Skip to content

Commit de65673

Browse files
daniel-mohedanodaniel-mohedano
authored
Cleanup CIVis smoke tests (#11453)
fix: junitconsole smoke test assertions fix: fixture updates chore: restore latest testing for gradle plugin scenario chore: remove unused method chore: spotless Co-authored-by: daniel.mohedano <daniel.mohedano@datadoghq.com>
1 parent 1ec9f65 commit de65673

21 files changed

Lines changed: 83 additions & 21 deletions

File tree

‎dd-java-agent/agent-ci-visibility/civisibility-test-fixtures/src/main/java/datadog/trace/civisibility/CiVisibilitySmokeTest.java‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import static org.junit.jupiter.api.Assertions.assertEquals;
55
import static org.junit.jupiter.api.Assertions.assertFalse;
66
import static org.junit.jupiter.api.Assertions.assertNotNull;
7+
import static org.junit.jupiter.api.Assertions.assertTrue;
78

89
import datadog.trace.api.Config;
910
import datadog.trace.api.civisibility.config.TestFQN;
@@ -284,20 +285,24 @@ protected static void verifySnapshots(List<Map<String, Object>> logs, int expect
284285
assertEquals(expectedCount, logs.size());
285286

286287
List<String> requiredLogFields =
287-
Arrays.asList("logger.name", "logger.method", "dd.spanid", "dd.traceid");
288+
Arrays.asList("logger.name", "logger.method", "dd.span_id", "dd.trace_id");
288289
List<String> requiredSnapshotFields =
289290
Arrays.asList("captures", "exceptionId", "probe", "stack");
290291

291292
for (Map<String, Object> log : logs) {
292-
requiredLogFields.forEach(log::containsKey);
293+
requiredLogFields.forEach(
294+
field -> assertTrue(log.containsKey(field), "log must contain field: " + field));
293295

294296
@SuppressWarnings("unchecked")
295297
Map<String, Object> debuggerMap = (Map<String, Object>) log.get("debugger");
296298
@SuppressWarnings("unchecked")
297299
Map<String, Object> snapshotContent = (Map<String, Object>) debuggerMap.get("snapshot");
298300

299301
assertNotNull(snapshotContent, "snapshot must not be null");
300-
requiredSnapshotFields.forEach(snapshotContent::containsKey);
302+
requiredSnapshotFields.forEach(
303+
field ->
304+
assertTrue(
305+
snapshotContent.containsKey(field), "snapshot must contain field: " + field));
301306
}
302307
}
303308
}

