diff options
Diffstat (limited to 'java')
4 files changed, 17 insertions, 17 deletions
diff --git a/java/broker-plugins/experimental/info/src/test/java/org/apache/qpid/info/systest/InfoPluginTest.java b/java/broker-plugins/experimental/info/src/test/java/org/apache/qpid/info/systest/InfoPluginTest.java index 156c9eb138..348e860d5f 100644 --- a/java/broker-plugins/experimental/info/src/test/java/org/apache/qpid/info/systest/InfoPluginTest.java +++ b/java/broker-plugins/experimental/info/src/test/java/org/apache/qpid/info/systest/InfoPluginTest.java @@ -210,12 +210,13 @@ public class InfoPluginTest extends QpidBrokerTestCase } br.close(); System.out.println("*** Received buffer: " + buf); - System.out.println("*** Latch countdown"); - _latch.countDown(); synchronized (_recv) { _recv.add(buf); } + + System.out.println("*** Latch countdown"); + _latch.countDown(); } catch (Exception ex) { diff --git a/java/systests/src/main/java/org/apache/qpid/client/AMQQueueDeferredOrderingTest.java b/java/systests/src/main/java/org/apache/qpid/client/AMQQueueDeferredOrderingTest.java index 986297bfe1..7ea4416f3b 100644 --- a/java/systests/src/main/java/org/apache/qpid/client/AMQQueueDeferredOrderingTest.java +++ b/java/systests/src/main/java/org/apache/qpid/client/AMQQueueDeferredOrderingTest.java @@ -35,13 +35,11 @@ import org.slf4j.LoggerFactory; public class AMQQueueDeferredOrderingTest extends QpidBrokerTestCase { - - private static final int NUM_MESSAGES = 1000; - private Connection con; private Session session; private AMQQueue queue; private MessageConsumer consumer; + private int numMessages; private static final Logger _logger = LoggerFactory.getLogger(AMQQueueDeferredOrderingTest.class); @@ -87,6 +85,8 @@ public class AMQQueueDeferredOrderingTest extends QpidBrokerTestCase { super.setUp(); + numMessages = isBrokerStorePersistent() ? 300 : 1000; + _logger.info("Create Connection"); con = getConnection(); _logger.info("Create Session"); @@ -105,19 +105,19 @@ public class AMQQueueDeferredOrderingTest extends QpidBrokerTestCase // Setup initial messages _logger.info("Creating first producer thread"); - producerThread = new ASyncProducer(queue, 0, NUM_MESSAGES / 2); + producerThread = new ASyncProducer(queue, 0, numMessages / 2); producerThread.start(); // Wait for them to be done producerThread.join(); // Setup second set of messages to produce while we consume _logger.info("Creating second producer thread"); - producerThread = new ASyncProducer(queue, NUM_MESSAGES / 2, NUM_MESSAGES); + producerThread = new ASyncProducer(queue, numMessages / 2, numMessages); producerThread.start(); // Start consuming and checking they're in order _logger.info("Consuming messages"); - for (int i = 0; i < NUM_MESSAGES; i++) + for (int i = 0; i < numMessages; i++) { Message msg = consumer.receive(3000); assertNotNull("Message should not be null", msg); diff --git a/java/systests/src/main/java/org/apache/qpid/client/ResetMessageListenerTest.java b/java/systests/src/main/java/org/apache/qpid/client/ResetMessageListenerTest.java index 303da29389..40a0d32b01 100644 --- a/java/systests/src/main/java/org/apache/qpid/client/ResetMessageListenerTest.java +++ b/java/systests/src/main/java/org/apache/qpid/client/ResetMessageListenerTest.java @@ -135,7 +135,7 @@ public class ResetMessageListenerTest extends QpidBrokerTestCase try { assertTrue("Did not receive all first batch of messages", - _allFirstMessagesSent.await(1000, TimeUnit.MILLISECONDS)); + _allFirstMessagesSent.await(MSG_COUNT, TimeUnit.SECONDS)); _logger.info("Received first batch of messages"); } catch (InterruptedException e) @@ -212,7 +212,7 @@ public class ResetMessageListenerTest extends QpidBrokerTestCase try { - assertTrue(_allSecondMessagesSent.await(1000, TimeUnit.MILLISECONDS)); + assertTrue(_allSecondMessagesSent.await(MSG_COUNT, TimeUnit.SECONDS)); } catch (InterruptedException e) { diff --git a/java/systests/src/main/java/org/apache/qpid/server/queue/QueueDepthWithSelectorTest.java b/java/systests/src/main/java/org/apache/qpid/server/queue/QueueDepthWithSelectorTest.java index 74f50e8659..aeeecb2dff 100644 --- a/java/systests/src/main/java/org/apache/qpid/server/queue/QueueDepthWithSelectorTest.java +++ b/java/systests/src/main/java/org/apache/qpid/server/queue/QueueDepthWithSelectorTest.java @@ -110,18 +110,13 @@ public class QueueDepthWithSelectorTest extends QpidBrokerTestCase try { Connection connection = getConnection(); - Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE); + AMQSession session = (AMQSession)connection.createSession(false, Session.AUTO_ACKNOWLEDGE); - Thread.sleep(2000); - long queueDepth = ((AMQSession) session).getQueueDepth((AMQDestination) _queue); + long queueDepth = session.getQueueDepth((AMQDestination) _queue); assertEquals("Session reports Queue depth not as expected", expectedDepth, queueDepth); connection.close(); } - catch (InterruptedException e) - { - fail(e.getMessage()); - } catch (AMQException e) { fail(e.getMessage()); @@ -158,6 +153,10 @@ public class QueueDepthWithSelectorTest extends QpidBrokerTestCase { assertTrue("Message " + msgId + " not received.", msgIdRecevied[msgId]); } + + //do a synchronous op to ensure the acks are processed + //on the broker before proceeding + ((AMQSession)_clientSession).sync(); } /** |