Repository: qpid-jms Updated Branches: refs/heads/master 615fb0848 -> 8aa05509f
NO-JIRA Fix spelling in test support class API Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/8aa05509 Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/8aa05509 Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/8aa05509 Branch: refs/heads/master Commit: 8aa05509f169cd92f87507c4423bfb616534c892 Parents: 615fb08 Author: Timothy Bish <[email protected]> Authored: Fri Jun 8 14:51:31 2018 -0400 Committer: Timothy Bish <[email protected]> Committed: Fri Jun 8 14:51:31 2018 -0400 ---------------------------------------------------------------------- .../qpid/jms/JmsConnectionFailedTest.java | 2 +- .../consumer/JmsMessageConsumerFailedTest.java | 2 +- .../ConnectionConsumerIntegrationTest.java | 2 +- .../integration/ConnectionIntegrationTest.java | 2 +- .../integration/ConsumerIntegrationTest.java | 6 ++--- .../integration/IdleTimeoutIntegrationTest.java | 2 +- .../integration/JMSConsumerIntegrationTest.java | 2 +- .../integration/ProducerIntegrationTest.java | 2 +- .../jms/integration/SessionIntegrationTest.java | 8 +++--- .../producer/JmsMessageProducerFailedTest.java | 2 +- .../jms/producer/JmsMessageProducerTest.java | 24 ++++++++--------- .../failover/FailoverIntegrationTest.java | 6 ++--- .../provider/failover/FailoverProviderTest.java | 4 +-- .../qpid/jms/session/JmsSessionFailedTest.java | 2 +- .../java/org/apache/qpid/jms/test/Wait.java | 11 ++++---- .../transports/netty/NettyTcpTransportTest.java | 8 +++--- .../transports/netty/NettyWsTransportTest.java | 6 ++--- .../qpid/jms/consumer/JmsAutoAckTest.java | 4 +-- .../qpid/jms/consumer/JmsClientAckTest.java | 26 +++++++++--------- .../jms/consumer/JmsDurableSubscriberTest.java | 4 +-- .../jms/consumer/JmsMessageConsumerTest.java | 10 +++---- .../qpid/jms/consumer/JmsZeroPrefetchTest.java | 8 +++--- .../jms/discovery/JmsAmqpDiscoveryTest.java | 8 +++--- .../qpid/jms/failover/JmsFailoverTest.java | 28 ++++++++++---------- .../jms/failover/JmsOfflineBehaviorTests.java | 4 +-- .../jms/failover/JmsTxConsumerFailoverTest.java | 4 +-- .../jms/failover/JmsTxProducerFailoverTest.java | 4 +-- .../jms/producer/JmsMessageProducerTest.java | 2 +- ...JmsProducerFlowControlFailIfNoSpaceTest.java | 2 +- .../apache/qpid/jms/session/JmsSessionTest.java | 4 +-- .../java/org/apache/qpid/jms/support/Wait.java | 11 ++++---- .../JmsTransactionRedeliveryPolicyTest.java | 4 +-- 32 files changed, 106 insertions(+), 108 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/8aa05509/qpid-jms-client/src/test/java/org/apache/qpid/jms/JmsConnectionFailedTest.java ---------------------------------------------------------------------- diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/JmsConnectionFailedTest.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/JmsConnectionFailedTest.java index 0bf8a91..961c84b 100644 --- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/JmsConnectionFailedTest.java +++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/JmsConnectionFailedTest.java @@ -48,7 +48,7 @@ public class JmsConnectionFailedTest extends JmsConnectionClosedTest { assertTrue(Wait.waitFor(new Wait.Condition() { @Override - public boolean isSatisified() throws Exception { + public boolean isSatisfied() throws Exception { return !jmsConnection.isConnected(); } }, TimeUnit.SECONDS.toMillis(30), TimeUnit.MILLISECONDS.toMillis(10))); http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/8aa05509/qpid-jms-client/src/test/java/org/apache/qpid/jms/consumer/JmsMessageConsumerFailedTest.java ---------------------------------------------------------------------- diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/consumer/JmsMessageConsumerFailedTest.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/consumer/JmsMessageConsumerFailedTest.java index ce86809..1700648 100644 --- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/consumer/JmsMessageConsumerFailedTest.java +++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/consumer/JmsMessageConsumerFailedTest.java @@ -54,7 +54,7 @@ public class JmsMessageConsumerFailedTest extends JmsMessageConsumerClosedTest { assertTrue(Wait.waitFor(new Wait.Condition() { @Override - public boolean isSatisified() throws Exception { + public boolean isSatisfied() throws Exception { return !jmsConnection.isConnected(); } }, TimeUnit.SECONDS.toMillis(30), TimeUnit.MILLISECONDS.toMillis(2))); http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/8aa05509/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/ConnectionConsumerIntegrationTest.java ---------------------------------------------------------------------- diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/ConnectionConsumerIntegrationTest.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/ConnectionConsumerIntegrationTest.java index 30885b8..5bbfff9 100644 --- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/ConnectionConsumerIntegrationTest.java +++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/ConnectionConsumerIntegrationTest.java @@ -397,7 +397,7 @@ public class ConnectionConsumerIntegrationTest extends QpidJmsTestCase { testPeer.waitForAllHandlersToComplete(1000); assertTrue("consumer never closed.", Wait.waitFor(new Wait.Condition() { @Override - public boolean isSatisified() throws Exception { + public boolean isSatisfied() throws Exception { try { consumer.getServerSessionPool(); } catch (IllegalStateException jmsise) { http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/8aa05509/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/ConnectionIntegrationTest.java ---------------------------------------------------------------------- diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/ConnectionIntegrationTest.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/ConnectionIntegrationTest.java index e560874..c2f6f5f 100644 --- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/ConnectionIntegrationTest.java +++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/ConnectionIntegrationTest.java @@ -579,7 +579,7 @@ public class ConnectionIntegrationTest extends QpidJmsTestCase { testPeer.waitForAllHandlersToComplete(1000); assertTrue("connection never closed.", Wait.waitFor(new Wait.Condition() { @Override - public boolean isSatisified() throws Exception { + public boolean isSatisfied() throws Exception { return !((JmsConnection) connection).isConnected(); } }, 10000, 10)); http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/8aa05509/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/ConsumerIntegrationTest.java ---------------------------------------------------------------------- diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/ConsumerIntegrationTest.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/ConsumerIntegrationTest.java index ae3694a..1543f3a 100644 --- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/ConsumerIntegrationTest.java +++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/ConsumerIntegrationTest.java @@ -172,7 +172,7 @@ public class ConsumerIntegrationTest extends QpidJmsTestCase { testPeer.waitForAllHandlersToComplete(1000); assertTrue("consumer never closed.", Wait.waitFor(new Wait.Condition() { @Override - public boolean isSatisified() throws Exception { + public boolean isSatisfied() throws Exception { try { consumer.getMessageListener(); } catch (IllegalStateException jmsise) { @@ -241,7 +241,7 @@ public class ConsumerIntegrationTest extends QpidJmsTestCase { testPeer.waitForAllHandlersToComplete(1000); assertTrue("consumer never closed.", Wait.waitFor(new Wait.Condition() { @Override - public boolean isSatisified() throws Exception { + public boolean isSatisfied() throws Exception { try { consumer.getMessageListener(); } catch (IllegalStateException jmsise) { @@ -919,7 +919,7 @@ public class ConsumerIntegrationTest extends QpidJmsTestCase { assertTrue("Consumer should close", Wait.waitFor(new Wait.Condition() { @Override - public boolean isSatisified() throws Exception { + public boolean isSatisfied() throws Exception { try { consumer.getMessageSelector(); return false; http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/8aa05509/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/IdleTimeoutIntegrationTest.java ---------------------------------------------------------------------- diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/IdleTimeoutIntegrationTest.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/IdleTimeoutIntegrationTest.java index 53942f2..bc06e1d 100644 --- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/IdleTimeoutIntegrationTest.java +++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/IdleTimeoutIntegrationTest.java @@ -193,7 +193,7 @@ public class IdleTimeoutIntegrationTest extends QpidJmsTestCase { boolean failed = Wait.waitFor(new Wait.Condition() { @Override - public boolean isSatisified() throws Exception { + public boolean isSatisfied() throws Exception { return connection.isFailed(); } }, 10000, 10); http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/8aa05509/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/JMSConsumerIntegrationTest.java ---------------------------------------------------------------------- diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/JMSConsumerIntegrationTest.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/JMSConsumerIntegrationTest.java index 786d4e4..8b09870 100644 --- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/JMSConsumerIntegrationTest.java +++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/JMSConsumerIntegrationTest.java @@ -102,7 +102,7 @@ public class JMSConsumerIntegrationTest extends QpidJmsTestCase { testPeer.waitForAllHandlersToComplete(1000); assertTrue("JMSConsumer never closed.", Wait.waitFor(new Wait.Condition() { @Override - public boolean isSatisified() throws Exception { + public boolean isSatisfied() throws Exception { try { consumer.getMessageListener(); } catch (IllegalStateRuntimeException jmsise) { http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/8aa05509/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/ProducerIntegrationTest.java ---------------------------------------------------------------------- diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/ProducerIntegrationTest.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/ProducerIntegrationTest.java index 8a8a96c..11c4c3e 100644 --- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/ProducerIntegrationTest.java +++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/ProducerIntegrationTest.java @@ -943,7 +943,7 @@ public class ProducerIntegrationTest extends QpidJmsTestCase { testPeer.waitForAllHandlersToComplete(1000); assertTrue("producer never closed.", Wait.waitFor(new Wait.Condition() { @Override - public boolean isSatisified() throws Exception { + public boolean isSatisfied() throws Exception { try { producer.getDestination(); } catch (Exception ex) { http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/8aa05509/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/SessionIntegrationTest.java ---------------------------------------------------------------------- diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/SessionIntegrationTest.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/SessionIntegrationTest.java index b69e43c..70871fc 100644 --- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/SessionIntegrationTest.java +++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/SessionIntegrationTest.java @@ -1698,7 +1698,7 @@ public class SessionIntegrationTest extends QpidJmsTestCase { // Verify the producers get marked closed assertTrue("producer never closed.", Wait.waitFor(new Wait.Condition() { @Override - public boolean isSatisified() throws Exception { + public boolean isSatisfied() throws Exception { try { producer.getDestination(); } catch (IllegalStateException jmsise) { @@ -1716,7 +1716,7 @@ public class SessionIntegrationTest extends QpidJmsTestCase { assertTrue("producer2 never closed.", Wait.waitFor(new Wait.Condition() { @Override - public boolean isSatisified() throws Exception { + public boolean isSatisfied() throws Exception { try { producer2.getDestination(); } catch (IllegalStateException jmsise) { @@ -1897,7 +1897,7 @@ public class SessionIntegrationTest extends QpidJmsTestCase { testPeer.waitForAllHandlersToComplete(1000); assertTrue("consumer never closed.", Wait.waitFor(new Wait.Condition() { @Override - public boolean isSatisified() throws Exception { + public boolean isSatisfied() throws Exception { try { consumer.getMessageListener(); } catch (IllegalStateException jmsise) { @@ -1915,7 +1915,7 @@ public class SessionIntegrationTest extends QpidJmsTestCase { assertTrue("consumer2 never closed.", Wait.waitFor(new Wait.Condition() { @Override - public boolean isSatisified() throws Exception { + public boolean isSatisfied() throws Exception { try { consumer2.getMessageListener(); } catch (IllegalStateException jmsise) { http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/8aa05509/qpid-jms-client/src/test/java/org/apache/qpid/jms/producer/JmsMessageProducerFailedTest.java ---------------------------------------------------------------------- diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/producer/JmsMessageProducerFailedTest.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/producer/JmsMessageProducerFailedTest.java index ef08f5b..f801800 100644 --- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/producer/JmsMessageProducerFailedTest.java +++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/producer/JmsMessageProducerFailedTest.java @@ -54,7 +54,7 @@ public class JmsMessageProducerFailedTest extends JmsMessageProducerClosedTest { assertTrue(Wait.waitFor(new Wait.Condition() { @Override - public boolean isSatisified() throws Exception { + public boolean isSatisfied() throws Exception { return !jmsConnection.isConnected(); } }, TimeUnit.SECONDS.toMillis(30), TimeUnit.MILLISECONDS.toMillis(2))); http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/8aa05509/qpid-jms-client/src/test/java/org/apache/qpid/jms/producer/JmsMessageProducerTest.java ---------------------------------------------------------------------- diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/producer/JmsMessageProducerTest.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/producer/JmsMessageProducerTest.java index 440890a..81e78dc 100644 --- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/producer/JmsMessageProducerTest.java +++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/producer/JmsMessageProducerTest.java @@ -465,7 +465,7 @@ public class JmsMessageProducerTest extends JmsConnectionTestSupport { assertTrue("Not all sends made it to the remote", Wait.waitFor(new Wait.Condition() { @Override - public boolean isSatisified() throws Exception { + public boolean isSatisfied() throws Exception { return remotePoor.getPendingCompletions(destination).size() == MESSAGE_COUNT; } })); @@ -475,7 +475,7 @@ public class JmsMessageProducerTest extends JmsConnectionTestSupport { assertTrue("Not all completions triggered", Wait.waitFor(new Wait.Condition() { @Override - public boolean isSatisified() throws Exception { + public boolean isSatisfied() throws Exception { return listener.getCompletedSends().size() == MESSAGE_COUNT; } })); @@ -506,7 +506,7 @@ public class JmsMessageProducerTest extends JmsConnectionTestSupport { assertTrue("Not all sends made it to the remote", Wait.waitFor(new Wait.Condition() { @Override - public boolean isSatisified() throws Exception { + public boolean isSatisfied() throws Exception { return remotePoor.getPendingCompletions(destination).size() == MESSAGE_COUNT; } })); @@ -523,7 +523,7 @@ public class JmsMessageProducerTest extends JmsConnectionTestSupport { assertTrue("Not all completions triggered", Wait.waitFor(new Wait.Condition() { @Override - public boolean isSatisified() throws Exception { + public boolean isSatisfied() throws Exception { return listener.getCompletedSends().size() == MESSAGE_COUNT; } })); @@ -553,7 +553,7 @@ public class JmsMessageProducerTest extends JmsConnectionTestSupport { assertTrue("Not all messages sent", Wait.waitFor(new Wait.Condition() { @Override - public boolean isSatisified() throws Exception { + public boolean isSatisfied() throws Exception { return remotePoor.getPendingCompletions(destination).size() == MESSAGE_COUNT; } })); @@ -562,7 +562,7 @@ public class JmsMessageProducerTest extends JmsConnectionTestSupport { assertTrue("Not all completions triggered", Wait.waitFor(new Wait.Condition() { @Override - public boolean isSatisified() throws Exception { + public boolean isSatisfied() throws Exception { return listener.getFailedSends().size() == MESSAGE_COUNT; } })); @@ -593,7 +593,7 @@ public class JmsMessageProducerTest extends JmsConnectionTestSupport { assertTrue("Not all sends made it to the remote", Wait.waitFor(new Wait.Condition() { @Override - public boolean isSatisified() throws Exception { + public boolean isSatisfied() throws Exception { return remotePoor.getPendingCompletions(destination).size() == MESSAGE_COUNT; } })); @@ -610,7 +610,7 @@ public class JmsMessageProducerTest extends JmsConnectionTestSupport { assertTrue("Not all failures triggered", Wait.waitFor(new Wait.Condition() { @Override - public boolean isSatisified() throws Exception { + public boolean isSatisfied() throws Exception { return listener.getFailedSends().size() == MESSAGE_COUNT; } })); @@ -641,7 +641,7 @@ public class JmsMessageProducerTest extends JmsConnectionTestSupport { assertTrue("Not all sends made it to the remote", Wait.waitFor(new Wait.Condition() { @Override - public boolean isSatisified() throws Exception { + public boolean isSatisfied() throws Exception { return remotePoor.getPendingCompletions(destination).size() == MESSAGE_COUNT; } })); @@ -664,7 +664,7 @@ public class JmsMessageProducerTest extends JmsConnectionTestSupport { assertTrue("Not all completions triggered", Wait.waitFor(new Wait.Condition() { @Override - public boolean isSatisified() throws Exception { + public boolean isSatisfied() throws Exception { return listener.getCombinedSends().size() == MESSAGE_COUNT; } })); @@ -713,7 +713,7 @@ public class JmsMessageProducerTest extends JmsConnectionTestSupport { assertTrue("Not all sends made it to the remote", Wait.waitFor(new Wait.Condition() { @Override - public boolean isSatisified() throws Exception { + public boolean isSatisfied() throws Exception { return remotePoor.getPendingCompletions(destination).size() == MESSAGE_COUNT; } })); @@ -763,7 +763,7 @@ public class JmsMessageProducerTest extends JmsConnectionTestSupport { assertTrue("Not all sends made it to the remote", Wait.waitFor(new Wait.Condition() { @Override - public boolean isSatisified() throws Exception { + public boolean isSatisfied() throws Exception { return remotePoor.getPendingCompletions(destination).size() == MESSAGE_COUNT; } })); http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/8aa05509/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 63596d4..b8aa42c 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 @@ -1980,7 +1980,7 @@ public class FailoverIntegrationTest extends QpidJmsTestCase { testPeer.waitForAllHandlersToComplete(1000); assertTrue("consumer never closed.", Wait.waitFor(new Wait.Condition() { @Override - public boolean isSatisified() throws Exception { + public boolean isSatisfied() throws Exception { try { consumer.getMessageListener(); } catch (IllegalStateException jmsise) { @@ -2366,7 +2366,7 @@ public class FailoverIntegrationTest extends QpidJmsTestCase { // Verify the consumer gets marked closed assertTrue("consumer never closed.", Wait.waitFor(new Wait.Condition() { @Override - public boolean isSatisified() throws Exception { + public boolean isSatisfied() throws Exception { try { consumer.getMessageListener(); } catch (IllegalStateException jmsise) { @@ -2485,7 +2485,7 @@ public class FailoverIntegrationTest extends QpidJmsTestCase { // Verify the producer gets marked closed assertTrue("producer never closed.", Wait.waitFor(new Wait.Condition() { @Override - public boolean isSatisified() throws Exception { + public boolean isSatisfied() throws Exception { try { producer.getDestination(); } catch (IllegalStateException jmsise) { http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/8aa05509/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/failover/FailoverProviderTest.java ---------------------------------------------------------------------- diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/failover/FailoverProviderTest.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/failover/FailoverProviderTest.java index dbb4381..19b8d25 100644 --- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/failover/FailoverProviderTest.java +++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/failover/FailoverProviderTest.java @@ -137,7 +137,7 @@ public class FailoverProviderTest extends FailoverProviderTestSupport { assertTrue("Should have a remote URI after connect", Wait.waitFor(new Wait.Condition() { @Override - public boolean isSatisified() throws Exception { + public boolean isSatisfied() throws Exception { return provider.getRemoteURI() != null; } }, TimeUnit.SECONDS.toMillis(20), 10)); @@ -152,7 +152,7 @@ public class FailoverProviderTest extends FailoverProviderTestSupport { assertTrue("Should have a mock scheme after connect", Wait.waitFor(new Wait.Condition() { @Override - public boolean isSatisified() throws Exception { + public boolean isSatisfied() throws Exception { LOG.info("FailoverProvider: toString = {}", provider.toString()); return provider.toString().contains("mock://"); } http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/8aa05509/qpid-jms-client/src/test/java/org/apache/qpid/jms/session/JmsSessionFailedTest.java ---------------------------------------------------------------------- diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/session/JmsSessionFailedTest.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/session/JmsSessionFailedTest.java index f4db9d0..a903a81 100644 --- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/session/JmsSessionFailedTest.java +++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/session/JmsSessionFailedTest.java @@ -56,7 +56,7 @@ public class JmsSessionFailedTest extends JmsSessionClosedTest { assertTrue(Wait.waitFor(new Wait.Condition() { @Override - public boolean isSatisified() throws Exception { + public boolean isSatisfied() throws Exception { return !jmsConnection.isConnected(); } }, TimeUnit.SECONDS.toMillis(30), TimeUnit.MILLISECONDS.toMillis(2))); http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/8aa05509/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/Wait.java ---------------------------------------------------------------------- diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/Wait.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/Wait.java index 5e15977..e7c609d 100644 --- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/Wait.java +++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/Wait.java @@ -24,7 +24,7 @@ public class Wait { public static final long SLEEP_MILLIS = 200; public interface Condition { - boolean isSatisified() throws Exception; + boolean isSatisfied() throws Exception; } public static boolean waitFor(Condition condition) throws Exception { @@ -36,13 +36,12 @@ public class Wait { } public static boolean waitFor(final Condition condition, final long duration, final long sleepMillis) throws Exception { - final long expiry = System.currentTimeMillis() + duration; - boolean conditionSatisified = condition.isSatisified(); - while (!conditionSatisified && System.currentTimeMillis() < expiry) { + boolean conditionSatisfied = condition.isSatisfied(); + while (!conditionSatisfied && System.currentTimeMillis() < expiry) { TimeUnit.MILLISECONDS.sleep(sleepMillis); - conditionSatisified = condition.isSatisified(); + conditionSatisfied = condition.isSatisfied(); } - return conditionSatisified; + return conditionSatisfied; } } http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/8aa05509/qpid-jms-client/src/test/java/org/apache/qpid/jms/transports/netty/NettyTcpTransportTest.java ---------------------------------------------------------------------- diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/transports/netty/NettyTcpTransportTest.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/transports/netty/NettyTcpTransportTest.java index 91a33b9..777ffbb 100644 --- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/transports/netty/NettyTcpTransportTest.java +++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/transports/netty/NettyTcpTransportTest.java @@ -262,7 +262,7 @@ public class NettyTcpTransportTest extends QpidJmsTestCase { assertTrue(Wait.waitFor(new Wait.Condition() { @Override - public boolean isSatisified() throws Exception { + public boolean isSatisfied() throws Exception { LOG.debug("Checking completion: read {} expecting {}", bytesRead.get(), (FRAME_SIZE * CONNECTION_COUNT)); return bytesRead.get() == (FRAME_SIZE * CONNECTION_COUNT); } @@ -302,7 +302,7 @@ public class NettyTcpTransportTest extends QpidJmsTestCase { final Transport connectedTransport = transport; assertTrue(Wait.waitFor(new Wait.Condition() { @Override - public boolean isSatisified() throws Exception { + public boolean isSatisfied() throws Exception { return !connectedTransport.isConnected(); } }, 10000, 50)); @@ -371,7 +371,7 @@ public class NettyTcpTransportTest extends QpidJmsTestCase { assertTrue(Wait.waitFor(new Wait.Condition() { @Override - public boolean isSatisified() throws Exception { + public boolean isSatisfied() throws Exception { return !data.isEmpty(); } }, 10000, 50)); @@ -424,7 +424,7 @@ public class NettyTcpTransportTest extends QpidJmsTestCase { assertTrue(Wait.waitFor(new Wait.Condition() { @Override - public boolean isSatisified() throws Exception { + public boolean isSatisfied() throws Exception { return bytesRead.get() == (byteCount * iterations); } }, 10000, 50)); http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/8aa05509/qpid-jms-client/src/test/java/org/apache/qpid/jms/transports/netty/NettyWsTransportTest.java ---------------------------------------------------------------------- diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/transports/netty/NettyWsTransportTest.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/transports/netty/NettyWsTransportTest.java index 5c33547..993d526 100644 --- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/transports/netty/NettyWsTransportTest.java +++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/transports/netty/NettyWsTransportTest.java @@ -158,7 +158,7 @@ public class NettyWsTransportTest extends NettyTcpTransportTest { assertTrue(Wait.waitFor(new Wait.Condition() { @Override - public boolean isSatisified() throws Exception { + public boolean isSatisfied() throws Exception { LOG.debug("Checking completion: read {} expecting {}", bytesRead.get(), FRAME_SIZE); return bytesRead.get() == FRAME_SIZE || !transport.isConnected(); } @@ -209,7 +209,7 @@ public class NettyWsTransportTest extends NettyTcpTransportTest { assertTrue(Wait.waitFor(new Wait.Condition() { @Override - public boolean isSatisified() throws Exception { + public boolean isSatisfied() throws Exception { LOG.debug("Checking completion: read {} expecting {}", bytesRead.get(), FRAME_SIZE); return bytesRead.get() == FRAME_SIZE || !transport.isConnected(); } @@ -306,7 +306,7 @@ public class NettyWsTransportTest extends NettyTcpTransportTest { assertTrue("Transport should have lost connection", Wait.waitFor(new Wait.Condition() { @Override - public boolean isSatisified() throws Exception { + public boolean isSatisfied() throws Exception { try { transport.send(sendBuffer); } catch (IOException e) { http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/8aa05509/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/consumer/JmsAutoAckTest.java ---------------------------------------------------------------------- diff --git a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/consumer/JmsAutoAckTest.java b/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/consumer/JmsAutoAckTest.java index b7bf4c8..ec5cb8b 100644 --- a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/consumer/JmsAutoAckTest.java +++ b/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/consumer/JmsAutoAckTest.java @@ -62,7 +62,7 @@ public class JmsAutoAckTest extends AmqpTestSupport { assertTrue("Queued message not consumed.", Wait.waitFor(new Wait.Condition() { @Override - public boolean isSatisified() throws Exception { + public boolean isSatisfied() throws Exception { return proxy.getQueueSize() == 0; } })); @@ -94,7 +94,7 @@ public class JmsAutoAckTest extends AmqpTestSupport { assertTrue("Queued message not consumed.", Wait.waitFor(new Wait.Condition() { @Override - public boolean isSatisified() throws Exception { + public boolean isSatisfied() throws Exception { return proxy.getQueueSize() == 0; } })); http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/8aa05509/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/consumer/JmsClientAckTest.java ---------------------------------------------------------------------- diff --git a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/consumer/JmsClientAckTest.java b/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/consumer/JmsClientAckTest.java index 7b7f09f..e2cd80b 100644 --- a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/consumer/JmsClientAckTest.java +++ b/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/consumer/JmsClientAckTest.java @@ -76,7 +76,7 @@ public class JmsClientAckTest extends AmqpTestSupport { assertTrue("Queued message not consumed.", Wait.waitFor(new Wait.Condition() { @Override - public boolean isSatisified() throws Exception { + public boolean isSatisfied() throws Exception { return proxy.getQueueSize() == 0; } })); @@ -111,7 +111,7 @@ public class JmsClientAckTest extends AmqpTestSupport { assertTrue("Queued message not consumed.", Wait.waitFor(new Wait.Condition() { @Override - public boolean isSatisified() throws Exception { + public boolean isSatisfied() throws Exception { return proxy.getQueueSize() == 0; } })); @@ -147,7 +147,7 @@ public class JmsClientAckTest extends AmqpTestSupport { assertTrue("Queued message not consumed.", Wait.waitFor(new Wait.Condition() { @Override - public boolean isSatisified() throws Exception { + public boolean isSatisfied() throws Exception { return proxy.getQueueSize() == 0; } })); @@ -182,7 +182,7 @@ public class JmsClientAckTest extends AmqpTestSupport { assertTrue("Queued message not consumed.", Wait.waitFor(new Wait.Condition() { @Override - public boolean isSatisified() throws Exception { + public boolean isSatisfied() throws Exception { return proxy.getQueueSize() == 0; } })); @@ -225,7 +225,7 @@ public class JmsClientAckTest extends AmqpTestSupport { assertTrue("Queued message not consumed.", Wait.waitFor(new Wait.Condition() { @Override - public boolean isSatisified() throws Exception { + public boolean isSatisfied() throws Exception { return proxy.getQueueSize() == 0; } })); @@ -271,7 +271,7 @@ public class JmsClientAckTest extends AmqpTestSupport { assertTrue("Not all messages appear as in-flight.", Wait.waitFor(new Wait.Condition() { @Override - public boolean isSatisified() throws Exception { + public boolean isSatisfied() throws Exception { return proxy.getInFlightCount() == MSG_COUNT; } })); @@ -281,7 +281,7 @@ public class JmsClientAckTest extends AmqpTestSupport { assertTrue("Queued message not consumed.", Wait.waitFor(new Wait.Condition() { @Override - public boolean isSatisified() throws Exception { + public boolean isSatisfied() throws Exception { return proxy.getQueueSize() == 0; } })); @@ -499,7 +499,7 @@ public class JmsClientAckTest extends AmqpTestSupport { assertTrue("Queue didn't receive all messages", Wait.waitFor(new Wait.Condition() { @Override - public boolean isSatisified() throws Exception { + public boolean isSatisfied() throws Exception { return proxy.getQueueSize() == MESSAGE_COUNT; } })); @@ -534,7 +534,7 @@ public class JmsClientAckTest extends AmqpTestSupport { assertTrue("Queued message not consumed.", Wait.waitFor(new Wait.Condition() { @Override - public boolean isSatisified() throws Exception { + public boolean isSatisfied() throws Exception { return proxy.getQueueSize() == 0; } })); @@ -559,7 +559,7 @@ public class JmsClientAckTest extends AmqpTestSupport { assertTrue("Queue didn't receive all messages", Wait.waitFor(new Wait.Condition() { @Override - public boolean isSatisified() throws Exception { + public boolean isSatisfied() throws Exception { return proxy.getQueueSize() == MESSAGE_COUNT; } })); @@ -587,7 +587,7 @@ public class JmsClientAckTest extends AmqpTestSupport { boolean consumed = Wait.waitFor(new Wait.Condition() { @Override - public boolean isSatisified() throws Exception { + public boolean isSatisfied() throws Exception { return proxy.getQueueSize() == MESSAGE_COUNT - messagesConsumed.get(); } }, 10000, 20); @@ -608,7 +608,7 @@ public class JmsClientAckTest extends AmqpTestSupport { assertTrue("Not all messages could be consumed, got " + messagesConsumed.get(), Wait.waitFor(new Wait.Condition() { @Override - public boolean isSatisified() throws Exception { + public boolean isSatisfied() throws Exception { LOG.info("Are we complete: error:{} nessages read:{}", failure.get(), messagesConsumed.get()); return failure.get() != null || messagesConsumed.get() == MESSAGE_COUNT; } @@ -619,7 +619,7 @@ public class JmsClientAckTest extends AmqpTestSupport { assertTrue("Queued message not consumed.", Wait.waitFor(new Wait.Condition() { @Override - public boolean isSatisified() throws Exception { + public boolean isSatisfied() throws Exception { return proxy.getQueueSize() == 0; } })); http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/8aa05509/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/consumer/JmsDurableSubscriberTest.java ---------------------------------------------------------------------- diff --git a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/consumer/JmsDurableSubscriberTest.java b/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/consumer/JmsDurableSubscriberTest.java index 9c73973..30f9b79 100644 --- a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/consumer/JmsDurableSubscriberTest.java +++ b/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/consumer/JmsDurableSubscriberTest.java @@ -316,14 +316,14 @@ public class JmsDurableSubscriberTest extends AmqpTestSupport { assertTrue("Should have no durables.", Wait.waitFor(new Wait.Condition() { @Override - public boolean isSatisified() throws Exception { + public boolean isSatisfied() throws Exception { return brokerService.getAdminView().getDurableTopicSubscribers().length == 0; } })); assertTrue("Should have an inactive sub.", Wait.waitFor(new Wait.Condition() { @Override - public boolean isSatisified() throws Exception { + public boolean isSatisfied() throws Exception { return brokerService.getAdminView().getInactiveDurableTopicSubscribers().length == 1; } })); http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/8aa05509/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/consumer/JmsMessageConsumerTest.java ---------------------------------------------------------------------- diff --git a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/consumer/JmsMessageConsumerTest.java b/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/consumer/JmsMessageConsumerTest.java index 38e60dc..9fdaeb0 100644 --- a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/consumer/JmsMessageConsumerTest.java +++ b/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/consumer/JmsMessageConsumerTest.java @@ -92,7 +92,7 @@ public class JmsMessageConsumerTest extends AmqpTestSupport { assertTrue("Queued message not consumed.", Wait.waitFor(new Wait.Condition() { @Override - public boolean isSatisified() throws Exception { + public boolean isSatisfied() throws Exception { return proxy.getQueueSize() == 0; } })); @@ -118,7 +118,7 @@ public class JmsMessageConsumerTest extends AmqpTestSupport { assertTrue("Published message not consumed.", Wait.waitFor(new Wait.Condition() { @Override - public boolean isSatisified() throws Exception { + public boolean isSatisfied() throws Exception { return proxy.getQueueSize() == 0; } })); @@ -152,7 +152,7 @@ public class JmsMessageConsumerTest extends AmqpTestSupport { assertTrue("Listener not notified of correct number of messages.", Wait.waitFor(new Wait.Condition() { @Override - public boolean isSatisified() throws Exception { + public boolean isSatisfied() throws Exception { return available.get() == MSG_COUNT; } })); @@ -165,7 +165,7 @@ public class JmsMessageConsumerTest extends AmqpTestSupport { assertTrue("Queued message not consumed.", Wait.waitFor(new Wait.Condition() { @Override - public boolean isSatisified() throws Exception { + public boolean isSatisfied() throws Exception { return proxy.getQueueSize() == 0; } })); @@ -390,7 +390,7 @@ public class JmsMessageConsumerTest extends AmqpTestSupport { assertTrue("Queue did not get all expected messages", Wait.waitFor(new Wait.Condition() { @Override - public boolean isSatisified() throws Exception { + public boolean isSatisfied() throws Exception { return proxy.getQueueSize() == 2; } })); http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/8aa05509/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/consumer/JmsZeroPrefetchTest.java ---------------------------------------------------------------------- diff --git a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/consumer/JmsZeroPrefetchTest.java b/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/consumer/JmsZeroPrefetchTest.java index 9e780fb..7c75446 100644 --- a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/consumer/JmsZeroPrefetchTest.java +++ b/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/consumer/JmsZeroPrefetchTest.java @@ -79,7 +79,7 @@ public class JmsZeroPrefetchTest extends AmqpTestSupport { assertTrue(Wait.waitFor(new Wait.Condition() { @Override - public boolean isSatisified() throws Exception { + public boolean isSatisfied() throws Exception { return queueView.getQueueSize() == 0; } })); @@ -106,7 +106,7 @@ public class JmsZeroPrefetchTest extends AmqpTestSupport { assertTrue(Wait.waitFor(new Wait.Condition() { @Override - public boolean isSatisified() throws Exception { + public boolean isSatisfied() throws Exception { return queueView.getQueueSize() == 1; } })); @@ -138,7 +138,7 @@ public class JmsZeroPrefetchTest extends AmqpTestSupport { assertTrue(Wait.waitFor(new Wait.Condition() { @Override - public boolean isSatisified() throws Exception { + public boolean isSatisfied() throws Exception { return queueView.getQueueSize() == 1; } })); @@ -195,7 +195,7 @@ public class JmsZeroPrefetchTest extends AmqpTestSupport { assertTrue(Wait.waitFor(new Wait.Condition() { @Override - public boolean isSatisified() throws Exception { + public boolean isSatisfied() throws Exception { return queueView.getQueueSize() == 1; } })); http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/8aa05509/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/discovery/JmsAmqpDiscoveryTest.java ---------------------------------------------------------------------- diff --git a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/discovery/JmsAmqpDiscoveryTest.java b/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/discovery/JmsAmqpDiscoveryTest.java index 78cfa27..9c02eba 100644 --- a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/discovery/JmsAmqpDiscoveryTest.java +++ b/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/discovery/JmsAmqpDiscoveryTest.java @@ -101,7 +101,7 @@ public class JmsAmqpDiscoveryTest extends AmqpTestSupport implements JmsConnecti assertTrue("connection never connected.", Wait.waitFor(new Wait.Condition() { @Override - public boolean isSatisified() throws Exception { + public boolean isSatisfied() throws Exception { return jmsConnection.isConnected(); } })); @@ -115,7 +115,7 @@ public class JmsAmqpDiscoveryTest extends AmqpTestSupport implements JmsConnecti assertTrue("connection never connected.", Wait.waitFor(new Wait.Condition() { @Override - public boolean isSatisified() throws Exception { + public boolean isSatisfied() throws Exception { return jmsConnection.isConnected(); } })); @@ -134,7 +134,7 @@ public class JmsAmqpDiscoveryTest extends AmqpTestSupport implements JmsConnecti assertTrue("connection never connected.", Wait.waitFor(new Wait.Condition() { @Override - public boolean isSatisified() throws Exception { + public boolean isSatisfied() throws Exception { return jmsConnection.isConnected(); } })); @@ -153,7 +153,7 @@ public class JmsAmqpDiscoveryTest extends AmqpTestSupport implements JmsConnecti assertTrue("connection never connected.", Wait.waitFor(new Wait.Condition() { @Override - public boolean isSatisified() throws Exception { + public boolean isSatisfied() throws Exception { return jmsConnection.isConnected(); } })); http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/8aa05509/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/failover/JmsFailoverTest.java ---------------------------------------------------------------------- diff --git a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/failover/JmsFailoverTest.java b/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/failover/JmsFailoverTest.java index dd33bdc..5a36a4f 100644 --- a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/failover/JmsFailoverTest.java +++ b/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/failover/JmsFailoverTest.java @@ -166,7 +166,7 @@ public class JmsFailoverTest extends AmqpTestSupport { assertTrue("Should have a new connection.", Wait.waitFor(new Wait.Condition() { @Override - public boolean isSatisified() throws Exception { + public boolean isSatisfied() throws Exception { return brokerService.getAdminView().getCurrentConnectionsCount() == 1; } }, TimeUnit.SECONDS.toMillis(30), TimeUnit.MILLISECONDS.toMillis(100))); @@ -174,7 +174,7 @@ public class JmsFailoverTest extends AmqpTestSupport { assertTrue("Should one new Queue Subscription.", Wait.waitFor(new Wait.Condition() { @Override - public boolean isSatisified() throws Exception { + public boolean isSatisfied() throws Exception { return brokerService.getAdminView().getQueueSubscribers().length == 1; } }, TimeUnit.SECONDS.toMillis(30), TimeUnit.MILLISECONDS.toMillis(50))); @@ -182,7 +182,7 @@ public class JmsFailoverTest extends AmqpTestSupport { assertTrue("Should one new Queue Producer.", Wait.waitFor(new Wait.Condition() { @Override - public boolean isSatisified() throws Exception { + public boolean isSatisfied() throws Exception { return brokerService.getAdminView().getQueueProducers().length == 1; } }, TimeUnit.SECONDS.toMillis(30), TimeUnit.MILLISECONDS.toMillis(50))); @@ -208,7 +208,7 @@ public class JmsFailoverTest extends AmqpTestSupport { assertTrue("Should have a new connection.", Wait.waitFor(new Wait.Condition() { @Override - public boolean isSatisified() throws Exception { + public boolean isSatisfied() throws Exception { return brokerService.getAdminView().getCurrentConnectionsCount() == 1; } }, TimeUnit.SECONDS.toMillis(30), TimeUnit.MILLISECONDS.toMillis(100))); @@ -216,7 +216,7 @@ public class JmsFailoverTest extends AmqpTestSupport { assertTrue("Should have no inactive subscribers.", Wait.waitFor(new Wait.Condition() { @Override - public boolean isSatisified() throws Exception { + public boolean isSatisfied() throws Exception { return brokerService.getAdminView().getInactiveDurableTopicSubscribers().length == 0; } }, TimeUnit.SECONDS.toMillis(30), TimeUnit.MILLISECONDS.toMillis(100))); @@ -224,7 +224,7 @@ public class JmsFailoverTest extends AmqpTestSupport { assertTrue("Should have one durable sub.", Wait.waitFor(new Wait.Condition() { @Override - public boolean isSatisified() throws Exception { + public boolean isSatisfied() throws Exception { return brokerService.getAdminView().getDurableTopicSubscribers().length == 1; } }, TimeUnit.SECONDS.toMillis(30), TimeUnit.MILLISECONDS.toMillis(100))); @@ -255,7 +255,7 @@ public class JmsFailoverTest extends AmqpTestSupport { assertTrue("Should have all messages sent.", Wait.waitFor(new Wait.Condition() { @Override - public boolean isSatisified() throws Exception { + public boolean isSatisfied() throws Exception { return proxy.getQueueSize() == MSG_COUNT; } }, TimeUnit.SECONDS.toMillis(30), TimeUnit.MILLISECONDS.toMillis(100))); @@ -309,7 +309,7 @@ public class JmsFailoverTest extends AmqpTestSupport { assertTrue("Should have a new connection.", Wait.waitFor(new Wait.Condition() { @Override - public boolean isSatisified() throws Exception { + public boolean isSatisfied() throws Exception { return brokerService.getAdminView().getCurrentConnectionsCount() == 1; } }, TimeUnit.SECONDS.toMillis(30), TimeUnit.MILLISECONDS.toMillis(100))); @@ -317,7 +317,7 @@ public class JmsFailoverTest extends AmqpTestSupport { assertTrue("Should have a recovered producer.", Wait.waitFor(new Wait.Condition() { @Override - public boolean isSatisified() throws Exception { + public boolean isSatisfied() throws Exception { return brokerService.getAdminView().getQueueProducers().length == 1; } }, TimeUnit.SECONDS.toMillis(30), TimeUnit.MILLISECONDS.toMillis(50))); @@ -327,7 +327,7 @@ public class JmsFailoverTest extends AmqpTestSupport { assertTrue("Should have all messages sent.", Wait.waitFor(new Wait.Condition() { @Override - public boolean isSatisified() throws Exception { + public boolean isSatisfied() throws Exception { return proxy.getQueueSize() == MSG_COUNT; } }, TimeUnit.SECONDS.toMillis(30), TimeUnit.MILLISECONDS.toMillis(50))); @@ -377,7 +377,7 @@ public class JmsFailoverTest extends AmqpTestSupport { assertTrue("Should have a new connection.", Wait.waitFor(new Wait.Condition() { @Override - public boolean isSatisified() throws Exception { + public boolean isSatisfied() throws Exception { return brokerService.getAdminView().getCurrentConnectionsCount() == 1; } }, TimeUnit.SECONDS.toMillis(30), TimeUnit.MILLISECONDS.toMillis(100))); @@ -385,7 +385,7 @@ public class JmsFailoverTest extends AmqpTestSupport { assertTrue("Should one new Queue Subscription.", Wait.waitFor(new Wait.Condition() { @Override - public boolean isSatisified() throws Exception { + public boolean isSatisfied() throws Exception { return brokerService.getAdminView().getQueueSubscribers().length == 1; } }, TimeUnit.SECONDS.toMillis(30), TimeUnit.MILLISECONDS.toMillis(50))); @@ -437,7 +437,7 @@ public class JmsFailoverTest extends AmqpTestSupport { assertTrue("Should have a new connection.", Wait.waitFor(new Wait.Condition() { @Override - public boolean isSatisified() throws Exception { + public boolean isSatisfied() throws Exception { return brokerService.getAdminView().getCurrentConnectionsCount() == 1; } }, TimeUnit.SECONDS.toMillis(30), TimeUnit.MILLISECONDS.toMillis(100))); @@ -445,7 +445,7 @@ public class JmsFailoverTest extends AmqpTestSupport { assertTrue("Should one new Queue Subscription.", Wait.waitFor(new Wait.Condition() { @Override - public boolean isSatisified() throws Exception { + public boolean isSatisfied() throws Exception { return brokerService.getAdminView().getQueueSubscribers().length == 1; } }, TimeUnit.SECONDS.toMillis(30), TimeUnit.MILLISECONDS.toMillis(50))); http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/8aa05509/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/failover/JmsOfflineBehaviorTests.java ---------------------------------------------------------------------- diff --git a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/failover/JmsOfflineBehaviorTests.java b/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/failover/JmsOfflineBehaviorTests.java index 466561b..4421941 100644 --- a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/failover/JmsOfflineBehaviorTests.java +++ b/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/failover/JmsOfflineBehaviorTests.java @@ -147,7 +147,7 @@ public class JmsOfflineBehaviorTests extends AmqpTestSupport { assertTrue("Should connect to secondary URI.", Wait.waitFor(new Wait.Condition() { @Override - public boolean isSatisified() throws Exception { + public boolean isSatisfied() throws Exception { URI current = connection.getConnectedURI(); if (current != null && current.equals(brokers.get(1))) { return true; @@ -181,7 +181,7 @@ public class JmsOfflineBehaviorTests extends AmqpTestSupport { assertTrue("Should have a new connection.", Wait.waitFor(new Wait.Condition() { @Override - public boolean isSatisified() throws Exception { + public boolean isSatisfied() throws Exception { return brokerService.getAdminView().getCurrentConnectionsCount() == 1; } }, TimeUnit.SECONDS.toMillis(30), TimeUnit.MILLISECONDS.toMillis(100))); http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/8aa05509/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/failover/JmsTxConsumerFailoverTest.java ---------------------------------------------------------------------- diff --git a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/failover/JmsTxConsumerFailoverTest.java b/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/failover/JmsTxConsumerFailoverTest.java index cac7b2a..8284cdb 100644 --- a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/failover/JmsTxConsumerFailoverTest.java +++ b/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/failover/JmsTxConsumerFailoverTest.java @@ -72,7 +72,7 @@ public class JmsTxConsumerFailoverTest extends AmqpTestSupport { assertTrue("Should have a new connection.", Wait.waitFor(new Wait.Condition() { @Override - public boolean isSatisified() throws Exception { + public boolean isSatisfied() throws Exception { return brokerService.getAdminView().getCurrentConnectionsCount() == 1; } }, TimeUnit.SECONDS.toMillis(30), TimeUnit.MILLISECONDS.toMillis(100))); @@ -80,7 +80,7 @@ public class JmsTxConsumerFailoverTest extends AmqpTestSupport { assertTrue("Should have a recovered consumer.", Wait.waitFor(new Wait.Condition() { @Override - public boolean isSatisified() throws Exception { + public boolean isSatisfied() throws Exception { return brokerService.getAdminView().getQueueSubscribers().length == 1; } }, TimeUnit.SECONDS.toMillis(30), TimeUnit.MILLISECONDS.toMillis(50))); http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/8aa05509/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/failover/JmsTxProducerFailoverTest.java ---------------------------------------------------------------------- diff --git a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/failover/JmsTxProducerFailoverTest.java b/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/failover/JmsTxProducerFailoverTest.java index 29670a8..d5aaf80 100644 --- a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/failover/JmsTxProducerFailoverTest.java +++ b/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/failover/JmsTxProducerFailoverTest.java @@ -76,7 +76,7 @@ public class JmsTxProducerFailoverTest extends AmqpTestSupport { assertTrue("Should have a new connection.", Wait.waitFor(new Wait.Condition() { @Override - public boolean isSatisified() throws Exception { + public boolean isSatisfied() throws Exception { return brokerService.getAdminView().getCurrentConnectionsCount() == 1; } }, TimeUnit.SECONDS.toMillis(30), TimeUnit.MILLISECONDS.toMillis(100))); @@ -84,7 +84,7 @@ public class JmsTxProducerFailoverTest extends AmqpTestSupport { assertTrue("Should have a recovered producer.", Wait.waitFor(new Wait.Condition() { @Override - public boolean isSatisified() throws Exception { + public boolean isSatisfied() throws Exception { return brokerService.getAdminView().getQueueProducers().length == 1; } }, TimeUnit.SECONDS.toMillis(30), TimeUnit.MILLISECONDS.toMillis(50))); http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/8aa05509/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/producer/JmsMessageProducerTest.java ---------------------------------------------------------------------- diff --git a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/producer/JmsMessageProducerTest.java b/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/producer/JmsMessageProducerTest.java index 8785554..e596e42 100644 --- a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/producer/JmsMessageProducerTest.java +++ b/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/producer/JmsMessageProducerTest.java @@ -139,7 +139,7 @@ public class JmsMessageProducerTest extends AmqpTestSupport { assertTrue("Should all make it to the Queue.", Wait.waitFor(new Wait.Condition() { @Override - public boolean isSatisified() throws Exception { + public boolean isSatisfied() throws Exception { return proxy.getQueueSize() == MSG_COUNT; } })); http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/8aa05509/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/producer/JmsProducerFlowControlFailIfNoSpaceTest.java ---------------------------------------------------------------------- diff --git a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/producer/JmsProducerFlowControlFailIfNoSpaceTest.java b/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/producer/JmsProducerFlowControlFailIfNoSpaceTest.java index 4219f7b..1fb728a 100644 --- a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/producer/JmsProducerFlowControlFailIfNoSpaceTest.java +++ b/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/producer/JmsProducerFlowControlFailIfNoSpaceTest.java @@ -120,7 +120,7 @@ public class JmsProducerFlowControlFailIfNoSpaceTest extends AmqpTestSupport { assertTrue("Should have got an error from no space.", Wait.waitFor(new Wait.Condition() { @Override - public boolean isSatisified() throws Exception { + public boolean isSatisfied() throws Exception { return !exceptions.isEmpty(); } })); http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/8aa05509/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/session/JmsSessionTest.java ---------------------------------------------------------------------- diff --git a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/session/JmsSessionTest.java b/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/session/JmsSessionTest.java index a1058bd..8a3aff6 100644 --- a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/session/JmsSessionTest.java +++ b/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/session/JmsSessionTest.java @@ -109,7 +109,7 @@ public class JmsSessionTest extends AmqpTestSupport { assertTrue("Temp Queue should be deleted.", Wait.waitFor(new Wait.Condition() { @Override - public boolean isSatisified() throws Exception { + public boolean isSatisfied() throws Exception { return broker.getTemporaryQueues().length == 0; } }, TimeUnit.SECONDS.toMillis(30), TimeUnit.MILLISECONDS.toMillis(50))); @@ -144,7 +144,7 @@ public class JmsSessionTest extends AmqpTestSupport { assertTrue("Temp Topic should be deleted.", Wait.waitFor(new Wait.Condition() { @Override - public boolean isSatisified() throws Exception { + public boolean isSatisfied() throws Exception { return broker.getTemporaryTopics().length == 0; } }, TimeUnit.SECONDS.toMillis(30), TimeUnit.MILLISECONDS.toMillis(50))); http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/8aa05509/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/support/Wait.java ---------------------------------------------------------------------- diff --git a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/support/Wait.java b/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/support/Wait.java index 0e33c10..2d756e9 100644 --- a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/support/Wait.java +++ b/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/support/Wait.java @@ -24,7 +24,7 @@ public class Wait { public static final long SLEEP_MILLIS = 200; public interface Condition { - boolean isSatisified() throws Exception; + boolean isSatisfied() throws Exception; } public static boolean waitFor(Condition condition) throws Exception { @@ -36,13 +36,12 @@ public class Wait { } public static boolean waitFor(final Condition condition, final long duration, final long sleepMillis) throws Exception { - final long expiry = System.currentTimeMillis() + duration; - boolean conditionSatisified = condition.isSatisified(); - while (!conditionSatisified && System.currentTimeMillis() < expiry) { + boolean conditionSatisfied = condition.isSatisfied(); + while (!conditionSatisfied && System.currentTimeMillis() < expiry) { TimeUnit.MILLISECONDS.sleep(sleepMillis); - conditionSatisified = condition.isSatisified(); + conditionSatisfied = condition.isSatisfied(); } - return conditionSatisified; + return conditionSatisfied; } } http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/8aa05509/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/transactions/JmsTransactionRedeliveryPolicyTest.java ---------------------------------------------------------------------- diff --git a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/transactions/JmsTransactionRedeliveryPolicyTest.java b/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/transactions/JmsTransactionRedeliveryPolicyTest.java index 9b831d9..cf8c0f1 100644 --- a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/transactions/JmsTransactionRedeliveryPolicyTest.java +++ b/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/transactions/JmsTransactionRedeliveryPolicyTest.java @@ -95,7 +95,7 @@ public class JmsTransactionRedeliveryPolicyTest extends AmqpTestSupport { assertTrue("Message should get DLQ'd", Wait.waitFor(new Wait.Condition() { @Override - public boolean isSatisified() throws Exception { + public boolean isSatisfied() throws Exception { return queueView.getQueueSize() == 0; } })); @@ -151,7 +151,7 @@ public class JmsTransactionRedeliveryPolicyTest extends AmqpTestSupport { assertTrue("Message should get DLQ'd", Wait.waitFor(new Wait.Condition() { @Override - public boolean isSatisified() throws Exception { + public boolean isSatisfied() throws Exception { return queueView.getQueueSize() == 0; } })); --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
