Removed depndence on sun.misc.BASE64Decoder

7 files changed, 531 insertions, 13 deletions

diff --git a/ChangeLog b/ChangeLog
index 0640d4f..219cd9b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+2011-10-17  Jiri Vanek <[email protected]>
+
+	Removed depndence on  sun.misc.BASE64Decoder
+	* configure.ac: removed check for sun.misc.BASE64Decoder
+	* netx/net/sourceforge/jnlp/PluginBridge.java :  sun.misc.BASE64Decoder
+	import repalced by net.sourceforge.jnlp.util.replacements.BASE64Decoder
+	* netx/net/sourceforge/jnlp/util/replacements/BASE64Decoder.java: new
+	file, in-tre copy from jdk7
+	* netx/net/sourceforge/jnlp/util/replacements/CharacterDecoder.java: likewise
+	* tests/netx/unit/net/sourceforge/jnlp/util/replacements/BASE64DecoderTest.java:
+	new tests for new files
+	* tests/netx/unit/net/sourceforge/jnlp/util/replacements/BASE64EncoderTest.java:
+	(getAndInvokeMethod), (encoded) and (sSrc) made public final. Corrected
+	usage of (encoded2), added new test (testEmbededBase64EncoderAgainstEbededDecoder)
+	to test with internal  decoder.	
+
 2014-01-02  Andrew Azores  <[email protected]>
 
 	Added ChangeLog revision hyperlinking to html-gen.sh
