merge heads

Author: rade

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

@@ -17,6 +17,10 @@ private interface Confuser {
         public Frame confuse(Frame frame) throws IOException;
     }
 
+    @Override protected void setUp() throws IOException {}
+
+    @Override protected void tearDown() throws IOException {}
+
     public void testMissingHeader() throws IOException {
         expectUnexpectedFrameError(new Confuser() {
             public Frame confuse(Frame frame) {
@@ -81,10 +85,10 @@ private void expectUnexpectedFrameError(Confuser confuser) throws IOException {
         handler.confuser = confuser;
 
         try {
-            String queue = channel.queueDeclare().getQueue();
-            channel.basicPublish("", queue, null, "Hello".getBytes());
-            GetResponse result = channel.basicGet(queue, false);
-            channel.basicAck(result.getEnvelope().getDeliveryTag(), false);
+            //NB: the frame confuser relies on the encoding of the
+            //method field to be at least 8 bytes long
+            channel.basicPublish("", "routing key", null, "Hello".getBytes());
+            channel.basicQos(0);
             fail("We should have seen an UNEXPECTED_FRAME by now");
         }
         catch (IOException e) {