test cycle breaking

Author: Matthias Radestock

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

@@ -56,7 +56,7 @@ private static boolean[] expected(String key) {
         return expected;
     }
 
-    protected void setUp() throws IOException {
+    @Override protected void setUp() throws IOException {
         super.setUp();
         channel.setReturnListener(new ReturnListener() {
                 public void handleBasicReturn(int replyCode,
@@ -71,6 +71,18 @@ public void handleBasicReturn(int replyCode,
             });
     }
 
+    @Override protected void createResources() throws IOException {
+        for (String q : resources) {
+            channel.queueDeclare(q);
+        }
+    }
+
+    @Override protected void releaseResources() throws IOException {
+        for (String q : resources) {
+            channel.queueDelete(q);
+        }
+    }
+
     protected void setupRouting(String x, String ume) throws IOException {
         Map<String, Object> args = new HashMap<String, Object>();
         if (ume != null) args.put("ume", ume);
@@ -122,10 +134,6 @@ protected void check(String key, boolean ret) throws IOException {
 
     public void testUme() throws IOException {
 
-        for (String q : resources) {
-            channel.queueDeclare(q, false, false, true, false, null);
-        }
-
         //check various cases of missing UMEs - we expect to see some
         //warnings in the server logs
 
@@ -167,11 +175,22 @@ public void testUme() throws IOException {
         }
 
         //cleanup
-        for (String r : resources) {
-            channel.exchangeDelete(r);
-            channel.queueDelete(r);
+        for (String e : resources) {
+            channel.exchangeDelete(e);
         }
 
     }
 
+    public void testCycleBreaking() throws IOException {
+        setupRouting("x", "u");
+        setupRouting("u", "v");
+        setupRouting("v", "x");
+
+        check("z", false);
+
+        for (String e : resources) {
+            channel.exchangeDelete(e);
+        }
+    }
+
 }