Merge bug23093

Author: Michael Bridgen

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

@@ -13,13 +13,53 @@
  * Test that the server correctly handles us when we send it bad frames
  */
 public class UnexpectedFrames extends BrokerTestCase {
+
     private interface Confuser {
         public Frame confuse(Frame frame) throws IOException;
     }
 
-    @Override protected void setUp() throws IOException {}
+    private static class ConfusedFrameHandler extends SocketFrameHandler {
+
+        private boolean confusedOnce = false;
+
+        public ConfusedFrameHandler(Socket socket) throws IOException {
+            super(socket);
+        }
+
+        @Override
+        public void writeFrame(Frame frame) throws IOException {
+            if (confusedOnce) {
+                super.writeFrame(frame);
+            } else {
+                Frame confusedFrame = confuser.confuse(frame);
+                if (confusedFrame != frame) confusedOnce = true;
+                if (confusedFrame != null) {
+                    super.writeFrame(confusedFrame);
+                }
+            }
+        }
+
+        public Confuser confuser = new Confuser() {
+            public Frame confuse(Frame frame) {
+                // Do nothing to start with, we need to negotiate before the
+                // server will send us unexpected_frame errors
+                return frame;
+            }
+        };
+    }
 
-    @Override protected void tearDown() throws IOException {}
+    private static class ConfusedConnectionFactory extends ConnectionFactory {
+
+        @Override protected FrameHandler createFrameHandler(Socket sock)
+            throws IOException {
+            return new ConfusedFrameHandler(sock);
+        }
+    }
+
+    public UnexpectedFrames() {
+        super();
+        connectionFactory = new ConfusedConnectionFactory();
+    }
 
     public void testMissingHeader() throws IOException {
         expectUnexpectedFrameError(new Confuser() {
@@ -38,7 +78,11 @@ public Frame confuse(Frame frame) {
                 if (frame.type == AMQP.FRAME_METHOD) {
                     // We can't just skip the method as that will lead us to
                     // send 0 bytes and hang waiting for a response.
-                    frame.type = AMQP.FRAME_HEADER;
+                    Frame confusedFrame = new Frame(AMQP.FRAME_HEADER,
+                                                    frame.channel,
+                                                    frame.payload);
+                    confusedFrame.accumulator = frame.accumulator;
+                    return confusedFrame;
                 }
                 return frame;
             }
@@ -73,53 +117,16 @@ public Frame confuse(Frame frame) throws IOException {
         });
     }
 
-    private void expectUnexpectedFrameError(Confuser confuser) throws IOException {
-        ConnectionFactory factory = new ConnectionFactory();
-        Socket socket = factory.getSocketFactory().createSocket("localhost",
-                AMQP.PROTOCOL.PORT);
-        ConfusedFrameHandler handler = new ConfusedFrameHandler(socket);
-        AMQConnection connection = new AMQConnection(factory, handler);
-        connection.start();
-        Channel channel = connection.createChannel();
-
-        handler.confuser = confuser;
-
-        try {
-            //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) {
-            checkShutdownSignal(AMQP.UNEXPECTED_FRAME, e);
-        }
-    }
+    private void expectUnexpectedFrameError(Confuser confuser)
+        throws IOException {
 
-    private static class ConfusedFrameHandler extends SocketFrameHandler {
-        public ConfusedFrameHandler(Socket socket) throws IOException {
-            super(socket);
-        }
+        ((ConfusedFrameHandler)((AMQConnection)connection).getFrameHandler()).
+            confuser = confuser;
 
-        @Override
-        public void writeFrame(Frame frame) throws IOException {
-            Frame confusedFrame = new Frame();
-            confusedFrame.accumulator = frame.accumulator;
-            confusedFrame.channel = frame.channel;
-            confusedFrame.type = frame.type;
-
-            confusedFrame = confuser.confuse(confusedFrame);
-            if (confusedFrame != null) {
-                super.writeFrame(confusedFrame);
-            }
-        }
-
-        public Confuser confuser = new Confuser() {
-            public Frame confuse(Frame frame) {
-                // Do nothing to start with, we need to negotiate before the
-                // server will send us unexpected_frame errors
-                return frame;
-            }
-        };
+        //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());
+        expectError(AMQP.UNEXPECTED_FRAME);
     }
+
 }