QPID-1487: Make AMQDestination generate URLs with a destination set to the routing key. Add a test for this.

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@720919 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 43 insertions, 1 deletions

diff --git a/qpid/java/client/src/main/java/org/apache/qpid/client/AMQDestination.java b/qpid/java/client/src/main/java/org/apache/qpid/client/AMQDestination.java
index 4f157d89ea..750599b350 100644
--- a/qpid/java/client/src/main/java/org/apache/qpid/client/AMQDestination.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/AMQDestination.java
@@ -270,7 +270,7 @@ public abstract class AMQDestination implements Destination, Referenceable
             sb.append("://");
             sb.append(_exchangeName);
 
-            sb.append("//");
+            sb.append("/"+_routingKey+"/");
 
             if (_queueName != null)
             {
diff --git a/qpid/java/client/src/test/java/org/apache/qpid/client/AMQQueueTest.java b/qpid/java/client/src/test/java/org/apache/qpid/client/AMQQueueTest.java
new file mode 100644
index 0000000000..7789f87ace
--- /dev/null
+++ b/qpid/java/client/src/test/java/org/apache/qpid/client/AMQQueueTest.java
@@ -0,0 +1,42 @@
+/*
+ *
+ * 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.client;
+
+import org.apache.qpid.framing.AMQShortString;
+
+import junit.framework.TestCase;
+
+public class AMQQueueTest extends TestCase
+{
+    AMQShortString exchange = new AMQShortString("test.exchange");
+    AMQShortString routingkey = new AMQShortString("test-route");
+    AMQShortString qname = new AMQShortString("test-queue");
+    AMQShortString[] oneBinding = new AMQShortString[]{new AMQShortString("bindingA")};
+    AMQShortString[] bindings = new AMQShortString[]{new AMQShortString("bindingB"), 
+                                                     new AMQShortString("bindingC")};
+
+    public void testToURLNoBindings()
+    {
+        AMQQueue dest = new AMQQueue(exchange, routingkey, qname);
+        String url = dest.toURL();
+        assertEquals("direct://test.exchange/test-route/test-queue?routingkey='test-route'", url);
+    }
+}