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

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

Revision: 94
          http://p-unit.svn.sourceforge.net/p-unit/?rev=94&view=rev
Author:   zhanghuangzhu
Date:     2007-05-17 06:18:32 -0700 (Thu, 17 May 2007)

Log Message:
-----------
Andrew Zhang: refactored PUnitEventListener.

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.extension/src/org/punit/reporter/chart/image/AbstractImageReporter.java
    trunk/punit.extension/src/org/punit/reporter/chart/image/TestSuiteImageReporter.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-17 12:26:47 UTC (rev 93)
+++ trunk/punit/src/org/punit/events/PUnitEventListener.java	2007-05-17 13:18:32 UTC (rev 94)
@@ -20,12 +20,12 @@
 
 	public void onMethodEnd(Method method, Throwable t);
 	
-	public void onWatchersStart(Watcher[] watchers);
+	public void onWatchersStart(Watcher[] watchers, Object testInstance, Method method, Object[] params);
 
-	public void onWatcherStart(Watcher watcher);
+	public void onWatcherStart(Watcher watcher, Object testInstance, Method method, Object[] params);
 
-	public void onWatcherEnd(Watcher watcher);
+	public void onWatcherEnd(Watcher watcher, Object testInstance, Method method, Object[] params);
 
-	public void onWatchersEnd(Watcher[] watchers);
+	public void onWatchersEnd(Watcher[] watchers, Object testInstance, Method method, Object[] params);
 
 }

Modified: trunk/punit/src/org/punit/reporter/stream/StreamLoggerListener.java
===================================================================
--- trunk/punit/src/org/punit/reporter/stream/StreamLoggerListener.java	2007-05-17 12:26:47 UTC (rev 93)
+++ trunk/punit/src/org/punit/reporter/stream/StreamLoggerListener.java	2007-05-17 13:18:32 UTC (rev 94)
@@ -70,18 +70,18 @@
 		}
 	}
 
