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/04/16 10:11:02 UTC
svn commit: r765501 - in /camel/branches/camel-1.x/camel-core/src:
main/java/org/apache/camel/component/dataset/
main/java/org/apache/camel/component/mock/
test/java/org/apache/camel/component/dataset/
test/java/org/apache/camel/processor/
Author: davsclaus
Date: Thu Apr 16 08:11:02 2009
New Revision: 765501
URL: http://svn.apache.org/viewvc?rev=765501&view=rev
Log:
Merged revisions 765154 via svnmerge from
https://svn.apache.org/repos/asf/camel/trunk
........
r765154 | davsclaus | 2009-04-15 14:31:05 +0200 (Wed, 15 Apr 2009) | 1 line
camel-script cannot run be tested on Max OS with jdk1.5.
........
Modified:
camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/component/dataset/DataSetConsumer.java
camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/component/mock/MockEndpoint.java
camel/branches/camel-1.x/camel-core/src/test/java/org/apache/camel/component/dataset/DataSetSedaTest.java
camel/branches/camel-1.x/camel-core/src/test/java/org/apache/camel/processor/RoutePerformanceTest.java
Modified: camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/component/dataset/DataSetConsumer.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/component/dataset/DataSetConsumer.java?rev=765501&r1=765500&r2=765501&view=diff
==============================================================================
--- camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/component/dataset/DataSetConsumer.java (original)
+++ camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/component/dataset/DataSetConsumer.java Thu Apr 16 08:11:02 2009
@@ -65,10 +65,10 @@
try {
long delay = endpoint.getProduceDelay();
- if (delay < 3) {
- // if no delay set then we must sleep at lest for 3 millis to avoid concurrency
+ if (delay < 4) {
+ // if no delay set then we must sleep at lest for 4 millis to avoid concurrency
// issues with extremely high throughput
- delay = 3;
+ delay = 4;
}
Thread.sleep(delay);
} catch (InterruptedException e) {
Modified: camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/component/mock/MockEndpoint.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/component/mock/MockEndpoint.java?rev=765501&r1=765500&r2=765501&view=diff
==============================================================================
--- camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/component/mock/MockEndpoint.java (original)
+++ camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/component/mock/MockEndpoint.java Thu Apr 16 08:11:02 2009
@@ -649,13 +649,14 @@
if (reporter != null) {
reporter.process(exchange);
}
-
performAssertions(exchange);
} catch (Throwable e) {
failures.add(e);
- }
- if (latch != null) {
- latch.countDown();
+ } finally {
+ // make sure latch is counted down to avoid test hanging forever
+ if (latch != null) {
+ latch.countDown();
+ }
}
}
Modified: camel/branches/camel-1.x/camel-core/src/test/java/org/apache/camel/component/dataset/DataSetSedaTest.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-1.x/camel-core/src/test/java/org/apache/camel/component/dataset/DataSetSedaTest.java?rev=765501&r1=765500&r2=765501&view=diff
==============================================================================
--- camel/branches/camel-1.x/camel-core/src/test/java/org/apache/camel/component/dataset/DataSetSedaTest.java (original)
+++ camel/branches/camel-1.x/camel-core/src/test/java/org/apache/camel/component/dataset/DataSetSedaTest.java Thu Apr 16 08:11:02 2009
@@ -49,8 +49,8 @@
//TODO: remove this once the delegate processor supports async
errorHandler(noErrorHandler());
- from("dataset:foo").to("seda:queue:test?size=100");
- from("seda:queue:test?size=100").to("dataset:foo");
+ from("dataset:foo").to("seda:queue:test?size=200");
+ from("seda:queue:test?size=200").to("dataset:foo");
}
};
}
Modified: camel/branches/camel-1.x/camel-core/src/test/java/org/apache/camel/processor/RoutePerformanceTest.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-1.x/camel-core/src/test/java/org/apache/camel/processor/RoutePerformanceTest.java?rev=765501&r1=765500&r2=765501&view=diff
==============================================================================
--- camel/branches/camel-1.x/camel-core/src/test/java/org/apache/camel/processor/RoutePerformanceTest.java (original)
+++ camel/branches/camel-1.x/camel-core/src/test/java/org/apache/camel/processor/RoutePerformanceTest.java Thu Apr 16 08:11:02 2009
@@ -24,30 +24,26 @@
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.dataset.SimpleDataSet;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
/**
* A route for simple performance testing that can be used when we suspect
* something is wrong. Inspired by end user on forum doing this as proof of concept.
*/
public class RoutePerformanceTest extends ContextTestSupport {
- private static final Log LOG = LogFactory.getLog(RoutePerformanceTest.class);
protected SimpleDataSet dataSet = new SimpleDataSet(1000);
public void testPerformance() throws Exception {
- long start = System.nanoTime();
+ long start = System.currentTimeMillis();
MockEndpoint endpoint = getMockEndpoint("mock:results");
endpoint.expectedMessageCount((int) dataSet.getSize());
assertMockEndpointsSatisfied();
- long delta = System.nanoTime() - start;
+ long delta = System.currentTimeMillis() - start;
- LOG.info("Took: " + delta + " ns");
- LOG.info("Took: " + delta / 1000000 + " millis");
+ System.out.println("RoutePerformanceTest: Took: " + delta + " ms");
}
@Override