Copied:
commons/sandbox/monitoring/trunk/src/test/java/org/apache/commons/monitoring/impl/CompositeMetricsMonitorTest.java
(from r679011,
commons/sandbox/monitoring/trunk/src/test/java/org/apache/commons/monitoring/impl/CompositeValuesMonitorTest.java)
URL:
http://svn.apache.org/viewvc/commons/sandbox/monitoring/trunk/src/test/java/org/apache/commons/monitoring/impl/CompositeMetricsMonitorTest.java?p2=commons/sandbox/monitoring/trunk/src/test/java/org/apache/commons/monitoring/impl/CompositeMetricsMonitorTest.java&p1=commons/sandbox/monitoring/trunk/src/test/java/org/apache/commons/monitoring/impl/CompositeValuesMonitorTest.java&r1=679011&r2=679034&rev=679034&view=diff
==============================================================================
---
commons/sandbox/monitoring/trunk/src/test/java/org/apache/commons/monitoring/impl/CompositeValuesMonitorTest.java
(original)
+++
commons/sandbox/monitoring/trunk/src/test/java/org/apache/commons/monitoring/impl/CompositeMetricsMonitorTest.java
Wed Jul 23 02:00:21 2008
@@ -25,20 +25,20 @@
import org.apache.commons.monitoring.Monitor;
import org.apache.commons.monitoring.MonitoringTest;
import org.apache.commons.monitoring.Unit;
-import org.apache.commons.monitoring.impl.monitors.CompositeValuesMonitor;
+import org.apache.commons.monitoring.impl.monitors.CompositeMetricsMonitor;
/**
* Test for basic Monitor behaviour
*
* @author <a href="mailto:[EMAIL PROTECTED]">Nicolas De Loof</a>
*/
-public class CompositeValuesMonitorTest
+public class CompositeMetricsMonitorTest
extends TestCase
{
public void testReset()
throws Exception
{
- Monitor monitor = new CompositeValuesMonitor( new Monitor.Key(
"MonitorTest.testReset", "test", "utils" ) );
+ Monitor monitor = new CompositeMetricsMonitor( new Monitor.Key(
"MonitorTest.testReset", "test", "utils" ) );
Counter counter = monitor.getCounter( Monitor.PERFORMANCES );
counter.add( 1, Unit.NANOS );
assertEquals( 1, counter.get() );
@@ -51,7 +51,7 @@
public void testCompositeCounter()
throws Exception
{
- Monitor monitor = new CompositeValuesMonitor( new Monitor.Key(
"MonitorTest.testComposite", "test", "utils" ) );
+ Monitor monitor = new CompositeMetricsMonitor( new Monitor.Key(
"MonitorTest.testComposite", "test", "utils" ) );
Counter counter = monitor.getCounter( MonitoringTest.COUNTER );
Composite<Counter> composite = (Composite<Counter>) counter;
@@ -79,7 +79,7 @@
public void testCompositeGauge()
throws Exception
{
- Monitor monitor = new CompositeValuesMonitor( new Monitor.Key(
"MonitorTest.testComposite", "test", "utils" ) );
+ Monitor monitor = new CompositeMetricsMonitor( new Monitor.Key(
"MonitorTest.testComposite", "test", "utils" ) );
Gauge gauge = monitor.getGauge( MonitoringTest.GAUGE );
Composite<Gauge> composite = (Composite<Gauge>) gauge;
Propchange:
commons/sandbox/monitoring/trunk/src/test/java/org/apache/commons/monitoring/impl/CompositeMetricsMonitorTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
commons/sandbox/monitoring/trunk/src/test/java/org/apache/commons/monitoring/impl/CompositeMetricsMonitorTest.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange:
commons/sandbox/monitoring/trunk/src/test/java/org/apache/commons/monitoring/impl/CompositeMetricsMonitorTest.java
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange:
commons/sandbox/monitoring/trunk/src/test/java/org/apache/commons/monitoring/impl/CompositeMetricsMonitorTest.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified:
commons/sandbox/monitoring/trunk/src/test/java/org/apache/commons/monitoring/impl/ThreadSafeCounterTest.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/monitoring/trunk/src/test/java/org/apache/commons/monitoring/impl/ThreadSafeCounterTest.java?rev=679034&r1=679033&r2=679034&view=diff
==============================================================================
---
commons/sandbox/monitoring/trunk/src/test/java/org/apache/commons/monitoring/impl/ThreadSafeCounterTest.java
(original)
+++
commons/sandbox/monitoring/trunk/src/test/java/org/apache/commons/monitoring/impl/ThreadSafeCounterTest.java
Wed Jul 23 02:00:21 2008
@@ -22,7 +22,7 @@
import org.apache.commons.monitoring.Counter;
import org.apache.commons.monitoring.MonitoringTest;
import org.apache.commons.monitoring.Unit;
-import org.apache.commons.monitoring.impl.values.ThreadSafeCounter;
+import org.apache.commons.monitoring.impl.metrics.ThreadSafeCounter;
public class ThreadSafeCounterTest
extends TestCase
Modified:
commons/sandbox/monitoring/trunk/src/test/java/org/apache/commons/monitoring/impl/ThreadSafeGaugeTest.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/monitoring/trunk/src/test/java/org/apache/commons/monitoring/impl/ThreadSafeGaugeTest.java?rev=679034&r1=679033&r2=679034&view=diff
==============================================================================
---
commons/sandbox/monitoring/trunk/src/test/java/org/apache/commons/monitoring/impl/ThreadSafeGaugeTest.java
(original)
+++
commons/sandbox/monitoring/trunk/src/test/java/org/apache/commons/monitoring/impl/ThreadSafeGaugeTest.java
Wed Jul 23 02:00:21 2008
@@ -23,7 +23,7 @@
import org.apache.commons.monitoring.MonitoringTest;
import org.apache.commons.monitoring.Role;
import org.apache.commons.monitoring.Unit;
-import org.apache.commons.monitoring.impl.values.ThreadSafeGauge;
+import org.apache.commons.monitoring.impl.metrics.ThreadSafeGauge;
public class ThreadSafeGaugeTest
extends TestCase
Modified:
commons/sandbox/monitoring/trunk/src/test/java/org/apache/commons/monitoring/listener/ThresholdListenerTest.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/monitoring/trunk/src/test/java/org/apache/commons/monitoring/listener/ThresholdListenerTest.java?rev=679034&r1=679033&r2=679034&view=diff
==============================================================================
---
commons/sandbox/monitoring/trunk/src/test/java/org/apache/commons/monitoring/listener/ThresholdListenerTest.java
(original)
+++
commons/sandbox/monitoring/trunk/src/test/java/org/apache/commons/monitoring/listener/ThresholdListenerTest.java
Wed Jul 23 02:00:21 2008
@@ -22,9 +22,9 @@
import org.apache.commons.monitoring.Counter;
import org.apache.commons.monitoring.Monitor;
import org.apache.commons.monitoring.MonitoringTest;
-import org.apache.commons.monitoring.StatValue;
+import org.apache.commons.monitoring.Metric;
import org.apache.commons.monitoring.Unit;
-import org.apache.commons.monitoring.impl.monitors.CreateValuesOnDemandMonitor;
+import
org.apache.commons.monitoring.impl.monitors.CreateMetricsOnDemandMonitor;
import org.apache.commons.monitoring.listeners.ThresholdListener;
/**
@@ -36,7 +36,7 @@
public void testThresholdListener()
throws Exception
{
- final Monitor monitor = new CreateValuesOnDemandMonitor(
+ final Monitor monitor = new CreateMetricsOnDemandMonitor(
new Monitor.Key( "MonitoringTest.testMonitoring", "test", "utils"
) );
Counter counter = monitor.getCounter( MonitoringTest.COUNTER );
@@ -65,7 +65,7 @@
this.monitor = monitor;
}
- public void exceed( StatValue value, long l )
+ public void exceed( Metric value, long l )
{
count++;
assertEquals( 10, l );
Modified:
commons/sandbox/monitoring/trunk/src/test/java/org/apache/commons/monitoring/reporting/RendererTest.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/monitoring/trunk/src/test/java/org/apache/commons/monitoring/reporting/RendererTest.java?rev=679034&r1=679033&r2=679034&view=diff
==============================================================================
---
commons/sandbox/monitoring/trunk/src/test/java/org/apache/commons/monitoring/reporting/RendererTest.java
(original)
+++
commons/sandbox/monitoring/trunk/src/test/java/org/apache/commons/monitoring/reporting/RendererTest.java
Wed Jul 23 02:00:21 2008
@@ -32,8 +32,8 @@
import org.apache.commons.monitoring.MonitoringTest;
import org.apache.commons.monitoring.Role;
import org.apache.commons.monitoring.Unit;
-import org.apache.commons.monitoring.impl.monitors.CreateValuesOnDemandMonitor;
-import org.apache.commons.monitoring.impl.values.ThreadSafeCounter;
+import org.apache.commons.monitoring.impl.metrics.ThreadSafeCounter;
+import
org.apache.commons.monitoring.impl.monitors.CreateMetricsOnDemandMonitor;
import org.apache.commons.monitoring.reporting.Renderer.Options;
public class RendererTest
@@ -46,12 +46,12 @@
throws Exception
{
monitors = new LinkedList<Monitor>();
- Monitor m1 = new CreateValuesOnDemandMonitor( new Monitor.Key(
"JsonRendererTest.setUp", "test", "reporting" ) );
+ Monitor m1 = new CreateMetricsOnDemandMonitor( new Monitor.Key(
"JsonRendererTest.setUp", "test", "reporting" ) );
m1.getCounter( Monitor.PERFORMANCES ).add( 10, Unit.NANOS );
m1.getGauge( Monitor.CONCURRENCY );
monitors.add( m1 );
- Monitor m2 = new CreateValuesOnDemandMonitor( new Monitor.Key(
"TestCase", "test", "junit" ) );
+ Monitor m2 = new CreateMetricsOnDemandMonitor( new Monitor.Key(
"TestCase", "test", "junit" ) );
m2.getCounter( Monitor.PERFORMANCES );
m2.getGauge( Monitor.CONCURRENCY ).increment(Unit.UNARY);
monitors.add( m2 );
