Skip to content

Commit 5fc6d58

Browse files
nikita-tkachenko-datadognikita-tkachenko-datadog
committed
Update test fixtures
1 parent 3c7e9c7 commit 5fc6d58

File tree

6 files changed

+345
-111
lines changed

6 files changed

+345
-111
lines changed

‎dd-java-agent/agent-ci-visibility/src/testFixtures/groovy/datadog/trace/civisibility/CiVisibilityInstrumentationTest.groovy‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -341,13 +341,13 @@ abstract class CiVisibilityInstrumentationTest extends AgentTestRunner {
341341
] + replacements
342342

343343
// uncomment to generate expected data templates
344-
// def clazz = this.getClass()
345-
// def resourceName = clazz.name.replace('.', '/') + ".class"
346-
// def classfilePath = clazz.getResource(resourceName).toURI().schemeSpecificPart
347-
// def modulePath = classfilePath.substring(0, classfilePath.indexOf("/build/classes"))
348-
// def baseTemplatesPath = modulePath + "/src/test/resources/" + testcaseName
349-
// CiVisibilityTestUtils.generateTemplates(baseTemplatesPath, events, coverages, additionalReplacements)
350-
// return [:]
344+
// def clazz = this.getClass()
345+
// def resourceName = "/" + clazz.name.replace('.', '/') + ".class"
346+
// def classfilePath = clazz.getResource(resourceName).toURI().schemeSpecificPart
347+
// def modulePath = classfilePath.substring(0, classfilePath.indexOf("/build/classes"))
348+
// def baseTemplatesPath = modulePath + "/src/test/resources/" + testcaseName
349+
// CiVisibilityTestUtils.generateTemplates(baseTemplatesPath, events, coverages, additionalReplacements)
350+
// return [:]
351351

352352
return CiVisibilityTestUtils.assertData(testcaseName, events, coverages, additionalReplacements)
353353
}

