QPID-9

Updated EncodingUtils.java to include a single Character field so we can tell the difference between a char and a string of length 1.

Tests changed accordingly.

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

1 files changed, 2 insertions, 4 deletions

diff --git a/qpid/java/common/src/test/java/org/apache/qpid/framing/PropertyFieldTableTest.java b/qpid/java/common/src/test/java/org/apache/qpid/framing/PropertyFieldTableTest.java
index e41487ba4b..f2067a5649 100644
--- a/qpid/java/common/src/test/java/org/apache/qpid/framing/PropertyFieldTableTest.java
+++ b/qpid/java/common/src/test/java/org/apache/qpid/framing/PropertyFieldTableTest.java
@@ -26,8 +26,6 @@ import junit.framework.TestCase;
 import java.util.Enumeration;
 
 import org.apache.mina.common.ByteBuffer;
-import org.apache.mina.common.ByteBufferProxy;
-import org.apache.mina.common.support.BaseByteBuffer;
 
 public class PropertyFieldTableTest extends TestCase
 {
@@ -402,7 +400,7 @@ public class PropertyFieldTableTest extends TestCase
         Assert.assertEquals(size, result.getEncodedSize());
 
         result.setChar("char", (char) 'c');
-        size += 1 + EncodingUtils.encodedShortStringLength("char") + EncodingUtils.encodedCharacterLength();
+        size += 1 + EncodingUtils.encodedShortStringLength("char") + EncodingUtils.encodedCharLength();
         Assert.assertEquals(size, result.getEncodedSize());
 
         result.setDouble("double", (double) Double.MAX_VALUE);
@@ -444,7 +442,7 @@ public class PropertyFieldTableTest extends TestCase
         Assert.assertEquals(size, result.getEncodedSize());
 
         result.setObject("object-char", 'c');
-        size += 1 + EncodingUtils.encodedShortStringLength("object-char") + EncodingUtils.encodedCharacterLength();
+        size += 1 + EncodingUtils.encodedShortStringLength("object-char") + EncodingUtils.encodedCharLength();
         Assert.assertEquals(size, result.getEncodedSize());
 
         result.setObject("object-double", Double.MAX_VALUE);