Add tests for new clear calls. Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/f2900222 Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/f2900222 Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/f2900222
Branch: refs/heads/master Commit: f2900222ef4764c4809e7e912cbcebe84b89f09e Parents: cee0c34 Author: Timothy Bish <tabish...@gmail.com> Authored: Mon Oct 13 14:16:40 2014 -0400 Committer: Timothy Bish <tabish...@gmail.com> Committed: Mon Oct 13 14:16:40 2014 -0400 ---------------------------------------------------------------------- .../JmsMessagePropertyIntercepterTest.java | 132 +++++++++++++++++++ 1 file changed, 132 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/f2900222/qpid-jms-client/src/test/java/org/apache/qpid/jms/message/JmsMessagePropertyIntercepterTest.java ---------------------------------------------------------------------- diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/message/JmsMessagePropertyIntercepterTest.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/message/JmsMessagePropertyIntercepterTest.java index c786622..4a54d06 100644 --- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/message/JmsMessagePropertyIntercepterTest.java +++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/message/JmsMessagePropertyIntercepterTest.java @@ -164,6 +164,16 @@ public class JmsMessagePropertyIntercepterTest { } } + @Test + public void testJMSDestinationClearedWhenRequested() throws JMSException { + JmsMessageFacade message = Mockito.mock(JmsMessageFacade.class); + Mockito.when(message.getDestination()).thenReturn(null); + JmsMessagePropertyIntercepter.clearProperties(message, true); + Mockito.verify(message, Mockito.never()).setDestination(null); + JmsMessagePropertyIntercepter.clearProperties(message, false); + Mockito.verify(message).setDestination(null); + } + //---------- JMSReplyTo --------------------------------------------------// @Test @@ -247,6 +257,15 @@ public class JmsMessagePropertyIntercepterTest { } } + @Test + public void testJMSRepltyToClearedWhenRequested() throws JMSException { + JmsMessageFacade message = Mockito.mock(JmsMessageFacade.class); + JmsMessagePropertyIntercepter.clearProperties(message, true); + Mockito.verify(message, Mockito.never()).setReplyTo(null); + JmsMessagePropertyIntercepter.clearProperties(message, false); + Mockito.verify(message).setReplyTo(null); + } + //---------- JMSType -----------------------------------------------------// @Test @@ -326,6 +345,15 @@ public class JmsMessagePropertyIntercepterTest { } } + @Test + public void testJMSTypeClearedWhenRequested() throws JMSException { + JmsMessageFacade message = Mockito.mock(JmsMessageFacade.class); + JmsMessagePropertyIntercepter.clearProperties(message, true); + Mockito.verify(message, Mockito.never()).setType(null); + JmsMessagePropertyIntercepter.clearProperties(message, false); + Mockito.verify(message).setType(null); + } + //---------- JMSDeliveryMode ---------------------------------------------// @Test @@ -426,6 +454,20 @@ public class JmsMessagePropertyIntercepterTest { fail("Should have thrown an exception for this call"); } catch (NumberFormatException e) { } + try { + JmsMessagePropertyIntercepter.setProperty(message, JMS_DELIVERY_MODE, null); + fail("Should have thrown an exception for this call"); + } catch (NumberFormatException e) { + } + } + + @Test + public void testJMSDeliveryModeClearedWhenRequested() throws JMSException { + JmsMessageFacade message = Mockito.mock(JmsMessageFacade.class); + JmsMessagePropertyIntercepter.clearProperties(message, true); + Mockito.verify(message, Mockito.never()).setPersistent(true); + JmsMessagePropertyIntercepter.clearProperties(message, false); + Mockito.verify(message).setPersistent(true); } //---------- JMSPriority ---------------------------------------------// @@ -503,6 +545,15 @@ public class JmsMessagePropertyIntercepterTest { } } + @Test + public void testJMSPriorityClearedWhenRequested() throws JMSException { + JmsMessageFacade message = Mockito.mock(JmsMessageFacade.class); + JmsMessagePropertyIntercepter.clearProperties(message, true); + Mockito.verify(message, Mockito.never()).setPriority(4); + JmsMessagePropertyIntercepter.clearProperties(message, false); + Mockito.verify(message).setPriority(4); + } + //---------- JMSMessageID ---------------------------------------------// @Test @@ -582,6 +633,15 @@ public class JmsMessagePropertyIntercepterTest { } } + @Test + public void testJMSMessageIDClearedWhenRequested() throws JMSException { + JmsMessageFacade message = Mockito.mock(JmsMessageFacade.class); + JmsMessagePropertyIntercepter.clearProperties(message, true); + Mockito.verify(message, Mockito.never()).setMessageId(null); + JmsMessagePropertyIntercepter.clearProperties(message, false); + Mockito.verify(message).setMessageId(null); + } + //---------- JMSTimestamp ---------------------------------------------// @Test @@ -662,6 +722,15 @@ public class JmsMessagePropertyIntercepterTest { } } + @Test + public void testJMSTimeStampClearedWhenRequested() throws JMSException { + JmsMessageFacade message = Mockito.mock(JmsMessageFacade.class); + JmsMessagePropertyIntercepter.clearProperties(message, true); + Mockito.verify(message, Mockito.never()).setTimestamp(0); + JmsMessagePropertyIntercepter.clearProperties(message, false); + Mockito.verify(message).setTimestamp(0); + } + //---------- JMSCorrelationID ---------------------------------------------// @Test @@ -741,6 +810,15 @@ public class JmsMessagePropertyIntercepterTest { } } + @Test + public void testJMSCorrelationIDClearedWhenRequested() throws JMSException { + JmsMessageFacade message = Mockito.mock(JmsMessageFacade.class); + JmsMessagePropertyIntercepter.clearProperties(message, true); + Mockito.verify(message, Mockito.never()).setCorrelationId(null); + JmsMessagePropertyIntercepter.clearProperties(message, false); + Mockito.verify(message).setCorrelationId(null); + } + //---------- JMSExpiration ---------------------------------------------// @Test @@ -821,6 +899,15 @@ public class JmsMessagePropertyIntercepterTest { } } + @Test + public void testJMSExpirationClearedWhenRequested() throws JMSException { + JmsMessageFacade message = Mockito.mock(JmsMessageFacade.class); + JmsMessagePropertyIntercepter.clearProperties(message, true); + Mockito.verify(message, Mockito.never()).setExpiration(0); + JmsMessagePropertyIntercepter.clearProperties(message, false); + Mockito.verify(message).setExpiration(0); + } + //---------- JMSRedelivered ---------------------------------------------// @Test @@ -910,6 +997,15 @@ public class JmsMessagePropertyIntercepterTest { } } + @Test + public void testJMSRedeliveredClearedWhenRequested() throws JMSException { + JmsMessageFacade message = Mockito.mock(JmsMessageFacade.class); + JmsMessagePropertyIntercepter.clearProperties(message, true); + Mockito.verify(message, Mockito.never()).setRedelivered(false); + JmsMessagePropertyIntercepter.clearProperties(message, false); + Mockito.verify(message).setRedelivered(false); + } + //---------- JMSXGroupID ---------------------------------------------// @Test @@ -978,6 +1074,15 @@ public class JmsMessagePropertyIntercepterTest { } } + @Test + public void testJMSXGroupIDClearedWhenRequested() throws JMSException { + JmsMessageFacade message = Mockito.mock(JmsMessageFacade.class); + JmsMessagePropertyIntercepter.clearProperties(message, true); + Mockito.verify(message).setGroupId(null); + JmsMessagePropertyIntercepter.clearProperties(message, false); + Mockito.verify(message, Mockito.times(2)).setGroupId(null); + } + //---------- JMSXGroupSeq ---------------------------------------------// @Test @@ -1046,6 +1151,15 @@ public class JmsMessagePropertyIntercepterTest { } } + @Test + public void testJMSXGroupSeqClearedWhenRequested() throws JMSException { + JmsMessageFacade message = Mockito.mock(JmsMessageFacade.class); + JmsMessagePropertyIntercepter.clearProperties(message, true); + Mockito.verify(message).setGroupSequence(0); + JmsMessagePropertyIntercepter.clearProperties(message, false); + Mockito.verify(message, Mockito.times(2)).setGroupSequence(0); + } + //---------- JMSXDeliveryCount ---------------------------------------------// @Test @@ -1114,6 +1228,15 @@ public class JmsMessagePropertyIntercepterTest { } } + @Test + public void testJMSXDeliveryCountClearedWhenRequested() throws JMSException { + JmsMessageFacade message = Mockito.mock(JmsMessageFacade.class); + JmsMessagePropertyIntercepter.clearProperties(message, true); + Mockito.verify(message).setDeliveryCount(1); + JmsMessagePropertyIntercepter.clearProperties(message, false); + Mockito.verify(message, Mockito.times(2)).setDeliveryCount(1); + } + //---------- JMSXUserID ---------------------------------------------// @Test @@ -1192,4 +1315,13 @@ public class JmsMessagePropertyIntercepterTest { } catch (JMSException e) { } } + + @Test + public void testJMSXUserIDClearedWhenRequested() throws JMSException { + JmsMessageFacade message = Mockito.mock(JmsMessageFacade.class); + JmsMessagePropertyIntercepter.clearProperties(message, true); + Mockito.verify(message).setUserId(null); + JmsMessagePropertyIntercepter.clearProperties(message, false); + Mockito.verify(message, Mockito.times(2)).setUserId(null); + } } --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
