Author: bvahdat Date: Wed Jan 2 16:24:00 2013 New Revision: 1427849 URL: http://svn.apache.org/viewvc?rev=1427849&view=rev Log: Merged revisions 1427844 via svnmerge from https://svn.apache.org/repos/asf/camel/branches/camel-2.10.x
................ r1427844 | bvahdat | 2013-01-02 17:18:40 +0100 (Mi, 02 Jan 2013) | 9 lines Merged revisions 1427825 via svnmerge from https://svn.apache.org/repos/asf/camel/trunk ........ r1427825 | bvahdat | 2013-01-02 16:33:34 +0100 (Mi, 02 Jan 2013) | 1 line Polished (only backported the camel-performance part of this commit). ........ ................ Modified: camel/branches/camel-2.9.x/ (props changed) camel/branches/camel-2.9.x/tests/camel-performance/src/test/java/org/apache/camel/test/perf/AbstractBasePerformanceTest.java camel/branches/camel-2.9.x/tests/camel-performance/src/test/java/org/apache/camel/test/perf/ContentBasedRoutingPerformanceTest.java camel/branches/camel-2.9.x/tests/camel-performance/src/test/java/org/apache/camel/test/perf/HeaderBasedRoutingPerformanceTest.java camel/branches/camel-2.9.x/tests/camel-performance/src/test/java/org/apache/camel/test/perf/SplitterPerformanceTest.java camel/branches/camel-2.9.x/tests/camel-performance/src/test/java/org/apache/camel/test/perf/XPathBasedRoutingPerformanceTest.java camel/branches/camel-2.9.x/tests/camel-performance/src/test/java/org/apache/camel/test/perf/XQueryBasedRoutingPerformanceTest.java camel/branches/camel-2.9.x/tests/camel-performance/src/test/java/org/apache/camel/test/perf/XsltPerformanceTest.java Propchange: camel/branches/camel-2.9.x/ ------------------------------------------------------------------------------ Merged /camel/trunk:r1427825 Merged /camel/branches/camel-2.10.x:r1427844 Propchange: camel/branches/camel-2.9.x/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: camel/branches/camel-2.9.x/tests/camel-performance/src/test/java/org/apache/camel/test/perf/AbstractBasePerformanceTest.java URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/tests/camel-performance/src/test/java/org/apache/camel/test/perf/AbstractBasePerformanceTest.java?rev=1427849&r1=1427848&r2=1427849&view=diff ============================================================================== --- camel/branches/camel-2.9.x/tests/camel-performance/src/test/java/org/apache/camel/test/perf/AbstractBasePerformanceTest.java (original) +++ camel/branches/camel-2.9.x/tests/camel-performance/src/test/java/org/apache/camel/test/perf/AbstractBasePerformanceTest.java Wed Jan 2 16:24:00 2013 @@ -56,9 +56,4 @@ public abstract class AbstractBasePerfor public boolean isCreateCamelContextPerClass() { return true; } - - @Override - protected boolean useJmx() { - return false; - } } \ No newline at end of file Modified: camel/branches/camel-2.9.x/tests/camel-performance/src/test/java/org/apache/camel/test/perf/ContentBasedRoutingPerformanceTest.java URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/tests/camel-performance/src/test/java/org/apache/camel/test/perf/ContentBasedRoutingPerformanceTest.java?rev=1427849&r1=1427848&r2=1427849&view=diff ============================================================================== --- camel/branches/camel-2.9.x/tests/camel-performance/src/test/java/org/apache/camel/test/perf/ContentBasedRoutingPerformanceTest.java (original) +++ camel/branches/camel-2.9.x/tests/camel-performance/src/test/java/org/apache/camel/test/perf/ContentBasedRoutingPerformanceTest.java Wed Jan 2 16:24:00 2013 @@ -17,6 +17,7 @@ package org.apache.camel.test.perf; import org.apache.camel.builder.RouteBuilder; +import org.apache.camel.util.StopWatch; import org.junit.Test; public class ContentBasedRoutingPerformanceTest extends AbstractBasePerformanceTest { @@ -32,12 +33,11 @@ public class ContentBasedRoutingPerforma resetMock(count); - long start = System.currentTimeMillis(); + StopWatch watch = new StopWatch(); execute(count); - long end = System.currentTimeMillis(); - + assertMockEndpointsSatisfied(); - log.warn("Run " + count + " tests in " + (end - start) + "ms"); + log.warn("Ran {} tests in {}ms", count, watch.taken()); } @Test @@ -49,12 +49,11 @@ public class ContentBasedRoutingPerforma resetMock(count); - long start = System.currentTimeMillis(); + StopWatch watch = new StopWatch(); execute(count); - long end = System.currentTimeMillis(); - + assertMockEndpointsSatisfied(); - log.warn("Run " + count + " tests in " + (end - start) + "ms"); + log.warn("Ran {} tests in {}ms", count, watch.taken()); } @Test @@ -66,12 +65,11 @@ public class ContentBasedRoutingPerforma resetMock(count); - long start = System.currentTimeMillis(); + StopWatch watch = new StopWatch(); execute(count); - long end = System.currentTimeMillis(); assertMockEndpointsSatisfied(); - log.warn("Run " + count + " tests in " + (end - start) + "ms"); + log.warn("Ran {} tests in {}ms", count, watch.taken()); } @Test @@ -83,12 +81,11 @@ public class ContentBasedRoutingPerforma resetMock(count); - long start = System.currentTimeMillis(); + StopWatch watch = new StopWatch(); execute(count); - long end = System.currentTimeMillis(); assertMockEndpointsSatisfied(); - log.warn("Run " + count + " tests in " + (end - start) + "ms"); + log.warn("Ran {} tests in {}ms", count, watch.taken()); } @Override Modified: camel/branches/camel-2.9.x/tests/camel-performance/src/test/java/org/apache/camel/test/perf/HeaderBasedRoutingPerformanceTest.java URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/tests/camel-performance/src/test/java/org/apache/camel/test/perf/HeaderBasedRoutingPerformanceTest.java?rev=1427849&r1=1427848&r2=1427849&view=diff ============================================================================== --- camel/branches/camel-2.9.x/tests/camel-performance/src/test/java/org/apache/camel/test/perf/HeaderBasedRoutingPerformanceTest.java (original) +++ camel/branches/camel-2.9.x/tests/camel-performance/src/test/java/org/apache/camel/test/perf/HeaderBasedRoutingPerformanceTest.java Wed Jan 2 16:24:00 2013 @@ -17,6 +17,7 @@ package org.apache.camel.test.perf; import org.apache.camel.builder.RouteBuilder; +import org.apache.camel.util.StopWatch; import org.junit.Test; public class HeaderBasedRoutingPerformanceTest extends AbstractBasePerformanceTest { @@ -32,12 +33,11 @@ public class HeaderBasedRoutingPerforman resetMock(count); - long start = System.currentTimeMillis(); + StopWatch watch = new StopWatch(); execute(count); - long end = System.currentTimeMillis(); - + assertMockEndpointsSatisfied(); - log.warn("Run " + count + " tests in " + (end - start) + "ms"); + log.warn("Ran {} tests in {}ms", count, watch.taken()); } @Test @@ -48,13 +48,12 @@ public class HeaderBasedRoutingPerforman execute(20000); resetMock(count); - - long start = System.currentTimeMillis(); + + StopWatch watch = new StopWatch(); execute(count); - long end = System.currentTimeMillis(); - + assertMockEndpointsSatisfied(); - log.warn("Run " + count + " tests in " + (end - start) + "ms"); + log.warn("Ran {} tests in {}ms", count, watch.taken()); } @Test Modified: camel/branches/camel-2.9.x/tests/camel-performance/src/test/java/org/apache/camel/test/perf/SplitterPerformanceTest.java URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/tests/camel-performance/src/test/java/org/apache/camel/test/perf/SplitterPerformanceTest.java?rev=1427849&r1=1427848&r2=1427849&view=diff ============================================================================== --- camel/branches/camel-2.9.x/tests/camel-performance/src/test/java/org/apache/camel/test/perf/SplitterPerformanceTest.java (original) +++ camel/branches/camel-2.9.x/tests/camel-performance/src/test/java/org/apache/camel/test/perf/SplitterPerformanceTest.java Wed Jan 2 16:24:00 2013 @@ -17,6 +17,7 @@ package org.apache.camel.test.perf; import org.apache.camel.builder.RouteBuilder; +import org.apache.camel.util.StopWatch; import org.junit.Test; public class SplitterPerformanceTest extends AbstractBasePerformanceTest { @@ -60,17 +61,16 @@ public class SplitterPerformanceTest ext public void testTokenize() throws InterruptedException { template.setDefaultEndpointUri("direct:tokenize"); - // warm up with 30.000 messages so that the JIT compiler kicks in + // warm up with 1 message so that the JIT compiler kicks in execute(1); resetMock(count); - long start = System.currentTimeMillis(); + StopWatch watch = new StopWatch(); execute(1); - long end = System.currentTimeMillis(); - + assertMockEndpointsSatisfied(); - log.warn("Run " + count + " tests in " + (end - start) + "ms"); + log.warn("Ran {} tests in {}ms", count, watch.taken()); } @Override Modified: camel/branches/camel-2.9.x/tests/camel-performance/src/test/java/org/apache/camel/test/perf/XPathBasedRoutingPerformanceTest.java URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/tests/camel-performance/src/test/java/org/apache/camel/test/perf/XPathBasedRoutingPerformanceTest.java?rev=1427849&r1=1427848&r2=1427849&view=diff ============================================================================== --- camel/branches/camel-2.9.x/tests/camel-performance/src/test/java/org/apache/camel/test/perf/XPathBasedRoutingPerformanceTest.java (original) +++ camel/branches/camel-2.9.x/tests/camel-performance/src/test/java/org/apache/camel/test/perf/XPathBasedRoutingPerformanceTest.java Wed Jan 2 16:24:00 2013 @@ -20,6 +20,7 @@ import java.util.HashMap; import java.util.Map; import org.apache.camel.builder.RouteBuilder; +import org.apache.camel.util.StopWatch; import org.junit.Test; public class XPathBasedRoutingPerformanceTest extends AbstractBasePerformanceTest { @@ -35,12 +36,11 @@ public class XPathBasedRoutingPerformanc resetMock(count); - long start = System.currentTimeMillis(); + StopWatch watch = new StopWatch(); execute(count); - long end = System.currentTimeMillis(); - + assertMockEndpointsSatisfied(); - log.warn("Run " + count + " tests in " + (end - start) + "ms"); + log.warn("Ran {} tests in {}ms", count, watch.taken()); } @Test @@ -52,12 +52,11 @@ public class XPathBasedRoutingPerformanc resetMock(count); - long start = System.currentTimeMillis(); + StopWatch watch = new StopWatch(); execute(count); - long end = System.currentTimeMillis(); assertMockEndpointsSatisfied(); - log.warn("Run " + count + " tests in " + (end - start) + "ms"); + log.warn("Ran {} tests in {} ms", count, watch.taken()); } @Override Modified: camel/branches/camel-2.9.x/tests/camel-performance/src/test/java/org/apache/camel/test/perf/XQueryBasedRoutingPerformanceTest.java URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/tests/camel-performance/src/test/java/org/apache/camel/test/perf/XQueryBasedRoutingPerformanceTest.java?rev=1427849&r1=1427848&r2=1427849&view=diff ============================================================================== --- camel/branches/camel-2.9.x/tests/camel-performance/src/test/java/org/apache/camel/test/perf/XQueryBasedRoutingPerformanceTest.java (original) +++ camel/branches/camel-2.9.x/tests/camel-performance/src/test/java/org/apache/camel/test/perf/XQueryBasedRoutingPerformanceTest.java Wed Jan 2 16:24:00 2013 @@ -20,6 +20,7 @@ import java.util.HashMap; import java.util.Map; import org.apache.camel.builder.RouteBuilder; +import org.apache.camel.util.StopWatch; import org.junit.Test; public class XQueryBasedRoutingPerformanceTest extends AbstractBasePerformanceTest { @@ -35,12 +36,11 @@ public class XQueryBasedRoutingPerforman resetMock(count); - long start = System.currentTimeMillis(); + StopWatch watch = new StopWatch(); execute(count); - long end = System.currentTimeMillis(); - + assertMockEndpointsSatisfied(); - log.warn("Run " + count + " tests in " + (end - start) + "ms"); + log.warn("Ran {} tests in {}ms", count, watch.taken()); } @Test @@ -52,12 +52,11 @@ public class XQueryBasedRoutingPerforman resetMock(count); - long start = System.currentTimeMillis(); + StopWatch watch = new StopWatch(); execute(count); - long end = System.currentTimeMillis(); assertMockEndpointsSatisfied(); - log.warn("Run " + count + " tests in " + (end - start) + "ms"); + log.warn("Ran {} tests in {}ms", count, watch.taken()); } @Override Modified: camel/branches/camel-2.9.x/tests/camel-performance/src/test/java/org/apache/camel/test/perf/XsltPerformanceTest.java URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/tests/camel-performance/src/test/java/org/apache/camel/test/perf/XsltPerformanceTest.java?rev=1427849&r1=1427848&r2=1427849&view=diff ============================================================================== --- camel/branches/camel-2.9.x/tests/camel-performance/src/test/java/org/apache/camel/test/perf/XsltPerformanceTest.java (original) +++ camel/branches/camel-2.9.x/tests/camel-performance/src/test/java/org/apache/camel/test/perf/XsltPerformanceTest.java Wed Jan 2 16:24:00 2013 @@ -17,6 +17,7 @@ package org.apache.camel.test.perf; import org.apache.camel.builder.RouteBuilder; +import org.apache.camel.util.StopWatch; import org.junit.Test; public class XsltPerformanceTest extends AbstractBasePerformanceTest { @@ -32,12 +33,11 @@ public class XsltPerformanceTest extends resetMock(count); - long start = System.currentTimeMillis(); + StopWatch watch = new StopWatch(); execute(count); - long end = System.currentTimeMillis(); - + assertMockEndpointsSatisfied(); - log.warn("Run " + count + " tests in " + (end - start) + "ms"); + log.warn("Ran {} tests in {}ms", count, watch.taken()); } @Override
