Break out some common bits into a base class for all the AMQP message facades to use in their test cases.
Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/fe1114d2 Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/fe1114d2 Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/fe1114d2 Branch: refs/heads/master Commit: fe1114d22a61121408b50b641af91c96cd94aa10 Parents: 8c223ae Author: Timothy Bish <tabish...@gmail.com> Authored: Wed Oct 8 18:41:39 2014 -0400 Committer: Timothy Bish <tabish...@gmail.com> Committed: Wed Oct 8 18:41:39 2014 -0400 ---------------------------------------------------------------------- .../message/AmqpJmsMapMessageFacadeTest.java | 39 +-------- .../amqp/message/AmqpJmsMessageFacadeTest.java | 26 +----- .../message/AmqpJmsMessageTypesTestCase.java | 83 ++++++++++++++++++++ .../message/AmqpJmsStreamMessageFacadeTest.java | 41 +--------- 4 files changed, 87 insertions(+), 102 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/fe1114d2/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMapMessageFacadeTest.java ---------------------------------------------------------------------- diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMapMessageFacadeTest.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMapMessageFacadeTest.java index 9d37241..cc70a0c 100644 --- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMapMessageFacadeTest.java +++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMapMessageFacadeTest.java @@ -27,33 +27,17 @@ import java.util.Enumeration; import java.util.HashMap; import java.util.Map; -import org.apache.qpid.jms.JmsDestination; -import org.apache.qpid.jms.JmsTopic; -import org.apache.qpid.jms.provider.amqp.AmqpConnection; -import org.apache.qpid.jms.provider.amqp.AmqpConsumer; -import org.apache.qpid.jms.test.QpidJmsTestCase; 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.MessageAnnotations; import org.apache.qpid.proton.message.Message; -import org.junit.Before; import org.junit.Test; -import org.mockito.Mockito; /** * Test for the AmqpJmsMapMessageFacade class */ -public class AmqpJmsMapMessageFacadeTest extends QpidJmsTestCase { - - private JmsDestination consumerDestination; - - @Before - @Override - public void setUp() throws Exception { - super.setUp(); - consumerDestination = new JmsTopic("TestTopic"); - }; +public class AmqpJmsMapMessageFacadeTest extends AmqpJmsMessageTypesTestCase { //---------- Test initial state of newly created message -----------------// @@ -225,25 +209,4 @@ public class AmqpJmsMapMessageFacadeTest extends QpidJmsTestCase { amqpMapMessageFacade.put("entry", "value"); assertFalse(amqpMapMessageFacade.isEmpty()); } - - //---------- Test Support Methods ----------------------------------------// - - private AmqpJmsMapMessageFacade createNewMapMessageFacade() { - return new AmqpJmsMapMessageFacade(createMockAmqpConnection()); - } - - private AmqpJmsMapMessageFacade createReceivedMapMessageFacade(AmqpConsumer amqpConsumer, Message message) { - return new AmqpJmsMapMessageFacade(amqpConsumer, message); - } - - private AmqpConsumer createMockAmqpConsumer() { - AmqpConsumer consumer = Mockito.mock(AmqpConsumer.class); - Mockito.when(consumer.getConnection()).thenReturn(createMockAmqpConnection()); - Mockito.when(consumer.getDestination()).thenReturn(consumerDestination); - return consumer; - } - - private AmqpConnection createMockAmqpConnection() { - return Mockito.mock(AmqpConnection.class); - } } http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/fe1114d2/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMessageFacadeTest.java ---------------------------------------------------------------------- diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMessageFacadeTest.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMessageFacadeTest.java index a497e16..250e09f 100644 --- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMessageFacadeTest.java +++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMessageFacadeTest.java @@ -45,8 +45,6 @@ import org.apache.qpid.jms.JmsQueue; import org.apache.qpid.jms.JmsTemporaryQueue; import org.apache.qpid.jms.JmsTopic; import org.apache.qpid.jms.message.facade.JmsMessageFacade; -import org.apache.qpid.jms.provider.amqp.AmqpConnection; -import org.apache.qpid.jms.provider.amqp.AmqpConsumer; import org.apache.qpid.jms.test.testpeer.describedtypes.sections.PropertiesDescribedType; import org.apache.qpid.proton.Proton; import org.apache.qpid.proton.amqp.Binary; @@ -61,34 +59,14 @@ import org.apache.qpid.proton.amqp.messaging.Properties; import org.apache.qpid.proton.codec.impl.DataImpl; import org.apache.qpid.proton.message.Message; import org.junit.Test; -import org.mockito.Mockito; -public class AmqpJmsMessageFacadeTest { +public class AmqpJmsMessageFacadeTest extends AmqpJmsMessageTypesTestCase { + private static final String TEST_PROP_A = "TEST_PROP_A"; private static final String TEST_PROP_B = "TEST_PROP_B"; private static final String TEST_VALUE_STRING_A = "TEST_VALUE_STRING_A"; private static final String TEST_VALUE_STRING_B = "TEST_VALUE_STRING_B"; private static final long MAX_UINT = 0xFFFFFFFFL; - private final JmsDestination consumerDestination = new JmsTopic("TestTopic"); - - private AmqpJmsMessageFacade createNewMessageFacade() { - return new AmqpJmsMessageFacade(createMockAmqpConnection()); - } - - private AmqpJmsMessageFacade createReceivedMessageFacade(AmqpConsumer amqpConsumer, Message message) { - return new AmqpJmsMessageFacade(amqpConsumer, message); - } - - private AmqpConsumer createMockAmqpConsumer() { - AmqpConsumer consumer = Mockito.mock(AmqpConsumer.class); - Mockito.when(consumer.getConnection()).thenReturn(createMockAmqpConnection()); - Mockito.when(consumer.getDestination()).thenReturn(consumerDestination); - return consumer; - } - - private AmqpConnection createMockAmqpConnection() { - return Mockito.mock(AmqpConnection.class); - } // ====== AMQP Header Section ======= // ================================== http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/fe1114d2/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMessageTypesTestCase.java ---------------------------------------------------------------------- diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMessageTypesTestCase.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMessageTypesTestCase.java new file mode 100644 index 0000000..d4201df --- /dev/null +++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsMessageTypesTestCase.java @@ -0,0 +1,83 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.qpid.jms.provider.amqp.message; + +import org.apache.qpid.jms.JmsDestination; +import org.apache.qpid.jms.JmsTopic; +import org.apache.qpid.jms.provider.amqp.AmqpConnection; +import org.apache.qpid.jms.provider.amqp.AmqpConsumer; +import org.apache.qpid.jms.test.QpidJmsTestCase; +import org.apache.qpid.proton.message.Message; +import org.junit.Before; +import org.mockito.Mockito; + +public class AmqpJmsMessageTypesTestCase extends QpidJmsTestCase { + + private JmsDestination consumerDestination; + + @Before + @Override + public void setUp() throws Exception { + super.setUp(); + consumerDestination = new JmsTopic("TestTopic"); + }; + + //---------- Test Support Methods ----------------------------------------// + + protected AmqpJmsMessageFacade createNewMessageFacade() { + return new AmqpJmsMessageFacade(createMockAmqpConnection()); + } + + protected AmqpJmsMessageFacade createReceivedMessageFacade(AmqpConsumer amqpConsumer, Message message) { + return new AmqpJmsMessageFacade(amqpConsumer, message); + } + + protected AmqpJmsTextMessageFacade createNewTextMessageFacade() { + return new AmqpJmsTextMessageFacade(createMockAmqpConnection()); + } + + protected AmqpJmsTextMessageFacade createReceivedTextMessageFacade(AmqpConsumer amqpConsumer, Message message) { + return new AmqpJmsTextMessageFacade(amqpConsumer, message); + } + + protected AmqpJmsMapMessageFacade createNewMapMessageFacade() { + return new AmqpJmsMapMessageFacade(createMockAmqpConnection()); + } + + protected AmqpJmsMapMessageFacade createReceivedMapMessageFacade(AmqpConsumer amqpConsumer, Message message) { + return new AmqpJmsMapMessageFacade(amqpConsumer, message); + } + + protected AmqpJmsStreamMessageFacade createNewStreamMessageFacade() { + return new AmqpJmsStreamMessageFacade(createMockAmqpConnection()); + } + + protected AmqpJmsStreamMessageFacade createReceivedStreamMessageFacade(AmqpConsumer amqpConsumer, Message message) { + return new AmqpJmsStreamMessageFacade(amqpConsumer, message); + } + + protected AmqpConsumer createMockAmqpConsumer() { + AmqpConsumer consumer = Mockito.mock(AmqpConsumer.class); + Mockito.when(consumer.getConnection()).thenReturn(createMockAmqpConnection()); + Mockito.when(consumer.getDestination()).thenReturn(consumerDestination); + return consumer; + } + + protected AmqpConnection createMockAmqpConnection() { + return Mockito.mock(AmqpConnection.class); + } +} http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/fe1114d2/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsStreamMessageFacadeTest.java ---------------------------------------------------------------------- diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsStreamMessageFacadeTest.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsStreamMessageFacadeTest.java index ec0e3bd..e661275 100644 --- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsStreamMessageFacadeTest.java +++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsStreamMessageFacadeTest.java @@ -32,11 +32,6 @@ import java.util.Map; import javax.jms.MessageEOFException; -import org.apache.qpid.jms.JmsDestination; -import org.apache.qpid.jms.JmsTopic; -import org.apache.qpid.jms.provider.amqp.AmqpConnection; -import org.apache.qpid.jms.provider.amqp.AmqpConsumer; -import org.apache.qpid.jms.test.QpidJmsTestCase; import org.apache.qpid.proton.amqp.Binary; import org.apache.qpid.proton.amqp.Symbol; import org.apache.qpid.proton.amqp.messaging.AmqpSequence; @@ -45,21 +40,9 @@ import org.apache.qpid.proton.amqp.messaging.Data; import org.apache.qpid.proton.amqp.messaging.MessageAnnotations; import org.apache.qpid.proton.amqp.messaging.Section; import org.apache.qpid.proton.message.Message; -import org.junit.Before; import org.junit.Test; -import org.mockito.Mockito; -public class AmqpJmsStreamMessageFacadeTest extends QpidJmsTestCase { - - private JmsDestination consumerDestination; - - @Before - @Override - public void setUp() throws Exception { - super.setUp(); - - consumerDestination = new JmsTopic("TestTopic"); - }; +public class AmqpJmsStreamMessageFacadeTest extends AmqpJmsMessageTypesTestCase { @Test public void testNewMessageToSendContainsMessageTypeAnnotation() throws Exception { @@ -346,26 +329,4 @@ public class AmqpJmsStreamMessageFacadeTest extends QpidJmsTestCase { amqpStreamMessageFacade.clearBody(); amqpStreamMessageFacade.put("myString"); } - - // ====== Utility Methods ======= - // ============================== - - private AmqpJmsStreamMessageFacade createNewStreamMessageFacade() { - return new AmqpJmsStreamMessageFacade(createMockAmqpConnection()); - } - - private AmqpJmsStreamMessageFacade createReceivedStreamMessageFacade(AmqpConsumer amqpConsumer, Message message) { - return new AmqpJmsStreamMessageFacade(amqpConsumer, message); - } - - private AmqpConsumer createMockAmqpConsumer() { - AmqpConsumer consumer = Mockito.mock(AmqpConsumer.class); - Mockito.when(consumer.getConnection()).thenReturn(createMockAmqpConnection()); - Mockito.when(consumer.getDestination()).thenReturn(consumerDestination); - return consumer; - } - - private AmqpConnection createMockAmqpConnection() { - return Mockito.mock(AmqpConnection.class); - } } \ No newline at end of file --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
