[P-unit-devel] SF.net SVN: p-unit: [225] trunk/punit

[<zha...@us...>]

Revision: 225
          http://p-unit.svn.sourceforge.net/p-unit/?rev=225&view=rev
Author:   zhanghuangzhu
Date:     2007-06-25 04:34:23 -0700 (Mon, 25 Jun 2007)

Log Message:
-----------
Andrew Zhang: First implementation for Loop test is done.

Modified Paths:
--------------
    trunk/punit/src/org/punit/method/runner/AbstractMethodRunner.java
    trunk/punit/src/org/punit/method/runner/ConcurrentMethodRunner.java
    trunk/punit.test/src/tests/api/org/punit/runner/ConcurrentRunnerTest.java
    trunk/punit.test/src/tests/api/org/punit/runner/SoloRunnerTest.java
    trunk/punit.test/src/tests/api/org/punit/testclasses/LoopTestClass.java

Modified: trunk/punit/src/org/punit/method/runner/AbstractMethodRunner.java
===================================================================
--- trunk/punit/src/org/punit/method/runner/AbstractMethodRunner.java	2007-06-25 09:09:45 UTC (rev 224)
+++ trunk/punit/src/org/punit/method/runner/AbstractMethodRunner.java	2007-06-25 11:34:23 UTC (rev 225)
@@ -76,11 +76,11 @@
 		try {
 			if (needsRunMethod()) {
 				init(testInstance, method, params);
+				setUpBeforeWatchers(params);
+				startWatchers(testInstance, method, params);
+				setUpAfterWatchers(params);
 				startToStopThread();
 				do {
-					setUpBeforeWatchers(params);
-					startWatchers(testInstance, method, params);
-					setUpAfterWatchers(params);
 					runImpl();
 				} while (isLoop());
 				stopToStopThread();
@@ -161,7 +161,7 @@
 		_tearDownMethod = _convention.getTearDownMethod(_class);
 		_checkMethod = _convention.getCheckMethod(method);
 		_expectedException = _convention.getExpectedException(method);
-		int toStop = _convention.getToStop(_testInstance);
+		long toStop = _convention.toStop(_testInstance);
 		if (toStop > 0) {
 			_toStopThread = new ToStopThread(new Runnable() {
 				public void run() {

Modified: trunk/punit/src/org/punit/method/runner/ConcurrentMethodRunner.java
===================================================================
--- trunk/punit/src/org/punit/method/runner/ConcurrentMethodRunner.java	2007-06-25 09:09:45 UTC (rev 224)
+++ trunk/punit/src/org/punit/method/runner/ConcurrentMethodRunner.java	2007-06-25 11:34:23 UTC (rev 225)
@@ -27,7 +27,13 @@
 	}
 	
 	private void startThreads() {
+		int count = _convention.getConcurrentCount(_testInstance, _method);
+		int threadCount = count > 0? count : _concurrentCount;
+		_threads = new TestMethodThread[threadCount];
 		for (int i = 0; i < _threads.length; ++i) {
+			_threads[i] = new TestMethodThread(this, "punit concurrent method runner"); //$NON-NLS-1$
+		}
+		for (int i = 0; i < _threads.length; ++i) {
 			_threads[i].start();
 		}
 	}
@@ -41,20 +47,6 @@
 			}
 		}
 	}
-
-	protected void setUpBeforeWatchers(Object[] params) throws Throwable {
-		super.setUpBeforeWatchers(params);
-		initThreads();		
-	}
-
-	private void initThreads() {
-		int count = _convention.getConcurrentCount(_testInstance, _method);
-		int threadCount = count > 0? count : _concurrentCount;
-		_threads = new TestMethodThread[threadCount];
-		for (int i = 0; i < _threads.length; ++i) {
-			_threads[i] = new TestMethodThread(this, "punit concurrent method runner"); //$NON-NLS-1$
-		}
-	}
 	
 	protected String getCheckMethodName() {
 		return "check_" + _method.getName(); //$NON-NLS-1$

Modified: trunk/punit.test/src/tests/api/org/punit/runner/ConcurrentRunnerTest.java
===================================================================
--- trunk/punit.test/src/tests/api/org/punit/runner/ConcurrentRunnerTest.java	2007-06-25 09:09:45 UTC (rev 224)
+++ trunk/punit.test/src/tests/api/org/punit/runner/ConcurrentRunnerTest.java	2007-06-25 11:34:23 UTC (rev 225)
@@ -13,12 +13,9 @@
 import tests.util.*;
 
 public class ConcurrentRunnerTest extends TestCase {
-	private ConcurrentRunner _runner;
+	
+	private ConcurrentRunner _runner = new ConcurrentRunner();
 
-	protected void setUp() throws Exception {
-		_runner = new ConcurrentRunner();
-	}
-
 	public void testMain() {
 		ConcurrentRunner.main(new String[] {TestSuiteClass.class.getName()});
 	}
@@ -27,6 +24,12 @@
 		_runner.run(TestSuiteClass.class);
 	}
 	
+	public void testRunLoopTest() {
+		LoopTestClass.reset();
+		_runner.run(LoopTestClass.class);
+		LoopTestClass.assertTestClassRun();
+	}
+	
 	public void testRunConcurrent() {
 		ConcurrentTestClass.reset();
 		_runner.run(ConcurrentTestClass.class);

Modified: trunk/punit.test/src/tests/api/org/punit/runner/SoloRunnerTest.java
===================================================================
--- trunk/punit.test/src/tests/api/org/punit/runner/SoloRunnerTest.java	2007-06-25 09:09:45 UTC (rev 224)
+++ trunk/punit.test/src/tests/api/org/punit/runner/SoloRunnerTest.java	2007-06-25 11:34:23 UTC (rev 225)
@@ -36,6 +36,13 @@
 		TestClass.assertTestClassRun();
 		_eventListener.assertAllEventsInvoked();
 	}
+	
+	public void testRunLoopTest() {
+		LoopTestClass.reset();
+		_runner.run(LoopTestClass.class);
+		LoopTestClass.assertTestClassRun();
+		_eventListener.assertAllEventsInvoked();
+	}
 
 	public void testRunAnnotationTest() {
 		AnnotationTestClass.reset();

Modified: trunk/punit.test/src/tests/api/org/punit/testclasses/LoopTestClass.java
===================================================================
--- trunk/punit.test/src/tests/api/org/punit/testclasses/LoopTestClass.java	2007-06-25 09:09:45 UTC (rev 224)
+++ trunk/punit.test/src/tests/api/org/punit/testclasses/LoopTestClass.java	2007-06-25 11:34:23 UTC (rev 225)
@@ -47,10 +47,10 @@
 	}
 	
 	public static void assertTestClassRun() {
-		Assert.assertTrue(_test1 > 1);
-		Assert.assertTrue(_test2 > 1);
-		Assert.assertTrue(_setUp > 1);
-		Assert.assertTrue(_tearDown > 1);
+		Assert.assertTrue(_test1 > 2);
+		Assert.assertTrue(_test2 > 2);
+		Assert.assertEquals(2, _setUp);
+		Assert.assertEquals(2, _tearDown);
 	}
 
 	public long toAbort() {


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