Author: nicolas
Date: Thu Jan 24 05:06:54 2008
New Revision: 614869
URL: http://svn.apache.org/viewvc?rev=614869&view=rev
Log:
- rename read methods to getXX (javabean convention)
- override getMean for Gauge (testcase included)
- rename stats methods to match commons-math terminology
Added:
commons/sandbox/monitoring/trunk/src/main/java/org/apache/commons/monitoring/impl/SimpleCounter.java
(with props)
commons/sandbox/monitoring/trunk/src/main/java/org/apache/commons/monitoring/impl/SimpleGauge.java
- copied, changed from r614573,
commons/sandbox/monitoring/trunk/src/main/java/org/apache/commons/monitoring/impl/ConcurrencyGauge.java
commons/sandbox/monitoring/trunk/src/test/java/org/apache/commons/monitoring/impl/SimpleGaugeTest.java
- copied, changed from r614573,
commons/sandbox/monitoring/trunk/src/test/java/org/apache/commons/monitoring/impl/ConcurrencyGaugeTest.java
Removed:
commons/sandbox/monitoring/trunk/src/main/java/org/apache/commons/monitoring/impl/ConcurrencyGauge.java
commons/sandbox/monitoring/trunk/src/test/java/org/apache/commons/monitoring/impl/ConcurrencyGaugeTest.java
Modified:
commons/sandbox/monitoring/trunk/ (props changed)
commons/sandbox/monitoring/trunk/src/main/java/org/apache/commons/monitoring/Counter.java
commons/sandbox/monitoring/trunk/src/main/java/org/apache/commons/monitoring/StatValue.java
commons/sandbox/monitoring/trunk/src/main/java/org/apache/commons/monitoring/impl/RepositoryBase.java
commons/sandbox/monitoring/trunk/src/main/java/org/apache/commons/monitoring/impl/SimpleMonitor.java
commons/sandbox/monitoring/trunk/src/main/java/org/apache/commons/monitoring/impl/SimpleValue.java
commons/sandbox/monitoring/trunk/src/main/java/org/apache/commons/monitoring/reporting/JsonRenderer.java
commons/sandbox/monitoring/trunk/src/main/java/org/apache/commons/monitoring/reporting/XmlRenderer.java
commons/sandbox/monitoring/trunk/src/test/java/org/apache/commons/monitoring/MonitoringTest.java
commons/sandbox/monitoring/trunk/src/test/java/org/apache/commons/monitoring/reporting/RendererTest.java
Propchange: commons/sandbox/monitoring/trunk/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Jan 24 05:06:54 2008
@@ -0,0 +1,6 @@
+target
+.externalToolBuilders
+.settings
+.classpath
+.project
+maven-eclipse.xml
Modified:
commons/sandbox/monitoring/trunk/src/main/java/org/apache/commons/monitoring/Counter.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/monitoring/trunk/src/main/java/org/apache/commons/monitoring/Counter.java?rev=614869&r1=614868&r2=614869&view=diff
==============================================================================
---
commons/sandbox/monitoring/trunk/src/main/java/org/apache/commons/monitoring/Counter.java
(original)
+++
commons/sandbox/monitoring/trunk/src/main/java/org/apache/commons/monitoring/Counter.java
Thu Jan 24 05:06:54 2008
@@ -29,10 +29,11 @@
/**
* @return the sum of all set operations
*/
- long total();
+ long getSum();
/**
* @return how many time the value has been set
*/
- int hits();
+ int getHits();
}
+
Modified:
commons/sandbox/monitoring/trunk/src/main/java/org/apache/commons/monitoring/StatValue.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/monitoring/trunk/src/main/java/org/apache/commons/monitoring/StatValue.java?rev=614869&r1=614868&r2=614869&view=diff
==============================================================================
---
commons/sandbox/monitoring/trunk/src/main/java/org/apache/commons/monitoring/StatValue.java
(original)
+++
commons/sandbox/monitoring/trunk/src/main/java/org/apache/commons/monitoring/StatValue.java
Thu Jan 24 05:06:54 2008
@@ -20,7 +20,7 @@
/**
* A <code>StatValue</code> is a numerical indicator of some monitored
* application state with support for simple statistics.
- *
+ *
* @author <a href="mailto:[EMAIL PROTECTED]">Nicolas De Loof</a>
*/
public interface StatValue
@@ -38,26 +38,26 @@
void set( long l );
/**
- * @return the min value
+ * @return the minimum value
*/
- long min();
+ long getMin();
/**
- * @return the max value
+ * @return the maximum value
*/
- long max();
+ long getMax();
/**
- * @return the average value
+ * @return the arithmetic mean value
*/
- double average();
+ double getMean();
/**
* Compute the standard deviation : measures the dispersion of values
around
* the average value = sqrt( variance ).
- *
+ *
* @return the value standard deviation
*/
- double standardDeviation();
+ double getStandardDeviation();
}
Modified:
commons/sandbox/monitoring/trunk/src/main/java/org/apache/commons/monitoring/impl/RepositoryBase.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/monitoring/trunk/src/main/java/org/apache/commons/monitoring/impl/RepositoryBase.java?rev=614869&r1=614868&r2=614869&view=diff
==============================================================================
---
commons/sandbox/monitoring/trunk/src/main/java/org/apache/commons/monitoring/impl/RepositoryBase.java
(original)
+++
commons/sandbox/monitoring/trunk/src/main/java/org/apache/commons/monitoring/impl/RepositoryBase.java
Thu Jan 24 05:06:54 2008
@@ -91,8 +91,8 @@
{
Monitor monitor;
monitor = new SimpleMonitor( key );
- monitor.setValue( new SimpleValue(), Monitor.PERFORMANCES );
- monitor.setValue( new ConcurrencyGauge(), Monitor.CONCURRENCY );
+ monitor.setValue( new SimpleCounter(), Monitor.PERFORMANCES );
+ monitor.setValue( new SimpleGauge(), Monitor.CONCURRENCY );
return monitor;
}
Added:
commons/sandbox/monitoring/trunk/src/main/java/org/apache/commons/monitoring/impl/SimpleCounter.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/monitoring/trunk/src/main/java/org/apache/commons/monitoring/impl/SimpleCounter.java?rev=614869&view=auto
==============================================================================
---
commons/sandbox/monitoring/trunk/src/main/java/org/apache/commons/monitoring/impl/SimpleCounter.java
(added)
+++
commons/sandbox/monitoring/trunk/src/main/java/org/apache/commons/monitoring/impl/SimpleCounter.java
Thu Jan 24 05:06:54 2008
@@ -0,0 +1,28 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.commons.monitoring.impl;
+
+import org.apache.commons.monitoring.Counter;
+
+public class SimpleCounter
+ extends SimpleValue implements Counter
+{
+
+ // Nothing to do : Counter method already implemented by SimpleValue
+
+}
Propchange:
commons/sandbox/monitoring/trunk/src/main/java/org/apache/commons/monitoring/impl/SimpleCounter.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
commons/sandbox/monitoring/trunk/src/main/java/org/apache/commons/monitoring/impl/SimpleCounter.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange:
commons/sandbox/monitoring/trunk/src/main/java/org/apache/commons/monitoring/impl/SimpleCounter.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied:
commons/sandbox/monitoring/trunk/src/main/java/org/apache/commons/monitoring/impl/SimpleGauge.java
(from r614573,
commons/sandbox/monitoring/trunk/src/main/java/org/apache/commons/monitoring/impl/ConcurrencyGauge.java)
URL:
http://svn.apache.org/viewvc/commons/sandbox/monitoring/trunk/src/main/java/org/apache/commons/monitoring/impl/SimpleGauge.java?p2=commons/sandbox/monitoring/trunk/src/main/java/org/apache/commons/monitoring/impl/SimpleGauge.java&p1=commons/sandbox/monitoring/trunk/src/main/java/org/apache/commons/monitoring/impl/ConcurrencyGauge.java&r1=614573&r2=614869&rev=614869&view=diff
==============================================================================
---
commons/sandbox/monitoring/trunk/src/main/java/org/apache/commons/monitoring/impl/ConcurrencyGauge.java
(original)
+++
commons/sandbox/monitoring/trunk/src/main/java/org/apache/commons/monitoring/impl/SimpleGauge.java
Thu Jan 24 05:06:54 2008
@@ -17,27 +17,37 @@
package org.apache.commons.monitoring.impl;
-public class ConcurrencyGauge
+import org.apache.commons.monitoring.Gauge;
+
+/**
+ * Simple implementation of a Gauge. Maintains a total of (value * time) on
each
+ * gauge increment/decrement to compute the mean value.
+ *
+ * @author <a href="mailto:[EMAIL PROTECTED]">Nicolas De Loof</a>
+ */
+public class SimpleGauge
extends SimpleValue
+ implements Gauge
{
- private long cpuTime;
+ private long total;
private long lastUse;
- private long firstUse;
+ // Use a double so that unset can be detected as "Not a Number"
+ private double firstUse = Double.NaN;
@Override
public synchronized void increment()
{
long now = nanoTime();
- if ( firstUse == 0 )
+ if ( Double.isNaN( firstUse ) )
{
firstUse = now;
}
- if ( lastUse > 0 )
+ else
{
long delta = now - lastUse;
- cpuTime += get() * delta;
+ total += get() * delta;
}
super.increment();
lastUse = now;
@@ -53,14 +63,14 @@
{
long now = nanoTime();
long delta = now - lastUse;
- cpuTime += get() * delta;
+ total += get() * delta;
super.decrement();
lastUse = now;
}
@Override
- public synchronized double average()
+ public synchronized double getMean()
{
- return ( (double) cpuTime ) / ( lastUse - firstUse );
+ return ( (double) total ) / ( nanoTime() - firstUse );
}
}
Modified:
commons/sandbox/monitoring/trunk/src/main/java/org/apache/commons/monitoring/impl/SimpleMonitor.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/monitoring/trunk/src/main/java/org/apache/commons/monitoring/impl/SimpleMonitor.java?rev=614869&r1=614868&r2=614869&view=diff
==============================================================================
---
commons/sandbox/monitoring/trunk/src/main/java/org/apache/commons/monitoring/impl/SimpleMonitor.java
(original)
+++
commons/sandbox/monitoring/trunk/src/main/java/org/apache/commons/monitoring/impl/SimpleMonitor.java
Thu Jan 24 05:06:54 2008
@@ -27,7 +27,7 @@
/**
* Simple implementation of the [EMAIL PROTECTED] Monitor} interface.
- *
+ *
* @author <a href="mailto:[EMAIL PROTECTED]">Nicolas De Loof</a>
*/
public class SimpleMonitor
@@ -66,15 +66,7 @@
public StatValue getValue( String role )
{
- StatValue value = values.get( role );
- if ( value != null )
- {
- return value;
- }
- // If no value has been registered for this role, create a default one
- value = new SimpleValue();
- StatValue previous = values.putIfAbsent( role, value );
- return previous != null ? previous : value;
+ return values.get( role );
}
public boolean setValue( StatValue value, String role )
Modified:
commons/sandbox/monitoring/trunk/src/main/java/org/apache/commons/monitoring/impl/SimpleValue.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/monitoring/trunk/src/main/java/org/apache/commons/monitoring/impl/SimpleValue.java?rev=614869&r1=614868&r2=614869&view=diff
==============================================================================
---
commons/sandbox/monitoring/trunk/src/main/java/org/apache/commons/monitoring/impl/SimpleValue.java
(original)
+++
commons/sandbox/monitoring/trunk/src/main/java/org/apache/commons/monitoring/impl/SimpleValue.java
Thu Jan 24 05:06:54 2008
@@ -17,21 +17,19 @@
package org.apache.commons.monitoring.impl;
-import org.apache.commons.monitoring.Counter;
-import org.apache.commons.monitoring.Gauge;
import org.apache.commons.monitoring.StatValue;
/**
* A simple implementation of [EMAIL PROTECTED] StatValue}
- *
+ *
* @author <a href="mailto:[EMAIL PROTECTED]">Nicolas De Loof</a>
*/
-public class SimpleValue
- implements Gauge, Counter
+public abstract class SimpleValue
+ implements StatValue
{
private long value;
- private long total;
+ private long sum;
private int hits;
@@ -39,21 +37,20 @@
private long min;
- /** total of squares */
- private long squares;
+ private long sumOfSquares;
private String unit;
/**
* [EMAIL PROTECTED]
*/
- public double average()
+ public double getMean()
{
if ( hits == 0 )
{
return Double.NaN;
}
- return ( (double) total ) / hits;
+ return ( (double) sum ) / hits;
}
/**
@@ -67,7 +64,7 @@
/**
* [EMAIL PROTECTED]
*/
- public long max()
+ public long getMax()
{
return max;
}
@@ -75,7 +72,7 @@
/**
* [EMAIL PROTECTED]
*/
- public long min()
+ public long getMin()
{
return min;
}
@@ -86,12 +83,12 @@
public synchronized void set( long l )
{
value = l;
- onValueSet();
+ onValueSet( l );
}
- private void onValueSet()
+ protected void onValueSet(long l)
{
- if ( ( hits == 0 ) || ( value < min ) )
+ if ( ( hits == 0 ) || ( l < min ) )
{
min = value;
}
@@ -109,53 +106,49 @@
* <p>
* [EMAIL PROTECTED]
*/
- public double standardDeviation()
+ public double getStandardDeviation()
{
long n = hits;
if ( n <= 1 )
{
return Double.NaN;
}
- double variance = ( squares - total * average() ) / ( n - 1 );
+ double variance = ( sumOfSquares - sum * getMean() ) / ( n - 1 );
return Math.sqrt( variance );
}
- public long total()
+ protected long getSquares()
{
- return total;
+ return sumOfSquares;
}
- public int hits()
+ public synchronized void increment()
{
- return hits;
+ onValueSet( ++value );
}
- protected long getSquares()
+ public synchronized void decrement()
{
- return squares;
+ onValueSet( --value );
}
- public synchronized void increment()
+ public String getUnit()
{
- value++;
- onValueSet();
+ return unit;
}
- public synchronized void decrement()
+ public void add( long delta )
{
- value--;
- onValueSet();
+ onValueSet( value += delta );
}
- public void add( long delta )
+ public long getSum()
{
- value += delta;
- onValueSet();
+ return sum;
}
- public String getUnit()
+ public int getHits()
{
- return unit;
+ return hits;
}
-
}
Modified:
commons/sandbox/monitoring/trunk/src/main/java/org/apache/commons/monitoring/reporting/JsonRenderer.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/monitoring/trunk/src/main/java/org/apache/commons/monitoring/reporting/JsonRenderer.java?rev=614869&r1=614868&r2=614869&view=diff
==============================================================================
---
commons/sandbox/monitoring/trunk/src/main/java/org/apache/commons/monitoring/reporting/JsonRenderer.java
(original)
+++
commons/sandbox/monitoring/trunk/src/main/java/org/apache/commons/monitoring/reporting/JsonRenderer.java
Thu Jan 24 05:06:54 2008
@@ -99,20 +99,20 @@
write( ":{value:\"" );
write( String.valueOf( value.get() ) );
write( "\",min:\"" );
- write( String.valueOf( value.min() ) );
+ write( String.valueOf( value.getMin() ) );
write( "\",max:\"" );
- write( String.valueOf( value.max() ) );
- write( "\",average:\"" );
- write( String.valueOf( value.average() ) );
+ write( String.valueOf( value.getMax() ) );
+ write( "\",mean:\"" );
+ write( String.valueOf( value.getMean() ) );
write( "\",stdDev:\"" );
- write( String.valueOf( value.standardDeviation() ) );
+ write( String.valueOf( value.getStandardDeviation() ) );
if ( value instanceof Counter )
{
Counter counter = (Counter) value;
write( "\",total:\"" );
- write( String.valueOf( counter.total() ) );
+ write( String.valueOf( counter.getSum() ) );
write( "\",hits:\"" );
- write( String.valueOf( counter.hits() ) );
+ write( String.valueOf( counter.getHits() ) );
}
write( "\"}" );
}
Modified:
commons/sandbox/monitoring/trunk/src/main/java/org/apache/commons/monitoring/reporting/XmlRenderer.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/monitoring/trunk/src/main/java/org/apache/commons/monitoring/reporting/XmlRenderer.java?rev=614869&r1=614868&r2=614869&view=diff
==============================================================================
---
commons/sandbox/monitoring/trunk/src/main/java/org/apache/commons/monitoring/reporting/XmlRenderer.java
(original)
+++
commons/sandbox/monitoring/trunk/src/main/java/org/apache/commons/monitoring/reporting/XmlRenderer.java
Thu Jan 24 05:06:54 2008
@@ -77,20 +77,20 @@
write( " value=\"" );
write( String.valueOf( value.get() ) );
write( "\" min=\"" );
- write( String.valueOf( value.min() ) );
+ write( String.valueOf( value.getMin() ) );
write( "\" max=\"" );
- write( String.valueOf( value.max() ) );
- write( "\" average=\"" );
- write( String.valueOf( value.average() ) );
+ write( String.valueOf( value.getMax() ) );
+ write( "\" mean=\"" );
+ write( String.valueOf( value.getMean() ) );
write( "\" stdDev=\"" );
- write( String.valueOf( value.standardDeviation() ) );
+ write( String.valueOf( value.getStandardDeviation() ) );
if ( value instanceof Counter )
{
Counter counter = (Counter) value;
write( "\" total=\"" );
- write( String.valueOf( counter.total() ) );
+ write( String.valueOf( counter.getSum() ) );
write( "\" hits=\"" );
- write( String.valueOf( counter.hits() ) );
+ write( String.valueOf( counter.getHits() ) );
}
write( "\"/>" );
}
Modified:
commons/sandbox/monitoring/trunk/src/test/java/org/apache/commons/monitoring/MonitoringTest.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/monitoring/trunk/src/test/java/org/apache/commons/monitoring/MonitoringTest.java?rev=614869&r1=614868&r2=614869&view=diff
==============================================================================
---
commons/sandbox/monitoring/trunk/src/test/java/org/apache/commons/monitoring/MonitoringTest.java
(original)
+++
commons/sandbox/monitoring/trunk/src/test/java/org/apache/commons/monitoring/MonitoringTest.java
Thu Jan 24 05:06:54 2008
@@ -39,7 +39,7 @@
Monitor monitor = Monitoring.getMonitor(
"MonitoringTest.testMonitoring", "test", "utils" );
Gauge concurrency = monitor.getGauge( Monitor.CONCURRENCY );
assertEquals( 1, concurrency.get() );
- assertEquals( 2, concurrency.max() );
+ assertEquals( 2, concurrency.getMax() );
stopWatch1.stop();
assertEquals( 0, concurrency.get() );
Copied:
commons/sandbox/monitoring/trunk/src/test/java/org/apache/commons/monitoring/impl/SimpleGaugeTest.java
(from r614573,
commons/sandbox/monitoring/trunk/src/test/java/org/apache/commons/monitoring/impl/ConcurrencyGaugeTest.java)
URL:
http://svn.apache.org/viewvc/commons/sandbox/monitoring/trunk/src/test/java/org/apache/commons/monitoring/impl/SimpleGaugeTest.java?p2=commons/sandbox/monitoring/trunk/src/test/java/org/apache/commons/monitoring/impl/SimpleGaugeTest.java&p1=commons/sandbox/monitoring/trunk/src/test/java/org/apache/commons/monitoring/impl/ConcurrencyGaugeTest.java&r1=614573&r2=614869&rev=614869&view=diff
==============================================================================
---
commons/sandbox/monitoring/trunk/src/test/java/org/apache/commons/monitoring/impl/ConcurrencyGaugeTest.java
(original)
+++
commons/sandbox/monitoring/trunk/src/test/java/org/apache/commons/monitoring/impl/SimpleGaugeTest.java
Thu Jan 24 05:06:54 2008
@@ -21,7 +21,7 @@
import org.apache.commons.monitoring.Gauge;
-public class ConcurrencyGaugeTest
+public class SimpleGaugeTest
extends TestCase
{
private long time;
@@ -32,42 +32,38 @@
* <li>First one runs during 4 time units </li>
* <li>First one runs during 2 time units </li>
* </ul>
- * average concurrency is expected to be 1.5
- *
* <pre>
* concurrency
- * 3 _______
- * 2 ___| |___
- * 1 | |
- * 0 +---1---2---3---4---5---> time
- *
- *
- *
+ * _______
+ * 2 ___| |___
+ * 1 | |
+ * -0---1---2---3---4---> time
* </pre>
- *
+ * mean value is expected to be 1.5
+ *
* @throws Exception
*/
- public void testCompteAverageConcurency()
+ public void testCompteMean()
throws Exception
{
- Gauge concurrency = new MockTimeConcurrencyGauge();
+ Gauge gauge = new MockTimeGauge();
- time = 1;
- concurrency.increment();
+ time = 0;
+ gauge.increment();
time++;
- concurrency.increment();
+ gauge.increment();
time++;
time++;
- concurrency.decrement();
+ gauge.decrement();
time++;
- concurrency.decrement();
+ gauge.decrement();
- assertEquals( 0, concurrency.get() );
- assertEquals( 1.5D, concurrency.average(), 0D );
+ assertEquals( 0, gauge.get() );
+ assertEquals( 1.5D, gauge.getMean(), 0D );
}
- private class MockTimeConcurrencyGauge
- extends ConcurrencyGauge
+ private class MockTimeGauge
+ extends SimpleGauge
{
@Override
protected long nanoTime()
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=614869&r1=614868&r2=614869&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
Thu Jan 24 05:06:54 2008
@@ -26,6 +26,8 @@
import junit.framework.TestCase;
import org.apache.commons.monitoring.Monitor;
+import org.apache.commons.monitoring.impl.SimpleCounter;
+import org.apache.commons.monitoring.impl.SimpleGauge;
import org.apache.commons.monitoring.impl.SimpleMonitor;
public class RendererTest
@@ -41,12 +43,15 @@
{
monitors = new LinkedList<Monitor>();
Monitor m1 = new SimpleMonitor( "JsonRendererTest.setUp", "test",
"reporting" );
+ m1.setValue( new SimpleCounter(), Monitor.PERFORMANCES );
+ m1.setValue( new SimpleGauge(), Monitor.CONCURRENCY );
m1.getCounter( Monitor.PERFORMANCES ).add( 10 );
monitors.add( m1 );
Monitor m2 = new SimpleMonitor( "TestCase", "test", "junit" );
- m2.getCounter( Monitor.CONCURRENCY ).set( 1 );
- m2.getCounter( "UNEXPECTED" ).set( 1 );
+ m2.setValue( new SimpleCounter(), Monitor.PERFORMANCES );
+ m2.setValue( new SimpleGauge(), Monitor.CONCURRENCY );
+ m2.getGauge( Monitor.CONCURRENCY ).increment();
monitors.add( m2 );
}
@@ -59,11 +64,11 @@
assertEquals(
"["
+
"{key:{name:\"JsonRendererTest.setUp\",category:\"test\",subsystem:\"reporting\"},"
- +
"concurrency:{value:\"0\",min:\"0\",max:\"0\",average:\"NaN\",stdDev:\"NaN\",total:\"0\",hits:\"0\"},"
- +
"performances:{value:\"10\",min:\"10\",max:\"10\",average:\"0.0\",stdDev:\"NaN\",total:\"0\",hits:\"1\"}},"
+ +
"concurrency:{value:\"0\",min:\"0\",max:\"0\",mean:\"NaN\",stdDev:\"NaN\"},"
+ +
"performances:{value:\"10\",min:\"10\",max:\"10\",mean:\"0.0\",stdDev:\"NaN\",total:\"0\",hits:\"1\"}},"
+
"{key:{name:\"TestCase\",category:\"test\",subsystem:\"junit\"},"
- +
"concurrency:{value:\"1\",min:\"1\",max:\"1\",average:\"0.0\",stdDev:\"NaN\",total:\"0\",hits:\"1\"},"
- +
"performances:{value:\"0\",min:\"0\",max:\"0\",average:\"NaN\",stdDev:\"NaN\",total:\"0\",hits:\"0\"}}"
+ +
"concurrency:{value:\"1\",min:\"1\",max:\"1\",mean:\"0.0\",stdDev:\"NaN\"},"
+ +
"performances:{value:\"0\",min:\"0\",max:\"0\",mean:\"NaN\",stdDev:\"NaN\",total:\"0\",hits:\"0\"}}"
+ "]", out.toString() );
}
@@ -76,12 +81,12 @@
assertEquals(
"<monitors>"
+ "<monitor name=\"JsonRendererTest.setUp\" category=\"test\"
subsystem=\"reporting\">"
- + "<concurrency value=\"0\" min=\"0\" max=\"0\"
average=\"NaN\" stdDev=\"NaN\" total=\"0\" hits=\"0\"/>"
- + "<performances value=\"10\" min=\"10\" max=\"10\"
average=\"0.0\" stdDev=\"NaN\" total=\"0\" hits=\"1\"/>"
+ + "<concurrency value=\"0\" min=\"0\" max=\"0\" mean=\"NaN\"
stdDev=\"NaN\"/>"
+ + "<performances value=\"10\" min=\"10\" max=\"10\"
mean=\"0.0\" stdDev=\"NaN\" total=\"0\" hits=\"1\"/>"
+ "</monitor>"
+ "<monitor name=\"TestCase\" category=\"test\"
subsystem=\"junit\">"
- + "<concurrency value=\"1\" min=\"1\" max=\"1\"
average=\"0.0\" stdDev=\"NaN\" total=\"0\" hits=\"1\"/>"
- + "<performances value=\"0\" min=\"0\" max=\"0\"
average=\"NaN\" stdDev=\"NaN\" total=\"0\" hits=\"0\"/>"
+ + "<concurrency value=\"1\" min=\"1\" max=\"1\" mean=\"0.0\"
stdDev=\"NaN\"/>"
+ + "<performances value=\"0\" min=\"0\" max=\"0\" mean=\"NaN\"
stdDev=\"NaN\" total=\"0\" hits=\"0\"/>"
+ "</monitor></monitors>", out.toString() );
}
}
