You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2009/09/01 07:36:46 UTC

svn commit: r809826 - in /camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jms: JmsPerformanceTest.java StopWatch.java

Author: davsclaus
Date: Tue Sep  1 05:36:46 2009
New Revision: 809826

URL: http://svn.apache.org/viewvc?rev=809826&view=rev
Log:
Fixed stopwatch to output in millis.

Modified:
    camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsPerformanceTest.java
    camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/StopWatch.java

Modified: camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsPerformanceTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsPerformanceTest.java?rev=809826&r1=809825&r2=809826&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsPerformanceTest.java (original)
+++ camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/JmsPerformanceTest.java Tue Sep  1 05:36:46 2009
@@ -78,7 +78,7 @@
     }
 
     protected void assertExpectedMessagesReceived() throws InterruptedException {
-        receivedCountDown.await(50000, TimeUnit.SECONDS);
+        receivedCountDown.await(50, TimeUnit.SECONDS);
 
         assertEquals("Received message count", expectedMessageCount, consumedMessageCount);
 

Modified: camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/StopWatch.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/StopWatch.java?rev=809826&r1=809825&r2=809826&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/StopWatch.java (original)
+++ camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/jms/StopWatch.java Tue Sep  1 05:36:46 2009
@@ -71,8 +71,7 @@
     public String toString() {
         double average = totalElapsed;
         average /= totalLoops;
-        average /= 1000;
-        return id + " count: " + loopCount + " elapsed: " + groupElapsed + " min: " + minTime + " max: " + maxTime + " average: " + formatSeconds(average);
+        return id + " count: " + loopCount + ", elapsed (ms): " + groupElapsed + ", min (ms): " + minTime + ", max (ms): " + maxTime + ", average (ms): " + formatNumber(average);
     }
 
     public int getLogFrequency() {
@@ -103,7 +102,7 @@
         return groupElapsed;
     }
 
-    protected String formatSeconds(double time) {
+    protected String formatNumber(double time) {
         return numberFormat.format(time);
     }
 }