You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ni...@apache.org on 2011/06/03 17:19:54 UTC
svn commit: r1131070 - in /camel/trunk:
camel-core/src/test/java/org/apache/camel/builder/xml/
camel-core/src/test/java/org/apache/camel/component/seda/
camel-core/src/test/java/org/apache/camel/impl/
camel-core/src/test/java/org/apache/camel/language/...
Author: ningjiang
Date: Fri Jun 3 15:19:52 2011
New Revision: 1131070
URL: http://svn.apache.org/viewvc?rev=1131070&view=rev
Log:
CAMEL-4042 Shutdown the thread pool when the test is over
Modified:
camel/trunk/camel-core/src/test/java/org/apache/camel/builder/xml/XPathTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/component/seda/SedaConcurrentTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/impl/ServicePoolTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/language/XPathAnotherRouteConcurrentTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/MulticastParallelNoStopOnExceptionTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/MulticastParallelStopOnExceptionTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/MulticastParallelStressTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/OnCompletionGlobalCustomPoolTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/PipelineConcurrentTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/RecipeientListWithSimpleExpressionTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SamplingThrottlerTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SplitterParallelNoStopOnExceptionTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SplitterParallelStopOnExceptionTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/StreamResequencerTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ThrottlerAsyncDelayedTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ThrottlerTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/WireTapCustomPool2Test.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/WireTapCustomPoolTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateConcurrentPerCorrelationKeyTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregatorConcurrencyTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/util/CaseInsensitiveMapTest.java
camel/trunk/components/camel-freemarker/src/test/java/org/apache/camel/component/freemarker/FreemarkerConcurrentTest.java
camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerConcurrentTest.java
camel/trunk/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBAggregateConcurrentDifferentGroupsTest.java
camel/trunk/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBAggregateConcurrentSameGroupTest.java
camel/trunk/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBAggregateLoadConcurrentTest.java
camel/trunk/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpConcurrentTest.java
camel/trunk/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/JacksonConcurrentTest.java
camel/trunk/components/camel-javaspace/src/test/java/org/apache/camel/component/javaspace/JavaSpaceRequestReplyTest.java
camel/trunk/components/camel-jaxb/src/test/java/org/apache/camel/example/JaxbConcurrentDataFormatTest.java
camel/trunk/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcProducerConcurrenctTest.java
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpProducerConcurrentTest.java
camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerConcurrentTest.java
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsProduerConcurrentTest.java
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsProduerConcurrentWithReplyTest.java
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteUsingJMSXGroupTest.java
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsConcurrentConsumersTest.java
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsJMSReplyToEndpointUsingInOutTest.java
camel/trunk/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaProducerConcurrentTest.java
camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailProducerConcurrentTest.java
camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaProducerAnotherConcurrentTest.java
camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaProducerConcurrentTest.java
camel/trunk/components/camel-netty/src/test/java/org/apache/camel/component/netty/Netty2978IssueTest.java
camel/trunk/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyConcurrentTest.java
camel/trunk/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletProducerConcurrentTest.java
camel/trunk/components/camel-rmi/src/test/java/org/apache/camel/component/rmi/RmiConcurrencyTest.java
camel/trunk/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryConcurrencyTest.java
camel/trunk/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryURLBasedConcurrencyTest.java
camel/trunk/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerConcurrentTest.java
camel/trunk/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcAggregateConcurrentDifferentGroupsTest.java
camel/trunk/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcAggregateConcurrentSameGroupTest.java
camel/trunk/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcAggregateLoadConcurrentTest.java
camel/trunk/components/camel-stringtemplate/src/test/java/org/apache/camel/component/stringtemplate/StringTemplateConcurrentTest.java
camel/trunk/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocityConcurrentTest.java
camel/trunk/components/camel-xmlbeans/src/test/java/org/apache/camel/converter/xmlbeans/XmlBeansConcurrencyTest.java
camel/trunk/components/camel-xmlsecurity/src/test/java/org/apache/camel/dataformat/xmlsecurity/XMLSecurityConcurrencyTest.java
camel/trunk/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppProducerConcurrentTest.java
camel/trunk/components/camel-xstream/src/test/java/org/apache/camel/dataformat/xstream/XStreamConcurrencyTest.java
camel/trunk/examples/camel-example-route-throttling/src/main/java/org/apache/camel/example/client/CamelClient.java
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/builder/xml/XPathTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/builder/xml/XPathTest.java?rev=1131070&r1=1131069&r2=1131070&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/builder/xml/XPathTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/builder/xml/XPathTest.java Fri Jun 3 15:19:52 2011
@@ -375,6 +375,7 @@ public class XPathTest extends ContextTe
assertNotNull(doc);
}
assertEquals(size, count);
+ executor.shutdownNow();
}
public void testXPathNodeListTest() throws Exception {
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/seda/SedaConcurrentTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/seda/SedaConcurrentTest.java?rev=1131070&r1=1131069&r2=1131070&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/seda/SedaConcurrentTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/seda/SedaConcurrentTest.java Fri Jun 3 15:19:52 2011
@@ -85,6 +85,7 @@ public class SedaConcurrentTest extends
assertMockEndpointsSatisfied();
assertEquals(20, replies.size());
+ executors.shutdownNow();
}
public void testSedaConcurrentInOutWithAsync() throws Exception {
@@ -96,7 +97,8 @@ public class SedaConcurrentTest extends
mock.setMinimumResultWaitTime(3000);
// use our own template that has a higher thread pool than default camel that uses 5
- ProducerTemplate pt = new DefaultProducerTemplate(context, Executors.newFixedThreadPool(10));
+ ExecutorService executor = Executors.newFixedThreadPool(10);
+ ProducerTemplate pt = new DefaultProducerTemplate(context, executor);
// must start the template
pt.start();
@@ -113,8 +115,8 @@ public class SedaConcurrentTest extends
String out = (String) replies.get(i).get();
assertTrue(out.startsWith("Bye"));
}
-
pt.stop();
+ executor.shutdownNow();
}
@Override
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/impl/ServicePoolTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/impl/ServicePoolTest.java?rev=1131070&r1=1131069&r2=1131070&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/impl/ServicePoolTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/impl/ServicePoolTest.java Fri Jun 3 15:19:52 2011
@@ -213,6 +213,7 @@ public class ServicePoolTest extends Con
for (int i = 0; i < 5; i++) {
assertEquals(i, response.get(i).get());
}
+ executor.shutdownNow();
}
public void testConcurrentStress() throws Exception {
@@ -242,6 +243,7 @@ public class ServicePoolTest extends Con
for (int i = 0; i < 5; i++) {
assertEquals(i, response.get(i).get());
}
+ executor.shutdownNow();
}
}
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/language/XPathAnotherRouteConcurrentTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/language/XPathAnotherRouteConcurrentTest.java?rev=1131070&r1=1131069&r2=1131070&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/language/XPathAnotherRouteConcurrentTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/language/XPathAnotherRouteConcurrentTest.java Fri Jun 3 15:19:52 2011
@@ -55,6 +55,7 @@ public class XPathAnotherRouteConcurrent
}
assertMockEndpointsSatisfied();
+ executor.shutdown();
}
private String createXmlBody(int index, String name) {
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/MulticastParallelNoStopOnExceptionTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/MulticastParallelNoStopOnExceptionTest.java?rev=1131070&r1=1131069&r2=1131070&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/MulticastParallelNoStopOnExceptionTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/MulticastParallelNoStopOnExceptionTest.java Fri Jun 3 15:19:52 2011
@@ -29,6 +29,18 @@ import org.apache.camel.builder.RouteBui
* @version
*/
public class MulticastParallelNoStopOnExceptionTest extends ContextTestSupport {
+ private ExecutorService service;
+
+ protected void setUp() throws Exception {
+ // use a pool with 2 concurrent tasks so we cannot run too fast
+ service = Executors.newFixedThreadPool(2);
+ super.setUp();
+ }
+
+ protected void tearDown() throws Exception {
+ super.tearDown();
+ service.shutdownNow();
+ }
public void testMulticastParallelNoStopOnExceptionOk() throws Exception {
getMockEndpoint("mock:foo").expectedBodiesReceived("Hello");
@@ -64,8 +76,6 @@ public class MulticastParallelNoStopOnEx
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- // use a pool with 2 concurrent tasks so we cannot run to fast
- ExecutorService service = Executors.newFixedThreadPool(2);
from("direct:start")
.multicast()
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/MulticastParallelStopOnExceptionTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/MulticastParallelStopOnExceptionTest.java?rev=1131070&r1=1131069&r2=1131070&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/MulticastParallelStopOnExceptionTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/MulticastParallelStopOnExceptionTest.java Fri Jun 3 15:19:52 2011
@@ -31,6 +31,18 @@ import org.apache.camel.builder.RouteBui
* @version
*/
public class MulticastParallelStopOnExceptionTest extends ContextTestSupport {
+ private ExecutorService service;
+
+ protected void setUp() throws Exception {
+ // use a pool with 2 concurrent tasks so we cannot run too fast
+ service = Executors.newFixedThreadPool(2);
+ super.setUp();
+ }
+
+ protected void tearDown() throws Exception {
+ super.tearDown();
+ service.shutdownNow();
+ }
public void testMulticastParallelStopOnExceptionOk() throws Exception {
getMockEndpoint("mock:foo").expectedBodiesReceived("Hello");
@@ -70,9 +82,7 @@ public class MulticastParallelStopOnExce
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- // use a pool with 2 concurrent tasks so we cannot run to fast
- ExecutorService service = Executors.newFixedThreadPool(2);
-
+
from("direct:start")
.multicast()
.parallelProcessing().stopOnException().executorService(service).to("direct:foo", "direct:bar", "direct:baz")
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/MulticastParallelStressTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/MulticastParallelStressTest.java?rev=1131070&r1=1131069&r2=1131070&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/MulticastParallelStressTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/MulticastParallelStressTest.java Fri Jun 3 15:19:52 2011
@@ -72,6 +72,7 @@ public class MulticastParallelStressTest
}
assertMockEndpointsSatisfied();
+ executor.shutdownNow();
}
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/OnCompletionGlobalCustomPoolTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/OnCompletionGlobalCustomPoolTest.java?rev=1131070&r1=1131069&r2=1131070&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/OnCompletionGlobalCustomPoolTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/OnCompletionGlobalCustomPoolTest.java Fri Jun 3 15:19:52 2011
@@ -26,12 +26,24 @@ import org.apache.camel.builder.RouteBui
*/
public class OnCompletionGlobalCustomPoolTest extends OnCompletionGlobalTest {
+ private ExecutorService pool;
+
+ protected void setUp() throws Exception {
+ // use a pool with 2 concurrent tasks so we cannot run too fast
+ pool = Executors.newFixedThreadPool(2);
+ super.setUp();
+ }
+
+ protected void tearDown() throws Exception {
+ super.tearDown();
+ pool.shutdownNow();
+ }
+
@Override
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- ExecutorService pool = Executors.newFixedThreadPool(2);
// use a custom thread pool
onCompletion().executorService(pool).to("log:global").to("mock:sync");
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/PipelineConcurrentTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/PipelineConcurrentTest.java?rev=1131070&r1=1131069&r2=1131070&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/PipelineConcurrentTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/PipelineConcurrentTest.java Fri Jun 3 15:19:52 2011
@@ -61,6 +61,7 @@ public class PipelineConcurrentTest exte
mock.assertIsSatisfied();
mock.expectsNoDuplicates(body());
+ executor.shutdown();
}
protected RouteBuilder createRouteBuilder() throws Exception {
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/RecipeientListWithSimpleExpressionTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/RecipeientListWithSimpleExpressionTest.java?rev=1131070&r1=1131069&r2=1131070&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/RecipeientListWithSimpleExpressionTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/RecipeientListWithSimpleExpressionTest.java Fri Jun 3 15:19:52 2011
@@ -72,6 +72,7 @@ public class RecipeientListWithSimpleExp
}
assertMockEndpointsSatisfied();
+ executors.shutdownNow();
}
public static class MyBeanRouter {
@@ -123,6 +124,7 @@ public class RecipeientListWithSimpleExp
}
assertMockEndpointsSatisfied();
+ executors.shutdownNow();
}
}
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SamplingThrottlerTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SamplingThrottlerTest.java?rev=1131070&r1=1131069&r2=1131070&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SamplingThrottlerTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SamplingThrottlerTest.java Fri Jun 3 15:19:52 2011
@@ -85,6 +85,7 @@ public class SamplingThrottlerTest exten
}
mock.assertIsSatisfied();
+ executor.shutdownNow();
}
public void testSamplingUsingmessageFrequency() throws Exception {
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SplitterParallelNoStopOnExceptionTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SplitterParallelNoStopOnExceptionTest.java?rev=1131070&r1=1131069&r2=1131070&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SplitterParallelNoStopOnExceptionTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SplitterParallelNoStopOnExceptionTest.java Fri Jun 3 15:19:52 2011
@@ -31,6 +31,19 @@ import org.apache.camel.component.mock.M
*/
public class SplitterParallelNoStopOnExceptionTest extends ContextTestSupport {
+ private ExecutorService service;
+
+ protected void setUp() throws Exception {
+ // use a pool with 2 concurrent tasks so we cannot run too fast
+ service = Executors.newFixedThreadPool(2);
+ super.setUp();
+ }
+
+ protected void tearDown() throws Exception {
+ super.tearDown();
+ service.shutdownNow();
+ }
+
public void testSplitParallelNoStopOnExceptionOk() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:split");
mock.expectedBodiesReceivedInAnyOrder("Hello World", "Bye World", "Hi World");
@@ -63,8 +76,6 @@ public class SplitterParallelNoStopOnExc
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- // use a pool with 2 concurrent tasks so we cannot run to fast
- ExecutorService service = Executors.newFixedThreadPool(2);
from("direct:start")
.split(body().tokenize(",")).parallelProcessing().executorService(service)
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SplitterParallelStopOnExceptionTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SplitterParallelStopOnExceptionTest.java?rev=1131070&r1=1131069&r2=1131070&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SplitterParallelStopOnExceptionTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SplitterParallelStopOnExceptionTest.java Fri Jun 3 15:19:52 2011
@@ -33,6 +33,19 @@ import org.apache.camel.component.mock.M
*/
public class SplitterParallelStopOnExceptionTest extends ContextTestSupport {
+ private ExecutorService service;
+
+ protected void setUp() throws Exception {
+ // use a pool with 2 concurrent tasks so we cannot run too fast
+ service = Executors.newFixedThreadPool(2);
+ super.setUp();
+ }
+
+ protected void tearDown() throws Exception {
+ super.tearDown();
+ service.shutdownNow();
+ }
+
public void testSplitParallelStopOnExceptionOk() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:split");
mock.expectedBodiesReceivedInAnyOrder("Hello World", "Bye World");
@@ -66,9 +79,7 @@ public class SplitterParallelStopOnExcep
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- // use a pool with 2 concurrent tasks so we cannot run to fast
- ExecutorService service = Executors.newFixedThreadPool(2);
-
+
from("direct:start")
.split(body().tokenize(",")).parallelProcessing().stopOnException().executorService(service)
.process(new Processor() {
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/StreamResequencerTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/StreamResequencerTest.java?rev=1131070&r1=1131069&r2=1131070&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/StreamResequencerTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/StreamResequencerTest.java Fri Jun 3 15:19:52 2011
@@ -72,7 +72,7 @@ public class StreamResequencerTest exten
resultEndpoint.setResultWaitTime(20000);
resultEndpoint.assertIsSatisfied();
- service.shutdown();
+ service.shutdownNow();
}
@Override
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ThrottlerAsyncDelayedTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ThrottlerAsyncDelayedTest.java?rev=1131070&r1=1131069&r2=1131070&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ThrottlerAsyncDelayedTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ThrottlerAsyncDelayedTest.java Fri Jun 3 15:19:52 2011
@@ -66,6 +66,7 @@ public class ThrottlerAsyncDelayedTest e
// add a little slack
long delta = System.currentTimeMillis() - start + 200;
assertTrue("Should take at least " + minimumTime + "ms, was: " + delta, delta >= minimumTime);
+ executor.shutdownNow();
}
protected RouteBuilder createRouteBuilder() {
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ThrottlerTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ThrottlerTest.java?rev=1131070&r1=1131069&r2=1131070&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ThrottlerTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ThrottlerTest.java Fri Jun 3 15:19:52 2011
@@ -71,6 +71,7 @@ public class ThrottlerTest extends Conte
// add a little slack
long delta = System.currentTimeMillis() - start + 200;
assertTrue("Should take at least " + minimumTime + "ms, was: " + delta, delta >= minimumTime);
+ executor.shutdownNow();
}
public void testTimeSlotCalculus() throws Exception {
@@ -113,6 +114,7 @@ public class ThrottlerTest extends Conte
// add a little slack
long delta = System.currentTimeMillis() - start + 200;
assertTrue("Should take at least " + minimumTime + "ms, was: " + delta, delta >= minimumTime);
+ executor.shutdownNow();
}
public void testConfigurationWithHeaderExpression() throws Exception {
@@ -138,6 +140,7 @@ public class ThrottlerTest extends Conte
// add a little slack
long delta = System.currentTimeMillis() - start + 200;
assertTrue("Should take at least " + minimumTime + "ms, was: " + delta, delta >= minimumTime);
+ executor.shutdownNow();
}
protected RouteBuilder createRouteBuilder() {
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/WireTapCustomPool2Test.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/WireTapCustomPool2Test.java?rev=1131070&r1=1131069&r2=1131070&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/WireTapCustomPool2Test.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/WireTapCustomPool2Test.java Fri Jun 3 15:19:52 2011
@@ -31,6 +31,14 @@ import org.apache.camel.component.mock.M
public class WireTapCustomPool2Test extends ContextTestSupport {
protected MockEndpoint tap;
protected MockEndpoint result;
+ protected ExecutorService pool;
+
+ protected void tearDown() throws Exception {
+ super.tearDown();
+ if (pool != null) {
+ pool.shutdownNow();
+ }
+ }
public void testSend() throws Exception {
// hello must come first, as we have delay on the tapped route
@@ -54,7 +62,7 @@ public class WireTapCustomPool2Test exte
public void configure() {
// START SNIPPET: e1
// use a custom thread pool for sending tapped messages
- ExecutorService pool = Executors.newFixedThreadPool(2);
+ pool = Executors.newFixedThreadPool(2);
from("direct:start")
.to("log:foo")
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/WireTapCustomPoolTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/WireTapCustomPoolTest.java?rev=1131070&r1=1131069&r2=1131070&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/WireTapCustomPoolTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/WireTapCustomPoolTest.java Fri Jun 3 15:19:52 2011
@@ -31,6 +31,14 @@ import org.apache.camel.component.mock.M
public class WireTapCustomPoolTest extends ContextTestSupport {
protected MockEndpoint tap;
protected MockEndpoint result;
+ protected ExecutorService pool;
+
+ protected void tearDown() throws Exception {
+ super.tearDown();
+ if (pool != null) {
+ pool.shutdownNow();
+ }
+ }
public void testSend() throws Exception {
// hello must come first, as we have delay on the tapped route
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateConcurrentPerCorrelationKeyTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateConcurrentPerCorrelationKeyTest.java?rev=1131070&r1=1131069&r2=1131070&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateConcurrentPerCorrelationKeyTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregateConcurrentPerCorrelationKeyTest.java Fri Jun 3 15:19:52 2011
@@ -56,6 +56,7 @@ public class AggregateConcurrentPerCorre
service.invokeAll(tasks);
assertMockEndpointsSatisfied();
+ service.shutdownNow();
}
@Override
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregatorConcurrencyTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregatorConcurrencyTest.java?rev=1131070&r1=1131069&r2=1131070&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregatorConcurrencyTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregatorConcurrencyTest.java Fri Jun 3 15:19:52 2011
@@ -71,6 +71,8 @@ public class AggregatorConcurrencyTest e
assertMockEndpointsSatisfied();
assertEquals(100, COUNTER.get());
+ // Need to shutdown the threadpool
+ service.shutdownNow();
}
@Override
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/util/CaseInsensitiveMapTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/util/CaseInsensitiveMapTest.java?rev=1131070&r1=1131069&r2=1131070&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/util/CaseInsensitiveMapTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/util/CaseInsensitiveMapTest.java Fri Jun 3 15:19:52 2011
@@ -476,6 +476,7 @@ public class CaseInsensitiveMapTest exte
assertEquals(123, map.get("FOO"));
assertEquals(456, map.get("Bar"));
assertEquals("cheese", map.get("cAKe"));
+ service.shutdownNow();
}
public void testCopyMapWithCamelHeadersTest() throws Exception {
Modified: camel/trunk/components/camel-freemarker/src/test/java/org/apache/camel/component/freemarker/FreemarkerConcurrentTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-freemarker/src/test/java/org/apache/camel/component/freemarker/FreemarkerConcurrentTest.java?rev=1131070&r1=1131069&r2=1131070&view=diff
==============================================================================
--- camel/trunk/components/camel-freemarker/src/test/java/org/apache/camel/component/freemarker/FreemarkerConcurrentTest.java (original)
+++ camel/trunk/components/camel-freemarker/src/test/java/org/apache/camel/component/freemarker/FreemarkerConcurrentTest.java Fri Jun 3 15:19:52 2011
@@ -56,6 +56,7 @@ public class FreemarkerConcurrentTest ex
}
assertMockEndpointsSatisfied();
+ executor.shutdownNow();
}
protected RouteBuilder createRouteBuilder() {
Modified: camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerConcurrentTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerConcurrentTest.java?rev=1131070&r1=1131069&r2=1131070&view=diff
==============================================================================
--- camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerConcurrentTest.java (original)
+++ camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpProducerConcurrentTest.java Fri Jun 3 15:19:52 2011
@@ -61,6 +61,7 @@ public class FtpProducerConcurrentTest e
}
assertMockEndpointsSatisfied();
+ executor.shutdownNow();
}
@Override
Modified: camel/trunk/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBAggregateConcurrentDifferentGroupsTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBAggregateConcurrentDifferentGroupsTest.java?rev=1131070&r1=1131069&r2=1131070&view=diff
==============================================================================
--- camel/trunk/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBAggregateConcurrentDifferentGroupsTest.java (original)
+++ camel/trunk/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBAggregateConcurrentDifferentGroupsTest.java Fri Jun 3 15:19:52 2011
@@ -73,6 +73,7 @@ public class HawtDBAggregateConcurrentDi
}
assertMockEndpointsSatisfied();
+ executor.shutdownNow();
}
@Override
Modified: camel/trunk/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBAggregateConcurrentSameGroupTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBAggregateConcurrentSameGroupTest.java?rev=1131070&r1=1131069&r2=1131070&view=diff
==============================================================================
--- camel/trunk/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBAggregateConcurrentSameGroupTest.java (original)
+++ camel/trunk/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBAggregateConcurrentSameGroupTest.java Fri Jun 3 15:19:52 2011
@@ -72,6 +72,7 @@ public class HawtDBAggregateConcurrentSa
}
assertMockEndpointsSatisfied();
+ executor.shutdownNow();
}
@Override
Modified: camel/trunk/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBAggregateLoadConcurrentTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBAggregateLoadConcurrentTest.java?rev=1131070&r1=1131069&r2=1131070&view=diff
==============================================================================
--- camel/trunk/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBAggregateLoadConcurrentTest.java (original)
+++ camel/trunk/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBAggregateLoadConcurrentTest.java Fri Jun 3 15:19:52 2011
@@ -73,6 +73,7 @@ public class HawtDBAggregateLoadConcurre
LOG.info("Sending all " + SIZE + " message done. Now waiting for aggregation to complete.");
assertMockEndpointsSatisfied();
+ executor.shutdownNow();
}
@Override
Modified: camel/trunk/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpConcurrentTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpConcurrentTest.java?rev=1131070&r1=1131069&r2=1131070&view=diff
==============================================================================
--- camel/trunk/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpConcurrentTest.java (original)
+++ camel/trunk/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpConcurrentTest.java Fri Jun 3 15:19:52 2011
@@ -92,6 +92,7 @@ public class HttpConcurrentTest extends
// should be 10 unique responses
assertEquals("Should be " + files + " unique responses", files, unique.size());
+ executor.shutdownNow();
}
}
Modified: camel/trunk/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/JacksonConcurrentTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/JacksonConcurrentTest.java?rev=1131070&r1=1131069&r2=1131070&view=diff
==============================================================================
--- camel/trunk/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/JacksonConcurrentTest.java (original)
+++ camel/trunk/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/JacksonConcurrentTest.java Fri Jun 3 15:19:52 2011
@@ -59,6 +59,7 @@ public class JacksonConcurrentTest exten
}
assertMockEndpointsSatisfied();
+ executor.shutdownNow();
}
protected RouteBuilder createRouteBuilder() {
Modified: camel/trunk/components/camel-javaspace/src/test/java/org/apache/camel/component/javaspace/JavaSpaceRequestReplyTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-javaspace/src/test/java/org/apache/camel/component/javaspace/JavaSpaceRequestReplyTest.java?rev=1131070&r1=1131069&r2=1131070&view=diff
==============================================================================
--- camel/trunk/components/camel-javaspace/src/test/java/org/apache/camel/component/javaspace/JavaSpaceRequestReplyTest.java (original)
+++ camel/trunk/components/camel-javaspace/src/test/java/org/apache/camel/component/javaspace/JavaSpaceRequestReplyTest.java Fri Jun 3 15:19:52 2011
@@ -74,7 +74,7 @@ public class JavaSpaceRequestReplyTest e
}
long stop = System.currentTimeMillis();
System.out.println(stop - start);
- es.shutdown();
+ es.shutdownNow();
}
@Override
Modified: camel/trunk/components/camel-jaxb/src/test/java/org/apache/camel/example/JaxbConcurrentDataFormatTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jaxb/src/test/java/org/apache/camel/example/JaxbConcurrentDataFormatTest.java?rev=1131070&r1=1131069&r2=1131070&view=diff
==============================================================================
--- camel/trunk/components/camel-jaxb/src/test/java/org/apache/camel/example/JaxbConcurrentDataFormatTest.java (original)
+++ camel/trunk/components/camel-jaxb/src/test/java/org/apache/camel/example/JaxbConcurrentDataFormatTest.java Fri Jun 3 15:19:52 2011
@@ -62,6 +62,7 @@ public class JaxbConcurrentDataFormatTes
}
assertMockEndpointsSatisfied();
+ executor.shutdownNow();
}
protected RouteBuilder createRouteBuilder() {
Modified: camel/trunk/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcProducerConcurrenctTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcProducerConcurrenctTest.java?rev=1131070&r1=1131069&r2=1131070&view=diff
==============================================================================
--- camel/trunk/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcProducerConcurrenctTest.java (original)
+++ camel/trunk/components/camel-jdbc/src/test/java/org/apache/camel/component/jdbc/JdbcProducerConcurrenctTest.java Fri Jun 3 15:19:52 2011
@@ -85,6 +85,7 @@ public class JdbcProducerConcurrenctTest
assertEquals("nsandhu", columns.get("NAME"));
}
}
+ executor.shutdownNow();
}
protected JndiRegistry createRegistry() throws Exception {
Modified: camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpProducerConcurrentTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpProducerConcurrentTest.java?rev=1131070&r1=1131069&r2=1131070&view=diff
==============================================================================
--- camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpProducerConcurrentTest.java (original)
+++ camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpProducerConcurrentTest.java Fri Jun 3 15:19:52 2011
@@ -73,6 +73,7 @@ public class HttpProducerConcurrentTest
// should be 10 unique responses
assertEquals("Should be " + files + " unique responses", files, unique.size());
+ executor.shutdownNow();
}
Modified: camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerConcurrentTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerConcurrentTest.java?rev=1131070&r1=1131069&r2=1131070&view=diff
==============================================================================
--- camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerConcurrentTest.java (original)
+++ camel/trunk/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerConcurrentTest.java Fri Jun 3 15:19:52 2011
@@ -90,6 +90,7 @@ public class JettyHttpProducerConcurrent
// should be 10 unique responses
assertEquals("Should be " + files + " unique responses", files, unique.size());
+ executor.shutdownNow();
}
protected RouteBuilder createRouteBuilder() throws Exception {
Modified: camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsProduerConcurrentTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsProduerConcurrentTest.java?rev=1131070&r1=1131069&r2=1131070&view=diff
==============================================================================
--- camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsProduerConcurrentTest.java (original)
+++ camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsProduerConcurrentTest.java Fri Jun 3 15:19:52 2011
@@ -59,6 +59,7 @@ public class JmsProduerConcurrentTest ex
}
assertMockEndpointsSatisfied();
+ executor.shutdownNow();
}
protected CamelContext createCamelContext() throws Exception {
Modified: camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsProduerConcurrentWithReplyTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsProduerConcurrentWithReplyTest.java?rev=1131070&r1=1131069&r2=1131070&view=diff
==============================================================================
--- camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsProduerConcurrentWithReplyTest.java (original)
+++ camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsProduerConcurrentWithReplyTest.java Fri Jun 3 15:19:52 2011
@@ -69,6 +69,7 @@ public class JmsProduerConcurrentWithRep
Object out = futures.get(i).get();
assertEquals("Bye Message " + i, out);
}
+ executor.shutdownNow();
}
protected CamelContext createCamelContext() throws Exception {
Modified: camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteUsingJMSXGroupTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteUsingJMSXGroupTest.java?rev=1131070&r1=1131069&r2=1131070&view=diff
==============================================================================
--- camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteUsingJMSXGroupTest.java (original)
+++ camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteUsingJMSXGroupTest.java Fri Jun 3 15:19:52 2011
@@ -62,6 +62,7 @@ public class JmsRouteUsingJMSXGroupTest
}
assertMockEndpointsSatisfied();
+ executor.shutdownNow();
}
protected CamelContext createCamelContext() throws Exception {
Modified: camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsConcurrentConsumersTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsConcurrentConsumersTest.java?rev=1131070&r1=1131069&r2=1131070&view=diff
==============================================================================
--- camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsConcurrentConsumersTest.java (original)
+++ camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsConcurrentConsumersTest.java Fri Jun 3 15:19:52 2011
@@ -65,6 +65,7 @@ public class JmsConcurrentConsumersTest
long delta = System.currentTimeMillis() - start;
assertTrue("Should be faster than 20000 millis, took " + delta + " millis", delta < 20000L);
+ executor.shutdown();
}
protected CamelContext createCamelContext() throws Exception {
Modified: camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsJMSReplyToEndpointUsingInOutTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsJMSReplyToEndpointUsingInOutTest.java?rev=1131070&r1=1131069&r2=1131070&view=diff
==============================================================================
--- camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsJMSReplyToEndpointUsingInOutTest.java (original)
+++ camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsJMSReplyToEndpointUsingInOutTest.java Fri Jun 3 15:19:52 2011
@@ -17,6 +17,7 @@
package org.apache.camel.component.jms.issues;
import java.util.concurrent.Callable;
+import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import javax.jms.ConnectionFactory;
import javax.jms.Destination;
@@ -57,7 +58,8 @@ public class JmsJMSReplyToEndpointUsingI
// do not use Camel to send and receive to simulate a non Camel client
// use another thread to listen and send the reply
- Executors.newFixedThreadPool(1).submit(new Callable<Object>() {
+ ExecutorService executor = Executors.newFixedThreadPool(1);
+ executor.submit(new Callable<Object>() {
public Object call() throws Exception {
JmsTemplate jms = new JmsTemplate(amq.getConfiguration().getConnectionFactory());
@@ -94,6 +96,7 @@ public class JmsJMSReplyToEndpointUsingI
});
assertMockEndpointsSatisfied();
+ executor.shutdownNow();
}
protected RouteBuilder createRouteBuilder() throws Exception {
Modified: camel/trunk/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaProducerConcurrentTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaProducerConcurrentTest.java?rev=1131070&r1=1131069&r2=1131070&view=diff
==============================================================================
--- camel/trunk/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaProducerConcurrentTest.java (original)
+++ camel/trunk/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaProducerConcurrentTest.java Fri Jun 3 15:19:52 2011
@@ -87,6 +87,7 @@ public class JpaProducerConcurrentTest e
// assert in the database
assertEntityInDB(files);
+ executor.shutdownNow();
}
@Override
Modified: camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailProducerConcurrentTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailProducerConcurrentTest.java?rev=1131070&r1=1131069&r2=1131070&view=diff
==============================================================================
--- camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailProducerConcurrentTest.java (original)
+++ camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailProducerConcurrentTest.java Fri Jun 3 15:19:52 2011
@@ -73,6 +73,7 @@ public class MailProducerConcurrentTest
}
assertEquals("There should be " + files + " unique mails", files, bodies.size());
+ executor.shutdownNow();
}
@Override
Modified: camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaProducerAnotherConcurrentTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaProducerAnotherConcurrentTest.java?rev=1131070&r1=1131069&r2=1131070&view=diff
==============================================================================
--- camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaProducerAnotherConcurrentTest.java (original)
+++ camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaProducerAnotherConcurrentTest.java Fri Jun 3 15:19:52 2011
@@ -72,6 +72,7 @@ public class MinaProducerAnotherConcurre
Object out = responses.get(i).get();
assertEquals("Bye " + i, out);
}
+ executor.shutdownNow();
}
@Override
Modified: camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaProducerConcurrentTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaProducerConcurrentTest.java?rev=1131070&r1=1131069&r2=1131070&view=diff
==============================================================================
--- camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaProducerConcurrentTest.java (original)
+++ camel/trunk/components/camel-mina/src/test/java/org/apache/camel/component/mina/MinaProducerConcurrentTest.java Fri Jun 3 15:19:52 2011
@@ -72,6 +72,7 @@ public class MinaProducerConcurrentTest
// should be 10 unique responses
assertEquals("Should be " + files + " unique responses", files, unique.size());
+ executor.shutdownNow();
}
@Override
Modified: camel/trunk/components/camel-netty/src/test/java/org/apache/camel/component/netty/Netty2978IssueTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-netty/src/test/java/org/apache/camel/component/netty/Netty2978IssueTest.java?rev=1131070&r1=1131069&r2=1131070&view=diff
==============================================================================
--- camel/trunk/components/camel-netty/src/test/java/org/apache/camel/component/netty/Netty2978IssueTest.java (original)
+++ camel/trunk/components/camel-netty/src/test/java/org/apache/camel/component/netty/Netty2978IssueTest.java Fri Jun 3 15:19:52 2011
@@ -82,6 +82,7 @@ public class Netty2978IssueTest extends
// should be 1000 unique replies
assertEquals(1000, replies.size());
+ executorService.shutdownNow();
} finally {
client.close();
}
Modified: camel/trunk/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyConcurrentTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyConcurrentTest.java?rev=1131070&r1=1131069&r2=1131070&view=diff
==============================================================================
--- camel/trunk/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyConcurrentTest.java (original)
+++ camel/trunk/components/camel-netty/src/test/java/org/apache/camel/component/netty/NettyConcurrentTest.java Fri Jun 3 15:19:52 2011
@@ -66,6 +66,7 @@ public class NettyConcurrentTest extends
// should be 10 unique responses
assertEquals("Should be " + files + " unique responses", files, unique.size());
+ executor.shutdownNow();
}
@Override
Modified: camel/trunk/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletProducerConcurrentTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletProducerConcurrentTest.java?rev=1131070&r1=1131069&r2=1131070&view=diff
==============================================================================
--- camel/trunk/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletProducerConcurrentTest.java (original)
+++ camel/trunk/components/camel-restlet/src/test/java/org/apache/camel/component/restlet/RestletProducerConcurrentTest.java Fri Jun 3 15:19:52 2011
@@ -80,6 +80,7 @@ public class RestletProducerConcurrentTe
// should be 10 unique responses
assertEquals("Should be " + files + " unique responses", files, unique.size());
+ executor.shutdownNow();
}
@Override
Modified: camel/trunk/components/camel-rmi/src/test/java/org/apache/camel/component/rmi/RmiConcurrencyTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-rmi/src/test/java/org/apache/camel/component/rmi/RmiConcurrencyTest.java?rev=1131070&r1=1131069&r2=1131070&view=diff
==============================================================================
--- camel/trunk/components/camel-rmi/src/test/java/org/apache/camel/component/rmi/RmiConcurrencyTest.java (original)
+++ camel/trunk/components/camel-rmi/src/test/java/org/apache/camel/component/rmi/RmiConcurrencyTest.java Fri Jun 3 15:19:52 2011
@@ -86,6 +86,7 @@ public class RmiConcurrencyTest extends
}
assertMockEndpointsSatisfied();
+ executor.shutdownNow();
}
@Override
Modified: camel/trunk/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryConcurrencyTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryConcurrencyTest.java?rev=1131070&r1=1131069&r2=1131070&view=diff
==============================================================================
--- camel/trunk/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryConcurrencyTest.java (original)
+++ camel/trunk/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryConcurrencyTest.java Fri Jun 3 15:19:52 2011
@@ -63,6 +63,7 @@ public class XQueryConcurrencyTest exten
mock.assertNoDuplicates(body());
assertMockEndpointsSatisfied();
+ executor.shutdown();
}
protected RouteBuilder createRouteBuilder() throws Exception {
Modified: camel/trunk/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryURLBasedConcurrencyTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryURLBasedConcurrencyTest.java?rev=1131070&r1=1131069&r2=1131070&view=diff
==============================================================================
--- camel/trunk/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryURLBasedConcurrencyTest.java (original)
+++ camel/trunk/components/camel-saxon/src/test/java/org/apache/camel/component/xquery/XQueryURLBasedConcurrencyTest.java Fri Jun 3 15:19:52 2011
@@ -63,6 +63,7 @@ public class XQueryURLBasedConcurrencyTe
// must use bodyAs(String.class) to force DOM to be converted to String XML
// for duplication detection
mock.assertNoDuplicates(bodyAs(String.class));
+ executor.shutdown();
}
protected RouteBuilder createRouteBuilder() throws Exception {
Modified: camel/trunk/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerConcurrentTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerConcurrentTest.java?rev=1131070&r1=1131069&r2=1131070&view=diff
==============================================================================
--- camel/trunk/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerConcurrentTest.java (original)
+++ camel/trunk/components/camel-sql/src/test/java/org/apache/camel/component/sql/SqlProducerConcurrentTest.java Fri Jun 3 15:19:52 2011
@@ -85,6 +85,7 @@ public class SqlProducerConcurrentTest e
assertEquals("Linux", columns.get("PROJECT"));
}
}
+ executor.shutdownNow();
}
@Before
Modified: camel/trunk/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcAggregateConcurrentDifferentGroupsTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcAggregateConcurrentDifferentGroupsTest.java?rev=1131070&r1=1131069&r2=1131070&view=diff
==============================================================================
--- camel/trunk/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcAggregateConcurrentDifferentGroupsTest.java (original)
+++ camel/trunk/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcAggregateConcurrentDifferentGroupsTest.java Fri Jun 3 15:19:52 2011
@@ -60,6 +60,7 @@ public class JdbcAggregateConcurrentDiff
}
assertMockEndpointsSatisfied();
+ executor.shutdownNow();
}
@Override
Modified: camel/trunk/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcAggregateConcurrentSameGroupTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcAggregateConcurrentSameGroupTest.java?rev=1131070&r1=1131069&r2=1131070&view=diff
==============================================================================
--- camel/trunk/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcAggregateConcurrentSameGroupTest.java (original)
+++ camel/trunk/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcAggregateConcurrentSameGroupTest.java Fri Jun 3 15:19:52 2011
@@ -59,6 +59,7 @@ public class JdbcAggregateConcurrentSame
}
assertMockEndpointsSatisfied();
+ executor.shutdownNow();
}
@Override
Modified: camel/trunk/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcAggregateLoadConcurrentTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcAggregateLoadConcurrentTest.java?rev=1131070&r1=1131069&r2=1131070&view=diff
==============================================================================
--- camel/trunk/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcAggregateLoadConcurrentTest.java (original)
+++ camel/trunk/components/camel-sql/src/test/java/org/apache/camel/processor/aggregate/jdbc/JdbcAggregateLoadConcurrentTest.java Fri Jun 3 15:19:52 2011
@@ -62,6 +62,7 @@ public class JdbcAggregateLoadConcurrent
LOG.info("Sending all " + SIZE + " message done. Now waiting for aggregation to complete.");
assertMockEndpointsSatisfied();
+ executor.shutdownNow();
}
@Override
Modified: camel/trunk/components/camel-stringtemplate/src/test/java/org/apache/camel/component/stringtemplate/StringTemplateConcurrentTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-stringtemplate/src/test/java/org/apache/camel/component/stringtemplate/StringTemplateConcurrentTest.java?rev=1131070&r1=1131069&r2=1131070&view=diff
==============================================================================
--- camel/trunk/components/camel-stringtemplate/src/test/java/org/apache/camel/component/stringtemplate/StringTemplateConcurrentTest.java (original)
+++ camel/trunk/components/camel-stringtemplate/src/test/java/org/apache/camel/component/stringtemplate/StringTemplateConcurrentTest.java Fri Jun 3 15:19:52 2011
@@ -56,6 +56,7 @@ public class StringTemplateConcurrentTes
}
assertMockEndpointsSatisfied();
+ executor.shutdownNow();
}
protected RouteBuilder createRouteBuilder() {
Modified: camel/trunk/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocityConcurrentTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocityConcurrentTest.java?rev=1131070&r1=1131069&r2=1131070&view=diff
==============================================================================
--- camel/trunk/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocityConcurrentTest.java (original)
+++ camel/trunk/components/camel-velocity/src/test/java/org/apache/camel/component/velocity/VelocityConcurrentTest.java Fri Jun 3 15:19:52 2011
@@ -56,6 +56,7 @@ public class VelocityConcurrentTest exte
}
assertMockEndpointsSatisfied();
+ executor.shutdownNow();
}
protected RouteBuilder createRouteBuilder() {
Modified: camel/trunk/components/camel-xmlbeans/src/test/java/org/apache/camel/converter/xmlbeans/XmlBeansConcurrencyTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-xmlbeans/src/test/java/org/apache/camel/converter/xmlbeans/XmlBeansConcurrencyTest.java?rev=1131070&r1=1131069&r2=1131070&view=diff
==============================================================================
--- camel/trunk/components/camel-xmlbeans/src/test/java/org/apache/camel/converter/xmlbeans/XmlBeansConcurrencyTest.java (original)
+++ camel/trunk/components/camel-xmlbeans/src/test/java/org/apache/camel/converter/xmlbeans/XmlBeansConcurrencyTest.java Fri Jun 3 15:19:52 2011
@@ -56,6 +56,7 @@ public class XmlBeansConcurrencyTest ext
}
assertMockEndpointsSatisfied();
+ executor.shutdownNow();
}
protected RouteBuilder createRouteBuilder() {
Modified: camel/trunk/components/camel-xmlsecurity/src/test/java/org/apache/camel/dataformat/xmlsecurity/XMLSecurityConcurrencyTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-xmlsecurity/src/test/java/org/apache/camel/dataformat/xmlsecurity/XMLSecurityConcurrencyTest.java?rev=1131070&r1=1131069&r2=1131070&view=diff
==============================================================================
--- camel/trunk/components/camel-xmlsecurity/src/test/java/org/apache/camel/dataformat/xmlsecurity/XMLSecurityConcurrencyTest.java (original)
+++ camel/trunk/components/camel-xmlsecurity/src/test/java/org/apache/camel/dataformat/xmlsecurity/XMLSecurityConcurrencyTest.java Fri Jun 3 15:19:52 2011
@@ -61,6 +61,7 @@ public class XMLSecurityConcurrencyTest
String secure = getMockEndpoint("mock:secure").getReceivedExchanges().get(0).getIn().getBody(String.class);
assertNotNull(secure);
assertTrue("Should not be readable", secure.indexOf("read") == -1);
+ executor.shutdownNow();
}
protected RouteBuilder createRouteBuilder() {
Modified: camel/trunk/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppProducerConcurrentTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppProducerConcurrentTest.java?rev=1131070&r1=1131069&r2=1131070&view=diff
==============================================================================
--- camel/trunk/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppProducerConcurrentTest.java (original)
+++ camel/trunk/components/camel-xmpp/src/test/java/org/apache/camel/component/xmpp/XmppProducerConcurrentTest.java Fri Jun 3 15:19:52 2011
@@ -63,6 +63,7 @@ public class XmppProducerConcurrentTest
}
assertMockEndpointsSatisfied();
+ executor.shutdownNow();
}
@Override
Modified: camel/trunk/components/camel-xstream/src/test/java/org/apache/camel/dataformat/xstream/XStreamConcurrencyTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-xstream/src/test/java/org/apache/camel/dataformat/xstream/XStreamConcurrencyTest.java?rev=1131070&r1=1131069&r2=1131070&view=diff
==============================================================================
--- camel/trunk/components/camel-xstream/src/test/java/org/apache/camel/dataformat/xstream/XStreamConcurrencyTest.java (original)
+++ camel/trunk/components/camel-xstream/src/test/java/org/apache/camel/dataformat/xstream/XStreamConcurrencyTest.java Fri Jun 3 15:19:52 2011
@@ -60,6 +60,7 @@ public class XStreamConcurrencyTest exte
}
assertMockEndpointsSatisfied();
+ executor.shutdownNow();
}
protected RouteBuilder createRouteBuilder() {
Modified: camel/trunk/examples/camel-example-route-throttling/src/main/java/org/apache/camel/example/client/CamelClient.java
URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-route-throttling/src/main/java/org/apache/camel/example/client/CamelClient.java?rev=1131070&r1=1131069&r2=1131070&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-route-throttling/src/main/java/org/apache/camel/example/client/CamelClient.java (original)
+++ camel/trunk/examples/camel-example-route-throttling/src/main/java/org/apache/camel/example/client/CamelClient.java Fri Jun 3 15:19:52 2011
@@ -70,7 +70,7 @@ public final class CamelClient {
latch.await(300, TimeUnit.SECONDS);
System.out.println("... Send " + SIZE + " message to JMS broker");
-
+ executors.shutdownNow();
System.exit(0);
}