-	public void onWatchersStart(Watcher[] watchers) {
+	public void onWatchersStart(Watcher[] watchers, Object testInstance, Method method, Object[] params) {
 		_watchersStart = true;
 	}
 
-	public void onWatcherStart(Watcher watcher) {
+	public void onWatcherStart(Watcher watcher, Object testInstance, Method method, Object[] params) {
 	}
 
-	public void onWatchersEnd(Watcher[] watchers) {
+	public void onWatchersEnd(Watcher[] watchers, Object testInstance, Method method, Object[] params) {
 		log("]", Level.FINE); //$NON-NLS-1$
 	}
 
-	public void onWatcherEnd(Watcher watcher) {
+	public void onWatcherEnd(Watcher watcher, Object testInstance, Method method, Object[] params) {
 		String watchValue = watcher.stringValue();
 		if (_watchersStart) {
 			log(" - [" + watchValue, Level.FINE); //$NON-NLS-1$
@@ -143,19 +143,6 @@
 			_timeWatcher.stop();
 		}
 
-		/*
-		 * The format is:
-		 * 
-		 * Total: 4 (GREEN) - 156ms
-		 * 
-		 * or:
-		 * 
-		 * Total: 2 (RED) - 120ms 1)java.lang.IllegalArgumentException at
-		 * tests.SimpleTestSample.test1(SimpleTestSample.java:20)
-		 * 2)java.lang.NullPointerException at
-		 * tests.SimpleTestSample.test2(SimpleTestSample.java:24)
-		 * 
-		 */
 		public void log(final StreamLoggerListener logger) {
 			StringBuffer sb = new StringBuffer();
 			sb.append(Messages.getString("logger.02")); //$NON-NLS-1$

Modified: trunk/punit/src/org/punit/runner/method/AbstractTestMethodRunner.java
===================================================================
--- trunk/punit/src/org/punit/runner/method/AbstractTestMethodRunner.java	2007-05-17 12:26:47 UTC (rev 93)
+++ trunk/punit/src/org/punit/runner/method/AbstractTestMethodRunner.java	2007-05-17 13:18:32 UTC (rev 94)
@@ -45,7 +45,7 @@
 			onMethodStart(method);
 			init(testInstance, method, params);
 			setUpBeforeWatchers(params);
-			startWatchers();
+			startWatchers(testInstance, method, params);
 			setUpAfterWatchers(params);
 			runImpl();
 		} catch (Throwable t) {
@@ -57,7 +57,7 @@
 				throwable = t;
 			} finally {
 				try {
-					stopWatchers();
+					stopWatchers(testInstance, method, params);
 					tearDownAfterWatchers(params);
 				} catch (Throwable t) {
 					throwable = t;
@@ -160,50 +160,50 @@
 		}
 	}
 
-	protected final void startWatchers() {
-		onWatchersStart();
+	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]);
+			onWatcherStart(_watchers[i], testInstance, method, params);
 			_watchers[i].start();
 		}
 	}
 
-	private void onWatchersStart() {
+	private void onWatchersStart(final Object testInstance, final Method method, final Object[] params) {
 		TraverserUtil.traverse(_eventListeners.iterator(), new Traverser() {
 			public void traverse(Object obj) {
-				((PUnitEventListener) obj).onWatchersStart(_watchers);
+				((PUnitEventListener) obj).onWatchersStart(_watchers, testInstance, method, params);
 			}
 		});
 	}
 	
-	private void onWatcherStart(final Watcher watcher) {
+	private void onWatcherStart(final Watcher watcher, final Object testInstance, final Method method, final Object[] params) {
 		TraverserUtil.traverse(_eventListeners.iterator(), new Traverser() {
 			public void traverse(Object obj) {
-				((PUnitEventListener) obj).onWatcherStart(watcher);
+				((PUnitEventListener) obj).onWatcherStart(watcher, testInstance, method, params);
 			}
 		});
 	}
 
-	protected final void stopWatchers() {
+	protected final void stopWatchers(Object testInstance, Method method, Object[] params) {
 		for (int i = 0; i < _watchers.length; ++i) {
 			_watchers[i].stop();
-			onWatcherEnd(_watchers[i]);
+			onWatcherEnd(_watchers[i], testInstance, method, params);
 		}
-		onWatchersEnd();
+		onWatchersEnd(testInstance, method, params);
 	}
 
-	private void onWatcherEnd(final Watcher watcher) {
+	private void onWatcherEnd(final Watcher watcher, final Object testInstance, final Method method, final Object[] params) {
 		TraverserUtil.traverse(_eventListeners.iterator(), new Traverser() {
 			public void traverse(Object obj) {
-				((PUnitEventListener) obj).onWatcherEnd(watcher);
+				((PUnitEventListener) obj).onWatcherEnd(watcher, testInstance, method, params);
 			}
 		});
 	}
 	
-	private void onWatchersEnd() {
+	private void onWatchersEnd(final Object testInstance, final Method method, final Object[] params) {
 		TraverserUtil.traverse(_eventListeners.iterator(), new Traverser() {
 			public void traverse(Object obj) {
-				((PUnitEventListener) obj).onWatchersEnd(_watchers);
+				((PUnitEventListener) obj).onWatchersEnd(_watchers, testInstance, method, params);
 			}
 		});
 	}

Modified: trunk/punit.extension/src/org/punit/reporter/chart/image/AbstractImageReporter.java
===================================================================
--- trunk/punit.extension/src/org/punit/reporter/chart/image/AbstractImageReporter.java	2007-05-17 12:26:47 UTC (rev 93)
+++ trunk/punit.extension/src/org/punit/reporter/chart/image/AbstractImageReporter.java	2007-05-17 13:18:32 UTC (rev 94)
@@ -20,12 +20,7 @@
 	protected final String _format;
 	
 	protected transient RunnerProperties _runnerProperties;
-	
-	protected transient Class _currentClass;
 
-	protected transient Method _currentMethod;
-
-
 	public AbstractImageReporter() {
 		this(ImageReporterConstants.DEFAULT_HEIGHT, ImageReporterConstants.DEFAULT_WIDTH, ImageReporterConstants.DEFAULT_FORMAT);
 	}
@@ -36,31 +31,29 @@
 		_format = format;
 	}
 	
-	public void onWatchersStart(Watcher[] watchers) {
-		// nothing needs to do
+	public void onClassStart(Class clazz) {
 	}
 
-	public void onWatchersEnd(Watcher[] watchers) {
+	public void onClassEnd(Class clazz) {
 		// nothing needs to do
 	}
 
-	public void onClassStart(Class clazz) {
-		_currentClass = clazz;
+	public void onMethodStart(Method method) {
 	}
 
-	public void onClassEnd(Class clazz) {
+	public void onMethodEnd(Method method, Throwable t) {
 		// nothing needs to do
 	}
 
-	public void onMethodStart(Method method) {
-		_currentMethod = method;
+	public void onWatcherStart(Watcher watcher, Object testInstance, Method method, Object[] params) {
+		// nothing needs to do
 	}
 
-	public void onMethodEnd(Method method, Throwable t) {
+	public void onWatchersStart(Watcher[] watchers, Object testInstance, Method method, Object[] params) {
 		// nothing needs to do
 	}
 
-	public void onWatcherStart(Watcher watcher) {
+	public void onWatchersEnd(Watcher[] watchers, Object testInstance, Method method, Object[] params) {
 		// nothing needs to do
 	}
 

Modified: trunk/punit.extension/src/org/punit/reporter/chart/image/TestSuiteImageReporter.java
===================================================================
--- trunk/punit.extension/src/org/punit/reporter/chart/image/TestSuiteImageReporter.java	2007-05-17 12:26:47 UTC (rev 93)
+++ trunk/punit.extension/src/org/punit/reporter/chart/image/TestSuiteImageReporter.java	2007-05-17 13:18:32 UTC (rev 94)
@@ -1,6 +1,7 @@
 package org.punit.reporter.chart.image;
 
 import java.io.*;
+import java.lang.reflect.*;
 import java.util.*;
 import java.util.Map.*;
 
@@ -71,11 +72,11 @@
 		});
 	}
 
-	public void onWatcherEnd(Watcher watcher) {
+	public void onWatcherEnd(Watcher watcher, Object testInstance, Method method, Object[] params) {
 		DefaultCategoryDataset dataset = getDataset(watcher);
 		double value = watcher.value();
-		String yname = _currentClass.getSimpleName();
-		String xname = _currentMethod.getName();
+		String yname = testInstance.getClass().getSimpleName();
+		String xname = method.getName();
 		dataset.addValue(value, yname, xname); // value, y, x
 	}
 

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-17 12:26:47 UTC (rev 93)
+++ trunk/punit.test/src/tests/api/org/punit/runner/MockPUnitEventListener.java	2007-05-17 13:18:32 UTC (rev 94)
@@ -45,19 +45,19 @@
 		onMethodStart = true;
 	}
 
-	public void onWatcherEnd(Watcher watcher) {
+	public void onWatcherEnd(Watcher watcher, Object testInstance, Method method, Object[] params) {
 		onWatcherEnd = true;
 	}
 
-	public void onWatcherStart(Watcher watcher) {
+	public void onWatcherStart(Watcher watcher, Object testInstance, Method method, Object[] params) {
 		onWatcherStart = true;
 	}
 
-	public void onWatchersEnd(Watcher[] watchers) {
+	public void onWatchersEnd(Watcher[] watchers, Object testInstance, Method method, Object[] params) {
 		onWatchersEnd = true;
 	}
 
-	public void onWatchersStart(Watcher[] watchers) {
+	public void onWatchersStart(Watcher[] watchers, Object testInstance, Method method, Object[] params) {
 		onWatchersStart = true;
 	}
 


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