You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by or...@apache.org on 2019/08/21 16:35:43 UTC

[qpid-broker-j] 01/21: QPID-8349: [Tests][AMQP 1.0] Log sent and received performatives in test interaction

This is an automated email from the ASF dual-hosted git repository.

orudyy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/qpid-broker-j.git

commit 6e4d71679c92663d1d61fc93d9b17f4c20793bcb
Author: Alex Rudyy <or...@apache.org>
AuthorDate: Mon Aug 19 14:16:09 2019 +0100

    QPID-8349: [Tests][AMQP 1.0] Log sent and received performatives in test interaction
---
 .../java/org/apache/qpid/tests/protocol/v1_0/FrameDecoder.java    | 7 ++++++-
 .../java/org/apache/qpid/tests/protocol/v1_0/FrameEncoder.java    | 8 +++++++-
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/systests/protocol-tests-amqp-1-0/src/main/java/org/apache/qpid/tests/protocol/v1_0/FrameDecoder.java b/systests/protocol-tests-amqp-1-0/src/main/java/org/apache/qpid/tests/protocol/v1_0/FrameDecoder.java
index a8ab32e..39b16fa 100644
--- a/systests/protocol-tests-amqp-1-0/src/main/java/org/apache/qpid/tests/protocol/v1_0/FrameDecoder.java
+++ b/systests/protocol-tests-amqp-1-0/src/main/java/org/apache/qpid/tests/protocol/v1_0/FrameDecoder.java
@@ -60,6 +60,7 @@ import org.apache.qpid.tests.protocol.Response;
 
 public class FrameDecoder implements InputDecoder
 {
+    private static final Logger FRAME_LOGGER = LoggerFactory.getLogger("amqp.frame");
     private static final Logger LOGGER = LoggerFactory.getLogger(FrameDecoder.class);
     private static final AMQPDescribedTypeRegistry TYPE_REGISTRY = AMQPDescribedTypeRegistry.newInstance()
                                                                                             .registerTransportLayer()
@@ -104,7 +105,10 @@ public class FrameDecoder implements InputDecoder
                     {
                         byte[] header = new byte[8];
                         inputBuffer.get(header);
-                        _connectionHandler._responseQueue.add(new HeaderResponse(header));
+
+                        HeaderResponse headerResponse = new HeaderResponse(header);
+                        FRAME_LOGGER.debug("RECV:" + headerResponse);
+                        _connectionHandler._responseQueue.add(headerResponse);
                         _state = ParsingState.PERFORMATIVES;
                     }
                     break;
@@ -250,6 +254,7 @@ public class FrameDecoder implements InputDecoder
                     throw new UnsupportedOperationException("Unexpected frame type : " + val.getClass());
                 }
 
+                FRAME_LOGGER.debug("RECV:" + response.getBody());
                 _responseQueue.add(response);
             }
         }
diff --git a/systests/protocol-tests-amqp-1-0/src/main/java/org/apache/qpid/tests/protocol/v1_0/FrameEncoder.java b/systests/protocol-tests-amqp-1-0/src/main/java/org/apache/qpid/tests/protocol/v1_0/FrameEncoder.java
index 748407f..1a99d3d 100644
--- a/systests/protocol-tests-amqp-1-0/src/main/java/org/apache/qpid/tests/protocol/v1_0/FrameEncoder.java
+++ b/systests/protocol-tests-amqp-1-0/src/main/java/org/apache/qpid/tests/protocol/v1_0/FrameEncoder.java
@@ -24,6 +24,9 @@ import java.nio.ByteBuffer;
 import java.util.ArrayList;
 import java.util.List;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import org.apache.qpid.server.bytebuffer.QpidByteBuffer;
 import org.apache.qpid.server.protocol.v1_0.codec.FrameWriter;
 import org.apache.qpid.server.protocol.v1_0.framing.AMQFrame;
@@ -35,6 +38,7 @@ import org.apache.qpid.tests.protocol.v1_0.extensions.type.TestFilterWriter;
 
 public class FrameEncoder implements OutputEncoder
 {
+    private static final Logger FRAME_LOGGER = LoggerFactory.getLogger("amqp.frame");
     private static final AMQPDescribedTypeRegistry TYPE_REGISTRY = AMQPDescribedTypeRegistry.newInstance()
                                                                                             .registerTransportLayer()
                                                                                             .registerMessagingLayer()
@@ -79,7 +83,9 @@ public class FrameEncoder implements OutputEncoder
 
                 }
             });
-            _frameWriter.send(((AMQFrame) msg));
+            AMQFrame frame = (AMQFrame) msg;
+            FRAME_LOGGER.debug("SEND: " + frame.getFrameBody());
+            _frameWriter.send(frame);
 
             int remaining = 0;
             for (ByteBuffer byteBuffer: buffers)


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org