‎dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/java/org/example/cucumber/calculator/CalculatorSteps.java‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ public void a_calculator_I_just_turned_on() {
2323

2424
@Given("a flaky calculator I just turned on")
2525
public void a_flaky_calculator_I_just_turned_on() {
26-
calc = ++flakyCounter >= 3 ? new Calculator() : null;
26+
calc = new Calculator(++flakyCounter < 3);
2727
}
2828

2929
@When("I add {int} and {int}")
@@ -94,6 +94,15 @@ public void setOperation(String operation) {
9494
static class Calculator {
9595
private static final List<String> OPS = asList("-", "+", "*", "/");
9696
private final Deque<Number> stack = new LinkedList<>();
97+
private final boolean broken;
98+
99+
public Calculator() {
100+
this(false);
101+
}
102+
103+
public Calculator(boolean broken) {
104+
this.broken = broken;
105+
}
97106

98107
public void push(Object arg) {
99108
if (OPS.contains(arg)) {
@@ -116,6 +125,9 @@ public void push(Object arg) {
116125
}
117126

118127
public Number value() {
128+
if (broken) {
129+
throw new RuntimeException("This test is flaky");
130+
}
119131
return stack.getLast();
120132
}
121133
}

‎dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/src/test/resources/test-failed-then-succeed/events.ftl‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,9 @@
4040
"component" : "junit",
4141
"dummy_ci_tag" : "dummy_ci_tag_value",
4242
"env" : "none",
43+
"error.message" : ${content_meta_error_message},
4344
"error.stack" : ${content_meta_error_stack},
44-
"error.type" : "java.lang.NullPointerException",
45+
"error.type" : "java.lang.RuntimeException",
4546
"language" : "jvm",
4647
"library_version" : ${content_meta_library_version},
4748
"runtime-id" : ${content_meta_runtime_id},
@@ -85,8 +86,9 @@
8586
"component" : "junit",
8687
"dummy_ci_tag" : "dummy_ci_tag_value",
8788
"env" : "none",
89+
"error.message" : ${content_meta_error_message},
8890
"error.stack" : ${content_meta_error_stack_2},
89-
"error.type" : "java.lang.NullPointerException",
91+
"error.type" : "java.lang.RuntimeException",
9092
"language" : "jvm",
9193
"library_version" : ${content_meta_library_version},
9294
"runtime-id" : ${content_meta_runtime_id},

‎dd-java-agent/instrumentation/selenium/src/test/resources/test-succeed-multiple/coverages.ftl‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
[ ]

‎dd-java-agent/instrumentation/selenium/src/test/resources/test-succeed-multiple/events.ftl‎

Lines changed: 207 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,207 @@
1+
[ {
2+
"content" : {
3+
"duration" : ${content_duration},
4+
"error" : 0,
5+
"meta" : {
6+
"_dd.p.tid" : ${content_meta__dd_p_tid},
7+
"component" : "junit",
8+
"dummy_ci_tag" : "dummy_ci_tag_value",
9+
"env" : "none",
10+
"library_version" : ${content_meta_library_version},
11+
"span.kind" : "test_suite_end",
12+
"test.codeowners" : "[\"owner1\",\"owner2\"]",
13+
"test.framework" : "junit5",
14+
"test.framework_version" : ${content_meta_test_framework_version},
15+
"test.module" : "selenium",
16+
"test.source.file" : "dummy_source_path",
17+
"test.status" : "pass",
18+
"test.suite" : "org.example.TestSucceedMultipleSelenium",
19+
"test.type" : "test",
20+
"test_session.name" : "session-name"
21+
},
22+
"metrics" : {
23+
"_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count},
24+
"test.source.end" : 19,
25+
"test.source.start" : 11
26+
},
27+
"name" : "junit.test_suite",
28+
"resource" : "org.example.TestSucceedMultipleSelenium",
29+
"service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
30+
"start" : ${content_start},
31+
"test_module_id" : ${content_test_module_id},
32+
"test_session_id" : ${content_test_session_id},
33+
"test_suite_id" : ${content_test_suite_id}
34+
},
35+
"type" : "test_suite_end",
36+
"version" : 1
37+
}, {
38+
"content" : {
39+
"duration" : ${content_duration_2},
40+
"error" : 0,
41+
"meta" : {
42+
"_dd.profiling.ctx" : "test",
43+
"_dd.tracer_host" : ${content_meta__dd_tracer_host},
44+
"component" : "junit",
45+
"dummy_ci_tag" : "dummy_ci_tag_value",
46+
"env" : "none",
47+
"language" : "jvm",
48+
"library_version" : ${content_meta_library_version},
49+
"runtime-id" : ${content_meta_runtime_id},
50+
"span.kind" : "test",
51+
"test.browser.driver" : "selenium",
52+
"test.browser.driver_version" : ${content_meta_test_browser_driver_version},
53+
"test.browser.name" : "htmlunit",
54+
"test.browser.version" : ${content_meta_test_browser_version},
55+
"test.codeowners" : "[\"owner1\",\"owner2\"]",
56+
"test.framework" : "junit5",
57+
"test.framework_version" : ${content_meta_test_framework_version},
58+
"test.is_rum_active" : "true",
59+
"test.module" : "selenium",
60+
"test.name" : "test_succeed",
61+
"test.source.file" : "dummy_source_path",
62+
"test.source.method" : "test_succeed()V",
63+
"test.status" : "pass",
64+
"test.suite" : "org.example.TestSucceedMultipleSelenium",
65+
"test.type" : "browser",
66+
"test_session.name" : "session-name"
67+
},
68+
"metrics" : {
69+
"_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2},
70+
"_dd.profiling.enabled" : 0,
71+
"_dd.trace_span_attribute_schema" : 0,
72+
"process_id" : ${content_metrics_process_id},
73+
"test.source.end" : 18,
74+
"test.source.start" : 12
75+
},
76+
"name" : "junit.test",
77+
"parent_id" : ${content_parent_id},
78+
"resource" : "org.example.TestSucceedMultipleSelenium.test_succeed",
79+
"service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
80+
"span_id" : ${content_span_id},
81+
"start" : ${content_start_2},
82+
"test_module_id" : ${content_test_module_id},
83+
"test_session_id" : ${content_test_session_id},
84+
"test_suite_id" : ${content_test_suite_id},
85+
"trace_id" : ${content_trace_id}
86+
},
87+
"type" : "test",
88+
"version" : 2
89+
}, {
90+
"content" : {
91+
"duration" : ${content_duration_3},
92+
"error" : 0,
93+
"meta" : {
94+
"_dd.profiling.ctx" : "test",
95+
"_dd.tracer_host" : ${content_meta__dd_tracer_host},
96+
"component" : "junit",
97+
"dummy_ci_tag" : "dummy_ci_tag_value",
98+
"env" : "none",
99+
"language" : "jvm",
100+
"library_version" : ${content_meta_library_version},
101+
"runtime-id" : ${content_meta_runtime_id},
102+
"span.kind" : "test",
103+
"test.browser.driver" : "selenium",
104+
"test.browser.driver_version" : ${content_meta_test_browser_driver_version},
105+
"test.browser.name" : "htmlunit",
106+
"test.browser.version" : ${content_meta_test_browser_version},
107+
"test.codeowners" : "[\"owner1\",\"owner2\"]",
108+
"test.framework" : "junit5",
109+
"test.framework_version" : ${content_meta_test_framework_version},
110+
"test.is_rum_active" : "true",
111+
"test.module" : "selenium",
112+
"test.name" : "test_succeed_another",
113+
"test.source.file" : "dummy_source_path",
114+
"test.source.method" : "test_succeed_another()V",
115+
"test.status" : "pass",
116+
"test.suite" : "org.example.TestSucceedMultipleSelenium",
117+
"test.type" : "browser",
118+
"test_session.name" : "session-name"
119+
},
120+
"metrics" : {
121+
"_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_3},
122+
"_dd.profiling.enabled" : 0,
123+
"_dd.trace_span_attribute_schema" : 0,
124+
"process_id" : ${content_metrics_process_id},
125+
"test.source.end" : 18,
126+
"test.source.start" : 12
127+
},
128+
"name" : "junit.test",
129+
"parent_id" : ${content_parent_id},
130+
"resource" : "org.example.TestSucceedMultipleSelenium.test_succeed_another",
131+
"service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
132+
"span_id" : ${content_span_id_2},
133+
"start" : ${content_start_3},
134+
"test_module_id" : ${content_test_module_id},
135+
"test_session_id" : ${content_test_session_id},
136+
"test_suite_id" : ${content_test_suite_id},
137+
"trace_id" : ${content_trace_id_2}
138+
},
139+
"type" : "test",
140+
"version" : 2
141+
}, {
142+
"content" : {
143+
"duration" : ${content_duration_4},
144+
"error" : 0,
145+
"meta" : {
146+
"_dd.p.tid" : ${content_meta__dd_p_tid_2},
147+
"_dd.profiling.ctx" : "test",
148+
"_dd.tracer_host" : ${content_meta__dd_tracer_host},
149+
"component" : "junit",
150+
"dummy_ci_tag" : "dummy_ci_tag_value",
151+
"env" : "none",
152+
"language" : "jvm",
153+
"library_version" : ${content_meta_library_version},
154+
"runtime-id" : ${content_meta_runtime_id},
155+
"span.kind" : "test_session_end",
156+
"test.command" : "selenium",
157+
"test.framework" : "junit5",
158+
"test.framework_version" : ${content_meta_test_framework_version},
159+
"test.status" : "pass",
160+
"test.type" : "test",
161+
"test_session.name" : "session-name"
162+
},
163+
"metrics" : {
164+
"_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_4},
165+
"_dd.profiling.enabled" : 0,
166+
"_dd.trace_span_attribute_schema" : 0,
167+
"process_id" : ${content_metrics_process_id}
168+
},
169+
"name" : "junit.test_session",
170+
"resource" : "selenium",
171+
"service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
172+
"start" : ${content_start_4},
173+
"test_session_id" : ${content_test_session_id}
174+
},
175+
"type" : "test_session_end",
176+
"version" : 1
177+
}, {
178+
"content" : {
179+
"duration" : ${content_duration_5},
180+
"error" : 0,
181+
"meta" : {
182+
"_dd.p.tid" : ${content_meta__dd_p_tid_3},
183+
"component" : "junit",
184+
"dummy_ci_tag" : "dummy_ci_tag_value",
185+
"env" : "none",
186+
"library_version" : ${content_meta_library_version},
187+
"span.kind" : "test_module_end",
188+
"test.framework" : "junit5",
189+
"test.framework_version" : ${content_meta_test_framework_version},
190+
"test.module" : "selenium",
191+
"test.status" : "pass",
192+
"test.type" : "test",
193+
"test_session.name" : "session-name"
194+
},
195+
"metrics" : {
196+
"_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_5}
197+
},
198+
"name" : "junit.test_module",
199+
"resource" : "selenium",
200+
"service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
201+
"start" : ${content_start_5},
202+
"test_module_id" : ${content_test_module_id},
203+
"test_session_id" : ${content_test_session_id}
204+
},
205+
"type" : "test_module_end",
206+
"version" : 1
207+
} ]

0 commit comments

Comments
 (0)