Skip to content

Commit 9693e42

Browse files
simplified test management maven smoke test
1 parent 99d9749 commit 9693e42

File tree

4 files changed

+14
-343
lines changed

4 files changed

+14
-343
lines changed

dd-smoke-tests/maven/src/test/groovy/datadog/smoketest/MavenSmokeTest.groovy

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -136,18 +136,16 @@ class MavenSmokeTest extends CiVisibilitySmokeTest {
136136
mockBackend.givenAttemptToFixRetries(5)
137137

138138
mockBackend.givenQuarantinedTests("Maven Smoke Tests Project maven-surefire-plugin default-test", "datadog.smoke.TestFailed", "test_failed")
139-
mockBackend.givenQuarantinedTests("Maven Smoke Tests Project maven-surefire-plugin default-test", "datadog.smoke.TestSucceeded", "test_succeeded")
139+
mockBackend.givenQuarantinedTests("Maven Smoke Tests Project maven-surefire-plugin default-test", "datadog.smoke.TestFailed", "test_another_failed")
140140

141-
mockBackend.givenDisabledTests("Maven Smoke Tests Project maven-surefire-plugin default-test", "datadog.smoke.TestFailed", "test_another_failed")
142-
mockBackend.givenDisabledTests("Maven Smoke Tests Project maven-surefire-plugin default-test", "datadog.smoke.TestSucceeded", "test_another_succeeded")
141+
mockBackend.givenDisabledTests("Maven Smoke Tests Project maven-surefire-plugin default-test", "datadog.smoke.TestSucceeded", "test_succeed")
143142

144-
mockBackend.givenAttemptToFixTests("Maven Smoke Tests Project maven-surefire-plugin default-test", "datadog.smoke.TestSucceeded", "test_succeeded")
145143
mockBackend.givenAttemptToFixTests("Maven Smoke Tests Project maven-surefire-plugin default-test", "datadog.smoke.TestFailed", "test_another_failed")
146144

147145
def exitCode = whenRunningMavenBuild([], [])
148146
assert exitCode == 0
149147

150-
verifyEventsAndCoverages(projectName, "maven", mavenVersion, mockBackend.waitForEvents(20), mockBackend.waitForCoverages(11))
148+
verifyEventsAndCoverages(projectName, "maven", mavenVersion, mockBackend.waitForEvents(15), mockBackend.waitForCoverages(6))
151149

152150
where:
153151
projectName | mavenVersion

dd-smoke-tests/maven/src/test/resources/test_successful_maven_run_test_management/coverages.ftl

Lines changed: 1 addition & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -4,43 +4,7 @@
44
}, {
55
"filename" : "src/test/java/datadog/smoke/TestSucceeded.java"
66
} ],
7-
"span_id" : ${content_span_id_12},
8-
"test_session_id" : ${content_test_session_id},
9-
"test_suite_id" : ${content_test_suite_id_2}
10-
}, {
11-
"files" : [ {
12-
"filename" : "src/main/java/datadog/smoke/Calculator.java"
13-
}, {
14-
"filename" : "src/test/java/datadog/smoke/TestSucceeded.java"
15-
} ],
16-
"span_id" : ${content_span_id_13},
17-
"test_session_id" : ${content_test_session_id},
18-
"test_suite_id" : ${content_test_suite_id_2}
19-
}, {
20-
"files" : [ {
21-
"filename" : "src/main/java/datadog/smoke/Calculator.java"
22-
}, {
23-
"filename" : "src/test/java/datadog/smoke/TestSucceeded.java"
24-
} ],
25-
"span_id" : ${content_span_id_14},
26-
"test_session_id" : ${content_test_session_id},
27-
"test_suite_id" : ${content_test_suite_id_2}
28-
}, {
29-
"files" : [ {
30-
"filename" : "src/main/java/datadog/smoke/Calculator.java"
31-
}, {
32-
"filename" : "src/test/java/datadog/smoke/TestSucceeded.java"
33-
} ],
34-
"span_id" : ${content_span_id_15},
35-
"test_session_id" : ${content_test_session_id},
36-
"test_suite_id" : ${content_test_suite_id_2}
37-
}, {
38-
"files" : [ {
39-
"filename" : "src/main/java/datadog/smoke/Calculator.java"
40-
}, {
41-
"filename" : "src/test/java/datadog/smoke/TestSucceeded.java"
42-
} ],
43-
"span_id" : ${content_span_id_16},
7+
"span_id" : ${content_span_id_11},
448
"test_session_id" : ${content_test_session_id},
459
"test_suite_id" : ${content_test_suite_id_2}
4610
}, {

0 commit comments

Comments
 (0)