[CODEC-78] Base64: Improve Code Coverage. Patch applied: https://issues.apache.org/jira/secure/attachment/12415223/codec78-evenMoreCoverage.patch

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

Author: garydgregory

src/java/org/apache/commons/codec/binary/Base64.java

@@ -314,6 +314,10 @@ public Base64(int lineLength, byte[] lineSeparator) {
      * @since 1.4
      */
     public Base64(int lineLength, byte[] lineSeparator, boolean urlSafe) {
+        if (lineSeparator == null) {
+            lineLength = 0;  // disable chunk-separating
+            lineSeparator = CHUNK_SEPARATOR;  // this just gets ignored
+        }
         this.lineLength = lineLength > 0 ? (lineLength / 4) * 4 : 0;
         this.lineSeparator = new byte[lineSeparator.length];
         System.arraycopy(lineSeparator, 0, this.lineSeparator, 0, lineSeparator.length);
@@ -957,7 +961,7 @@ private static long getEncodeLength(byte[] pArray, int chunkSize, byte[] chunkSe
         if (mod != 0) {
             len += 4 - mod;
         }
-        if (chunkSize > 0 && chunkSeparator != null) {
+        if (chunkSize > 0) {
             boolean lenChunksPerfectly = len % chunkSize == 0;
             len += (len / chunkSize) * chunkSeparator.length;
             if (!lenChunksPerfectly) {

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

@@ -63,6 +63,21 @@ public void testBase64() {
         byte[] encodedBytes = Base64.encodeBase64(StringUtils.getBytesUtf8(content));
         encodedContent = StringUtils.newStringUtf8(encodedBytes);
         assertTrue("encoding hello world", encodedContent.equals("SGVsbG8gV29ybGQ="));
+
+        Base64 b64 = new Base64(76, null);  // null lineSeparator same as saying no-chunking
+        encodedBytes = b64.encode(StringUtils.getBytesUtf8(content));
+        encodedContent = StringUtils.newStringUtf8(encodedBytes);
+        assertTrue("encoding hello world", encodedContent.equals("SGVsbG8gV29ybGQ="));
+
+        b64 = new Base64(0, null);  // null lineSeparator same as saying no-chunking
+        encodedBytes = b64.encode(StringUtils.getBytesUtf8(content));
+        encodedContent = StringUtils.newStringUtf8(encodedBytes);
+        assertTrue("encoding hello world", encodedContent.equals("SGVsbG8gV29ybGQ="));
+
+        // bogus characters to decode (to skip actually)
+        byte[] decode = b64.decode("SGVsbG{éééééé}8gV29ybGQ=");
+        String decodeString = StringUtils.newStringUtf8(decode);
+        assertTrue("decode hello world", decodeString.equals("Hello World"));        
     }
 
     /**