You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by gt...@apache.org on 2015/09/29 14:15:27 UTC
activemq git commit: https://issues.apache.org/jira/browse/AMQ-5854 -
tidy up test
Repository: activemq
Updated Branches:
refs/heads/master 8d982479e -> 92e1f60d9
https://issues.apache.org/jira/browse/AMQ-5854 - tidy up test
Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/92e1f60d
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/92e1f60d
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/92e1f60d
Branch: refs/heads/master
Commit: 92e1f60d984d0e29eade47dbb6d2d30d838254c2
Parents: 8d98247
Author: gtully <ga...@gmail.com>
Authored: Tue Sep 29 13:11:29 2015 +0100
Committer: gtully <ga...@gmail.com>
Committed: Tue Sep 29 13:11:29 2015 +0100
----------------------------------------------------------------------
.../activemq/transport/failover/FailoverTxSlowAckTest.java | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq/blob/92e1f60d/activemq-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverTxSlowAckTest.java
----------------------------------------------------------------------
diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverTxSlowAckTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverTxSlowAckTest.java
index 1bbd0d8..427e2ba 100644
--- a/activemq-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverTxSlowAckTest.java
+++ b/activemq-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverTxSlowAckTest.java
@@ -57,7 +57,7 @@ public class FailoverTxSlowAckTest {
private static final String QUEUE_OUT = "OUT";
private static final String MESSAGE_TEXT = "Test message ";
- private static final String TRANSPORT_URI = "tcp://localhost:0?transport.useKeepAlive=false&wireFormat.maxInactivityDuration=10000";
+ private static final String TRANSPORT_URI = "tcp://localhost:0";
private String url;
final int prefetch = 1;
BrokerService broker;
@@ -88,8 +88,6 @@ public class FailoverTxSlowAckTest {
policyMap.setDefaultEntry(defaultEntry);
broker.setDestinationPolicy(policyMap);
- url = broker.getTransportConnectors().get(0).getConnectUri().toString();
-
return broker;
}
@@ -121,8 +119,9 @@ public class FailoverTxSlowAckTest {
}}});
broker.start();
+ url = broker.getTransportConnectors().get(0).getConnectUri().toString();
- ActiveMQConnectionFactory cf = new ActiveMQConnectionFactory("failover:(" + url + "?useKeepAlive=false&wireFormat.maxInactivityDuration=10000)");
+ ActiveMQConnectionFactory cf = new ActiveMQConnectionFactory("failover:(" + url + ")");
cf.setWatchTopicAdvisories(false);
cf.setDispatchAsync(false);
@@ -224,7 +223,7 @@ public class FailoverTxSlowAckTest {
broker.start();
assertTrue("message was recieved ", messagesReceived.await(20, TimeUnit.SECONDS));
- assertTrue("tx complete through failover", commitDoneLatch.await(20, TimeUnit.SECONDS));
+ assertTrue("tx complete through failover", commitDoneLatch.await(40, TimeUnit.SECONDS));
assertEquals("one delivery", 1, receivedCount.get());
assertTrue("got disconnect/reconnect", gotDisconnect.get());