maven-surefire-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From krosenv...@apache.org
Subject svn commit: r1098400 [2/2] - 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...
Date Sun, 01 May 2011 20:21:05 GMT
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/resources/default-configuration/src/test/java/defaultConfiguration/BasicTest.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/resources/default-configuration/src/test/java/defaultConfiguration/BasicTest.java?rev=1098400&r1=1098399&r2=1098400&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/resources/default-configuration/src/test/java/defaultConfiguration/BasicTest.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/resources/default-configuration/src/test/java/defaultConfiguration/BasicTest.java Sun May  1 20:21:02 2011
@@ -24,7 +24,8 @@ public class BasicTest
         TestSuite suite = new TestSuite();
         Test test = new BasicTest( "testSetUp", "dummy" );
         suite.addTest( test );
-        TestSetup setup = new TestSetup( suite )
+
+        return new TestSetup( suite )
         {
 
             protected void setUp()
@@ -38,8 +39,6 @@ public class BasicTest
             }
 
         };
-
-        return setup;
     }
 
     protected void setUp()

Modified: maven/surefire/trunk/surefire-integration-tests/src/test/resources/isolated-classloader/src/test/java/isolatedClassloader/BasicTest.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/resources/isolated-classloader/src/test/java/isolatedClassloader/BasicTest.java?rev=1098400&r1=1098399&r2=1098400&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/resources/isolated-classloader/src/test/java/isolatedClassloader/BasicTest.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/resources/isolated-classloader/src/test/java/isolatedClassloader/BasicTest.java Sun May  1 20:21:02 2011
@@ -23,7 +23,8 @@ public class BasicTest
         TestSuite suite = new TestSuite();
         Test test = new BasicTest( "testSetUp", "dummy" );
         suite.addTest( test );
-        TestSetup setup = new TestSetup( suite )
+
+        return new TestSetup( suite )
         {
 
             protected void setUp()
@@ -37,8 +38,6 @@ public class BasicTest
             }
 
         };
-
-        return setup;
     }
 
     protected void setUp()

Modified: maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit-innerClass/src/test/java/junit/innerClass/BasicTest.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit-innerClass/src/test/java/junit/innerClass/BasicTest.java?rev=1098400&r1=1098399&r2=1098400&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit-innerClass/src/test/java/junit/innerClass/BasicTest.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit-innerClass/src/test/java/junit/innerClass/BasicTest.java Sun May  1 20:21:02 2011
@@ -10,6 +10,6 @@ public class BasicTest
     }
     
     public class Foo {
-        public Foo(String x, String y) {};
+        public Foo(String x, String y) {}
     }
 }

Modified: maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit-pathWithUmlaut/src/test/java/umlautTest/BasicTest.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit-pathWithUmlaut/src/test/java/umlautTest/BasicTest.java?rev=1098400&r1=1098399&r2=1098400&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit-pathWithUmlaut/src/test/java/umlautTest/BasicTest.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit-pathWithUmlaut/src/test/java/umlautTest/BasicTest.java Sun May  1 20:21:02 2011
@@ -23,7 +23,8 @@ public class BasicTest
         TestSuite suite = new TestSuite();
         Test test = new BasicTest( "testSetUp", "dummy" );
         suite.addTest( test );
-        TestSetup setup = new TestSetup( suite )
+
+        return new TestSetup( suite )
         {
 
             protected void setUp()
@@ -37,8 +38,6 @@ public class BasicTest
             }
 
         };
-
-        return setup;
     }
 
     protected void setUp()

Modified: maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit-twoTestCaseSuite/src/test/java/junit/twoTestCaseSuite/BasicTest.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit-twoTestCaseSuite/src/test/java/junit/twoTestCaseSuite/BasicTest.java?rev=1098400&r1=1098399&r2=1098400&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit-twoTestCaseSuite/src/test/java/junit/twoTestCaseSuite/BasicTest.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit-twoTestCaseSuite/src/test/java/junit/twoTestCaseSuite/BasicTest.java Sun May  1 20:21:02 2011
@@ -22,7 +22,8 @@ public class BasicTest
         TestSuite suite = new TestSuite();
         Test test = new BasicTest( "testSetUp", "dummy" );
         suite.addTest( test );
-        TestSetup setup = new TestSetup( suite )
+
+        return new TestSetup( suite )
         {
 
             protected void setUp()
@@ -36,8 +37,6 @@ public class BasicTest
             }
 
         };
-
-        return setup;
     }
 
     protected void setUp()

Modified: maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit-twoTestCases/src/test/java/junit/twoTestCases/BasicTest.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit-twoTestCases/src/test/java/junit/twoTestCases/BasicTest.java?rev=1098400&r1=1098399&r2=1098400&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit-twoTestCases/src/test/java/junit/twoTestCases/BasicTest.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit-twoTestCases/src/test/java/junit/twoTestCases/BasicTest.java Sun May  1 20:21:02 2011
@@ -12,7 +12,7 @@ public class BasicTest
 
     private static boolean tearDownCalled = false;
 
-    public BasicTest( String name, String extraName )
+    public BasicTest( String name )
     {
         super( name );
     }
@@ -20,9 +20,10 @@ public class BasicTest
     public static Test suite()
     {
         TestSuite suite = new TestSuite();
-        Test test = new BasicTest( "testSetUp", "dummy" );
+        Test test = new BasicTest( "testSetUp" );
         suite.addTest( test );
-        TestSetup setup = new TestSetup( suite )
+
+        return new TestSetup( suite )
         {
 
             protected void setUp()
@@ -36,8 +37,6 @@ public class BasicTest
             }
 
         };
-
-        return setup;
     }
 
     protected void setUp()

