Author: bvahdat Date: Wed Jan 2 16:35:42 2013 New Revision: 1427855 URL: http://svn.apache.org/viewvc?rev=1427855&view=rev Log: Merged revisions 1427854 via svnmerge from https://svn.apache.org/repos/asf/camel/branches/camel-2.10.x
................ r1427854 | bvahdat | 2013-01-02 17:33:26 +0100 (Mi, 02 Jan 2013) | 9 lines Merged revisions 1427853 via svnmerge from https://svn.apache.org/repos/asf/camel/trunk ........ r1427853 | bvahdat | 2013-01-02 17:29:39 +0100 (Mi, 02 Jan 2013) | 1 line Polished. ........ ................ 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/HeaderBasedRoutingPerformanceTest.java Propchange: camel/branches/camel-2.9.x/ ------------------------------------------------------------------------------ Merged /camel/trunk:r1427853 Merged /camel/branches/camel-2.10.x:r1427854 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/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=1427855&r1=1427854&r2=1427855&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:35:42 2013 @@ -65,12 +65,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 @@ -82,12 +81,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()); } @Override