‎dd-smoke-tests/gradle/src/test/java/datadog/smoketest/GradleDaemonSmokeTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ void testLegacy(
8989
"corrupted-config-new | latest | test-corrupted-config-new-instrumentation | false | false | false | 1 | 0 ",
9090
"succeed-junit-5 | latest | test-succeed-junit-5 | false | true | false | 5 | 1 ",
9191
"failed-flaky-retries | latest | test-failed-flaky-retries | false | false | true | 8 | 0 ",
92-
"succeed-gradle-plugin-test | 9.3.1 | test-succeed-gradle-plugin-test | false | true | false | 5 | 0 "
92+
"succeed-gradle-plugin-test | latest | test-succeed-gradle-plugin-test | false | true | false | 5 | 0 "
9393
})
9494
@ParameterizedTest
9595
void testNew(

‎dd-smoke-tests/gradle/src/test/resources/test-failed-flaky-retries/events.ftl‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -209,6 +209,7 @@
209209
"span.kind" : "test_suite_end",
210210
"test.framework" : "junit4",
211211
"test.framework_version" : "4.10",
212+
"test.itr.tests_skipping.enabled" : "true",
212213
"test.module" : ":test",
213214
"test.source.file" : "src/test/java/datadog/smoke/TestFailed.java",
214215
"test.status" : "fail",
@@ -269,6 +270,7 @@
269270
"test.failure_suppressed" : "true",
270271
"test.framework" : "junit4",
271272
"test.framework_version" : "4.10",
273+
"test.itr.tests_skipping.enabled" : "true",
272274
"test.module" : ":test",
273275
"test.name" : "test_failed",
274276
"test.source.file" : "src/test/java/datadog/smoke/TestFailed.java",
@@ -335,6 +337,7 @@
335337
"test.framework" : "junit4",
336338
"test.framework_version" : "4.10",
337339
"test.is_retry" : "true",
340+
"test.itr.tests_skipping.enabled" : "true",
338341
"test.module" : ":test",
339342
"test.name" : "test_failed",
340343
"test.retry_reason" : "auto_test_retry",
@@ -402,6 +405,7 @@
402405
"test.framework" : "junit4",
403406
"test.framework_version" : "4.10",
404407
"test.is_retry" : "true",
408+
"test.itr.tests_skipping.enabled" : "true",
405409
"test.module" : ":test",
406410
"test.name" : "test_failed",
407411
"test.retry_reason" : "auto_test_retry",
@@ -469,6 +473,7 @@
469473
"test.framework" : "junit4",
470474
"test.framework_version" : "4.10",
471475
"test.is_retry" : "true",
476+
"test.itr.tests_skipping.enabled" : "true",
472477
"test.module" : ":test",
473478
"test.name" : "test_failed",
474479
"test.retry_reason" : "auto_test_retry",
@@ -537,6 +542,7 @@
537542
"test.framework_version" : "4.10",
538543
"test.has_failed_all_retries" : "true",
539544
"test.is_retry" : "true",
545+
"test.itr.tests_skipping.enabled" : "true",
540546
"test.module" : ":test",
541547
"test.name" : "test_failed",
542548
"test.retry_reason" : "auto_test_retry",

‎dd-smoke-tests/gradle/src/test/resources/test-failed-new-instrumentation/events.ftl‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -209,6 +209,7 @@
209209
"span.kind" : "test_suite_end",
210210
"test.framework" : "junit4",
211211
"test.framework_version" : "4.10",
212+
"test.itr.tests_skipping.enabled" : "true",
212213
"test.module" : ":test",
213214
"test.source.file" : "src/test/java/datadog/smoke/TestFailed.java",
214215
"test.status" : "fail",
@@ -269,6 +270,7 @@
269270
"test.final_status" : "fail",
270271
"test.framework" : "junit4",
271272
"test.framework_version" : "4.10",
273+
"test.itr.tests_skipping.enabled" : "true",
272274
"test.module" : ":test",
273275
"test.name" : "test_failed",
274276
"test.source.file" : "src/test/java/datadog/smoke/TestFailed.java",

‎dd-smoke-tests/gradle/src/test/resources/test-succeed-gradle-plugin-test/events.ftl‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -203,6 +203,7 @@
203203
"span.kind" : "test_suite_end",
204204
"test.framework" : "junit5",
205205
"test.framework_version" : "5.10.2",
206+
"test.itr.tests_skipping.enabled" : "true",
206207
"test.module" : ":test",
207208
"test.source.file" : "src/test/java/datadog/smoke/HelloPluginFunctionalTest.java",
208209
"test.status" : "pass",
@@ -262,6 +263,7 @@
262263
"test.final_status" : "pass",
263264
"test.framework" : "junit5",
264265
"test.framework_version" : "5.10.2",
266+
"test.itr.tests_skipping.enabled" : "true",
265267
"test.module" : ":test",
266268
"test.name" : "pluginPrintsHelloMessageOnGradle85",
267269
"test.source.file" : "src/test/java/datadog/smoke/HelloPluginFunctionalTest.java",

‎dd-smoke-tests/gradle/src/test/resources/test-succeed-junit-5/events.ftl‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -205,6 +205,7 @@
205205
"span.kind" : "test_suite_end",
206206
"test.framework" : "junit5",
207207
"test.framework_version" : "5.9.3",
208+
"test.itr.tests_skipping.enabled" : "true",
208209
"test.module" : ":test",
209210
"test.source.file" : "src/test/java/datadog/smoke/TestSucceed.java",
210211
"test.status" : "pass",
@@ -264,6 +265,7 @@
264265
"test.final_status" : "pass",
265266
"test.framework" : "junit5",
266267
"test.framework_version" : "5.9.3",
268+
"test.itr.tests_skipping.enabled" : "true",
267269
"test.module" : ":test",
268270
"test.name" : "test_succeed",
269271
"test.source.file" : "src/test/java/datadog/smoke/TestSucceed.java",
@@ -328,6 +330,7 @@
328330
"test.final_status" : "skip",
329331
"test.framework" : "junit5",
330332
"test.framework_version" : "5.9.3",
333+
"test.itr.tests_skipping.enabled" : "true",
331334
"test.module" : ":test",
332335
"test.name" : "test_to_skip_with_itr",
333336
"test.skip_reason" : "Skipped by Datadog Test Impact Analysis",

‎dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-forks-new-instrumentation/coverages.ftl‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,4 @@
11
[ {
2-
"files" : [ {
3-
"bitmap" : "gAw=",
4-
"filename" : "src/test/java/datadog/smoke/TestSucceed.java"
5-
}, {
6-
"bitmap" : "IA==",
7-
"filename" : "src/main/java/datadog/smoke/Calculator.java"
8-
} ],
9-
"span_id" : ${content_span_id_4},
10-
"test_session_id" : ${content_test_session_id},
11-
"test_suite_id" : ${content_test_suite_id}
12-
}, {
132
"files" : [ {
143
"bitmap" : "AAE=",
154
"filename" : "src/main/java/datadog/smoke/Calculator.java"
@@ -20,4 +9,15 @@
209
"span_id" : ${content_span_id_5},
2110
"test_session_id" : ${content_test_session_id},
2211
"test_suite_id" : ${content_test_suite_id_2}
12+
}, {
13+
"files" : [ {
14+
"bitmap" : "gAw=",
15+
"filename" : "src/test/java/datadog/smoke/TestSucceed.java"
16+
}, {
17+
"bitmap" : "IA==",
18+
"filename" : "src/main/java/datadog/smoke/Calculator.java"
19+
} ],
20+
"span_id" : ${content_span_id_4},
21+
"test_session_id" : ${content_test_session_id},
22+
"test_suite_id" : ${content_test_suite_id}
2323
} ]

‎dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-forks-new-instrumentation/events.ftl‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -203,6 +203,7 @@
203203
"span.kind" : "test_suite_end",
204204
"test.framework" : "junit4",
205205
"test.framework_version" : "4.13.2",
206+
"test.itr.tests_skipping.enabled" : "true",
206207
"test.module" : ":test",
207208
"test.source.file" : "src/test/java/datadog/smoke/TestSucceed.java",
208209
"test.status" : "pass",
@@ -262,6 +263,7 @@
262263
"test.final_status" : "pass",
263264
"test.framework" : "junit4",
264265
"test.framework_version" : "4.13.2",
266+
"test.itr.tests_skipping.enabled" : "true",
265267
"test.module" : ":test",
266268
"test.name" : "test_succeed",
267269
"test.source.file" : "src/test/java/datadog/smoke/TestSucceed.java",
@@ -315,6 +317,7 @@
315317
"span.kind" : "test_suite_end",
316318
"test.framework" : "junit5",
317319
"test.framework_version" : "5.9.3",
320+
"test.itr.tests_skipping.enabled" : "true",
318321
"test.module" : ":test",
319322
"test.source.file" : "src/test/java/datadog/smoke/TestSucceedJunit5.java",
320323
"test.status" : "pass",
@@ -374,6 +377,7 @@
374377
"test.final_status" : "pass",
375378
"test.framework" : "junit5",
376379
"test.framework_version" : "5.9.3",
380+
"test.itr.tests_skipping.enabled" : "true",
377381
"test.module" : ":test",
378382
"test.name" : "test_succeed",
379383
"test.source.file" : "src/test/java/datadog/smoke/TestSucceedJunit5.java",

‎dd-smoke-tests/gradle/src/test/resources/test-succeed-multi-module-new-instrumentation/events.ftl‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -162,6 +162,7 @@
162162
"span.kind" : "test_suite_end",
163163
"test.framework" : "junit4",
164164
"test.framework_version" : "4.10",
165+
"test.itr.tests_skipping.enabled" : "true",
165166
"test.module" : ":submodule-a:test",
166167
"test.source.file" : "submodule-a/src/test/java/datadog/smoke/TestSucceed.java",
167168
"test.status" : "pass",
@@ -210,6 +211,7 @@
210211
"span.kind" : "test_suite_end",
211212
"test.framework" : "junit4",
212213
"test.framework_version" : "4.10",
214+
"test.itr.tests_skipping.enabled" : "true",
213215
"test.module" : ":submodule-b:test",
214216
"test.source.file" : "submodule-b/src/test/java/datadog/smoke/TestSucceed.java",
215217
"test.status" : "pass",
@@ -268,6 +270,7 @@
268270
"test.final_status" : "pass",
269271
"test.framework" : "junit4",
270272
"test.framework_version" : "4.10",
273+
"test.itr.tests_skipping.enabled" : "true",
271274
"test.module" : ":submodule-a:test",
272275
"test.name" : "test_succeed",
273276
"test.source.file" : "submodule-a/src/test/java/datadog/smoke/TestSucceed.java",
@@ -331,6 +334,7 @@
331334
"test.final_status" : "pass",
332335
"test.framework" : "junit4",
333336
"test.framework_version" : "4.10",
337+
"test.itr.tests_skipping.enabled" : "true",
334338
"test.module" : ":submodule-b:test",
335339
"test.name" : "test_succeed",
336340
"test.source.file" : "submodule-b/src/test/java/datadog/smoke/TestSucceed.java",

‎dd-smoke-tests/gradle/src/test/resources/test-succeed-new-instrumentation/events.ftl‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -205,6 +205,7 @@
205205
"span.kind" : "test_suite_end",
206206
"test.framework" : "junit4",
207207
"test.framework_version" : "4.10",
208+
"test.itr.tests_skipping.enabled" : "true",
208209
"test.module" : ":test",
209210
"test.source.file" : "src/test/java/datadog/smoke/TestSucceed.java",
210211
"test.status" : "pass",
@@ -263,6 +264,7 @@
263264
"test.final_status" : "pass",
264265
"test.framework" : "junit4",
265266
"test.framework_version" : "4.10",
267+
"test.itr.tests_skipping.enabled" : "true",
266268
"test.module" : ":test",
267269
"test.name" : "test_succeed",
268270
"test.source.file" : "src/test/java/datadog/smoke/TestSucceed.java",
@@ -326,6 +328,7 @@
326328
"test.final_status" : "skip",
327329
"test.framework" : "junit4",
328330
"test.framework_version" : "4.10",
331+
"test.itr.tests_skipping.enabled" : "true",
329332
"test.module" : ":test",
330333
"test.name" : "test_to_skip_with_itr",
331334
"test.skip_reason" : "Skipped by Datadog Test Impact Analysis",

0 commit comments

Comments
 (0)