You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by su...@apache.org on 2012/09/27 17:50:53 UTC
svn commit: r1391062 - in /camel/trunk/components/camel-sjms: ./
src/test/java/org/apache/camel/component/sjms/tx/
Author: sully6768
Date: Thu Sep 27 15:50:53 2012
New Revision: 1391062
URL: http://svn.apache.org/viewvc?rev=1391062&view=rev
Log:
Disabling batch transaction concurrent tests
Modified:
camel/trunk/components/camel-sjms/pom.xml
camel/trunk/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/BatchTransactedConcurrentMultipleConsumerTest.java
camel/trunk/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/BatchTransactedConcurrentMultipleRouteConsumersTest.java
camel/trunk/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/TransactedConcurrentConsumersTest.java
Modified: camel/trunk/components/camel-sjms/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-sjms/pom.xml?rev=1391062&r1=1391061&r2=1391062&view=diff
==============================================================================
--- camel/trunk/components/camel-sjms/pom.xml (original)
+++ camel/trunk/components/camel-sjms/pom.xml Thu Sep 27 15:50:53 2012
@@ -132,10 +132,17 @@
</configuration>
</plugin> <!-- Configure which tests are included/excuded -->
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
+ <version>2.8</version>
<configuration>
<forkMode>pertest</forkMode>
<argLine>-Xmx512M</argLine>
+ <excludes>
+ <exclude>**/BatchTransactedConcurrentMultipleConsumerTest.*</exclude>
+ <exclude>**/BatchTransactedConcurrentMultipleRouteConsumersTest.*</exclude>
+ <exclude>**/TransactedConcurrentConsumersTest.*</exclude>
+ </excludes>
</configuration>
</plugin>
<plugin>
Modified: camel/trunk/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/BatchTransactedConcurrentMultipleConsumerTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/BatchTransactedConcurrentMultipleConsumerTest.java?rev=1391062&r1=1391061&r2=1391062&view=diff
==============================================================================
--- camel/trunk/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/BatchTransactedConcurrentMultipleConsumerTest.java (original)
+++ camel/trunk/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/BatchTransactedConcurrentMultipleConsumerTest.java Thu Sep 27 15:50:53 2012
@@ -16,6 +16,7 @@
*/
package org.apache.camel.component.sjms.tx;
+import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;
import org.apache.activemq.ActiveMQConnectionFactory;
@@ -36,6 +37,7 @@ public class BatchTransactedConcurrentMu
private static final int CONSUMER_COUNT = 2;
private static final int MAX_ATTEMPTS_COUNT = 50;
private static final int MESSAGE_COUNT = 200;
+ private static final String BROKER_URI = "vm://btcmcTestBroker?broker.persistent=false&broker.useJmx=true";
/**
* Verify that the batch transactions behave correctly when we combine it
@@ -59,7 +61,7 @@ public class BatchTransactedConcurrentMu
template.sendBody("direct:start", message);
log.trace("Sending message: {}", message);
}
- assertMockEndpointsSatisfied();
+ assertMockEndpointsSatisfied(10, TimeUnit.SECONDS);
}
@@ -67,7 +69,7 @@ public class BatchTransactedConcurrentMu
protected CamelContext createCamelContext() throws Exception {
CamelContext camelContext = super.createCamelContext();
- ActiveMQConnectionFactory connectionFactory = new ActiveMQConnectionFactory("vm://broker?broker.persistent=false&broker.useJmx=true");
+ ActiveMQConnectionFactory connectionFactory = new ActiveMQConnectionFactory(BROKER_URI);
SjmsComponent component = new SjmsComponent();
component.setConnectionFactory(connectionFactory);
camelContext.addComponent("sjms", component);
Modified: camel/trunk/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/BatchTransactedConcurrentMultipleRouteConsumersTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/BatchTransactedConcurrentMultipleRouteConsumersTest.java?rev=1391062&r1=1391061&r2=1391062&view=diff
==============================================================================
--- camel/trunk/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/BatchTransactedConcurrentMultipleRouteConsumersTest.java (original)
+++ camel/trunk/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/BatchTransactedConcurrentMultipleRouteConsumersTest.java Thu Sep 27 15:50:53 2012
@@ -16,6 +16,7 @@
*/
package org.apache.camel.component.sjms.tx;
+import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;
import org.apache.activemq.ActiveMQConnectionFactory;
@@ -37,6 +38,7 @@ public class BatchTransactedConcurrentMu
private static final int MAX_ATTEMPTS_COUNT = 50;
private static final int MESSAGE_COUNT = 200;
private static final int CONSUMER_COUNT = 1;
+ private static final String BROKER_URI = "vm://btccmrcTestBroker?broker.persistent=false&broker.useJmx=true";
/**
* We want to verify that when consuming from a single destination with
@@ -65,14 +67,14 @@ public class BatchTransactedConcurrentMu
template.sendBody("direct:start", message);
log.trace("Sending message: {}", message);
}
- assertMockEndpointsSatisfied();
+ assertMockEndpointsSatisfied(10, TimeUnit.SECONDS);
}
@Override
protected CamelContext createCamelContext() throws Exception {
CamelContext camelContext = super.createCamelContext();
- ActiveMQConnectionFactory connectionFactory = new ActiveMQConnectionFactory("vm://broker?broker.persistent=false&broker.useJmx=true");
+ ActiveMQConnectionFactory connectionFactory = new ActiveMQConnectionFactory(BROKER_URI);
SjmsComponent component = new SjmsComponent();
component.setConnectionFactory(connectionFactory);
camelContext.addComponent("sjms", component);
Modified: camel/trunk/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/TransactedConcurrentConsumersTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/TransactedConcurrentConsumersTest.java?rev=1391062&r1=1391061&r2=1391062&view=diff
==============================================================================
--- camel/trunk/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/TransactedConcurrentConsumersTest.java (original)
+++ camel/trunk/components/camel-sjms/src/test/java/org/apache/camel/component/sjms/tx/TransactedConcurrentConsumersTest.java Thu Sep 27 15:50:53 2012
@@ -16,6 +16,7 @@
*/
package org.apache.camel.component.sjms.tx;
+import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;
import org.apache.activemq.ActiveMQConnectionFactory;
@@ -34,7 +35,8 @@ public class TransactedConcurrentConsume
private static final int CONSUMER_COUNT = 2;
private static final int MAX_ATTEMPTS_COUNT = 50;
- private static final int MESSAGE_COUNT = 200;
+ private static final int MESSAGE_COUNT = 100;
+ private static final String BROKER_URI = "vm://tccTestBroker?broker.persistent=false&broker.useJmx=true";
/**
* Verify that transacted and concurrent consumers work correctly together.
@@ -46,8 +48,9 @@ public class TransactedConcurrentConsume
// We are set up for a failure to occur every 50 messages. Even with
// multiple consumers we should still only see 4 message failures
// over the course of 200 messages.
- getMockEndpoint("mock:test.redelivered.false").expectedMessageCount(196);
- getMockEndpoint("mock:test.redelivered.true").expectedMessageCount(4);
+ int transactedMsgs = MESSAGE_COUNT/MAX_ATTEMPTS_COUNT;
+ getMockEndpoint("mock:test.redelivered.false").expectedMessageCount(MESSAGE_COUNT - transactedMsgs);
+ getMockEndpoint("mock:test.redelivered.true").expectedMessageCount(transactedMsgs);
// We should never see a message appear in this endpoint or we
// have problem with our JMS provider
@@ -59,8 +62,8 @@ public class TransactedConcurrentConsume
template.sendBody("direct:start", message);
log.trace("Sending message: {}", message);
}
-
- assertMockEndpointsSatisfied();
+
+ assertMockEndpointsSatisfied(10, TimeUnit.SECONDS);
}
@@ -68,7 +71,7 @@ public class TransactedConcurrentConsume
protected CamelContext createCamelContext() throws Exception {
CamelContext camelContext = super.createCamelContext();
- ActiveMQConnectionFactory connectionFactory = new ActiveMQConnectionFactory("vm://broker?broker.persistent=false&broker.useJmx=true");
+ ActiveMQConnectionFactory connectionFactory = new ActiveMQConnectionFactory(BROKER_URI);
SjmsComponent component = new SjmsComponent();
component.setConnectionFactory(connectionFactory);
camelContext.addComponent("sjms", component);