svn commit: r738041 - in /commons/sandbox/monitoring/branches/modules/core/src: main/java/org/apache/commons/monitoring/monitors/NullMonitor.java test/java/org/apache/commons/monitoring/stopwatches/DefaultStopWatchTest.java

[nicolas]

Author: nicolas
Date: Tue Jan 27 09:23:52 2009
New Revision: 738041

URL: http://svn.apache.org/viewvc?rev=738041&view=rev
Log:
strict role test fix

Modified:
    
commons/sandbox/monitoring/branches/modules/core/src/main/java/org/apache/commons/monitoring/monitors/NullMonitor.java
    
commons/sandbox/monitoring/branches/modules/core/src/test/java/org/apache/commons/monitoring/stopwatches/DefaultStopWatchTest.java

Modified: 
commons/sandbox/monitoring/branches/modules/core/src/main/java/org/apache/commons/monitoring/monitors/NullMonitor.java
URL: 
http://svn.apache.org/viewvc/commons/sandbox/monitoring/branches/modules/core/src/main/java/org/apache/commons/monitoring/monitors/NullMonitor.java?rev=738041&r1=738040&r2=738041&view=diff
==============================================================================
--- 
commons/sandbox/monitoring/branches/modules/core/src/main/java/org/apache/commons/monitoring/monitors/NullMonitor.java
 (original)
+++ 
commons/sandbox/monitoring/branches/modules/core/src/main/java/org/apache/commons/monitoring/monitors/NullMonitor.java
 Tue Jan 27 09:23:52 2009
@@ -2,7 +2,6 @@
 
 import java.util.Arrays;
 import java.util.Collection;
-import java.util.Collections;
 
 import org.apache.commons.monitoring.Counter;
 import org.apache.commons.monitoring.Gauge;
@@ -23,11 +22,13 @@
 public class NullMonitor
     implements Monitor
 {
-    private static Role NOOP = new Role( "NoOp", Unit.UNARY, 
Metric.Type.COUNTER );
+    private static Role NOP_COUNTER = new Role( "Nop", Unit.UNARY, 
Metric.Type.COUNTER );
 
-    private static NoOpCounter counter = new NoOpCounter( NOOP );
+    private static Role NOP_GAUGE = new Role( "Nop", Unit.UNARY, 
Metric.Type.GAUGE );
 
-    private static NoOpGauge gauge = new NoOpGauge( NOOP );
+    private static NoOpCounter counter = new NoOpCounter( NOP_COUNTER );
+
+    private static NoOpGauge gauge = new NoOpGauge( NOP_GAUGE );
 
     private Collection<Metric> metrics = Arrays.asList( new Metric[] { 
counter, gauge } );
 
@@ -73,7 +74,7 @@
 
     public Collection<Role> getRoles()
     {
-        return Collections.singletonList( NOOP );
+        return Arrays.asList( new Role[] { NOP_COUNTER, NOP_GAUGE } );
     }
 
     public void reset()

Modified: 
commons/sandbox/monitoring/branches/modules/core/src/test/java/org/apache/commons/monitoring/stopwatches/DefaultStopWatchTest.java
URL: 
http://svn.apache.org/viewvc/commons/sandbox/monitoring/branches/modules/core/src/test/java/org/apache/commons/monitoring/stopwatches/DefaultStopWatchTest.java?rev=738041&r1=738040&r2=738041&view=diff
==============================================================================
--- 
commons/sandbox/monitoring/branches/modules/core/src/test/java/org/apache/commons/monitoring/stopwatches/DefaultStopWatchTest.java
 (original)
+++ 
commons/sandbox/monitoring/branches/modules/core/src/test/java/org/apache/commons/monitoring/stopwatches/DefaultStopWatchTest.java
 Tue Jan 27 09:23:52 2009
@@ -20,10 +20,8 @@
 import static junit.framework.Assert.assertEquals;
 import static junit.framework.Assert.assertTrue;
 
-import org.apache.commons.monitoring.Monitor;
 import org.apache.commons.monitoring.StopWatch;
 import org.apache.commons.monitoring.monitors.NullMonitor;
-import org.apache.commons.monitoring.stopwatches.DefaultStopWatch;
 import org.junit.Test;
 
 /**