start on unit tests for AmqpJmsObjectMessageFacade
Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/5c46a63c Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/5c46a63c Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/5c46a63c Branch: refs/heads/master Commit: 5c46a63c38f8404fcb0dc5607baf690b0edacae1 Parents: 8aa3d4d Author: Robert Gemmell <rob...@apache.org> Authored: Fri Oct 10 12:54:15 2014 +0100 Committer: Robert Gemmell <rob...@apache.org> Committed: Fri Oct 10 12:54:15 2014 +0100 ---------------------------------------------------------------------- .../message/AmqpJmsMessageTypesTestCase.java | 8 ++ .../message/AmqpJmsObjectMessageFacadeTest.java | 84 ++++++++++++++++++++ 2 files changed, 92 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/5c46a63c/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 index a39afcd..8ad585f 100644 --- 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 @@ -78,6 +78,14 @@ public class AmqpJmsMessageTypesTestCase extends QpidJmsTestCase { return new AmqpJmsStreamMessageFacade(amqpConsumer, message); } + protected AmqpJmsObjectMessageFacade createNewObjectMessageFacade(boolean javaSerialized) { + return new AmqpJmsObjectMessageFacade(createMockAmqpConnection(), javaSerialized); + } + + protected AmqpJmsObjectMessageFacade createReceivedObjectMessageFacade(AmqpConsumer amqpConsumer, Message message) { + return new AmqpJmsObjectMessageFacade(amqpConsumer, message); + } + protected AmqpConsumer createMockAmqpConsumer() { AmqpConsumer consumer = Mockito.mock(AmqpConsumer.class); Mockito.when(consumer.getConnection()).thenReturn(createMockAmqpConnection()); http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/5c46a63c/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsObjectMessageFacadeTest.java ---------------------------------------------------------------------- diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsObjectMessageFacadeTest.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsObjectMessageFacadeTest.java new file mode 100644 index 0000000..4b3e422 --- /dev/null +++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/amqp/message/AmqpJmsObjectMessageFacadeTest.java @@ -0,0 +1,84 @@ +/** + * 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 static org.apache.qpid.jms.provider.amqp.message.AmqpMessageSupport.JMS_MSG_TYPE; +import static org.apache.qpid.jms.provider.amqp.message.AmqpMessageSupport.JMS_OBJECT_MESSAGE; +import static org.apache.qpid.jms.provider.amqp.message.AmqpMessageSupport.getSymbol; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; + +import java.util.Map; + +import org.apache.qpid.proton.amqp.Symbol; +import org.apache.qpid.proton.amqp.messaging.MessageAnnotations; +import org.apache.qpid.proton.message.Message; +import org.junit.Test; + +/** + * Tests for class AmqpJmsObjectMessageFacade + */ +public class AmqpJmsObjectMessageFacadeTest extends AmqpJmsMessageTypesTestCase { + + // ---------- Test initial state of newly created message -----------------// + + @Test + public void testNewMessageToSendContainsMessageTypeAnnotation() throws Exception { + AmqpJmsObjectMessageFacade amqpObjectMessageFacade = createNewObjectMessageFacade(true); + + Message protonMessage = amqpObjectMessageFacade.getAmqpMessage(); + MessageAnnotations annotations = protonMessage.getMessageAnnotations(); + Map<Symbol, Object> annotationsMap = annotations.getValue(); + + assertNotNull("MessageAnnotations section was not present", annotations); + assertNotNull("MessageAnnotations section value was not present", annotationsMap); + + assertTrue("expected message type annotation to be present", annotationsMap.containsKey(AmqpMessageSupport.getSymbol(JMS_MSG_TYPE))); + assertEquals("unexpected value for message type annotation value", JMS_OBJECT_MESSAGE, annotationsMap.get(getSymbol(JMS_MSG_TYPE))); + assertEquals(JMS_OBJECT_MESSAGE, amqpObjectMessageFacade.getJmsMsgType()); + } + + @Test + public void testNewMessageToSendReturnsNullObject() throws Exception { + doNewMessageToSendReturnsNullObjectTestImpl(true); + } + + @Test + public void testNewAmqpTypedMessageToSendReturnsNullObject() throws Exception { + doNewMessageToSendReturnsNullObjectTestImpl(false); + } + + private void doNewMessageToSendReturnsNullObjectTestImpl(boolean javaSerialized) throws Exception { + AmqpJmsObjectMessageFacade amqpObjectMessageFacade = createNewObjectMessageFacade(javaSerialized); + amqpObjectMessageFacade.clearBody(); + assertNull(amqpObjectMessageFacade.getObject()); + } + + // ---------- test for normal message operations -------------------------// + + // ---------- test handling of received messages -------------------------// + + @Test + public void testGetObjectUsingReceivedMessageWithNoBodySectionReturnsNull() throws Exception { + Message message = Message.Factory.create(); + AmqpJmsObjectMessageFacade amqpObjectMessageFacade = createReceivedObjectMessageFacade(createMockAmqpConsumer(), message); + + assertNull("Expected null object", amqpObjectMessageFacade.getObject()); + } +} --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org