Author: krosenvold
Date: Sat Jul 21 18:32:25 2012
New Revision: 1364144
URL: http://svn.apache.org/viewvc?rev=1364144&view=rev
Log:
[SUREFIRE-847] Regression reported in issue
While this is technically a testng bug, we aim to please. Fixed with IT
Added:
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire847AdditionalFailureIT.java
(with props)
maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-847-testngfail/
maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-847-testngfail/README.txt
maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-847-testngfail/pom.xml
maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-847-testngfail/src/
maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-847-testngfail/src/test/
maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-847-testngfail/src/test/java/
maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-847-testngfail/src/test/java/org/
maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-847-testngfail/src/test/java/org/codehaus/
maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-847-testngfail/src/test/java/org/codehaus/SomeFailedTest.java
maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-847-testngfail/src/test/java/org/codehaus/SomePassedTest.java
maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-847-testngfail/src/test/resources/
maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-847-testngfail/src/test/resources/suite.xml
Modified:
maven/surefire/trunk/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/TestNGMapConfigurator.java
Added:
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire847AdditionalFailureIT.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire847AdditionalFailureIT.java?rev=1364144&view=auto
==============================================================================
---
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire847AdditionalFailureIT.java
(added)
+++
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire847AdditionalFailureIT.java
Sat Jul 21 18:32:25 2012
@@ -0,0 +1,15 @@
+package org.apache.maven.surefire.its.jiras;
+
+import org.apache.maven.surefire.its.fixture.OutputValidator;
+import org.apache.maven.surefire.its.fixture.SurefireIntegrationTestCase;
+import org.apache.maven.surefire.its.fixture.SurefireLauncher;
+
+public class Surefire847AdditionalFailureIT
+ extends SurefireIntegrationTestCase
+{
+ public void testJUnitRunCategoryAB()
+ {
+ unpack( "surefire-847-testngfail" ).setTestToRun(
"org.codehaus.SomePassedTest")
+ .executeTest().verifyErrorFreeLog();
+ }
+}
Propchange:
maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/jiras/Surefire847AdditionalFailureIT.java
------------------------------------------------------------------------------
svn:executable = *
Added:
maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-847-testngfail/README.txt
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-847-testngfail/README.txt?rev=1364144&view=auto
==============================================================================
---
maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-847-testngfail/README.txt
(added)
+++
maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-847-testngfail/README.txt
Sat Jul 21 18:32:25 2012
@@ -0,0 +1,2 @@
+start project
+mvn clean test -Dtest=org.codehaus.SomeFailedTest
\ No newline at end of file
Added:
maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-847-testngfail/pom.xml
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-847-testngfail/pom.xml?rev=1364144&view=auto
==============================================================================
---
maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-847-testngfail/pom.xml
(added)
+++
maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-847-testngfail/pom.xml
Sat Jul 21 18:32:25 2012
@@ -0,0 +1,48 @@
+<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";>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.codehaus.jira</groupId>
+ <artifactId>surefire-847</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ <dependencies>
+ <dependency>
+ <groupId>com.google.inject</groupId>
+ <artifactId>guice</artifactId>
+ <version>3.0</version>
+ <classifier>no_aop</classifier>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.testng</groupId>
+ <artifactId>testng</artifactId>
+ <version>6.5.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>2.3.2</version>
+ <configuration>
+ <source>1.6</source>
+ <target>1.6</target>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.13-SNAPSHOT</version>
+ <configuration>
+ <trimStackTrace>false</trimStackTrace>
+
<workingDirectory>${project.build.directory}/test-classes</workingDirectory>
+ </configuration>
+ </plugin>
+
+ </plugins>
+ </build>
+ <properties>
+
<defaultSuiteFile>${basedir}/src/test/resources/suite.xml</defaultSuiteFile>
+ </properties>
+</project>
Added:
maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-847-testngfail/src/test/java/org/codehaus/SomeFailedTest.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-847-testngfail/src/test/java/org/codehaus/SomeFailedTest.java?rev=1364144&view=auto
==============================================================================
---
maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-847-testngfail/src/test/java/org/codehaus/SomeFailedTest.java
(added)
+++
maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-847-testngfail/src/test/java/org/codehaus/SomeFailedTest.java
Sat Jul 21 18:32:25 2012
@@ -0,0 +1,12 @@
+package org.codehaus;
+import org.testng.Assert;
+import org.testng.annotations.Test;
+
+@Test
+public class SomeFailedTest {
+
+ @Test
+ public void failedTest() {
+ Assert.assertFalse(true);
+ }
+}
Added:
maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-847-testngfail/src/test/java/org/codehaus/SomePassedTest.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-847-testngfail/src/test/java/org/codehaus/SomePassedTest.java?rev=1364144&view=auto
==============================================================================
---
maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-847-testngfail/src/test/java/org/codehaus/SomePassedTest.java
(added)
+++
maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-847-testngfail/src/test/java/org/codehaus/SomePassedTest.java
Sat Jul 21 18:32:25 2012
@@ -0,0 +1,14 @@
+package org.codehaus;
+import org.testng.Assert;
+import org.testng.annotations.Test;
+
+
+public class SomePassedTest {
+
+ @Test
+ public void passedTestA(){
+ Assert.assertTrue(true);
+ }
+
+
+}
Added:
maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-847-testngfail/src/test/resources/suite.xml
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-847-testngfail/src/test/resources/suite.xml?rev=1364144&view=auto
==============================================================================
---
maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-847-testngfail/src/test/resources/suite.xml
(added)
+++
maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-847-testngfail/src/test/resources/suite.xml
Sat Jul 21 18:32:25 2012
@@ -0,0 +1,8 @@
+<suite name="BaseSuite" verbose="1" parallel="classes"
+ thread-count="2">
+ <test name="SUREFIRE-847" preserve-order="false">
+ <packages>
+ <package name="org.codehaus"/>
+ </packages>
+ </test>
+</suite>
Modified:
maven/surefire/trunk/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/TestNGMapConfigurator.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/TestNGMapConfigurator.java?rev=1364144&r1=1364143&r2=1364144&view=diff
==============================================================================
---
maven/surefire/trunk/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/TestNGMapConfigurator.java
(original)
+++
maven/surefire/trunk/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/TestNGMapConfigurator.java
Sat Jul 21 18:32:25 2012
@@ -56,6 +56,7 @@ public class TestNGMapConfigurator
throws TestSetFailedException
{
Map convertedOptions = new HashMap();
+ convertedOptions.put( "-mixed", Boolean.FALSE );
for ( Iterator it = options.entrySet().iterator(); it.hasNext(); )
{
Map.Entry entry = (Map.Entry) it.next();
