diff options
| -rw-r--r-- | qpid/java/systests/src/main/java/org/apache/qpid/server/queue/TimeToLiveTest.java | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/TimeToLiveTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/TimeToLiveTest.java index 8d0d9b50d6..02db795534 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/TimeToLiveTest.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/TimeToLiveTest.java @@ -95,19 +95,20 @@ public class TimeToLiveTest extends QpidTestCase clientConnection.start(); //Receive Message 0 - Message received = consumer.receive(1000); - Assert.assertNotNull("First message not received", received); - Assert.assertTrue("First message doesn't have first set.", received.getBooleanProperty("first")); - Assert.assertEquals("First message has incorrect TTL.", 0L, received.getLongProperty("TTL")); - + Message receivedFirst = consumer.receive(1000); + Message receivedSecond = consumer.receive(1000); + Message receivedThird = consumer.receive(1000); + + // Only first and last messages sent should survive expiry + Assert.assertNull("More messages received", receivedThird); - received = consumer.receive(1000); - Assert.assertNotNull("Final message not received", received); - Assert.assertFalse("Final message has first set.", received.getBooleanProperty("first")); - Assert.assertEquals("Final message has incorrect TTL.", 0L, received.getLongProperty("TTL")); + Assert.assertNotNull("First message not received", receivedFirst); + Assert.assertTrue("First message doesn't have first set.", receivedFirst.getBooleanProperty("first")); + Assert.assertEquals("First message has incorrect TTL.", 0L, receivedFirst.getLongProperty("TTL")); - received = consumer.receive(1000); - Assert.assertNull("More messages received", received); + Assert.assertNotNull("Final message not received", receivedSecond); + Assert.assertFalse("Final message has first set.", receivedSecond.getBooleanProperty("first")); + Assert.assertEquals("Final message has incorrect TTL.", 0L, receivedSecond.getLongProperty("TTL")); clientConnection.close(); |