Merge bug22964 into default

Author: Simon MacMullen

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

@@ -86,7 +86,7 @@ protected void addRestrictedAccount()
         runCtl("add_vhost /test");
         runCtl("set_permissions -p /test test configure write read");
         runCtl("set_permissions -p /test testadmin \".*\" \".*\" \".*\"");
-        runCtl("set_permissions -p /test noaccess \"\" \"\" \"\"");
+        runCtl("set_permissions -p /test -s all noaccess \"\" \"\" \"\"");
     }
 
     protected void deleteRestrictedAccount()
@@ -270,6 +270,11 @@ public void with(String _) throws IOException {
                     noAccessCh.queueDeclare("justaqueue", false, false, true, null);
                 }}
         );
+        expectExceptionRun(AMQP.ACCESS_REFUSED, new WithName() {
+                public void with(String _) throws IOException {
+                    noAccessCh.queueDeclare();
+                }}
+        );
         expectExceptionRun(AMQP.ACCESS_REFUSED, new WithName() {
                 public void with(String _) throws IOException {
                     noAccessCh.queueDelete("configure");