diff --git a/configure.ac b/configure.ac
index 217f5f4..bc129e5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -77,7 +77,6 @@ IT_CHECK_FOR_CLASS(SUN_NET_WWW_PROTOCOL_JAR_URLJARFILE, [sun.net.www.protocol.ja
 IT_CHECK_FOR_CLASS(SUN_NET_WWW_PROTOCOL_JAR_URLJARFILECALLBACK, [sun.net.www.protocol.jar.URLJarFileCallBack])
 IT_CHECK_FOR_CLASS(SUN_AWT_X11_XEMBEDDEDFRAME, [sun.awt.X11.XEmbeddedFrame])
 IT_CHECK_FOR_CLASS(SUN_MISC_REF, [sun.misc.Ref])
-IT_CHECK_FOR_CLASS(SUN_MISC_BASE64DECODER, [sun.misc.BASE64Decoder])
 IT_CHECK_FOR_CLASS(COM_SUN_JNDI_TOOLKIT_URL_URLUTIL, [com.sun.jndi.toolkit.url.UrlUtil])
 IT_CHECK_FOR_CLASS(SUN_APPLET_APPLETIMAGEREF, [sun.applet.AppletImageRef])
 IT_CHECK_FOR_APPLETVIEWERPANEL_HOLE
diff --git a/netx/net/sourceforge/jnlp/PluginBridge.java b/netx/net/sourceforge/jnlp/PluginBridge.java
index db4f7b2..a399527 100644
--- a/netx/net/sourceforge/jnlp/PluginBridge.java
+++ b/netx/net/sourceforge/jnlp/PluginBridge.java
@@ -38,7 +38,7 @@ import java.util.Set;
 
 import net.sourceforge.jnlp.runtime.JNLPRuntime;
 import net.sourceforge.jnlp.util.logging.OutputController;
-import sun.misc.BASE64Decoder;
+import net.sourceforge.jnlp.util.replacements.BASE64Decoder;
 
 /**
  * Allows reuse of code that expects a JNLPFile object,
diff --git a/netx/net/sourceforge/jnlp/util/replacements/BASE64Decoder.java b/netx/net/sourceforge/jnlp/util/replacements/BASE64Decoder.java
new file mode 100644
index 0000000..525a89a
--- /dev/null
+++ b/netx/net/sourceforge/jnlp/util/replacements/BASE64Decoder.java
@@ -0,0 +1,170 @@
+/*
+ * Copyright (c) 1995, 2000, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package net.sourceforge.jnlp.util.replacements;
+
+import java.io.IOException;
+import java.io.OutputStream;
+import java.io.PushbackInputStream;
+
+/**
+ * This class implements a BASE64 Character decoder as specified in RFC1521.
+ *
+ * This RFC is part of the MIME specification which is published by the
+ * Internet Engineering Task Force (IETF). Unlike some other encoding
+ * schemes there is nothing in this encoding that tells the decoder
+ * where a buffer starts or stops, so to use it you will need to isolate
+ * your encoded data into a single chunk and then feed them this decoder.
+ * The simplest way to do that is to read all of the encoded data into a
+ * string and then use:
+ * <pre>
+ *      byte    mydata[];
+ *      BASE64Decoder base64 = new BASE64Decoder();
+ *
+ *      mydata = base64.decodeBuffer(bufferString);
+ * </pre>
+ * This will decode the String in <i>bufferString</i> and give you an array
+ * of bytes in the array <i>myData</i>.
+ *
+ * On errors, this class throws a CEFormatException with the following detail
+ * strings:
+ * <pre>
+ *    "BASE64Decoder: Not enough bytes for an atom."
+ * </pre>
+ *
+ * @author      Chuck McManis
+ * @see         CharacterEncoder
+ * @see         BASE64Decoder
+ */
+
+public class BASE64Decoder extends CharacterDecoder {
+
+    private static class CEFormatException extends IOException {
+       public CEFormatException(String s) {
+                super(s);
+        }
+    }
+    
+    /** This class has 4 bytes per atom */
+    @Override
+    protected int bytesPerAtom() {
+        return (4);
+    }
+
+    /** Any multiple of 4 will do, 72 might be common */
+    @Override
+    protected int bytesPerLine() {
+        return (72);
+    }
+
+    /**
+     * This character array provides the character to value map
+     * based on RFC1521.
+     */
+    private final static char pem_array[] = {
+        //       0   1   2   3   4   5   6   7
+                'A','B','C','D','E','F','G','H', // 0
+                'I','J','K','L','M','N','O','P', // 1
+                'Q','R','S','T','U','V','W','X', // 2
+                'Y','Z','a','b','c','d','e','f', // 3
+                'g','h','i','j','k','l','m','n', // 4
+                'o','p','q','r','s','t','u','v', // 5
+                'w','x','y','z','0','1','2','3', // 6
+                '4','5','6','7','8','9','+','/'  // 7
+        };
+
+    private final static byte pem_convert_array[] = new byte[256];
+
+    static {
+        for (int i = 0; i < 255; i++) {
+            pem_convert_array[i] = -1;
+        }
+        for (int i = 0; i < pem_array.length; i++) {
+            pem_convert_array[pem_array[i]] = (byte) i;
+        }
+    }
+
+    byte decode_buffer[] = new byte[4];
+
+    /**
+     * Decode one BASE64 atom into 1, 2, or 3 bytes of data.
+     */
+    @Override
+    protected void decodeAtom(PushbackInputStream inStream, OutputStream outStream, int rem)
+        throws java.io.IOException
+    {
+        int     i;
+        byte    a = -1, b = -1, c = -1, d = -1;
+
+        if (rem < 2) {
+            throw new CEFormatException("BASE64Decoder: Not enough bytes for an atom.");
+        }
+        do {
+            i = inStream.read();
+            if (i == -1) {
+                throw new CEStreamExhausted();
+            }
+        } while (i == '\n' || i == '\r');
+        decode_buffer[0] = (byte) i;
+
+        i = readFully(inStream, decode_buffer, 1, rem-1);
+        if (i == -1) {
+            throw new CEStreamExhausted();
+        }
+
+        if (rem > 3 && decode_buffer[3] == '=') {
+            rem = 3;
+        }
+        if (rem > 2 && decode_buffer[2] == '=') {
+            rem = 2;
+        }
+        switch (rem) {
+        case 4:
+            d = pem_convert_array[decode_buffer[3] & 0xff];
+            // NOBREAK
+        case 3:
+            c = pem_convert_array[decode_buffer[2] & 0xff];
+            // NOBREAK
+        case 2:
+            b = pem_convert_array[decode_buffer[1] & 0xff];
+            a = pem_convert_array[decode_buffer[0] & 0xff];
+            break;
+        }
+
+        switch (rem) {
+        case 2:
+            outStream.write( (byte)(((a << 2) & 0xfc) | ((b >>> 4) & 3)) );
+            break;
+        case 3:
+            outStream.write( (byte) (((a << 2) & 0xfc) | ((b >>> 4) & 3)) );
+            outStream.write( (byte) (((b << 4) & 0xf0) | ((c >>> 2) & 0xf)) );
+            break;
+        case 4:
+            outStream.write( (byte) (((a << 2) & 0xfc) | ((b >>> 4) & 3)) );
+            outStream.write( (byte) (((b << 4) & 0xf0) | ((c >>> 2) & 0xf)) );
+            outStream.write( (byte) (((c << 6) & 0xc0) | (d  & 0x3f)) );
+            break;
+        }
+    }
+}
diff --git a/netx/net/sourceforge/jnlp/util/replacements/CharacterDecoder.java b/netx/net/sourceforge/jnlp/util/replacements/CharacterDecoder.java
new file mode 100644
index 0000000..a46ea1e
--- /dev/null
+++ b/netx/net/sourceforge/jnlp/util/replacements/CharacterDecoder.java
@@ -0,0 +1,226 @@
+/*
+ * Copyright (c) 1995, 2004, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package net.sourceforge.jnlp.util.replacements;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.PushbackInputStream;
+import java.nio.ByteBuffer;
+
+/**
+ * This class defines the decoding half of character encoders.
+ * A character decoder is an algorithim for transforming 8 bit
+ * binary data that has been encoded into text by a character
+ * encoder, back into original binary form.
+ *
+ * The character encoders, in general, have been structured
+ * around a central theme that binary data can be encoded into
+ * text that has the form:
+ *
+ * <pre>
+ *      [Buffer Prefix]
+ *      [Line Prefix][encoded data atoms][Line Suffix]
+ *      [Buffer Suffix]
+ * </pre>
+ *
+ * Of course in the simplest encoding schemes, the buffer has no
+ * distinct prefix of suffix, however all have some fixed relationship
+ * between the text in an 'atom' and the binary data itself.
+ *
+ * In the CharacterEncoder and CharacterDecoder classes, one complete
+ * chunk of data is referred to as a <i>buffer</i>. Encoded buffers
+ * are all text, and decoded buffers (sometimes just referred to as
+ * buffers) are binary octets.
+ *
+ * To create a custom decoder, you must, at a minimum,  overide three
+ * abstract methods in this class.
+ * <DL>
+ * <DD>bytesPerAtom which tells the decoder how many bytes to
+ * expect from decodeAtom
+ * <DD>decodeAtom which decodes the bytes sent to it as text.
+ * <DD>bytesPerLine which tells the encoder the maximum number of
+ * bytes per line.
+ * </DL>
+ *
+ * In general, the character decoders return error in the form of a
+ * CEFormatException. The syntax of the detail string is
+ * <pre>
+ *      DecoderClassName: Error message.
+ * </pre>
+ *
+ * Several useful decoders have already been written and are
+ * referenced in the See Also list below.
+ *
+ * @author      Chuck McManis
+ * @see         CEFormatException
+ * @see         CharacterEncoder
+ * @see         UCDecoder
+ * @see         UUDecoder
+ * @see         BASE64Decoder
+ */
+
+public abstract class CharacterDecoder {
+    
+    /** This exception is thrown when EOF is reached */
+    protected static class CEStreamExhausted extends IOException { };
+
+    /** Return the number of bytes per atom of decoding */
+    abstract protected int bytesPerAtom();
+
+    /** Return the maximum number of bytes that can be encoded per line */
+    abstract protected int bytesPerLine();
+
+    /** decode the beginning of the buffer, by default this is a NOP. */
+    protected void decodeBufferPrefix(PushbackInputStream aStream, OutputStream bStream) throws IOException { }
+
+    /** decode the buffer suffix, again by default it is a NOP. */
+    protected void decodeBufferSuffix(PushbackInputStream aStream, OutputStream bStream) throws IOException { }
+
+    /**
+     * This method should return, if it knows, the number of bytes
+     * that will be decoded. Many formats such as uuencoding provide
+     * this information. By default we return the maximum bytes that
+     * could have been encoded on the line.
+     */
+    protected int decodeLinePrefix(PushbackInputStream aStream, OutputStream bStream) throws IOException {
+        return (bytesPerLine());
+    }
+
+    /**
+     * This method post processes the line, if there are error detection
+     * or correction codes in a line, they are generally processed by
+     * this method. The simplest version of this method looks for the
+     * (newline) character.
+     */
+    protected void decodeLineSuffix(PushbackInputStream aStream, OutputStream bStream) throws IOException { }
+
+    /**
+     * This method does an actual decode. It takes the decoded bytes and
+     * writes them to the OutputStream. The integer <i>l</i> tells the
+     * method how many bytes are required. This is always <= bytesPerAtom().
+     */
+    protected void decodeAtom(PushbackInputStream aStream, OutputStream bStream, int l) throws IOException {
+        throw new CEStreamExhausted();
+    }
+
+    /**
+     * This method works around the bizarre semantics of BufferedInputStream's
+     * read method.
+     */
+    protected int readFully(InputStream in, byte buffer[], int offset, int len)
+        throws java.io.IOException {
+        for (int i = 0; i < len; i++) {
+            int q = in.read();
+            if (q == -1) {
+                return ((i == 0) ? -1 : i);
+            }
+            buffer[i+offset] = (byte)q;
+        }
+        return len;
+    }
+
+    /**
+     * Decode the text from the InputStream and write the decoded
+     * octets to the OutputStream. This method runs until the stream
+     * is exhausted.
+     * @exception CEFormatException An error has occured while decoding
+     * @exception CEStreamExhausted The input stream is unexpectedly out of data
+     */
+    public void decodeBuffer(InputStream aStream, OutputStream bStream) throws IOException {
+        int     i;
+        int     totalBytes = 0;
+
+        PushbackInputStream ps = new PushbackInputStream (aStream);
+        decodeBufferPrefix(ps, bStream);
+        while (true) {
+            int length;
+
+            try {
+                length = decodeLinePrefix(ps, bStream);
+                for (i = 0; (i+bytesPerAtom()) < length; i += bytesPerAtom()) {
+                    decodeAtom(ps, bStream, bytesPerAtom());
+                    totalBytes += bytesPerAtom();
+                }
+                if ((i + bytesPerAtom()) == length) {
+                    decodeAtom(ps, bStream, bytesPerAtom());
+                    totalBytes += bytesPerAtom();
+                } else {
+                    decodeAtom(ps, bStream, length - i);
+                    totalBytes += (length - i);
+                }
+                decodeLineSuffix(ps, bStream);
+            } catch (CEStreamExhausted e) {
+                break;
+            }
+        }
+        decodeBufferSuffix(ps, bStream);
+    }
+
+    /**
+     * Alternate decode interface that takes a String containing the encoded
+     * buffer and returns a byte array containing the data.
+     * @exception CEFormatException An error has occured while decoding
+     */
+    public byte decodeBuffer(String inputString)[] throws IOException {
+        byte    inputBuffer[] = new byte[inputString.length()];
+        ByteArrayInputStream inStream;
+        ByteArrayOutputStream outStream;
+
+        inputString.getBytes(0, inputString.length(), inputBuffer, 0);
+        inStream = new ByteArrayInputStream(inputBuffer);
+        outStream = new ByteArrayOutputStream();
+        decodeBuffer(inStream, outStream);
+        return (outStream.toByteArray());
+    }
+
+    /**
+     * Decode the contents of the inputstream into a buffer.
+     */
+    public byte decodeBuffer(InputStream in)[] throws IOException {
+        ByteArrayOutputStream outStream = new ByteArrayOutputStream();
+        decodeBuffer(in, outStream);
+        return (outStream.toByteArray());
+    }
+
+    /**
+     * Decode the contents of the String into a ByteBuffer.
+     */
+    public ByteBuffer decodeBufferToByteBuffer(String inputString)
+        throws IOException {
+        return ByteBuffer.wrap(decodeBuffer(inputString));
+    }
+
+    /**
+     * Decode the contents of the inputStream into a ByteBuffer.
+     */
+    public ByteBuffer decodeBufferToByteBuffer(InputStream in)
+        throws IOException {
+        return ByteBuffer.wrap(decodeBuffer(in));
+    }
+}
diff --git a/tests/netx/unit/net/sourceforge/jnlp/util/replacements/BASE64DecoderTest.java b/tests/netx/unit/net/sourceforge/jnlp/util/replacements/BASE64DecoderTest.java
new file mode 100644
index 0000000..8c98146
--- /dev/null
+++ b/tests/netx/unit/net/sourceforge/jnlp/util/replacements/BASE64DecoderTest.java
@@ -0,0 +1,99 @@
+/* BASE64EncoderTest.java
+Copyright (C) 2011 Red Hat, Inc.
+
+This file is part of IcedTea.
+
+IcedTea is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License as published by
+the Free Software Foundation, version 2.
+
+IcedTea is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with IcedTea; see the file COPYING.  If not, write to
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version.
+ */
+package net.sourceforge.jnlp.util.replacements;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.OutputStream;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import org.junit.Assert;
+import org.junit.Test;
+
+/** Test various corner cases of the parser */
+public class BASE64DecoderTest {
+
+    private static final String sunClassE = "sun.misc.BASE64Encoder";
+      
+    @Test
+    public void testEmbededBase64Decoder() throws Exception {
+        final byte[] data = BASE64EncoderTest.encoded;
+        ByteArrayOutputStream out2 = new ByteArrayOutputStream();
+        BASE64Decoder e2 = new BASE64Decoder();
+        e2.decodeBuffer(new ByteArrayInputStream(data), out2);
+        byte[] decoded = out2.toByteArray();
+        Assert.assertEquals(BASE64EncoderTest.sSrc, new String(decoded, "utf-8"));
+
+
+
+    }
+
+    @Test
+    /*
+     * This test will fail, in case taht sun.misc.BASE64Encoder will be removed from builders java
+     */
+    public void testEmbededBase64DecoderAgainstSunOne() throws Exception {
+        final byte[] data = BASE64EncoderTest.encoded;
+        ByteArrayOutputStream out2 = new ByteArrayOutputStream();
+        BASE64Decoder e2 = new BASE64Decoder();
+        e2.decodeBuffer(new ByteArrayInputStream(data), out2);
+        byte[] encoded2 = out2.toByteArray();
+        Object encoder = BASE64EncoderTest.createInsatnce(sunClassE);
+        ByteArrayOutputStream out = new ByteArrayOutputStream();
+        BASE64EncoderTest.getAndInvokeMethod(encoder, "encodeBuffer", encoded2, out);
+        Assert.assertArrayEquals(data, out.toByteArray());
+        Assert.assertArrayEquals(BASE64EncoderTest.encoded, out.toByteArray());
+
+    }
+    
+     @Test
+    public void testEmbededBase64DecoderAgainstEmbededEncoder() throws Exception {
+        final byte[] data = BASE64EncoderTest.encoded;
+        ByteArrayOutputStream out2 = new ByteArrayOutputStream();
+        BASE64Decoder e2 = new BASE64Decoder();
+        e2.decodeBuffer(new ByteArrayInputStream(data), out2);
+        byte[] encoded2 = out2.toByteArray();
+        BASE64Encoder encoder = new BASE64Encoder();
+        ByteArrayOutputStream out = new ByteArrayOutputStream();
+        encoder.encodeBuffer(encoded2, out);
+        Assert.assertArrayEquals(data, out.toByteArray());
+        Assert.assertArrayEquals(BASE64EncoderTest.encoded, out.toByteArray());
+
+    }
+
+  
+}
diff --git a/tests/netx/unit/net/sourceforge/jnlp/util/replacements/BASE64EncoderTest.java b/tests/netx/unit/net/sourceforge/jnlp/util/replacements/BASE64EncoderTest.java
index 27ee230..7febee2 100644
--- a/tests/netx/unit/net/sourceforge/jnlp/util/replacements/BASE64EncoderTest.java
+++ b/tests/netx/unit/net/sourceforge/jnlp/util/replacements/BASE64EncoderTest.java
@@ -48,10 +48,10 @@ import org.junit.Test;
 /** Test various corner cases of the parser */
 public class BASE64EncoderTest {
 
-    private static final String sSrc = "abcdefgHIJKLMNOPQrstuvwxyz1234567890\r\n"
+    static final String sSrc = "abcdefgHIJKLMNOPQrstuvwxyz1234567890\r\n"
             + "-=+_))(**&&&^^%%$$##@@!!~{}][\":'/\\.,><\n"
             + "+ěšěčřžýáíé=ů/úěřťšďňéíáč";
-    private static final byte[] encoded = {89, 87, 74, 106, 90, 71, 86, 109, 90,
+    static final byte[] encoded = {89, 87, 74, 106, 90, 71, 86, 109, 90,
         48, 104, 74, 83, 107, 116, 77, 84, 85, 53, 80, 85, 70, 70, 121, 99, 51,
         82, 49, 100, 110, 100, 52, 101, 88, 111, 120, 77, 106, 77, 48, 78, 84,
         89, 51, 79, 68, 107, 119, 68, 81, 111, 116, 80, 83, 116, 102, 75, 83,
@@ -63,8 +63,7 @@ public class BASE64EncoderTest {
         69, 109, 56, 87, 90, 120, 97, 88, 70, 111, 99, 83, 80, 10, 120, 89, 106,
         68, 113, 99, 79, 116, 119, 54, 72, 69, 106, 81, 61, 61, 10};
     
-    public static final String sunClassE = "sun.misc.BASE64Encoder";
-    public static final String sunClassD = "sun.misc.BASE64Decoder";
+    private static final String sunClassD = "sun.misc.BASE64Decoder";
 
     @Test
     public void testEmbededBase64Encoder() throws Exception {
@@ -97,23 +96,32 @@ public class BASE64EncoderTest {
         e2.encodeBuffer(data, out2);
         byte[] encoded2 = out2.toByteArray();
         Object decoder = createInsatnce(sunClassD);
-        byte[] decoded = (byte[]) (getAndInvokeMethod(decoder, "decodeBuffer", new String(encoded, "utf-8")));
+        byte[] decoded = (byte[]) (getAndInvokeMethod(decoder, "decodeBuffer", new String(encoded2, "utf-8")));
+        Assert.assertArrayEquals(data, decoded);
+        Assert.assertEquals(sSrc, new String(decoded, "utf-8"));
+    }
+    
+      @Test
+    public void testEmbededBase64EncoderAgainstEbededDecoder() throws Exception {
+        final byte[] data = sSrc.getBytes("utf-8");
+        ByteArrayOutputStream out2 = new ByteArrayOutputStream();
+        BASE64Encoder e2 = new BASE64Encoder();
+        e2.encodeBuffer(data, out2);
+        byte[] encoded2 = out2.toByteArray();
+        BASE64Decoder decoder = new BASE64Decoder();
+        byte[] decoded = decoder.decodeBuffer(new String(encoded2, "utf-8"));
         Assert.assertArrayEquals(data, decoded);
         Assert.assertEquals(sSrc, new String(decoded, "utf-8"));
-
-
-
-
     }
 
-    private static Object createInsatnce(String ofCalss) throws ClassNotFoundException, InstantiationException, IllegalAccessException {
+    static Object createInsatnce(String ofCalss) throws ClassNotFoundException, InstantiationException, IllegalAccessException {
 
         Class<?> classDefinition = Class.forName(ofCalss);
         return classDefinition.newInstance();
 
     }
 
-    private static Object getAndInvokeMethod(Object instance, String methodName, Object... params) throws NoSuchMethodException, IllegalAccessException, IllegalArgumentException, InvocationTargetException {
+    static Object getAndInvokeMethod(Object instance, String methodName, Object... params) throws NoSuchMethodException, IllegalAccessException, IllegalArgumentException, InvocationTargetException {
         Class<?>[] cs = new Class<?>[params.length];
         for (int i = 0; i < params.length; i++) {
             Object object = params[i];