QPID-4521: ensure that the routing key is properly passed to the alternate Topic exchange by the adapter. Add unit tests for the adapter methods.

merged from trunk r1425515


git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.20@1430321 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 98 insertions, 1 deletions

diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/InboundMessageAdapter.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/InboundMessageAdapter.java
index bbc33ca846..d7dbd58537 100755
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/InboundMessageAdapter.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/InboundMessageAdapter.java
@@ -47,7 +47,7 @@ public class InboundMessageAdapter implements InboundMessage
 
     public AMQShortString getRoutingKeyShortString()
     {
-        return AMQShortString.valueOf(_entry.getMessage());
+        return AMQShortString.valueOf(_entry.getMessage().getRoutingKey());
     }
 
     public String getRoutingKey()
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/InboundMessageAdapterTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/InboundMessageAdapterTest.java
new file mode 100644
index 0000000000..2f160678ba
--- /dev/null
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/InboundMessageAdapterTest.java
@@ -0,0 +1,97 @@
+/*
+ *
+ * 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.server.queue;
+
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import org.apache.qpid.framing.AMQShortString;
+import org.apache.qpid.server.message.AMQMessageHeader;
+import org.apache.qpid.server.message.ServerMessage;
+import org.apache.qpid.test.utils.QpidTestCase;
+
+public class InboundMessageAdapterTest extends QpidTestCase
+{
+    private ServerMessage<?> _mockMessage;
+    private QueueEntry _mockQueueEntry;
+    private InboundMessageAdapter _inboundMessageAdapter;
+
+    @Override
+    protected void setUp() throws Exception
+    {
+        super.setUp();
+        _mockMessage = mock(ServerMessage.class);
+        _mockQueueEntry = mock(QueueEntry.class);
+        when(_mockQueueEntry.getMessage()).thenReturn(_mockMessage);
+
+        _inboundMessageAdapter = new InboundMessageAdapter(_mockQueueEntry);
+    }
+
+    public void testGetRoutingKey() throws Exception
+    {
+        String routingKey = getTestName();
+        when(_mockMessage.getRoutingKey()).thenReturn(routingKey);
+
+        assertEquals("Unexpected value for routing key", routingKey, _inboundMessageAdapter.getRoutingKey());
+    }
+
+    public void testGetRoutingKeyShortString() throws Exception
+    {
+        String routingKey = getTestName();
+        when(_mockMessage.getRoutingKey()).thenReturn(routingKey);
+
+        AMQShortString routingKeyShortString = AMQShortString.valueOf(routingKey);
+        assertEquals("Unexpected value for routing key short string", routingKeyShortString, _inboundMessageAdapter.getRoutingKeyShortString());
+    }
+
+    public void testGetMessageHeader() throws Exception
+    {
+        AMQMessageHeader mockMessageHeader = mock(AMQMessageHeader.class);
+        when(_mockQueueEntry.getMessageHeader()).thenReturn(mockMessageHeader);
+
+        assertSame("unexpected message header", mockMessageHeader, _inboundMessageAdapter.getMessageHeader());
+    }
+
+    public void testIsRedelivered() throws Exception
+    {
+        when(_mockQueueEntry.isRedelivered()).thenReturn(true);
+        assertTrue("unexpected isRedelivered value", _inboundMessageAdapter.isRedelivered());
+
+        when(_mockQueueEntry.isRedelivered()).thenReturn(false);
+        assertFalse("unexpected isRedelivered value", _inboundMessageAdapter.isRedelivered());
+    }
+
+    public void testIsPersistent() throws Exception
+    {
+        when(_mockQueueEntry.isPersistent()).thenReturn(true);
+        assertTrue("unexpected isPersistent value", _inboundMessageAdapter.isPersistent());
+
+        when(_mockQueueEntry.isPersistent()).thenReturn(false);
+        assertFalse("unexpected isPersistent value", _inboundMessageAdapter.isPersistent());
+    }
+
+    public void testGetSize() throws Exception
+    {
+        long size = 32526215;
+        when(_mockQueueEntry.getSize()).thenReturn(size);
+        assertEquals("unexpected getSize value", size, _inboundMessageAdapter.getSize());
+    }
+}