Author: hboutemy
Date: Sat Dec 31 15:25:09 2011
New Revision: 1226100
URL: http://svn.apache.org/viewvc?rev=1226100&view=rev
Log:
more generics
Modified:
maven/surefire/trunk/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/ConcurrentReporterManagerTest.java
maven/surefire/trunk/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/ConfigurableParallelComputerTest.java
maven/surefire/trunk/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/JUnitCoreParametersTest.java
maven/surefire/trunk/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/JUnitCoreTester.java
Modified:
maven/surefire/trunk/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/ConcurrentReporterManagerTest.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/ConcurrentReporterManagerTest.java?rev=1226100&r1=1226099&r2=1226100&view=diff
==============================================================================
---
maven/surefire/trunk/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/ConcurrentReporterManagerTest.java
(original)
+++
maven/surefire/trunk/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/ConcurrentReporterManagerTest.java
Sat Dec 31 15:25:09 2011
@@ -142,7 +142,7 @@ public class ConcurrentReporterManagerTe
// assertEquals( 23, stringList.size() );
}
- private void runClasses( int success, int ignored, int failure, Class...
classes )
+ private void runClasses( int success, int ignored, int failure,
Class<?>... classes )
throws TestSetFailedException
{
ReporterFactory reporterFactory = createReporterFactory();
@@ -162,7 +162,7 @@ public class ConcurrentReporterManagerTe
assertReporter( result, success, ignored, failure, "methods" );
}
- private RunStatistics runClasses( Class... classes )
+ private RunStatistics runClasses( Class<?>... classes )
throws TestSetFailedException
{
HashMap<String, TestSet> classMethodCounts = new HashMap<String,
TestSet>();
@@ -182,7 +182,7 @@ public class ConcurrentReporterManagerTe
private RunStatistics runClasses( ReporterFactory reporterManagerFactory,
org.junit.runner.notification.RunListener demultiplexingRunListener,
- Class... classes )
+ Class<?>... classes )
throws TestSetFailedException
{
Modified:
maven/surefire/trunk/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/ConfigurableParallelComputerTest.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/ConfigurableParallelComputerTest.java?rev=1226100&r1=1226099&r2=1226100&view=diff
==============================================================================
---
maven/surefire/trunk/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/ConfigurableParallelComputerTest.java
(original)
+++
maven/surefire/trunk/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/ConfigurableParallelComputerTest.java
Sat Dec 31 15:25:09 2011
@@ -47,7 +47,7 @@ public class ConfigurableParallelCompute
throws Exception
{
Result result = new Result();
- Class[] realClasses = new Class[]{ Dummy.class, Dummy2.class };
+ Class<?>[] realClasses = new Class[]{ Dummy.class, Dummy2.class };
DiagnosticRunListener diagnosticRunListener = new
DiagnosticRunListener( false, result.createListener() );
JUnitCore jUnitCore = getJunitCore( diagnosticRunListener );
@@ -72,7 +72,7 @@ public class ConfigurableParallelCompute
throws Exception
{
Result result = new Result();
- Class[] realClasses = getClassList();
+ Class<?>[] realClasses = getClassList();
JUnitCore jUnitCore = getJunitCore( result );
Computer computer = new Computer();
timedRun( NUMTESTS, result, realClasses, jUnitCore, computer );
@@ -84,7 +84,7 @@ public class ConfigurableParallelCompute
throws Exception
{
Result result = new Result();
- Class[] realClasses = getClassList();
+ Class<?>[] realClasses = getClassList();
JUnitCore jUnitCore = getJunitCore( result );
Computer computer = new ConfigurableParallelComputer( true, true );
timedRun( NUMTESTS, result, realClasses, jUnitCore, computer );
@@ -105,7 +105,7 @@ public class ConfigurableParallelCompute
{
Result result = new Result();
final Computer computer = new ConfigurableParallelComputer( false,
true, 3, false );
- Class[] realClasses = getClassList( SlowTest.class, 5 ); // 300 ms in
methods, 600 in classes
+ Class<?>[] realClasses = getClassList( SlowTest.class, 5 ); // 300 ms
in methods, 600 in classes
JUnitCore jUnitCore = getJunitCore( result );
runIt( realClasses, jUnitCore, computer );
@@ -116,7 +116,7 @@ public class ConfigurableParallelCompute
throws ExecutionException
{
Result result = new Result();
- Class[] realClasses = getClassList( FailingAssertions.class );
+ Class<?>[] realClasses = getClassList( FailingAssertions.class );
JUnitCore jUnitCore = getJunitCore( result );
runIt( realClasses, jUnitCore, computer );
assertEquals( "No tests should fail, right ?", NUMTESTS,
result.getFailures().size() );
@@ -130,7 +130,7 @@ public class ConfigurableParallelCompute
{
Computer computer = new ConfigurableParallelComputer( false, true, 4,
true );
Result result = new Result();
- Class[] realClasses = getClassList( Failure.class );
+ Class<?>[] realClasses = getClassList( Failure.class );
JUnitCore jUnitCore = getJunitCore( result );
runIt( realClasses, jUnitCore, computer );
assertEquals( "No tests should fail, right ?", NUMTESTS,
result.getFailures().size() );
@@ -143,10 +143,10 @@ public class ConfigurableParallelCompute
throws Exception
{
Result result = new Result();
- Class[] realClasses = getClassList();
+ Class<?>[] realClasses = getClassList();
JUnitCore jUnitCore = getJunitCore( result );
ConfigurableParallelComputer computer = new
ConfigurableParallelComputer( false, true, 2, false );
- long resp = timedRun( NUMTESTS, result, realClasses, jUnitCore,
computer );
+ timedRun( NUMTESTS, result, realClasses, jUnitCore, computer );
}
@Test
@@ -154,7 +154,7 @@ public class ConfigurableParallelCompute
throws Exception
{
Result result = new Result();
- Class[] realClasses = getClassList();
+ Class<?>[] realClasses = getClassList();
JUnitCore jUnitCore = getJunitCore( result );
ConfigurableParallelComputer computer = new
ConfigurableParallelComputer( true, false );
timedRun( NUMTESTS, result, realClasses, jUnitCore, computer );
@@ -165,7 +165,7 @@ public class ConfigurableParallelCompute
throws Exception
{
Result result = new Result();
- Class[] realClasses = getClassList();
+ Class<?>[] realClasses = getClassList();
DiagnosticRunListener diagnosticRunListener = new
DiagnosticRunListener( false, result.createListener() );
JUnitCore jUnitCore = getJunitCore( diagnosticRunListener );
ConfigurableParallelComputer computer = new
ConfigurableParallelComputer( true, true );
@@ -187,7 +187,7 @@ public class ConfigurableParallelCompute
return jUnitCore;
}
- private long runIt( Class[] realClasses, JUnitCore jUnitCore, Computer
computer )
+ private long runIt( Class<?>[] realClasses, JUnitCore jUnitCore, Computer
computer )
throws ExecutionException
{
long start = System.currentTimeMillis();
@@ -199,7 +199,7 @@ public class ConfigurableParallelCompute
return System.currentTimeMillis() - start;
}
- private long timedRun( int NUMTESTS, Result result, Class[] realClasses,
JUnitCore jUnitCore, Computer computer )
+ private long timedRun( int NUMTESTS, Result result, Class<?>[]
realClasses, JUnitCore jUnitCore, Computer computer )
throws ExecutionException
{
long time = runIt( realClasses, jUnitCore, computer );
@@ -209,17 +209,17 @@ public class ConfigurableParallelCompute
return time;
}
- private Class[] getClassList()
+ private Class<?>[] getClassList()
{
return getClassList( Dummy.class, NUMTESTS );
}
- private Class[] getClassList( Class testClass )
+ private Class<?>[] getClassList( Class<?> testClass )
{
return getClassList( testClass, NUMTESTS );
}
- private Class[] getClassList( Class testClass, int numItems )
+ private Class<?>[] getClassList( Class<?> testClass, int numItems )
{
List<Class> realClasses = new ArrayList<Class>();
for ( int i = 0; i < numItems; i++ )
@@ -229,16 +229,16 @@ public class ConfigurableParallelCompute
return realClasses.toArray( new Class[realClasses.size()] );
}
- static void sleepReallyEvenOnWindows(long ms)
+ static void sleepReallyEvenOnWindows( long ms )
throws InterruptedException
{
long endAt = System.currentTimeMillis() + ms;
- Thread.sleep( ms);
- while ( endAt > System.currentTimeMillis()){
- Thread.sleep( ms/10);
+ Thread.sleep( ms );
+ while ( endAt > System.currentTimeMillis() )
+ {
+ Thread.sleep( ms / 10 );
Thread.yield();
}
-
}
public static class Dummy
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=1226100&r1=1226099&r2=1226100&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
Sat Dec 31 15:25:09 2011
@@ -20,12 +20,9 @@ package org.apache.maven.surefire.junitc
*/
import junit.framework.TestCase;
-import org.junit.Test;
import java.util.Properties;
-import static org.junit.Assert.*;
-
/*
* @author Kristian Rosenvold, kristian.rosenvold@gmail com
*/
Modified:
maven/surefire/trunk/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/JUnitCoreTester.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/JUnitCoreTester.java?rev=1226100&r1=1226099&r2=1226100&view=diff
==============================================================================
---
maven/surefire/trunk/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/JUnitCoreTester.java
(original)
+++
maven/surefire/trunk/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/JUnitCoreTester.java
Sat Dec 31 15:25:09 2011
@@ -43,7 +43,7 @@ public class JUnitCoreTester
public JUnitCoreTester()
{
- this(new Computer());
+ this( new Computer() );
}
public JUnitCoreTester( Computer computer )
