Author: burton
Date: Tue Mar 8 16:09:49 2005
New Revision: 156586
URL: http://svn.apache.org/viewcvs?view=rev&rev=156586
Log:
refactored test to use clear instad of reset... tests for xmlrpc daemon support
Modified:
jakarta/commons/sandbox/benchmark/trunk/project.xml
jakarta/commons/sandbox/benchmark/trunk/src/java/org/apache/commons/benchmark/Benchmark.java
jakarta/commons/sandbox/benchmark/trunk/src/test/org/apache/commons/benchmark/Test1.java
Modified: jakarta/commons/sandbox/benchmark/trunk/project.xml
URL:
http://svn.apache.org/viewcvs/jakarta/commons/sandbox/benchmark/trunk/project.xml?view=diff&r1=156585&r2=156586
==============================================================================
--- jakarta/commons/sandbox/benchmark/trunk/project.xml (original)
+++ jakarta/commons/sandbox/benchmark/trunk/project.xml Tue Mar 8 16:09:49 2005
@@ -61,6 +61,11 @@
<version>1.7.0</version>
</dependency>
+ <dependency>
+ <id>xmlrpc</id>
+ <version>1.2-b1</version>
+ </dependency>
+
<dependency><id>jrobin</id><version>1.4.0</version></dependency>
<!-- these two are required by maven -->
Modified:
jakarta/commons/sandbox/benchmark/trunk/src/java/org/apache/commons/benchmark/Benchmark.java
URL:
http://svn.apache.org/viewcvs/jakarta/commons/sandbox/benchmark/trunk/src/java/org/apache/commons/benchmark/Benchmark.java?view=diff&r1=156585&r2=156586
==============================================================================
---
jakarta/commons/sandbox/benchmark/trunk/src/java/org/apache/commons/benchmark/Benchmark.java
(original)
+++
jakarta/commons/sandbox/benchmark/trunk/src/java/org/apache/commons/benchmark/Benchmark.java
Tue Mar 8 16:09:49 2005
@@ -124,7 +124,7 @@
this.name = name;
- reset();
+ clear();
}
@@ -133,7 +133,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">Kevin A. Burton</a>
*/
- void reset() {
+ void clear() {
tracker1 = new BenchmarkTracker( INTERVAL_1, this );
tracker5 = new BenchmarkTracker( INTERVAL_5, this );
@@ -146,7 +146,7 @@
/**
* Get the tracker for this benchmark which includes all metadata related
to
* this benchmark including total completed/started and current values.
- *
+ *
*/
public BenchmarkTracker getTracker() {
return getTracker1();
Modified:
jakarta/commons/sandbox/benchmark/trunk/src/test/org/apache/commons/benchmark/Test1.java
URL:
http://svn.apache.org/viewcvs/jakarta/commons/sandbox/benchmark/trunk/src/test/org/apache/commons/benchmark/Test1.java?view=diff&r1=156585&r2=156586
==============================================================================
---
jakarta/commons/sandbox/benchmark/trunk/src/test/org/apache/commons/benchmark/Test1.java
(original)
+++
jakarta/commons/sandbox/benchmark/trunk/src/test/org/apache/commons/benchmark/Test1.java
Tue Mar 8 16:09:49 2005
@@ -16,6 +16,11 @@
package org.apache.commons.benchmark;
+import org.apache.commons.benchmark.*;
+import org.apache.commons.benchmark.xmlrpc.*;
+
+import org.apache.xmlrpc.*;
+
import junit.framework.*;
import java.util.*;
@@ -30,6 +35,50 @@
//FIXME: test with using really short intervals but with diff values.
+ public void testXmlrpc() throws Exception {
+
+ WebServer webserver = new WebServer ( 2048 );
+
+ webserver.addHandler( "benchmark",
+ new BenchmarkHandler() );
+
+ // deny all clients
+ webserver.setParanoid ( true );
+ // allow local access
+ webserver.acceptClient ( "10.*.*.*" );
+ webserver.acceptClient ( "127.*.*.*" );
+
+ webserver.start();
+
+ Thread.sleep( 100 );
+
+ //create a faux benchmark
+
+ Benchmark b = Benchmark.getBenchmark( "foo" );
+ b.start();
+ b.complete();
+
+ assertEquals( 1, b.getTracker1().now.completed );
+
+ b.getTracker1().reset( System.currentTimeMillis() );
+
+ //FIXME: this isn't working.
+ assertEquals( 0, b.getTracker1().now.completed );
+ assertEquals( 1, b.getTracker1().last.completed );
+
+ String router = "http://localhost:2048/RPC2";;
+
+ XmlRpcClient xmlrpc = new XmlRpcClient ( router );
+
+ Vector params = new Vector ();
+ params.add( "foo" );
+
+ Object result = xmlrpc.execute ( "benchmark.getLastCompleted", params
);
+
+ assertEquals( new Double( 1 ), result );
+
+ }
+
public void testDuration() throws Exception {
Benchmark.DISABLE_LOCAL = false;
@@ -59,7 +108,7 @@
assertTrue( 100 < meanDuration );
assertTrue( 200 > meanDuration );
- benchmark.reset();
+ benchmark.clear();
}
@@ -91,7 +140,7 @@
assertEquals( 0, benchmark.getTracker1().now.getCompleted() );
assertEquals( 0, benchmark.getTracker1().now.getDuration() );
- benchmark.reset();
+ benchmark.clear();
}
@@ -160,7 +209,7 @@
assertEquals( 0, benchmark.getTracker5().now.started );
//reset all the trackers
- benchmark.reset();
+ benchmark.clear();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
