This commit contains the changes agreed upon in QPID-2363 except for the connection parameter which will be added shortly

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

1 files changed, 55 insertions, 65 deletions

diff --git a/java/systests/src/main/java/org/apache/qpid/client/message/AMQPEncodedMapMessageTest.java b/java/systests/src/main/java/org/apache/qpid/client/message/AMQPEncodedMapMessageTest.java
index 8852ff82cd..8265b75201 100644
--- a/java/systests/src/main/java/org/apache/qpid/client/message/AMQPEncodedMapMessageTest.java
+++ b/java/systests/src/main/java/org/apache/qpid/client/message/AMQPEncodedMapMessageTest.java
@@ -53,79 +53,69 @@ public class AMQPEncodedMapMessageTest extends QpidTestCase
 
     public void testEmptyMessage() throws JMSException
     {
-        if (((AMQConnection)_connection).getProtocolVersion() == ProtocolVersion.v0_10)
-        {
-            MapMessage m = _session.createMapMessage();
-            _producer.send(m);
-            AMQPEncodedMapMessage msg = (AMQPEncodedMapMessage)_consumer.receive(RECEIVE_TIMEOUT);
-            assertNotNull("Message was not received on time",msg);  
-            assertEquals("Message content-type is incorrect",
-                            AMQPEncodedMapMessage.MIME_TYPE,
-                            ((AbstractJMSMessage)msg).getContentType());
-            
-            assertEquals("Message content should be an empty map",
-                    Collections.EMPTY_MAP,
-                    ((AMQPEncodedMapMessage)msg).getMap());
-    
-        }
+        MapMessage m = _session.createMapMessage();
+        _producer.send(m);
+        AMQPEncodedMapMessage msg = (AMQPEncodedMapMessage)_consumer.receive(RECEIVE_TIMEOUT);
+        assertNotNull("Message was not received on time",msg);  
+        assertEquals("Message content-type is incorrect",
+                        AMQPEncodedMapMessage.MIME_TYPE,
+                        ((AbstractJMSMessage)msg).getContentType());
+        
+        assertEquals("Message content should be an empty map",
+                Collections.EMPTY_MAP,
+                ((AMQPEncodedMapMessage)msg).getMap());
     }
     
     public void testNullMessage() throws JMSException
     {
-        if (((AMQConnection)_connection).getProtocolVersion() == ProtocolVersion.v0_10)
-        {
-            MapMessage m = _session.createMapMessage();
-            ((AMQPEncodedMapMessage)m).setMap(null);
-            _producer.send(m);
-            AMQPEncodedMapMessage msg = (AMQPEncodedMapMessage)_consumer.receive(RECEIVE_TIMEOUT);
-            assertNotNull("Message was not received on time",msg);  
-            assertEquals("Message content-type is incorrect",
-                            AMQPEncodedMapMessage.MIME_TYPE,
-                            ((AbstractJMSMessage)msg).getContentType());
-            
-            assertEquals("Message content should be null",
-                    null,
-                    ((AMQPEncodedMapMessage)msg).getMap());
-    
-        }
+        MapMessage m = _session.createMapMessage();
+        ((AMQPEncodedMapMessage)m).setMap(null);
+        _producer.send(m);
+        AMQPEncodedMapMessage msg = (AMQPEncodedMapMessage)_consumer.receive(RECEIVE_TIMEOUT);
+        assertNotNull("Message was not received on time",msg);  
+        assertEquals("Message content-type is incorrect",
+                        AMQPEncodedMapMessage.MIME_TYPE,
+                        ((AbstractJMSMessage)msg).getContentType());
+        
+        assertEquals("Message content should be null",
+                null,
+                ((AMQPEncodedMapMessage)msg).getMap());
+
     }
 
     public void testMessageWithContent() throws JMSException
     {
-        if (((AMQConnection)_connection).getProtocolVersion() == ProtocolVersion.v0_10)
-        {
-            MapMessage m = _session.createMapMessage();
-            m.setBoolean("Boolean", true);
-            m.setByte("Byte", (byte)5);
-            byte[] bytes = new byte[]{(byte)5,(byte)8};
-            m.setBytes("Bytes", bytes);
-            m.setChar("Char", 'X');
-            m.setDouble("Double", 56.84);
-            m.setFloat("Float", Integer.MAX_VALUE + 5000);
-            m.setInt("Int", Integer.MAX_VALUE - 5000);
-            m.setShort("Short", (short)58);
-            m.setString("String", "Hello");            
-            _producer.send(m);
-            
-            AMQPEncodedMapMessage msg = (AMQPEncodedMapMessage)_consumer.receive(RECEIVE_TIMEOUT);
-            assertNotNull("Message was not received on time",msg);            
-            assertEquals("Message content-type is incorrect",
-                            AMQPEncodedMapMessage.MIME_TYPE,
-                            ((AbstractJMSMessage)msg).getContentType());
-            
-            assertEquals(true,m.getBoolean("Boolean"));
-            assertEquals((byte)5,m.getByte("Byte"));
-            byte[] bytesRcv = m.getBytes("Bytes");
-            assertNotNull("Byte array is null",bytesRcv);
-            assertEquals((byte)5,bytesRcv[0]);
-            assertEquals((byte)8,bytesRcv[1]);
-            assertEquals('X',m.getChar("Char"));
-            assertEquals(56.84,m.getDouble("Double"));
-            //assertEquals(Integer.MAX_VALUE + 5000,m.getFloat("Float"));
-            assertEquals(Integer.MAX_VALUE - 5000,m.getInt("Int"));
-            assertEquals((short)58,m.getShort("Short"));
-            assertEquals("Hello",m.getString("String"));            
-        }
+        MapMessage m = _session.createMapMessage();
+        m.setBoolean("Boolean", true);
+        m.setByte("Byte", (byte)5);
+        byte[] bytes = new byte[]{(byte)5,(byte)8};
+        m.setBytes("Bytes", bytes);
+        m.setChar("Char", 'X');
+        m.setDouble("Double", 56.84);
+        m.setFloat("Float", Integer.MAX_VALUE + 5000);
+        m.setInt("Int", Integer.MAX_VALUE - 5000);
+        m.setShort("Short", (short)58);
+        m.setString("String", "Hello");            
+        _producer.send(m);
+        
+        AMQPEncodedMapMessage msg = (AMQPEncodedMapMessage)_consumer.receive(RECEIVE_TIMEOUT);
+        assertNotNull("Message was not received on time",msg);            
+        assertEquals("Message content-type is incorrect",
+                        AMQPEncodedMapMessage.MIME_TYPE,
+                        ((AbstractJMSMessage)msg).getContentType());
+        
+        assertEquals(true,m.getBoolean("Boolean"));
+        assertEquals((byte)5,m.getByte("Byte"));
+        byte[] bytesRcv = m.getBytes("Bytes");
+        assertNotNull("Byte array is null",bytesRcv);
+        assertEquals((byte)5,bytesRcv[0]);
+        assertEquals((byte)8,bytesRcv[1]);
+        assertEquals('X',m.getChar("Char"));
+        assertEquals(56.84,m.getDouble("Double"));
+        //assertEquals(Integer.MAX_VALUE + 5000,m.getFloat("Float"));
+        assertEquals(Integer.MAX_VALUE - 5000,m.getInt("Int"));
+        assertEquals((short)58,m.getShort("Short"));
+        assertEquals("Hello",m.getString("String"));
     }
     
     public void tearDown() throws Exception