Author: davsclaus
Date: Mon Jul 14 04:23:07 2008
New Revision: 676551
URL: http://svn.apache.org/viewvc?rev=676551&view=rev
Log:
CAMEL-702: Fixed concurrency issues with XQuery.
Modified:
activemq/camel/trunk/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryConcurrencyTest.java
activemq/camel/trunk/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryURLBasedConcurrencyTest.java
Modified:
activemq/camel/trunk/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryConcurrencyTest.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryConcurrencyTest.java?rev=676551&r1=676550&r2=676551&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryConcurrencyTest.java
(original)
+++
activemq/camel/trunk/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryConcurrencyTest.java
Mon Jul 14 04:23:07 2008
@@ -25,7 +25,7 @@
import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
/**
- * Concurrency test of XQuery.
+ * Concurrency test of XQuery using transform.xquery DSL.
*/
public class XQueryConcurrencyTest extends ContextTestSupport {
@@ -57,8 +57,8 @@
});
}
- mock.assertNoDuplicates(body());
mock.assertIsSatisfied();
+ mock.assertNoDuplicates(body());
}
protected RouteBuilder createRouteBuilder() throws Exception {
Modified:
activemq/camel/trunk/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryURLBasedConcurrencyTest.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryURLBasedConcurrencyTest.java?rev=676551&r1=676550&r2=676551&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryURLBasedConcurrencyTest.java
(original)
+++
activemq/camel/trunk/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryURLBasedConcurrencyTest.java
Mon Jul 14 04:23:07 2008
@@ -19,18 +19,19 @@
import java.util.Random;
import org.apache.camel.ContextTestSupport;
+import org.apache.camel.Exchange;
import org.apache.camel.builder.DeadLetterChannelBuilder;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
/**
- * Concurrency test of XQuery.
+ * Concurrency test of XQuery using classpath resources (to).
*/
public class XQueryURLBasedConcurrencyTest extends ContextTestSupport {
public void testConcurrency() throws Exception {
- int total = 100;
+ int total = 1000;
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMessageCount(total);
@@ -43,8 +44,8 @@
final int threadCount = i;
executor.execute(new Runnable() {
public void run() {
- int start = threadCount * 20;
- for (int i = 0; i < 20; i++) {
+ int start = threadCount * 200;
+ for (int i = 0; i < 200; i++) {
try {
// do some random sleep to simulate spread in user
activity
Thread.sleep(new Random().nextInt(10));
@@ -52,17 +53,16 @@
// ignore
}
template.sendBody("direct:start",
- "<mail><subject>Hey</subject><body>Hello
world!</body></mail>");
+ "<mail><subject>" + (start + i) +
"</subject><body>Hello world!</body></mail>");
}
}
});
}
- mock.assertNoDuplicates(body());
mock.assertIsSatisfied();
-
- System.out.println("The End");
- System.out.println(mock.getExchanges().get(0).getIn().getBody());
+ // must use bodyAs(String.class) to force DOM to be converted to
String XML
+ // for duplication detection
+ mock.assertNoDuplicates(bodyAs(String.class));
}
protected RouteBuilder createRouteBuilder() throws Exception {
