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

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

Revision: 125
          http://p-unit.svn.sourceforge.net/p-unit/?rev=125&view=rev
Author:   zhanghuangzhu
Date:     2007-05-19 01:23:03 -0700 (Sat, 19 May 2007)

Log Message:
-----------
Andrew Zhang: javadoc and refactored watchers.

Modified Paths:
--------------
    trunk/punit/src/org/punit/events/PUnitEventListener.java
    trunk/punit/src/org/punit/reporter/stream/StreamLoggerListener.java
    trunk/punit/src/org/punit/runner/method/AbstractTestMethodRunner.java
    trunk/punit/src/org/punit/runner/method/TestMethodRunner.java
    trunk/punit.extension/src/org/punit/reporter/chart/AbstractChartReporter.java
    trunk/punit.test/src/tests/api/org/punit/runner/MockPUnitEventListener.java

Modified: trunk/punit/src/org/punit/events/PUnitEventListener.java
===================================================================
--- trunk/punit/src/org/punit/events/PUnitEventListener.java	2007-05-19 08:03:15 UTC (rev 124)
+++ trunk/punit/src/org/punit/events/PUnitEventListener.java	2007-05-19 08:23:03 UTC (rev 125)
@@ -4,6 +4,7 @@
 
 import java.io.*;
 import java.lang.reflect.*;
+import java.util.*;
 
 import org.punit.runner.*;
 import org.punit.type.*;
@@ -74,12 +75,12 @@
 	/**
 	 * It is triggered before all watchers start.
 	 */
-	public void onWatchersStart(Watcher[] watchers);
+	public void onWatchersStart(List watchers);
 
 	/**
 	 * It is triggered after all watchers stop.
 	 */
-	public void onWatchersEnd(Watcher[] watchers);
+	public void onWatchersEnd(List watchers);
 
 	/**
 	 * It is triggered before this watcher starts.

Modified: trunk/punit/src/org/punit/reporter/stream/StreamLoggerListener.java
===================================================================
--- trunk/punit/src/org/punit/reporter/stream/StreamLoggerListener.java	2007-05-19 08:03:15 UTC (rev 124)
+++ trunk/punit/src/org/punit/reporter/stream/StreamLoggerListener.java	2007-05-19 08:23:03 UTC (rev 125)
@@ -81,14 +81,14 @@
 		}
 	}
 
-	public void onWatchersStart(Watcher[] watchers) {
+	public void onWatchersStart(List watchers) {
 		_watchersStart = true;
 	}
 
 	public void onWatcherStart(Watcher watcher) {
 	}
 
-	public void onWatchersEnd(Watcher[] watchers) {
+	public void onWatchersEnd(List watchers) {
 		log("]", Level.FINE); //$NON-NLS-1$
 	}
 

Modified: trunk/punit/src/org/punit/runner/method/AbstractTestMethodRunner.java
===================================================================
--- trunk/punit/src/org/punit/runner/method/AbstractTestMethodRunner.java	2007-05-19 08:03:15 UTC (rev 124)
+++ trunk/punit/src/org/punit/runner/method/AbstractTestMethodRunner.java	2007-05-19 08:23:03 UTC (rev 125)
@@ -12,7 +12,7 @@
 
 public abstract class AbstractTestMethodRunner implements TestMethodRunner {
 
-	protected Watcher[] _watchers;
+	protected List _watchers = new ArrayList(); // <Watcher>
 
 	protected Object _testInstance;
 
@@ -27,15 +27,28 @@
 	protected Method _setUpMethod;
 
 	private Runner _runner;
+	
+	private MemoryWatcher _memoryWatcher = new MemoryWatcher();
+	
+	private TimeWatcher _timeWatcher = new TimeWatcher();
 
 	public AbstractTestMethodRunner() {
-		_watchers = new Watcher[] { new MemoryWatcher(), new TimeWatcher() };
+		_watchers.add(_memoryWatcher);
+		_watchers.add(_timeWatcher);
 	}
 
-	public void setWatchers(Watcher[] watchers) {
-		_watchers = watchers;
+	public void addWatcher(Watcher watcher) {
+		_watchers.add(watcher);
 	}
 	
+	public void removeTimeWatcher() {
+		_watchers.remove(_timeWatcher);
+	}
+	
+	public void removeMemoryWatcher() {
+		_watchers.remove(_memoryWatcher);
+	}
+	
 	public void setRunner(Runner runner) {
 		_runner = runner;
 	}
@@ -170,10 +183,13 @@
 
 	protected final void startWatchers(final Object testInstance, final Method method, final Object[] params) {
 		onWatchersStart(testInstance, method, params);
-		for (int i = 0; i < _watchers.length; ++i) {
-			onWatcherStart(_watchers[i], testInstance, method, params);
-			_watchers[i].start();
-		}
+		TraverserUtil.traverse(_watchers.iterator(), new Traverser() {
+			public void traverse(Object obj) {
+				Watcher watcher = (Watcher) obj;
+				onWatcherStart(watcher, testInstance, method, params);
+				watcher.start();
+			}
+		});
 	}
 
 	private void onWatchersStart(final Object testInstance, final Method method, final Object[] params) {
@@ -192,11 +208,14 @@
 		});
 	}
 
-	protected final void stopWatchers(Object testInstance, Method method, Object[] params) {
-		for (int i = 0; i < _watchers.length; ++i) {
-			_watchers[i].stop();
-			onWatcherEnd(_watchers[i], testInstance, method, params);
-		}
+	protected final void stopWatchers(final Object testInstance, final Method method, final Object[] params) {
+		TraverserUtil.traverse(_watchers.iterator(), new Traverser() {
+			public void traverse(Object obj) {
+				Watcher watcher = (Watcher) obj;
+				watcher.stop();
+				onWatcherEnd(watcher, testInstance, method, params);
+			}
+		});
 		onWatchersEnd(testInstance, method, params);
 	}
 
@@ -220,7 +239,7 @@
 		return _runner.eventListeners();
 	}
 
-	public Watcher[] watchers() {
+	public List watchers() {
 		return _watchers;
 	}
 

Modified: trunk/punit/src/org/punit/runner/method/TestMethodRunner.java
===================================================================
--- trunk/punit/src/org/punit/runner/method/TestMethodRunner.java	2007-05-19 08:03:15 UTC (rev 124)
+++ trunk/punit/src/org/punit/runner/method/TestMethodRunner.java	2007-05-19 08:23:03 UTC (rev 125)
@@ -2,9 +2,9 @@
 
 import java.io.*;
 import java.lang.reflect.*;
+import java.util.*;
 
 import org.punit.runner.*;
-import org.punit.watcher.*;
 
 public interface TestMethodRunner extends Serializable{
 	/**
@@ -22,5 +22,5 @@
 	 * returns the watchers associated with this method runner.
 	 * @return
 	 */
