Roundtrip tests (some commented out that fail)

Applied https://issues.apache.org/jira/secure/attachment/12439949/codec-99-test-fixes.patch

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/codec/trunk@928158 13f79535-47bb-0310-9956-ffa450edef68

Author: garydgregory

src/test/org/apache/commons/codec/binary/Base64Test.java

@@ -556,13 +556,14 @@ public void testRfc4648Section10Decode() {
      * @see <a href="http://tools.ietf.org/html/rfc4648">http://tools.ietf.org/html/rfc4648</a>
      */
     public void testRfc4648Section10DecodeWithCrLf() {
-        assertEquals("", StringUtils.newStringUsAscii(Base64.decodeBase64("")));
-        assertEquals("f", StringUtils.newStringUsAscii(Base64.decodeBase64("Zg==" + Base64.CHUNK_SEPARATOR)));
-        assertEquals("fo", StringUtils.newStringUsAscii(Base64.decodeBase64("Zm8=" + Base64.CHUNK_SEPARATOR)));
-        //assertEquals("foo", StringUtils.newStringUsAscii(Base64.decodeBase64("Zm9v" + Base64.CHUNK_SEPARATOR)));
-        assertEquals("foob", StringUtils.newStringUsAscii(Base64.decodeBase64("Zm9vYg==" + Base64.CHUNK_SEPARATOR)));
-        assertEquals("fooba", StringUtils.newStringUsAscii(Base64.decodeBase64("Zm9vYmE=" + Base64.CHUNK_SEPARATOR)));
-        //assertEquals("foobar", StringUtils.newStringUsAscii(Base64.decodeBase64("Zm9vYmFy" + Base64.CHUNK_SEPARATOR)));
+        String CRLF = StringUtils.newStringUsAscii(Base64.CHUNK_SEPARATOR);
+        assertEquals("", StringUtils.newStringUsAscii(Base64.decodeBase64("" + CRLF)));
+        assertEquals("f", StringUtils.newStringUsAscii(Base64.decodeBase64("Zg==" + CRLF)));
+        assertEquals("fo", StringUtils.newStringUsAscii(Base64.decodeBase64("Zm8=" + CRLF)));
+        assertEquals("foo", StringUtils.newStringUsAscii(Base64.decodeBase64("Zm9v" + CRLF)));
+        assertEquals("foob", StringUtils.newStringUsAscii(Base64.decodeBase64("Zm9vYg==" + CRLF)));
+        assertEquals("fooba", StringUtils.newStringUsAscii(Base64.decodeBase64("Zm9vYmE=" + CRLF)));
+        assertEquals("foobar", StringUtils.newStringUsAscii(Base64.decodeBase64("Zm9vYmFy" + CRLF)));
     }
 
     /**
@@ -589,6 +590,66 @@ public void testRfc4648Section10Encode() {
         //assertEquals("Zm9vYmFy", Base64.encodeBase64String(StringUtils.getBytesUtf8("foobar")));
     }
 
+    /**
+     * Tests RFC 4648 section 10 test vectors.
+     * <ul>
+     * <li>BASE64("") = ""</li>
+     * <li>BASE64("f") = "Zg=="</li>
+     * <li>BASE64("fo") = "Zm8="</li>
+     * <li>BASE64("foo") = "Zm9v"</li>
+     * <li>BASE64("foob") = "Zm9vYg=="</li>
+     * <li>BASE64("fooba") = "Zm9vYmE="</li>
+     * <li>BASE64("foobar") = "Zm9vYmFy"</li>
+     * </ul>
+     * 
+     * @see <a href="http://tools.ietf.org/html/rfc4648">http://tools.ietf.org/html/rfc4648</a>
+     */
+    public void testRfc4648Section10DecodeEncode() {
+        testDecodeEncode("");
+        //testDecodeEncode("Zg==");
+        //testDecodeEncode("Zm8=");
+        //testDecodeEncode("Zm9v");
+        //testDecodeEncode("Zm9vYg==");
+        //testDecodeEncode("Zm9vYmE=");
+        //testDecodeEncode("Zm9vYmFy");
+    }
+    
+    private void testDecodeEncode(String encodedText) {
+        String decodedText = StringUtils.newStringUsAscii(Base64.decodeBase64(encodedText));
+        String encodedText2 = Base64.encodeBase64String(StringUtils.getBytesUtf8(decodedText));
+        assertEquals(encodedText, encodedText2);
+    }
+
+    /**
+     * Tests RFC 4648 section 10 test vectors.
+     * <ul>
+     * <li>BASE64("") = ""</li>
+     * <li>BASE64("f") = "Zg=="</li>
+     * <li>BASE64("fo") = "Zm8="</li>
+     * <li>BASE64("foo") = "Zm9v"</li>
+     * <li>BASE64("foob") = "Zm9vYg=="</li>
+     * <li>BASE64("fooba") = "Zm9vYmE="</li>
+     * <li>BASE64("foobar") = "Zm9vYmFy"</li>
+     * </ul>
+     * 
+     * @see <a href="http://tools.ietf.org/html/rfc4648">http://tools.ietf.org/html/rfc4648</a>
+     */
+    public void testRfc4648Section10EncodeDecode() {
+        testEncodeDecode("");
+        testEncodeDecode("f");
+        testEncodeDecode("fo");
+        testEncodeDecode("foo");
+        testEncodeDecode("foob");
+        testEncodeDecode("fooba");
+        testEncodeDecode("foobar");
+    }
+    
+    private void testEncodeDecode(String plainText) {
+        String encodedText = Base64.encodeBase64String(StringUtils.getBytesUtf8(plainText));
+        String decodedText = StringUtils.newStringUsAscii(Base64.decodeBase64(encodedText));
+        assertEquals(plainText, decodedText);
+    }
+    
     public void testSingletons() {
         assertEquals("AA==", new String(Base64.encodeBase64(new byte[]{(byte) 0})));
         assertEquals("AQ==", new String(Base64.encodeBase64(new byte[]{(byte) 1})));