QPID-5825: Changes to address some review comments for initial commit

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1603914 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 38 insertions, 4 deletions

diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/server/SupportedProtocolVersionsTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/SupportedProtocolVersionsTest.java
index 23a00431d1..42f3854d32 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/server/SupportedProtocolVersionsTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/server/SupportedProtocolVersionsTest.java
@@ -26,6 +26,7 @@ import org.apache.qpid.framing.ProtocolVersion;
 import org.apache.qpid.server.configuration.BrokerProperties;
 import org.apache.qpid.server.model.Protocol;
 import org.apache.qpid.server.model.adapter.PortFactoryTest;
+import org.apache.qpid.server.plugin.AMQPProtocolVersionWrapper;
 import org.apache.qpid.test.utils.QpidBrokerTestCase;
 
 /**
@@ -130,5 +131,33 @@ public class SupportedProtocolVersionsTest extends QpidBrokerTestCase
         connection.close();
     }
 
+    public void testProtocolIsExpectedBasedOnTestProfile() throws Exception
+    {
+        super.setUp();
+        final AMQConnection connection = (AMQConnection) getConnection();
+        final Protocol expectedBrokerProtocol = getBrokerProtocol();
+        final AMQPProtocolVersionWrapper amqpProtocolVersionWrapper = new AMQPProtocolVersionWrapper(expectedBrokerProtocol);
+        final ProtocolVersion protocolVersion = connection.getProtocolVersion();
+        assertTrue("Connection AMQP protocol " + expectedBrokerProtocol + "is not the same as the test specified protocol " + protocolVersion,
+                    areEquivalent(amqpProtocolVersionWrapper, protocolVersion));
+        connection.close();
+    }
 
-}
\ No newline at end of file
+    private boolean areEquivalent(AMQPProtocolVersionWrapper amqpProtocolVersionWrapper, ProtocolVersion protocolVersion)
+    {
+        byte byteMajor = (byte)amqpProtocolVersionWrapper.getMajor();
+        byte byteMinor;
+        if (amqpProtocolVersionWrapper.getPatch() == 0)
+        {
+            byteMinor = (byte)amqpProtocolVersionWrapper.getMinor();
+        }
+        else
+        {
+            final StringBuilder sb = new StringBuilder();
+            sb.append(amqpProtocolVersionWrapper.getMinor());
+            sb.append(amqpProtocolVersionWrapper.getPatch());
+            byteMinor = Byte.valueOf(sb.toString()).byteValue();
+        }
+        return (protocolVersion.getMajorVersion() == byteMajor && protocolVersion.getMinorVersion() == byteMinor);
+    }
+}
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java
index 88e7ee20c8..9b6abb1447 100755
--- a/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java
@@ -164,7 +164,7 @@ public class QpidBrokerTestCase extends QpidTestCase
     protected BrokerCommandHelper _brokerCommandHelper = new BrokerCommandHelper(BROKER_COMMAND_TEMPLATE);
 
     private Boolean _brokerCleanBetweenTests = Boolean.getBoolean(BROKER_CLEAN_BETWEEN_TESTS);
-    private final Protocol _brokerVersion = Protocol.valueOf("AMQP_" + System.getProperty(BROKER_VERSION, " ").substring(1));
+    private final Protocol _brokerProtocol = Protocol.valueOf("AMQP_" + System.getProperty(BROKER_VERSION, " ").substring(1));
     protected String _output = System.getProperty(TEST_OUTPUT, System.getProperty("java.io.tmpdir"));
     protected Boolean _brokerPersistent = Boolean.getBoolean(BROKER_PERSITENT);
 
@@ -993,12 +993,17 @@ public class QpidBrokerTestCase extends QpidTestCase
      */
     public boolean isBroker08()
     {
-        return _brokerVersion.equals(Protocol.AMQP_0_8);
+        return _brokerProtocol.equals(Protocol.AMQP_0_8);
     }
 
     public boolean isBroker010()
     {
-        return _brokerVersion.equals(Protocol.AMQP_0_10);
+        return _brokerProtocol.equals(Protocol.AMQP_0_10);
+    }
+
+    public Protocol getBrokerProtocol()
+    {
+        return _brokerProtocol;
     }
 
     protected boolean isJavaBroker()