[SUREFIRE] fixed build for unstable TestNG:5.12.1 in IT
Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/4fcd0386 Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/4fcd0386 Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/4fcd0386 Branch: refs/heads/master Commit: 4fcd03864e0508e61dad6010661271b77a2744e5 Parents: b249b9e Author: Tibor17 <[email protected]> Authored: Wed Oct 14 01:27:54 2015 +0200 Committer: Tibor17 <[email protected]> Committed: Wed Oct 14 01:27:54 2015 +0200 ---------------------------------------------------------------------- .../src/test/java/testng/objectfactory/FileHelper.java | 2 +- .../src/test/resources/testng-testRunnerFactory/pom.xml | 4 +++- .../src/test/java/testng/testrunnerfactory/FileHelper.java | 2 +- .../testrunnerfactory/TestNGCustomTestRunnerFactory.java | 6 +++--- 4 files changed, 8 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4fcd0386/surefire-integration-tests/src/test/resources/testng-objectFactory/src/test/java/testng/objectfactory/FileHelper.java ---------------------------------------------------------------------- diff --git a/surefire-integration-tests/src/test/resources/testng-objectFactory/src/test/java/testng/objectfactory/FileHelper.java b/surefire-integration-tests/src/test/resources/testng-objectFactory/src/test/java/testng/objectfactory/FileHelper.java index 3b27106..4db30b6 100644 --- a/surefire-integration-tests/src/test/resources/testng-objectFactory/src/test/java/testng/objectfactory/FileHelper.java +++ b/surefire-integration-tests/src/test/resources/testng-objectFactory/src/test/java/testng/objectfactory/FileHelper.java @@ -10,7 +10,7 @@ public class FileHelper { try { - File target = new File( "./target" ).getCanonicalFile(); + File target = new File( System.getProperty("user.dir"), "target" ).getCanonicalFile(); File listenerOutput = new File( target, fileName ); FileWriter out = new FileWriter( listenerOutput, true ); out.write( content ); http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4fcd0386/surefire-integration-tests/src/test/resources/testng-testRunnerFactory/pom.xml ---------------------------------------------------------------------- diff --git a/surefire-integration-tests/src/test/resources/testng-testRunnerFactory/pom.xml b/surefire-integration-tests/src/test/resources/testng-testRunnerFactory/pom.xml index efe3286..8955a30 100644 --- a/surefire-integration-tests/src/test/resources/testng-testRunnerFactory/pom.xml +++ b/surefire-integration-tests/src/test/resources/testng-testRunnerFactory/pom.xml @@ -42,10 +42,12 @@ -testrunfactory parameter is buggy in 5.13.1 because expects String instead of Class -testrunfactory works in 5.10 but fails on missing testng.css because not generated by TestNG itself. Every next version changed API. + Here API applicable up to 5.12.1. --> <groupId>org.testng</groupId> <artifactId>testng</artifactId> - <version>5.12.1</version> + <version>5.10</version> + <classifier>jdk15</classifier> <scope>test</scope> </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4fcd0386/surefire-integration-tests/src/test/resources/testng-testRunnerFactory/src/test/java/testng/testrunnerfactory/FileHelper.java ---------------------------------------------------------------------- diff --git a/surefire-integration-tests/src/test/resources/testng-testRunnerFactory/src/test/java/testng/testrunnerfactory/FileHelper.java b/surefire-integration-tests/src/test/resources/testng-testRunnerFactory/src/test/java/testng/testrunnerfactory/FileHelper.java index 22063e3..4b998ed 100644 --- a/surefire-integration-tests/src/test/resources/testng-testRunnerFactory/src/test/java/testng/testrunnerfactory/FileHelper.java +++ b/surefire-integration-tests/src/test/resources/testng-testRunnerFactory/src/test/java/testng/testrunnerfactory/FileHelper.java @@ -10,7 +10,7 @@ public class FileHelper { try { - File target = new File( "./target" ).getCanonicalFile(); + File target = new File( System.getProperty("user.dir"), "target" ).getCanonicalFile(); File listenerOutput = new File( target, fileName ); FileWriter out = new FileWriter( listenerOutput, true ); out.write( content ); http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/4fcd0386/surefire-integration-tests/src/test/resources/testng-testRunnerFactory/src/test/java/testng/testrunnerfactory/TestNGCustomTestRunnerFactory.java ---------------------------------------------------------------------- diff --git a/surefire-integration-tests/src/test/resources/testng-testRunnerFactory/src/test/java/testng/testrunnerfactory/TestNGCustomTestRunnerFactory.java b/surefire-integration-tests/src/test/resources/testng-testRunnerFactory/src/test/java/testng/testrunnerfactory/TestNGCustomTestRunnerFactory.java index 7d3cdcd..d52ec96 100644 --- a/surefire-integration-tests/src/test/resources/testng-testRunnerFactory/src/test/java/testng/testrunnerfactory/TestNGCustomTestRunnerFactory.java +++ b/surefire-integration-tests/src/test/resources/testng-testRunnerFactory/src/test/java/testng/testrunnerfactory/TestNGCustomTestRunnerFactory.java @@ -4,7 +4,7 @@ import org.testng.ISuite; import org.testng.ITestRunnerFactory; import org.testng.TestRunner; import org.testng.xml.XmlTest; -import org.testng.IInvokedMethodListener; +//import org.testng.IInvokedMethodListener; import java.util.List; @@ -12,11 +12,11 @@ public class TestNGCustomTestRunnerFactory implements ITestRunnerFactory { - public TestRunner newTestRunner( ISuite suite, XmlTest test, List<IInvokedMethodListener> listeners ) + public TestRunner newTestRunner( ISuite suite, XmlTest test/*, List<IInvokedMethodListener> listeners*/ ) { FileHelper.writeFile( "testrunnerfactory-output.txt", "Instantiated Test Runner for suite:\n\t" + suite + "\nand test:\n\t" + test +"\n\n" ); - return new TestRunner( suite, test, test.skipFailedInvocationCounts(), listeners ); + return new TestRunner( suite, test, test.skipFailedInvocationCounts()/*, listeners*/ ); } }
