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 12:18:51 UTC
[1/3] git commit: add builder tests for messages arriving with an
amqp-value or amqp-sequence body section but no type annotation
Repository: qpid-jms
Updated Branches:
refs/heads/master df6a30d52 -> 47e6fe0c8
add builder tests for messages arriving with an amqp-value or amqp-sequence body section but no type annotation
Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/b37c8971
Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/b37c8971
Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/b37c8971
Branch: refs/heads/master
Commit: b37c8971b7e2c67d9cac20d2cb92641706707f2d
Parents: df6a30d
Author: Robert Gemmell <ro...@apache.org>
Authored: Mon Oct 6 10:22:47 2014 +0100
Committer: Robert Gemmell <ro...@apache.org>
Committed: Mon Oct 6 10:22:47 2014 +0100
----------------------------------------------------------------------
.../amqp/message/AmqpJmsMessageBuilderTest.java | 153 ++++++++++++++++++-
1 file changed, 152 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/b37c8971/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMessageBuilderTest.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMessageBuilderTest.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMessageBuilderTest.java
index b9177ca..994badf 100644
--- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMessageBuilderTest.java
+++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMessageBuilderTest.java
@@ -26,7 +26,9 @@ import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
import java.io.IOException;
+import java.util.ArrayList;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
import org.apache.qpid.jms.message.JmsBytesMessage;
@@ -40,6 +42,8 @@ import org.apache.qpid.jms.test.QpidJmsTestCase;
import org.apache.qpid.proton.Proton;
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;
@@ -420,7 +424,7 @@ public class AmqpJmsMessageBuilderTest extends QpidJmsTestCase {
* indicate the type of JMS message it is.
*/
@Test(expected = IOException.class)
- public void testCreateGenericMessageFromDataWithUnknownContentTypeAndEmptyBinary() throws Exception {
+ public void testDataWithUnknownContentTypeAndEmptyBinaryThrowsException() throws Exception {
//TODO: decide if this should instead just be a plain Message or BytesMessage instead?
Message message = Proton.message();
Binary binary = new Binary(new byte[0]);
@@ -429,4 +433,151 @@ public class AmqpJmsMessageBuilderTest extends QpidJmsTestCase {
AmqpJmsMessageBuilder.createJmsMessage(mockConsumer, message);
}
+
+ // --------- AmqpValue Body Section ---------
+
+ /**
+ * Test that an amqp-value body containing a string results in a TextMessage
+ * when not otherwise annotated to indicate the type of JMS message it is.
+ */
+ @Test
+ public void testCreateTextMessageFromAmqpValueWithString() throws Exception {
+ Message message = Proton.message();
+ message.setBody(new AmqpValue("content"));
+
+ JmsMessage jmsMessage = AmqpJmsMessageBuilder.createJmsMessage(mockConsumer, message);
+ assertNotNull("Message should not be null", jmsMessage);
+ assertEquals("Unexpected message class type", JmsTextMessage.class, jmsMessage.getClass());
+
+ JmsMessageFacade facade = jmsMessage.getFacade();
+ assertNotNull("Facade should not be null", facade);
+ assertEquals("Unexpected facade class type", AmqpJmsTextMessageFacade.class, facade.getClass());
+ }
+
+ /**
+ * Test that an amqp-value body containing a null results in an TextMessage
+ * when not otherwise annotated to indicate the type of JMS message it is.
+ */
+ @Test
+ public void testCreateTextMessageFromAmqpValueWithNull() throws Exception {
+ Message message = Proton.message();
+ message.setBody(new AmqpValue(null));
+
+ JmsMessage jmsMessage = AmqpJmsMessageBuilder.createJmsMessage(mockConsumer, message);
+ assertNotNull("Message should not be null", jmsMessage);
+ assertEquals("Unexpected message class type", JmsTextMessage.class, jmsMessage.getClass());
+
+ JmsMessageFacade facade = jmsMessage.getFacade();
+ assertNotNull("Facade should not be null", facade);
+ assertEquals("Unexpected facade class type", AmqpJmsTextMessageFacade.class, facade.getClass());
+ }
+
+ /**
+ * Test that an amqp-value body containing a map results in an ObjectMessage
+ * when not otherwise annotated to indicate the type of JMS message it is.
+ */
+ @Test
+ public void testCreateAmqpObjectMessageFromAmqpValueWithMap() throws Exception {
+ Message message = Proton.message();
+ Map<String, String> map = new HashMap<String,String>();
+ message.setBody(new AmqpValue(map));
+
+ JmsMessage jmsMessage = AmqpJmsMessageBuilder.createJmsMessage(mockConsumer, message);
+ assertNotNull("Message should not be null", jmsMessage);
+ assertEquals("Unexpected message class type", JmsObjectMessage.class, jmsMessage.getClass());
+
+ JmsMessageFacade facade = jmsMessage.getFacade();
+ assertNotNull("Facade should not be null", facade);
+ assertEquals("Unexpected facade class type", AmqpJmsObjectMessageFacade.class, facade.getClass());
+
+ AmqpObjectTypeDelegate delegate = ((AmqpJmsObjectMessageFacade) facade).getDelegate();
+ assertTrue("Unexpected delegate type: " + delegate, delegate instanceof AmqpTypedObjectDelegate);
+ }
+
+ /**
+ * Test that an amqp-value body containing a list results in an ObjectMessage
+ * when not otherwise annotated to indicate the type of JMS message it is.
+ */
+ @Test
+ public void testCreateAmqpObjectMessageFromAmqpValueWithList() throws Exception {
+ Message message = Proton.message();
+ List<String> list = new ArrayList<String>();
+ message.setBody(new AmqpValue(list));
+
+ JmsMessage jmsMessage = AmqpJmsMessageBuilder.createJmsMessage(mockConsumer, message);
+ assertNotNull("Message should not be null", jmsMessage);
+ assertEquals("Unexpected message class type", JmsObjectMessage.class, jmsMessage.getClass());
+
+ JmsMessageFacade facade = jmsMessage.getFacade();
+ assertNotNull("Facade should not be null", facade);
+ assertEquals("Unexpected facade class type", AmqpJmsObjectMessageFacade.class, facade.getClass());
+
+ AmqpObjectTypeDelegate delegate = ((AmqpJmsObjectMessageFacade) facade).getDelegate();
+ assertTrue("Unexpected delegate type: " + delegate, delegate instanceof AmqpTypedObjectDelegate);
+ }
+
+ /**
+ * Test that an amqp-value body containing a binary value results in BytesMessage
+ * when not otherwise annotated to indicate the type of JMS message it is.
+ */
+ @Test
+ public void testCreateAmqpBytesMessageFromAmqpValueWithBinary() throws Exception {
+ Message message = Proton.message();
+ Binary binary = new Binary(new byte[0]);
+ message.setBody(new AmqpValue(binary));
+
+ JmsMessage jmsMessage = AmqpJmsMessageBuilder.createJmsMessage(mockConsumer, message);
+ assertNotNull("Message should not be null", jmsMessage);
+ assertEquals("Unexpected message class type", JmsBytesMessage.class, jmsMessage.getClass());
+
+ JmsMessageFacade facade = jmsMessage.getFacade();
+ assertNotNull("Facade should not be null", facade);
+ assertEquals("Unexpected facade class type", AmqpJmsBytesMessageFacade.class, facade.getClass());
+ }
+
+ /**
+ * Test that an amqp-value body containing a value which can't be categorised results in
+ * an ObjectMessage when not otherwise annotated to indicate the type of JMS message it is.
+ */
+ @Test
+ public void testCreateObjectMessageFromAmqpValueWithUncategorisedContent() throws Exception {
+ Message message = Proton.message();
+ message.setBody(new AmqpValue(new Object()));// This obviously shouldn't happen in practice
+
+ JmsMessage jmsMessage = AmqpJmsMessageBuilder.createJmsMessage(mockConsumer, message);
+ assertNotNull("Message should not be null", jmsMessage);
+ assertEquals("Unexpected message class type", JmsObjectMessage.class, jmsMessage.getClass());
+
+ JmsMessageFacade facade = jmsMessage.getFacade();
+ assertNotNull("Facade should not be null", facade);
+ assertEquals("Unexpected facade class type", AmqpJmsObjectMessageFacade.class, facade.getClass());
+
+ AmqpObjectTypeDelegate delegate = ((AmqpJmsObjectMessageFacade) facade).getDelegate();
+ assertTrue("Unexpected delegate type: " + delegate, delegate instanceof AmqpTypedObjectDelegate);
+ }
+
+ // --------- AmqpSequence Body Section ---------
+
+ /**
+ * Test that an amqp-sequence body containing a binary value results in an ObjectMessage
+ * when not otherwise annotated to indicate the type of JMS message it is.
+ */
+ @Test
+ public void testCreateObjectMessageMessageFromAmqpSequence() throws Exception
+ {
+ Message message = Proton.message();
+ List<String> list = new ArrayList<String>();
+ message.setBody(new AmqpSequence(list));
+
+ JmsMessage jmsMessage = AmqpJmsMessageBuilder.createJmsMessage(mockConsumer, message);
+ assertNotNull("Message should not be null", jmsMessage);
+ assertEquals("Unexpected message class type", JmsObjectMessage.class, jmsMessage.getClass());
+
+ JmsMessageFacade facade = jmsMessage.getFacade();
+ assertNotNull("Facade should not be null", facade);
+ assertEquals("Unexpected facade class type", AmqpJmsObjectMessageFacade.class, facade.getClass());
+
+ AmqpObjectTypeDelegate delegate = ((AmqpJmsObjectMessageFacade) facade).getDelegate();
+ assertTrue("Unexpected delegate type: " + delegate, delegate instanceof AmqpTypedObjectDelegate);
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org
[2/3] git commit: enable ignored test
Posted by ro...@apache.org.
enable ignored test
Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/9243bc8b
Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/9243bc8b
Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/9243bc8b
Branch: refs/heads/master
Commit: 9243bc8b31c883ff1a5dc2396e208469ea699f5f
Parents: b37c897
Author: Robert Gemmell <ro...@apache.org>
Authored: Mon Oct 6 10:52:46 2014 +0100
Committer: Robert Gemmell <ro...@apache.org>
Committed: Mon Oct 6 10:52:46 2014 +0100
----------------------------------------------------------------------
.../java/org/apache/qpid/jms/message/JmsStreamMessageTest.java | 5 -----
1 file changed, 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/9243bc8b/qpid-jms-client/src/test/java/org/apache/qpid/jms/message/JmsStreamMessageTest.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/message/JmsStreamMessageTest.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/message/JmsStreamMessageTest.java
index ff9c390..e0356bd 100644
--- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/message/JmsStreamMessageTest.java
+++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/message/JmsStreamMessageTest.java
@@ -34,10 +34,7 @@ import javax.jms.MessageNotReadableException;
import javax.jms.MessageNotWriteableException;
import javax.jms.StreamMessage;
-import org.apache.qpid.jms.message.JmsMessageFactory;
-import org.apache.qpid.jms.message.JmsStreamMessage;
import org.apache.qpid.jms.message.facade.defaults.JmsDefaultMessageFactory;
-import org.junit.Ignore;
import org.junit.Test;
/**
@@ -657,8 +654,6 @@ public class JmsStreamMessageTest {
assertGetStreamEntryThrowsMessageFormatException(streamMessage, byte[].class);
}
- // TODO - Support Big Strings
- @Ignore
@Test
public void testReadBigString() throws JMSException {
JmsStreamMessage msg = factory.createStreamMessage();
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org
[3/3] git commit: enable ignored test
Posted by ro...@apache.org.
enable ignored test
Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/47e6fe0c
Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/47e6fe0c
Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/47e6fe0c
Branch: refs/heads/master
Commit: 47e6fe0c8790d9011da4673248b0e3475b2cb095
Parents: 9243bc8
Author: Robert Gemmell <ro...@apache.org>
Authored: Mon Oct 6 10:58:11 2014 +0100
Committer: Robert Gemmell <ro...@apache.org>
Committed: Mon Oct 6 11:17:58 2014 +0100
----------------------------------------------------------------------
.../src/test/java/org/apache/qpid/jms/JmsMessageIntegrityTest.java | 2 --
1 file changed, 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/47e6fe0c/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/JmsMessageIntegrityTest.java
----------------------------------------------------------------------
diff --git a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/JmsMessageIntegrityTest.java b/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/JmsMessageIntegrityTest.java
index f4b54a6..c81bd34 100644
--- a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/JmsMessageIntegrityTest.java
+++ b/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/JmsMessageIntegrityTest.java
@@ -41,7 +41,6 @@ import javax.jms.StreamMessage;
import javax.jms.TextMessage;
import org.apache.qpid.jms.support.AmqpTestSupport;
-import org.junit.Ignore;
import org.junit.Test;
/**
@@ -454,7 +453,6 @@ public class JmsMessageIntegrityTest extends AmqpTestSupport {
}
// TODO - implement proper handling of foreign JMS Message and Destination types.
- @Ignore("ActiveMQ is dropping messages as expired with current proton lib")
@Test
public void testForeignMessage() throws Exception {
connection.start();
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org