Modified: maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit4-runlistener/src/test/java/runListener/FileWritingRunListener1.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit4-runlistener/src/test/java/runListener/FileWritingRunListener1.java?rev=1098400&r1=1098399&r2=1098400&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit4-runlistener/src/test/java/runListener/FileWritingRunListener1.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit4-runlistener/src/test/java/runListener/FileWritingRunListener1.java Sun May  1 20:21:02 2011
@@ -14,7 +14,6 @@ public class FileWritingRunListener1
 
     @Override
     public void testStarted( Description description )
-        throws Exception
     {
         FileHelper.writeFile( "runlistener-output-1.txt", "This written by RunListener#testStarted()" );
     }

Modified: maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit4-runlistener/src/test/java/runListener/FileWritingRunListener2.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit4-runlistener/src/test/java/runListener/FileWritingRunListener2.java?rev=1098400&r1=1098399&r2=1098400&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit4-runlistener/src/test/java/runListener/FileWritingRunListener2.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/resources/junit4-runlistener/src/test/java/runListener/FileWritingRunListener2.java Sun May  1 20:21:02 2011
@@ -14,7 +14,6 @@ public class FileWritingRunListener2
 
     @Override
     public void testStarted( Description description )
-        throws Exception
     {
         FileHelper.writeFile( "runlistener-output-2.txt", "This written by RunListener#testStarted()" );
     }

Modified: maven/surefire/trunk/surefire-integration-tests/src/test/resources/large-test-results/src/test/java/largeTestResults/BasicTest.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/resources/large-test-results/src/test/java/largeTestResults/BasicTest.java?rev=1098400&r1=1098399&r2=1098400&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/resources/large-test-results/src/test/java/largeTestResults/BasicTest.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/resources/large-test-results/src/test/java/largeTestResults/BasicTest.java Sun May  1 20:21:02 2011
@@ -7,7 +7,7 @@ public class BasicTest
     extends TestCase
 {
 
-    private int number;
+    private final int number;
 
     public BasicTest( String name , int number)
     {

Modified: maven/surefire/trunk/surefire-integration-tests/src/test/resources/plain-old-java-classpath/src/test/java/plainOldJavaClasspath/BasicTest.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/resources/plain-old-java-classpath/src/test/java/plainOldJavaClasspath/BasicTest.java?rev=1098400&r1=1098399&r2=1098400&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/resources/plain-old-java-classpath/src/test/java/plainOldJavaClasspath/BasicTest.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/resources/plain-old-java-classpath/src/test/java/plainOldJavaClasspath/BasicTest.java Sun May  1 20:21:02 2011
@@ -24,7 +24,8 @@ public class BasicTest
         TestSuite suite = new TestSuite();
         Test test = new BasicTest( "testSetUp", "dummy" );
         suite.addTest( test );
-        TestSetup setup = new TestSetup( suite )
+
+        return new TestSetup( suite )
         {
 
             protected void setUp()
@@ -38,8 +39,6 @@ public class BasicTest
             }
 
         };
-
-        return setup;
     }
 
     protected void setUp()

Modified: maven/surefire/trunk/surefire-integration-tests/src/test/resources/result-counting/src/test/java/resultcounting/MySuiteTest1.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/resources/result-counting/src/test/java/resultcounting/MySuiteTest1.java?rev=1098400&r1=1098399&r2=1098400&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/resources/result-counting/src/test/java/resultcounting/MySuiteTest1.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/resources/result-counting/src/test/java/resultcounting/MySuiteTest1.java Sun May  1 20:21:02 2011
@@ -9,16 +9,13 @@ public class MySuiteTest1 extends TestCa
     public static Test suite () {
         TestSuite suite = new TestSuite();
 
-        suite.addTest (new MySuiteTest1("testMe", 1));
+        suite.addTest (new MySuiteTest1("testMe" ));
 
         return suite;
     }
 
