1) Only reopen the channel

2) Fix another race
3) Use basic.qos consistently after publish
4) Reduce duplication

Author: Simon MacMullen

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

@@ -190,7 +190,7 @@ public void with(String name) throws IOException {
                     channel.basicPublish(name, "", null, "foo".getBytes());
                     //followed by a dummy synchronous command in order
                     //to catch any errors
-                    ((AMQChannel)channel).exnWrappingRpc(new AMQImpl.Channel.Flow(true));
+                    channel.basicQos(0);
                 }});
     }
 
@@ -277,7 +277,7 @@ public void with(String _) throws IOException {
         expectExceptionRun(AMQP.ACCESS_REFUSED, new WithName() {
                 public void with(String _) throws IOException {
                     channel.basicPublish("write", "", null, "foo".getBytes());
-                    channel.queueDeclare();
+                    channel.basicQos(0);
                 }}
         );
         expectExceptionRun(AMQP.ACCESS_REFUSED, new WithName() {
@@ -299,15 +299,11 @@ protected void expectExceptionRun(int exceptionCode, WithName action)
             action.with("");
             fail();
         } catch (IOException e) {
-            ShutdownSignalException sse = (ShutdownSignalException)e.getCause();
-            if (sse.isHardError()) {
-                fail("Got a hard-error.  Was expecting soft-error: " + exceptionCode);
-            } else {
-                AMQP.Channel.Close closeMethod =
-                    (AMQP.Channel.Close) ((Command)sse.getReason()).getMethod();
-                assertEquals(exceptionCode, closeMethod.getReplyCode());
-            }
-            channel = channel.getConnection().createChannel();
+            checkShutdownSignal(exceptionCode, e);
+            openChannel();
+        } catch (AlreadyClosedException e) {
+            checkShutdownSignal(exceptionCode, e);
+            openChannel();
         }
     }
 
@@ -349,11 +345,9 @@ protected void runTest(boolean exp, String name, WithName test)
             assertTrue(msg, exp);
         } catch (IOException e) {
             checkShutdownSignal(AMQP.ACCESS_REFUSED, e);
-            openConnection();
             openChannel();
         } catch (AlreadyClosedException e) {
             checkShutdownSignal(AMQP.ACCESS_REFUSED, e);
-            openConnection();
             openChannel();
         }
     }