[P-unit-devel] SF.net SVN: p-unit: [317] trunk/punit.test/src/tests/api/org/punit

[<cu...@us...>]

Revision: 317
          http://p-unit.svn.sourceforge.net/p-unit/?rev=317&view=rev
Author:   cuvavu
Date:     2008-06-10 01:22:52 -0700 (Tue, 10 Jun 2008)

Log Message:
-----------
Making the concurrentRunner run before and after stuff in the same thread as the actual test.

Modified Paths:
--------------
    trunk/punit.test/src/tests/api/org/punit/method/runner/AbstractMethodRunnerTest.java
    trunk/punit.test/src/tests/api/org/punit/runner/ConcurrentRunnerTest.java

Added Paths:
-----------
    trunk/punit.test/src/tests/api/org/punit/testclasses/BeforeAndAfterConcurrentTestClass.java

Modified: trunk/punit.test/src/tests/api/org/punit/method/runner/AbstractMethodRunnerTest.java
===================================================================
--- trunk/punit.test/src/tests/api/org/punit/method/runner/AbstractMethodRunnerTest.java	2008-05-28 12:46:18 UTC (rev 316)
+++ trunk/punit.test/src/tests/api/org/punit/method/runner/AbstractMethodRunnerTest.java	2008-06-10 08:22:52 UTC (rev 317)
@@ -67,7 +67,7 @@
 	public void testRun_MultipleExceptions() {
 		resetRunFlag();
 		_methodRunner.run(new TestMultiException(), getMethod(TestMultiException.class, "test"), new Object[] {});
-		Assert.assertEquals(NullPointerException.class, _mockEvenListener.throwable);
+		Assert.assertEquals(IllegalStateException.class, _mockEvenListener.throwable);
 	}
 
 	private void resetRunFlag() {
@@ -109,9 +109,18 @@
 	private static class MockMethodRunner extends AbstractMethodRunner {
 		public boolean isInvoked;
 
-		protected void runImpl() throws Throwable {
+		protected void runImpl( boolean doNormalSetupAndTeardown ) throws Throwable {
 			isInvoked = true;
-			super.runMethod();
+	    	try {
+				if (doNormalSetupAndTeardown) {
+					setUp();
+				}
+				super.runMethod();
+			} finally {
+				if (doNormalSetupAndTeardown) {
+					tearDown();
+				}
+			}
 		}
 	}
 

Modified: trunk/punit.test/src/tests/api/org/punit/runner/ConcurrentRunnerTest.java
===================================================================
--- trunk/punit.test/src/tests/api/org/punit/runner/ConcurrentRunnerTest.java	2008-05-28 12:46:18 UTC (rev 316)
+++ trunk/punit.test/src/tests/api/org/punit/runner/ConcurrentRunnerTest.java	2008-06-10 08:22:52 UTC (rev 317)
@@ -9,9 +9,11 @@
 import org.punit.convention.AnnotationConvention;
 import org.punit.events.*;
 import org.punit.runner.ConcurrentRunner;
+import org.punit.runner.ExecutorPoolImpl;
 import org.punit.runner.SoloRunner;
 
 import tests.api.org.punit.testclasses.AnnotationTestClass;
+import tests.api.org.punit.testclasses.BeforeAndAfterConcurrentTestClass;
 import tests.api.org.punit.testclasses.ConcurrentParameterizedTestClass;
 import tests.api.org.punit.testclasses.ConcurrentTestClass;
 import tests.api.org.punit.testclasses.LoopTestClass;
@@ -31,70 +33,81 @@
     public void setUp() {
     	_runner = new ConcurrentRunner();
     }
-    public void testMain() {
-        ConcurrentRunner.main(new String[] { TestSuiteClass.class.getName() });
-    }
-
-    public void testRun() {
-        _runner.run(TestSuiteClass.class);
-    }
-
-    public void testRunLoopTest() {
-        LoopTestClass.reset();
-        _runner.run(LoopTestClass.class);
-        LoopTestClass.assertTestClassRun();
-    }
-
-    public void testRunConcurrent() {
-        ConcurrentTestClass.reset();
-        _runner.run(ConcurrentTestClass.class);
-        assertConcurrentTestClassRun();
-    }
-
-    public void testRunTest() {
-        TestClass0.reset();
-        _runner.run(TestClass0.class);
-        TestClass0.assertTestClassRun();
-    }
-
-    public void testRunAnnotationTest() {
-        AnnotationTestClass.reset();
+//    public void testMain() {
+//        ConcurrentRunner.main(new String[] { TestSuiteClass.class.getName() });
+//    }
+//
+//    public void testRun() {
+//        _runner.run(TestSuiteClass.class);
+//    }
+//
+//    public void testRunLoopTest() {
+//        LoopTestClass.reset();
+//        _runner.run(LoopTestClass.class);
+//        LoopTestClass.assertTestClassRun();
+//    }
+//
+//    public void testRunConcurrent() {
+//        ConcurrentTestClass.reset();
+//        _runner.run(ConcurrentTestClass.class);
+//        assertConcurrentTestClassRun();
+//    }
+//
+//    public void testRunTest() {
+//        TestClass0.reset();
+//        _runner.run(TestClass0.class);
+//        TestClass0.assertTestClassRun();
+//    }
+//
+//    public void testRunAnnotationTest() {
+//        AnnotationTestClass.reset();
+//        _runner.setConvention(new AnnotationConvention());
+//        _runner.run(AnnotationTestClass.class);
+//        AnnotationTestClass.assertTestClassRun();
+//    }
+//
+//    public void testRunPUnitTest() {
+//        TestClass3.reset();
+//        _runner.run(TestClass3.class);
+//        TestClass3.assertTestClassRun();
+//    }
+//
+//    public void testRunParameterized() throws Exception {
+//        ConcurrentParameterizedTestClass.reset();
+//        _runner.run(ConcurrentParameterizedTestClass.class);
+//        ConcurrentParameterizedTestClass.assertTestClassRun();
+//    }
+//
+//    public void testRunTestSuite() {
+//        ConcurrentTestClass.reset();
+//        TestClass0.reset();
+//        TestClass3.reset();
+//        _runner.run(TestSuiteClass.class);
+//        assertConcurrentTestClassRun();
+//        TestClass0.assertTestClassRun();
+//        TestClass3.assertTestClassRun();
+//    }
+//
+//    public void testSerializable() throws Exception {
+//        _runner.addEventListener(new MockEventListener());
+//        List<EventListener> expectedListeners = _runner.eventListeners();
+//        ConcurrentRunner runner = (ConcurrentRunner) TestUtil
+//                .getSerialiableObject(_runner);
+//        List<EventListener> eventListeners = runner.eventListeners();
+//        assertEquals(expectedListeners.size(), eventListeners.size());
+//    }
+    
+    /**
+     * Test to check that the before and after methods run in the same thread as the methods
+     */
+    public void testBeforeAndAfterThreads() throws Exception {
+    	_runner = new ConcurrentRunner(1);
+//    	_runner.setExecutorPool(new ExecutorPoolImpl(2));
         _runner.setConvention(new AnnotationConvention());
-        _runner.run(AnnotationTestClass.class);
-        AnnotationTestClass.assertTestClassRun();
+    	_runner.run(BeforeAndAfterConcurrentTestClass.class);
+    	assertEquals(_runner.testResult().failures().size(), 0);
     }
 
-    public void testRunPUnitTest() {
-        TestClass3.reset();
-        _runner.run(TestClass3.class);
-        TestClass3.assertTestClassRun();
-    }
-
-    public void testRunParameterized() throws Exception {
-        ConcurrentParameterizedTestClass.reset();
-        _runner.run(ConcurrentParameterizedTestClass.class);
-        ConcurrentParameterizedTestClass.assertTestClassRun();
-    }
-
-    public void testRunTestSuite() {
-        ConcurrentTestClass.reset();
-        TestClass0.reset();
-        TestClass3.reset();
-        _runner.run(TestSuiteClass.class);
-        assertConcurrentTestClassRun();
-        TestClass0.assertTestClassRun();
-        TestClass3.assertTestClassRun();
-    }
-
-    public void testSerializable() throws Exception {
-        _runner.addEventListener(new MockEventListener());
-        List<EventListener> expectedListeners = _runner.eventListeners();
-        ConcurrentRunner runner = (ConcurrentRunner) TestUtil
-                .getSerialiableObject(_runner);
-        List<EventListener> eventListeners = runner.eventListeners();
-        assertEquals(expectedListeners.size(), eventListeners.size());
-    }
-
     private void assertConcurrentTestClassRun() {
         ConcurrentTestClass test = new ConcurrentTestClass();
         assertEquals(test.concurrentCount(), ConcurrentTestClass.value);

Added: trunk/punit.test/src/tests/api/org/punit/testclasses/BeforeAndAfterConcurrentTestClass.java
===================================================================
--- trunk/punit.test/src/tests/api/org/punit/testclasses/BeforeAndAfterConcurrentTestClass.java	                        (rev 0)
+++ trunk/punit.test/src/tests/api/org/punit/testclasses/BeforeAndAfterConcurrentTestClass.java	2008-06-10 08:22:52 UTC (rev 317)
@@ -0,0 +1,32 @@
+package tests.api.org.punit.testclasses;
+
+import org.punit.annotation.After;
+import org.punit.annotation.Before;
+import org.punit.annotation.Test;
+
+import static junit.framework.Assert.*;
+
+import tests.util.*;
+
+public class BeforeAndAfterConcurrentTestClass {
+	
+	private int value1 = 0;
+	
+	@Before
+	public void before() {
+		value1 = 5;
+	}
+	
+	@Test
+	public synchronized void one() {
+		TestUtil.doSomething();
+		value1 += 5;
+		assertEquals(10, value1);
+	}
+	
+	@After
+	public void after() {
+		value1 += 5;
+		assertEquals(15, value1);
+	}
+}
\ No newline at end of file


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.