add test for buildFromProperties, simplify/correct implementation to avoid use of redundant properties already defined by instantiating the classes
Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/cd0edd49 Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/cd0edd49 Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/cd0edd49 Branch: refs/heads/master Commit: cd0edd49945de5a2fff3ad093238f2bfc297ad5b Parents: 98447a5 Author: Robert Gemmell <[email protected]> Authored: Fri Jan 23 16:39:59 2015 +0000 Committer: Robert Gemmell <[email protected]> Committed: Fri Jan 23 17:39:01 2015 +0000 ---------------------------------------------------------------------- .../main/java/org/apache/qpid/jms/JmsDestination.java | 4 ---- .../src/test/java/org/apache/qpid/jms/JmsQueueTest.java | 12 ++++++++++++ .../java/org/apache/qpid/jms/JmsTemporaryQueueTest.java | 12 ++++++++++++ .../java/org/apache/qpid/jms/JmsTemporaryTopicTest.java | 12 ++++++++++++ .../src/test/java/org/apache/qpid/jms/JmsTopicTest.java | 12 ++++++++++++ 5 files changed, 48 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/cd0edd49/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsDestination.java ---------------------------------------------------------------------- diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsDestination.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsDestination.java index 57c7d64..245ee7f 100644 --- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsDestination.java +++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsDestination.java @@ -90,10 +90,6 @@ public abstract class JmsDestination extends JNDIStorable implements Externaliza @Override protected void buildFromProperties(Map<String, String> props) { setName(getProperty(props, NAME_PROP, "")); - Boolean bool = Boolean.valueOf(getProperty(props, TOPIC_PROP, Boolean.TRUE.toString())); - this.topic = bool.booleanValue(); - bool = Boolean.valueOf(getProperty(props, TEMPORARY_PROP, Boolean.FALSE.toString())); - this.temporary = bool.booleanValue(); } /** http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/cd0edd49/qpid-jms-client/src/test/java/org/apache/qpid/jms/JmsQueueTest.java ---------------------------------------------------------------------- diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/JmsQueueTest.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/JmsQueueTest.java index 7f3a338..2afa058 100644 --- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/JmsQueueTest.java +++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/JmsQueueTest.java @@ -118,6 +118,18 @@ public class JmsQueueTest extends QpidJmsTestCase { } @Test + public void testBuildFromProperties() throws Exception { + String name = "myQueue"; + JmsQueue queue = new JmsQueue(); + + Map<String, String> props = new HashMap<String, String>(); + props.put(NAME_PROP, name); + queue.buildFromProperties(props); + + assertEquals("Unexpected value for name", name, queue.getQueueName()); + } + + @Test public void testSerializeThenDeserialize() throws Exception { String name = "myQueue"; JmsQueue queue = new JmsQueue(name); http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/cd0edd49/qpid-jms-client/src/test/java/org/apache/qpid/jms/JmsTemporaryQueueTest.java ---------------------------------------------------------------------- diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/JmsTemporaryQueueTest.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/JmsTemporaryQueueTest.java index cc9a145..c397373 100644 --- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/JmsTemporaryQueueTest.java +++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/JmsTemporaryQueueTest.java @@ -126,6 +126,18 @@ public class JmsTemporaryQueueTest extends QpidJmsTestCase { } @Test + public void testBuildFromProperties() throws Exception { + String name = "myQueue"; + JmsTemporaryQueue queue = new JmsTemporaryQueue(); + + Map<String, String> props = new HashMap<String, String>(); + props.put(NAME_PROP, name); + queue.buildFromProperties(props); + + assertEquals("Unexpected value for name", name, queue.getQueueName()); + } + + @Test public void testSerializeThenDeserialize() throws Exception { String name = "myQueue"; JmsTemporaryQueue queue = new JmsTemporaryQueue(name); http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/cd0edd49/qpid-jms-client/src/test/java/org/apache/qpid/jms/JmsTemporaryTopicTest.java ---------------------------------------------------------------------- diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/JmsTemporaryTopicTest.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/JmsTemporaryTopicTest.java index 714dd32..a689a9d 100644 --- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/JmsTemporaryTopicTest.java +++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/JmsTemporaryTopicTest.java @@ -126,6 +126,18 @@ public class JmsTemporaryTopicTest extends QpidJmsTestCase { } @Test + public void testBuildFromProperties() throws Exception { + String name = "myTopic"; + JmsTemporaryTopic topic = new JmsTemporaryTopic(); + + Map<String, String> props = new HashMap<String, String>(); + props.put(NAME_PROP, name); + topic.buildFromProperties(props); + + assertEquals("Unexpected value for name", name, topic.getTopicName()); + } + + @Test public void testSerializeThenDeserialize() throws Exception { String name = "myTopic"; JmsTemporaryTopic topic = new JmsTemporaryTopic(name); http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/cd0edd49/qpid-jms-client/src/test/java/org/apache/qpid/jms/JmsTopicTest.java ---------------------------------------------------------------------- diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/JmsTopicTest.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/JmsTopicTest.java index 2d314f3..3fec15f 100644 --- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/JmsTopicTest.java +++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/JmsTopicTest.java @@ -118,6 +118,18 @@ public class JmsTopicTest extends QpidJmsTestCase { } @Test + public void testBuildFromProperties() throws Exception { + String name = "myTopic"; + JmsTopic topic = new JmsTopic(); + + Map<String, String> props = new HashMap<String, String>(); + props.put(NAME_PROP, name); + topic.buildFromProperties(props); + + assertEquals("Unexpected value for name", name, topic.getTopicName()); + } + + @Test public void testSerializeThenDeserialize() throws Exception { String name = "myTopic"; JmsTopic topic = new JmsTopic(name); --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
