From 09251222ae3ee4747e26c5b022ea83ec46511be2 Mon Sep 17 00:00:00 2001 From: Sylwester Lachiewicz Date: Thu, 4 Jan 2024 02:05:28 +0100 Subject: [PATCH] Upgrade TestNG to 7.5.1, drop old versions --- .../surefire/its/CheckTestNgVersionsIT.java | 100 ++---------------- .../src/test/resources/junit5-testng/pom.xml | 4 +- .../surefire-1535-parallel-testng/pom.xml | 2 +- .../resources/surefire-1733-testng/pom.xml | 2 +- .../pom.xml | 2 +- .../resources/testng-740-parallel/pom.xml | 2 +- .../resources/testng-junit4-together/pom.xml | 2 +- .../surefire-testng-utils/pom.xml | 3 +- surefire-providers/surefire-testng/pom.xml | 3 +- 9 files changed, 18 insertions(+), 102 deletions(-) diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/CheckTestNgVersionsIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/CheckTestNgVersionsIT.java index 557e13d11d..f008e7ee15 100644 --- a/surefire-its/src/test/java/org/apache/maven/surefire/its/CheckTestNgVersionsIT.java +++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/CheckTestNgVersionsIT.java @@ -25,7 +25,6 @@ import org.apache.maven.surefire.its.fixture.OutputValidator; import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase; import org.apache.maven.surefire.its.fixture.SurefireLauncher; -import org.junit.Ignore; import org.junit.Test; import static org.junit.Assert.assertEquals; @@ -41,106 +40,25 @@ */ public class CheckTestNgVersionsIT extends SurefireJUnit4IntegrationTestCase { + // TestNG 7.6 and above needs JDK11 @Test - public void test47() { - runTestNgTest("4.7", "jdk15"); + public void test751() { + runTestNgTestWithRunOrder("7.5.1"); } @Test - @Ignore("5.0 and 5.0.1 jars on central are malformed SUREFIRE-375 + MAVENUPLOAD-1024") - public void xXXtest50() { - runTestNgTest("5.0", "jdk15"); + public void test6143() { + runTestNgTestWithRunOrder("6.14.3"); } @Test - @Ignore("5.0 and 5.0.1 jars on central are malformed SUREFIRE-375 + MAVENUPLOAD-1024") - public void xXXtest501() { - runTestNgTest("5.0.1", "jdk15"); + public void test69136() { + runTestNgTestWithRunOrder("6.9.13.6"); } @Test - public void test502() { - runTestNgTest("5.0.2", "jdk15"); - } - - @Test - public void test51() { - runTestNgTest("5.1", "jdk15"); - } - - @Test - public void test55() { - runTestNgTest("5.5", "jdk15"); - } - - @Test - public void test56() { - runTestNgTest("5.6", "jdk15"); - } - - @Test - public void test57() { - runTestNgTest("5.7", "jdk15"); - } - - @Test - public void test58() { - runTestNgTest("5.8", "jdk15"); - } - - @Test - public void test59() { - runTestNgTest("5.9", "jdk15"); - } - - @Test - public void test510() { - runTestNgTest("5.10", "jdk15"); - } - - @Test - public void test511() { - runTestNgTest("5.11", "jdk15"); - } - - @Test - public void test512() { - runTestNgTest("5.12.1"); - } - - @Test - public void test513() { - runTestNgTest("5.13"); - } - - @Test - public void test5131() { - runTestNgTest("5.13.1"); - } - - @Test - public void test514() { - runTestNgTest("5.14"); - } - - @Test - public void test5141() { - runTestNgTest("5.14.1"); - } - - @Test - public void test5142() { - runTestNgTest("5.14.2"); - } - - @Test - public void test60() { - runTestNgTest("6.0"); - } - - @Test - public void test685() { - runTestNgTestWithRunOrder("6.8.5"); + public void test6821() { + runTestNgTestWithRunOrder("6.8.21"); } private void runTestNgTestWithRunOrder(String version) { diff --git a/surefire-its/src/test/resources/junit5-testng/pom.xml b/surefire-its/src/test/resources/junit5-testng/pom.xml index fd383106dc..1e0fe14c6a 100644 --- a/surefire-its/src/test/resources/junit5-testng/pom.xml +++ b/surefire-its/src/test/resources/junit5-testng/pom.xml @@ -39,13 +39,13 @@ org.testng testng - 7.5 + 7.5.1 test org.junit.support testng-engine - 1.0.1 + 1.0.4 test diff --git a/surefire-its/src/test/resources/surefire-1535-parallel-testng/pom.xml b/surefire-its/src/test/resources/surefire-1535-parallel-testng/pom.xml index 18addd70db..284c6a74ad 100644 --- a/surefire-its/src/test/resources/surefire-1535-parallel-testng/pom.xml +++ b/surefire-its/src/test/resources/surefire-1535-parallel-testng/pom.xml @@ -37,7 +37,7 @@ org.testng testng - 6.13.1 + 7.5.1 test diff --git a/surefire-its/src/test/resources/surefire-1733-testng/pom.xml b/surefire-its/src/test/resources/surefire-1733-testng/pom.xml index 630d09dfdc..40dfe67001 100644 --- a/surefire-its/src/test/resources/surefire-1733-testng/pom.xml +++ b/surefire-its/src/test/resources/surefire-1733-testng/pom.xml @@ -36,7 +36,7 @@ org.testng testng - 7.1.0 + 7.5.1 test diff --git a/surefire-its/src/test/resources/testng-740-parallel-without-threadcount/pom.xml b/surefire-its/src/test/resources/testng-740-parallel-without-threadcount/pom.xml index 8d4fd22033..500de01f08 100644 --- a/surefire-its/src/test/resources/testng-740-parallel-without-threadcount/pom.xml +++ b/surefire-its/src/test/resources/testng-740-parallel-without-threadcount/pom.xml @@ -59,7 +59,7 @@ org.testng testng - 7.4.0 + 7.5.1 diff --git a/surefire-its/src/test/resources/testng-740-parallel/pom.xml b/surefire-its/src/test/resources/testng-740-parallel/pom.xml index 867d6adb21..b1a50d59bc 100644 --- a/surefire-its/src/test/resources/testng-740-parallel/pom.xml +++ b/surefire-its/src/test/resources/testng-740-parallel/pom.xml @@ -60,7 +60,7 @@ org.testng testng - 7.4.0 + 7.5.1 diff --git a/surefire-its/src/test/resources/testng-junit4-together/pom.xml b/surefire-its/src/test/resources/testng-junit4-together/pom.xml index e8efb68f59..cbd79c43ee 100644 --- a/surefire-its/src/test/resources/testng-junit4-together/pom.xml +++ b/surefire-its/src/test/resources/testng-junit4-together/pom.xml @@ -42,7 +42,7 @@ org.testng testng - 6.8.5 + 7.5.1 test diff --git a/surefire-providers/surefire-testng-utils/pom.xml b/surefire-providers/surefire-testng-utils/pom.xml index d14d0dae6c..3212163ea8 100644 --- a/surefire-providers/surefire-testng-utils/pom.xml +++ b/surefire-providers/surefire-testng-utils/pom.xml @@ -50,8 +50,7 @@ org.testng testng - 5.10 - jdk15 + 7.5.1 provided diff --git a/surefire-providers/surefire-testng/pom.xml b/surefire-providers/surefire-testng/pom.xml index f0c4bae400..49a0099d58 100644 --- a/surefire-providers/surefire-testng/pom.xml +++ b/surefire-providers/surefire-testng/pom.xml @@ -55,8 +55,7 @@ org.testng testng - 5.10 - jdk15 + 7.5.1 provided