Author: davsclaus
Date: Sat Apr 9 19:15:54 2011
New Revision: 1090653
URL: http://svn.apache.org/viewvc?rev=1090653&view=rev
Log:
CAMEL-3528: Using pooled connection factories. Fixed test.
Modified:
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/CamelJmsTestHelper.java
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsSuspendResumeTest.java
Modified:
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/CamelJmsTestHelper.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/CamelJmsTestHelper.java?rev=1090653&r1=1090652&r2=1090653&view=diff
==============================================================================
---
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/CamelJmsTestHelper.java
(original)
+++
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/CamelJmsTestHelper.java
Sat Apr 9 19:15:54 2011
@@ -20,6 +20,7 @@ import java.util.concurrent.atomic.Atomi
import javax.jms.ConnectionFactory;
import org.apache.activemq.ActiveMQConnectionFactory;
+import org.apache.activemq.pool.PooledConnectionFactory;
/**
* A helper for unit testing with Apache ActiveMQ as embedded JMS broker.
@@ -44,8 +45,11 @@ public final class CamelJmsTestHelper {
if (options != null) {
url = url + "&" + options;
}
- ConnectionFactory connectionFactory = new
ActiveMQConnectionFactory(url);
- return connectionFactory;
+ ActiveMQConnectionFactory connectionFactory = new
ActiveMQConnectionFactory(url);
+ // use a pooled connection factory
+ PooledConnectionFactory pooled = new
PooledConnectionFactory(connectionFactory);
+ pooled.setMaxConnections(8);
+ return pooled;
}
public static ConnectionFactory createPersistentConnectionFactory() {
@@ -59,7 +63,11 @@ public final class CamelJmsTestHelper {
if (options != null) {
url = url + "&" + options;
}
- ConnectionFactory connectionFactory = new
ActiveMQConnectionFactory(url);
- return connectionFactory;
+ ActiveMQConnectionFactory connectionFactory = new
ActiveMQConnectionFactory(url);
+
+ // use a pooled connection factory
+ PooledConnectionFactory pooled = new
PooledConnectionFactory(connectionFactory);
+ pooled.setMaxConnections(8);
+ return pooled;
}
}
Modified:
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsSuspendResumeTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsSuspendResumeTest.java?rev=1090653&r1=1090652&r2=1090653&view=diff
==============================================================================
---
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsSuspendResumeTest.java
(original)
+++
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsSuspendResumeTest.java
Sat Apr 9 19:15:54 2011
@@ -47,6 +47,9 @@ public class JmsSuspendResumeTest extend
resetMocks();
mock.expectedMessageCount(0);
+ // sleep a bit to ensure its properly suspended
+ Thread.sleep(2000);
+
template.sendBody("activemq:queue:foo", "Bye World");
assertMockEndpointsSatisfied(1, TimeUnit.SECONDS);