@@ -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 ) {
0 commit comments