Merged bug25538 into stable

Author: Emile Joubert

test/src/com/rabbitmq/client/test/BrokerTestCase.java

@@ -27,6 +27,7 @@
 import com.rabbitmq.client.ConnectionFactory;
 import com.rabbitmq.client.GetResponse;
 import com.rabbitmq.client.MessageProperties;
+import com.rabbitmq.client.Method;
 import com.rabbitmq.client.ShutdownSignalException;
 import com.rabbitmq.client.AlreadyClosedException;
 import com.rabbitmq.client.impl.ShutdownNotifierComponent;
@@ -82,10 +83,15 @@ protected void releaseResources()
     protected void restart()
             throws IOException {
         tearDown();
-        Host.executeCommand("cd ../rabbitmq-test; make restart-app");
+        bareRestart();
         setUp();
     }
 
+    protected void bareRestart()
+            throws IOException {
+        Host.executeCommand("cd ../rabbitmq-test; make restart-app");
+    }
+
     public void openConnection()
             throws IOException {
         if (connection == null) {
@@ -126,14 +132,20 @@ public void checkShutdownSignal(int expectedCode, AlreadyClosedException ace) {
     }
 
     public void checkShutdownSignal(int expectedCode, ShutdownSignalException sse) {
-        Command closeCommand = (Command) sse.getReason();
+        Object reason = sse.getReason();
+        Method method;
+        if (reason instanceof Command) {
+            method = ((Command) reason).getMethod();
+        } else {
+            method = (Method) reason;
+        }
         channel = null;
         if (sse.isHardError()) {
             connection = null;
-            AMQP.Connection.Close closeMethod = (AMQP.Connection.Close) closeCommand.getMethod();
+            AMQP.Connection.Close closeMethod = (AMQP.Connection.Close) method;
             assertEquals(expectedCode, closeMethod.getReplyCode());
         } else {
-            AMQP.Channel.Close closeMethod = (AMQP.Channel.Close) closeCommand.getMethod();
+            AMQP.Channel.Close closeMethod = (AMQP.Channel.Close) method;
             assertEquals(expectedCode, closeMethod.getReplyCode());
         }
     }

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

@@ -39,5 +39,6 @@ public static void add(TestSuite suite) {
         suite.addTestSuite(MessageRecovery.class);
         suite.addTestSuite(Firehose.class);
         suite.addTestSuite(PersistenceGuarantees.class);
+        suite.addTestSuite(Shutdown.class);
     }
 }

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

@@ -0,0 +1,17 @@
+package com.rabbitmq.client.test.server;
+
+import com.rabbitmq.client.test.BrokerTestCase;
+import com.rabbitmq.client.AMQP;
+import com.rabbitmq.client.Channel;
+import com.rabbitmq.client.Connection;
+
+import java.io.IOException;
+
+public class Shutdown extends BrokerTestCase {
+
+    public void testErrorOnShutdown() throws Exception {
+        bareRestart();
+        expectError(AMQP.CONNECTION_FORCED);
+    }
+
+}