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 [5/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-providers/surefire-junit3/src/main/java/org/apache/maven/surefire/junit/PojoTestSet.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-providers/surefire-junit3/src/main/java/org/apache/maven/surefire/junit/PojoTestSet.java?rev=1236883&r1=1236882&r2=1236883&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-providers/surefire-junit3/src/main/java/org/apache/maven/surefire/junit/PojoTestSet.java (original)
+++ maven/surefire/trunk/surefire-providers/surefire-junit3/src/main/java/org/apache/maven/surefire/junit/PojoTestSet.java Fri Jan 27 20:50:34 2012
@@ -19,17 +19,16 @@ package org.apache.maven.surefire.junit;
* under the License.
*/
-import org.apache.maven.surefire.report.PojoStackTraceWriter;
-import org.apache.maven.surefire.report.RunListener;
-import org.apache.maven.surefire.report.ReportEntry;
-import org.apache.maven.surefire.report.SimpleReportEntry;
-import org.apache.maven.surefire.testset.TestSetFailedException;
-
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
import java.util.ArrayList;
import java.util.List;
+import org.apache.maven.surefire.report.PojoStackTraceWriter;
+import org.apache.maven.surefire.report.ReportEntry;
+import org.apache.maven.surefire.report.RunListener;
+import org.apache.maven.surefire.report.SimpleReportEntry;
+import org.apache.maven.surefire.testset.TestSetFailedException;
public class PojoTestSet
implements SurefireTestSet
@@ -42,9 +41,9 @@ public class PojoTestSet
private final Object testObject;
private List testMethods;
-
+
private Method setUpMethod;
-
+
private Method tearDownMethod;
private final Class testClass;
@@ -216,14 +215,22 @@ public class PojoTestSet
return getTestClass().getName() + "." + testMethodName;
}
- private void setUpFixture() throws Throwable
+ private void setUpFixture()
+ throws Throwable
{
- if (setUpMethod != null) setUpMethod.invoke( testObject, new Object[0] );
+ if ( setUpMethod != null )
+ {
+ setUpMethod.invoke( testObject, new Object[0] );
+ }
}
- private void tearDownFixture() throws Throwable
+ private void tearDownFixture()
+ throws Throwable
{
- if (tearDownMethod != null) tearDownMethod.invoke( testObject, new Object[0] );
+ if ( tearDownMethod != null )
+ {
+ tearDownMethod.invoke( testObject, new Object[0] );
+ }
}
private void discoverTestMethods()
@@ -254,13 +261,13 @@ public class PojoTestSet
}
}
}
- else if (m.getName().equals("setUp") && m.getParameterTypes().length == 0)
+ else if ( m.getName().equals( "setUp" ) && m.getParameterTypes().length == 0 )
{
- setUpMethod = m;
+ setUpMethod = m;
}
- else if (m.getName().equals("tearDown") && m.getParameterTypes().length == 0)
+ else if ( m.getName().equals( "tearDown" ) && m.getParameterTypes().length == 0 )
{
- tearDownMethod = m;
+ tearDownMethod = m;
}
}
}
Modified: maven/surefire/trunk/surefire-providers/surefire-junit3/src/main/java/org/apache/maven/surefire/junit/TestListenerInvocationHandler.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-providers/surefire-junit3/src/main/java/org/apache/maven/surefire/junit/TestListenerInvocationHandler.java?rev=1236883&r1=1236882&r2=1236883&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-providers/surefire-junit3/src/main/java/org/apache/maven/surefire/junit/TestListenerInvocationHandler.java (original)
+++ maven/surefire/trunk/surefire-providers/surefire-junit3/src/main/java/org/apache/maven/surefire/junit/TestListenerInvocationHandler.java Fri Jan 27 20:50:34 2012
@@ -19,15 +19,14 @@ package org.apache.maven.surefire.junit;
* under the License.
*/
-import org.apache.maven.surefire.report.RunListener;
-import org.apache.maven.surefire.report.ReportEntry;
-import org.apache.maven.surefire.report.SimpleReportEntry;
-
import java.lang.reflect.InvocationHandler;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.util.HashSet;
import java.util.Set;
+import org.apache.maven.surefire.report.ReportEntry;
+import org.apache.maven.surefire.report.RunListener;
+import org.apache.maven.surefire.report.SimpleReportEntry;
public class TestListenerInvocationHandler
implements InvocationHandler
Modified: maven/surefire/trunk/surefire-providers/surefire-junit3/src/test/java/org/apache/maven/surefire/junit/JUnitTestSetTest.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-providers/surefire-junit3/src/test/java/org/apache/maven/surefire/junit/JUnitTestSetTest.java?rev=1236883&r1=1236882&r2=1236883&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-providers/surefire-junit3/src/test/java/org/apache/maven/surefire/junit/JUnitTestSetTest.java (original)
+++ maven/surefire/trunk/surefire-providers/surefire-junit3/src/test/java/org/apache/maven/surefire/junit/JUnitTestSetTest.java Fri Jan 27 20:50:34 2012
@@ -19,16 +19,16 @@ package org.apache.maven.surefire.junit;
* under the License.
*/
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
+import java.util.ArrayList;
+import java.util.List;
import org.apache.maven.surefire.common.junit3.JUnit3Reflector;
import org.apache.maven.surefire.report.ReportEntry;
import org.apache.maven.surefire.report.RunListener;
import org.apache.maven.surefire.testset.TestSetFailedException;
-import java.util.ArrayList;
-import java.util.List;
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
public class JUnitTestSetTest
extends TestCase
@@ -48,72 +48,73 @@ public class JUnitTestSetTest
( (ReportEntry) succeededTests.get( 0 ) ).getName() );
}
- public static final class AlwaysSucceeds
- extends TestCase
- {
- public void testSuccess() {
- assertTrue( true );
- }
- }
-
- public static class SuccessListener
- implements RunListener
- {
-
- private List succeededTests = new ArrayList();
-
- public void testSetStarting( ReportEntry report )
- {
- }
-
- public void testSetCompleted( ReportEntry report )
- {
- }
-
- public void testStarting( ReportEntry report )
- {
- }
-
- public void testSucceeded( ReportEntry report )
- {
- this.succeededTests.add( report );
- }
-
- public void testAssumptionFailure( ReportEntry report )
- {
- throw new IllegalStateException();
- }
-
- public void testError( ReportEntry report )
- {
- throw new IllegalStateException();
- }
-
- public void testFailed( ReportEntry report )
- {
- throw new IllegalStateException();
- }
-
- public void testSkipped( ReportEntry report )
- {
- throw new IllegalStateException();
- }
-
- public List getSucceededTests()
- {
- return succeededTests;
- }
-
- }
-
- public static class Suite
- {
-
- public static Test suite()
- {
- TestSuite suite = new TestSuite();
- suite.addTestSuite( AlwaysSucceeds.class );
- return suite;
- }
- }
+ public static final class AlwaysSucceeds
+ extends TestCase
+ {
+ public void testSuccess()
+ {
+ assertTrue( true );
+ }
+ }
+
+ public static class SuccessListener
+ implements RunListener
+ {
+
+ private List succeededTests = new ArrayList();
+
+ public void testSetStarting( ReportEntry report )
+ {
+ }
+
+ public void testSetCompleted( ReportEntry report )
+ {
+ }
+
+ public void testStarting( ReportEntry report )
+ {
+ }
+
+ public void testSucceeded( ReportEntry report )
+ {
+ this.succeededTests.add( report );
+ }
+
+ public void testAssumptionFailure( ReportEntry report )
+ {
+ throw new IllegalStateException();
+ }
+
+ public void testError( ReportEntry report )
+ {
+ throw new IllegalStateException();
+ }
+
+ public void testFailed( ReportEntry report )
+ {
+ throw new IllegalStateException();
+ }
+
+ public void testSkipped( ReportEntry report )
+ {
+ throw new IllegalStateException();
+ }
+
+ public List getSucceededTests()
+ {
+ return succeededTests;
+ }
+
+ }
+
+ public static class Suite
+ {
+
+ public static Test suite()
+ {
+ TestSuite suite = new TestSuite();
+ suite.addTestSuite( AlwaysSucceeds.class );
+ return suite;
+ }
+ }
}
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=1236883&r1=1236882&r2=1236883&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 Jan 27 20:50:34 2012
@@ -41,9 +41,9 @@ import org.apache.maven.surefire.util.De
import org.apache.maven.surefire.util.DirectoryScanner;
import org.apache.maven.surefire.util.RunOrderCalculator;
import org.apache.maven.surefire.util.TestsToRun;
-
import org.apache.maven.surefire.util.internal.StringUtils;
import org.codehaus.plexus.util.SelectorUtils;
+
import org.junit.runner.Request;
import org.junit.runner.Result;
import org.junit.runner.Runner;
@@ -99,7 +99,6 @@ public class JUnit4Provider
final RunListener reporter = reporterFactory.createReporter();
-
ConsoleOutputCapture.startCapture( (ConsoleOutputReceiver) reporter );
JUnit4RunListener jUnit4TestSetReporter = new JUnit4RunListener( reporter );
@@ -150,11 +149,12 @@ public class JUnit4Provider
}
}
- private RunNotifier getRunNotifer( org.junit.runner.notification.RunListener main, Result result, List<org.junit.runner.notification.RunListener> others )
+ private RunNotifier getRunNotifer( org.junit.runner.notification.RunListener main, Result result,
+ List<org.junit.runner.notification.RunListener> others )
{
RunNotifier fNotifier = new RunNotifier();
fNotifier.addListener( main );
- fNotifier.addListener( result.createListener() );
+ fNotifier.addListener( result.createListener() );
for ( org.junit.runner.notification.RunListener listener : others )
{
fNotifier.addListener( listener );
@@ -184,7 +184,7 @@ public class JUnit4Provider
private TestsToRun scanClassPath()
{
final TestsToRun scannedClasses = directoryScanner.locateTestClasses( testClassLoader, jUnit4TestChecker );
- return runOrderCalculator.orderTestClasses( scannedClasses );
+ return runOrderCalculator.orderTestClasses( scannedClasses );
}
@SuppressWarnings( "unchecked" )
@@ -220,7 +220,7 @@ public class JUnit4Provider
if ( !StringUtils.isBlank( testMethod ) )
{
Method[] methods = testClass.getMethods();
- for (int i = 0,size = methods.length;i<size;i++)
+ for ( int i = 0, size = methods.length; i < size; i++ )
{
if ( SelectorUtils.match( testMethod, methods[i].getName() ) )
{
Modified: maven/surefire/trunk/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/AsynchronousRunner.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/AsynchronousRunner.java?rev=1236883&r1=1236882&r2=1236883&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/AsynchronousRunner.java (original)
+++ maven/surefire/trunk/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/AsynchronousRunner.java Fri Jan 27 20:50:34 2012
@@ -31,23 +31,23 @@ import org.apache.maven.surefire.util.Ne
import org.junit.runners.model.RunnerScheduler;
/**
-* @author <a href="mailto:kristian@zenior.no">Kristian Rosenvold</a>
-*/
+ * @author <a href="mailto:kristian@zenior.no">Kristian Rosenvold</a>
+ */
public class AsynchronousRunner
implements RunnerScheduler
{
- private final List<Future<Object>> futures = Collections.synchronizedList(new ArrayList<Future<Object>>());
+ private final List<Future<Object>> futures = Collections.synchronizedList( new ArrayList<Future<Object>>() );
private final ExecutorService fService;
- public AsynchronousRunner(ExecutorService fService)
+ public AsynchronousRunner( ExecutorService fService )
{
this.fService = fService;
}
public void schedule( final Runnable childStatement )
{
- futures.add( fService.submit( Executors.callable(childStatement) ) );
+ futures.add( fService.submit( Executors.callable( childStatement ) ) );
}
Modified: maven/surefire/trunk/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/ConfigurableParallelComputer.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/ConfigurableParallelComputer.java?rev=1236883&r1=1236882&r2=1236883&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/ConfigurableParallelComputer.java (original)
+++ maven/surefire/trunk/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/ConfigurableParallelComputer.java Fri Jan 27 20:50:34 2012
@@ -22,11 +22,11 @@ package org.apache.maven.surefire.junitc
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
+import java.util.concurrent.ExecutionException;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
-import java.util.concurrent.ExecutionException;
-
import org.apache.maven.surefire.util.NestedRuntimeException;
+
import org.junit.runner.Computer;
import org.junit.runner.Runner;
import org.junit.runners.ParentRunner;
@@ -140,14 +140,17 @@ public class ConfigurableParallelCompute
throws Throwable
{
Runner runner = super.getRunner( builder, testClass );
- ClassDemarcatingRunner classDemarcatingRunner = new ClassDemarcatingRunner(runner, testClass);
- return fMethods && !isTestSuite( testClass )? parallelize( classDemarcatingRunner, getMethodInterceptor() ) : classDemarcatingRunner;
+ ClassDemarcatingRunner classDemarcatingRunner = new ClassDemarcatingRunner( runner, testClass );
+ return fMethods && !isTestSuite( testClass )
+ ? parallelize( classDemarcatingRunner, getMethodInterceptor() )
+ : classDemarcatingRunner;
}
- private boolean isTestSuite( Class<?> testClass){
+ private boolean isTestSuite( Class<?> testClass )
+ {
// Todo: Find out how/if this is enough
final Suite.SuiteClasses annotation = testClass.getAnnotation( Suite.SuiteClasses.class );
- return (annotation != null);
+ return ( annotation != null );
}
@Override
Modified: maven/surefire/trunk/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/JUnitCoreParameters.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/JUnitCoreParameters.java?rev=1236883&r1=1236882&r2=1236883&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/JUnitCoreParameters.java (original)
+++ maven/surefire/trunk/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/JUnitCoreParameters.java Fri Jan 27 20:50:34 2012
@@ -49,8 +49,7 @@ class JUnitCoreParameters
this.parallel = properties.getProperty( PARALLEL_KEY, "none" ).toLowerCase();
this.perCoreThreadCount = Boolean.valueOf( properties.getProperty( PERCORETHREADCOUNT_KEY, "true" ) );
this.threadCount = Integer.valueOf( properties.getProperty( THREADCOUNT_KEY, "2" ) );
- this.useUnlimitedThreads =
- Boolean.valueOf( properties.getProperty( USEUNLIMITEDTHREADS_KEY, "false" ) );
+ this.useUnlimitedThreads = Boolean.valueOf( properties.getProperty( USEUNLIMITEDTHREADS_KEY, "false" ) );
}
public boolean isParallelMethod()
Modified: maven/surefire/trunk/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/JUnitCoreProvider.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/JUnitCoreProvider.java?rev=1236883&r1=1236882&r2=1236883&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/JUnitCoreProvider.java (original)
+++ maven/surefire/trunk/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/JUnitCoreProvider.java Fri Jan 27 20:50:34 2012
@@ -68,7 +68,6 @@ public class JUnitCoreProvider
private final ProviderParameters providerParameters;
-
private TestsToRun testsToRun;
private JUnit48Reflector jUnit48Reflector;
@@ -120,7 +119,7 @@ public class JUnitCoreProvider
testsToRun = forkTestSet == null ? getSuitesAsList( filter ) : TestsToRun.fromClass( (Class) forkTestSet );
}
- if (testsToRun.size() == 0)
+ if ( testsToRun.size() == 0 )
{
filter = null;
}
@@ -181,15 +180,15 @@ public class JUnitCoreProvider
private Filter createJUnit48Filter()
{
final FilterFactory filterFactory = new FilterFactory( testClassLoader );
- return isMethodFilterSpecified() ?
- filterFactory.createMethodFilter( requestedTestMethod ) :
- filterFactory.createGroupFilter( providerParameters.getProviderProperties() );
+ return isMethodFilterSpecified()
+ ? filterFactory.createMethodFilter( requestedTestMethod )
+ : filterFactory.createGroupFilter( providerParameters.getProviderProperties() );
}
private TestsToRun scanClassPath()
{
final TestsToRun scanned = directoryScanner.locateTestClasses( testClassLoader, scannerFilter );
- return runOrderCalculator.orderTestClasses( scanned );
+ return runOrderCalculator.orderTestClasses( scanned );
}
private boolean isMethodFilterSpecified()
Modified: maven/surefire/trunk/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/SynchronousRunner.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/SynchronousRunner.java?rev=1236883&r1=1236882&r2=1236883&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/SynchronousRunner.java (original)
+++ maven/surefire/trunk/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/SynchronousRunner.java Fri Jan 27 20:50:34 2012
@@ -3,8 +3,8 @@ package org.apache.maven.surefire.junitc
import org.junit.runners.model.RunnerScheduler;
/**
-* @author <a href="mailto:kristian@zenior.no">Kristian Rosenvold</a>
-*/
+ * @author <a href="mailto:kristian@zenior.no">Kristian Rosenvold</a>
+ */
class SynchronousRunner
implements RunnerScheduler
{
Modified: maven/surefire/trunk/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/DiagnosticRunListener.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/DiagnosticRunListener.java?rev=1236883&r1=1236882&r2=1236883&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/DiagnosticRunListener.java (original)
+++ maven/surefire/trunk/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/DiagnosticRunListener.java Fri Jan 27 20:50:34 2012
@@ -32,11 +32,17 @@ public class DiagnosticRunListener
extends RunListener
{
private final AtomicInteger numTestStarted = new AtomicInteger();
+
private final AtomicInteger numTestFailed = new AtomicInteger();
+
private final AtomicInteger numTestAssumptionsFailed = new AtomicInteger();
+
private final AtomicInteger numTestFinished = new AtomicInteger();
+
private final AtomicInteger numTestIgnored = new AtomicInteger();
+
private final boolean printToConsole;
+
private final RunListener target;
Modified: maven/surefire/trunk/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/JUnit4Reflector481Test.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/JUnit4Reflector481Test.java?rev=1236883&r1=1236882&r2=1236883&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/JUnit4Reflector481Test.java (original)
+++ maven/surefire/trunk/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/JUnit4Reflector481Test.java Fri Jan 27 20:50:34 2012
@@ -18,11 +18,11 @@ package org.apache.maven.surefire.junitc
* specific language governing permissions and limitations
* under the License.
*/
-import org.apache.maven.surefire.common.junit4.JUnit4Reflector;
-import org.apache.maven.surefire.util.ReflectionUtils;
import java.lang.annotation.Annotation;
import java.lang.reflect.Method;
+import org.apache.maven.surefire.common.junit4.JUnit4Reflector;
+import org.apache.maven.surefire.util.ReflectionUtils;
import org.junit.Assert;
import org.junit.Ignore;
@@ -31,6 +31,7 @@ import org.junit.runner.Description;
/**
* Reflector Test with junit 4.8.1
+ *
* @author Kristian Rosenvold
*/
public class JUnit4Reflector481Test
@@ -38,17 +39,20 @@ public class JUnit4Reflector481Test
private static final Class[] EMPTY_CLASS_ARRAY = new Class[0];
@Test
- public void testGetAnnotatedIgnore(){
+ public void testGetAnnotatedIgnore()
+ {
JUnit4Reflector reflector = new JUnit4Reflector();
final Method testSomething2 =
ReflectionUtils.getMethod( IgnoreWithDescription.class, "testSomething2", EMPTY_CLASS_ARRAY );
final Annotation[] annotations = testSomething2.getAnnotations();
- Description desc = Description.createTestDescription( IgnoreWithDescription.class, "testSomething2", annotations );
- Ignore annotatedIgnore = reflector.getAnnotatedIgnore( desc );
+ Description desc =
+ Description.createTestDescription( IgnoreWithDescription.class, "testSomething2", annotations );
+ Ignore annotatedIgnore = reflector.getAnnotatedIgnore( desc );
Assert.assertEquals( reason, annotatedIgnore.value() );
}
private static final String reason = "Ignorance is bliss";
+
public static class IgnoreWithDescription
{
Modified: maven/surefire/trunk/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/JUnitCoreParametersTest.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/JUnitCoreParametersTest.java?rev=1236883&r1=1236882&r2=1236883&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/JUnitCoreParametersTest.java (original)
+++ maven/surefire/trunk/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/JUnitCoreParametersTest.java Fri Jan 27 20:50:34 2012
@@ -19,10 +19,10 @@ package org.apache.maven.surefire.junitc
* under the License.
*/
-import junit.framework.TestCase;
-
import java.util.Properties;
+import junit.framework.TestCase;
+
/*
* @author Kristian Rosenvold, kristian.rosenvold@gmail com
*/
Modified: maven/surefire/trunk/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/JUnitCoreRunListenerTest.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/JUnitCoreRunListenerTest.java?rev=1236883&r1=1236882&r2=1236883&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/JUnitCoreRunListenerTest.java (original)
+++ maven/surefire/trunk/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/JUnitCoreRunListenerTest.java Fri Jan 27 20:50:34 2012
@@ -19,9 +19,8 @@ package org.apache.maven.surefire.junitc
* under the License.
*/
-import org.apache.maven.surefire.junit4.MockReporter;
-
import java.util.HashMap;
+import org.apache.maven.surefire.junit4.MockReporter;
import junit.framework.TestCase;
import org.junit.Assume;
Modified: maven/surefire/trunk/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/MavenSurefireJUnit48RunnerTest.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/MavenSurefireJUnit48RunnerTest.java?rev=1236883&r1=1236882&r2=1236883&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/MavenSurefireJUnit48RunnerTest.java (original)
+++ maven/surefire/trunk/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/MavenSurefireJUnit48RunnerTest.java Fri Jan 27 20:50:34 2012
@@ -27,7 +27,7 @@ import org.junit.runner.notification.Fai
* TestCase that expose "No tests were executed!" on Test failure using Maven Surefire 2.6-SNAPSHOT
* and the JUnit 4.8 Runner.
* {@code
- * * <p/>
+ * * <p/>
* -------------------------------------------------------
* T E S T S
* -------------------------------------------------------
Modified: maven/surefire/trunk/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/Surefire746Test.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/Surefire746Test.java?rev=1236883&r1=1236882&r2=1236883&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/Surefire746Test.java (original)
+++ maven/surefire/trunk/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/Surefire746Test.java Fri Jan 27 20:50:34 2012
@@ -150,7 +150,8 @@ public class Surefire746Test
public void testFinished( Description description )
throws Exception
{
- throw new RuntimeException( "This Exception will cause Surefire to receive a internal JUnit Description and fail" );
+ throw new RuntimeException(
+ "This Exception will cause Surefire to receive a internal JUnit Description and fail" );
}
}
}
\ No newline at end of file
Modified: maven/surefire/trunk/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/TestMethodTest.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/TestMethodTest.java?rev=1236883&r1=1236882&r2=1236883&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/TestMethodTest.java (original)
+++ maven/surefire/trunk/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/TestMethodTest.java Fri Jan 27 20:50:34 2012
@@ -19,10 +19,11 @@ package org.apache.maven.surefire.junitc
* under the License.
*/
-import junit.framework.TestCase;
import org.apache.maven.surefire.report.ReportEntry;
import org.apache.maven.surefire.report.SimpleReportEntry;
+import junit.framework.TestCase;
+
/**
* @author Kristian Rosenvold
*/
Modified: maven/surefire/trunk/surefire-providers/surefire-testng-utils/src/main/java/org/apache/maven/surefire/testng/utils/GroupMatcherMethodSelector.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-providers/surefire-testng-utils/src/main/java/org/apache/maven/surefire/testng/utils/GroupMatcherMethodSelector.java?rev=1236883&r1=1236882&r2=1236883&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-providers/surefire-testng-utils/src/main/java/org/apache/maven/surefire/testng/utils/GroupMatcherMethodSelector.java (original)
+++ maven/surefire/trunk/surefire-providers/surefire-testng-utils/src/main/java/org/apache/maven/surefire/testng/utils/GroupMatcherMethodSelector.java Fri Jan 27 20:50:34 2012
@@ -3,12 +3,12 @@ package org.apache.maven.surefire.testng
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-
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.parse.GroupMatcherParser;
import org.apache.maven.surefire.group.parse.ParseException;
+
import org.testng.IMethodSelector;
import org.testng.IMethodSelectorContext;
import org.testng.ITestNGMethod;
@@ -79,8 +79,9 @@ public class GroupMatcherMethodSelector
}
catch ( ParseException e )
{
- throw new IllegalArgumentException( "Cannot parse group includes/excludes expression(s):\nIncludes: "
- + groups + "\nExcludes: " + excludedGroups, e );
+ throw new IllegalArgumentException(
+ "Cannot parse group includes/excludes expression(s):\nIncludes: " + groups + "\nExcludes: "
+ + excludedGroups, e );
}
}
Modified: maven/surefire/trunk/surefire-providers/surefire-testng-utils/src/main/java/org/apache/maven/surefire/testng/utils/MethodSelector.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?rev=1236883&r1=1236882&r2=1236883&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-providers/surefire-testng-utils/src/main/java/org/apache/maven/surefire/testng/utils/MethodSelector.java (original)
+++ maven/surefire/trunk/surefire-providers/surefire-testng-utils/src/main/java/org/apache/maven/surefire/testng/utils/MethodSelector.java Fri Jan 27 20:50:34 2012
@@ -19,13 +19,13 @@ package org.apache.maven.surefire.testng
* under the License.
*/
+import java.util.List;
import org.codehaus.plexus.util.SelectorUtils;
+
import org.testng.IMethodSelector;
import org.testng.IMethodSelectorContext;
import org.testng.ITestNGMethod;
-import java.util.List;
-
/**
* For internal use only
*
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=1236883&r1=1236882&r2=1236883&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 Jan 27 20:50:34 2012
@@ -71,9 +71,9 @@ public class TestNGDirectoryTestSuite
private final RunOrderCalculator runOrderCalculator;
public TestNGDirectoryTestSuite( File basedir, ArrayList includes, ArrayList excludes, ArrayList specificTests,
- String testSourceDirectory,
- String artifactVersion, Properties confOptions, File reportsDirectory,
- String testMethodPattern, RunOrderCalculator runOrderCalculator )
+ String testSourceDirectory, String artifactVersion, Properties confOptions,
+ File reportsDirectory, String testMethodPattern,
+ RunOrderCalculator runOrderCalculator )
{
this.surefireDirectoryScanner = new DefaultDirectoryScanner( basedir, includes, excludes, specificTests );
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=1236883&r1=1236882&r2=1236883&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 Jan 27 20:50:34 2012
@@ -25,7 +25,6 @@ import java.lang.reflect.InvocationTarge
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;
@@ -38,6 +37,7 @@ import org.apache.maven.surefire.testng.
import org.apache.maven.surefire.testset.TestSetFailedException;
import org.apache.maven.surefire.util.NestedRuntimeException;
import org.apache.maven.surefire.util.internal.StringUtils;
+
import org.testng.TestNG;
/**
@@ -48,21 +48,22 @@ import org.testng.TestNG;
*/
public class TestNGExecutor
{
-
-
+
+
private TestNGExecutor()
{
// noop
}
public static void run( Class[] testClasses, String testSourceDirectory, Map options, ArtifactVersion version,
- RunListener reportManager, TestNgTestSuite suite, File reportsDirectory, final String methodNamePattern )
+ RunListener reportManager, TestNgTestSuite suite, File reportsDirectory,
+ final String methodNamePattern )
throws TestSetFailedException
{
TestNG testng = new TestNG( true );
applyGroupMatching( testng, options );
- if (!StringUtils.isBlank( methodNamePattern ))
+ if ( !StringUtils.isBlank( methodNamePattern ) )
{
applyMethodNameFiltering( testng, methodNamePattern );
}
@@ -75,46 +76,46 @@ public class TestNGExecutor
testng.run();
}
- private static void applyMethodNameFiltering(TestNG testng, String methodNamePattern)
+ 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 );
+ 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} );
+ Method method = clazz.getMethod( "setMethodName", new Class[]{ String.class } );
+ method.invoke( null, new Object[]{ methodNamePattern } );
}
catch ( ClassNotFoundException e )
{
- throw new TestSetFailedException(e.getMessage(), e);
+ throw new TestSetFailedException( e.getMessage(), e );
}
catch ( SecurityException e )
{
- throw new TestSetFailedException(e.getMessage(), e);
+ throw new TestSetFailedException( e.getMessage(), e );
}
catch ( NoSuchMethodException e )
{
- throw new TestSetFailedException(e.getMessage(), e);
+ throw new TestSetFailedException( e.getMessage(), e );
}
catch ( IllegalArgumentException e )
{
- throw new TestSetFailedException(e.getMessage(), e);
+ throw new TestSetFailedException( e.getMessage(), e );
}
catch ( IllegalAccessException e )
{
- throw new TestSetFailedException(e.getMessage(), e);
+ throw new TestSetFailedException( e.getMessage(), e );
}
catch ( InvocationTargetException e )
{
- throw new TestSetFailedException(e.getMessage(), e);
- }
+ throw new TestSetFailedException( e.getMessage(), e );
+ }
}
-
+
private static void applyGroupMatching( TestNG testng, Map options )
throws TestSetFailedException
{
@@ -135,8 +136,8 @@ public class TestNGExecutor
Class clazz = Class.forName( clazzName );
// HORRIBLE hack, but TNG doesn't allow us to setup a method selector instance directly.
- Method method = clazz.getMethod( "setGroups", new Class[] { String.class, String.class } );
- method.invoke( null, new Object[] { groups, excludedGroups } );
+ Method method = clazz.getMethod( "setGroups", new Class[]{ String.class, String.class } );
+ method.invoke( null, new Object[]{ groups, excludedGroups } );
}
catch ( ClassNotFoundException e )
{
@@ -206,8 +207,8 @@ public class TestNGExecutor
}
- private static void postConfigure( TestNG testNG, String sourcePath, RunListener reportManager, TestNgTestSuite suite,
- File reportsDirectory )
+ private static void postConfigure( TestNG testNG, String sourcePath, RunListener reportManager,
+ TestNgTestSuite suite, File reportsDirectory )
throws TestSetFailedException
{
// turn off all TestNG output
@@ -248,5 +249,5 @@ public class TestNGExecutor
return new TestNGReporter( reportManager );
}
}
-
+
}
Modified: maven/surefire/trunk/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGReporter.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGReporter.java?rev=1236883&r1=1236882&r2=1236883&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGReporter.java (original)
+++ maven/surefire/trunk/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGReporter.java Fri Jan 27 20:50:34 2012
@@ -19,14 +19,13 @@ package org.apache.maven.surefire.testng
* under the License.
*/
+import java.util.ResourceBundle;
import org.apache.maven.surefire.report.CategorizedReportEntry;
import org.apache.maven.surefire.report.PojoStackTraceWriter;
import org.apache.maven.surefire.report.ReportEntry;
import org.apache.maven.surefire.report.RunListener;
import org.apache.maven.surefire.report.SimpleReportEntry;
-import java.util.ResourceBundle;
-
import org.testng.ISuite;
import org.testng.ISuiteListener;
import org.testng.ITestContext;
Modified: maven/surefire/trunk/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGTestSet.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGTestSet.java?rev=1236883&r1=1236882&r2=1236883&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGTestSet.java (original)
+++ maven/surefire/trunk/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGTestSet.java Fri Jan 27 20:50:34 2012
@@ -32,6 +32,7 @@ public class TestNGTestSet
/**
* Creates a new test testset that will process the class being
* passed in to determine the testing configuration.
+ *
* @param testClass The test class
*/
public TestNGTestSet( Class testClass )
Modified: maven/surefire/trunk/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/AbstractDirectConfigurator.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/AbstractDirectConfigurator.java?rev=1236883&r1=1236882&r2=1236883&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/AbstractDirectConfigurator.java (original)
+++ maven/surefire/trunk/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/AbstractDirectConfigurator.java Fri Jan 27 20:50:34 2012
@@ -25,10 +25,10 @@ import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
-
import org.apache.maven.surefire.booter.ProviderParameterNames;
import org.apache.maven.surefire.testset.TestSetFailedException;
import org.apache.maven.surefire.util.NestedRuntimeException;
+
import org.testng.TestNG;
public abstract class AbstractDirectConfigurator
@@ -129,10 +129,10 @@ public abstract class AbstractDirectConf
public void invoke( Object target, Object value )
throws Exception
{
- Method setter = target.getClass().getMethod( this.setterName, new Class[] { this.paramClass } );
+ Method setter = target.getClass().getMethod( this.setterName, new Class[]{ this.paramClass } );
if ( setter != null )
{
- setter.invoke( target, new Object[] { convertValue( value ) } );
+ setter.invoke( target, new Object[]{ convertValue( value ) } );
}
}
Modified: maven/surefire/trunk/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/Configurator.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/Configurator.java?rev=1236883&r1=1236882&r2=1236883&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/Configurator.java (original)
+++ maven/surefire/trunk/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/Configurator.java Fri Jan 27 20:50:34 2012
@@ -19,12 +19,13 @@ package org.apache.maven.surefire.testng
* under the License.
*/
+import java.util.Map;
import org.apache.maven.surefire.testset.TestSetFailedException;
-import org.testng.TestNG;
-import java.util.Map;
+import org.testng.TestNG;
public interface Configurator
{
- void configure( TestNG testng, Map options ) throws TestSetFailedException;
+ void configure( TestNG testng, Map options )
+ throws TestSetFailedException;
}
\ No newline at end of file
Modified: maven/surefire/trunk/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/TestNG4751Configurator.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/TestNG4751Configurator.java?rev=1236883&r1=1236882&r2=1236883&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/TestNG4751Configurator.java (original)
+++ maven/surefire/trunk/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/TestNG4751Configurator.java Fri Jan 27 20:50:34 2012
@@ -31,7 +31,7 @@ import org.apache.maven.surefire.booter.
* -threadcount (int)
* -parallel (boolean)
* <p/>
- *
+ *
* @author <a href='mailto:the[dot]mindstorm[at]gmail[dot]com'>Alex Popescu</a>
*/
public class TestNG4751Configurator
Modified: maven/surefire/trunk/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/TestNG52Configurator.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/TestNG52Configurator.java?rev=1236883&r1=1236882&r2=1236883&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/TestNG52Configurator.java (original)
+++ maven/surefire/trunk/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/TestNG52Configurator.java Fri Jan 27 20:50:34 2012
@@ -31,7 +31,7 @@ import org.apache.maven.surefire.booter.
* -threadcount (int)
* -parallel (String)
* <p/>
- *
+ *
* @author <a href='mailto:the[dot]mindstorm[at]gmail[dot]com'>Alex Popescu</a>
*/
public class TestNG52Configurator
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=1236883&r1=1236882&r2=1236883&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 Fri Jan 27 20:50:34 2012
@@ -24,9 +24,9 @@ import java.util.ArrayList;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
-
import org.apache.maven.surefire.booter.ProviderParameterNames;
import org.apache.maven.surefire.testset.TestSetFailedException;
+
import org.testng.TestNG;
/**
@@ -39,7 +39,7 @@ import org.testng.TestNG;
* <code>TestNGCommandLineArgs.REPORTERS_LIST</code> which is a <code>List>ReporterConfig<</code>.
* <p/>
* Test classes and/or suite files are not passed along as options parameters, but configured separately.
- *
+ *
* @author <a href='mailto:the[dot]mindstorm[at]gmail[dot]com'>Alex Popescu</a>
*/
public class TestNGMapConfigurator
@@ -102,8 +102,8 @@ public class TestNGMapConfigurator
try
{
Class reporterConfig = Class.forName( reporterConfigClassName );
- Method deserialize = reporterConfig.getMethod( "deserialize", new Class[] { String.class } );
- Object rc = deserialize.invoke( null, new Object[] { val } );
+ Method deserialize = reporterConfig.getMethod( "deserialize", new Class[]{ String.class } );
+ Object rc = deserialize.invoke( null, new Object[]{ val } );
ArrayList reportersList = new ArrayList();
reportersList.add( rc );
return reportersList;
Modified: maven/surefire/trunk/surefire-setup-integration-tests/src/test/java/org/apache/maven/surefire/its/SetUpForIntegrationTest.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-setup-integration-tests/src/test/java/org/apache/maven/surefire/its/SetUpForIntegrationTest.java?rev=1236883&r1=1236882&r2=1236883&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-setup-integration-tests/src/test/java/org/apache/maven/surefire/its/SetUpForIntegrationTest.java (original)
+++ maven/surefire/trunk/surefire-setup-integration-tests/src/test/java/org/apache/maven/surefire/its/SetUpForIntegrationTest.java Fri Jan 27 20:50:34 2012
@@ -18,11 +18,11 @@ package org.apache.maven.surefire.its;
* under the License.
*/
-import junit.framework.TestCase;
-
import java.io.File;
import java.io.IOException;
+import junit.framework.TestCase;
+
/**
* Created by IntelliJ IDEA.
*
Modified: maven/surefire/trunk/surefire-setup-integration-tests/src/test/java/org/apache/maven/surefire/its/StagedLocalRepoHelper.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-setup-integration-tests/src/test/java/org/apache/maven/surefire/its/StagedLocalRepoHelper.java?rev=1236883&r1=1236882&r2=1236883&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-setup-integration-tests/src/test/java/org/apache/maven/surefire/its/StagedLocalRepoHelper.java (original)
+++ maven/surefire/trunk/surefire-setup-integration-tests/src/test/java/org/apache/maven/surefire/its/StagedLocalRepoHelper.java Fri Jan 27 20:50:34 2012
@@ -19,6 +19,11 @@ package org.apache.maven.surefire.its;
* under the License.
*/
+import java.io.File;
+import java.io.IOException;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Random;
import org.apache.maven.settings.Profile;
import org.apache.maven.settings.Repository;
import org.apache.maven.settings.RepositoryPolicy;
@@ -29,12 +34,6 @@ import org.codehaus.plexus.util.ReaderFa
import org.codehaus.plexus.util.WriterFactory;
import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
-import java.io.File;
-import java.io.IOException;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Random;
-
/**
* Helper class to assist in using verifier with a staged local repository.
*
@@ -155,7 +154,7 @@ public final class StagedLocalRepoHelper
}
policy.setUpdatePolicy( "never" );
-
+
return policy;
}