Skip to content

Commit c80ed84

Browse files
Update test fixtures
1 parent f5c4b8f commit c80ed84

File tree

89 files changed

+1326
-78
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

89 files changed

+1326
-78
lines changed

dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/groovy/CucumberTest.groovy

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -138,13 +138,13 @@ class CucumberTest extends CiVisibilityInstrumentationTest {
138138
assertSpansData(testcaseName)
139139

140140
where:
141-
testcaseName | features | quarantined | known
142-
"test-quarantined-failed" | ["org/example/cucumber/calculator/basic_arithmetic_failed.feature"] | [
141+
testcaseName | features | quarantined | known
142+
"test-quarantined-failed-known" | ["org/example/cucumber/calculator/basic_arithmetic_failed.feature"] | [
143143
new TestIdentifier("classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic", "Addition", null)
144144
] | [
145145
new TestIdentifier("classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic", "Addition", null)
146146
]
147-
"test-quarantined-failed-efd" | ["org/example/cucumber/calculator/basic_arithmetic_failed.feature"] | [
147+
"test-quarantined-failed-efd" | ["org/example/cucumber/calculator/basic_arithmetic_failed.feature"] | [
148148
new TestIdentifier("classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic", "Addition", null)
149149
] | []
150150
}

dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-quarantined-failed-atr/events.ftl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -243,6 +243,7 @@
243243
"span.kind" : "test",
244244
"test.framework" : "cucumber",
245245
"test.framework_version" : ${content_meta_test_framework_version},
246+
"test.has_failed_all_retries" : "true",
246247
"test.is_retry" : "true",
247248
"test.management.is_quarantined" : "true",
248249
"test.module" : "cucumber-junit-4",

dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-quarantined-failed-efd/events.ftl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,7 @@
147147
"span.kind" : "test",
148148
"test.framework" : "cucumber",
149149
"test.framework_version" : ${content_meta_test_framework_version},
150+
"test.has_failed_all_retries" : "true",
150151
"test.is_new" : "true",
151152
"test.is_retry" : "true",
152153
"test.management.is_quarantined" : "true",
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
[ {
2+
"files" : [ {
3+
"filename" : "org/example/cucumber/calculator/basic_arithmetic_failed.feature"
4+
} ],
5+
"span_id" : ${content_span_id},
6+
"test_session_id" : ${content_test_session_id},
7+
"test_suite_id" : ${content_test_suite_id}
8+
} ]
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,148 @@
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.framework" : "cucumber",
13+
"test.framework_version" : ${content_meta_test_framework_version},
14+
"test.module" : "cucumber-junit-4",
15+
"test.status" : "fail",
16+
"test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic",
17+
"test.type" : "test",
18+
"test_session.name" : "session-name"
19+
},
20+
"metrics" : {
21+
"_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count}
22+
},
23+
"name" : "junit.test_suite",
24+
"resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic",
25+
"service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
26+
"start" : ${content_start},
27+
"test_module_id" : ${content_test_module_id},
28+
"test_session_id" : ${content_test_session_id},
29+
"test_suite_id" : ${content_test_suite_id}
30+
},
31+
"type" : "test_suite_end",
32+
"version" : 1
33+
}, {
34+
"content" : {
35+
"duration" : ${content_duration_2},
36+
"error" : 1,
37+
"meta" : {
38+
"_dd.profiling.ctx" : "test",
39+
"_dd.tracer_host" : ${content_meta__dd_tracer_host},
40+
"component" : "junit",
41+
"dummy_ci_tag" : "dummy_ci_tag_value",
42+
"env" : "none",
43+
"error.message" : ${content_meta_error_message},
44+
"error.stack" : ${content_meta_error_stack},
45+
"error.type" : "java.lang.AssertionError",
46+
"language" : "jvm",
47+
"library_version" : ${content_meta_library_version},
48+
"runtime-id" : ${content_meta_runtime_id},
49+
"span.kind" : "test",
50+
"test.framework" : "cucumber",
51+
"test.framework_version" : ${content_meta_test_framework_version},
52+
"test.management.is_quarantined" : "true",
53+
"test.module" : "cucumber-junit-4",
54+
"test.name" : "Addition",
55+
"test.status" : "fail",
56+
"test.suite" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic",
57+
"test.traits" : "{\"category\":[\"foo\"]}",
58+
"test.type" : "test",
59+
"test_session.name" : "session-name"
60+
},
61+
"metrics" : {
62+
"_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_2},
63+
"_dd.profiling.enabled" : 0,
64+
"_dd.trace_span_attribute_schema" : 0,
65+
"process_id" : ${content_metrics_process_id}
66+
},
67+
"name" : "junit.test",
68+
"parent_id" : ${content_parent_id},
69+
"resource" : "classpath:org/example/cucumber/calculator/basic_arithmetic_failed.feature:Basic Arithmetic.Addition",
70+
"service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
71+
"span_id" : ${content_span_id},
72+
"start" : ${content_start_2},
73+
"test_module_id" : ${content_test_module_id},
74+
"test_session_id" : ${content_test_session_id},
75+
"test_suite_id" : ${content_test_suite_id},
76+
"trace_id" : ${content_trace_id}
77+
},
78+
"type" : "test",
79+
"version" : 2
80+
}, {
81+
"content" : {
82+
"duration" : ${content_duration_3},
83+
"error" : 0,
84+
"meta" : {
85+
"_dd.p.tid" : ${content_meta__dd_p_tid_2},
86+
"_dd.profiling.ctx" : "test",
87+
"_dd.tracer_host" : ${content_meta__dd_tracer_host},
88+
"component" : "junit",
89+
"dummy_ci_tag" : "dummy_ci_tag_value",
90+
"env" : "none",
91+
"language" : "jvm",
92+
"library_version" : ${content_meta_library_version},
93+
"runtime-id" : ${content_meta_runtime_id},
94+
"span.kind" : "test_session_end",
95+
"test.command" : "cucumber-junit-4",
96+
"test.early_flake.enabled" : "true",
97+
"test.framework" : "cucumber",
98+
"test.framework_version" : ${content_meta_test_framework_version},
99+
"test.status" : "fail",
100+
"test.type" : "test",
101+
"test_session.name" : "session-name"
102+
},
103+
"metrics" : {
104+
"_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_3},
105+
"_dd.profiling.enabled" : 0,
106+
"_dd.trace_span_attribute_schema" : 0,
107+
"process_id" : ${content_metrics_process_id}
108+
},
109+
"name" : "junit.test_session",
110+
"resource" : "cucumber-junit-4",
111+
"service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
112+
"start" : ${content_start_3},
113+
"test_session_id" : ${content_test_session_id}
114+
},
115+
"type" : "test_session_end",
116+
"version" : 1
117+
}, {
118+
"content" : {
119+
"duration" : ${content_duration_4},
120+
"error" : 0,
121+
"meta" : {
122+
"_dd.p.tid" : ${content_meta__dd_p_tid_3},
123+
"component" : "junit",
124+
"dummy_ci_tag" : "dummy_ci_tag_value",
125+
"env" : "none",
126+
"library_version" : ${content_meta_library_version},
127+
"span.kind" : "test_module_end",
128+
"test.early_flake.enabled" : "true",
129+
"test.framework" : "cucumber",
130+
"test.framework_version" : ${content_meta_test_framework_version},
131+
"test.module" : "cucumber-junit-4",
132+
"test.status" : "fail",
133+
"test.type" : "test",
134+
"test_session.name" : "session-name"
135+
},
136+
"metrics" : {
137+
"_dd.host.vcpu_count" : ${content_metrics__dd_host_vcpu_count_4}
138+
},
139+
"name" : "junit.test_module",
140+
"resource" : "cucumber-junit-4",
141+
"service" : "worker.org.gradle.process.internal.worker.gradleworkermain",
142+
"start" : ${content_start_4},
143+
"test_module_id" : ${content_test_module_id},
144+
"test_session_id" : ${content_test_session_id}
145+
},
146+
"type" : "test_module_end",
147+
"version" : 1
148+
} ]

dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-quarantined-failed/events.ftl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,4 +143,4 @@
143143
},
144144
"type" : "test_module_end",
145145
"version" : 1
146-
} ]
146+
} ]

dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-retry-failure/events.ftl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -239,6 +239,7 @@
239239
"span.kind" : "test",
240240
"test.framework" : "cucumber",
241241
"test.framework_version" : ${content_meta_test_framework_version},
242+
"test.has_failed_all_retries" : "true",
242243
"test.is_retry" : "true",
243244
"test.module" : "cucumber-junit-4",
244245
"test.name" : "Addition",

dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/src/test/resources/test-retry-scenario-outline-5.4.0/events.ftl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -325,6 +325,7 @@
325325
"span.kind" : "test",
326326
"test.framework" : "cucumber",
327327
"test.framework_version" : ${content_meta_test_framework_version},
328+
"test.has_failed_all_retries" : "true",
328329
"test.is_retry" : "true",
329330
"test.module" : "cucumber-junit-4",
330331
"test.name" : "Many additions",

dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/groovy/MUnitTest.groovy

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -122,9 +122,9 @@ class MUnitTest extends CiVisibilityInstrumentationTest {
122122
assertSpansData(testcaseName)
123123

124124
where:
125-
testcaseName | tests | quarantined | known
126-
"test-quarantined-failed" | [TestFailedMUnit] | [new TestIdentifier("org.example.TestFailedMUnit", "Calculator.add", null)] | [new TestIdentifier("org.example.TestFailedMUnit", "Calculator.add", null)]
127-
"test-quarantined-failed-efd" | [TestFailedMUnit] | [new TestIdentifier("org.example.TestFailedMUnit", "Calculator.add", null)] | []
125+
testcaseName | tests | quarantined | known
126+
"test-quarantined-failed-known" | [TestFailedMUnit] | [new TestIdentifier("org.example.TestFailedMUnit", "Calculator.add", null)] | [new TestIdentifier("org.example.TestFailedMUnit", "Calculator.add", null)]
127+
"test-quarantined-failed-efd" | [TestFailedMUnit] | [new TestIdentifier("org.example.TestFailedMUnit", "Calculator.add", null)] | []
128128
}
129129

130130
private void runTests(Collection<Class<?>> tests, boolean expectSuccess = true) {

dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-quarantined-failed-atr/events.ftl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -322,6 +322,7 @@
322322
"test.codeowners" : "[\"owner1\",\"owner2\"]",
323323
"test.framework" : "munit",
324324
"test.framework_version" : ${content_meta_test_framework_version},
325+
"test.has_failed_all_retries" : "true",
325326
"test.is_retry" : "true",
326327
"test.management.is_quarantined" : "true",
327328
"test.module" : "munit-junit-4",

dd-java-agent/instrumentation/junit-4.10/munit-junit-4/src/test/resources/test-quarantined-failed-efd/events.ftl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -224,6 +224,7 @@
224224
"test.codeowners" : "[\"owner1\",\"owner2\"]",
225225
"test.framework" : "munit",
226226
"test.framework_version" : ${content_meta_test_framework_version},
227+
"test.has_failed_all_retries" : "true",
227228
"test.is_new" : "true",
228229
"test.is_retry" : "true",
229230
"test.management.is_quarantined" : "true",
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
[ ]

0 commit comments

Comments
 (0)