You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ro...@apache.org on 2014/10/06 15:05:46 UTC
[1/2] git commit: add unit tests for AmqpJmsStreamMessageFacade
Repository: qpid-jms
Updated Branches:
refs/heads/master 47e6fe0c8 -> 2e0500594
add unit tests for AmqpJmsStreamMessageFacade
Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/026d83a9
Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/026d83a9
Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/026d83a9
Branch: refs/heads/master
Commit: 026d83a9ec1c2267d06c5008918769daae1efc52
Parents: 47e6fe0
Author: Robert Gemmell <ro...@apache.org>
Authored: Mon Oct 6 12:31:11 2014 +0100
Committer: Robert Gemmell <ro...@apache.org>
Committed: Mon Oct 6 12:31:11 2014 +0100
----------------------------------------------------------------------
.../message/AmqpJmsStreamMessageFacadeTest.java | 359 +++++++++++++++++++
1 file changed, 359 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/026d83a9/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsStreamMessageFacadeTest.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsStreamMessageFacadeTest.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsStreamMessageFacadeTest.java
new file mode 100644
index 0000000..fd823af
--- /dev/null
+++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsStreamMessageFacadeTest.java
@@ -0,0 +1,359 @@
+/*
+ *
+ * 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.jms.provider.amqp.message;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+import javax.jms.MessageEOFException;
+
+import org.apache.qpid.jms.JmsDestination;
+import org.apache.qpid.jms.JmsTopic;
+import org.apache.qpid.jms.provider.amqp.AmqpConnection;
+import org.apache.qpid.jms.provider.amqp.AmqpConsumer;
+import org.apache.qpid.jms.test.QpidJmsTestCase;
+import org.apache.qpid.proton.amqp.Binary;
+import org.apache.qpid.proton.amqp.Symbol;
+import org.apache.qpid.proton.amqp.messaging.AmqpSequence;
+import org.apache.qpid.proton.amqp.messaging.AmqpValue;
+import org.apache.qpid.proton.amqp.messaging.Data;
+import org.apache.qpid.proton.amqp.messaging.MessageAnnotations;
+import org.apache.qpid.proton.message.Message;
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.Mockito;
+
+public class AmqpJmsStreamMessageFacadeTest extends QpidJmsTestCase {
+
+ private JmsDestination consumerDestination;
+
+ @Before
+ @Override
+ public void setUp() throws Exception {
+ super.setUp();
+
+ consumerDestination = new JmsTopic("TestTopic");
+ };
+
+ @Test
+ public void testNewMessageToSendContainsMessageTypeAnnotation() throws Exception {
+ AmqpJmsStreamMessageFacade amqpStreamMessageFacade = createNewStreamMessageFacade();
+
+ Message protonMessage = amqpStreamMessageFacade.getAmqpMessage();
+ MessageAnnotations annotations = protonMessage.getMessageAnnotations();
+ Map<Symbol, Object> annotationsMap = annotations.getValue();
+
+ assertNotNull("MessageAnnotations section was not present", annotations);
+ assertNotNull("MessageAnnotations section value was not present", annotationsMap);
+
+ assertTrue("expected message type annotation to be present", annotationsMap.containsKey(AmqpMessageSupport.getSymbol(AmqpMessageSupport.JMS_MSG_TYPE)));
+ assertEquals("unexpected value for message type annotation value", AmqpMessageSupport.JMS_STREAM_MESSAGE, annotationsMap.get(AmqpMessageSupport.getSymbol(AmqpMessageSupport.JMS_MSG_TYPE)));
+ }
+
+ @Test(expected = MessageEOFException.class)
+ public void testPeekWithNewMessageToSendThrowsMEOFE() throws Exception {
+ AmqpJmsStreamMessageFacade amqpStreamMessageFacade = createNewStreamMessageFacade();
+ amqpStreamMessageFacade.peek();
+ }
+
+ @Test(expected = MessageEOFException.class)
+ public void testPopWithNewMessageToSendThrowsMEOFE() throws Exception {
+ AmqpJmsStreamMessageFacade amqpStreamMessageFacade = createNewStreamMessageFacade();
+ amqpStreamMessageFacade.pop();
+ }
+
+ @Test
+ public void testPeekUsingReceivedMessageWithAmqpValueBodyReturnsExpectedValue() throws Exception {
+ Message message = Message.Factory.create();
+ List<Object> list = new ArrayList<Object>();
+ list.add(Boolean.FALSE);
+ message.setBody(new AmqpValue(list));
+
+ AmqpJmsStreamMessageFacade amqpStreamMessageFacade = createReceivedStreamMessageFacade(createMockAmqpConsumer(), message);
+
+ assertEquals("Unexpected value retrieved", Boolean.FALSE, amqpStreamMessageFacade.peek());
+ }
+
+ @Test
+ public void testPeekUsingReceivedMessageWithAmqpSequenceBodyReturnsExpectedValue() throws Exception {
+ Message message = Message.Factory.create();
+ List<Object> list = new ArrayList<Object>();
+ list.add(Boolean.FALSE);
+ message.setBody(new AmqpSequence(list));
+
+ AmqpJmsStreamMessageFacade amqpStreamMessageFacade = createReceivedStreamMessageFacade(createMockAmqpConsumer(), message);
+
+ assertEquals("Unexpected value retrieved", Boolean.FALSE, amqpStreamMessageFacade.peek());
+ }
+
+ @Test
+ public void testRepeatedPeekReturnsExpectedValue() throws Exception {
+ Message message = Message.Factory.create();
+ List<Object> list = new ArrayList<Object>();
+ list.add(Boolean.FALSE);
+ list.add(Boolean.TRUE);
+ message.setBody(new AmqpSequence(list));
+
+ AmqpJmsStreamMessageFacade amqpStreamMessageFacade = createReceivedStreamMessageFacade(createMockAmqpConsumer(), message);
+
+ assertEquals("Unexpected value retrieved", Boolean.FALSE, amqpStreamMessageFacade.peek());
+ assertEquals("Unexpected value retrieved", Boolean.FALSE, amqpStreamMessageFacade.peek());
+ }
+
+ @Test
+ public void testRepeatedPeekAfterPopReturnsExpectedValue() throws Exception {
+ Message message = Message.Factory.create();
+ List<Object> list = new ArrayList<Object>();
+ list.add(Boolean.FALSE);
+ list.add(Boolean.TRUE);
+ message.setBody(new AmqpSequence(list));
+
+ AmqpJmsStreamMessageFacade amqpStreamMessageFacade = createReceivedStreamMessageFacade(createMockAmqpConsumer(), message);
+
+ assertEquals("Unexpected value retrieved", Boolean.FALSE, amqpStreamMessageFacade.peek());
+ amqpStreamMessageFacade.pop();
+ assertEquals("Unexpected value retrieved", Boolean.TRUE, amqpStreamMessageFacade.peek());
+ }
+
+ @Test
+ public void testResetPositionAfterPop() throws Exception {
+ Message message = Message.Factory.create();
+ List<Object> list = new ArrayList<Object>();
+ list.add(Boolean.FALSE);
+ list.add(Boolean.TRUE);
+ message.setBody(new AmqpSequence(list));
+
+ AmqpJmsStreamMessageFacade amqpStreamMessageFacade = createReceivedStreamMessageFacade(createMockAmqpConsumer(), message);
+
+ assertEquals("Unexpected value retrieved", Boolean.FALSE, amqpStreamMessageFacade.peek());
+ amqpStreamMessageFacade.pop();
+
+ amqpStreamMessageFacade.reset();
+
+ assertEquals("Unexpected value retrieved", Boolean.FALSE, amqpStreamMessageFacade.peek());
+ amqpStreamMessageFacade.pop();
+
+ assertEquals("Unexpected value retrieved", Boolean.TRUE, amqpStreamMessageFacade.peek());
+ amqpStreamMessageFacade.pop();
+ }
+
+ @Test
+ public void testResetPositionAfterPeekThrowsMEOFE() throws Exception {
+ Message message = Message.Factory.create();
+ List<Object> list = new ArrayList<Object>();
+ list.add(Boolean.FALSE);
+ list.add(Boolean.TRUE);
+ message.setBody(new AmqpSequence(list));
+
+ AmqpJmsStreamMessageFacade amqpStreamMessageFacade = createReceivedStreamMessageFacade(createMockAmqpConsumer(), message);
+
+ assertEquals("Unexpected value retrieved", Boolean.FALSE, amqpStreamMessageFacade.peek());
+ amqpStreamMessageFacade.pop();
+ assertEquals("Unexpected value retrieved", Boolean.TRUE, amqpStreamMessageFacade.peek());
+ amqpStreamMessageFacade.pop();
+
+ try {
+ amqpStreamMessageFacade.peek();
+ fail("expected exception to be thrown");
+ } catch (MessageEOFException meofe) {
+ // expected
+ }
+
+ amqpStreamMessageFacade.reset();
+
+ assertEquals("Unexpected value retrieved", Boolean.FALSE, amqpStreamMessageFacade.peek());
+ amqpStreamMessageFacade.pop();
+ assertEquals("Unexpected value retrieved", Boolean.TRUE, amqpStreamMessageFacade.peek());
+ }
+
+ @Test
+ public void testIsEmpty() throws Exception {
+ AmqpJmsStreamMessageFacade amqpStreamMessageFacade = createNewStreamMessageFacade();
+
+ assertTrue("unexpected value", amqpStreamMessageFacade.isEmpty());
+
+ // add something
+ amqpStreamMessageFacade.put(Boolean.TRUE);
+
+ assertFalse("unexpected value", amqpStreamMessageFacade.isEmpty());
+ }
+
+ @Test
+ public void testHasNext() throws Exception {
+ AmqpJmsStreamMessageFacade amqpStreamMessageFacade = createNewStreamMessageFacade();
+
+ assertFalse("unexpected value", amqpStreamMessageFacade.hasNext());
+
+ // add some things
+ amqpStreamMessageFacade.put(Boolean.TRUE);
+ amqpStreamMessageFacade.put(Boolean.FALSE);
+
+ assertTrue("unexpected value", amqpStreamMessageFacade.hasNext());
+ amqpStreamMessageFacade.pop();
+ assertTrue("unexpected value", amqpStreamMessageFacade.hasNext());
+ amqpStreamMessageFacade.pop();
+ assertFalse("unexpected value", amqpStreamMessageFacade.hasNext());
+ }
+
+ @Test
+ public void testClearBody() throws Exception {
+ AmqpJmsStreamMessageFacade amqpStreamMessageFacade = createNewStreamMessageFacade();
+
+ // add some stuff
+ amqpStreamMessageFacade.put(Boolean.TRUE);
+ amqpStreamMessageFacade.put(Boolean.FALSE);
+
+ // retrieve only some of it, leaving some unread
+ assertEquals("unexpected value", Boolean.TRUE, amqpStreamMessageFacade.peek());
+ amqpStreamMessageFacade.pop();
+
+ // clear
+ amqpStreamMessageFacade.clearBody();
+
+ // add something else
+ amqpStreamMessageFacade.put(Character.valueOf('c'));
+
+ // check we can get it alone before another IOOBE (i.e position was reset, other contents cleared)
+ assertEquals("unexpected value", Character.valueOf('c'), amqpStreamMessageFacade.peek());
+ amqpStreamMessageFacade.pop();
+
+ try {
+ amqpStreamMessageFacade.peek();
+ fail("expected exception to be thrown");
+ } catch (MessageEOFException meofe) {
+ // expected
+ }
+ }
+
+ @Test
+ public void testPopFullyReadListThrowsMEOFE() throws Exception {
+ Message message = Message.Factory.create();
+ List<Object> list = new ArrayList<Object>();
+ list.add(Boolean.FALSE);
+ message.setBody(new AmqpSequence(list));
+
+ AmqpJmsStreamMessageFacade amqpStreamMessageFacade = createReceivedStreamMessageFacade(createMockAmqpConsumer(), message);
+
+ assertEquals("Unexpected value retrieved", Boolean.FALSE, amqpStreamMessageFacade.peek());
+ amqpStreamMessageFacade.pop();
+
+ try {
+ amqpStreamMessageFacade.pop();
+ fail("expected exception to be thrown");
+ } catch (MessageEOFException meofe) {
+ // expected
+ }
+ }
+
+ @Test
+ public void testCreateWithUnexpectedBodySectionTypeThrowsISE() throws Exception {
+ Message message = Message.Factory.create();
+ message.setBody(new Data(new Binary(new byte[0])));
+
+ try {
+ createReceivedStreamMessageFacade(createMockAmqpConsumer(), message);
+ fail("expected exception to be thrown");
+ } catch (IllegalStateException ise) {
+ // expected
+ }
+ }
+
+ @Test
+ public void testCreateWithAmqpValueBodySectionContainingUnexpectedValueThrowsISE() throws Exception {
+ Message message = Message.Factory.create();
+ message.setBody(new AmqpValue("not-a-list"));
+
+ try {
+ createReceivedStreamMessageFacade(createMockAmqpConsumer(), message);
+ fail("expected exception to be thrown");
+ } catch (IllegalStateException ise) {
+ // expected
+ }
+ }
+
+ @Test
+ public void testCreateWithEmptyAmqpValueBodySection() throws Exception
+ {
+ Message message = Message.Factory.create();
+ message.setBody(new AmqpValue(null));
+
+ AmqpJmsStreamMessageFacade amqpStreamMessageFacade = createReceivedStreamMessageFacade(createMockAmqpConsumer(), message);
+
+ //Should be able to use the message, e.g clearing it and adding to it.
+ amqpStreamMessageFacade.clearBody();
+ amqpStreamMessageFacade.put("myString");
+ }
+
+ @Test
+ public void testCreateWithEmptyAmqpSequenceBodySection() throws Exception
+ {
+ Message message = Message.Factory.create();
+ message.setBody(new AmqpSequence(null));
+
+ AmqpJmsStreamMessageFacade amqpStreamMessageFacade = createReceivedStreamMessageFacade(createMockAmqpConsumer(), message);
+
+ //Should be able to use the message, e.g clearing it and adding to it.
+ amqpStreamMessageFacade.clearBody();
+ amqpStreamMessageFacade.put("myString");
+ }
+
+ @Test
+ public void testCreateWithNoBodySection() throws Exception
+ {
+ Message message = Message.Factory.create();
+ message.setBody(null);
+
+ AmqpJmsStreamMessageFacade amqpStreamMessageFacade = createReceivedStreamMessageFacade(createMockAmqpConsumer(), message);
+
+ //Should be able to use the message, e.g clearing it and adding to it.
+ amqpStreamMessageFacade.clearBody();
+ amqpStreamMessageFacade.put("myString");
+ }
+
+ // ====== Utility Methods =======
+ // ==============================
+
+ private AmqpJmsStreamMessageFacade createNewStreamMessageFacade() {
+ return new AmqpJmsStreamMessageFacade(createMockAmqpConnection());
+ }
+
+ private AmqpJmsStreamMessageFacade createReceivedStreamMessageFacade(AmqpConsumer amqpConsumer, Message message) {
+ return new AmqpJmsStreamMessageFacade(amqpConsumer, message);
+ }
+
+ private AmqpConsumer createMockAmqpConsumer() {
+ AmqpConsumer consumer = Mockito.mock(AmqpConsumer.class);
+ Mockito.when(consumer.getConnection()).thenReturn(createMockAmqpConnection());
+ Mockito.when(consumer.getDestination()).thenReturn(consumerDestination);
+ return consumer;
+ }
+
+ private AmqpConnection createMockAmqpConnection() {
+ return Mockito.mock(AmqpConnection.class);
+ }
+}
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org
[2/2] git commit: use AmqpSequence body to send StreamMessages
Posted by ro...@apache.org.
use AmqpSequence body to send StreamMessages
Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/2e050059
Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/2e050059
Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/2e050059
Branch: refs/heads/master
Commit: 2e05005947c842d05291aadf06ce960a5bb8e7a4
Parents: 026d83a
Author: Robert Gemmell <ro...@apache.org>
Authored: Mon Oct 6 14:05:05 2014 +0100
Committer: Robert Gemmell <ro...@apache.org>
Committed: Mon Oct 6 14:05:05 2014 +0100
----------------------------------------------------------------------
.../message/AmqpJmsStreamMessageFacade.java | 4 +-
.../StreamMessageIntegrationTest.java | 4 +-
.../message/AmqpJmsStreamMessageFacadeTest.java | 12 ++++
.../types/EncodedAmqpSequenceMatcher.java | 59 ++++++++++++++++++++
.../matchers/types/EncodedAmqpValueMatcher.java | 1 +
5 files changed, 76 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/2e050059/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsStreamMessageFacade.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsStreamMessageFacade.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsStreamMessageFacade.java
index fae76e6..f0355bf 100644
--- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsStreamMessageFacade.java
+++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsStreamMessageFacade.java
@@ -51,7 +51,7 @@ public class AmqpJmsStreamMessageFacade extends AmqpJmsMessageFacade implements
*/
public AmqpJmsStreamMessageFacade(AmqpConnection connection) {
super(connection);
- list = initializeEmptyBodyList(false);
+ list = initializeEmptyBodyList(true);
setAnnotation(JMS_MSG_TYPE, JMS_STREAM_MESSAGE);
}
@@ -70,7 +70,7 @@ public class AmqpJmsStreamMessageFacade extends AmqpJmsMessageFacade implements
Section body = getAmqpMessage().getBody();
if (body == null) {
- list = initializeEmptyBodyList(false);
+ list = initializeEmptyBodyList(true);
} else if (body instanceof AmqpValue) {
Object value = ((AmqpValue) body).getValue();
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/2e050059/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/StreamMessageIntegrationTest.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/StreamMessageIntegrationTest.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/StreamMessageIntegrationTest.java
index a9e860a..b337f8d 100644
--- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/StreamMessageIntegrationTest.java
+++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/integration/StreamMessageIntegrationTest.java
@@ -44,7 +44,7 @@ import org.apache.qpid.jms.test.testpeer.matchers.sections.MessageAnnotationsSec
import org.apache.qpid.jms.test.testpeer.matchers.sections.MessageHeaderSectionMatcher;
import org.apache.qpid.jms.test.testpeer.matchers.sections.MessagePropertiesSectionMatcher;
import org.apache.qpid.jms.test.testpeer.matchers.sections.TransferPayloadCompositeMatcher;
-import org.apache.qpid.jms.test.testpeer.matchers.types.EncodedAmqpValueMatcher;
+import org.apache.qpid.jms.test.testpeer.matchers.types.EncodedAmqpSequenceMatcher;
import org.apache.qpid.proton.amqp.Binary;
import org.apache.qpid.proton.amqp.DescribedType;
import org.apache.qpid.proton.amqp.Symbol;
@@ -200,7 +200,7 @@ public class StreamMessageIntegrationTest extends QpidJmsTestCase {
messageMatcher.setHeadersMatcher(headersMatcher);
messageMatcher.setMessageAnnotationsMatcher(msgAnnotationsMatcher);
messageMatcher.setPropertiesMatcher(propertiesMatcher);
- messageMatcher.setMessageContentMatcher(new EncodedAmqpValueMatcher(list));
+ messageMatcher.setMessageContentMatcher(new EncodedAmqpSequenceMatcher(list));
//send the message
testPeer.expectTransfer(messageMatcher);
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/2e050059/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsStreamMessageFacadeTest.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsStreamMessageFacadeTest.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsStreamMessageFacadeTest.java
index fd823af..ec0e3bd 100644
--- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsStreamMessageFacadeTest.java
+++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsStreamMessageFacadeTest.java
@@ -43,6 +43,7 @@ import org.apache.qpid.proton.amqp.messaging.AmqpSequence;
import org.apache.qpid.proton.amqp.messaging.AmqpValue;
import org.apache.qpid.proton.amqp.messaging.Data;
import org.apache.qpid.proton.amqp.messaging.MessageAnnotations;
+import org.apache.qpid.proton.amqp.messaging.Section;
import org.apache.qpid.proton.message.Message;
import org.junit.Before;
import org.junit.Test;
@@ -75,6 +76,17 @@ public class AmqpJmsStreamMessageFacadeTest extends QpidJmsTestCase {
assertEquals("unexpected value for message type annotation value", AmqpMessageSupport.JMS_STREAM_MESSAGE, annotationsMap.get(AmqpMessageSupport.getSymbol(AmqpMessageSupport.JMS_MSG_TYPE)));
}
+ @Test
+ public void testNewMessageToSendContainsAmqpSequenceBody() throws Exception {
+ AmqpJmsStreamMessageFacade amqpStreamMessageFacade = createNewStreamMessageFacade();
+
+ Message protonMessage = amqpStreamMessageFacade.getAmqpMessage();
+ Section body = protonMessage.getBody();
+
+ assertNotNull("Body section was not present", body);
+ assertTrue("Body section was not of expected type: " + body.getClass(), body instanceof AmqpSequence);
+ }
+
@Test(expected = MessageEOFException.class)
public void testPeekWithNewMessageToSendThrowsMEOFE() throws Exception {
AmqpJmsStreamMessageFacade amqpStreamMessageFacade = createNewStreamMessageFacade();
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/2e050059/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/types/EncodedAmqpSequenceMatcher.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/types/EncodedAmqpSequenceMatcher.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/types/EncodedAmqpSequenceMatcher.java
new file mode 100644
index 0000000..f718f98
--- /dev/null
+++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/types/EncodedAmqpSequenceMatcher.java
@@ -0,0 +1,59 @@
+/*
+ * 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.jms.test.testpeer.matchers.types;
+
+import java.util.List;
+
+import org.apache.qpid.proton.amqp.Symbol;
+import org.apache.qpid.proton.amqp.UnsignedLong;
+import org.apache.qpid.proton.amqp.messaging.AmqpSequence;
+import org.hamcrest.Description;
+
+public class EncodedAmqpSequenceMatcher extends EncodedAmqpTypeMatcher
+{
+ private static final Symbol DESCRIPTOR_SYMBOL = Symbol.valueOf("amqp:amqp-sequence:list");
+ private static final UnsignedLong DESCRIPTOR_CODE = UnsignedLong.valueOf(0x0000000000000076L);
+
+ /**
+ * @param expectedValue the value that is expected to be IN the
+ * received {@link AmqpSequence}
+ */
+ public EncodedAmqpSequenceMatcher(List<Object> expectedValue)
+ {
+ this(expectedValue,false);
+ }
+
+ /**
+ * @param expectedValue the value that is expected to be IN the
+ * received {@link AmqpSequence}
+ * @param permitTrailingBytes if it is permitted for bytes to be left in the Binary after consuming the {@link AmqpSequence}
+ */
+ public EncodedAmqpSequenceMatcher(Object expectedValue, boolean permitTrailingBytes)
+ {
+ super(DESCRIPTOR_SYMBOL, DESCRIPTOR_CODE, expectedValue, permitTrailingBytes);
+ }
+
+ @Override
+ public void describeTo(Description description)
+ {
+ description
+ .appendText("a Binary encoding of an AmqpSequence that wraps: ")
+ .appendValue(getExpectedValue());
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/2e050059/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/types/EncodedAmqpValueMatcher.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/types/EncodedAmqpValueMatcher.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/types/EncodedAmqpValueMatcher.java
index 93dcc36..26f9a3d 100644
--- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/types/EncodedAmqpValueMatcher.java
+++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/types/EncodedAmqpValueMatcher.java
@@ -20,6 +20,7 @@ package org.apache.qpid.jms.test.testpeer.matchers.types;
import org.apache.qpid.proton.amqp.Symbol;
import org.apache.qpid.proton.amqp.UnsignedLong;
+import org.apache.qpid.proton.amqp.messaging.AmqpValue;
import org.hamcrest.Description;
public class EncodedAmqpValueMatcher extends EncodedAmqpTypeMatcher
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org