Merged bug22908 into default.

Author: Simon MacMullen

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

@@ -35,11 +35,7 @@
 import java.util.HashMap;
 import java.io.IOException;
 
-import com.rabbitmq.client.Channel;
-
-import com.rabbitmq.client.test.BrokerTestCase;
-
-public class ExchangeDeclare extends BrokerTestCase {
+public class ExchangeDeclare extends ExchangeEquivalenceBase {
 
     static final String TYPE = "direct";
 
@@ -49,50 +45,30 @@ public void releaseResources() throws IOException {
         channel.exchangeDelete(NAME);
     }
 
-    public static void verifyEquivalent(Channel channel, String name,
-            String type, boolean durable, boolean autoDelete,
-            Map<String, Object> args) throws IOException {
-        channel.exchangeDeclarePassive(name);
-        channel.exchangeDeclare(name, type, durable, autoDelete, args);
-    }
-
-    // Note: this will close the channel
-    public static void verifyNotEquivalent(Channel channel, String name,
-            String type, boolean durable, boolean autoDelete,
-            Map<String, Object> args) throws IOException {
-        channel.exchangeDeclarePassive(name);
-        try {
-            channel.exchangeDeclare(name, type, durable, autoDelete, args);
-            fail("Exchange was supposed to be not equivalent");
-        } catch (IOException ioe) {
-            return;
-        }
-    }
-
     public void testExchangeNoArgsEquivalence() throws IOException {
         channel.exchangeDeclare(NAME, TYPE, false, false, null);
-        verifyEquivalent(channel, NAME, TYPE, false, false, null);
+        verifyEquivalent(NAME, TYPE, false, false, null);
     }
 
     public void testExchangeNonsenseArgsEquivalent() throws IOException {
         channel.exchangeDeclare(NAME, TYPE, false, false, null);
         Map<String, Object> args = new HashMap<String, Object>();
         args.put("nonsensical-argument-surely-not-in-use", "foo");
-        verifyEquivalent(channel, NAME, TYPE, false, false, args);
+        verifyEquivalent(NAME, TYPE, false, false, args);
     }
 
     public void testExchangeDurableNotEquivalent() throws IOException {
         channel.exchangeDeclare(NAME, TYPE, false, false, null);
-        verifyNotEquivalent(channel, NAME, TYPE, true, false, null);
+        verifyNotEquivalent(NAME, TYPE, true, false, null);
     }
 
     public void testExchangeTypeNotEquivalent() throws IOException {
         channel.exchangeDeclare(NAME, "direct", false, false, null);
-        verifyNotEquivalent(channel, NAME, "fanout", false, false, null);
+        verifyNotEquivalent(NAME, "fanout", false, false, null);
     }
 
     public void testExchangeAutoDeleteNotEquivalent() throws IOException {
         channel.exchangeDeclare(NAME, "direct", false, false, null);
-        verifyNotEquivalent(channel, NAME, "direct", false, true, null);
+        verifyNotEquivalent(NAME, "direct", false, true, null);
     }
 }

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

@@ -0,0 +1,30 @@
+package com.rabbitmq.client.test.functional;
+
+import com.rabbitmq.client.AMQP;
+import com.rabbitmq.client.test.BrokerTestCase;
+
+import java.io.IOException;
+import java.util.Map;
+
+public abstract class ExchangeEquivalenceBase extends BrokerTestCase {
+    public void verifyEquivalent(String name,
+            String type, boolean durable, boolean autoDelete,
+            Map<String, Object> args) throws IOException {
+        channel.exchangeDeclarePassive(name);
+        channel.exchangeDeclare(name, type, durable, autoDelete, args);
+    }
+
+    // Note: this will close the channel
+    public void verifyNotEquivalent(String name,
+            String type, boolean durable, boolean autoDelete,
+            Map<String, Object> args) throws IOException {
+        channel.exchangeDeclarePassive(name);
+        try {
+            channel.exchangeDeclare(name, type, durable, autoDelete, args);
+            fail("Exchange was supposed to be not equivalent");
+        } catch (IOException ioe) {
+            checkShutdownSignal(AMQP.NOT_ALLOWED, ioe);
+            return;
+        }
+    }
+}

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

@@ -34,6 +34,7 @@
 import java.io.IOException;
 import java.util.HashMap;
 
+import com.rabbitmq.client.AMQP;
 import com.rabbitmq.client.Channel;
 import com.rabbitmq.client.Connection;
 import com.rabbitmq.client.QueueingConsumer;

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

@@ -35,6 +35,7 @@
 import java.util.HashMap;
 import java.util.Map;
 
+import com.rabbitmq.client.AMQP;
 import com.rabbitmq.client.QueueingConsumer;
 import com.rabbitmq.client.test.BrokerTestCase;
 
@@ -81,6 +82,10 @@ void verifyNotEquivalent(boolean durable, boolean exclusive,
         try {
             verifyQueue(q, durable, exclusive, autoDelete, null);
         } catch (IOException ioe) {
+            if (exclusive)
+                checkShutdownSignal(AMQP.RESOURCE_LOCKED, ioe);
+            else
+                checkShutdownSignal(AMQP.NOT_ALLOWED, ioe);
             return;
         }
         fail("Queue.declare should have been rejected as not equivalent");

test/src/com/rabbitmq/client/test/server/ExchangeEquivalence.java renamed to test/src/com/rabbitmq/client/test/server/AlternateExchangeEquivalence.java

@@ -35,26 +35,23 @@
 import java.util.HashMap;
 import java.io.IOException;
 
-import com.rabbitmq.client.test.BrokerTestCase;
-import com.rabbitmq.client.test.functional.ExchangeDeclare;
+import com.rabbitmq.client.test.functional.ExchangeEquivalenceBase;
 
-public class ExchangeEquivalence extends BrokerTestCase {
+public class AlternateExchangeEquivalence extends ExchangeEquivalenceBase {
     static Map<String, Object> args = new HashMap<String, Object>();
     {
         args.put("alternate-exchange", "UME");
     }
 
     public void testAlternateExchangeEquivalence() throws IOException {
         channel.exchangeDeclare("alternate", "direct", false, false, args);
-        ExchangeDeclare.verifyEquivalent(channel, "alternate", "direct", false,
-                false, args);
+        verifyEquivalent("alternate", "direct", false, false, args);
     }
 
     public void testAlternateExchangeNonEquivalence() throws IOException {
         channel.exchangeDeclare("alternate", "direct", false, false, args);
         Map<String, Object> altargs = new HashMap<String, Object>();
         altargs.put("alternate-exchange", "somewhere");
-        ExchangeDeclare.verifyNotEquivalent(channel, "alternate", "direct",
-                false, false, altargs);
+        verifyNotEquivalent("alternate", "direct", false, false, altargs);
     }
 }

test/src/com/rabbitmq/client/test/server/ServerTests.java

@@ -42,7 +42,7 @@ public static TestSuite suite() {
         suite.addTestSuite(EffectVisibilityCrossNodeTest.class);
         suite.addTest(PersisterRestartTests.suite());
         suite.addTestSuite(ExclusiveQueueDurability.class);
-        suite.addTestSuite(ExchangeEquivalence.class);
+        suite.addTestSuite(AlternateExchangeEquivalence.class);
         return suite;
     }
 }