You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ti...@apache.org on 2015/10/14 01:28:38 UTC
[1/4] maven-surefire git commit: [SUREFIRE] refactoring
Repository: maven-surefire
Updated Branches:
refs/heads/master 14ab8a348 -> 4fcd03864
[SUREFIRE] refactoring
Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/cdc3aef8
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/cdc3aef8
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/cdc3aef8
Branch: refs/heads/master
Commit: cdc3aef89e6d253b11aa3950bf716efc31eb74fc
Parents: 14ab8a3
Author: Tibor17 <ti...@lycos.com>
Authored: Wed Oct 14 00:17:05 2015 +0200
Committer: Tibor17 <ti...@lycos.com>
Committed: Wed Oct 14 00:17:05 2015 +0200
----------------------------------------------------------------------
.../testng-parallel-suites/src/test/resources/testng1.xml | 2 +-
.../testng-parallel-suites/src/test/resources/testng2.xml | 2 +-
.../src/test/resources/testng-suite-xml/src/test-data/testng1.xml | 2 +-
.../src/test/resources/testng-suite-xml/src/test-data/testng2.xml | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/cdc3aef8/surefire-integration-tests/src/test/resources/testng-parallel-suites/src/test/resources/testng1.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/testng-parallel-suites/src/test/resources/testng1.xml b/surefire-integration-tests/src/test/resources/testng-parallel-suites/src/test/resources/testng1.xml
index 1655967..ac62eca 100644
--- a/surefire-integration-tests/src/test/resources/testng-parallel-suites/src/test/resources/testng1.xml
+++ b/surefire-integration-tests/src/test/resources/testng-parallel-suites/src/test/resources/testng1.xml
@@ -21,7 +21,7 @@
<suite name="Suite 1 Test" verbose="4">
- <test name="Sample Test">
+ <test name="Sample Test 1">
<classes>
<class name="testng.suiteXml.TestNGSuiteTest"/>
</classes>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/cdc3aef8/surefire-integration-tests/src/test/resources/testng-parallel-suites/src/test/resources/testng2.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/testng-parallel-suites/src/test/resources/testng2.xml b/surefire-integration-tests/src/test/resources/testng-parallel-suites/src/test/resources/testng2.xml
index 3f0749a..4036c21 100644
--- a/surefire-integration-tests/src/test/resources/testng-parallel-suites/src/test/resources/testng2.xml
+++ b/surefire-integration-tests/src/test/resources/testng-parallel-suites/src/test/resources/testng2.xml
@@ -21,7 +21,7 @@
<suite name="Suite 2 Test" verbose="4">
- <test name="Sample Test">
+ <test name="Sample Test 2">
<classes>
<class name="testng.suiteXml.TestNGSuiteTest"/>
</classes>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/cdc3aef8/surefire-integration-tests/src/test/resources/testng-suite-xml/src/test-data/testng1.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/testng-suite-xml/src/test-data/testng1.xml b/surefire-integration-tests/src/test/resources/testng-suite-xml/src/test-data/testng1.xml
index 1655967..c1e38f3 100644
--- a/surefire-integration-tests/src/test/resources/testng-suite-xml/src/test-data/testng1.xml
+++ b/surefire-integration-tests/src/test/resources/testng-suite-xml/src/test-data/testng1.xml
@@ -21,7 +21,7 @@
<suite name="Suite 1 Test" verbose="4">
- <test name="Sample Test">
+ <test name="Sample Test 2">
<classes>
<class name="testng.suiteXml.TestNGSuiteTest"/>
</classes>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/cdc3aef8/surefire-integration-tests/src/test/resources/testng-suite-xml/src/test-data/testng2.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/testng-suite-xml/src/test-data/testng2.xml b/surefire-integration-tests/src/test/resources/testng-suite-xml/src/test-data/testng2.xml
index 3f0749a..4036c21 100644
--- a/surefire-integration-tests/src/test/resources/testng-suite-xml/src/test-data/testng2.xml
+++ b/surefire-integration-tests/src/test/resources/testng-suite-xml/src/test-data/testng2.xml
@@ -21,7 +21,7 @@
<suite name="Suite 2 Test" verbose="4">
- <test name="Sample Test">
+ <test name="Sample Test 2">
<classes>
<class name="testng.suiteXml.TestNGSuiteTest"/>
</classes>
[2/4] maven-surefire git commit: [SUREFIRE] improved testng version
range
Posted by ti...@apache.org.
[SUREFIRE] improved testng version range
Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/6494afbf
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/6494afbf
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/6494afbf
Branch: refs/heads/master
Commit: 6494afbf865d81e81a05f137c2debf9ba84cbed0
Parents: cdc3aef
Author: Tibor17 <ti...@lycos.com>
Authored: Wed Oct 14 00:29:10 2015 +0200
Committer: Tibor17 <ti...@lycos.com>
Committed: Wed Oct 14 00:29:10 2015 +0200
----------------------------------------------------------------------
.../apache/maven/plugin/surefire/AbstractSurefireMojo.java | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/6494afbf/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
----------------------------------------------------------------------
diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
index 2a77415..05fee27 100644
--- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
@@ -1113,22 +1113,22 @@ public abstract class AbstractSurefireMojo
{
try
{
- VersionRange range = VersionRange.createFromVersionSpec( "[4.7,5.1]" );
+ VersionRange range = VersionRange.createFromVersionSpec( "[4.7,5.2)" );
if ( range.containsVersion( version ) )
{
return "org.apache.maven.surefire.testng.conf.TestNG4751Configurator";
}
- range = VersionRange.createFromVersionSpec( "[5.2]" );
+ range = VersionRange.createFromVersionSpec( "[5.2,5.3)" );
if ( range.containsVersion( version ) )
{
return "org.apache.maven.surefire.testng.conf.TestNG52Configurator";
}
- range = VersionRange.createFromVersionSpec( "[5.3,5.9]" );
+ range = VersionRange.createFromVersionSpec( "[5.3,5.10)" );
if ( range.containsVersion( version ) )
{
return "org.apache.maven.surefire.testng.conf.TestNGMapConfigurator";
}
- range = VersionRange.createFromVersionSpec( "[5.10,6.4]" );
+ range = VersionRange.createFromVersionSpec( "[5.10,6.5)" );
if ( range.containsVersion( version ) )
{
return "org.apache.maven.surefire.testng.conf.TestNG510Configurator";
[3/4] maven-surefire git commit: [SUREFIRE] TestNG652ConfiguratorTest
should become TestNG60ConfiguratorTest due to -objectfactory and
-testrunfactory
Posted by ti...@apache.org.
[SUREFIRE] TestNG652ConfiguratorTest should become TestNG60ConfiguratorTest due to -objectfactory and -testrunfactory
Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/b249b9e0
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/b249b9e0
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/b249b9e0
Branch: refs/heads/master
Commit: b249b9e048e3285c84ca921ca83749170e6e5069
Parents: 6494afb
Author: Tibor17 <ti...@lycos.com>
Authored: Wed Oct 14 00:44:39 2015 +0200
Committer: Tibor17 <ti...@lycos.com>
Committed: Wed Oct 14 00:44:39 2015 +0200
----------------------------------------------------------------------
.../plugin/surefire/AbstractSurefireMojo.java | 4 +-
.../testng/conf/TestNG60Configurator.java | 53 ++++++++++++++++++++
.../testng/conf/TestNG652Configurator.java | 52 -------------------
.../testng/conf/TestNG60ConfiguratorTest.java | 44 ++++++++++++++++
.../testng/conf/TestNG652ConfiguratorTest.java | 44 ----------------
5 files changed, 99 insertions(+), 98 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b249b9e0/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
----------------------------------------------------------------------
diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
index 05fee27..6159263 100644
--- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
@@ -1133,10 +1133,10 @@ public abstract class AbstractSurefireMojo
{
return "org.apache.maven.surefire.testng.conf.TestNG510Configurator";
}
- range = VersionRange.createFromVersionSpec( "[6.5,)" );
+ range = VersionRange.createFromVersionSpec( "[6.0,)" );
if ( range.containsVersion( version ) )
{
- return "org.apache.maven.surefire.testng.conf.TestNG652Configurator";
+ return "org.apache.maven.surefire.testng.conf.TestNG60Configurator";
}
throw new MojoExecutionException( "Unknown TestNG version " + version );
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b249b9e0/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/TestNG60Configurator.java
----------------------------------------------------------------------
diff --git a/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/TestNG60Configurator.java b/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/TestNG60Configurator.java
new file mode 100644
index 0000000..531d85e
--- /dev/null
+++ b/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/TestNG60Configurator.java
@@ -0,0 +1,53 @@
+package org.apache.maven.surefire.testng.conf;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import java.util.Map;
+import java.util.Map.Entry;
+import org.apache.maven.surefire.testset.TestSetFailedException;
+
+/**
+ * TestNG 6.0 configurator. Changed objectFactory type to String.
+ * Configuring -objectfactory and -testrunfactory.
+ *
+ * @author <a href='mailto:marvin[at]marvinformatics[dot]com'>Marvin Froeder</a>
+ * @since 2.13
+ */
+public class TestNG60Configurator
+ extends TestNG510Configurator
+{
+
+ Map<String, Object> getConvertedOptions( Map<String, String> options )
+ throws TestSetFailedException
+ {
+ Map<String, Object> convertedOptions = super.getConvertedOptions( options );
+ for ( Entry<String, Object> entry : convertedOptions.entrySet() )
+ {
+ String key = entry.getKey();
+ if ( "-objectfactory".equals( key ) || "-testrunfactory".equals( key ) )
+ {
+ Class value = (Class) entry.getValue();
+ convertedOptions.put( key, value.getName() );
+ break;
+ }
+ }
+ return convertedOptions;
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b249b9e0/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/TestNG652Configurator.java
----------------------------------------------------------------------
diff --git a/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/TestNG652Configurator.java b/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/TestNG652Configurator.java
deleted file mode 100644
index e963659..0000000
--- a/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/TestNG652Configurator.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package org.apache.maven.surefire.testng.conf;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import java.util.Map;
-import java.util.Map.Entry;
-import org.apache.maven.surefire.testset.TestSetFailedException;
-
-/**
- * TestNG 6.5.2 configurator. Changed objectFactory type to String
- *
- * @author <a href='mailto:marvin[at]marvinformatics[dot]com'>Marvin Froeder</a>
- * @since 2.13
- */
-public class TestNG652Configurator
- extends TestNG510Configurator
-{
-
- Map<String, Object> getConvertedOptions( Map<String, String> options )
- throws TestSetFailedException
- {
- Map<String, Object> convertedOptions = super.getConvertedOptions( options );
- for ( Entry<String, Object> entry : convertedOptions.entrySet() )
- {
- String key = entry.getKey();
- if ( "-objectfactory".equals( key ) )
- {
- Class value = (Class) entry.getValue();
- convertedOptions.put( key, value.getName() );
- break;
- }
- }
- return convertedOptions;
- }
-}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b249b9e0/surefire-providers/surefire-testng/src/test/java/org/apache/maven/surefire/testng/conf/TestNG60ConfiguratorTest.java
----------------------------------------------------------------------
diff --git a/surefire-providers/surefire-testng/src/test/java/org/apache/maven/surefire/testng/conf/TestNG60ConfiguratorTest.java b/surefire-providers/surefire-testng/src/test/java/org/apache/maven/surefire/testng/conf/TestNG60ConfiguratorTest.java
new file mode 100644
index 0000000..2e3af91
--- /dev/null
+++ b/surefire-providers/surefire-testng/src/test/java/org/apache/maven/surefire/testng/conf/TestNG60ConfiguratorTest.java
@@ -0,0 +1,44 @@
+package org.apache.maven.surefire.testng.conf;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import java.util.HashMap;
+import java.util.Map;
+
+import junit.framework.TestCase;
+
+/**
+ * @author <a href='mailto:marvin[at]marvinformatics[dot]com'>Marvin Froeder</a>
+ */
+public class TestNG60ConfiguratorTest
+ extends TestCase
+{
+
+ public void testGetConvertedOptions()
+ throws Exception
+ {
+ TestNGMapConfigurator testNGMapConfigurator = new TestNG60Configurator();
+ Map raw = new HashMap();
+ raw.put( "objectfactory", "java.lang.String" );
+ Map convertedOptions = testNGMapConfigurator.getConvertedOptions( raw );
+ String objectfactory = (String) convertedOptions.get( "-objectfactory" );
+ assertNotNull( objectfactory );
+ }
+}
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/b249b9e0/surefire-providers/surefire-testng/src/test/java/org/apache/maven/surefire/testng/conf/TestNG652ConfiguratorTest.java
----------------------------------------------------------------------
diff --git a/surefire-providers/surefire-testng/src/test/java/org/apache/maven/surefire/testng/conf/TestNG652ConfiguratorTest.java b/surefire-providers/surefire-testng/src/test/java/org/apache/maven/surefire/testng/conf/TestNG652ConfiguratorTest.java
deleted file mode 100644
index 6a0c583..0000000
--- a/surefire-providers/surefire-testng/src/test/java/org/apache/maven/surefire/testng/conf/TestNG652ConfiguratorTest.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package org.apache.maven.surefire.testng.conf;
-
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import java.util.HashMap;
-import java.util.Map;
-
-import junit.framework.TestCase;
-
-/**
- * @author <a href='mailto:marvin[at]marvinformatics[dot]com'>Marvin Froeder</a>
- */
-public class TestNG652ConfiguratorTest
- extends TestCase
-{
-
- public void testGetConvertedOptions()
- throws Exception
- {
- TestNGMapConfigurator testNGMapConfigurator = new TestNG652Configurator();
- Map raw = new HashMap();
- raw.put( "objectfactory", "java.lang.String" );
- Map convertedOptions = testNGMapConfigurator.getConvertedOptions( raw );
- String objectfactory = (String) convertedOptions.get( "-objectfactory" );
- assertNotNull( objectfactory );
- }
-}
[4/4] maven-surefire git commit: [SUREFIRE] fixed build for unstable
TestNG:5.12.1 in IT
Posted by ti...@apache.org.
[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 <ti...@lycos.com>
Authored: Wed Oct 14 01:27:54 2015 +0200
Committer: Tibor17 <ti...@lycos.com>
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*/ );
}
}