QPID-391 : Broker Refactoring - initial tidy... add some mechanisms for multi version

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

1 files changed, 9 insertions, 11 deletions

diff --git a/java/common/src/test/java/org/apache/qpid/framing/BasicContentHeaderPropertiesTest.java b/java/common/src/test/java/org/apache/qpid/framing/BasicContentHeaderPropertiesTest.java
index 0f706ac553..4fd1f60d69 100644
--- a/java/common/src/test/java/org/apache/qpid/framing/BasicContentHeaderPropertiesTest.java
+++ b/java/common/src/test/java/org/apache/qpid/framing/BasicContentHeaderPropertiesTest.java
@@ -22,8 +22,6 @@ package org.apache.qpid.framing;
 
 import org.apache.mina.common.ByteBuffer;
 
-import java.util.HashMap;
-
 import junit.framework.TestCase;
 
 
@@ -94,14 +92,14 @@ public class BasicContentHeaderPropertiesTest extends TestCase
     {
         String contentType = "contentType";
         _testProperties.setContentType(contentType);
-        assertEquals(contentType, _testProperties.getContentType());
+        assertEquals(contentType, _testProperties.getContentTypeAsString());
     }
 
     public void testSetGetEncoding()
     {
         String encoding = "encoding";
         _testProperties.setEncoding(encoding);
-        assertEquals(encoding, _testProperties.getEncoding());
+        assertEquals(encoding, _testProperties.getEncodingAsString());
     }
 
     public void testSetGetHeaders()
@@ -128,14 +126,14 @@ public class BasicContentHeaderPropertiesTest extends TestCase
     {
         String correlationId = "correlationId";
         _testProperties.setCorrelationId(correlationId);
-        assertEquals(correlationId, _testProperties.getCorrelationId());
+        assertEquals(correlationId, _testProperties.getCorrelationIdAsString());
     }
 
     public void testSetGetReplyTo()
     {
         String replyTo = "replyTo";
         _testProperties.setReplyTo(replyTo);
-        assertEquals(replyTo, _testProperties.getReplyTo());
+        assertEquals(replyTo, _testProperties.getReplyToAsString());
     }
 
     public void testSetGetExpiration()
@@ -149,7 +147,7 @@ public class BasicContentHeaderPropertiesTest extends TestCase
     {
         String messageId = "messageId";
         _testProperties.setMessageId(messageId);
-        assertEquals(messageId, _testProperties.getMessageId());
+        assertEquals(messageId, _testProperties.getMessageIdAsString());
     }
 
     public void testSetGetTimestamp()
@@ -163,28 +161,28 @@ public class BasicContentHeaderPropertiesTest extends TestCase
     {
         String type = "type";
         _testProperties.setType(type);
-        assertEquals(type, _testProperties.getType());
+        assertEquals(type, _testProperties.getTypeAsString());
     }
 
     public void testSetGetUserId()
     {
         String userId = "userId";
         _testProperties.setUserId(userId);
-        assertEquals(userId, _testProperties.getUserId());
+        assertEquals(userId, _testProperties.getUserIdAsString());
     }
 
     public void testSetGetAppId()
     {
         String appId = "appId";
         _testProperties.setAppId(appId);
-        assertEquals(appId, _testProperties.getAppId());
+        assertEquals(appId, _testProperties.getAppIdAsString());
     }
 
     public void testSetGetClusterId()
     {
         String clusterId = "clusterId";
         _testProperties.setClusterId(clusterId);
-        assertEquals(clusterId, _testProperties.getClusterId());
+        assertEquals(clusterId, _testProperties.getClusterIdAsString());
     }
 
 }