You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by kr...@apache.org on 2012/01/27 21:50:40 UTC
svn commit: r1236883 [3/5] - 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/plug...
Modified: maven/surefire/trunk/surefire-api/src/test/java/org/apache/maven/surefire/util/testdata/DataZT2A.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-api/src/test/java/org/apache/maven/surefire/util/testdata/DataZT2A.java?rev=1236883&r1=1236882&r2=1236883&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-api/src/test/java/org/apache/maven/surefire/util/testdata/DataZT2A.java (original)
+++ maven/surefire/trunk/surefire-api/src/test/java/org/apache/maven/surefire/util/testdata/DataZT2A.java Fri Jan 27 20:50:34 2012
@@ -20,5 +20,6 @@
package org.apache.maven.surefire.util.testdata;
-public class DataZT2A {
+public class DataZT2A
+{
}
Modified: maven/surefire/trunk/surefire-api/src/test/java/org/apache/maven/surefire/util/testdata/DataZT3A.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-api/src/test/java/org/apache/maven/surefire/util/testdata/DataZT3A.java?rev=1236883&r1=1236882&r2=1236883&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-api/src/test/java/org/apache/maven/surefire/util/testdata/DataZT3A.java (original)
+++ maven/surefire/trunk/surefire-api/src/test/java/org/apache/maven/surefire/util/testdata/DataZT3A.java Fri Jan 27 20:50:34 2012
@@ -20,5 +20,6 @@
package org.apache.maven.surefire.util.testdata;
-public class DataZT3A {
+public class DataZT3A
+{
}
Modified: maven/surefire/trunk/surefire-api/src/test/java/org/apache/maven/surefire/util/testdata/java/javascript/DataJavaZT4A.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-api/src/test/java/org/apache/maven/surefire/util/testdata/java/javascript/DataJavaZT4A.java?rev=1236883&r1=1236882&r2=1236883&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-api/src/test/java/org/apache/maven/surefire/util/testdata/java/javascript/DataJavaZT4A.java (original)
+++ maven/surefire/trunk/surefire-api/src/test/java/org/apache/maven/surefire/util/testdata/java/javascript/DataJavaZT4A.java Fri Jan 27 20:50:34 2012
@@ -25,5 +25,6 @@ package org.apache.maven.surefire.util.t
* Date: August 16, 2010
* Time: 11:13:18 PM
*/
-public class DataJavaZT4A {
+public class DataJavaZT4A
+{
}
Modified: maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/Classpath.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/Classpath.java?rev=1236883&r1=1236882&r2=1236883&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/Classpath.java (original)
+++ maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/Classpath.java Fri Jan 27 20:50:34 2012
@@ -137,7 +137,8 @@ public class Classpath
}
- public ClassLoader createClassLoader( ClassLoader parent, boolean childDelegation, boolean enableAssertions, String roleName )
+ public ClassLoader createClassLoader( ClassLoader parent, boolean childDelegation, boolean enableAssertions,
+ String roleName )
throws SurefireExecutionException
{
try
@@ -149,7 +150,8 @@ public class Classpath
URL url = (URL) iter.next();
classLoader.addURL( url );
}
- if (parent != null){
+ if ( parent != null )
+ {
jdkReflector.invokeAssertionStatusMethod( parent, enableAssertions );
}
jdkReflector.invokeAssertionStatusMethod( classLoader, enableAssertions );
Modified: maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ForkedBooter.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ForkedBooter.java?rev=1236883&r1=1236882&r2=1236883&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ForkedBooter.java (original)
+++ maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ForkedBooter.java Fri Jan 27 20:50:34 2012
@@ -70,7 +70,7 @@ public class ForkedBooter
startupConfiguration.writeSurefireTestClasspathProperty();
- Object testSet = forkedTestSet != null ? forkedTestSet.getDecodedValue(testClassLoader) : null;
+ Object testSet = forkedTestSet != null ? forkedTestSet.getDecodedValue( testClassLoader ) : null;
runSuitesInProcess( testSet, testClassLoader, startupConfiguration, providerConfiguration );
// noinspection CallToSystemExit
Modified: maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/IsolatedClassLoader.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/IsolatedClassLoader.java?rev=1236883&r1=1236882&r2=1236883&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/IsolatedClassLoader.java (original)
+++ maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/IsolatedClassLoader.java Fri Jan 27 20:50:34 2012
@@ -33,7 +33,7 @@ public class IsolatedClassLoader
private final ClassLoader parent = ClassLoader.getSystemClassLoader();
private final Set urls = new HashSet();
-
+
private final String roleName;
private boolean childDelegation = true;
Modified: maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ProviderFactory.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ProviderFactory.java?rev=1236883&r1=1236882&r2=1236883&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ProviderFactory.java (original)
+++ maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ProviderFactory.java Fri Jan 27 20:50:34 2012
@@ -22,7 +22,6 @@ package org.apache.maven.surefire.booter
import java.io.PrintStream;
import java.lang.reflect.Method;
import java.util.Iterator;
-
import org.apache.maven.surefire.providerapi.SurefireProvider;
import org.apache.maven.surefire.report.ReporterException;
import org.apache.maven.surefire.suite.RunResult;
Modified: maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/SystemPropertyManager.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/SystemPropertyManager.java?rev=1236883&r1=1236882&r2=1236883&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/SystemPropertyManager.java (original)
+++ maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/SystemPropertyManager.java Fri Jan 27 20:50:34 2012
@@ -70,8 +70,7 @@ public class SystemPropertyManager
p.setAsSystemProperties();
}
- public static File writePropertiesFile( Properties properties, File tempDirectory, String name,
- boolean isDebug )
+ public static File writePropertiesFile( Properties properties, File tempDirectory, String name, boolean isDebug )
throws IOException
{
File file = File.createTempFile( name, "tmp", tempDirectory );
Modified: maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/TypeEncodedValue.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/TypeEncodedValue.java?rev=1236883&r1=1236882&r2=1236883&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/TypeEncodedValue.java (original)
+++ maven/surefire/trunk/surefire-booter/src/main/java/org/apache/maven/surefire/booter/TypeEncodedValue.java Fri Jan 27 20:50:34 2012
@@ -50,7 +50,7 @@ public class TypeEncodedValue
return getDecodedValue( Thread.currentThread().getContextClassLoader() );
}
- public Object getDecodedValue(ClassLoader classLoader)
+ public Object getDecodedValue( ClassLoader classLoader )
{
if ( type.trim().length() == 0 )
{
Modified: maven/surefire/trunk/surefire-booter/src/test/java/org/apache/maven/surefire/booter/ClasspathTest.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-booter/src/test/java/org/apache/maven/surefire/booter/ClasspathTest.java?rev=1236883&r1=1236882&r2=1236883&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-booter/src/test/java/org/apache/maven/surefire/booter/ClasspathTest.java (original)
+++ maven/surefire/trunk/surefire-booter/src/test/java/org/apache/maven/surefire/booter/ClasspathTest.java Fri Jan 27 20:50:34 2012
@@ -60,7 +60,7 @@ public class ClasspathTest
Classpath classpath = new Classpath();
classpath.addClassPathElementUrl( DUMMY_URL_1 );
classpath.addClassPathElementUrl( DUMMY_URL_1 );
- assertClasspathConsistsOfElements( classpath, new String[] { DUMMY_URL_1 } );
+ assertClasspathConsistsOfElements( classpath, new String[]{ DUMMY_URL_1 } );
}
public void testGetAsUrlList()
@@ -86,7 +86,7 @@ public class ClasspathTest
Classpath secondClasspath = new Classpath();
secondClasspath.addClassPathElementUrl( DUMMY_URL_2 );
Classpath joinedClasspath = Classpath.join( firstClasspath, secondClasspath );
- assertClasspathConsistsOfElements( joinedClasspath, new String[] { DUMMY_URL_1, DUMMY_URL_2 } );
+ assertClasspathConsistsOfElements( joinedClasspath, new String[]{ DUMMY_URL_1, DUMMY_URL_2 } );
}
public void testShouldNotHaveDuplicatesAfterJoiningTowClasspathsWithEqualElements()
@@ -97,16 +97,19 @@ public class ClasspathTest
Classpath secondClasspath = new Classpath();
secondClasspath.addClassPathElementUrl( DUMMY_URL_1 );
Classpath joinedClasspath = Classpath.join( firstClasspath, secondClasspath );
- assertClasspathConsistsOfElements( joinedClasspath, new String[] { DUMMY_URL_1 } );
+ assertClasspathConsistsOfElements( joinedClasspath, new String[]{ DUMMY_URL_1 } );
}
public void testShouldNotBeAbleToRemoveElement()
throws Exception
{
- try {
- Classpath classpath = createClasspathWithTwoElements();
- classpath.getClassPath().remove( 0 );
- } catch (java.lang.UnsupportedOperationException ignore){
+ try
+ {
+ Classpath classpath = createClasspathWithTwoElements();
+ classpath.getClassPath().remove( 0 );
+ }
+ catch ( java.lang.UnsupportedOperationException ignore )
+ {
}
}
@@ -142,9 +145,9 @@ public class ClasspathTest
try
{
classpath.addClassPathElementUrl( null );
- fail("IllegalArgumentException not thrown.");
+ fail( "IllegalArgumentException not thrown." );
}
- catch (IllegalArgumentException expected)
+ catch ( IllegalArgumentException expected )
{
}
}
@@ -157,7 +160,7 @@ public class ClasspathTest
{
classpath.addClassPathElementUrl( null );
}
- catch (IllegalArgumentException ignored)
+ catch ( IllegalArgumentException ignored )
{
}
assertEmptyClasspath( classpath );
Modified: maven/surefire/trunk/surefire-booter/src/test/java/org/apache/maven/surefire/booter/PropertiesWrapperTest.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-booter/src/test/java/org/apache/maven/surefire/booter/PropertiesWrapperTest.java?rev=1236883&r1=1236882&r2=1236883&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-booter/src/test/java/org/apache/maven/surefire/booter/PropertiesWrapperTest.java (original)
+++ maven/surefire/trunk/surefire-booter/src/test/java/org/apache/maven/surefire/booter/PropertiesWrapperTest.java Fri Jan 27 20:50:34 2012
@@ -62,6 +62,7 @@ public class PropertiesWrapperTest
private final PropertiesWrapper mapper = new PropertiesWrapper( properties );
+
private final Classpath classpathWithTwoElements = createClasspathWithTwoElements();
public void testReadFromProperties()
@@ -83,7 +84,7 @@ public class PropertiesWrapperTest
public void testWriteToProperties()
throws Exception
{
- mapper.setClasspath( DUMMY_PREFIX, classpathWithTwoElements);
+ mapper.setClasspath( DUMMY_PREFIX, classpathWithTwoElements );
assertEquals( FIRST_ELEMENT, mapper.getProperty( DUMMY_PREFIX + "0" ) );
assertEquals( SECOND_ELEMENT, mapper.getProperty( DUMMY_PREFIX + "1" ) );
}
@@ -91,7 +92,7 @@ public class PropertiesWrapperTest
public void testRoundtrip()
throws Exception
{
- mapper.setClasspath( DUMMY_PREFIX, classpathWithTwoElements);
+ mapper.setClasspath( DUMMY_PREFIX, classpathWithTwoElements );
Classpath recreatedClasspath = readClasspathFromProperties();
assertEquals( classpathWithTwoElements, recreatedClasspath );
}
@@ -106,6 +107,6 @@ public class PropertiesWrapperTest
private Classpath readClasspathFromProperties()
{
- return mapper.getClasspath( DUMMY_PREFIX);
+ return mapper.getClasspath( DUMMY_PREFIX );
}
}
Modified: maven/surefire/trunk/surefire-booter/src/test/java/org/apache/maven/surefire/booter/SurefireReflectorTest.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-booter/src/test/java/org/apache/maven/surefire/booter/SurefireReflectorTest.java?rev=1236883&r1=1236882&r2=1236883&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-booter/src/test/java/org/apache/maven/surefire/booter/SurefireReflectorTest.java (original)
+++ maven/surefire/trunk/surefire-booter/src/test/java/org/apache/maven/surefire/booter/SurefireReflectorTest.java Fri Jan 27 20:50:34 2012
@@ -50,8 +50,7 @@ public class SurefireReflectorTest
DirectoryScannerParameters directoryScannerParameters =
new DirectoryScannerParameters( new File( "ABC" ), new ArrayList(), new ArrayList(), new ArrayList(),
- Boolean.FALSE,
- "hourly" );
+ Boolean.FALSE, "hourly" );
surefireReflector.setDirectoryScannerParameters( foo, directoryScannerParameters );
assertTrue( isCalled( foo ).booleanValue() );
Modified: maven/surefire/trunk/surefire-grouper/src/main/java/org/apache/maven/surefire/group/match/AndGroupMatcher.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-grouper/src/main/java/org/apache/maven/surefire/group/match/AndGroupMatcher.java?rev=1236883&r1=1236882&r2=1236883&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-grouper/src/main/java/org/apache/maven/surefire/group/match/AndGroupMatcher.java (original)
+++ maven/surefire/trunk/surefire-grouper/src/main/java/org/apache/maven/surefire/group/match/AndGroupMatcher.java Fri Jan 27 20:50:34 2012
@@ -83,14 +83,22 @@ public class AndGroupMatcher
public boolean equals( Object obj )
{
if ( this == obj )
+ {
return true;
+ }
if ( obj == null )
+ {
return false;
+ }
if ( getClass() != obj.getClass() )
+ {
return false;
+ }
AndGroupMatcher other = (AndGroupMatcher) obj;
if ( !getMatchers().equals( other.getMatchers() ) )
+ {
return false;
+ }
return true;
}
Modified: maven/surefire/trunk/surefire-grouper/src/main/java/org/apache/maven/surefire/group/match/InverseGroupMatcher.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-grouper/src/main/java/org/apache/maven/surefire/group/match/InverseGroupMatcher.java?rev=1236883&r1=1236882&r2=1236883&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-grouper/src/main/java/org/apache/maven/surefire/group/match/InverseGroupMatcher.java (original)
+++ maven/surefire/trunk/surefire-grouper/src/main/java/org/apache/maven/surefire/group/match/InverseGroupMatcher.java Fri Jan 27 20:50:34 2012
@@ -41,19 +41,29 @@ public class InverseGroupMatcher
public boolean equals( Object obj )
{
if ( this == obj )
+ {
return true;
+ }
if ( obj == null )
+ {
return false;
+ }
if ( getClass() != obj.getClass() )
+ {
return false;
+ }
InverseGroupMatcher other = (InverseGroupMatcher) obj;
if ( matcher == null )
{
if ( other.matcher != null )
+ {
return false;
+ }
}
else if ( !matcher.equals( other.matcher ) )
+ {
return false;
+ }
return true;
}
Modified: maven/surefire/trunk/surefire-grouper/src/main/java/org/apache/maven/surefire/group/match/OrGroupMatcher.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-grouper/src/main/java/org/apache/maven/surefire/group/match/OrGroupMatcher.java?rev=1236883&r1=1236882&r2=1236883&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-grouper/src/main/java/org/apache/maven/surefire/group/match/OrGroupMatcher.java (original)
+++ maven/surefire/trunk/surefire-grouper/src/main/java/org/apache/maven/surefire/group/match/OrGroupMatcher.java Fri Jan 27 20:50:34 2012
@@ -83,14 +83,22 @@ public class OrGroupMatcher
public boolean equals( Object obj )
{
if ( this == obj )
+ {
return true;
+ }
if ( obj == null )
+ {
return false;
+ }
if ( getClass() != obj.getClass() )
+ {
return false;
+ }
AndGroupMatcher other = (AndGroupMatcher) obj;
if ( !getMatchers().equals( other.getMatchers() ) )
+ {
return false;
+ }
return true;
}
}
Modified: maven/surefire/trunk/surefire-grouper/src/main/java/org/apache/maven/surefire/group/match/SingleGroupMatcher.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-grouper/src/main/java/org/apache/maven/surefire/group/match/SingleGroupMatcher.java?rev=1236883&r1=1236882&r2=1236883&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-grouper/src/main/java/org/apache/maven/surefire/group/match/SingleGroupMatcher.java (original)
+++ maven/surefire/trunk/surefire-grouper/src/main/java/org/apache/maven/surefire/group/match/SingleGroupMatcher.java Fri Jan 27 20:50:34 2012
@@ -27,19 +27,29 @@ public class SingleGroupMatcher
public boolean equals( Object obj )
{
if ( this == obj )
+ {
return true;
+ }
if ( obj == null )
+ {
return false;
+ }
if ( getClass() != obj.getClass() )
+ {
return false;
+ }
SingleGroupMatcher other = (SingleGroupMatcher) obj;
if ( enabled == null )
{
if ( other.enabled != null )
+ {
return false;
+ }
}
else if ( !enabled.equals( other.enabled ) )
+ {
return false;
+ }
return true;
}
@@ -60,7 +70,7 @@ public class SingleGroupMatcher
{
return true;
}
-
+
if ( name.endsWith( enabled ) )
{
return true;
Modified: maven/surefire/trunk/surefire-grouper/src/test/java/org/apache/maven/surefire/group/match/AndGroupMatcherTest.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-grouper/src/test/java/org/apache/maven/surefire/group/match/AndGroupMatcherTest.java?rev=1236883&r1=1236882&r2=1236883&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-grouper/src/test/java/org/apache/maven/surefire/group/match/AndGroupMatcherTest.java (original)
+++ maven/surefire/trunk/surefire-grouper/src/test/java/org/apache/maven/surefire/group/match/AndGroupMatcherTest.java Fri Jan 27 20:50:34 2012
@@ -8,27 +8,24 @@ public class AndGroupMatcherTest
public void testDontMatchOneInGroup()
{
- AndGroupMatcher matcher =
- new AndGroupMatcher( new SingleGroupMatcher( SingleGroupMatcher.class.getName() ),
- new SingleGroupMatcher( InverseGroupMatcher.class.getName() ) );
-
+ AndGroupMatcher matcher = new AndGroupMatcher( new SingleGroupMatcher( SingleGroupMatcher.class.getName() ),
+ new SingleGroupMatcher( InverseGroupMatcher.class.getName() ) );
+
assertFalse( matcher.enabled( InverseGroupMatcher.class, AndGroupMatcher.class ) );
}
public void testMatchBothInGroup()
{
- AndGroupMatcher matcher =
- new AndGroupMatcher( new SingleGroupMatcher( SingleGroupMatcher.class.getName() ),
- new SingleGroupMatcher( InverseGroupMatcher.class.getName() ) );
+ AndGroupMatcher matcher = new AndGroupMatcher( new SingleGroupMatcher( SingleGroupMatcher.class.getName() ),
+ new SingleGroupMatcher( InverseGroupMatcher.class.getName() ) );
assertTrue( matcher.enabled( InverseGroupMatcher.class, SingleGroupMatcher.class ) );
}
public void testDontMatchAnyInGroup()
{
- AndGroupMatcher matcher =
- new AndGroupMatcher( new SingleGroupMatcher( SingleGroupMatcher.class.getName() ),
- new SingleGroupMatcher( InverseGroupMatcher.class.getName() ) );
+ AndGroupMatcher matcher = new AndGroupMatcher( new SingleGroupMatcher( SingleGroupMatcher.class.getName() ),
+ new SingleGroupMatcher( InverseGroupMatcher.class.getName() ) );
assertFalse( matcher.enabled( OrGroupMatcher.class, AndGroupMatcher.class ) );
}
Modified: maven/surefire/trunk/surefire-grouper/src/test/java/org/apache/maven/surefire/group/match/OrGroupMatcherTest.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-grouper/src/test/java/org/apache/maven/surefire/group/match/OrGroupMatcherTest.java?rev=1236883&r1=1236882&r2=1236883&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-grouper/src/test/java/org/apache/maven/surefire/group/match/OrGroupMatcherTest.java (original)
+++ maven/surefire/trunk/surefire-grouper/src/test/java/org/apache/maven/surefire/group/match/OrGroupMatcherTest.java Fri Jan 27 20:50:34 2012
@@ -8,27 +8,24 @@ public class OrGroupMatcherTest
public void testMatchOneInOredGroup()
{
- OrGroupMatcher matcher =
- new OrGroupMatcher( new SingleGroupMatcher( SingleGroupMatcher.class.getName() ),
- new SingleGroupMatcher( InverseGroupMatcher.class.getName() ) );
-
+ OrGroupMatcher matcher = new OrGroupMatcher( new SingleGroupMatcher( SingleGroupMatcher.class.getName() ),
+ new SingleGroupMatcher( InverseGroupMatcher.class.getName() ) );
+
assertTrue( matcher.enabled( InverseGroupMatcher.class, AndGroupMatcher.class ) );
}
public void testMatchBothInOredGroup()
{
- OrGroupMatcher matcher =
- new OrGroupMatcher( new SingleGroupMatcher( SingleGroupMatcher.class.getName() ),
- new SingleGroupMatcher( InverseGroupMatcher.class.getName() ) );
+ OrGroupMatcher matcher = new OrGroupMatcher( new SingleGroupMatcher( SingleGroupMatcher.class.getName() ),
+ new SingleGroupMatcher( InverseGroupMatcher.class.getName() ) );
assertTrue( matcher.enabled( InverseGroupMatcher.class, SingleGroupMatcher.class ) );
}
public void testMatchNoneInOredGroup()
{
- OrGroupMatcher matcher =
- new OrGroupMatcher( new SingleGroupMatcher( SingleGroupMatcher.class.getName() ),
- new SingleGroupMatcher( InverseGroupMatcher.class.getName() ) );
+ OrGroupMatcher matcher = new OrGroupMatcher( new SingleGroupMatcher( SingleGroupMatcher.class.getName() ),
+ new SingleGroupMatcher( InverseGroupMatcher.class.getName() ) );
assertFalse( matcher.enabled( OrGroupMatcher.class, AndGroupMatcher.class ) );
}
Modified: maven/surefire/trunk/surefire-grouper/src/test/java/org/apache/maven/surefire/group/parse/GroupMatcherParserTest.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-grouper/src/test/java/org/apache/maven/surefire/group/parse/GroupMatcherParserTest.java?rev=1236883&r1=1236882&r2=1236883&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-grouper/src/test/java/org/apache/maven/surefire/group/parse/GroupMatcherParserTest.java (original)
+++ maven/surefire/trunk/surefire-grouper/src/test/java/org/apache/maven/surefire/group/parse/GroupMatcherParserTest.java Fri Jan 27 20:50:34 2012
@@ -1,13 +1,13 @@
package org.apache.maven.surefire.group.parse;
-import junit.framework.TestCase;
-
import org.apache.maven.surefire.group.match.AndGroupMatcher;
import org.apache.maven.surefire.group.match.GroupMatcher;
import org.apache.maven.surefire.group.match.InverseGroupMatcher;
import org.apache.maven.surefire.group.match.OrGroupMatcher;
import org.apache.maven.surefire.group.match.SingleGroupMatcher;
+import junit.framework.TestCase;
+
public class GroupMatcherParserTest
extends TestCase
{
@@ -31,8 +31,8 @@ public class GroupMatcherParserTest
public void testParseBareANDedPair()
throws ParseException
{
- GroupMatcher matcher =
- new GroupMatcherParser( GroupMatcherParser.class.getName() + " AND " + SingleGroupMatcher.class.getName() ).parse();
+ GroupMatcher matcher = new GroupMatcherParser(
+ GroupMatcherParser.class.getName() + " AND " + SingleGroupMatcher.class.getName() ).parse();
assertTrue( "Wrong matcher type: " + matcher.getClass().getName(), matcher instanceof AndGroupMatcher );
assertFalse( matcher.enabled( GroupMatcherParser.class ) );
@@ -42,8 +42,8 @@ public class GroupMatcherParserTest
public void testParseBareORedPair()
throws ParseException
{
- GroupMatcher matcher =
- new GroupMatcherParser( GroupMatcherParser.class.getName() + " OR " + SingleGroupMatcher.class.getName() ).parse();
+ GroupMatcher matcher = new GroupMatcherParser(
+ GroupMatcherParser.class.getName() + " OR " + SingleGroupMatcher.class.getName() ).parse();
assertTrue( "Wrong matcher type: " + matcher.getClass().getName(), matcher instanceof OrGroupMatcher );
assertTrue( matcher.enabled( GroupMatcherParser.class ) );
@@ -53,8 +53,8 @@ public class GroupMatcherParserTest
public void testBareCommaSeparatedORedPair()
throws ParseException
{
- GroupMatcher matcher =
- new GroupMatcherParser( GroupMatcherParser.class.getName() + ", " + SingleGroupMatcher.class.getName() ).parse();
+ GroupMatcher matcher = new GroupMatcherParser(
+ GroupMatcherParser.class.getName() + ", " + SingleGroupMatcher.class.getName() ).parse();
assertTrue( "Wrong matcher type: " + matcher.getClass().getName(), matcher instanceof OrGroupMatcher );
assertTrue( matcher.enabled( GroupMatcherParser.class ) );
@@ -64,9 +64,8 @@ public class GroupMatcherParserTest
public void testParseGroupedANDedPair()
throws ParseException
{
- GroupMatcher matcher =
- new GroupMatcherParser( "(" + GroupMatcherParser.class.getName() + " AND "
- + SingleGroupMatcher.class.getName() + ")" ).parse();
+ GroupMatcher matcher = new GroupMatcherParser(
+ "(" + GroupMatcherParser.class.getName() + " AND " + SingleGroupMatcher.class.getName() + ")" ).parse();
assertTrue( "Wrong matcher type: " + matcher.getClass().getName(), matcher instanceof AndGroupMatcher );
assertFalse( matcher.enabled( GroupMatcherParser.class ) );
@@ -76,9 +75,8 @@ public class GroupMatcherParserTest
public void testParseGroupedORedPair()
throws ParseException
{
- GroupMatcher matcher =
- new GroupMatcherParser( "(" + GroupMatcherParser.class.getName() + " OR "
- + SingleGroupMatcher.class.getName() + ")" ).parse();
+ GroupMatcher matcher = new GroupMatcherParser(
+ "(" + GroupMatcherParser.class.getName() + " OR " + SingleGroupMatcher.class.getName() + ")" ).parse();
assertTrue( "Wrong matcher type: " + matcher.getClass().getName(), matcher instanceof OrGroupMatcher );
assertTrue( matcher.enabled( GroupMatcherParser.class ) );
@@ -88,9 +86,8 @@ public class GroupMatcherParserTest
public void testParseInvertedGroupedANDedPair()
throws ParseException
{
- GroupMatcher matcher =
- new GroupMatcherParser( "NOT (" + GroupMatcherParser.class.getName() + " AND "
- + SingleGroupMatcher.class.getName() + ")" ).parse();
+ GroupMatcher matcher = new GroupMatcherParser(
+ "NOT (" + GroupMatcherParser.class.getName() + " AND " + SingleGroupMatcher.class.getName() + ")" ).parse();
assertTrue( "Wrong matcher type: " + matcher.getClass().getName(), matcher instanceof InverseGroupMatcher );
assertTrue( matcher.enabled( GroupMatcherParser.class ) );
@@ -100,9 +97,8 @@ public class GroupMatcherParserTest
public void testParseInvertedGroupedORedPair()
throws ParseException
{
- GroupMatcher matcher =
- new GroupMatcherParser( "NOT (" + GroupMatcherParser.class.getName() + " OR "
- + SingleGroupMatcher.class.getName() + ")" ).parse();
+ GroupMatcher matcher = new GroupMatcherParser(
+ "NOT (" + GroupMatcherParser.class.getName() + " OR " + SingleGroupMatcher.class.getName() + ")" ).parse();
assertTrue( "Wrong matcher type: " + matcher.getClass().getName(), matcher instanceof InverseGroupMatcher );
assertFalse( matcher.enabled( GroupMatcherParser.class ) );
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AggregateReportIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AggregateReportIT.java?rev=1236883&r1=1236882&r2=1236883&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AggregateReportIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/AggregateReportIT.java Fri Jan 27 20:50:34 2012
@@ -20,9 +20,11 @@ package org.apache.maven.surefire.its;
*/
import java.io.File;
-
-import org.apache.maven.surefire.its.fixture.*;
import org.apache.maven.surefire.its.fixture.HelperAssertions;
+import org.apache.maven.surefire.its.fixture.IntegrationTestSuiteResults;
+import org.apache.maven.surefire.its.fixture.OutputValidator;
+import org.apache.maven.surefire.its.fixture.SurefireIntegrationTestCase;
+import org.apache.maven.surefire.its.fixture.TestFile;
/**
* Test report aggregation
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckSingleTestIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckSingleTestIT.java?rev=1236883&r1=1236882&r2=1236883&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckSingleTestIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckSingleTestIT.java Fri Jan 27 20:50:34 2012
@@ -20,8 +20,8 @@ package org.apache.maven.surefire.its;
*/
import org.apache.maven.surefire.its.fixture.OutputValidator;
-import org.apache.maven.surefire.its.fixture.SurefireLauncher;
import org.apache.maven.surefire.its.fixture.SurefireIntegrationTestCase;
+import org.apache.maven.surefire.its.fixture.SurefireLauncher;
import org.apache.maven.surefire.its.fixture.TestFile;
/**
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestFailIfNoTestsForkModeIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestFailIfNoTestsForkModeIT.java?rev=1236883&r1=1236882&r2=1236883&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestFailIfNoTestsForkModeIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestFailIfNoTestsForkModeIT.java Fri Jan 27 20:50:34 2012
@@ -19,8 +19,8 @@ package org.apache.maven.surefire.its;
* under the License.
*/
-import org.apache.maven.surefire.its.fixture.SurefireLauncher;
import org.apache.maven.surefire.its.fixture.SurefireIntegrationTestCase;
+import org.apache.maven.surefire.its.fixture.SurefireLauncher;
/**
* Test failIfNoTests with various forkModes.
@@ -48,24 +48,24 @@ public class CheckTestFailIfNoTestsForkM
public void testDontFailIfNoTestsForkModeAlways()
{
- doTest( unpack().forkAlways().failIfNoTests( false) );
+ doTest( unpack().forkAlways().failIfNoTests( false ) );
}
public void testDontFailIfNoTestsForkModeNever()
{
- doTest( unpack().forkNever().failIfNoTests( false) );
+ doTest( unpack().forkNever().failIfNoTests( false ) );
}
public void testDontFailIfNoTestsForkModeOnce()
{
- doTest( unpack().forkOnce().failIfNoTests( false) );
+ doTest( unpack().forkOnce().failIfNoTests( false ) );
}
private void doTest( SurefireLauncher launcher )
{
if ( launcher.isFailIfNoTests() )
{
- launcher.executeTestWithFailure();
+ launcher.executeTestWithFailure();
}
else
{
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestFailIfNoTestsIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestFailIfNoTestsIT.java?rev=1236883&r1=1236882&r2=1236883&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestFailIfNoTestsIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestFailIfNoTestsIT.java Fri Jan 27 20:50:34 2012
@@ -20,8 +20,8 @@ package org.apache.maven.surefire.its;
*/
import org.apache.maven.surefire.its.fixture.OutputValidator;
-import org.apache.maven.surefire.its.fixture.SurefireLauncher;
import org.apache.maven.surefire.its.fixture.SurefireIntegrationTestCase;
+import org.apache.maven.surefire.its.fixture.SurefireLauncher;
import org.apache.maven.surefire.its.fixture.TestFile;
/**
@@ -53,8 +53,8 @@ public class CheckTestFailIfNoTestsIT
public void test48CategoriesFailWhenNoTests()
{
- unpack().failIfNoTests( false ).activateProfile( "junit47" ).setJUnitVersion( "4.8.1" )
- .executeTest().verifyErrorFreeLog();
+ unpack().failIfNoTests( false ).activateProfile( "junit47" ).setJUnitVersion(
+ "4.8.1" ).executeTest().verifyErrorFreeLog();
}
}
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgExecuteErrorIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgExecuteErrorIT.java?rev=1236883&r1=1236882&r2=1236883&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgExecuteErrorIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgExecuteErrorIT.java Fri Jan 27 20:50:34 2012
@@ -33,7 +33,7 @@ public class CheckTestNgExecuteErrorIT
public void testExecuteError()
throws Exception
{
- unpack( "/testng-execute-error" ).executeTestWithFailure()
- .verifyTextInLog( "at org.apache.maven.surefire.testng.TestNGExecutor.run" );
+ unpack( "/testng-execute-error" ).executeTestWithFailure().verifyTextInLog(
+ "at org.apache.maven.surefire.testng.TestNGExecutor.run" );
}
}
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgListenerReporterIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgListenerReporterIT.java?rev=1236883&r1=1236882&r2=1236883&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgListenerReporterIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgListenerReporterIT.java Fri Jan 27 20:50:34 2012
@@ -34,10 +34,9 @@ public class CheckTestNgListenerReporter
public void testTestNgListenerReporter()
{
final SurefireLauncher verifierStarter = unpack( "testng-listener-reporter" );
- verifierStarter.executeTest().verifyErrorFree( 1 )
- .getTargetFile( "resultlistener-output.txt" ).assertFileExists()
- .getTargetFile( "suitelistener-output.txt" ).assertFileExists()
- .getTargetFile( "reporter-output.txt" ).assertFileExists();
+ verifierStarter.executeTest().verifyErrorFree( 1 ).getTargetFile(
+ "resultlistener-output.txt" ).assertFileExists().getTargetFile(
+ "suitelistener-output.txt" ).assertFileExists().getTargetFile( "reporter-output.txt" ).assertFileExists();
}
}
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgSuiteXmlIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgSuiteXmlIT.java?rev=1236883&r1=1236882&r2=1236883&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgSuiteXmlIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/CheckTestNgSuiteXmlIT.java Fri Jan 27 20:50:34 2012
@@ -19,8 +19,8 @@ package org.apache.maven.surefire.its;
* under the License.
*/
-import org.apache.maven.surefire.its.fixture.SurefireLauncher;
import org.apache.maven.surefire.its.fixture.SurefireIntegrationTestCase;
+import org.apache.maven.surefire.its.fixture.SurefireLauncher;
/**
* Test simple TestNG suite XML file
@@ -42,7 +42,7 @@ public class CheckTestNgSuiteXmlIT
private SurefireLauncher unpack()
{
- return unpack( "testng-suite-xml" );
+ return unpack( "testng-suite-xml" );
}
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/DefaultConfigurationIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/DefaultConfigurationIT.java?rev=1236883&r1=1236882&r2=1236883&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/DefaultConfigurationIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/DefaultConfigurationIT.java Fri Jan 27 20:50:34 2012
@@ -31,6 +31,6 @@ public class DefaultConfigurationIT
{
public void testDefaultConfiguration()
{
- executeErrorFreeTest( "default-configuration" , 1 );
+ executeErrorFreeTest( "default-configuration", 1 );
}
}
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ForkConsoleOutputIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ForkConsoleOutputIT.java?rev=1236883&r1=1236882&r2=1236883&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ForkConsoleOutputIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ForkConsoleOutputIT.java Fri Jan 27 20:50:34 2012
@@ -20,8 +20,8 @@ package org.apache.maven.surefire.its;
*/
import org.apache.maven.surefire.its.fixture.OutputValidator;
-import org.apache.maven.surefire.its.fixture.SurefireLauncher;
import org.apache.maven.surefire.its.fixture.SurefireIntegrationTestCase;
+import org.apache.maven.surefire.its.fixture.SurefireLauncher;
/**
* Asserts proper behaviour of console output when forking
@@ -53,7 +53,8 @@ public class ForkConsoleOutputIT
public void testPrintSummaryFalseWithRedirect()
{
- final OutputValidator outputValidator = unpack().redirectToFile( true ).printSummary( false ).debugLogging().showErrorStackTraces().executeTest();
+ final OutputValidator outputValidator =
+ unpack().redirectToFile( true ).printSummary( false ).debugLogging().showErrorStackTraces().executeTest();
outputValidator.getSurefireReportsFile( "forkConsoleOutput.Test1-output.txt" ).assertFileExists();
}
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ForkConsoleOutputWithErrorsIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ForkConsoleOutputWithErrorsIT.java?rev=1236883&r1=1236882&r2=1236883&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ForkConsoleOutputWithErrorsIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ForkConsoleOutputWithErrorsIT.java Fri Jan 27 20:50:34 2012
@@ -37,8 +37,8 @@ public class ForkConsoleOutputWithErrors
{
final OutputValidator outputValidator = unpack( "/fork-consoleOutputWithErrors" ).
failNever().redirectToFile( true ).executeTest();
- final TestFile
- surefireReportsFile = outputValidator.getSurefireReportsFile( "TEST-forkConsoleOutput.Test2.xml" );
+ final TestFile surefireReportsFile =
+ outputValidator.getSurefireReportsFile( "TEST-forkConsoleOutput.Test2.xml" );
surefireReportsFile.assertContainsText( "sout: Will Fail soon" );
surefireReportsFile.assertContainsText( "serr: Will Fail now" );
}
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ForkModeIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ForkModeIT.java?rev=1236883&r1=1236882&r2=1236883&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ForkModeIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ForkModeIT.java Fri Jan 27 20:50:34 2012
@@ -20,8 +20,8 @@ package org.apache.maven.surefire.its;
*/
import org.apache.maven.surefire.its.fixture.OutputValidator;
-import org.apache.maven.surefire.its.fixture.SurefireLauncher;
import org.apache.maven.surefire.its.fixture.SurefireIntegrationTestCase;
+import org.apache.maven.surefire.its.fixture.SurefireLauncher;
import org.apache.maven.surefire.its.fixture.TestFile;
/**
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ForkModeTestNGIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ForkModeTestNGIT.java?rev=1236883&r1=1236882&r2=1236883&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ForkModeTestNGIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ForkModeTestNGIT.java Fri Jan 27 20:50:34 2012
@@ -21,7 +21,7 @@ package org.apache.maven.surefire.its;
/**
* Test forkMode
- *
+ *
* @author <a href="mailto:velo.br@gmail.com">Marvin Froeder</a>
*/
public class ForkModeTestNGIT
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/IncludesExcludesIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/IncludesExcludesIT.java?rev=1236883&r1=1236882&r2=1236883&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/IncludesExcludesIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/IncludesExcludesIT.java Fri Jan 27 20:50:34 2012
@@ -20,8 +20,8 @@ package org.apache.maven.surefire.its;
*/
import org.apache.maven.surefire.its.fixture.OutputValidator;
-import org.apache.maven.surefire.its.fixture.SurefireLauncher;
import org.apache.maven.surefire.its.fixture.SurefireIntegrationTestCase;
+import org.apache.maven.surefire.its.fixture.SurefireLauncher;
/**
* Test include/exclude patterns.
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit47RedirectOutputIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit47RedirectOutputIT.java?rev=1236883&r1=1236882&r2=1236883&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit47RedirectOutputIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit47RedirectOutputIT.java Fri Jan 27 20:50:34 2012
@@ -22,8 +22,8 @@ package org.apache.maven.surefire.its;
import java.io.IOException;
import org.apache.commons.lang.StringUtils;
import org.apache.maven.surefire.its.fixture.OutputValidator;
-import org.apache.maven.surefire.its.fixture.SurefireLauncher;
import org.apache.maven.surefire.its.fixture.SurefireIntegrationTestCase;
+import org.apache.maven.surefire.its.fixture.SurefireLauncher;
public class JUnit47RedirectOutputIT
extends SurefireIntegrationTestCase
@@ -46,9 +46,11 @@ public class JUnit47RedirectOutputIT
private void checkReports( OutputValidator validator )
throws IOException
{
- String report = StringUtils.trimToNull( validator.getSurefireReportsFile( "junit47ConsoleOutput.Test1-output.txt" ).readFileToString() );
+ String report = StringUtils.trimToNull(
+ validator.getSurefireReportsFile( "junit47ConsoleOutput.Test1-output.txt" ).readFileToString() );
assertNotNull( report );
- String report2 = StringUtils.trimToNull( validator.getSurefireReportsFile( "junit47ConsoleOutput.Test2-output.txt" ).readFileToString() );
+ String report2 = StringUtils.trimToNull(
+ validator.getSurefireReportsFile( "junit47ConsoleOutput.Test2-output.txt" ).readFileToString() );
assertNotNull( report2 );
assertFalse( validator.getSurefireReportsFile( "junit47ConsoleOutput.Test3-output.txt" ).exists() );
}
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit48TestCategoriesIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit48TestCategoriesIT.java?rev=1236883&r1=1236882&r2=1236883&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit48TestCategoriesIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit48TestCategoriesIT.java Fri Jan 27 20:50:34 2012
@@ -21,8 +21,8 @@ package org.apache.maven.surefire.its;
import java.io.IOException;
import org.apache.maven.it.VerificationException;
-import org.apache.maven.surefire.its.fixture.SurefireLauncher;
import org.apache.maven.surefire.its.fixture.SurefireIntegrationTestCase;
+import org.apache.maven.surefire.its.fixture.SurefireLauncher;
/**
* Test project using "groups" support
@@ -49,12 +49,8 @@ public class JUnit48TestCategoriesIT
private void runAB( SurefireLauncher unpacked )
throws VerificationException
{
- unpacked.executeTest().verifyErrorFreeLog()
- .assertTestSuiteResults( 3, 0, 0, 0 )
- .verifyTextInLog( "catA: 1" )
- .verifyTextInLog( "catB: 1" )
- .verifyTextInLog( "catC: 0" )
- .verifyTextInLog( "catNone: 0" );
+ unpacked.executeTest().verifyErrorFreeLog().assertTestSuiteResults( 3, 0, 0, 0 ).verifyTextInLog(
+ "catA: 1" ).verifyTextInLog( "catB: 1" ).verifyTextInLog( "catC: 0" ).verifyTextInLog( "catNone: 0" );
}
public void testCategoriesAC()
@@ -73,17 +69,13 @@ public class JUnit48TestCategoriesIT
private void runAC( SurefireLauncher surefireLauncher )
throws Exception
{
- surefireLauncher.groups( "junit4.CategoryA,junit4.CategoryC" ).executeTest()
- .verifyErrorFreeLog()
- .assertTestSuiteResults( 6, 0, 0, 0 )
- .verifyTextInLog( "catA: 1" )
- .verifyTextInLog( "catB: 0" )
- .verifyTextInLog( "catC: 1" )
- .verifyTextInLog( "catNone: 0" )
- .verifyTextInLog( "mA: 1" )
- .verifyTextInLog( "mB: 1" ) // This seems questionable !? The class is annotated with category C and method with B
- .verifyTextInLog( "mC: 1" )
- .verifyTextInLog( "CatNone: 1" );
+ surefireLauncher.groups(
+ "junit4.CategoryA,junit4.CategoryC" ).executeTest().verifyErrorFreeLog().assertTestSuiteResults( 6, 0, 0,
+ 0 ).verifyTextInLog(
+ "catA: 1" ).verifyTextInLog( "catB: 0" ).verifyTextInLog( "catC: 1" ).verifyTextInLog(
+ "catNone: 0" ).verifyTextInLog( "mA: 1" ).verifyTextInLog(
+ "mB: 1" ) // This seems questionable !? The class is annotated with category C and method with B
+ .verifyTextInLog( "mC: 1" ).verifyTextInLog( "CatNone: 1" );
}
private SurefireLauncher unpacked()
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit4RunListenerIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit4RunListenerIT.java?rev=1236883&r1=1236882&r2=1236883&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit4RunListenerIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnit4RunListenerIT.java Fri Jan 27 20:50:34 2012
@@ -20,12 +20,12 @@ package org.apache.maven.surefire.its;
*/
import org.apache.maven.surefire.its.fixture.OutputValidator;
-import org.apache.maven.surefire.its.fixture.SurefireLauncher;
import org.apache.maven.surefire.its.fixture.SurefireIntegrationTestCase;
+import org.apache.maven.surefire.its.fixture.SurefireLauncher;
/**
* JUnit4 RunListener Integration Test.
- *
+ *
* @author <a href="mailto:matthew.gilliard@gmail.com">Matthew Gilliard</a>
*/
public class JUnit4RunListenerIT
@@ -46,7 +46,7 @@ public class JUnit4RunListenerIT
{
final OutputValidator outputValidator = unpack().addGoal( "-Dprovider=surefire-junit4" ).setJUnitVersion(
"4.4" ).executeTest().verifyErrorFreeLog();
- assertResults(outputValidator);
+ assertResults( outputValidator );
outputValidator.verifyTextInLog( "testRunStarted null" );
outputValidator.verifyTextInLog( "testFinished simpleTest" );
outputValidator.verifyTextInLog( "testRunFinished org.junit.runner.Result" );
@@ -55,9 +55,10 @@ public class JUnit4RunListenerIT
public void testRunlistenerJunitCoreProvider()
throws Exception
{
- final OutputValidator outputValidator = unpack().addGoal( "-Dprovider=surefire-junit47" ).setJUnitVersion(
- "4.8.1" ).addGoal( "-DjunitVersion=4.8.1" ).executeTest().verifyErrorFreeLog(); // Todo: Fix junitVesion
- assertResults(outputValidator);
+ final OutputValidator outputValidator =
+ unpack().addGoal( "-Dprovider=surefire-junit47" ).setJUnitVersion( "4.8.1" ).addGoal(
+ "-DjunitVersion=4.8.1" ).executeTest().verifyErrorFreeLog(); // Todo: Fix junitVesion
+ assertResults( outputValidator );
outputValidator.verifyTextInLog( "testRunStarted null" );
outputValidator.verifyTextInLog( "testFinished simpleTest" );
outputValidator.verifyTextInLog( "testRunFinished org.junit.runner.Result" );
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnitDepIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnitDepIT.java?rev=1236883&r1=1236882&r2=1236883&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnitDepIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/JUnitDepIT.java Fri Jan 27 20:50:34 2012
@@ -19,8 +19,8 @@ package org.apache.maven.surefire.its;
* under the License.
*/
-import org.apache.maven.surefire.its.fixture.SurefireLauncher;
import org.apache.maven.surefire.its.fixture.SurefireIntegrationTestCase;
+import org.apache.maven.surefire.its.fixture.SurefireLauncher;
/**
* Test project using JUnit4.4 -dep. junit-dep includes only junit.* classes, and depends explicitly on hamcrest-core
@@ -38,40 +38,28 @@ public class JUnitDepIT
public void testJUnit44Dep()
throws Exception
{
- unpack().debugLogging()
- .addGoal( "-Djunit-dep.version=4.4" )
- .executeTest()
- .verifyErrorFree( 1 )
- .verifyTextInLog( "surefire-junit4" ); // Ahem. Will match on the 4.7 provider too
+ unpack().debugLogging().addGoal( "-Djunit-dep.version=4.4" ).executeTest().verifyErrorFree( 1 ).verifyTextInLog(
+ "surefire-junit4" ); // Ahem. Will match on the 4.7 provider too
}
public void testJUnit44DepWithSneaky381()
throws Exception
{
- unpack().debugLogging()
- .addGoal( "-Djunit-dep.version=4.4" )
- .activateProfile( "provided381" )
- .executeTest()
- .verifyErrorFree( 1 );
+ unpack().debugLogging().addGoal( "-Djunit-dep.version=4.4" ).activateProfile(
+ "provided381" ).executeTest().verifyErrorFree( 1 );
}
public void testJUnit47Dep()
throws Exception
{
- unpack().debugLogging()
- .addGoal( "-Djunit-dep.version=4.7" )
- .executeTest()
- .verifyErrorFree( 1 )
- .verifyTextInLog( "surefire-junit47" );
+ unpack().debugLogging().addGoal( "-Djunit-dep.version=4.7" ).executeTest().verifyErrorFree( 1 ).verifyTextInLog(
+ "surefire-junit47" );
}
public void testJUnit48Dep()
throws Exception
{
- unpack().debugLogging()
- .addGoal( "-Djunit-dep.version=4.8" )
- .executeTest()
- .verifyErrorFree( 1 )
- .verifyTextInLog( "surefire-junit47" );
+ unpack().debugLogging().addGoal( "-Djunit-dep.version=4.8" ).executeTest().verifyErrorFree( 1 ).verifyTextInLog(
+ "surefire-junit47" );
}
}
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Junit47concurrencyIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Junit47concurrencyIT.java?rev=1236883&r1=1236882&r2=1236883&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Junit47concurrencyIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Junit47concurrencyIT.java Fri Jan 27 20:50:34 2012
@@ -33,8 +33,8 @@ public class Junit47concurrencyIT
throws Exception
{
// todo: Align with others
- unpack( "concurrentjunit47" ).addD( "junitVersion", "4.7" ).setJUnitVersion( "4.7" ).executeTest()
- .verifyErrorFree( 1 );
+ unpack( "concurrentjunit47" ).addD( "junitVersion", "4.7" ).setJUnitVersion(
+ "4.7" ).executeTest().verifyErrorFree( 1 );
}
}
\ No newline at end of file
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=1236883&r1=1236882&r2=1236883&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 Jan 27 20:50:34 2012
@@ -19,8 +19,8 @@ package org.apache.maven.surefire.its;
* under the License.
*/
-import org.apache.maven.surefire.its.fixture.SurefireLauncher;
import org.apache.maven.surefire.its.fixture.SurefireIntegrationTestCase;
+import org.apache.maven.surefire.its.fixture.SurefireLauncher;
/**
* Test JUnit 4 tests marked with "Ignore" attribute
@@ -38,7 +38,8 @@ public class Junit4IgnoreIT
public void testJunit47ParallelIgnore()
{
- unpack().setJUnitVersion( "4.8.1" ).parallelClasses().executeTest().verifyErrorFreeLog().assertTestSuiteResults( 7, 0, 0, 7 );
+ unpack().setJUnitVersion( "4.8.1" ).parallelClasses().executeTest().verifyErrorFreeLog().assertTestSuiteResults(
+ 7, 0, 0, 7 );
}
private SurefireLauncher unpack()
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Junit4VersionsIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Junit4VersionsIT.java?rev=1236883&r1=1236882&r2=1236883&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Junit4VersionsIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/Junit4VersionsIT.java Fri Jan 27 20:50:34 2012
@@ -19,8 +19,8 @@ package org.apache.maven.surefire.its;
* under the License.
*/
-import org.apache.maven.surefire.its.fixture.SurefireLauncher;
import org.apache.maven.surefire.its.fixture.SurefireIntegrationTestCase;
+import org.apache.maven.surefire.its.fixture.SurefireLauncher;
/**
* Basic suite test using all known versions of JUnit 4.x
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/NoRunnableTestsInClassIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/NoRunnableTestsInClassIT.java?rev=1236883&r1=1236882&r2=1236883&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/NoRunnableTestsInClassIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/NoRunnableTestsInClassIT.java Fri Jan 27 20:50:34 2012
@@ -29,9 +29,9 @@ import org.apache.maven.surefire.its.fix
public class NoRunnableTestsInClassIT
extends SurefireIntegrationTestCase
{
- public void testJunit3ParallelBuildResultCount()
+ public void testJunit3ParallelBuildResultCount()
{
- unpack( "norunnableTests" ).failNever().executeTest()
- .verifyTextInLog( "No tests found in junit.norunnabletests.BasicTest" );
+ unpack( "norunnableTests" ).failNever().executeTest().verifyTextInLog(
+ "No tests found in junit.norunnabletests.BasicTest" );
}
}
\ No newline at end of file
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/PlexusConflictIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/PlexusConflictIT.java?rev=1236883&r1=1236882&r2=1236883&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/PlexusConflictIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/PlexusConflictIT.java Fri Jan 27 20:50:34 2012
@@ -19,8 +19,8 @@ package org.apache.maven.surefire.its;
* under the License.
*/
-import org.apache.maven.surefire.its.fixture.SurefireLauncher;
import org.apache.maven.surefire.its.fixture.SurefireIntegrationTestCase;
+import org.apache.maven.surefire.its.fixture.SurefireLauncher;
/**
* Test library using a conflicting version of plexus-utils
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ReportersIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ReportersIT.java?rev=1236883&r1=1236882&r2=1236883&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ReportersIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ReportersIT.java Fri Jan 27 20:50:34 2012
@@ -33,9 +33,7 @@ public class ReportersIT
{
public void testRedirectOutputTestNg()
{
- OutputValidator reporters = unpack( "reporters" )
- .redirectToFile( true )
- .printSummary( true ).executeTest();
+ OutputValidator reporters = unpack( "reporters" ).redirectToFile( true ).printSummary( true ).executeTest();
reporters.getSurefireReportsFile( "TestSuite-output.txt" ).assertFileExists();
reporters.getSurefireReportsFile( "TEST-TestSuite.xml" ).assertFileExists();
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ResultCountingIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ResultCountingIT.java?rev=1236883&r1=1236882&r2=1236883&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ResultCountingIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/ResultCountingIT.java Fri Jan 27 20:50:34 2012
@@ -19,12 +19,11 @@ package org.apache.maven.surefire.its;
* under the License.
*/
+import java.io.IOException;
import org.apache.maven.it.VerificationException;
import org.apache.maven.surefire.its.fixture.OutputValidator;
import org.apache.maven.surefire.its.fixture.SurefireIntegrationTestCase;
-import java.io.IOException;
-
/**
* Verifies that the providers get the result summary at the bottom of the run correctly, in different forkmodes
* SUREFIRE-613 Asserts proper test counts when running in parallel
@@ -34,7 +33,7 @@ import java.io.IOException;
public class ResultCountingIT
extends SurefireIntegrationTestCase
{
- public void testCountingWithJunit481ForkNever()
+ public void testCountingWithJunit481ForkNever()
throws Exception
{
assertForkMode( "never" );
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/RunOrderIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/RunOrderIT.java?rev=1236883&r1=1236882&r2=1236883&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/RunOrderIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/RunOrderIT.java Fri Jan 27 20:50:34 2012
@@ -23,8 +23,8 @@ import java.io.IOException;
import java.util.Calendar;
import org.apache.maven.it.VerificationException;
import org.apache.maven.surefire.its.fixture.OutputValidator;
-import org.apache.maven.surefire.its.fixture.SurefireLauncher;
import org.apache.maven.surefire.its.fixture.SurefireIntegrationTestCase;
+import org.apache.maven.surefire.its.fixture.SurefireLauncher;
/**
* Verifies the runOrder setting and its effect
@@ -73,8 +73,8 @@ public class RunOrderIT
public void testNonExistingRunOrder()
throws Exception
{
- unpack().forkMode( getForkMode() ).runOrder( "nonExistingRunOrder" ).executeTestWithFailure()
- .verifyTextInLog( "There's no RunOrder with the name nonExistingRunOrder." );
+ unpack().forkMode( getForkMode() ).runOrder( "nonExistingRunOrder" ).executeTestWithFailure().verifyTextInLog(
+ "There's no RunOrder with the name nonExistingRunOrder." );
}
private OutputValidator executeWithRunOrder( String runOrder )
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/SiblingAggregatorIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/SiblingAggregatorIT.java?rev=1236883&r1=1236882&r2=1236883&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/SiblingAggregatorIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/SiblingAggregatorIT.java Fri Jan 27 20:50:34 2012
@@ -19,8 +19,8 @@ package org.apache.maven.surefire.its;
* under the License.
*/
-import org.apache.maven.surefire.its.fixture.SurefireLauncher;
import org.apache.maven.surefire.its.fixture.SurefireIntegrationTestCase;
+import org.apache.maven.surefire.its.fixture.SurefireLauncher;
/**
* Test aggregator as a sibling to child modules; invokes modules as "../child"
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/SystemPropertiesTestIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/SystemPropertiesTestIT.java?rev=1236883&r1=1236882&r2=1236883&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/SystemPropertiesTestIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/SystemPropertiesTestIT.java Fri Jan 27 20:50:34 2012
@@ -19,8 +19,8 @@ package org.apache.maven.surefire.its;
* under the License.
*/
-import org.apache.maven.surefire.its.fixture.SurefireLauncher;
import org.apache.maven.surefire.its.fixture.SurefireIntegrationTestCase;
+import org.apache.maven.surefire.its.fixture.SurefireLauncher;
/**
* Test system properties
@@ -33,21 +33,16 @@ public class SystemPropertiesTestIT
public void testSystemProperties()
{
- unpack().addGoal( "-DsetOnMavenCommandLine=baz" )
- .addGoal( "-DsetOnArgLineWorkAround=baz" )
- .executeTest()
- .verifyErrorFree( 8 );
+ unpack().addGoal( "-DsetOnMavenCommandLine=baz" ).addGoal(
+ "-DsetOnArgLineWorkAround=baz" ).executeTest().verifyErrorFree( 8 );
}
public void testSystemPropertiesNoFork()
{
- unpack().forkNever().addGoal( "-DsetOnMavenCommandLine=baz" )
- .addGoal( "-DsetOnArgLineWorkAround=baz" )
- // DGF fake the argLine, since we're not forking
- .addGoal( "-DsetOnArgLine=bar" )
- .executeTest()
- .verifyErrorFree( 8 );
+ unpack().forkNever().addGoal( "-DsetOnMavenCommandLine=baz" ).addGoal( "-DsetOnArgLineWorkAround=baz" )
+ // DGF fake the argLine, since we're not forking
+ .addGoal( "-DsetOnArgLine=bar" ).executeTest().verifyErrorFree( 8 );
}
public SurefireLauncher unpack()
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgGroupsIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgGroupsIT.java?rev=1236883&r1=1236882&r2=1236883&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgGroupsIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgGroupsIT.java Fri Jan 27 20:50:34 2012
@@ -19,17 +19,16 @@ package org.apache.maven.surefire.its;
* under the License.
*/
-import org.apache.maven.surefire.its.fixture.SurefireLauncher;
import org.apache.maven.surefire.its.fixture.SurefireIntegrationTestCase;
+import org.apache.maven.surefire.its.fixture.SurefireLauncher;
/**
* Test that TestNG's @Test(threadPoolSize = n, invocationCount=n) causes tests to be run in parallel.
- *
+ *
* @author <a href="mailto:spam.haikal@gmail.com">Haikal Saadh</a>
- *
*/
public class TestNgGroupsIT
- extends SurefireIntegrationTestCase
+ extends SurefireIntegrationTestCase
{
public void testTestNgGroupThreadParallel()
{
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgParallelWithAnnotationsIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgParallelWithAnnotationsIT.java?rev=1236883&r1=1236882&r2=1236883&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgParallelWithAnnotationsIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestNgParallelWithAnnotationsIT.java Fri Jan 27 20:50:34 2012
@@ -23,15 +23,14 @@ import org.apache.maven.surefire.its.fix
/**
* Test that TestNG's @Test(threadPoolSize = n, invocationCount=n) causes tests to be run in parallel.
- *
+ *
* @author <a href="mailto:spam.haikal@gmail.com">Haikal Saadh</a>
- *
*/
public class TestNgParallelWithAnnotationsIT
- extends SurefireIntegrationTestCase
+ extends SurefireIntegrationTestCase
{
public void testTestNgGroupThreadParallel()
{
- executeErrorFreeTest( "/testng-parallel-with-annotations", 3);
+ executeErrorFreeTest( "/testng-parallel-with-annotations", 3 );
}
}
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestSingleMethodIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestSingleMethodIT.java?rev=1236883&r1=1236882&r2=1236883&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestSingleMethodIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TestSingleMethodIT.java Fri Jan 27 20:50:34 2012
@@ -29,7 +29,7 @@ import org.apache.maven.surefire.its.fix
public class TestSingleMethodIT
extends SurefireIntegrationTestCase
{
- public void singleMethod(String projectName)
+ public void singleMethod( String projectName )
throws Exception
{
unpack( projectName ).executeTest().verifyErrorFreeLog().assertTestSuiteResults( 1, 0, 0, 0 );
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TimeoutForkedTestIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TimeoutForkedTestIT.java?rev=1236883&r1=1236882&r2=1236883&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TimeoutForkedTestIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TimeoutForkedTestIT.java Fri Jan 27 20:50:34 2012
@@ -32,9 +32,10 @@ public class TimeoutForkedTestIT
public void testTimeoutForked()
throws Exception
{
- unpack( "/timeout-forked" ).addGoal( "-DsleepLength=10000" ).addGoal( "-DforkTimeout=1" ).executeTestWithFailure();
+ unpack( "/timeout-forked" ).addGoal( "-DsleepLength=10000" ).addGoal(
+ "-DforkTimeout=1" ).executeTestWithFailure();
// SUREFIRE-468 test that had to be reverted due to SUREFIRE-705
- //assertFalse( getSurefireReportsFile( "TEST-timeoutForked.BasicTest.xml" ).exists() );
+ //assertFalse( getSurefireReportsFile( "TEST-timeoutForked.BasicTest.xml" ).exists() );
// assertFalse( getSurefireReportsFile( "timeoutForked.BasicTest.txt" ).exists() );
}
}
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TwoTestCasesIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TwoTestCasesIT.java?rev=1236883&r1=1236882&r2=1236883&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TwoTestCasesIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/TwoTestCasesIT.java Fri Jan 27 20:50:34 2012
@@ -23,10 +23,11 @@ import java.io.File;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
-
-import org.apache.maven.surefire.its.fixture.*;
import org.apache.maven.surefire.its.fixture.HelperAssertions;
+import org.apache.maven.surefire.its.fixture.IntegrationTestSuiteResults;
+import org.apache.maven.surefire.its.fixture.OutputValidator;
import org.apache.maven.surefire.its.fixture.ReportTestSuite;
+import org.apache.maven.surefire.its.fixture.SurefireIntegrationTestCase;
/**
* Test running two test cases; confirms reporting works correctly
@@ -84,7 +85,8 @@ public class TwoTestCasesIT
final OutputValidator outputValidator = unpack( "junit4-twoTestCaseSuite" ).executeTest();
outputValidator.verifyErrorFreeLog().assertTestSuiteResults( 2, 0, 0, 0 );
- List<ReportTestSuite> reports = HelperAssertions.extractReports( ( new File[]{ outputValidator.getBaseDir() } ) );
+ List<ReportTestSuite> reports =
+ HelperAssertions.extractReports( ( new File[]{ outputValidator.getBaseDir() } ) );
Set<String> classNames = extractClassNames( reports );
assertContains( classNames, "twoTestCaseSuite.BasicTest" );
assertContains( classNames, "twoTestCaseSuite.Junit4TestTwo" );
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/UmlautDirIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/UmlautDirIT.java?rev=1236883&r1=1236882&r2=1236883&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/UmlautDirIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/UmlautDirIT.java Fri Jan 27 20:50:34 2012
@@ -24,8 +24,8 @@ import java.io.IOException;
import org.apache.maven.it.VerificationException;
import org.apache.maven.it.Verifier;
import org.apache.maven.it.util.FileUtils;
-import org.apache.maven.surefire.its.fixture.SurefireLauncher;
import org.apache.maven.surefire.its.fixture.SurefireIntegrationTestCase;
+import org.apache.maven.surefire.its.fixture.SurefireLauncher;
/**
* Test a directory with an umlaut
@@ -56,5 +56,5 @@ public class UmlautDirIT
unpackLocation.renameTo( dest );
return new SurefireLauncher( new Verifier( dest.getAbsolutePath() ) );
}
-
+
}
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=1236883&r1=1236882&r2=1236883&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 Jan 27 20:50:34 2012
@@ -25,8 +25,8 @@ import java.io.IOException;
import java.util.Properties;
import org.apache.maven.it.VerificationException;
import org.apache.maven.surefire.its.fixture.OutputValidator;
-import org.apache.maven.surefire.its.fixture.SurefireLauncher;
import org.apache.maven.surefire.its.fixture.SurefireIntegrationTestCase;
+import org.apache.maven.surefire.its.fixture.SurefireLauncher;
import org.apache.maven.surefire.its.fixture.TestFile;
/**
@@ -94,7 +94,7 @@ public class WorkingDirectoryIT
return child;
}
-
+
private TestFile getOutFile( OutputValidator child )
{
return child.getTargetFile( "out.txt" );
@@ -115,11 +115,13 @@ public class WorkingDirectoryIT
// test if not a symlink
if ( childTestDir.getBaseDir().equals( childTestDir.getBaseDir().getAbsoluteFile() ) )
{
- assertEquals( "wrong user.dir ! symlink ", childTestDir.getBaseDir().getAbsolutePath(), userDir.getAbsolutePath() );
+ assertEquals( "wrong user.dir ! symlink ", childTestDir.getBaseDir().getAbsolutePath(),
+ userDir.getAbsolutePath() );
}
else
{
- assertEquals( "wrong user.dir symlink ", childTestDir.getBaseDir().getCanonicalPath(), userDir.getCanonicalPath() );
+ assertEquals( "wrong user.dir symlink ", childTestDir.getBaseDir().getCanonicalPath(),
+ userDir.getCanonicalPath() );
}
}
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/WorkingDirectoryIsInvalidPropertyIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/WorkingDirectoryIsInvalidPropertyIT.java?rev=1236883&r1=1236882&r2=1236883&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/WorkingDirectoryIsInvalidPropertyIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/WorkingDirectoryIsInvalidPropertyIT.java Fri Jan 27 20:50:34 2012
@@ -13,8 +13,7 @@ public class WorkingDirectoryIsInvalidPr
public void testWorkingDirectory()
throws Exception
{
- unpack( "working-directory-is-invalid-property" )
- .executeTestWithFailure()
- .verifyTextInLog( "workingDirectory cannot be null" );
+ unpack( "working-directory-is-invalid-property" ).executeTestWithFailure().verifyTextInLog(
+ "workingDirectory cannot be null" );
}
}
\ No newline at end of file
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/XmlReporterRunTimeIT.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/XmlReporterRunTimeIT.java?rev=1236883&r1=1236882&r2=1236883&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/XmlReporterRunTimeIT.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/XmlReporterRunTimeIT.java Fri Jan 27 20:50:34 2012
@@ -19,12 +19,12 @@ package org.apache.maven.surefire.its;
* under the License.
*/
-import org.apache.maven.surefire.its.fixture.*;
-import org.apache.maven.surefire.its.fixture.HelperAssertions;
-import org.apache.maven.surefire.its.fixture.ReportTestSuite;
-
import java.io.File;
import java.util.List;
+import org.apache.maven.surefire.its.fixture.HelperAssertions;
+import org.apache.maven.surefire.its.fixture.OutputValidator;
+import org.apache.maven.surefire.its.fixture.ReportTestSuite;
+import org.apache.maven.surefire.its.fixture.SurefireIntegrationTestCase;
/**
* Test reported runtime
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/HelperAssertions.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/HelperAssertions.java?rev=1236883&r1=1236882&r2=1236883&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/HelperAssertions.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/java/org/apache/maven/surefire/its/fixture/HelperAssertions.java Fri Jan 27 20:50:34 2012
@@ -39,14 +39,15 @@ public class HelperAssertions
/**
* assert that the reports in the specified testDir have the right summary statistics
*/
- public static void assertIntegrationTestSuiteResults( int total, int errors, int failures, int skipped, File testDir )
+ public static void assertIntegrationTestSuiteResults( int total, int errors, int failures, int skipped,
+ File testDir )
{
- IntegrationTestSuiteResults suite = parseIntegrationTestResults( new File[] { testDir } );
+ IntegrationTestSuiteResults suite = parseIntegrationTestResults( new File[]{ testDir } );
assertTestSuiteResults( total, errors, failures, skipped, suite );
}
public static void assertTestSuiteResults( int total, int errors, int failures, int skipped,
- IntegrationTestSuiteResults actualSuite )
+ IntegrationTestSuiteResults actualSuite )
{
Assert.assertEquals( "wrong number of tests", total, actualSuite.getTotal() );
Assert.assertEquals( "wrong number of errors", errors, actualSuite.getErrors() );