diff options
| author | Rafael H. Schloming <rhs@apache.org> | 2009-02-25 23:21:13 +0000 |
|---|---|---|
| committer | Rafael H. Schloming <rhs@apache.org> | 2009-02-25 23:21:13 +0000 |
| commit | a7484073368b0334cd174074bc4576f031a5ebe1 (patch) | |
| tree | a3cff58418be3bc7ea071fba8e181f450821ad01 /qpid/java/systests | |
| parent | 3ea99fb143cc0fcb830a9f4482c280ecbc3d1057 (diff) | |
| download | qpid-python-a7484073368b0334cd174074bc4576f031a5ebe1.tar.gz | |
Made the various receive variants check that the server queue is empty before returning null. Also modified AMQQueueBrowser to use receiveNoWait() when browsing queues using 0-10. These changes uncovered numerous second order bugs, mostly in failover. These are also fixed. This fixes QPID-1642 and QPID-1643.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@747963 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/systests')
| -rw-r--r-- | qpid/java/systests/src/main/java/org/apache/qpid/client/MessageListenerTest.java | 8 | ||||
| -rw-r--r-- | qpid/java/systests/src/main/java/org/apache/qpid/test/client/failover/FailoverTest.java | 6 |
2 files changed, 8 insertions, 6 deletions
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/client/MessageListenerTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/client/MessageListenerTest.java index 4c1d5ee9c1..ffec6c7a29 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/client/MessageListenerTest.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/client/MessageListenerTest.java @@ -106,6 +106,14 @@ public class MessageListenerTest extends QpidTestCase implements MessageListener } } + public void testSynchronousRecieveNoWait() throws Exception + { + for (int msg = 0; msg < MSG_COUNT; msg++) + { + assertTrue(_consumer.receiveNoWait() != null); + } + } + public void testAsynchronousRecieve() throws Exception { _consumer.setMessageListener(this); diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/client/failover/FailoverTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/client/failover/FailoverTest.java index cd921f0971..4c4ef0320c 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/test/client/failover/FailoverTest.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/client/failover/FailoverTest.java @@ -230,12 +230,6 @@ public class FailoverTest extends FailoverBaseCase implements ConnectionListener causeFailure(DEFAULT_FAILOVER_TIME); - if (!CLUSTERED) - { - msg = consumer.receive(500); - assertNull("Should not have received message from new broker!", msg); - } - // Check that you produce and consume the rest of messages. _logger.debug("=================="); _logger.debug("Sending " + (totalMessages-toProduce) + " messages"); |