From c3df6ede2abf64b1ef2ec157621c65735599eea7 Mon Sep 17 00:00:00 2001 From: Martin Ritchie Date: Tue, 1 May 2007 07:17:43 +0000 Subject: Merged revisions 532766-532785,532788-532790,532792-533064,533066-533074,533076,533080-533130,533132-533139,533142-533703,533705-533765 via svnmerge from https://svn.apache.org/repos/asf/incubator/qpid/branches/M2 ........ r532766 | rgreig | 2007-04-26 15:57:04 +0100 (Thu, 26 Apr 2007) | 1 line Rationlized the performance tests. ........ r532794 | rgreig | 2007-04-26 17:33:10 +0100 (Thu, 26 Apr 2007) | 1 line Rationalized the performance tests. ........ r533721 | rgodfrey | 2007-04-30 13:24:41 +0100 (Mon, 30 Apr 2007) | 1 line QPID-476 : Remove duplicate map of channelId to session ........ r533764 | ritchiem | 2007-04-30 15:37:23 +0100 (Mon, 30 Apr 2007) | 4 lines QPID-466 Create STRICT_AMQP System property to disable JMS extensions in Java client. Updated to allow the use of durable subscriptions but it will not be as clean as with the extensions. Selectors are also now disabled. ........ r533765 | ritchiem | 2007-04-30 15:39:18 +0100 (Mon, 30 Apr 2007) | 1 line QPID-461 Update to CommitRollbackTest. Ensuring messages received have the correct redelivered value, regardless of order. ........ git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@533957 13f79535-47bb-0310-9956-ffa450edef68 --- .../client/protocol/AMQProtocolSessionTest.java | 3 --- .../test/unit/transacted/CommitRollbackTest.java | 28 +++++++++++----------- 2 files changed, 14 insertions(+), 17 deletions(-) (limited to 'java/client/src/test') diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/client/protocol/AMQProtocolSessionTest.java b/java/client/src/test/java/org/apache/qpid/test/unit/client/protocol/AMQProtocolSessionTest.java index 4374329fb0..3776ff767f 100644 --- a/java/client/src/test/java/org/apache/qpid/test/unit/client/protocol/AMQProtocolSessionTest.java +++ b/java/client/src/test/java/org/apache/qpid/test/unit/client/protocol/AMQProtocolSessionTest.java @@ -32,9 +32,6 @@ public class AMQProtocolSessionTest extends TestCase { private static class AMQProtSession extends AMQProtocolSession { - public AMQProtSession() - { - } public AMQProtSession(AMQProtocolHandler protocolHandler, IoSession protocolSession, AMQConnection connection) { diff --git a/java/client/src/test/java/org/apache/qpid/test/unit/transacted/CommitRollbackTest.java b/java/client/src/test/java/org/apache/qpid/test/unit/transacted/CommitRollbackTest.java index 685fe20048..8aaa760537 100644 --- a/java/client/src/test/java/org/apache/qpid/test/unit/transacted/CommitRollbackTest.java +++ b/java/client/src/test/java/org/apache/qpid/test/unit/transacted/CommitRollbackTest.java @@ -390,7 +390,6 @@ public class CommitRollbackTest extends TestCase assertEquals("1", ((TextMessage) result).getText()); assertTrue("Messasge is marked as redelivered" + result, !result.getJMSRedelivered()); - _logger.info("Closing Consumer"); _consumer.close(); @@ -398,31 +397,32 @@ public class CommitRollbackTest extends TestCase _consumer = _session.createConsumer(_jmsQueue); _logger.info("receiving result"); + + // NOTE: Both msg 1 & 2 will be marked as redelivered as they have both will have been rejected. + // Only the occasion where it is not rejected will it mean it hasn't arrived at the client yet. result = _consumer.receive(1000); assertNotNull("test message was consumed and rolled back, but is gone", result); + + // The first message back will be either 1 or 2 being redelivered if (result.getJMSRedelivered()) { - assertEquals("1", ((TextMessage) result).getText()); - - result = _consumer.receive(1000); - assertNotNull("test message was consumed and rolled back, but is gone", result); - assertEquals("2", ((TextMessage) result).getText()); assertTrue("Messasge is not marked as redelivered" + result, result.getJMSRedelivered()); } - else + else // or it will be msg 2 arriving the first time due to latency. { - assertEquals("2", ((TextMessage) result).getText()); - assertTrue("Messasge is marked as redelivered" + result, !result.getJMSRedelivered()); + _logger.info("Message 2 wasn't prefetched so wasn't rejected"); + assertEquals("2", ((TextMessage) result).getText()); + } - result = _consumer.receive(1000); - assertNotNull("test message was consumed and rolled back, but is gone", result); - assertEquals("1", ((TextMessage) result).getText()); - assertTrue("Messasge is not marked as redelivered" + result, result.getJMSRedelivered()); + result = _consumer.receive(1000); + assertNotNull("test message was consumed and rolled back, but is gone", result); + assertTrue("Messasge is not marked as redelivered" + result, result.getJMSRedelivered()); - } result = _consumer.receive(1000); assertNull("test message should be null:" + result, result); + _session.commit(); + } -- cgit v1.2.1