-	public Watcher[] watchers();
+	public List watchers();
 }

Modified: trunk/punit.extension/src/org/punit/reporter/chart/AbstractChartReporter.java
===================================================================
--- trunk/punit.extension/src/org/punit/reporter/chart/AbstractChartReporter.java	2007-05-19 08:03:15 UTC (rev 124)
+++ trunk/punit.extension/src/org/punit/reporter/chart/AbstractChartReporter.java	2007-05-19 08:23:03 UTC (rev 125)
@@ -205,11 +205,11 @@
 		// nothing needs to do
 	}
 	
-	public void onWatchersStart(Watcher[] watchers) {
+	public void onWatchersStart(List watchers) {
 		// nothing needs to do
 	}
 
-	public void onWatchersEnd(Watcher[] watchers) {
+	public void onWatchersEnd(List watchers) {
 		// nothing needs to do
 	}
 

Modified: trunk/punit.test/src/tests/api/org/punit/runner/MockPUnitEventListener.java
===================================================================
--- trunk/punit.test/src/tests/api/org/punit/runner/MockPUnitEventListener.java	2007-05-19 08:03:15 UTC (rev 124)
+++ trunk/punit.test/src/tests/api/org/punit/runner/MockPUnitEventListener.java	2007-05-19 08:23:03 UTC (rev 125)
@@ -1,6 +1,7 @@
 package tests.api.org.punit.runner;
 
 import java.lang.reflect.*;
+import java.util.*;
 
 import junit.framework.*;
 
@@ -56,11 +57,11 @@
 		onWatcherStart = true;
 	}
 
-	public void onWatchersEnd(Watcher[] watchers) {
+	public void onWatchersEnd(List watchers) {
 		onWatchersEnd = true;
 	}
 
-	public void onWatchersStart(Watcher[] watchers) {
+	public void onWatchersStart(List watchers) {
 		onWatchersStart = true;
 	}
 


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