NO-JIRA: clean up a little
Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/a5e049aa Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/a5e049aa Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/a5e049aa Branch: refs/heads/master Commit: a5e049aab5e6ce1aa36022c262e5c5f34c785896 Parents: 848b100 Author: Robert Gemmell <[email protected]> Authored: Tue Jun 16 11:52:55 2015 +0100 Committer: Robert Gemmell <[email protected]> Committed: Tue Jun 16 11:52:55 2015 +0100 ---------------------------------------------------------------------- .../qpid/jms/test/testpeer/TestAmqpPeer.java | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/a5e049aa/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/TestAmqpPeer.java ---------------------------------------------------------------------- diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/TestAmqpPeer.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/TestAmqpPeer.java index 29a0634..b1aad6d 100644 --- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/TestAmqpPeer.java +++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/TestAmqpPeer.java @@ -93,13 +93,15 @@ import org.junit.Assert; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -// TODO should expectXXXYYYZZZ methods just be expect(matcher)? public class TestAmqpPeer implements AutoCloseable { + private static final Logger LOGGER = LoggerFactory.getLogger(TestAmqpPeer.class.getName()); + private static final Symbol ANONYMOUS = Symbol.valueOf("ANONYMOUS"); private static final Symbol EXTERNAL = Symbol.valueOf("EXTERNAL"); private static final Symbol PLAIN = Symbol.valueOf("PLAIN"); - private static final Logger LOGGER = LoggerFactory.getLogger(TestAmqpPeer.class.getName()); + private static final UnsignedByte SASL_OK = UnsignedByte.valueOf((byte)0); + private static final UnsignedByte SASL_FAIL_AUTH = UnsignedByte.valueOf((byte)1); private static final int CONNECTION_CHANNEL = 0; private final TestAmqpPeerRunner _driverRunnable; @@ -204,7 +206,7 @@ public class TestAmqpPeer implements AutoCloseable return _emptyFrameCount; } - public void receiveHeader(byte[] header) + void receiveHeader(byte[] header) { Handler handler = getFirstHandler(); if(handler instanceof HeaderHandler) @@ -221,7 +223,7 @@ public class TestAmqpPeer implements AutoCloseable } } - public void receiveFrame(int type, int channel, DescribedType describedType, Binary payload) + void receiveFrame(int type, int channel, DescribedType describedType, Binary payload) { Handler handler = getFirstHandler(); if(handler instanceof FrameHandler) @@ -238,7 +240,7 @@ public class TestAmqpPeer implements AutoCloseable } } - public void receiveEmptyFrame(int type, int channel) + void receiveEmptyFrame(int type, int channel) { _emptyFrameCount ++; LOGGER.debug("Received empty frame"); @@ -314,7 +316,7 @@ public class TestAmqpPeer implements AutoCloseable sendFrame(FrameType.AMQP, 0, null, null, deferWrite); } - public void sendFrame(FrameType type, int channel, DescribedType frameDescribedType, Binary framePayload, boolean deferWrite) + void sendFrame(FrameType type, int channel, DescribedType frameDescribedType, Binary framePayload, boolean deferWrite) { if(channel < 0) { @@ -386,7 +388,7 @@ public class TestAmqpPeer implements AutoCloseable { TestAmqpPeer.this.sendFrame( FrameType.SASL, 0, - new SaslOutcomeFrame().setCode(UnsignedByte.valueOf((byte)0)), + new SaslOutcomeFrame().setCode(SASL_OK), null, false); @@ -499,7 +501,7 @@ public class TestAmqpPeer implements AutoCloseable { TestAmqpPeer.this.sendFrame( FrameType.SASL, 0, - new SaslOutcomeFrame().setCode(UnsignedByte.valueOf((byte)1)), + new SaslOutcomeFrame().setCode(SASL_FAIL_AUTH), null, false); _driverRunnable.expectHeader(); @@ -547,7 +549,7 @@ public class TestAmqpPeer implements AutoCloseable { TestAmqpPeer.this.sendFrame( FrameType.SASL, 0, - new SaslOutcomeFrame().setCode(UnsignedByte.valueOf((byte)0)), + new SaslOutcomeFrame().setCode(SASL_OK), null, false); _driverRunnable.expectHeader(); --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
