move unbind tests to where they belong

Author: Matthias Radestock

test/src/com/rabbitmq/client/test/functional/BindingLifecycle.java

@@ -31,6 +31,7 @@
 
 package com.rabbitmq.client.test.functional;
 
+import com.rabbitmq.client.AMQP;
 import com.rabbitmq.client.Channel;
 import com.rabbitmq.client.Connection;
 import com.rabbitmq.client.GetResponse;
@@ -309,6 +310,46 @@ public void testExchangeAutoDeleteDurableManyBindings() throws IOException {
         doAutoDelete(true, 10);
     }
 
+    /**
+     * Test the behaviour of queue.unbind
+     */
+    public void testUnbind() throws Exception {
+
+        Binding b = new Binding(channel.queueDeclare().getQueue(),
+                                "amq.direct",
+                                "quay");
+
+        // failure cases
+
+        Binding[] tests = new Binding[] {
+            new Binding("unknown_queue", b.x, b.k),
+            new Binding(b.q, "unknown_exchange", b.k),
+            new Binding("unknown_unknown", "exchange_queue", b.k),
+            // see bug 20633
+            // new Binding(b.q, b.x, "unknown_rk"),
+            new Binding("unknown_queue", "unknown_exchange", "unknown_rk")
+        };
+
+        for (int i = 0; i < tests.length; i++) {
+
+            Binding test = tests[i];
+            try {
+                channel.queueUnbind(test.q, test.x, test.k);
+                fail("expected not_found in test " + i);
+            } catch (IOException ee) {
+                checkShutdownSignal(AMQP.NOT_FOUND, ee);
+                openChannel();
+            }
+        }
+
+        // success case
+
+        channel.queueBind(b.q, b.x, b.k);
+        sendRoutable(b);
+        channel.queueUnbind(b.q, b.x, b.k);
+        sendUnroutable(b);
+    }
+
     private void doAutoDelete(boolean durable, int queues) throws IOException {
 
         String[] queueNames = null;

test/src/com/rabbitmq/client/test/functional/Routing.java

@@ -217,43 +217,4 @@ public void testHeadersRouting() throws Exception {
 	checkGet(Q2, false);
     }
 
-    public void testUnbind() throws Exception {
-
-        String x = "amq.direct";
-        String q = "testUnbind";
-        String routingKey = "quay";
-
-        AMQP.Queue.DeclareOk ok = channel.queueDeclare(q);
-        channel.queueBind(q, x, routingKey);
-        channel.basicPublish(x, routingKey, null, "foobar".getBytes());
-        checkGet(q, true);
-
-        String[][] tests = new String[][] {
-            new String[] {"unknown_queue", x, routingKey},
-            new String[] {q, "unknown_exchange", routingKey},
-            new String[] {"unknown_queue", "unknown_exchange", routingKey},
-            // see bug 20633
-            // new String[] {q, x, "unknown_rk"},
-            new String[] {"unknown_queue", "unknown_exchange", "unknown_rk"}
-        };
-
-        for (int i = 0; i < tests.length; i++) {
-
-            String[] test = tests[i];
-            try {
-                channel.queueUnbind(test[0], test[1], test[2]);
-                fail("expected not_found in test " + i);
-            } catch (IOException ee) {
-                checkShutdownSignal(AMQP.NOT_FOUND, ee);
-                openChannel();
-            }
-        }
-
-        channel.queueUnbind(q, x, routingKey);
-
-        channel.basicPublish(x, routingKey, null, "foobar".getBytes());
-        checkGet(q, false);
-
-        channel.queueDelete(q);
-    }
 }