diff options
Diffstat (limited to 'java/broker/src/test')
4 files changed, 98 insertions, 12 deletions
diff --git a/java/broker/src/test/java/org/apache/qpid/server/exchange/AbstractHeadersExchangeTestBase.java b/java/broker/src/test/java/org/apache/qpid/server/exchange/AbstractHeadersExchangeTestBase.java index 6dcb187a37..12fa4ef952 100644 --- a/java/broker/src/test/java/org/apache/qpid/server/exchange/AbstractHeadersExchangeTestBase.java +++ b/java/broker/src/test/java/org/apache/qpid/server/exchange/AbstractHeadersExchangeTestBase.java @@ -405,6 +405,21 @@ public class AbstractHeadersExchangeTestBase extends TestCase { return 0; //To change body of implemented methods use File | Settings | File Templates. } + + public ContentHeaderBody getContentHeaderBody() throws AMQException + { + return null; //To change body of implemented methods use File | Settings | File Templates. + } + + public boolean isPersistent() throws AMQException + { + return false; //To change body of implemented methods use File | Settings | File Templates. + } + + public boolean isRedelivered() + { + return false; //To change body of implemented methods use File | Settings | File Templates. + } }; } diff --git a/java/broker/src/test/java/org/apache/qpid/server/filter/PropertyExpressionTest.java b/java/broker/src/test/java/org/apache/qpid/server/filter/PropertyExpressionTest.java new file mode 100644 index 0000000000..9344efd4a8 --- /dev/null +++ b/java/broker/src/test/java/org/apache/qpid/server/filter/PropertyExpressionTest.java @@ -0,0 +1,56 @@ +/* + * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * + */ +package org.apache.qpid.server.filter; + +import junit.framework.TestCase; +import org.apache.qpid.AMQException; +import org.apache.qpid.server.queue.MockQueueEntry; + +public class PropertyExpressionTest extends TestCase +{ + + public void testJMSRedelivered() + { + PropertyExpression<AMQException> pe = new PropertyExpression<AMQException>("JMSRedelivered"); + + MockQueueEntry queueEntry = new MockQueueEntry(); + + try + { + assertEquals("MockQueueEntry.redelivered should initialy be false", Boolean.FALSE, pe.evaluate(queueEntry)); + } + catch (AMQException e) + { + fail(e.getMessage()); + } + + queueEntry.setRedelivered(true); + + try + { + assertEquals("MockQueueEntry.redelivered not updated", Boolean.TRUE, pe.evaluate(queueEntry)); + } + catch (AMQException e) + { + fail(e.getMessage()); + } + } +} diff --git a/java/broker/src/test/java/org/apache/qpid/server/protocol/InternalTestProtocolSession.java b/java/broker/src/test/java/org/apache/qpid/server/protocol/InternalTestProtocolSession.java index da35ddc594..08f6fae230 100644 --- a/java/broker/src/test/java/org/apache/qpid/server/protocol/InternalTestProtocolSession.java +++ b/java/broker/src/test/java/org/apache/qpid/server/protocol/InternalTestProtocolSession.java @@ -25,8 +25,8 @@ import org.apache.qpid.codec.AMQCodecFactory; import org.apache.qpid.framing.AMQShortString; import org.apache.qpid.server.output.ProtocolOutputConverter; import org.apache.qpid.server.queue.AMQMessage; +import org.apache.qpid.server.queue.QueueEntry; import org.apache.qpid.server.registry.ApplicationRegistry; -import org.apache.qpid.server.AMQChannel; import java.util.ArrayList; import java.util.HashMap; @@ -99,7 +99,7 @@ public class InternalTestProtocolSession extends AMQMinaProtocolSession implemen { } - public void writeDeliver(AMQMessage message, int channelId, long deliveryTag, AMQShortString consumerTag) throws AMQException + public void writeDeliver(QueueEntry queueEntry, int channelId, long deliveryTag, AMQShortString consumerTag) throws AMQException { _deliveryCount.incrementAndGet(); @@ -121,11 +121,11 @@ public class InternalTestProtocolSession extends AMQMinaProtocolSession implemen consumers.put(consumerTag, consumerDelivers); } - consumerDelivers.add(new DeliveryPair(deliveryTag, message)); + consumerDelivers.add(new DeliveryPair(deliveryTag, queueEntry)); } } - public void writeGetOk(AMQMessage message, int channelId, long deliveryTag, int queueSize) throws AMQException + public void writeGetOk(QueueEntry queueEntry, int channelId, long deliveryTag, int queueSize) throws AMQException { } @@ -147,17 +147,17 @@ public class InternalTestProtocolSession extends AMQMinaProtocolSession implemen public class DeliveryPair { private long _deliveryTag; - private AMQMessage _message; + private QueueEntry _queueEntry; - public DeliveryPair(long deliveryTag, AMQMessage message) + public DeliveryPair(long deliveryTag, QueueEntry queueEntry) { _deliveryTag = deliveryTag; - _message = message; + _queueEntry = queueEntry; } - public AMQMessage getMessage() + public QueueEntry getMessage() { - return _message; + return _queueEntry; } public long getDeliveryTag() diff --git a/java/broker/src/test/java/org/apache/qpid/server/queue/MockQueueEntry.java b/java/broker/src/test/java/org/apache/qpid/server/queue/MockQueueEntry.java index 37f91e7464..ed7b2923e7 100644 --- a/java/broker/src/test/java/org/apache/qpid/server/queue/MockQueueEntry.java +++ b/java/broker/src/test/java/org/apache/qpid/server/queue/MockQueueEntry.java @@ -21,6 +21,7 @@ package org.apache.qpid.server.queue; import org.apache.qpid.AMQException; +import org.apache.qpid.framing.ContentHeaderBody; import org.apache.qpid.server.store.StoreContext; import org.apache.qpid.server.subscription.Subscription; @@ -28,6 +29,7 @@ public class MockQueueEntry implements QueueEntry { private AMQMessage _message; + private boolean _redelivered; public boolean acquire() { @@ -176,10 +178,9 @@ public class MockQueueEntry implements QueueEntry } - public void setRedelivered(boolean b) + public void setRedelivered(boolean redelivered) { - - + _redelivered = redelivered; } @@ -194,4 +195,18 @@ public class MockQueueEntry implements QueueEntry _message = msg; } + public ContentHeaderBody getContentHeaderBody() throws AMQException + { + return _message.getContentHeaderBody(); + } + + public boolean isPersistent() throws AMQException + { + return _message.isPersistent(); + } + + public boolean isRedelivered() + { + return _redelivered; + } } |