Author: krosenvold Date: Wed Dec 7 09:13:14 2011 New Revision: 1211346 URL: http://svn.apache.org/viewvc?rev=1211346&view=rev Log: o Added some notes about junit threading to ConcurrentReporterManager
Modified: maven/surefire/trunk/surefire-integration-tests/src/test/resources/runorder-parallel/src/test/java/runorder/parallel/Test1.java maven/surefire/trunk/surefire-integration-tests/src/test/resources/runorder-parallel/src/test/java/runorder/parallel/Test3.java maven/surefire/trunk/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/ConcurrentReporterManager.java Modified: maven/surefire/trunk/surefire-integration-tests/src/test/resources/runorder-parallel/src/test/java/runorder/parallel/Test1.java URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/resources/runorder-parallel/src/test/java/runorder/parallel/Test1.java?rev=1211346&r1=1211345&r2=1211346&view=diff ============================================================================== --- maven/surefire/trunk/surefire-integration-tests/src/test/resources/runorder-parallel/src/test/java/runorder/parallel/Test1.java (original) +++ maven/surefire/trunk/surefire-integration-tests/src/test/resources/runorder-parallel/src/test/java/runorder/parallel/Test1.java Wed Dec 7 09:13:14 2011 @@ -7,6 +7,11 @@ import org.junit.Test; public class Test1 { + public Test1() + { + System.out.println( Thread.currentThread().getName() + " Constructor" ); + } + static void sleep( int ms ) { try @@ -22,21 +27,21 @@ public class Test1 @Test public void testSleep200() { - System.out.println( "Test1.sleep200 started @ " + System.currentTimeMillis() ); + System.out.println( Thread.currentThread().getName() + " Test1.sleep200 started @ " + System.currentTimeMillis() ); sleep( 200 ); } @Test public void testSleep400() { - System.out.println( "Test1.sleep400 started @ " + System.currentTimeMillis() ); + System.out.println( Thread.currentThread().getName() + " Test1.sleep400 started @ " + System.currentTimeMillis() ); sleep( 400 ); } @Test public void testSleep600() { - System.out.println( "Test1.sleep600 started @ " + System.currentTimeMillis() ); + System.out.println( Thread.currentThread().getName() + " Test1.sleep600 started @ " + System.currentTimeMillis() ); sleep( 600 ); } @@ -44,6 +49,7 @@ public class Test1 public static void setUpBeforeClass() throws Exception { + System.out.println( Thread.currentThread().getName() + " beforeClass sleep 175 " + System.currentTimeMillis() ); Thread.sleep( 175 ); } @@ -51,6 +57,7 @@ public class Test1 public static void tearDownAfterClass() throws Exception { + System.out.println( Thread.currentThread().getName() + " afterClass sleep 175 " + System.currentTimeMillis() ); Thread.sleep( 175 ); } Modified: maven/surefire/trunk/surefire-integration-tests/src/test/resources/runorder-parallel/src/test/java/runorder/parallel/Test3.java URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-integration-tests/src/test/resources/runorder-parallel/src/test/java/runorder/parallel/Test3.java?rev=1211346&r1=1211345&r2=1211346&view=diff ============================================================================== --- maven/surefire/trunk/surefire-integration-tests/src/test/resources/runorder-parallel/src/test/java/runorder/parallel/Test3.java (original) +++ maven/surefire/trunk/surefire-integration-tests/src/test/resources/runorder-parallel/src/test/java/runorder/parallel/Test3.java Wed Dec 7 09:13:14 2011 @@ -1,5 +1,7 @@ package runorder.parallel; +import org.junit.AfterClass; +import org.junit.BeforeClass; import org.junit.Test; /** @@ -32,4 +34,21 @@ public class Test3 { System.out.println("Test3.sleep50 started @ " + System.currentTimeMillis()); Test1.sleep(50); } + + @BeforeClass + public static void setUpBeforeClass() + throws Exception + { + System.out.println( Thread.currentThread().getName() + " Test3 beforeClass sleep 175 " + System.currentTimeMillis() ); + Thread.sleep( 175 ); + } + + @AfterClass + public static void tearDownAfterClass() + throws Exception + { + System.out.println( Thread.currentThread().getName() + " Test3 afterClass sleep 175 " + System.currentTimeMillis() ); + Thread.sleep( 175 ); + } + } \ No newline at end of file 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=1211346&r1=1211345&r2=1211346&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 Wed Dec 7 09:13:14 2011 @@ -28,6 +28,13 @@ import org.apache.maven.surefire.report. import org.apache.maven.surefire.testset.TestSetFailedException; /** + * Handles responses from concurrent junit + * + * Stuff to remember about JUnit threading: + * parallel=classes; beforeClass/afterClass, constructor and all tests method run on same thread + * parallel=methods; beforeClass/afterClass run on main thread, constructor + each test method run on same thread + * parallel=both; same as parallel=methods + * * @author Kristian Rosenvold */ public abstract class ConcurrentReporterManager