Skip to content

Commit 6fe1b50

Browse files
chore: revert skips
1 parent c39aeeb commit 6fe1b50

2 files changed

Lines changed: 9 additions & 18 deletions

File tree

dd-java-agent/instrumentation/maven/maven-3.2.1/build.gradle

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,6 @@ muzzle {
1111

1212
addTestSuiteForDir('latestDepTest', 'test')
1313

14-
tasks.named("latestDepTest", Test) {
15-
systemProperty 'test.isLatestDepTest', 'true'
16-
}
17-
1814
dependencies {
1915
compileOnly 'org.apache.maven:maven-embedder:3.2.1'
2016

dd-java-agent/instrumentation/maven/maven-3.2.1/src/test/groovy/MavenInstrumentationTest.groovy

Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import java.nio.file.Path
99
import java.nio.file.Paths
1010

1111
import static org.junit.jupiter.api.Assertions.assertEquals
12-
import static org.junit.jupiter.api.Assumptions.abort
1312

1413
class MavenInstrumentationTest extends CiVisibilityInstrumentationTest {
1514

@@ -41,10 +40,6 @@ class MavenInstrumentationTest extends CiVisibilityInstrumentationTest {
4140
}
4241

4342
def "test #testcaseName"() {
44-
if (skipLatest && Boolean.getBoolean("test.isLatestDepTest")) {
45-
abort("Skipping latest dep test")
46-
}
47-
4843
String workingDirectory = projectFolder.toString()
4944

5045
def exitCode = new MavenCli().doMain(args.toArray(new String[0]), workingDirectory, null, null)
@@ -53,15 +48,15 @@ class MavenInstrumentationTest extends CiVisibilityInstrumentationTest {
5348
assertSpansData(testcaseName)
5449

5550
where:
56-
testcaseName | args | expectedExitCode | skipLatest
57-
"test_maven_build_with_no_tests_generates_spans" | ["-B", "verify"] | 0 | false
58-
"test_maven_build_with_incorrect_command_generates_spans" | ["-B", "unknownPhase"] | 1 | false
59-
"test_maven_build_with_tests_generates_spans" | ["-B", "clean", "test"] | 0 | false
60-
"test_maven_build_with_failed_tests_generates_spans" | ["-B", "clean", "test"] | 1 | false
61-
"test_maven_build_with_tests_in_multiple_modules_generates_spans" | ["-B", "clean", "test"] | 1 | false
62-
"test_maven_build_with_tests_in_multiple_modules_run_in_parallel_generates_spans" | ["-B", "-T4", "clean", "test"] | 0 | false
63-
"test_maven_build_with_unit_and_integration_tests_generates_spans" | ["-B", "verify"] | 0 | true // temporary workaround to avoid failures with maven-failsafe-plugin 3.5.5
64-
"test_maven_build_with_no_fork_generates_spans" | ["-B", "clean", "test"] | 0 | false
51+
testcaseName | args | expectedExitCode
52+
"test_maven_build_with_no_tests_generates_spans" | ["-B", "verify"] | 0
53+
"test_maven_build_with_incorrect_command_generates_spans" | ["-B", "unknownPhase"] | 1
54+
"test_maven_build_with_tests_generates_spans" | ["-B", "clean", "test"] | 0
55+
"test_maven_build_with_failed_tests_generates_spans" | ["-B", "clean", "test"] | 1
56+
"test_maven_build_with_tests_in_multiple_modules_generates_spans" | ["-B", "clean", "test"] | 1
57+
"test_maven_build_with_tests_in_multiple_modules_run_in_parallel_generates_spans" | ["-B", "-T4", "clean", "test"] | 0
58+
"test_maven_build_with_unit_and_integration_tests_generates_spans" | ["-B", "verify"] | 0
59+
"test_maven_build_with_no_fork_generates_spans" | ["-B", "clean", "test"] | 0
6560
}
6661

6762
private void givenMavenProjectFiles(String projectFilesSources) {

0 commit comments

Comments
 (0)