From 63d78acccc64cc99ed92dad5744ce1e5887f00d5 Mon Sep 17 00:00:00 2001 From: Robert Davies Date: Thu, 28 Dec 2006 21:00:36 +0000 Subject: [PATCH] tidy up the tests git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@490807 13f79535-47bb-0310-9956-ffa450edef68 --- .../broker/region/cursors/CursorSupport.java | 19 ++++++++++++++++--- .../region/cursors/KahaCursorDurableTest.java | 2 +- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/activemq-core/src/test/java/org/apache/activemq/broker/region/cursors/CursorSupport.java b/activemq-core/src/test/java/org/apache/activemq/broker/region/cursors/CursorSupport.java index 88a203e951..de20a38051 100644 --- a/activemq-core/src/test/java/org/apache/activemq/broker/region/cursors/CursorSupport.java +++ b/activemq-core/src/test/java/org/apache/activemq/broker/region/cursors/CursorSupport.java @@ -127,12 +127,25 @@ public abstract class CursorSupport extends TestCase{ producer.send(msg); } latch.await(300000,TimeUnit.MILLISECONDS); + producerConnection.close(); + consumerConnection.close(); assertEquals("Still dipatching - count down latch not sprung",latch.getCount(),0); assertEquals("cosumerList - expected: "+MESSAGE_COUNT+" but was: "+consumerList.size(),consumerList.size(), senderList.size()); - assertEquals(senderList,consumerList); - producerConnection.close(); - consumerConnection.close(); + for (int i =0; i < senderList.size(); i++) { + Message sent = (Message)senderList.get(i); + Message consumed = (Message)consumerList.get(i); + if (!sent.equals(consumed)) { + System.err.println("BAD MATCH AT POS " + i); + System.err.println(sent); + System.err.println(consumed); + System.err.println("\n\n\n\n\n"); + for (int j = 0; j < consumerList.size(); j++) { + System.err.println(consumerList.get(j)); + } + } + assertEquals("This should be the same at pos " + i + " in the list",sent.getJMSMessageID(),consumed.getJMSMessageID()); + } } protected Connection getConsumerConnection(ConnectionFactory fac) throws JMSException{ diff --git a/activemq-core/src/test/java/org/apache/activemq/broker/region/cursors/KahaCursorDurableTest.java b/activemq-core/src/test/java/org/apache/activemq/broker/region/cursors/KahaCursorDurableTest.java index 4c2fb8c4e4..745dd4eeda 100644 --- a/activemq-core/src/test/java/org/apache/activemq/broker/region/cursors/KahaCursorDurableTest.java +++ b/activemq-core/src/test/java/org/apache/activemq/broker/region/cursors/KahaCursorDurableTest.java @@ -35,6 +35,6 @@ public class KahaCursorDurableTest extends CursorDurableTest{ KahaPersistenceAdapter adaptor = new KahaPersistenceAdapter(new File("activemq-data/durableTest")); answer.setPersistenceAdapter(adaptor); answer.addConnector(bindAddress); - //answer.setDeleteAllMessagesOnStartup(true); + answer.setDeleteAllMessagesOnStartup(true); } }