-    private int number;
-
-    public MySuiteTest1(String name, int number) {
+    public MySuiteTest1( String name ) {
         super (name);
-        this.number = number;
     }
 
     public void testMe() {

Modified: maven/surefire/trunk/surefire-integration-tests/src/test/resources/result-counting/src/test/java/resultcounting/MySuiteTest2.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/resources/result-counting/src/test/java/resultcounting/MySuiteTest2.java?rev=1098400&r1=1098399&r2=1098400&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/resources/result-counting/src/test/java/resultcounting/MySuiteTest2.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/resources/result-counting/src/test/java/resultcounting/MySuiteTest2.java Sun May  1 20:21:02 2011
@@ -9,17 +9,14 @@ public class MySuiteTest2 extends TestCa
     public static Test suite () {
         TestSuite suite = new TestSuite();
 
-        suite.addTest (new MySuiteTest2("testMe", 1));
-        suite.addTest (new MySuiteTest2("testMe", 2));
+        suite.addTest (new MySuiteTest2("testMe" ));
+        suite.addTest (new MySuiteTest2("testMe" ));
 
         return suite;
     }
 
-    private int number;
-
-    public MySuiteTest2(String name, int number) {
+    public MySuiteTest2( String name ) {
         super (name);
-        this.number = number;
     }
 
     public void testMe() {

Modified: maven/surefire/trunk/surefire-integration-tests/src/test/resources/result-counting/src/test/java/resultcounting/MySuiteTest3.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/resources/result-counting/src/test/java/resultcounting/MySuiteTest3.java?rev=1098400&r1=1098399&r2=1098400&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/resources/result-counting/src/test/java/resultcounting/MySuiteTest3.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/resources/result-counting/src/test/java/resultcounting/MySuiteTest3.java Sun May  1 20:21:02 2011
@@ -9,18 +9,15 @@ public class MySuiteTest3 extends TestCa
     public static Test suite () {
         TestSuite suite = new TestSuite();
 
-        suite.addTest (new MySuiteTest3("testMe", 1));
-        suite.addTest (new MySuiteTest3("testMe", 2));
-        suite.addTest (new MySuiteTest3("testMe", 3));
+        suite.addTest (new MySuiteTest3("testMe" ));
+        suite.addTest (new MySuiteTest3("testMe" ));
+        suite.addTest (new MySuiteTest3("testMe" ));
 
         return suite;
     }
 
-    private int number;
-
-    public MySuiteTest3(String name, int number) {
+    public MySuiteTest3( String name ) {
         super (name);
-        this.number = number;
     }
 
     public void testMe() {

Modified: maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-141-pluggableproviders/test-provider/src/main/java/org/apache/maven/surefire/testprovider/TestProvider.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-141-pluggableproviders/test-provider/src/main/java/org/apache/maven/surefire/testprovider/TestProvider.java?rev=1098400&r1=1098399&r2=1098400&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-141-pluggableproviders/test-provider/src/main/java/org/apache/maven/surefire/testprovider/TestProvider.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-141-pluggableproviders/test-provider/src/main/java/org/apache/maven/surefire/testprovider/TestProvider.java Sun May  1 20:21:02 2011
@@ -33,13 +33,9 @@ import java.util.Iterator;
  */
 public class TestProvider  extends AbstractProvider
 {
-    private final ReporterFactory reporterManagerFactory;
-    private final ClassLoader testClassLoader;
 
     public TestProvider( ProviderParameters booterParameters )
     {
-        this.reporterManagerFactory = booterParameters.getReporterFactory();
-        this.testClassLoader = booterParameters.getTestClassLoader();
     }
 
 

Modified: maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-141-pluggableproviders/test/src/test/java/junit/twoTestCases/BasicTest.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-141-pluggableproviders/test/src/test/java/junit/twoTestCases/BasicTest.java?rev=1098400&r1=1098399&r2=1098400&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-141-pluggableproviders/test/src/test/java/junit/twoTestCases/BasicTest.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-141-pluggableproviders/test/src/test/java/junit/twoTestCases/BasicTest.java Sun May  1 20:21:02 2011
@@ -12,7 +12,7 @@ public class BasicTest
 
     private static boolean tearDownCalled = false;
 
-    public BasicTest( String name, String extraName )
+    public BasicTest( String name )
     {
         super( name );
     }
@@ -20,7 +20,7 @@ public class BasicTest
     public static Test suite()
     {
         TestSuite suite = new TestSuite();
-        Test test = new BasicTest( "testSetUp", "dummy" );
+        Test test = new BasicTest( "testSetUp" );
         suite.addTest( test );
         TestSetup setup = new TestSetup( suite )
         {

Modified: maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-146-forkPerTestNoSetup/src/test/java/forkPerTestNoSetup/TestSurefire2.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-146-forkPerTestNoSetup/src/test/java/forkPerTestNoSetup/TestSurefire2.java?rev=1098400&r1=1098399&r2=1098400&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-146-forkPerTestNoSetup/src/test/java/forkPerTestNoSetup/TestSurefire2.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-146-forkPerTestNoSetup/src/test/java/forkPerTestNoSetup/TestSurefire2.java Sun May  1 20:21:02 2011
@@ -23,7 +23,8 @@ public class TestSurefire2
         TestSuite suite = new TestSuite();
         Test test = new TestSurefire2( "testSetUp", "dummy" );
         suite.addTest( test );
-        TestSetup setup = new TestSetup( suite )
+
+        return new TestSetup( suite )
         {
 
             protected void setUp()
@@ -37,8 +38,6 @@ public class TestSurefire2
             }
 
         };
-
-        return setup;
     }
 
     protected void setUp()

Modified: maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-408-manual-provider-selection/src/test/java/junit/twoTestCases/BasicTest.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-408-manual-provider-selection/src/test/java/junit/twoTestCases/BasicTest.java?rev=1098400&r1=1098399&r2=1098400&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-408-manual-provider-selection/src/test/java/junit/twoTestCases/BasicTest.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-408-manual-provider-selection/src/test/java/junit/twoTestCases/BasicTest.java Sun May  1 20:21:02 2011
@@ -12,7 +12,7 @@ public class BasicTest
 
     private static boolean tearDownCalled = false;
 
-    public BasicTest( String name, String extraName )
+    public BasicTest( String name )
     {
         super( name );
     }
@@ -20,9 +20,10 @@ public class BasicTest
     public static Test suite()
     {
         TestSuite suite = new TestSuite();
-        Test test = new BasicTest( "testSetUp", "dummy" );
+        Test test = new BasicTest( "testSetUp" );
         suite.addTest( test );
-        TestSetup setup = new TestSetup( suite )
+
+        return new TestSetup( suite )
         {
 
             protected void setUp()
@@ -36,8 +37,6 @@ public class BasicTest
             }
 
         };
-
-        return setup;
     }
 
     protected void setUp()

Modified: maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-500-puzzling-error/src/test/java/surefire500/ExplodingTest.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-500-puzzling-error/src/test/java/surefire500/ExplodingTest.java?rev=1098400&r1=1098399&r2=1098400&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-500-puzzling-error/src/test/java/surefire500/ExplodingTest.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-500-puzzling-error/src/test/java/surefire500/ExplodingTest.java Sun May  1 20:21:02 2011
@@ -9,17 +9,20 @@ import static org.junit.Assert.fail;
 public class ExplodingTest {
 
 	static {
-		if (true) {
+        //noinspection ConstantIfStatement
+        if (true) {
 			throw new java.lang.NoClassDefFoundError("whoops!"); 
 		}
 	}
 	
 	@Test
-	public void testPass() throws Exception {
+	public void testPass()
+    {
 		assertTrue(true);
 	}
 	
-	public void testFail() throws Exception {
+	public void testFail()
+    {
 		fail("fail");
 	}
 }

Modified: maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-500-puzzling-error/src/test/java/surefire500/PassingTest.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-500-puzzling-error/src/test/java/surefire500/PassingTest.java?rev=1098400&r1=1098399&r2=1098400&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-500-puzzling-error/src/test/java/surefire500/PassingTest.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-500-puzzling-error/src/test/java/surefire500/PassingTest.java Sun May  1 20:21:02 2011
@@ -7,22 +7,26 @@ import static org.junit.Assert.assertTru
 public class PassingTest {
 	
 	@Test
-	public void testOne() throws Exception {
+	public void testOne()
+    {
 		assertTrue(true);
 	}
 	
 	@Test
-	public void testTwo() throws Exception {
+	public void testTwo()
+    {
 		assertTrue(true);
 	}
 	
 	@Test
-	public void testThree() throws Exception {
+	public void testThree()
+    {
 		assertTrue(true);
 	}
 	
 	@Test
-	public void testFour() throws Exception {
+	public void testFour()
+    {
 		assertTrue(true);
 	}
 

Modified: maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-621-testCounting-junit3-in-parallel/src/it/java/mho/MySuiteTest1.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-621-testCounting-junit3-in-parallel/src/it/java/mho/MySuiteTest1.java?rev=1098400&r1=1098399&r2=1098400&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-621-testCounting-junit3-in-parallel/src/it/java/mho/MySuiteTest1.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-621-testCounting-junit3-in-parallel/src/it/java/mho/MySuiteTest1.java Sun May  1 20:21:02 2011
@@ -4,13 +4,7 @@ import junit.framework.Test;
 import junit.framework.TestCase;
 import junit.framework.TestSuite;
 
-/**
- * Created by IntelliJ IDEA.
- * User: yyit927b
- * Date: 26.05.2010
- * Time: 11:02:06
- * To change this template use File | Settings | File Templates.
- */
+
 public class MySuiteTest1 extends TestCase {
 
     public static Test suite () {
@@ -21,7 +15,7 @@ public class MySuiteTest1 extends TestCa
         return suite;
     }
 
-    private int number;
+    private final int number;
 
     public MySuiteTest1(String name, int number) {
         super (name);

Modified: maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-621-testCounting-junit3-in-parallel/src/it/java/mho/MySuiteTest2.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-621-testCounting-junit3-in-parallel/src/it/java/mho/MySuiteTest2.java?rev=1098400&r1=1098399&r2=1098400&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-621-testCounting-junit3-in-parallel/src/it/java/mho/MySuiteTest2.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-621-testCounting-junit3-in-parallel/src/it/java/mho/MySuiteTest2.java Sun May  1 20:21:02 2011
@@ -4,13 +4,7 @@ import junit.framework.Test;
 import junit.framework.TestCase;
 import junit.framework.TestSuite;
 
-/**
- * Created by IntelliJ IDEA.
- * User: yyit927b
- * Date: 26.05.2010
- * Time: 11:02:06
- * To change this template use File | Settings | File Templates.
- */
+
 public class MySuiteTest2 extends TestCase {
 
     public static Test suite () {
@@ -22,7 +16,7 @@ public class MySuiteTest2 extends TestCa
         return suite;
     }
 
-    private int number;
+    private final int number;
 
     public MySuiteTest2(String name, int number) {
         super (name);

Modified: maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-621-testCounting-junit3-in-parallel/src/it/java/mho/MySuiteTest3.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-621-testCounting-junit3-in-parallel/src/it/java/mho/MySuiteTest3.java?rev=1098400&r1=1098399&r2=1098400&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-621-testCounting-junit3-in-parallel/src/it/java/mho/MySuiteTest3.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/resources/surefire-621-testCounting-junit3-in-parallel/src/it/java/mho/MySuiteTest3.java Sun May  1 20:21:02 2011
@@ -4,13 +4,6 @@ import junit.framework.Test;
 import junit.framework.TestCase;
 import junit.framework.TestSuite;
 
-/**
- * Created by IntelliJ IDEA.
- * User: yyit927b
- * Date: 26.05.2010
- * Time: 11:27:42
- * To change this template use File | Settings | File Templates.
- */
 public class MySuiteTest3 extends TestCase {
 
     public static Test suite () {
@@ -23,7 +16,7 @@ public class MySuiteTest3 extends TestCa
         return suite;
     }
 
-    private int number;
+    private final int number;
 
     public MySuiteTest3(String name, int number) {
         super (name);

Modified: maven/surefire/trunk/surefire-integration-tests/src/test/resources/testng-beforeMethodFailure/src/test/java/testng/beforeMethodFailure/TestNGSuiteTest.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/resources/testng-beforeMethodFailure/src/test/java/testng/beforeMethodFailure/TestNGSuiteTest.java?rev=1098400&r1=1098399&r2=1098400&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-integration-tests/src/test/resources/testng-beforeMethodFailure/src/test/java/testng/beforeMethodFailure/TestNGSuiteTest.java (original)
+++ maven/surefire/trunk/surefire-integration-tests/src/test/resources/testng-beforeMethodFailure/src/test/java/testng/beforeMethodFailure/TestNGSuiteTest.java Sun May  1 20:21:02 2011
@@ -7,7 +7,7 @@ import org.testng.annotations.Test;
 
 public class TestNGSuiteTest {
 
-    private boolean beforeMethod = false;
+    private final boolean beforeMethod = false;
     
     @BeforeMethod
     public void beforeMethod() {

Modified: maven/surefire/trunk/surefire-providers/common-junit3/src/main/java/org/apache/maven/surefire/common/junit3/JUnit3Reflector.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-providers/common-junit3/src/main/java/org/apache/maven/surefire/common/junit3/JUnit3Reflector.java?rev=1098400&r1=1098399&r2=1098400&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-providers/common-junit3/src/main/java/org/apache/maven/surefire/common/junit3/JUnit3Reflector.java (original)
+++ maven/surefire/trunk/surefire-providers/common-junit3/src/main/java/org/apache/maven/surefire/common/junit3/JUnit3Reflector.java Sun May  1 20:21:02 2011
@@ -19,13 +19,12 @@ package org.apache.maven.surefire.common
  * under the License.
  */
 
-import org.apache.maven.surefire.util.NestedRuntimeException;
-import org.apache.maven.surefire.util.ReflectionUtils;
-
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
+import org.apache.maven.surefire.util.NestedRuntimeException;
+import org.apache.maven.surefire.util.ReflectionUtils;
 
 public final class JUnit3Reflector
 {
@@ -117,8 +116,7 @@ public final class JUnit3Reflector
 
 
     public Object constructTestObject( Class testClass )
-        throws IllegalAccessException, InvocationTargetException, NoSuchMethodException, InstantiationException,
-        ClassNotFoundException
+        throws IllegalAccessException, InvocationTargetException, NoSuchMethodException, InstantiationException
     {
         Object testObject = createInstanceFromSuiteMethod( testClass );
 

Modified: maven/surefire/trunk/surefire-providers/common-junit3/src/test/java/org/apache/maven/surefire/common/junit3/JUnit3TestCheckerTest.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-providers/common-junit3/src/test/java/org/apache/maven/surefire/common/junit3/JUnit3TestCheckerTest.java?rev=1098400&r1=1098399&r2=1098400&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-providers/common-junit3/src/test/java/org/apache/maven/surefire/common/junit3/JUnit3TestCheckerTest.java (original)
+++ maven/surefire/trunk/surefire-providers/common-junit3/src/test/java/org/apache/maven/surefire/common/junit3/JUnit3TestCheckerTest.java Sun May  1 20:21:02 2011
@@ -19,16 +19,17 @@ package org.apache.maven.surefire.common
  * under the License.
  */
 
+import org.apache.maven.surefire.testset.TestSetFailedException;
+
 import junit.framework.TestCase;
 import junit.framework.TestResult;
-import org.apache.maven.surefire.testset.TestSetFailedException;
 
 /**
  * @author Kristian Rosenvold
  */
 public class JUnit3TestCheckerTest
     extends TestCase {
-    JUnit3TestChecker jUnit3TestChecker = new JUnit3TestChecker( this.getClass().getClassLoader() );
+    private final JUnit3TestChecker jUnit3TestChecker = new JUnit3TestChecker( this.getClass().getClassLoader() );
 
     public void testValidJunit4Annotated()
         throws TestSetFailedException

Modified: maven/surefire/trunk/surefire-providers/common-junit4/src/main/java/org/apache/maven/surefire/common/junit4/JUnit4RunListener.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-providers/common-junit4/src/main/java/org/apache/maven/surefire/common/junit4/JUnit4RunListener.java?rev=1098400&r1=1098399&r2=1098400&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-providers/common-junit4/src/main/java/org/apache/maven/surefire/common/junit4/JUnit4RunListener.java (original)
+++ maven/surefire/trunk/surefire-providers/common-junit4/src/main/java/org/apache/maven/surefire/common/junit4/JUnit4RunListener.java Sun May  1 20:21:02 2011
@@ -42,7 +42,7 @@ public class JUnit4RunListener
      * This flag is set after a failure has occurred so that a <code>testSucceeded</code> event is not fired.
      * This is necessary because JUnit4 always fires a <code>testRunFinished</code> event-- even if there was a failure.
      */
-    private ThreadLocal failureFlag = new InheritableThreadLocal();
+    private final ThreadLocal<Boolean> failureFlag = new InheritableThreadLocal<Boolean>();
 
     /**
      * Constructor.
@@ -119,7 +119,7 @@ public class JUnit4RunListener
     public void testFinished( Description description )
         throws Exception
     {
-        Boolean failure = (Boolean) failureFlag.get();
+        Boolean failure = failureFlag.get();
         if ( failure == null )
         {
             reporter.testSucceeded( createReportEntry( description ) );
@@ -132,7 +132,7 @@ public class JUnit4RunListener
     }
 
 
-    protected String extractClassName( Description description )
+    String extractClassName( Description description )
     {
         String displayName = description.getDisplayName();
         Matcher m = PARENS.matcher( displayName );

Modified: maven/surefire/trunk/surefire-providers/common-junit4/src/main/java/org/apache/maven/surefire/junit4/MockReporter.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-providers/common-junit4/src/main/java/org/apache/maven/surefire/junit4/MockReporter.java?rev=1098400&r1=1098399&r2=1098400&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-providers/common-junit4/src/main/java/org/apache/maven/surefire/junit4/MockReporter.java (original)
+++ maven/surefire/trunk/surefire-providers/common-junit4/src/main/java/org/apache/maven/surefire/junit4/MockReporter.java Sun May  1 20:21:02 2011
@@ -23,7 +23,6 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicInteger;
 import org.apache.maven.surefire.report.ReportEntry;
-import org.apache.maven.surefire.report.ReporterConfiguration;
 import org.apache.maven.surefire.report.RunListener;
 
 /**
@@ -42,10 +41,6 @@ public class MockReporter
 
     public static final String TEST_COMPLETED = "TEST_COMPLETED";
 
-    public static final String TEST_FAILED = "TEST_FAILED";
-
-    public static final String TEST_ERROR = "TEST_ERROR";
-
     public static final String TEST_SKIPPED = "TEST_SKIPPED";
 
     private final AtomicInteger testSucceeded = new AtomicInteger();
@@ -60,11 +55,6 @@ public class MockReporter
     {
     }
 
-    public MockReporter( ReporterConfiguration reporterConfiguration )
-    {
-
-    }
-
     public void testSetStarting( ReportEntry report )
     {
         events.add( SET_STARTED );
@@ -93,38 +83,16 @@ public class MockReporter
         testIgnored.incrementAndGet();
     }
 
-    public void writeFooter( String footer )
-    {
-    }
-
-    public void writeDetailMessage( String message )
-    {
-    }
-
-    public List<String> getEvents()
-    {
-        return events;
-    }
-
     public int getTestSucceeded()
     {
         return testSucceeded.get();
     }
 
-    public int getTestIgnored()
-    {
-        return testIgnored.get();
-    }
-
     public int getTestFailed()
     {
         return testFailed.get();
     }
 
-    public void writeConsoleMessage( String message )
-    {
-    }
-
     public void testError( ReportEntry report )
     {
         testError.incrementAndGet();
@@ -139,7 +107,4 @@ public class MockReporter
     {
     }
 
-    public void writeTestOutput( String output, boolean stdout )
-    {
-    }
 }

Modified: maven/surefire/trunk/surefire-providers/common-junit4/src/test/java/org/apache/maven/surefire/junit4/JUnit4TestCheckerTest.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-providers/common-junit4/src/test/java/org/apache/maven/surefire/junit4/JUnit4TestCheckerTest.java?rev=1098400&r1=1098399&r2=1098400&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-providers/common-junit4/src/test/java/org/apache/maven/surefire/junit4/JUnit4TestCheckerTest.java (original)
+++ maven/surefire/trunk/surefire-providers/common-junit4/src/test/java/org/apache/maven/surefire/junit4/JUnit4TestCheckerTest.java Sun May  1 20:21:02 2011
@@ -39,7 +39,7 @@ import static org.junit.Assert.assertTru
  */
 public class JUnit4TestCheckerTest
 {
-    JUnit4TestChecker jUnit4TestChecker = new JUnit4TestChecker( this.getClass().getClassLoader() );
+    private final JUnit4TestChecker jUnit4TestChecker = new JUnit4TestChecker( this.getClass().getClassLoader() );
 
     @Test
     public void validJunit4Annotated()

Modified: maven/surefire/trunk/surefire-providers/surefire-junit3/src/main/java/org/apache/maven/surefire/junit/JUnitTestSet.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-providers/surefire-junit3/src/main/java/org/apache/maven/surefire/junit/JUnitTestSet.java?rev=1098400&r1=1098399&r2=1098400&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-providers/surefire-junit3/src/main/java/org/apache/maven/surefire/junit/JUnitTestSet.java (original)
+++ maven/surefire/trunk/surefire-providers/surefire-junit3/src/main/java/org/apache/maven/surefire/junit/JUnitTestSet.java Sun May  1 20:21:02 2011
@@ -19,13 +19,12 @@ package org.apache.maven.surefire.junit;
  * under the License.
  */
 
-import org.apache.maven.surefire.common.junit3.JUnit3Reflector;
-import org.apache.maven.surefire.report.RunListener;
-import org.apache.maven.surefire.testset.TestSetFailedException;
-
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.lang.reflect.Proxy;
+import org.apache.maven.surefire.common.junit3.JUnit3Reflector;
+import org.apache.maven.surefire.report.RunListener;
+import org.apache.maven.surefire.testset.TestSetFailedException;
 
 public final class JUnitTestSet
     implements SurefireTestSet
@@ -112,10 +111,6 @@ public final class JUnitTestSet
         {
             throw new TestSetFailedException( testClass.getName(), e.getTargetException() );
         }
-        catch ( ClassNotFoundException e )
-        {
-            throw new TestSetFailedException( "JUnit classes not available", e );
-        }
         catch ( NoSuchMethodException e )
         {
             throw new TestSetFailedException( "Class is not a JUnit TestCase", e );
@@ -127,7 +122,7 @@ public final class JUnitTestSet
         return testClass.getName();
     }
 
-    public Class getTestClass()
+    Class getTestClass()
     {
         return testClass;
     }

Modified: maven/surefire/trunk/surefire-providers/surefire-junit4/src/main/java/org/apache/maven/surefire/junit4/JUnit4TestSet.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-providers/surefire-junit4/src/main/java/org/apache/maven/surefire/junit4/JUnit4TestSet.java?rev=1098400&r1=1098399&r2=1098400&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-providers/surefire-junit4/src/main/java/org/apache/maven/surefire/junit4/JUnit4TestSet.java (original)
+++ maven/surefire/trunk/surefire-providers/surefire-junit4/src/main/java/org/apache/maven/surefire/junit4/JUnit4TestSet.java Sun May  1 20:21:02 2011
@@ -28,7 +28,7 @@ import org.junit.runner.Request;
 import org.junit.runner.Runner;
 import org.junit.runner.notification.RunNotifier;
 
-public class JUnit4TestSet
+class JUnit4TestSet
 {
 
     public static void execute( Class testClass, RunNotifier fNotifier, String testMethod )

Modified: maven/surefire/trunk/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/ClassesParallelRunListener.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/ClassesParallelRunListener.java?rev=1098400&r1=1098399&r2=1098400&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/ClassesParallelRunListener.java (original)
+++ maven/surefire/trunk/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/ClassesParallelRunListener.java Sun May  1 20:21:02 2011
@@ -20,7 +20,6 @@ package org.apache.maven.surefire.junitc
  */
 
 import java.util.Map;
-import org.apache.maven.surefire.report.ReporterConfiguration;
 import org.apache.maven.surefire.report.ReporterFactory;
 import org.apache.maven.surefire.testset.TestSetFailedException;
 
@@ -30,8 +29,7 @@ import org.apache.maven.surefire.testset
 public class ClassesParallelRunListener
     extends ConcurrentReporterManager
 {
-    public ClassesParallelRunListener( Map<String, TestSet> classMethodCounts, ReporterFactory reporterFactory,
-                                       ReporterConfiguration reporterConfiguration )
+    public ClassesParallelRunListener( Map<String, TestSet> classMethodCounts, ReporterFactory reporterFactory )
         throws TestSetFailedException
     {
         super( reporterFactory, false, classMethodCounts );

Modified: maven/surefire/trunk/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/ConcurrentReporterManager.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/ConcurrentReporterManager.java?rev=1098400&r1=1098399&r2=1098400&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/ConcurrentReporterManager.java (original)
+++ maven/surefire/trunk/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/ConcurrentReporterManager.java Sun May  1 20:21:02 2011
@@ -22,7 +22,6 @@ package org.apache.maven.surefire.junitc
 import java.util.Map;
 import org.apache.maven.surefire.report.ConsoleOutputReceiver;
 import org.apache.maven.surefire.report.ReportEntry;
-import org.apache.maven.surefire.report.ReporterConfiguration;
 import org.apache.maven.surefire.report.ReporterFactory;
 import org.apache.maven.surefire.report.RunListener;
 import org.apache.maven.surefire.testset.TestSetFailedException;
@@ -149,17 +148,14 @@ public abstract class ConcurrentReporter
     }
 
     public static ConcurrentReporterManager createInstance( Map<String, TestSet> classMethodCounts,
-                                                            ReporterFactory reporterManagerFactory,
-                                                            ReporterConfiguration reporterConfiguration,
-                                                            boolean parallelClasses, boolean parallelBoth )
+                                                            ReporterFactory reporterManagerFactory, boolean parallelClasses, boolean parallelBoth )
         throws TestSetFailedException
     {
         if ( parallelClasses )
         {
-            return new ClassesParallelRunListener( classMethodCounts, reporterManagerFactory, reporterConfiguration );
+            return new ClassesParallelRunListener( classMethodCounts, reporterManagerFactory );
         }
-        return new MethodsParallelRunListener( classMethodCounts, reporterManagerFactory, reporterConfiguration,
-                                               !parallelBoth );
+        return new MethodsParallelRunListener( classMethodCounts, reporterManagerFactory, !parallelBoth );
     }
 
 

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=1098400&r1=1098399&r2=1098400&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 Sun May  1 20:21:02 2011
@@ -101,8 +101,7 @@ public class JUnitCoreProvider
         final Map<String, TestSet> testSetMap = new ConcurrentHashMap<String, TestSet>();
 
         RunListener listener =
-            ConcurrentReporterManager.createInstance( testSetMap, reporterFactory, this.reporterConfiguration,
-                                                      jUnitCoreParameters.isParallelClasses(),
+            ConcurrentReporterManager.createInstance( testSetMap, reporterFactory, jUnitCoreParameters.isParallelClasses(),
                                                       jUnitCoreParameters.isParallelBoth() );
 
         ConsoleOutputCapture.startCapture((ConsoleOutputReceiver) listener);

Modified: maven/surefire/trunk/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/MethodsParallelRunListener.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/MethodsParallelRunListener.java?rev=1098400&r1=1098399&r2=1098400&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/MethodsParallelRunListener.java (original)
+++ maven/surefire/trunk/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/MethodsParallelRunListener.java Sun May  1 20:21:02 2011
@@ -20,7 +20,6 @@ package org.apache.maven.surefire.junitc
  */
 
 import java.util.Map;
-import org.apache.maven.surefire.report.ReporterConfiguration;
 import org.apache.maven.surefire.report.ReporterFactory;
 import org.apache.maven.surefire.testset.TestSetFailedException;
 
@@ -34,8 +33,7 @@ public class MethodsParallelRunListener
 
     private final Object lock = new Object();
 
-    public MethodsParallelRunListener( Map<String, TestSet> classMethodCounts, ReporterFactory reporterFactory,
-                                       ReporterConfiguration reporterConfiguration, boolean reportImmediately )
+    public MethodsParallelRunListener( Map<String, TestSet> classMethodCounts, ReporterFactory reporterFactory, boolean reportImmediately )
         throws TestSetFailedException
     {
         super( reporterFactory, reportImmediately, classMethodCounts );

Modified: maven/surefire/trunk/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/TestMethod.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/TestMethod.java?rev=1098400&r1=1098399&r2=1098400&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/TestMethod.java (original)
+++ maven/surefire/trunk/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/TestMethod.java Sun May  1 20:21:02 2011
@@ -89,7 +89,6 @@ class TestMethod
 
 
     public void replay( RunListener reporter )
-        throws Exception
     {
 
         if ( ignored != null )

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=1098400&r1=1098399&r2=1098400&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 Sun May  1 20:21:02 2011
@@ -153,7 +153,7 @@ public class ConcurrentReporterManagerTe
         ReporterFactory reporterFactory = createReporterFactory();
         HashMap<String, TestSet> classMethodCounts = new HashMap<String, TestSet>();
         RunListener reporter =
-            new ClassesParallelRunListener( classMethodCounts, reporterFactory, getReporterConfiguration() );
+            new ClassesParallelRunListener( classMethodCounts, reporterFactory );
         JUnitCoreRunListener runListener = new JUnitCoreRunListener( reporter, classMethodCounts );
         RunStatistics result = runClasses( reporterFactory, runListener, classes );
         assertReporter( result, success, ignored, failure, "classes" );
@@ -161,7 +161,7 @@ public class ConcurrentReporterManagerTe
 
         reporterFactory = createReporterFactory();
         reporter =
-            new MethodsParallelRunListener( classMethodCounts, reporterFactory, getReporterConfiguration(), true );
+            new MethodsParallelRunListener( classMethodCounts, reporterFactory, true );
         runListener = new JUnitCoreRunListener( reporter, classMethodCounts );
         result = runClasses( reporterFactory, runListener, classes );
         assertReporter( result, success, ignored, failure, "methods" );
@@ -205,12 +205,7 @@ public class ConcurrentReporterManagerTe
         throws TestSetFailedException
     {
         return new JUnitCoreRunListener(
-            new ClassesParallelRunListener( testSetMap, reporterFactory, getReporterConfiguration() ), testSetMap );
-    }
-
-    public ReporterConfiguration getReporterConfiguration()
-    {
-        return new ReporterConfiguration( new File( "." ), true );
+            new ClassesParallelRunListener( testSetMap, reporterFactory ), testSetMap );
     }
 
 

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=1098400&r1=1098399&r2=1098400&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 Sun May  1 20:21:02 2011
@@ -19,19 +19,17 @@
 
 package org.apache.maven.surefire.junitcore;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.ExecutionException;
+
 import junit.framework.TestCase;
-import org.junit.Ignore;
 import org.junit.Test;
-import org.junit.experimental.ParallelComputer;
 import org.junit.runner.Computer;
 import org.junit.runner.JUnitCore;
 import org.junit.runner.Result;
 import org.junit.runner.notification.RunListener;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.concurrent.ExecutionException;
-
 /**
  * Simple test of ConfigurableParallelComputer.
  *
@@ -198,8 +196,7 @@ public class ConfigurableParallelCompute
         {
             ( (ConfigurableParallelComputer) computer ).close();
         }
-        long rsult = System.currentTimeMillis() - start;
-        return rsult;
+        return System.currentTimeMillis() - start;
     }
 
     private long timedRun( int NUMTESTS, Result result, Class[] realClasses, JUnitCore jUnitCore, Computer computer )

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=1098400&r1=1098399&r2=1098400&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 Sun May  1 20:21:02 2011
@@ -54,14 +54,6 @@ public class DiagnosticRunListener exten
         this.target = target;
     }
 
-    public DiagnosticRunListener(boolean printToConsole) {
-        this( printToConsole, null);
-    }
-
-    public DiagnosticRunListener() {
-        this(true);
-    }
-
     @Override
     public void testRunStarted(Description description) throws Exception {
         print("testRunStarted", description);

Modified: maven/surefire/trunk/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/MavenSurefireJUnit47RunnerTest.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/MavenSurefireJUnit47RunnerTest.java?rev=1098400&r1=1098399&r2=1098400&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/MavenSurefireJUnit47RunnerTest.java (original)
+++ maven/surefire/trunk/surefire-providers/surefire-junit47/src/test/java/org/apache/maven/surefire/junitcore/MavenSurefireJUnit47RunnerTest.java Sun May  1 20:21:02 2011
@@ -124,7 +124,7 @@ public class MavenSurefireJUnit47RunnerT
 
         final HashMap<String, TestSet> classMethodCounts = new HashMap<String, TestSet>();
         RunListener reporter = ConcurrentReporterManager.createInstance( classMethodCounts, reporterManagerFactory,
-                                                                         getReporterConfiguration(), false, false );
+                                                                         false, false );
 
         org.junit.runner.notification.RunListener concurrentReportingRunListener =
             new JUnitCoreRunListener( reporter, classMethodCounts );

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=1098400&r1=1098399&r2=1098400&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 Sun May  1 20:21:02 2011
@@ -65,7 +65,7 @@ public class TestNGDirectoryTestSuite
 
     private final DirectoryScanner surefireDirectoryScanner;
 
-    private String testMethodPattern;
+    private final String testMethodPattern;
 
     public TestNGDirectoryTestSuite( File basedir, ArrayList includes, ArrayList excludes, String testSourceDirectory,
                                      String artifactVersion, Properties confOptions, File reportsDirectory,
@@ -171,11 +171,12 @@ public class TestNGDirectoryTestSuite
                                 this, junitReportsDirectory, testMethodPattern );
         }
 
+
         finishTestSuite( reporterManager, this );
     }
 
     // single class test
-    public void execute( String testSetName, ReporterFactory reporterManagerFactory, ClassLoader classLoader )
+    public void execute( String testSetName, ReporterFactory reporterManagerFactory )
         throws ReporterException, TestSetFailedException
     {
         if ( testSets == null )

Modified: maven/surefire/trunk/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGProvider.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGProvider.java?rev=1098400&r1=1098399&r2=1098400&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGProvider.java (original)
+++ maven/surefire/trunk/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGProvider.java Sun May  1 20:21:02 2011
@@ -94,8 +94,7 @@ public class TestNGProvider
             testNGXmlTestSuite.locateTestSets( testClassLoader );
             if ( forkTestSet != null && testRequest == null )
             {
-                testNGXmlTestSuite.execute( (String) forkTestSet, reporterFactory,
-                                            testClassLoader );
+                testNGXmlTestSuite.execute( (String) forkTestSet, reporterFactory );
             }
             else
             {

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=1098400&r1=1098399&r2=1098400&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 Sun May  1 20:21:02 2011
@@ -80,7 +80,7 @@ public class TestNGReporter
         String rawString = bundle.getString( "testStarting" );
         String group = groupString( result.getMethod().getGroups(), result.getTestClass().getName() );
         ReportEntry report =
-            new CategorizedReportEntry( getSource( result ), getUserFriendlyTestName( result ), group, rawString );
+            new CategorizedReportEntry( getSource( result ), getUserFriendlyTestName( result ), group );
         reporter.testStarting( report );
     }
 

Modified: maven/surefire/trunk/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGXmlTestSuite.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGXmlTestSuite.java?rev=1098400&r1=1098399&r2=1098400&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGXmlTestSuite.java (original)
+++ maven/surefire/trunk/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGXmlTestSuite.java Sun May  1 20:21:02 2011
@@ -94,7 +94,7 @@ public class TestNGXmlTestSuite
         TestNGDirectoryTestSuite.finishTestSuite( reporter, this );
     }
 
-    public void execute( String testSetName, ReporterFactory reporterManagerFactory, ClassLoader classLoader )
+    public void execute( String testSetName, ReporterFactory reporterManagerFactory )
         throws TestSetFailedException
     {
         throw new TestSetFailedException( "Cannot run individual test when suite files are specified" );

Modified: maven/surefire/trunk/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNgTestSuite.java
URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNgTestSuite.java?rev=1098400&r1=1098399&r2=1098400&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNgTestSuite.java (original)
+++ maven/surefire/trunk/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNgTestSuite.java Sun May  1 20:21:02 2011
@@ -32,7 +32,7 @@ import org.apache.maven.surefire.testset
 public interface TestNgTestSuite
 {
 
-    void execute( String testSetName, ReporterFactory reporterManagerFactory, ClassLoader classLoader )
+    void execute( String testSetName, ReporterFactory reporterManagerFactory )
         throws ReporterException, TestSetFailedException;
 
     Map locateTestSets( ClassLoader classLoader )



Mime
View raw message