You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ta...@apache.org on 2014/10/15 17:50:47 UTC
[1/3] git commit: Complete path coverage of destination
transformation method.
Repository: qpid-jms
Updated Branches:
refs/heads/master a0f228bad -> a088d9980
Complete path coverage of destination transformation method.
Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/4d3ea7a1
Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/4d3ea7a1
Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/4d3ea7a1
Branch: refs/heads/master
Commit: 4d3ea7a1422bf710440f9a291832d05c7f871335
Parents: a0f228b
Author: Timothy Bish <ta...@gmail.com>
Authored: Wed Oct 15 09:43:04 2014 -0400
Committer: Timothy Bish <ta...@gmail.com>
Committed: Wed Oct 15 09:43:04 2014 -0400
----------------------------------------------------------------------
.../message/JmsMessageTransformationTest.java | 89 +++++++++++++++++---
1 file changed, 76 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/4d3ea7a1/qpid-jms-client/src/test/java/org/apache/qpid/jms/message/JmsMessageTransformationTest.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/message/JmsMessageTransformationTest.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/message/JmsMessageTransformationTest.java
index 3904439..84c294f 100644
--- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/message/JmsMessageTransformationTest.java
+++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/message/JmsMessageTransformationTest.java
@@ -19,6 +19,7 @@ package org.apache.qpid.jms.message;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
@@ -51,6 +52,12 @@ public class JmsMessageTransformationTest {
//---------- Test Destination Transformation -----------------------------//
@Test
+ public void testTransformNullDestinationNoExceptions() throws JMSException {
+ JmsDestination transformed = JmsMessageTransformation.transformDestination(createMockJmsConnection(), null);
+ assertNull(transformed);
+ }
+
+ @Test
public void testPlainDestinationThrowsJMSEx() throws JMSException {
ForeignDestination destination = new ForeignDestination(DESTINATION_NAME);
try {
@@ -71,6 +78,43 @@ public class JmsMessageTransformationTest {
}
@Test
+ public void testCompositeTopicAndQueueDestinationNoNameThrowsJMSEx() throws JMSException {
+ ForeignTopicAndQueue destination = new ForeignTopicAndQueue(DESTINATION_NAME);
+ destination.setReturnQueueName(false);
+ destination.setReturnTopicName(false);
+
+ try {
+ JmsMessageTransformation.transformDestination(createMockJmsConnection(), destination);
+ fail("Should have thrown an JMSException");
+ } catch (JMSException ex) {
+ }
+ }
+
+ @Test
+ public void testTransformCompositeDestinationFromForeignTopic() throws JMSException {
+ ForeignTopicAndQueue destination = new ForeignTopicAndQueue(DESTINATION_NAME);
+ destination.setReturnQueueName(false);
+
+ JmsDestination transformed = JmsMessageTransformation.transformDestination(createMockJmsConnection(), destination);
+ assertNotNull(transformed);
+ assertTrue(transformed.isTopic());
+ assertFalse(transformed.isTemporary());
+ assertEquals(DESTINATION_NAME, transformed.getName());
+ }
+
+ @Test
+ public void testTransformCompositeDestinationFromForeignQueue() throws JMSException {
+ ForeignTopicAndQueue destination = new ForeignTopicAndQueue(DESTINATION_NAME);
+ destination.setReturnTopicName(false);
+
+ JmsDestination transformed = JmsMessageTransformation.transformDestination(createMockJmsConnection(), destination);
+ assertNotNull(transformed);
+ assertTrue(transformed.isQueue());
+ assertFalse(transformed.isTemporary());
+ assertEquals(DESTINATION_NAME, transformed.getName());
+ }
+
+ @Test
public void testJmsDestinationIsNotTransformed() throws JMSException {
JmsDestination destination = new JmsTopic(DESTINATION_NAME);
JmsDestination transformed = JmsMessageTransformation.transformDestination(createMockJmsConnection(), destination);
@@ -164,53 +208,72 @@ public class JmsMessageTransformationTest {
}
}
- private class ForeignTopicAndQueue extends ForeignDestination implements Queue, Topic {
+ private class ForeignTemporaryQueue extends ForeignQueue implements TemporaryQueue {
- public ForeignTopicAndQueue(String name) {
+ public ForeignTemporaryQueue(String name) {
super(name);
}
@Override
- public String getTopicName() throws JMSException {
+ public String getQueueName() throws JMSException {
return name;
}
@Override
- public String getQueueName() throws JMSException {
- return name;
+ public void delete() throws JMSException {
+
}
}
- private class ForeignTemporaryQueue extends ForeignQueue implements TemporaryQueue {
+ private class ForeignTemporaryTopic extends ForeignTopic implements TemporaryTopic {
- public ForeignTemporaryQueue(String name) {
+ public ForeignTemporaryTopic(String name) {
super(name);
}
@Override
- public String getQueueName() throws JMSException {
+ public String getTopicName() throws JMSException {
return name;
}
@Override
public void delete() throws JMSException {
-
}
}
- private class ForeignTemporaryTopic extends ForeignTopic implements TemporaryTopic {
+ private class ForeignTopicAndQueue extends ForeignDestination implements Queue, Topic {
- public ForeignTemporaryTopic(String name) {
+ private boolean returnTopicName = true;
+ private boolean returnQueueName = true;
+
+ public ForeignTopicAndQueue(String name) {
super(name);
}
@Override
public String getTopicName() throws JMSException {
- return name;
+ if (returnTopicName) {
+ return name;
+ }
+
+ return null;
}
@Override
- public void delete() throws JMSException {
+ public String getQueueName() throws JMSException {
+ if (returnQueueName) {
+ return name;
+ }
+
+ return null;
+ }
+
+ public void setReturnTopicName(boolean returnTopicName) {
+ this.returnTopicName = returnTopicName;
+ }
+
+ public void setReturnQueueName(boolean returnQueueName) {
+ this.returnQueueName = returnQueueName;
}
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org
[3/3] git commit: start testing the message transformation bits.
Posted by ta...@apache.org.
start testing the message transformation bits.
Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/a088d998
Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/a088d998
Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/a088d998
Branch: refs/heads/master
Commit: a088d99805ef6ede9eb321009324ad3441d2c6ab
Parents: a757bab
Author: Timothy Bish <ta...@gmail.com>
Authored: Wed Oct 15 11:45:48 2014 -0400
Committer: Timothy Bish <ta...@gmail.com>
Committed: Wed Oct 15 11:45:48 2014 -0400
----------------------------------------------------------------------
.../message/JmsMessageTransformationTest.java | 35 ++++++++++++++++++++
1 file changed, 35 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/a088d998/qpid-jms-client/src/test/java/org/apache/qpid/jms/message/JmsMessageTransformationTest.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/message/JmsMessageTransformationTest.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/message/JmsMessageTransformationTest.java
index 84c294f..8dc485b 100644
--- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/message/JmsMessageTransformationTest.java
+++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/message/JmsMessageTransformationTest.java
@@ -19,6 +19,7 @@ package org.apache.qpid.jms.message;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNotSame;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue;
@@ -34,6 +35,7 @@ import javax.jms.Topic;
import org.apache.qpid.jms.JmsConnection;
import org.apache.qpid.jms.JmsDestination;
import org.apache.qpid.jms.JmsTopic;
+import org.apache.qpid.jms.message.facade.defaults.JmsDefaultMessageFacade;
import org.junit.Test;
import org.mockito.Mockito;
@@ -49,6 +51,39 @@ public class JmsMessageTransformationTest {
new JmsMessageTransformation();
}
+ //---------- Test Message Transformation ---------------------------------//
+
+ @Test
+ public void testTransformJmsMessageCopies() throws JMSException {
+ JmsMessage source = new JmsMessage(new JmsDefaultMessageFacade());
+
+ source.setJMSMessageID("ID:CONNECTION:1:1");
+
+ JmsMessage copy = JmsMessageTransformation.transformMessage(createMockJmsConnection(), source);
+ assertNotNull(copy.getJMSMessageID());
+ assertEquals(source, copy);
+ assertNotSame(source, copy);
+ }
+
+ //---------- Test Generic Property Copy ----------------------------------//
+
+ @Test
+ public void testJMSMessagePropertiesAreCopied() throws JMSException {
+ JmsMessage source = new JmsMessage(new JmsDefaultMessageFacade());
+ JmsMessage target = new JmsMessage(new JmsDefaultMessageFacade());
+
+ source.setJMSType("text/test");
+
+ source.setBooleanProperty("boolValue", true);
+ source.setStringProperty("stringValue", "foo");
+
+ JmsMessageTransformation.copyProperties(createMockJmsConnection(), source, target);
+
+ assertEquals(true, target.getBooleanProperty("boolValue"));
+ assertEquals("foo", target.getStringProperty("stringValue"));
+ assertEquals("text/test", target.getJMSType());
+ }
+
//---------- Test Destination Transformation -----------------------------//
@Test
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org
[2/3] git commit: Create a raw Message type, not a TextMessage
Posted by ta...@apache.org.
Create a raw Message type, not a TextMessage
Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/a757bab4
Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/a757bab4
Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/a757bab4
Branch: refs/heads/master
Commit: a757bab4ca103ad6bc3887ebe47a21bbbede6be4
Parents: 4d3ea7a
Author: Timothy Bish <ta...@gmail.com>
Authored: Wed Oct 15 11:45:23 2014 -0400
Committer: Timothy Bish <ta...@gmail.com>
Committed: Wed Oct 15 11:45:23 2014 -0400
----------------------------------------------------------------------
.../java/org/apache/qpid/jms/message/JmsMessageTransformation.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/a757bab4/qpid-jms-client/src/main/java/org/apache/qpid/jms/message/JmsMessageTransformation.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/message/JmsMessageTransformation.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/message/JmsMessageTransformation.java
index c160cc8..cb82492 100644
--- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/message/JmsMessageTransformation.java
+++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/message/JmsMessageTransformation.java
@@ -165,7 +165,7 @@ public final class JmsMessageTransformation {
msg.setText(textMsg.getText());
activeMessage = msg;
} else {
- activeMessage = factory.createTextMessage();
+ activeMessage = factory.createMessage();
}
copyProperties(connection, message, activeMessage);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org