Skip to content

Commit 25422ec

Browse files
committed
Fix it wrong version of junit
Signed-off-by: Olivier Lamy <olamy@apache.org>
1 parent d0a7c6d commit 25422ec

File tree

3 files changed

+15
-31
lines changed

3 files changed

+15
-31
lines changed

surefire-its/src/test/java/org/apache/maven/surefire/its/CheckTestNgVersionsIT.java

Lines changed: 13 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -43,12 +43,12 @@ public class CheckTestNgVersionsIT extends SurefireJUnitIntegrationTestCase {
4343
// TestNG 7.6 and above needs JDK11
4444
@Test
4545
public void test751() {
46-
runTestNgTestWithRunOrder("7.5.1");
46+
runTestNgTest("7.5.1");
4747
}
4848

4949
@Test
5050
public void test6143() {
51-
runTestNgTestWithRunOrder("6.14.3");
51+
runTestNgTest("6.14.3");
5252
}
5353

5454
@Test
@@ -71,43 +71,28 @@ public void test6821() {
7171
.verifyTextInLog("TestNG support requires version 6.14.3 or above");
7272
}
7373

74-
private void runTestNgTestWithRunOrder(String version) {
75-
runTestNgTest(version, null, true);
76-
}
77-
7874
private void runTestNgTest(String version) {
79-
runTestNgTest(version, null, false);
80-
}
81-
82-
private void runTestNgTest(String version, String classifier) {
83-
runTestNgTest(version, classifier, false);
84-
}
85-
86-
private void runTestNgTest(String version, String classifier, boolean validateRunOrder) {
8775
final SurefireLauncher launcher = unpack("testng-simple").sysProp("testNgVersion", version);
8876

8977
final OutputValidator outputValidator = launcher.executeTest();
9078

9179
outputValidator.assertTestSuiteResults(3, 0, 0, 0);
9280

93-
if (validateRunOrder) {
94-
// assert correct run order of tests
95-
List<ReportTestSuite> report = HelperAssertions.extractReports(outputValidator.getBaseDir());
81+
// assert correct run order of tests
82+
List<ReportTestSuite> report = HelperAssertions.extractReports(outputValidator.getBaseDir());
83+
84+
assertEquals(3, report.size());
9685

97-
assertEquals(3, report.size());
86+
// Validate order
9887

99-
assertTrue(
100-
"TestNGSuiteTestC was not executed first",
101-
getTestClass(report, 0).endsWith("TestNGSuiteTestC"));
88+
assertTrue(
89+
"TestNGSuiteTestC was not executed first",
90+
getTestClass(report, 0).endsWith("TestNGSuiteTestC"));
10291

103-
assertTrue(
104-
"TestNGSuiteTestB was executed second",
105-
getTestClass(report, 1).endsWith("TestNGSuiteTestB"));
92+
assertTrue(
93+
"TestNGSuiteTestB was executed second", getTestClass(report, 1).endsWith("TestNGSuiteTestB"));
10694

107-
assertTrue(
108-
"TestNGSuiteTestA was executed last",
109-
getTestClass(report, 2).endsWith("TestNGSuiteTestA"));
110-
}
95+
assertTrue("TestNGSuiteTestA was executed last", getTestClass(report, 2).endsWith("TestNGSuiteTestA"));
11196
}
11297

11398
private String getTestClass(List<ReportTestSuite> report, int i) {

surefire-its/src/test/resources/testng-simple/pom.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@
3131
<properties>
3232
<surefire.testng.verbose>0</surefire.testng.verbose>
3333
<argLine/>
34-
<jacoco.agent/>
3534
<maven.compiler.source>1.8</maven.compiler.source>
3635
<maven.compiler.target>1.8</maven.compiler.target>
3736
</properties>
@@ -57,7 +56,7 @@
5756
<artifactId>maven-surefire-plugin</artifactId>
5857
<version>${surefire.version}</version>
5958
<configuration>
60-
<argLine>${argLine} "${jacoco.agent}"</argLine>
59+
<argLine>${argLine}</argLine>
6160
<runOrder>reversealphabetical</runOrder>
6261
<properties>
6362
<property>

surefire-its/src/test/resources/working-directory-missing/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
<dependency>
3434
<groupId>junit</groupId>
3535
<artifactId>junit</artifactId>
36-
<version>3.8.2</version>
36+
<version>4.13.2</version>
3737
<scope>test</scope>
3838
</dependency>
3939
</dependencies>

0 commit comments

Comments
 (0)