Repository: qpid-jms Updated Branches: refs/heads/master 28f0e8083 -> b37200f45
QPIDJMS-365: restore previously existing test to earlier condition Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/610ffe2a Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/610ffe2a Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/610ffe2a Branch: refs/heads/master Commit: 610ffe2aa5f66a6b1125612e07cbfdfc496963ec Parents: 28f0e80 Author: Robbie Gemmell <[email protected]> Authored: Thu Mar 22 11:34:18 2018 +0000 Committer: Robbie Gemmell <[email protected]> Committed: Thu Mar 22 11:34:18 2018 +0000 ---------------------------------------------------------------------- .../provider/failover/FailoverIntegrationTest.java | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/610ffe2a/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/failover/FailoverIntegrationTest.java ---------------------------------------------------------------------- diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/failover/FailoverIntegrationTest.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/failover/FailoverIntegrationTest.java index e12c312..69e472c 100644 --- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/failover/FailoverIntegrationTest.java +++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/failover/FailoverIntegrationTest.java @@ -16,11 +16,7 @@ */ package org.apache.qpid.jms.provider.failover; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.both; import static org.hamcrest.Matchers.equalTo; -import static org.hamcrest.Matchers.greaterThanOrEqualTo; -import static org.hamcrest.Matchers.lessThanOrEqualTo; import static org.hamcrest.Matchers.notNullValue; import static org.hamcrest.Matchers.nullValue; import static org.junit.Assert.assertEquals; @@ -182,11 +178,7 @@ public class FailoverIntegrationTest extends QpidJmsTestCase { originalPeer.expectOpen(); originalPeer.expectBegin(); - long ird = 0; - long rd = 2000; - long start = System.currentTimeMillis(); - - final JmsConnection connection = establishAnonymousConnecton("failover.initialReconnectDelay=" + ird + "&failover.reconnectDelay=" + rd + "&failover.maxReconnectAttempts=10", originalPeer, rejectingPeer, finalPeer); + final JmsConnection connection = establishAnonymousConnecton(originalPeer, rejectingPeer, finalPeer); connection.addConnectionListener(new JmsDefaultConnectionListener() { @Override public void onConnectionEstablished(URI remoteURI) { @@ -210,7 +202,7 @@ public class FailoverIntegrationTest extends QpidJmsTestCase { assertEquals("should not yet have connected to final peer", 1L, finalConnected.getCount()); // Set expectations on rejecting and final peer - rejectingPeer.rejectConnect(AmqpError.NOT_FOUND, "Resource could not be located", null); + rejectingPeer.expectSaslHeaderThenDrop(); finalPeer.expectSaslAnonymous(); finalPeer.expectOpen(); @@ -222,11 +214,6 @@ public class FailoverIntegrationTest extends QpidJmsTestCase { rejectingPeer.waitForAllHandlersToComplete(2000); assertTrue("Should connect to final peer", finalConnected.await(5, TimeUnit.SECONDS)); - long end = System.currentTimeMillis(); - - long margin = 2000; - assertThat("Elapsed time outwith expected range for reconnect", end - start, - both(greaterThanOrEqualTo(ird + rd)).and(lessThanOrEqualTo(ird + rd + margin))); // Shut it down finalPeer.expectClose(); --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
