You are viewing a plain text version of this content. The canonical link for it is here.
Posted to surefire-commits@maven.apache.org by ol...@apache.org on 2011/02/25 18:02:35 UTC
svn commit: r1074633 [2/2] - in /maven/surefire/trunk: ./
maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/
maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/
maven-surefire-common/src/main/java/org/apache/maven/p...
Propchange: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit44TestMethodPatternIT.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit44TestMethodPatternIT.java
------------------------------------------------------------------------------
svn:executable = *
Propchange: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit44TestMethodPatternIT.java
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Copied: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit44TestSingleMethodIT.java (from r1074594, maven/surefire/trunk/surefire-providers/surefire-junit4/src/main/java/org/apache/maven/surefire/junit4/JUnit4TestSet.java)
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit44TestSingleMethodIT.java?p2=maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit44TestSingleMethodIT.java&p1=maven/surefire/trunk/surefire-providers/surefire-junit4/src/main/java/org/apache/maven/surefire/junit4/JUnit4TestSet.java&r1=1074594&r2=1074633&rev=1074633&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-providers/surefire-junit4/src/main/java/org/apache/maven/surefire/junit4/JUnit4TestSet.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit44TestSingleMethodIT.java Fri Feb 25 17:02:32 2011
@@ -1,5 +1,4 @@
-package org.apache.maven.surefire.junit4;
-
+package org.apache.maven.surefire.its;
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -19,20 +18,18 @@ package org.apache.maven.surefire.junit4
* under the License.
*/
-import org.apache.maven.surefire.testset.TestSetFailedException;
-import org.junit.runner.Request;
-import org.junit.runner.Runner;
-import org.junit.runner.notification.RunNotifier;
-public class JUnit4TestSet
+/**
+ * Test project using -Dtest=mtClass#myMethod
+ *
+ * @author <a href="mailto:olamy@apache.org">Olivier Lamy</a>
+ */
+public class JUnit44TestSingleMethodIT
+ extends AbstractTestSingleMethod
{
-
- public static void execute( Class testClass, RunNotifier fNotifier )
- throws TestSetFailedException
+ public JUnit44TestSingleMethodIT()
{
- Runner junitTestRunner = Request.aClass( testClass ).getRunner();
-
- junitTestRunner.run( fNotifier );
+ super( "/junit44-single-method" );
}
-}
+}
Propchange: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit44TestSingleMethodIT.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit44TestSingleMethodIT.java
------------------------------------------------------------------------------
svn:executable = *
Propchange: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit44TestSingleMethodIT.java
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Copied: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit48TestMethodPatternIT.java (from r1074594, maven/surefire/trunk/surefire-providers/surefire-junit4/src/main/java/org/apache/maven/surefire/junit4/JUnit4TestSet.java)
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit48TestMethodPatternIT.java?p2=maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit48TestMethodPatternIT.java&p1=maven/surefire/trunk/surefire-providers/surefire-junit4/src/main/java/org/apache/maven/surefire/junit4/JUnit4TestSet.java&r1=1074594&r2=1074633&rev=1074633&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-providers/surefire-junit4/src/main/java/org/apache/maven/surefire/junit4/JUnit4TestSet.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit48TestMethodPatternIT.java Fri Feb 25 17:02:32 2011
@@ -1,5 +1,4 @@
-package org.apache.maven.surefire.junit4;
-
+package org.apache.maven.surefire.its;
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -19,20 +18,18 @@ package org.apache.maven.surefire.junit4
* under the License.
*/
-import org.apache.maven.surefire.testset.TestSetFailedException;
-import org.junit.runner.Request;
-import org.junit.runner.Runner;
-import org.junit.runner.notification.RunNotifier;
-public class JUnit4TestSet
+/**
+ * Test project using -Dtest=mtClass#myMethod
+ *
+ * @author <a href="mailto:olamy@apache.org">Olivier Lamy</a>
+ */
+public class JUnit48TestMethodPatternIT
+ extends AsbtractTestMethodPattern
{
-
- public static void execute( Class testClass, RunNotifier fNotifier )
- throws TestSetFailedException
+ public JUnit48TestMethodPatternIT()
{
- Runner junitTestRunner = Request.aClass( testClass ).getRunner();
-
- junitTestRunner.run( fNotifier );
+ super( "/junit48-method-pattern" );
}
-}
+}
Propchange: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit48TestMethodPatternIT.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit48TestMethodPatternIT.java
------------------------------------------------------------------------------
svn:executable = *
Propchange: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit48TestMethodPatternIT.java
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Copied: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit48TestSingleMethodIT.java (from r1074594, maven/surefire/trunk/surefire-providers/surefire-junit4/src/main/java/org/apache/maven/surefire/junit4/JUnit4TestSet.java)
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit48TestSingleMethodIT.java?p2=maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit48TestSingleMethodIT.java&p1=maven/surefire/trunk/surefire-providers/surefire-junit4/src/main/java/org/apache/maven/surefire/junit4/JUnit4TestSet.java&r1=1074594&r2=1074633&rev=1074633&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-providers/surefire-junit4/src/main/java/org/apache/maven/surefire/junit4/JUnit4TestSet.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit48TestSingleMethodIT.java Fri Feb 25 17:02:32 2011
@@ -1,5 +1,4 @@
-package org.apache.maven.surefire.junit4;
-
+package org.apache.maven.surefire.its;
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -19,20 +18,18 @@ package org.apache.maven.surefire.junit4
* under the License.
*/
-import org.apache.maven.surefire.testset.TestSetFailedException;
-import org.junit.runner.Request;
-import org.junit.runner.Runner;
-import org.junit.runner.notification.RunNotifier;
-public class JUnit4TestSet
+/**
+ * Test project using -Dtest=mtClass#myMethod
+ *
+ * @author <a href="mailto:olamy@apache.org">Olivier Lamy</a>
+ */
+public class JUnit48TestSingleMethodIT
+ extends AbstractTestSingleMethod
{
-
- public static void execute( Class testClass, RunNotifier fNotifier )
- throws TestSetFailedException
+ public JUnit48TestSingleMethodIT()
{
- Runner junitTestRunner = Request.aClass( testClass ).getRunner();
-
- junitTestRunner.run( fNotifier );
+ super( "/junit48-single-method" );
}
-}
+}
Propchange: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit48TestSingleMethodIT.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit48TestSingleMethodIT.java
------------------------------------------------------------------------------
svn:executable = *
Propchange: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit48TestSingleMethodIT.java
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit4ForkAlwaysStaticInitPollutionIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit4ForkAlwaysStaticInitPollutionIT.java?rev=1074633&r1=1074632&r2=1074633&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit4ForkAlwaysStaticInitPollutionIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit4ForkAlwaysStaticInitPollutionIT.java Fri Feb 25 17:02:32 2011
@@ -19,10 +19,6 @@ package org.apache.maven.surefire.its;
*/
-import org.apache.maven.it.Verifier;
-import org.apache.maven.it.util.ResourceExtractor;
-
-import java.io.File;
/**
* Test JUnit 4 tests marked with "Ignore" attribute
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Junit4IgnoreIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Junit4IgnoreIT.java?rev=1074633&r1=1074632&r2=1074633&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Junit4IgnoreIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Junit4IgnoreIT.java Fri Feb 25 17:02:32 2011
@@ -18,10 +18,6 @@ package org.apache.maven.surefire.its;
* under the License.
*/
-import org.apache.maven.it.Verifier;
-import org.apache.maven.it.util.ResourceExtractor;
-
-import java.io.File;
/**
* Test JUnit 4 tests marked with "Ignore" attribute
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire224WellFormedXmlFailuresIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire224WellFormedXmlFailuresIT.java?rev=1074633&r1=1074632&r2=1074633&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire224WellFormedXmlFailuresIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire224WellFormedXmlFailuresIT.java Fri Feb 25 17:02:32 2011
@@ -19,14 +19,12 @@ package org.apache.maven.surefire.its;
*/
-import org.apache.maven.it.Verifier;
-import org.apache.maven.it.util.ResourceExtractor;
-import org.apache.maven.plugins.surefire.report.ReportTestCase;
-import org.apache.maven.plugins.surefire.report.ReportTestSuite;
-
import java.io.File;
import java.util.List;
+import org.apache.maven.plugins.surefire.report.ReportTestCase;
+import org.apache.maven.plugins.surefire.report.ReportTestSuite;
+
/**
* Test Surefire-224 (XML test reports are not well-formed when failure message contains quotes)
*
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire260TestWithIdenticalNamesIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire260TestWithIdenticalNamesIT.java?rev=1074633&r1=1074632&r2=1074633&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire260TestWithIdenticalNamesIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire260TestWithIdenticalNamesIT.java Fri Feb 25 17:02:32 2011
@@ -19,14 +19,13 @@ package org.apache.maven.surefire.its;
*/
+import java.io.File;
+import java.net.URI;
+
import com.gargoylesoftware.htmlunit.WebClient;
import com.gargoylesoftware.htmlunit.html.HtmlAnchor;
import com.gargoylesoftware.htmlunit.html.HtmlDivision;
import com.gargoylesoftware.htmlunit.html.HtmlPage;
-import com.gargoylesoftware.htmlunit.html.HtmlSpan;
-
-import java.io.File;
-import java.net.URI;
/**
* Test Surefire-570 Multiple report directories
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire500PuzzlingErrorIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire500PuzzlingErrorIT.java?rev=1074633&r1=1074632&r2=1074633&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire500PuzzlingErrorIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire500PuzzlingErrorIT.java Fri Feb 25 17:02:32 2011
@@ -20,10 +20,6 @@ package org.apache.maven.surefire.its;
import java.io.File;
-import java.util.List;
-
-import junit.framework.Assert;
-import org.apache.maven.it.VerificationException;
/**
* SUREFIRE-500 Asserts correct error handling for the "odd" surefire-500 (and 625) issues.
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/SurefireVerifierTestClass.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/SurefireVerifierTestClass.java?rev=1074633&r1=1074632&r2=1074633&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/SurefireVerifierTestClass.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/SurefireVerifierTestClass.java Fri Feb 25 17:02:32 2011
@@ -227,7 +227,6 @@ public abstract class SurefireVerifierTe
}
public void verifyTextInLog(String text) throws VerificationException
-
{
verifier.verifyTextInLog(text);
}
Copied: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgTestMethodPatternIT.java (from r1074594, maven/surefire/trunk/surefire-providers/surefire-junit4/src/main/java/org/apache/maven/surefire/junit4/JUnit4TestSet.java)
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgTestMethodPatternIT.java?p2=maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgTestMethodPatternIT.java&p1=maven/surefire/trunk/surefire-providers/surefire-junit4/src/main/java/org/apache/maven/surefire/junit4/JUnit4TestSet.java&r1=1074594&r2=1074633&rev=1074633&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-providers/surefire-junit4/src/main/java/org/apache/maven/surefire/junit4/JUnit4TestSet.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgTestMethodPatternIT.java Fri Feb 25 17:02:32 2011
@@ -1,5 +1,4 @@
-package org.apache.maven.surefire.junit4;
-
+package org.apache.maven.surefire.its;
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -19,20 +18,18 @@ package org.apache.maven.surefire.junit4
* under the License.
*/
-import org.apache.maven.surefire.testset.TestSetFailedException;
-import org.junit.runner.Request;
-import org.junit.runner.Runner;
-import org.junit.runner.notification.RunNotifier;
-public class JUnit4TestSet
+/**
+ * Test project using -Dtest=mtClass#myMethod*
+ *
+ * @author <a href="mailto:olamy@apache.org">Olivier Lamy</a>
+ */
+public class TestNgTestMethodPatternIT
+ extends AsbtractTestMethodPattern
{
-
- public static void execute( Class testClass, RunNotifier fNotifier )
- throws TestSetFailedException
+ public TestNgTestMethodPatternIT()
{
- Runner junitTestRunner = Request.aClass( testClass ).getRunner();
-
- junitTestRunner.run( fNotifier );
+ super( "/testng-method-pattern" );
}
-}
+}
Propchange: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgTestMethodPatternIT.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgTestMethodPatternIT.java
------------------------------------------------------------------------------
svn:executable = *
Propchange: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgTestMethodPatternIT.java
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Copied: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgTestSingleMethod5149IT.java (from r1074594, maven/surefire/trunk/surefire-providers/surefire-junit4/src/main/java/org/apache/maven/surefire/junit4/JUnit4TestSet.java)
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgTestSingleMethod5149IT.java?p2=maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgTestSingleMethod5149IT.java&p1=maven/surefire/trunk/surefire-providers/surefire-junit4/src/main/java/org/apache/maven/surefire/junit4/JUnit4TestSet.java&r1=1074594&r2=1074633&rev=1074633&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-providers/surefire-junit4/src/main/java/org/apache/maven/surefire/junit4/JUnit4TestSet.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgTestSingleMethod5149IT.java Fri Feb 25 17:02:32 2011
@@ -1,5 +1,4 @@
-package org.apache.maven.surefire.junit4;
-
+package org.apache.maven.surefire.its;
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -19,20 +18,18 @@ package org.apache.maven.surefire.junit4
* under the License.
*/
-import org.apache.maven.surefire.testset.TestSetFailedException;
-import org.junit.runner.Request;
-import org.junit.runner.Runner;
-import org.junit.runner.notification.RunNotifier;
-public class JUnit4TestSet
+/**
+ * Test project using -Dtest=mtClass#myMethod
+ *
+ * @author <a href="mailto:olamy@apache.org">Olivier Lamy</a>
+ */
+public class TestNgTestSingleMethod5149IT
+ extends AbstractTestSingleMethod
{
-
- public static void execute( Class testClass, RunNotifier fNotifier )
- throws TestSetFailedException
+ public TestNgTestSingleMethod5149IT()
{
- Runner junitTestRunner = Request.aClass( testClass ).getRunner();
-
- junitTestRunner.run( fNotifier );
+ super( "/testng-single-method-5-14-9" );
}
-}
+}
Propchange: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgTestSingleMethod5149IT.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgTestSingleMethod5149IT.java
------------------------------------------------------------------------------
svn:executable = *
Propchange: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgTestSingleMethod5149IT.java
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Copied: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgTestSingleMethodIT.java (from r1074594, maven/surefire/trunk/surefire-providers/surefire-junit4/src/main/java/org/apache/maven/surefire/junit4/JUnit4TestSet.java)
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgTestSingleMethodIT.java?p2=maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgTestSingleMethodIT.java&p1=maven/surefire/trunk/surefire-providers/surefire-junit4/src/main/java/org/apache/maven/surefire/junit4/JUnit4TestSet.java&r1=1074594&r2=1074633&rev=1074633&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-providers/surefire-junit4/src/main/java/org/apache/maven/surefire/junit4/JUnit4TestSet.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgTestSingleMethodIT.java Fri Feb 25 17:02:32 2011
@@ -1,5 +1,4 @@
-package org.apache.maven.surefire.junit4;
-
+package org.apache.maven.surefire.its;
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -19,20 +18,18 @@ package org.apache.maven.surefire.junit4
* under the License.
*/
-import org.apache.maven.surefire.testset.TestSetFailedException;
-import org.junit.runner.Request;
-import org.junit.runner.Runner;
-import org.junit.runner.notification.RunNotifier;
-public class JUnit4TestSet
+/**
+ * Test project using -Dtest=mtClass#myMethod
+ *
+ * @author <a href="mailto:olamy@apache.org">Olivier Lamy</a>
+ */
+public class TestNgTestSingleMethodIT
+ extends AbstractTestSingleMethod
{
-
- public static void execute( Class testClass, RunNotifier fNotifier )
- throws TestSetFailedException
+ public TestNgTestSingleMethodIT()
{
- Runner junitTestRunner = Request.aClass( testClass ).getRunner();
-
- junitTestRunner.run( fNotifier );
+ super( "/testng-single-method" );
}
-}
+}
Propchange: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgTestSingleMethodIT.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgTestSingleMethodIT.java
------------------------------------------------------------------------------
svn:executable = *
Propchange: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgTestSingleMethodIT.java
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/WorkingDirectoryIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/WorkingDirectoryIT.java?rev=1074633&r1=1074632&r2=1074633&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/WorkingDirectoryIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/WorkingDirectoryIT.java Fri Feb 25 17:02:32 2011
@@ -18,16 +18,15 @@ package org.apache.maven.surefire.its;
* under the License.
*/
-import org.apache.maven.it.Verifier;
-import org.apache.maven.it.util.ResourceExtractor;
-
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
-import java.util.ArrayList;
import java.util.List;
import java.util.Properties;
+import org.apache.maven.it.Verifier;
+import org.apache.maven.it.util.ResourceExtractor;
+
/**
* Test working directory configuration, SUREFIRE-416
*
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit4/src/test/java/junit4/BasicTest.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit4/src/test/java/junit4/BasicTest.java?rev=1074633&r1=1074632&r2=1074633&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit4/src/test/java/junit4/BasicTest.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit4/src/test/java/junit4/BasicTest.java Fri Feb 25 17:02:32 2011
@@ -34,6 +34,7 @@ public class BasicTest
{
Assert.assertTrue( "setUp was not called", setUpCalled );
}
+
@AfterClass
public static void oneTimeTearDown()
Added: maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit44-method-pattern/pom.xml
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit44-method-pattern/pom.xml?rev=1074633&view=auto
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit44-method-pattern/pom.xml (added)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit44-method-pattern/pom.xml Fri Feb 25 17:02:32 2011
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ 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.
+ -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.apache.maven.plugins.surefire</groupId>
+ <artifactId>junit4</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <name>Test for JUnit 4</name>
+
+
+ <properties>
+ <junitVersion>4.4</junitVersion>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>${junitVersion}</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>${surefire.version}</version>
+ <configuration>
+ <test>BasicTest#testSuccess*</test>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
Propchange: maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit44-method-pattern/pom.xml
------------------------------------------------------------------------------
svn:executable = *
Copied: maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit44-method-pattern/src/test/java/junit4/BasicTest.java (from r1074594, maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit4/src/test/java/junit4/BasicTest.java)
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit44-method-pattern/src/test/java/junit4/BasicTest.java?p2=maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit44-method-pattern/src/test/java/junit4/BasicTest.java&p1=maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit4/src/test/java/junit4/BasicTest.java&r1=1074594&r2=1074633&rev=1074633&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit4/src/test/java/junit4/BasicTest.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit44-method-pattern/src/test/java/junit4/BasicTest.java Fri Feb 25 17:02:32 2011
@@ -34,6 +34,19 @@ public class BasicTest
{
Assert.assertTrue( "setUp was not called", setUpCalled );
}
+
+
+ @Test
+ public void testSuccessOne()
+ {
+ Assert.assertTrue( true );
+ }
+
+ @Test
+ public void testSuccessTwo()
+ {
+ Assert.assertTrue( true );
+ }
@AfterClass
public static void oneTimeTearDown()
Propchange: maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit44-method-pattern/src/test/java/junit4/BasicTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit44-method-pattern/src/test/java/junit4/BasicTest.java
------------------------------------------------------------------------------
svn:executable = *
Added: maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit44-single-method/pom.xml
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit44-single-method/pom.xml?rev=1074633&view=auto
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit44-single-method/pom.xml (added)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit44-single-method/pom.xml Fri Feb 25 17:02:32 2011
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ 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.
+ -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.apache.maven.plugins.surefire</groupId>
+ <artifactId>junit4</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <name>Test for JUnit 4</name>
+
+
+ <properties>
+ <junitVersion>4.4</junitVersion>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>${junitVersion}</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>${surefire.version}</version>
+ <configuration>
+ <test>BasicTest#testSuccessOne</test>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
Propchange: maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit44-single-method/pom.xml
------------------------------------------------------------------------------
svn:executable = *
Copied: maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit44-single-method/src/test/java/junit4/BasicTest.java (from r1074594, maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit4/src/test/java/junit4/BasicTest.java)
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit44-single-method/src/test/java/junit4/BasicTest.java?p2=maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit44-single-method/src/test/java/junit4/BasicTest.java&p1=maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit4/src/test/java/junit4/BasicTest.java&r1=1074594&r2=1074633&rev=1074633&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit4/src/test/java/junit4/BasicTest.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit44-single-method/src/test/java/junit4/BasicTest.java Fri Feb 25 17:02:32 2011
@@ -34,6 +34,13 @@ public class BasicTest
{
Assert.assertTrue( "setUp was not called", setUpCalled );
}
+
+
+ @Test
+ public void testSuccessOne()
+ {
+ Assert.assertTrue( true );
+ }
@AfterClass
public static void oneTimeTearDown()
Propchange: maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit44-single-method/src/test/java/junit4/BasicTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit44-single-method/src/test/java/junit4/BasicTest.java
------------------------------------------------------------------------------
svn:executable = *
Added: maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit48-method-pattern/pom.xml
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit48-method-pattern/pom.xml?rev=1074633&view=auto
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit48-method-pattern/pom.xml (added)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit48-method-pattern/pom.xml Fri Feb 25 17:02:32 2011
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ 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.
+ -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.apache.maven.plugins.surefire</groupId>
+ <artifactId>junit4</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <name>Test for JUnit 4.8.1</name>
+
+
+ <properties>
+ <junitVersion>4.8.1</junitVersion>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>${junitVersion}</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>${surefire.version}</version>
+ <configuration>
+ <test>BasicTest#testSuccess*</test>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
Propchange: maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit48-method-pattern/pom.xml
------------------------------------------------------------------------------
svn:executable = *
Copied: maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit48-method-pattern/src/test/java/junit4/BasicTest.java (from r1074594, maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit4/src/test/java/junit4/BasicTest.java)
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit48-method-pattern/src/test/java/junit4/BasicTest.java?p2=maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit48-method-pattern/src/test/java/junit4/BasicTest.java&p1=maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit4/src/test/java/junit4/BasicTest.java&r1=1074594&r2=1074633&rev=1074633&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit4/src/test/java/junit4/BasicTest.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit48-method-pattern/src/test/java/junit4/BasicTest.java Fri Feb 25 17:02:32 2011
@@ -34,6 +34,19 @@ public class BasicTest
{
Assert.assertTrue( "setUp was not called", setUpCalled );
}
+
+
+ @Test
+ public void testSuccessOne()
+ {
+ Assert.assertTrue( true );
+ }
+
+ @Test
+ public void testSuccessTwo()
+ {
+ Assert.assertTrue( true );
+ }
@AfterClass
public static void oneTimeTearDown()
Propchange: maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit48-method-pattern/src/test/java/junit4/BasicTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit48-method-pattern/src/test/java/junit4/BasicTest.java
------------------------------------------------------------------------------
svn:executable = *
Added: maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit48-single-method/pom.xml
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit48-single-method/pom.xml?rev=1074633&view=auto
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit48-single-method/pom.xml (added)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit48-single-method/pom.xml Fri Feb 25 17:02:32 2011
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ 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.
+ -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.apache.maven.plugins.surefire</groupId>
+ <artifactId>junit4</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <name>Test for JUnit 4.8.1</name>
+
+
+ <properties>
+ <junitVersion>4.8.1</junitVersion>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>${junitVersion}</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>${surefire.version}</version>
+ <configuration>
+ <test>BasicTest#testSuccessOne</test>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
Propchange: maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit48-single-method/pom.xml
------------------------------------------------------------------------------
svn:executable = *
Copied: maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit48-single-method/src/test/java/junit4/BasicTest.java (from r1074594, maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit4/src/test/java/junit4/BasicTest.java)
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit48-single-method/src/test/java/junit4/BasicTest.java?p2=maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit48-single-method/src/test/java/junit4/BasicTest.java&p1=maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit4/src/test/java/junit4/BasicTest.java&r1=1074594&r2=1074633&rev=1074633&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit4/src/test/java/junit4/BasicTest.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit48-single-method/src/test/java/junit4/BasicTest.java Fri Feb 25 17:02:32 2011
@@ -34,6 +34,13 @@ public class BasicTest
{
Assert.assertTrue( "setUp was not called", setUpCalled );
}
+
+
+ @Test
+ public void testSuccessOne()
+ {
+ Assert.assertTrue( true );
+ }
@AfterClass
public static void oneTimeTearDown()
Propchange: maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit48-single-method/src/test/java/junit4/BasicTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit48-single-method/src/test/java/junit4/BasicTest.java
------------------------------------------------------------------------------
svn:executable = *
Copied: maven/surefire/trunk/surefire-integration-tests/src/test/resources/testng-method-pattern/pom.xml (from r1074594, maven/surefire/trunk/surefire-providers/surefire-testng/pom.xml)
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/resources/testng-method-pattern/pom.xml?p2=maven/surefire/trunk/surefire-integration-tests/src/test/resources/testng-method-pattern/pom.xml&p1=maven/surefire/trunk/surefire-providers/surefire-testng/pom.xml&r1=1074594&r2=1074633&rev=1074633&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-providers/surefire-testng/pom.xml (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/resources/testng-method-pattern/pom.xml Fri Feb 25 17:02:32 2011
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
<!--
~ Licensed to the Apache Software Foundation (ASF) under one
~ or more contributor license agreements. See the NOTICE file
@@ -17,92 +18,73 @@
~ under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.maven.surefire</groupId>
- <artifactId>surefire-providers</artifactId>
- <version>2.7.3-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
-
- <artifactId>surefire-testng</artifactId>
-
- <name>SureFire TestNG Runner</name>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-artifact</artifactId>
- <version>2.0</version>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>provided</scope>
- </dependency>
- </dependencies>
+ <groupId>org.apache.maven.plugins.surefire</groupId>
+ <artifactId>junit4</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <name>Test for Testng</name>
- <build>
- <resources>
- <resource>
- <directory>src/main/resources/META-INF</directory>
- <targetPath>META-INF</targetPath>
- </resource>
- </resources>
- <plugins>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <fork>false</fork>
- <compilerVersion>1.4</compilerVersion>
- <source>1.4</source>
- <target>1.4</target>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <!-- DGF There are no tests in this project currently, and this
- resolves SUREFIRE-414 -->
- <skipExec>true</skipExec>
- </configuration>
- </plugin>
- </plugins>
- </build>
+ <properties>
+ <testNgVersion>5.7</testNgVersion>
+ <testNgClassifier>jdk15</testNgClassifier>
+ </properties>
- <!-- TODO: do we include both? Or just 1.5? No need for profile -->
<profiles>
<profile>
- <id>jdk14</id>
+ <id>testng-old</id>
<activation>
- <jdk>1.4</jdk>
+ <property><name>testNgClassifier</name></property>
</activation>
<dependencies>
<dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
- <version>5.7</version>
- <classifier>jdk14</classifier>
+ <version>${testNgVersion}</version>
+ <classifier>${testNgClassifier}</classifier>
</dependency>
</dependencies>
</profile>
<profile>
- <id>jdk15</id>
+ <id>testng-new</id>
<activation>
- <jdk>!1.4</jdk>
+ <property><name>!testNgClassifier</name></property>
</activation>
<dependencies>
<dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
- <version>5.7</version>
- <classifier>jdk15</classifier>
+ <version>${testNgVersion}</version>
</dependency>
</dependencies>
</profile>
- </profiles>
+ </profiles>
+
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>2.3.2</version>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>${surefire.version}</version>
+ <configuration>
+ <test>BasicTest#testSuccess*</test>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
</project>
Propchange: maven/surefire/trunk/surefire-integration-tests/src/test/resources/testng-method-pattern/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/surefire/trunk/surefire-integration-tests/src/test/resources/testng-method-pattern/pom.xml
------------------------------------------------------------------------------
svn:executable = *
Propchange: maven/surefire/trunk/surefire-integration-tests/src/test/resources/testng-method-pattern/pom.xml
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Copied: maven/surefire/trunk/surefire-integration-tests/src/test/resources/testng-method-pattern/src/test/java/testng/BasicTest.java (from r1074594, maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit4/src/test/java/junit4/BasicTest.java)
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/resources/testng-method-pattern/src/test/java/testng/BasicTest.java?p2=maven/surefire/trunk/surefire-integration-tests/src/test/resources/testng-method-pattern/src/test/java/testng/BasicTest.java&p1=maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit4/src/test/java/junit4/BasicTest.java&r1=1074594&r2=1074633&rev=1074633&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit4/src/test/java/junit4/BasicTest.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/resources/testng-method-pattern/src/test/java/testng/BasicTest.java Fri Feb 25 17:02:32 2011
@@ -1,10 +1,6 @@
-package junit4;
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-
+package testng;
+import org.testng.annotations.*;
+import org.testng.Assert;
public class BasicTest
{
@@ -13,7 +9,7 @@ public class BasicTest
private static boolean tearDownCalled = false;
- @Before
+ @BeforeTest
public void setUp()
{
setUpCalled = true;
@@ -21,7 +17,7 @@ public class BasicTest
System.out.println( "Called setUp" );
}
- @After
+ @AfterTest
public void tearDown()
{
setUpCalled = false;
@@ -32,8 +28,21 @@ public class BasicTest
@Test
public void testSetUp()
{
- Assert.assertTrue( "setUp was not called", setUpCalled );
+ Assert.assertTrue( setUpCalled );
}
+
+
+ @Test
+ public void testSuccessOne()
+ {
+ Assert.assertTrue( true );
+ }
+
+ @Test
+ public void testSuccessTwo()
+ {
+ Assert.assertTrue( true );
+ }
@AfterClass
public static void oneTimeTearDown()
Propchange: maven/surefire/trunk/surefire-integration-tests/src/test/resources/testng-method-pattern/src/test/java/testng/BasicTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/surefire/trunk/surefire-integration-tests/src/test/resources/testng-method-pattern/src/test/java/testng/BasicTest.java
------------------------------------------------------------------------------
svn:executable = *
Added: maven/surefire/trunk/surefire-integration-tests/src/test/resources/testng-single-method-5-14-9/pom.xml
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/resources/testng-single-method-5-14-9/pom.xml?rev=1074633&view=auto
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/resources/testng-single-method-5-14-9/pom.xml (added)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/resources/testng-single-method-5-14-9/pom.xml Fri Feb 25 17:02:32 2011
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ 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.
+ -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.apache.maven.plugins.surefire</groupId>
+ <artifactId>junit4</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <name>Test for Testng</name>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.testng</groupId>
+ <artifactId>testng</artifactId>
+ <version>5.14.9</version>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>2.3.2</version>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>${surefire.version}</version>
+ <configuration>
+ <test>BasicTest#testSuccessOne</test>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
Propchange: maven/surefire/trunk/surefire-integration-tests/src/test/resources/testng-single-method-5-14-9/pom.xml
------------------------------------------------------------------------------
svn:executable = *
Copied: maven/surefire/trunk/surefire-integration-tests/src/test/resources/testng-single-method-5-14-9/src/test/java/testng/BasicTest.java (from r1074594, maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit4/src/test/java/junit4/BasicTest.java)
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/resources/testng-single-method-5-14-9/src/test/java/testng/BasicTest.java?p2=maven/surefire/trunk/surefire-integration-tests/src/test/resources/testng-single-method-5-14-9/src/test/java/testng/BasicTest.java&p1=maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit4/src/test/java/junit4/BasicTest.java&r1=1074594&r2=1074633&rev=1074633&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit4/src/test/java/junit4/BasicTest.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/resources/testng-single-method-5-14-9/src/test/java/testng/BasicTest.java Fri Feb 25 17:02:32 2011
@@ -1,10 +1,6 @@
-package junit4;
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-
+package testng;
+import org.testng.annotations.*;
+import org.testng.Assert;
public class BasicTest
{
@@ -13,7 +9,7 @@ public class BasicTest
private static boolean tearDownCalled = false;
- @Before
+ @BeforeTest
public void setUp()
{
setUpCalled = true;
@@ -21,7 +17,7 @@ public class BasicTest
System.out.println( "Called setUp" );
}
- @After
+ @AfterTest
public void tearDown()
{
setUpCalled = false;
@@ -32,8 +28,21 @@ public class BasicTest
@Test
public void testSetUp()
{
- Assert.assertTrue( "setUp was not called", setUpCalled );
+ Assert.assertTrue( setUpCalled );
}
+
+
+ @Test
+ public void testSuccessOne()
+ {
+ Assert.assertTrue( true );
+ }
+
+ @Test
+ public void testSuccessTwo()
+ {
+ Assert.assertTrue( true );
+ }
@AfterClass
public static void oneTimeTearDown()
Propchange: maven/surefire/trunk/surefire-integration-tests/src/test/resources/testng-single-method-5-14-9/src/test/java/testng/BasicTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/surefire/trunk/surefire-integration-tests/src/test/resources/testng-single-method-5-14-9/src/test/java/testng/BasicTest.java
------------------------------------------------------------------------------
svn:executable = *
Copied: maven/surefire/trunk/surefire-integration-tests/src/test/resources/testng-single-method/pom.xml (from r1074594, maven/surefire/trunk/surefire-providers/surefire-testng/pom.xml)
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/resources/testng-single-method/pom.xml?p2=maven/surefire/trunk/surefire-integration-tests/src/test/resources/testng-single-method/pom.xml&p1=maven/surefire/trunk/surefire-providers/surefire-testng/pom.xml&r1=1074594&r2=1074633&rev=1074633&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-providers/surefire-testng/pom.xml (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/resources/testng-single-method/pom.xml Fri Feb 25 17:02:32 2011
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
<!--
~ Licensed to the Apache Software Foundation (ASF) under one
~ or more contributor license agreements. See the NOTICE file
@@ -17,92 +18,73 @@
~ under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.maven.surefire</groupId>
- <artifactId>surefire-providers</artifactId>
- <version>2.7.3-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
-
- <artifactId>surefire-testng</artifactId>
-
- <name>SureFire TestNG Runner</name>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-artifact</artifactId>
- <version>2.0</version>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>provided</scope>
- </dependency>
- </dependencies>
+ <groupId>org.apache.maven.plugins.surefire</groupId>
+ <artifactId>junit4</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <name>Test for Testng</name>
- <build>
- <resources>
- <resource>
- <directory>src/main/resources/META-INF</directory>
- <targetPath>META-INF</targetPath>
- </resource>
- </resources>
- <plugins>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <fork>false</fork>
- <compilerVersion>1.4</compilerVersion>
- <source>1.4</source>
- <target>1.4</target>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <!-- DGF There are no tests in this project currently, and this
- resolves SUREFIRE-414 -->
- <skipExec>true</skipExec>
- </configuration>
- </plugin>
- </plugins>
- </build>
+ <properties>
+ <testNgVersion>5.7</testNgVersion>
+ <testNgClassifier>jdk15</testNgClassifier>
+ </properties>
- <!-- TODO: do we include both? Or just 1.5? No need for profile -->
<profiles>
<profile>
- <id>jdk14</id>
+ <id>testng-old</id>
<activation>
- <jdk>1.4</jdk>
+ <property><name>testNgClassifier</name></property>
</activation>
<dependencies>
<dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
- <version>5.7</version>
- <classifier>jdk14</classifier>
+ <version>${testNgVersion}</version>
+ <classifier>${testNgClassifier}</classifier>
</dependency>
</dependencies>
</profile>
<profile>
- <id>jdk15</id>
+ <id>testng-new</id>
<activation>
- <jdk>!1.4</jdk>
+ <property><name>!testNgClassifier</name></property>
</activation>
<dependencies>
<dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
- <version>5.7</version>
- <classifier>jdk15</classifier>
+ <version>${testNgVersion}</version>
</dependency>
</dependencies>
</profile>
- </profiles>
+ </profiles>
+
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>2.3.2</version>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>${surefire.version}</version>
+ <configuration>
+ <test>BasicTest#testSuccessOne</test>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
</project>
Propchange: maven/surefire/trunk/surefire-integration-tests/src/test/resources/testng-single-method/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/surefire/trunk/surefire-integration-tests/src/test/resources/testng-single-method/pom.xml
------------------------------------------------------------------------------
svn:executable = *
Propchange: maven/surefire/trunk/surefire-integration-tests/src/test/resources/testng-single-method/pom.xml
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Copied: maven/surefire/trunk/surefire-integration-tests/src/test/resources/testng-single-method/src/test/java/testng/BasicTest.java (from r1074594, maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit4/src/test/java/junit4/BasicTest.java)
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/resources/testng-single-method/src/test/java/testng/BasicTest.java?p2=maven/surefire/trunk/surefire-integration-tests/src/test/resources/testng-single-method/src/test/java/testng/BasicTest.java&p1=maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit4/src/test/java/junit4/BasicTest.java&r1=1074594&r2=1074633&rev=1074633&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit4/src/test/java/junit4/BasicTest.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/resources/testng-single-method/src/test/java/testng/BasicTest.java Fri Feb 25 17:02:32 2011
@@ -1,10 +1,6 @@
-package junit4;
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-
+package testng;
+import org.testng.annotations.*;
+import org.testng.Assert;
public class BasicTest
{
@@ -13,7 +9,7 @@ public class BasicTest
private static boolean tearDownCalled = false;
- @Before
+ @BeforeTest
public void setUp()
{
setUpCalled = true;
@@ -21,7 +17,7 @@ public class BasicTest
System.out.println( "Called setUp" );
}
- @After
+ @AfterTest
public void tearDown()
{
setUpCalled = false;
@@ -32,8 +28,21 @@ public class BasicTest
@Test
public void testSetUp()
{
- Assert.assertTrue( "setUp was not called", setUpCalled );
+ Assert.assertTrue( setUpCalled );
}
+
+
+ @Test
+ public void testSuccessOne()
+ {
+ Assert.assertTrue( true );
+ }
+
+ @Test
+ public void testSuccessTwo()
+ {
+ Assert.assertTrue( true );
+ }
@AfterClass
public static void oneTimeTearDown()
Propchange: maven/surefire/trunk/surefire-integration-tests/src/test/resources/testng-single-method/src/test/java/testng/BasicTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/surefire/trunk/surefire-integration-tests/src/test/resources/testng-single-method/src/test/java/testng/BasicTest.java
------------------------------------------------------------------------------
svn:executable = *
Modified: maven/surefire/trunk/surefire-providers/pom.xml
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-providers/pom.xml?rev=1074633&r1=1074632&r2=1074633&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-providers/pom.xml (original)
+++ maven/surefire/trunk/surefire-providers/pom.xml Fri Feb 25 17:02:32 2011
@@ -39,6 +39,7 @@
<module>surefire-junit3</module>
<module>surefire-junit4</module>
<module>surefire-junit47</module>
+ <module>surefire-testng-utils</module>
<module>surefire-testng</module>
</modules>
Modified: maven/surefire/trunk/surefire-providers/surefire-junit4/src/main/java/org/apache/maven/surefire/junit4/JUnit4Provider.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-providers/surefire-junit4/src/main/java/org/apache/maven/surefire/junit4/JUnit4Provider.java?rev=1074633&r1=1074632&r2=1074633&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-providers/surefire-junit4/src/main/java/org/apache/maven/surefire/junit4/JUnit4Provider.java (original)
+++ maven/surefire/trunk/surefire-providers/surefire-junit4/src/main/java/org/apache/maven/surefire/junit4/JUnit4Provider.java Fri Feb 25 17:02:32 2011
@@ -63,6 +63,8 @@ public class JUnit4Provider
private final List<RunListener> customRunListeners;
private final JUnit4TestChecker jUnit4TestChecker;
+
+ private final String requestedTestMethod;
private TestsToRun testsToRun;
@@ -74,6 +76,7 @@ public class JUnit4Provider
customRunListeners = JUnit4RunListenerFactory.
createCustomListeners( booterParameters.getProviderProperties().getProperty( "listener" ) );
jUnit4TestChecker = new JUnit4TestChecker( testClassLoader );
+ requestedTestMethod = booterParameters.getTestRequest().getRequestedTestMethod();
}
@@ -112,7 +115,7 @@ public class JUnit4Provider
try
{
- JUnit4TestSet.execute( clazz, listeners );
+ JUnit4TestSet.execute( clazz, listeners, this.requestedTestMethod );
}
catch ( TestSetFailedException e )
{
Modified: maven/surefire/trunk/surefire-providers/surefire-junit4/src/main/java/org/apache/maven/surefire/junit4/JUnit4TestSet.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-providers/surefire-junit4/src/main/java/org/apache/maven/surefire/junit4/JUnit4TestSet.java?rev=1074633&r1=1074632&r2=1074633&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-providers/surefire-junit4/src/main/java/org/apache/maven/surefire/junit4/JUnit4TestSet.java (original)
+++ maven/surefire/trunk/surefire-providers/surefire-junit4/src/main/java/org/apache/maven/surefire/junit4/JUnit4TestSet.java Fri Feb 25 17:02:32 2011
@@ -19,7 +19,11 @@ package org.apache.maven.surefire.junit4
* under the License.
*/
+import java.lang.reflect.Method;
+
import org.apache.maven.surefire.testset.TestSetFailedException;
+import org.apache.maven.surefire.util.internal.SelectorUtils;
+import org.apache.maven.surefire.util.internal.StringUtils;
import org.junit.runner.Request;
import org.junit.runner.Runner;
import org.junit.runner.notification.RunNotifier;
@@ -27,11 +31,25 @@ import org.junit.runner.notification.Run
public class JUnit4TestSet
{
- public static void execute( Class testClass, RunNotifier fNotifier )
+ public static void execute( Class testClass, RunNotifier fNotifier, String testMethod )
throws TestSetFailedException
{
+ if ( !StringUtils.isBlank( testMethod ) )
+ {
+ Method[] methods = testClass.getMethods();
+ for (int i = 0,size = methods.length;i<size;i++)
+ {
+ if (SelectorUtils.match( testMethod, methods[i].getName() ) )
+ {
+ Runner junitTestRunner = Request.method( testClass, methods[i].getName() ).getRunner();
+ junitTestRunner.run( fNotifier );
+ }
+ }
+ return;
+ }
+
Runner junitTestRunner = Request.aClass( testClass ).getRunner();
-
+
junitTestRunner.run( fNotifier );
}
}
Added: maven/surefire/trunk/surefire-providers/surefire-testng-utils/pom.xml
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-providers/surefire-testng-utils/pom.xml?rev=1074633&view=auto
==============================================================================
--- maven/surefire/trunk/surefire-providers/surefire-testng-utils/pom.xml (added)
+++ maven/surefire/trunk/surefire-providers/surefire-testng-utils/pom.xml Fri Feb 25 17:02:32 2011
@@ -0,0 +1,57 @@
+<?xml version="1.0"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.maven.surefire</groupId>
+ <artifactId>surefire-providers</artifactId>
+ <version>2.7.3-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <artifactId>surefire-testng-utils</artifactId>
+
+ <name>SureFire TestNG Utils</name>
+
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.2</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+
+ <!-- TODO: do we include both? Or just 1.5? No need for profile -->
+ <profiles>
+ <profile>
+ <id>jdk14</id>
+ <activation>
+ <jdk>1.4</jdk>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>org.testng</groupId>
+ <artifactId>testng</artifactId>
+ <version>5.7</version>
+ <classifier>jdk14</classifier>
+ </dependency>
+ </dependencies>
+ </profile>
+ <profile>
+ <id>jdk15</id>
+ <activation>
+ <jdk>!1.4</jdk>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>org.testng</groupId>
+ <artifactId>testng</artifactId>
+ <version>5.7</version>
+ <classifier>jdk15</classifier>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
+
+</project>
Propchange: maven/surefire/trunk/surefire-providers/surefire-testng-utils/pom.xml
------------------------------------------------------------------------------
svn:executable = *
Copied: maven/surefire/trunk/surefire-providers/surefire-testng-utils/src/main/java/org/apache/maven/surefire/testng/utils/MethodSelector.java (from r1074594, maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire500PuzzlingErrorIT.java)
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-providers/surefire-testng-utils/src/main/java/org/apache/maven/surefire/testng/utils/MethodSelector.java?p2=maven/surefire/trunk/surefire-providers/surefire-testng-utils/src/main/java/org/apache/maven/surefire/testng/utils/MethodSelector.java&p1=maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire500PuzzlingErrorIT.java&r1=1074594&r2=1074633&rev=1074633&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Surefire500PuzzlingErrorIT.java (original)
+++ maven/surefire/trunk/surefire-providers/surefire-testng-utils/src/main/java/org/apache/maven/surefire/testng/utils/MethodSelector.java Fri Feb 25 17:02:32 2011
@@ -1,4 +1,5 @@
-package org.apache.maven.surefire.its;
+package org.apache.maven.surefire.testng.utils;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -18,34 +19,36 @@ package org.apache.maven.surefire.its;
* under the License.
*/
-
-import java.io.File;
import java.util.List;
-import junit.framework.Assert;
-import org.apache.maven.it.VerificationException;
+import org.apache.maven.surefire.util.internal.SelectorUtils;
+import org.testng.IMethodSelector;
+import org.testng.IMethodSelectorContext;
+import org.testng.ITestNGMethod;
/**
- * SUREFIRE-500 Asserts correct error handling for the "odd" surefire-500 (and 625) issues.
+ * For internal use only
+ * @author Olivier Lamy
+ * @since 2.7.3
*
- * @author Kristian Rosenvold
*/
-public class Surefire500PuzzlingErrorIT
- extends SurefireVerifierTestClass
+public class MethodSelector implements IMethodSelector
{
- public Surefire500PuzzlingErrorIT()
+
+ private static String METHOD_NAME = null;
+
+ public void setTestMethods( List arg0 )
{
- super( "/surefire-500-puzzling-error" );
+ // noop
}
-
- public void testBuildFailingWhenErrors()
- throws Exception
+
+ public boolean includeMethod( IMethodSelectorContext context, ITestNGMethod testngMethod, boolean isTestMethod )
{
- failNever();
- executeTest();
-
- File surefireReportsFile = getSurefireReportsFile( "surefire500.ExplodingTest.txt" );
- assertContainsText( surefireReportsFile, "java.lang.NoClassDefFoundError: whoops!" );
+ return SelectorUtils.match( METHOD_NAME, testngMethod.getMethodName() );
}
-
-}
\ No newline at end of file
+
+ public static void setMethodName(String methodName)
+ {
+ METHOD_NAME = methodName;
+ }
+}
Propchange: maven/surefire/trunk/surefire-providers/surefire-testng-utils/src/main/java/org/apache/maven/surefire/testng/utils/MethodSelector.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/surefire/trunk/surefire-providers/surefire-testng-utils/src/main/java/org/apache/maven/surefire/testng/utils/MethodSelector.java
------------------------------------------------------------------------------
svn:executable = *
Modified: maven/surefire/trunk/surefire-providers/surefire-testng/pom.xml
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-providers/surefire-testng/pom.xml?rev=1074633&r1=1074632&r2=1074633&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-providers/surefire-testng/pom.xml (original)
+++ maven/surefire/trunk/surefire-providers/surefire-testng/pom.xml Fri Feb 25 17:02:32 2011
@@ -38,9 +38,14 @@
<version>2.0</version>
</dependency>
<dependency>
+ <groupId>org.apache.maven.surefire</groupId>
+ <artifactId>surefire-testng-utils</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>3.8.1</version>
+ <version>3.8.2</version>
<scope>provided</scope>
</dependency>
</dependencies>
Modified: maven/surefire/trunk/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGDirectoryTestSuite.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGDirectoryTestSuite.java?rev=1074633&r1=1074632&r2=1074633&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGDirectoryTestSuite.java (original)
+++ maven/surefire/trunk/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGDirectoryTestSuite.java Fri Feb 25 17:02:32 2011
@@ -64,9 +64,11 @@ public class TestNGDirectoryTestSuite
private SortedMap testSets;
private final DirectoryScanner surefireDirectoryScanner;
+
+ private String testMethodPattern;
public TestNGDirectoryTestSuite( File basedir, ArrayList includes, ArrayList excludes, String testSourceDirectory,
- String artifactVersion, Properties confOptions, File reportsDirectory )
+ String artifactVersion, Properties confOptions, File reportsDirectory, String testMethodPattern )
{
this.surefireDirectoryScanner = new DefaultDirectoryScanner( basedir, includes, excludes, "filesystem" );
@@ -76,6 +78,7 @@ public class TestNGDirectoryTestSuite
this.testSourceDirectory = testSourceDirectory;
this.reportsDirectory = reportsDirectory;
this.version = new DefaultArtifactVersion( artifactVersion );
+ this.testMethodPattern = testMethodPattern;
}
public void execute( TestsToRun testsToRun, ReporterFactory reporterManagerFactory )
@@ -97,7 +100,7 @@ public class TestNGDirectoryTestSuite
startTestSuite( reporter, this );
TestNGExecutor.run( new Class[]{ (Class) testsToRun.iterator().next() }, this.testSourceDirectory, this.options,
- this.version, reporter, this, reportsDirectory );
+ this.version, reporter, this, reportsDirectory, testMethodPattern );
finishTestSuite( reporter, this );
}
@@ -144,7 +147,7 @@ public class TestNGDirectoryTestSuite
Class[] testClasses = (Class[]) testNgTestClasses.toArray( new Class[testNgTestClasses.size()] );
TestNGExecutor.run( testClasses, this.testSourceDirectory, this.options, this.version, reporterManager, this,
- testNgReportsDirectory );
+ testNgReportsDirectory, testMethodPattern );
if ( junitTestClasses.size() > 0 )
{
@@ -160,7 +163,7 @@ public class TestNGDirectoryTestSuite
junitOptions.put( "junit", Boolean.TRUE );
TestNGExecutor.run( testClasses, this.testSourceDirectory, junitOptions, this.version, reporterManager,
- this, junitReportsDirectory );
+ this, junitReportsDirectory, testMethodPattern );
}
finishTestSuite( reporterManager, this );
@@ -185,7 +188,7 @@ public class TestNGDirectoryTestSuite
startTestSuite( reporter, this );
TestNGExecutor.run( new Class[]{ testSet.getTestClass() }, this.testSourceDirectory, this.options, this.version,
- reporter, this, reportsDirectory );
+ reporter, this, reportsDirectory, testMethodPattern );
finishTestSuite( reporter, this );
}
Modified: maven/surefire/trunk/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGExecutor.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGExecutor.java?rev=1074633&r1=1074632&r2=1074633&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGExecutor.java (original)
+++ maven/surefire/trunk/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGExecutor.java Fri Feb 25 17:02:32 2011
@@ -19,6 +19,13 @@ package org.apache.maven.surefire.testng
* under the License.
*/
+import java.io.File;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.List;
+import java.util.Map;
+
import org.apache.maven.artifact.versioning.ArtifactVersion;
import org.apache.maven.artifact.versioning.InvalidVersionSpecificationException;
import org.apache.maven.artifact.versioning.VersionRange;
@@ -28,13 +35,8 @@ import org.apache.maven.surefire.testng.
import org.apache.maven.surefire.testng.conf.TestNG52Configurator;
import org.apache.maven.surefire.testng.conf.TestNGMapConfigurator;
import org.apache.maven.surefire.testset.TestSetFailedException;
-
-import java.io.File;
-import java.lang.reflect.Constructor;
-import java.util.List;
-import java.util.Map;
-
import org.apache.maven.surefire.util.NestedRuntimeException;
+import org.apache.maven.surefire.util.internal.StringUtils;
import org.testng.TestNG;
/**
@@ -45,15 +47,22 @@ import org.testng.TestNG;
*/
public class TestNGExecutor
{
+
+
private TestNGExecutor()
{
+ // noop
}
public static void run( Class[] testClasses, String testSourceDirectory, Map options, ArtifactVersion version,
- Reporter reportManager, TestNgTestSuite suite, File reportsDirectory )
+ Reporter reportManager, TestNgTestSuite suite, File reportsDirectory, final String methodNamePattern )
throws TestSetFailedException
{
TestNG testng = new TestNG( true );
+ if (!StringUtils.isBlank( methodNamePattern ))
+ {
+ applyMethodNameFiltering( testng, methodNamePattern );
+ }
Configurator configurator = getConfigurator( version );
configurator.configure( testng, options );
postConfigure( testng, testSourceDirectory, reportManager, suite, reportsDirectory );
@@ -61,6 +70,46 @@ public class TestNGExecutor
testng.run();
}
+ private static void applyMethodNameFiltering(TestNG testng, String methodNamePattern)
+ throws TestSetFailedException
+ {
+ // the class is available in the testClassPath
+ String clazzName = "org.apache.maven.surefire.testng.utils.MethodSelector";
+ // looks to need a high value
+ testng.addMethodSelector( clazzName , 10000 );
+ try
+ {
+ Class clazz = Class.forName( clazzName );
+
+ Method method = clazz.getMethod( "setMethodName", new Class[]{String.class} );
+ method.invoke( null, new Object[]{methodNamePattern} );
+ }
+ catch ( ClassNotFoundException e )
+ {
+ throw new TestSetFailedException(e.getMessage(), e);
+ }
+ catch ( SecurityException e )
+ {
+ throw new TestSetFailedException(e.getMessage(), e);
+ }
+ catch ( NoSuchMethodException e )
+ {
+ throw new TestSetFailedException(e.getMessage(), e);
+ }
+ catch ( IllegalArgumentException e )
+ {
+ throw new TestSetFailedException(e.getMessage(), e);
+ }
+ catch ( IllegalAccessException e )
+ {
+ throw new TestSetFailedException(e.getMessage(), e);
+ }
+ catch ( InvocationTargetException e )
+ {
+ throw new TestSetFailedException(e.getMessage(), e);
+ }
+ }
+
public static void run( List suiteFiles, String testSourceDirectory, Map options, ArtifactVersion version,
Reporter reportManager, TestNgTestSuite suite, File reportsDirectory )
throws TestSetFailedException
@@ -145,4 +194,5 @@ public class TestNGExecutor
return new TestNGReporter( reportManager );
}
}
+
}
Modified: maven/surefire/trunk/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGProvider.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGProvider.java?rev=1074633&r1=1074632&r2=1074633&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGProvider.java (original)
+++ maven/surefire/trunk/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGProvider.java Fri Feb 25 17:02:32 2011
@@ -129,7 +129,7 @@ public class TestNGProvider
new ArrayList( directoryScannerParameters.getExcludes() ),
testRequest.getTestSourceDirectory().toString(),
testArtifactInfo.getVersion(), providerProperties,
- reporterConfiguration.getReportsDirectory() );
+ reporterConfiguration.getReportsDirectory(), testRequest.getRequestedTestMethod() );
}
private TestNGXmlTestSuite getXmlSuite()
Re: svn commit: r1074633 [2/2] - in /maven/surefire/trunk: ./ maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/
maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/ maven-surefire-common/src/main/java/org/apache/maven/p...
Posted by Benjamin Bentmann <be...@udo.edu>.
Hi Olivier,
> Propchange: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit44TestMethodPatternIT.java
> ------------------------------------------------------------------------------
> svn:eol-style = native
>
> Propchange: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit44TestMethodPatternIT.java
> ------------------------------------------------------------------------------
> svn:executable = *
>
> Propchange: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit44TestMethodPatternIT.java
> ------------------------------------------------------------------------------
> svn:keywords = "Author Date Id Revision"
Can you please double-check your SVN client config [0]? Java files are
not executable and the svn keywords mustn't use quotes to be properly
parsed.
Benjamin
[0] http://maven.apache.org/developers/svn-eol-style.txt