enhance older tests to ensure the new return map is empty
Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/909ea19d Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/909ea19d Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/909ea19d Branch: refs/heads/master Commit: 909ea19d4dc837719fe4a29b024ac71a3a181a48 Parents: c48868e Author: Robert Gemmell <[email protected]> Authored: Mon Feb 2 12:07:10 2015 +0000 Committer: Robert Gemmell <[email protected]> Committed: Mon Feb 2 12:07:10 2015 +0000 ---------------------------------------------------------------------- .../test/java/org/apache/qpid/jms/JmsConnectionFactoryTest.java | 5 ++++- .../src/test/java/org/apache/qpid/jms/JmsQueueTest.java | 5 ++++- .../test/java/org/apache/qpid/jms/JmsTemporaryQueueTest.java | 5 ++++- .../test/java/org/apache/qpid/jms/JmsTemporaryTopicTest.java | 5 ++++- .../src/test/java/org/apache/qpid/jms/JmsTopicTest.java | 5 ++++- 5 files changed, 20 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/909ea19d/qpid-jms-client/src/test/java/org/apache/qpid/jms/JmsConnectionFactoryTest.java ---------------------------------------------------------------------- diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/JmsConnectionFactoryTest.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/JmsConnectionFactoryTest.java index 462ac0b..d2014b2 100644 --- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/JmsConnectionFactoryTest.java +++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/JmsConnectionFactoryTest.java @@ -123,7 +123,7 @@ public class JmsConnectionFactoryTest extends QpidJmsTestCase { props.put("remoteURI", uri); // Add another property directly props.put("queuePrefix", queuePrefix); - cf.setProperties(props); + Map<String, String> unusedProps = cf.setProperties(props); // Verify the clientID property option from the URI was applied. assertEquals("uri property query option not applied as expected", clientID, cf.getClientID()); @@ -131,6 +131,9 @@ public class JmsConnectionFactoryTest extends QpidJmsTestCase { assertEquals("direct property not applied as expected", queuePrefix, cf.getQueuePrefix()); // Verify the URI was filtered to remove the applied options assertEquals("URI was filtered to remove options that were applied", baseUri, cf.getRemoteURI()); + + // Verify the returned map was empty + assertTrue("Map should be empty: " + unusedProps, unusedProps.isEmpty()); } @Test http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/909ea19d/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 053a241..b5a59b4 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 @@ -116,9 +116,12 @@ public class JmsQueueTest extends QpidJmsTestCase { Map<String, String> props = new HashMap<String, String>(); props.put(NAME_PROP, name); - queue.setProperties(props); + Map<String, String> unusedProps = queue.setProperties(props); assertEquals("Unexpected value for name", name, queue.getQueueName()); + + // Verify the returned map was empty + assertTrue("Map should be empty: " + unusedProps, unusedProps.isEmpty()); } @Test http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/909ea19d/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 986469d..41f1b30 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 @@ -124,9 +124,12 @@ public class JmsTemporaryQueueTest extends QpidJmsTestCase { Map<String, String> props = new HashMap<String, String>(); props.put(NAME_PROP, name); - queue.setProperties(props); + Map<String, String> unusedProps = queue.setProperties(props); assertEquals("Unexpected value for name", name, queue.getQueueName()); + + // Verify the returned map was empty + assertTrue("Map should be empty: " + unusedProps, unusedProps.isEmpty()); } @Test http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/909ea19d/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 03214d5..8025060 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 @@ -124,9 +124,12 @@ public class JmsTemporaryTopicTest extends QpidJmsTestCase { Map<String, String> props = new HashMap<String, String>(); props.put(NAME_PROP, name); - topic.setProperties(props); + Map<String, String> unusedProps = topic.setProperties(props); assertEquals("Unexpected value for name", name, topic.getTopicName()); + + // Verify the returned map was empty + assertTrue("Map should be empty: " + unusedProps, unusedProps.isEmpty()); } @Test http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/909ea19d/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 782e50f..408ad9f 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 @@ -116,9 +116,12 @@ public class JmsTopicTest extends QpidJmsTestCase { Map<String, String> props = new HashMap<String, String>(); props.put(NAME_PROP, name); - topic.setProperties(props); + Map<String, String> unusedProps = topic.setProperties(props); assertEquals("Unexpected value for name", name, topic.getTopicName()); + + // Verify the returned map was empty + assertTrue("Map should be empty: " + unusedProps, unusedProps.isEmpty()); } @Test --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
