diff --git a/README.md b/README.md index 12750a1..66fd65a 100644 --- a/README.md +++ b/README.md @@ -34,5 +34,6 @@ Don't forget to add a TestNG `test` dependency to your build file, as it is not ```java repositories = List.of(MAVEN_CENTRAL); -scope(test).include(dependency("org.testng", "testng", version(7, 10, 0))); +scope(test).include(dependency("org.testng", "testng", version(7, 9, 0))); + ``` diff --git a/checkcliargs.sh b/checkcliargs.sh index 77e8ec5..0bad85a 100755 --- a/checkcliargs.sh +++ b/checkcliargs.sh @@ -7,10 +7,6 @@ TMPOLD=/tmp/checkcliargs-old java -cp "lib/test/*" $MAIN >$TMPNEW java -cp "examples/lib/test/*" $MAIN >$TMPOLD -if [ "$1" = "-v" ]; then - code --wait --diff $TMPOLD $TMPNEW -else - diff $TMPOLD $TMPNEW -fi +diff $TMPOLD $TMPNEW rm -rf $TMPNEW $TMPOLD diff --git a/examples/lib/bld/bld-wrapper.properties b/examples/lib/bld/bld-wrapper.properties index 3e2cccf..281f0e5 100644 --- a/examples/lib/bld/bld-wrapper.properties +++ b/examples/lib/bld/bld-wrapper.properties @@ -1,6 +1,6 @@ bld.downloadExtensionJavadoc=false bld.downloadExtensionSources=true -bld.extensions=com.uwyn.rife2:bld-testng:0.9.6 +bld.extensions=com.uwyn.rife2:bld-testng:0.9.6-SNAPSHOT bld.extension.jacoco=com.uwyn.rife2:bld-jacoco-report:0.9.5 bld.repositories=MAVEN_LOCAL,MAVEN_CENTRAL,RIFE2_SNAPSHOTS,RIFE2_RELEASES bld.downloadLocation= diff --git a/examples/src/bld/java/com/example/ExamplesBuild.java b/examples/src/bld/java/com/example/ExamplesBuild.java index 265b245..dd67bf7 100644 --- a/examples/src/bld/java/com/example/ExamplesBuild.java +++ b/examples/src/bld/java/com/example/ExamplesBuild.java @@ -30,13 +30,12 @@ public class ExamplesBuild extends BaseProject { version = version(0, 1, 0); javaRelease = 17; - downloadSources = true; autoDownloadPurge = true; repositories = List.of(MAVEN_CENTRAL); - scope(test).include(dependency("org.testng", "testng", version(7, 10, 0))); + scope(test).include(dependency("org.testng", "testng", version(7, 9, 0))); } public static void main(String[] args) { diff --git a/src/bld/java/rife/bld/extension/TestNgOperationBuild.java b/src/bld/java/rife/bld/extension/TestNgOperationBuild.java index a452d9c..e4c3235 100644 --- a/src/bld/java/rife/bld/extension/TestNgOperationBuild.java +++ b/src/bld/java/rife/bld/extension/TestNgOperationBuild.java @@ -34,7 +34,7 @@ public class TestNgOperationBuild extends Project { public TestNgOperationBuild() { pkg = "rife.bld.extension"; name = "bld-testng"; - version = version(0, 9, 6); + version = version(0, 9, 6, "SNAPSHOT"); javaRelease = 17; downloadSources = true; @@ -47,7 +47,7 @@ public class TestNgOperationBuild extends Project { .include(dependency("com.uwyn.rife2", "bld", version(1, 9, 0))); scope(test) - .include(dependency("org.testng", "testng", version(7, 10, 0))) + .include(dependency("org.testng", "testng", version(7, 9, 0))) .include(dependency("org.junit.jupiter", "junit-jupiter", version(5, 10, 2))) .include(dependency("org.junit.platform", "junit-platform-console-standalone", version(1, 10, 2))) .include(dependency("org.assertj", "assertj-core", version(3, 25, 3))); diff --git a/src/main/java/rife/bld/extension/TestNgOperation.java b/src/main/java/rife/bld/extension/TestNgOperation.java index d72a48c..f8bb7db 100644 --- a/src/main/java/rife/bld/extension/TestNgOperation.java +++ b/src/main/java/rife/bld/extension/TestNgOperation.java @@ -232,8 +232,7 @@ public class TestNgOperation extends TestOperation } /** - * Should TestNG generate results on a per suite basis by creating a sub directory for each suite and dumping - * results into it. + * Should TestNG consider failures in Data Providers as test failures. * *

Default is {@code false}

. * @@ -346,29 +345,6 @@ public class TestNgOperation extends TestOperation return this; } - /** - * An implementation of {@code ListenerComparator} that will be used by TestNG to determine order of execution for - * listeners. - * - * @param listenerComparator the listener comparator - * @return this operation instance - */ - public TestNgOperation listenerComparator(String listenerComparator) { - options.put("-listenercomparator", listenerComparator); - return this; - } - - /** - * The factory used to create TestNG listeners. - * - * @param listenerFactory the listener factory - * @return this operation instance - */ - public TestNgOperation listenerFactory(String listenerFactory) { - options.put("-listenerfactory", listenerFactory); - return this; - } - /** * Set the Level of verbosity. * @@ -453,18 +429,6 @@ public class TestNgOperation extends TestOperation return this; } - /** - * Fully qualified class name that implements {@code org.testng.ITestObjectFactory} which can be used to create - * test class and listener instances. - * - * @param objectFactory the object factory - * @return this operation instance - */ - public TestNgOperation objectFactory(String objectFactory) { - options.put("-objectfactory", objectFactory); - return this; - } - /** * The list of {@code .class} files or class names implementing {@code ITestRunnerFactory}. * diff --git a/src/test/java/rife/bld/extension/TestNgOperationTest.java b/src/test/java/rife/bld/extension/TestNgOperationTest.java index f216e13..3bdc424 100644 --- a/src/test/java/rife/bld/extension/TestNgOperationTest.java +++ b/src/test/java/rife/bld/extension/TestNgOperationTest.java @@ -17,7 +17,7 @@ package rife.bld.extension; import org.junit.jupiter.api.Test; -import rife.bld.Project; +import rife.bld.Project; // NOPMD import rife.bld.operations.exceptions.ExitStatusException; import java.util.List;