You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2011/12/31 17:00:38 UTC
svn commit: r1226121 - in
/maven/surefire/trunk/surefire-providers/surefire-junit4/src:
main/java/org/apache/maven/surefire/junit4/JUnit4Provider.java
test/java/org/apache/maven/surefire/junit4/JUnit4ProviderTest.java
Author: hboutemy
Date: Sat Dec 31 16:00:38 2011
New Revision: 1226121
URL: http://svn.apache.org/viewvc?rev=1226121&view=rev
Log:
more generics
Modified:
maven/surefire/trunk/surefire-providers/surefire-junit4/src/main/java/org/apache/maven/surefire/junit4/JUnit4Provider.java
maven/surefire/trunk/surefire-providers/surefire-junit4/src/test/java/org/apache/maven/surefire/junit4/JUnit4ProviderTest.java
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=1226121&r1=1226120&r2=1226121&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 Sat Dec 31 16:00:38 2011
@@ -90,7 +90,7 @@ public class JUnit4Provider
{
if ( testsToRun == null )
{
- testsToRun = forkTestSet == null ? scanClassPath() : TestsToRun.fromClass( (Class) forkTestSet );
+ testsToRun = forkTestSet == null ? scanClassPath() : TestsToRun.fromClass( (Class<?>) forkTestSet );
}
upgradeCheck();
@@ -109,7 +109,7 @@ public class JUnit4Provider
runNotifer.fireTestRunStarted( null );
- for ( Class clazz : testsToRun.getLocatedClasses() )
+ for ( Class<?> clazz : testsToRun.getLocatedClasses() )
{
executeTestSet( clazz, reporter, runNotifer );
}
@@ -121,7 +121,7 @@ public class JUnit4Provider
return reporterFactory.close();
}
- private void executeTestSet( Class clazz, RunListener reporter, RunNotifier listeners )
+ private void executeTestSet( Class<?> clazz, RunListener reporter, RunNotifier listeners )
throws ReporterException, TestSetFailedException
{
final ReportEntry report = new SimpleReportEntry( this.getClass().getName(), clazz.getName() );
@@ -173,7 +173,7 @@ public class JUnit4Provider
}
}
- public Iterator getSuites()
+ public Iterator<?> getSuites()
{
testsToRun = scanClassPath();
return testsToRun.iterator();
@@ -185,6 +185,7 @@ public class JUnit4Provider
return runOrderCalculator.orderTestClasses( scannedClasses );
}
+ @SuppressWarnings( "unchecked" )
private void upgradeCheck()
throws TestSetFailedException
{
@@ -194,8 +195,7 @@ public class JUnit4Provider
StringBuilder reason = new StringBuilder();
reason.append( "Updated check failed\n" );
reason.append( "There are tests that would be run with junit4 / surefire 2.6 but not with [2.7,):\n" );
- //noinspection unchecked
- for ( Class testClass : (List<Class>) ( (DefaultDirectoryScanner) directoryScanner ).getClassesSkippedByValidation() )
+ for ( Class<?> testClass : (List<Class<?>>) ( (DefaultDirectoryScanner) directoryScanner ).getClassesSkippedByValidation() )
{
reason.append( " " );
reason.append( testClass.getCanonicalName() );
@@ -212,7 +212,7 @@ public class JUnit4Provider
}
- private static void execute( Class testClass, RunNotifier fNotifier, String testMethod )
+ private static void execute( Class<?> testClass, RunNotifier fNotifier, String testMethod )
throws TestSetFailedException
{
if ( !StringUtils.isBlank( testMethod ) )
Modified: maven/surefire/trunk/surefire-providers/surefire-junit4/src/test/java/org/apache/maven/surefire/junit4/JUnit4ProviderTest.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-providers/surefire-junit4/src/test/java/org/apache/maven/surefire/junit4/JUnit4ProviderTest.java?rev=1226121&r1=1226120&r2=1226121&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-providers/surefire-junit4/src/test/java/org/apache/maven/surefire/junit4/JUnit4ProviderTest.java (original)
+++ maven/surefire/trunk/surefire-providers/surefire-junit4/src/test/java/org/apache/maven/surefire/junit4/JUnit4ProviderTest.java Sat Dec 31 16:00:38 2011
@@ -31,11 +31,12 @@ import junit.framework.TestCase;
public class JUnit4ProviderTest
extends TestCase
{
- public void testCreateProvider(){
- BaseProviderFactory providerParameters = new BaseProviderFactory(null, Boolean.TRUE);
+ public void testCreateProvider()
+ {
+ BaseProviderFactory providerParameters = new BaseProviderFactory( null, Boolean.TRUE );
providerParameters.setProviderProperties( new Properties() );
providerParameters.setClassLoaders( this.getClass().getClassLoader(), this.getClass().getClassLoader() );
- providerParameters.setTestRequest( new TestRequest( null, null, null ) );
- assertNotNull(new JUnit4Provider( providerParameters ));
+ providerParameters.setTestRequest( new TestRequest( null, null, null ) );
+ assertNotNull( new JUnit4Provider( providerParameters ) );
}
}