diff options
Diffstat (limited to 'java/systests/src')
5 files changed, 40 insertions, 15 deletions
diff --git a/java/systests/src/main/java/org/apache/qpid/server/exchange/AbstractHeadersExchangeTestBase.java b/java/systests/src/main/java/org/apache/qpid/server/exchange/AbstractHeadersExchangeTestBase.java index 6beeb92053..ccd23bc0bc 100644 --- a/java/systests/src/main/java/org/apache/qpid/server/exchange/AbstractHeadersExchangeTestBase.java +++ b/java/systests/src/main/java/org/apache/qpid/server/exchange/AbstractHeadersExchangeTestBase.java @@ -272,9 +272,10 @@ public class AbstractHeadersExchangeTestBase extends TestCase * not invoked. It is unnecessary since for this test we only care to know whether the message was * sent to the queue; the queue processing logic is not being tested. * @param msg + * @param deliverFirst * @throws AMQException */ - public void process(StoreContext context, AMQMessage msg) throws AMQException + public void process(StoreContext context, AMQMessage msg, boolean deliverFirst) throws AMQException { messages.add(new HeadersExchangeTest.Message(msg)); } diff --git a/java/systests/src/main/java/org/apache/qpid/server/queue/AMQQueueMBeanTest.java b/java/systests/src/main/java/org/apache/qpid/server/queue/AMQQueueMBeanTest.java index 2d0315d7f5..26332579cb 100644 --- a/java/systests/src/main/java/org/apache/qpid/server/queue/AMQQueueMBeanTest.java +++ b/java/systests/src/main/java/org/apache/qpid/server/queue/AMQQueueMBeanTest.java @@ -19,7 +19,6 @@ package org.apache.qpid.server.queue; import junit.framework.TestCase; import org.apache.qpid.AMQException; -import org.apache.qpid.framing.BasicPublishBody; import org.apache.qpid.framing.ContentHeaderBody; import org.apache.qpid.framing.AMQShortString; import org.apache.qpid.framing.abstraction.MessagePublishInfo; @@ -151,7 +150,7 @@ public class AMQQueueMBeanTest extends TestCase AMQMessage msg = message(false); long id = msg.getMessageId(); _queue.clearQueue(_storeContext); - _queue.process(_storeContext, msg); + _queue.process(_storeContext, msg, false); msg.routingComplete(_messageStore, _storeContext, new MessageHandleFactory()); _queueMBean.viewMessageContent(id); try @@ -216,7 +215,7 @@ public class AMQQueueMBeanTest extends TestCase } for (int i = 0; i < messageCount; i++) { - _queue.process(_storeContext, messages[i]); + _queue.process(_storeContext, messages[i], false); } for (int i = 0; i < messages.length; i++) diff --git a/java/systests/src/main/java/org/apache/qpid/server/queue/ConcurrencyTest.java b/java/systests/src/main/java/org/apache/qpid/server/queue/ConcurrencyTest.java index 6f3d42d090..4971db2d28 100644 --- a/java/systests/src/main/java/org/apache/qpid/server/queue/ConcurrencyTest.java +++ b/java/systests/src/main/java/org/apache/qpid/server/queue/ConcurrencyTest.java @@ -194,7 +194,7 @@ public class ConcurrencyTest extends MessageTestHelper AMQMessage msg = nextMessage(); if (msg != null) { - _deliveryMgr.deliver(null, new AMQShortString(toString()), msg); + _deliveryMgr.deliver(null, new AMQShortString(toString()), msg, false); } } } diff --git a/java/systests/src/main/java/org/apache/qpid/server/queue/DeliveryManagerTest.java b/java/systests/src/main/java/org/apache/qpid/server/queue/DeliveryManagerTest.java index e1be640c8e..dc5a6d3cf6 100644 --- a/java/systests/src/main/java/org/apache/qpid/server/queue/DeliveryManagerTest.java +++ b/java/systests/src/main/java/org/apache/qpid/server/queue/DeliveryManagerTest.java @@ -49,7 +49,7 @@ abstract public class DeliveryManagerTest extends MessageTestHelper for (int i = 0; i < batch; i++) { - _mgr.deliver(_storeContext, DEFAULT_QUEUE_NAME, messages[i]); + _mgr.deliver(_storeContext, DEFAULT_QUEUE_NAME, messages[i], false); } SubscriptionTestHelper s1 = new SubscriptionTestHelper("1"); @@ -59,7 +59,7 @@ abstract public class DeliveryManagerTest extends MessageTestHelper for (int i = batch; i < messages.length; i++) { - _mgr.deliver(_storeContext, DEFAULT_QUEUE_NAME, messages[i]); + _mgr.deliver(_storeContext, DEFAULT_QUEUE_NAME, messages[i], false); } assertTrue(s1.getMessages().isEmpty()); @@ -97,7 +97,7 @@ abstract public class DeliveryManagerTest extends MessageTestHelper for (int i = 0; i < batch; i++) { - _mgr.deliver(_storeContext, DEFAULT_QUEUE_NAME, messages[i]); + _mgr.deliver(_storeContext, DEFAULT_QUEUE_NAME, messages[i], false); } assertEquals(batch, s1.getMessages().size()); @@ -111,7 +111,7 @@ abstract public class DeliveryManagerTest extends MessageTestHelper s1.setSuspended(true); for (int i = batch; i < messages.length; i++) { - _mgr.deliver(_storeContext, DEFAULT_QUEUE_NAME, messages[i]); + _mgr.deliver(_storeContext, DEFAULT_QUEUE_NAME, messages[i], false); } _mgr.processAsync(new OnCurrentThreadExecutor()); @@ -133,7 +133,7 @@ abstract public class DeliveryManagerTest extends MessageTestHelper try { AMQMessage msg = message(true); - _mgr.deliver(_storeContext, DEFAULT_QUEUE_NAME, msg); + _mgr.deliver(_storeContext, DEFAULT_QUEUE_NAME, msg, false); msg.checkDeliveredToConsumer(); fail("expected exception did not occur"); } @@ -155,7 +155,7 @@ abstract public class DeliveryManagerTest extends MessageTestHelper _subscriptions.addSubscriber(s); s.setSuspended(true); AMQMessage msg = message(true); - _mgr.deliver(_storeContext, DEFAULT_QUEUE_NAME, msg); + _mgr.deliver(_storeContext, DEFAULT_QUEUE_NAME, msg, false); msg.checkDeliveredToConsumer(); fail("expected exception did not occur"); } diff --git a/java/systests/src/main/java/org/apache/qpid/server/queue/SubscriptionTestHelper.java b/java/systests/src/main/java/org/apache/qpid/server/queue/SubscriptionTestHelper.java index b3574ecba4..01eb2ba6a2 100644 --- a/java/systests/src/main/java/org/apache/qpid/server/queue/SubscriptionTestHelper.java +++ b/java/systests/src/main/java/org/apache/qpid/server/queue/SubscriptionTestHelper.java @@ -67,12 +67,22 @@ public class SubscriptionTestHelper implements Subscription return isSuspended; } - public boolean wouldSuspend(AMQMessage msg) + public boolean wouldSuspend(AMQMessage msg) { return isSuspended; } - + public void addToResendQueue(AMQMessage msg) + { + //no-op + } + + public Object getSendLock() + { + return new Object(); + } + + public void queueDeleted(AMQQueue queue) { } @@ -92,7 +102,17 @@ public class SubscriptionTestHelper implements Subscription return null; } - public void enqueueForPreDelivery(AMQMessage msg) + public Queue<AMQMessage> getResendQueue() + { + return null; + } + + public Queue<AMQMessage> getNextQueue(Queue<AMQMessage> messages) + { + return messages; + } + + public void enqueueForPreDelivery(AMQMessage msg, boolean deliverFirst) { //no-op } @@ -107,9 +127,14 @@ public class SubscriptionTestHelper implements Subscription //no-op } + public boolean isClosed() + { + return false; + } + public boolean isBrowser() { - return false; //To change body of implemented methods use File | Settings | File Templates. + return false; } public int hashCode() |