QPID-73 Updated FieldTableTest to no longer use the Base64 decoder included in jboss-all-client.jar. Instead it uses the one from commons-codec.

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

1 files changed, 4 insertions, 9 deletions

diff --git a/client/test/src/org/apache/qpid/framing/FieldTableTest.java b/client/test/src/org/apache/qpid/framing/FieldTableTest.java
index ae90c8ddde..3aa185df82 100644
--- a/client/test/src/org/apache/qpid/framing/FieldTableTest.java
+++ b/client/test/src/org/apache/qpid/framing/FieldTableTest.java
@@ -19,12 +19,6 @@ package org.apache.qpid.framing;
 
 import junit.framework.JUnit4TestAdapter;
 import org.apache.mina.common.ByteBuffer;
-import org.apache.xml.security.utils.Base64;
-import org.apache.xml.security.exceptions.Base64DecodingException;
-import org.apache.qpid.framing.AMQFrameDecodingException;
-import org.apache.qpid.framing.FieldTable;
-import org.apache.qpid.framing.ContentHeaderBody;
-import org.apache.qpid.framing.BasicContentHeaderProperties;
 import static org.junit.Assert.assertEquals;
 import org.junit.Test;
 
@@ -38,7 +32,7 @@ import java.util.Properties;
 public class FieldTableTest
 {
     @Test
-    public void dataDump() throws IOException, AMQFrameDecodingException, Base64DecodingException
+    public void dataDump() throws IOException, AMQFrameDecodingException
     {
         byte[] data = readBase64("content.txt");
         System.out.println("Got " + data.length + " bytes of data");
@@ -105,10 +99,11 @@ public class FieldTableTest
         return ((BasicContentHeaderProperties) header.properties).getHeaders();
     }
 
-    byte[] readBase64(String name) throws IOException, Base64DecodingException
+    byte[] readBase64(String name) throws IOException
     {
         String content = read(new InputStreamReader(getClass().getResourceAsStream(name)));
-        return Base64.decode(content);
+
+        return org.apache.commons.codec.binary.Base64.decodeBase64(content.getBytes());
     }
 
     FieldTable load(String name) throws IOException