more versatile 'expected error' handling

until bug25663 gets fixed

Author: rade

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;
@@ -126,14 +127,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());
         }
     }