[P-unit-devel] SF.net SVN: p-unit: [263] trunk/punit/src/org/punit

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

Revision: 263
          http://p-unit.svn.sourceforge.net/p-unit/?rev=263&view=rev
Author:   zhanghuangzhu
Date:     2007-12-25 05:07:01 -0800 (Tue, 25 Dec 2007)

Log Message:
-----------
Andrew Zhang: refactored AbstractWatcher. Changed the start sequence of watcher list.

Modified Paths:
--------------
    trunk/punit/src/org/punit/method/runner/AbstractMethodRunner.java
    trunk/punit/src/org/punit/watcher/AbstractWatcher.java
    trunk/punit/src/org/punit/watcher/CustomWatcher.java
    trunk/punit/src/org/punit/watcher/MemoryWatcher.java
    trunk/punit/src/org/punit/watcher/TimeWatcher.java

Modified: trunk/punit/src/org/punit/method/runner/AbstractMethodRunner.java
===================================================================
--- trunk/punit/src/org/punit/method/runner/AbstractMethodRunner.java	2007-12-25 12:35:17 UTC (rev 262)
+++ trunk/punit/src/org/punit/method/runner/AbstractMethodRunner.java	2007-12-25 13:07:01 UTC (rev 263)
@@ -257,13 +257,11 @@
     protected final void startWatchers(final Object testInstance,
             final Method method, final Object[] params) {
         onWatchersStart(testInstance, method, params);
-        TraverserUtil.traverse(_watchers.iterator(), new Traverser() {
-            public void traverse(Object obj) {
-                Watcher watcher = (Watcher) obj;
-                onWatcherStart(watcher, testInstance, method, params);
-                watcher.start();
-            }
-        });
+        for(int i = _watchers.size() - 1; i >= 0; i--) {
+        	Watcher watcher = (Watcher) _watchers.get(i);
+            onWatcherStart(watcher, testInstance, method, params);
+            watcher.start();
+        }
     }
 
     private void onWatchersStart(final Object testInstance,

Modified: trunk/punit/src/org/punit/watcher/AbstractWatcher.java
===================================================================
--- trunk/punit/src/org/punit/watcher/AbstractWatcher.java	2007-12-25 12:35:17 UTC (rev 262)
+++ trunk/punit/src/org/punit/watcher/AbstractWatcher.java	2007-12-25 13:07:01 UTC (rev 263)
@@ -5,21 +5,9 @@
 import org.punit.exception.ReflectionException;
 
 public abstract class AbstractWatcher implements Watcher {
-
-    transient long _scale = 1;
     
-    transient long _value;
-
-    public double value() {
-        return ((double) _value) / _scale;
-    }
-    
     public String stringValue() {
-        if (_scale == 1) {
-            return _value + unit(); //$NON-NLS-1$
-        } else {
-            return value() + unit();
-        }
+        return value() + unit();
     }
 
     public Watcher cloneSelf() {

Modified: trunk/punit/src/org/punit/watcher/CustomWatcher.java
===================================================================
--- trunk/punit/src/org/punit/watcher/CustomWatcher.java	2007-12-25 12:35:17 UTC (rev 262)
+++ trunk/punit/src/org/punit/watcher/CustomWatcher.java	2007-12-25 13:07:01 UTC (rev 263)
@@ -19,6 +19,10 @@
     private String _name;
 
     private String _unit;
+    
+    transient long _value;
+    
+    transient long _scale;
 
     private transient static MethodRunner _methodRunner;
 
@@ -40,6 +44,10 @@
 
     public void stop() {
     }
+    
+    public double value() {
+    	return ((double)_value)/_scale;
+    }
 
     /**
      * Updates all registered <code>CustomWatcher</code> for this method

Modified: trunk/punit/src/org/punit/watcher/MemoryWatcher.java
===================================================================
--- trunk/punit/src/org/punit/watcher/MemoryWatcher.java	2007-12-25 12:35:17 UTC (rev 262)
+++ trunk/punit/src/org/punit/watcher/MemoryWatcher.java	2007-12-25 13:07:01 UTC (rev 263)
@@ -13,6 +13,8 @@
     private transient long _startUsedMemory;
     
     private transient boolean _stop;
+    
+    private transient long _value;
 
     public void start() {
         _stop = false;
@@ -26,6 +28,10 @@
         _stop = true;
         monitorMemory();
     }
+    
+    public double value() {
+    	return _value;
+    }
 
     private void monitorMemory() {
         long usedMemory = MemoryUtil.usedMemory() - _startUsedMemory;

Modified: trunk/punit/src/org/punit/watcher/TimeWatcher.java
===================================================================
--- trunk/punit/src/org/punit/watcher/TimeWatcher.java	2007-12-25 12:35:17 UTC (rev 262)
+++ trunk/punit/src/org/punit/watcher/TimeWatcher.java	2007-12-25 13:07:01 UTC (rev 263)
@@ -9,15 +9,22 @@
     private static final long serialVersionUID = -1374581076649027519L;
 
     private transient long _startTime;
-
+    
+    private transient long _value;
+    
+    private static final int _SCALE = 1000000;
+    
     public void start() {
         _startTime = System.nanoTime();
-        _scale = 1000000;
     }
 
     public void stop() {
         _value = System.nanoTime() - _startTime;
     }
+    
+    public double value() {
+    	return ((double)_value)/_SCALE;
+    }
 
     public String punitName() {
         return Messages.getString("watcher.time"); //$NON-NLS-1$


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