refactor and fix the test - now it *really* does what it says

Author: rade

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

@@ -192,42 +192,40 @@ public void testExchangeRoutingLoop() throws IOException,
      */
     public void testTopicExchange() throws IOException, ShutdownSignalException,
             InterruptedException {
+
         channel.exchangeDeclare("e", "topic");
+
         for (String e : exchanges) {
             channel.exchangeBind(e, "e", e);
         }
-        for (String e : exchanges) {
-            publishWithMarker("e", e);
-        }
-        for (QueueingConsumer c : consumers) {
-            consumeNoDuplicates(c);
-        }
+        publishAndConsumeAll("e");
 
         channel.exchangeDeclare("ef", "direct");
         channel.exchangeBind("ef", "e", "#");
 
         for (String e : exchanges) {
             channel.exchangeBind(e, "ef", e);
         }
+        publishAndConsumeAll("e");
+
         for (String e : exchanges) {
-            publishWithMarker("e", e);
-        }
-        for (QueueingConsumer c : consumers) {
-            consumeNoDuplicates(c);
+            channel.exchangeUnbind(e, "e", e);
         }
+        publishAndConsumeAll("e");
 
         channel.exchangeDelete("ef");
+        channel.exchangeDelete("e");
+    }
+
+    private void publishAndConsumeAll(String exchange)
+        throws IOException, ShutdownSignalException, InterruptedException {
 
         for (String e : exchanges) {
-            channel.exchangeUnbind(e, "e", e);
-        }
-        for (String e : exchanges) {
-            publishWithMarker("e", e);
+            publishWithMarker(exchange, e);
         }
         for (QueueingConsumer c : consumers) {
             consumeNoDuplicates(c);
         }
-
-        channel.exchangeDelete("e");
     }
+
 }