You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by ju...@apache.org on 2011/01/23 06:52:42 UTC
svn commit: r1062330 - in /commons/proper/codec/trunk/src:
java/org/apache/commons/codec/binary/Base64.java
test/org/apache/commons/codec/binary/Base64Test.java
Author: julius
Date: Sun Jan 23 05:52:42 2011
New Revision: 1062330
URL: http://svn.apache.org/viewvc?rev=1062330&view=rev
Log:
CODEC-99 - Base64.encodeBase64String() should not chunk
Modified:
commons/proper/codec/trunk/src/java/org/apache/commons/codec/binary/Base64.java
commons/proper/codec/trunk/src/test/org/apache/commons/codec/binary/Base64Test.java
Modified: commons/proper/codec/trunk/src/java/org/apache/commons/codec/binary/Base64.java
URL: http://svn.apache.org/viewvc/commons/proper/codec/trunk/src/java/org/apache/commons/codec/binary/Base64.java?rev=1062330&r1=1062329&r2=1062330&view=diff
==============================================================================
--- commons/proper/codec/trunk/src/java/org/apache/commons/codec/binary/Base64.java (original)
+++ commons/proper/codec/trunk/src/java/org/apache/commons/codec/binary/Base64.java Sun Jan 23 05:52:42 2011
@@ -667,7 +667,7 @@ public class Base64 implements BinaryEnc
* @since 1.4
*/
public static String encodeBase64String(byte[] binaryData) {
- return StringUtils.newStringUtf8(encodeBase64(binaryData, true));
+ return StringUtils.newStringUtf8(encodeBase64(binaryData, false));
}
/**
Modified: commons/proper/codec/trunk/src/test/org/apache/commons/codec/binary/Base64Test.java
URL: http://svn.apache.org/viewvc/commons/proper/codec/trunk/src/test/org/apache/commons/codec/binary/Base64Test.java?rev=1062330&r1=1062329&r2=1062330&view=diff
==============================================================================
--- commons/proper/codec/trunk/src/test/org/apache/commons/codec/binary/Base64Test.java (original)
+++ commons/proper/codec/trunk/src/test/org/apache/commons/codec/binary/Base64Test.java Sun Jan 23 05:52:42 2011
@@ -583,12 +583,12 @@ public class Base64Test extends TestCase
*/
public void testRfc4648Section10Encode() {
assertEquals("", Base64.encodeBase64String(StringUtils.getBytesUtf8("")));
- //assertEquals("Zg==", Base64.encodeBase64String(StringUtils.getBytesUtf8("f")));
- //assertEquals("Zm8=", Base64.encodeBase64String(StringUtils.getBytesUtf8("fo")));
- //assertEquals("Zm9v", Base64.encodeBase64String(StringUtils.getBytesUtf8("foo")));
- //assertEquals("Zm9vYg==", Base64.encodeBase64String(StringUtils.getBytesUtf8("foob")));
- //assertEquals("Zm9vYmE=", Base64.encodeBase64String(StringUtils.getBytesUtf8("fooba")));
- //assertEquals("Zm9vYmFy", Base64.encodeBase64String(StringUtils.getBytesUtf8("foobar")));
+ assertEquals("Zg==", Base64.encodeBase64String(StringUtils.getBytesUtf8("f")));
+ assertEquals("Zm8=", Base64.encodeBase64String(StringUtils.getBytesUtf8("fo")));
+ assertEquals("Zm9v", Base64.encodeBase64String(StringUtils.getBytesUtf8("foo")));
+ assertEquals("Zm9vYg==", Base64.encodeBase64String(StringUtils.getBytesUtf8("foob")));
+ assertEquals("Zm9vYmE=", Base64.encodeBase64String(StringUtils.getBytesUtf8("fooba")));
+ assertEquals("Zm9vYmFy", Base64.encodeBase64String(StringUtils.getBytesUtf8("foobar")));
}
/**
@@ -1126,13 +1126,13 @@ public class Base64Test extends TestCase
byte[] b4 = Hex.decodeHex("2bf7cc2701fe4397b49ebeed5acc7090".toCharArray()); // for url-safe tests
assertEquals("byteToString Hello World", "SGVsbG8gV29ybGQ=", base64.encodeToString(b1));
- assertEquals("byteToString static Hello World", "SGVsbG8gV29ybGQ=\r\n", Base64.encodeBase64String(b1));
+ assertEquals("byteToString static Hello World", "SGVsbG8gV29ybGQ=", Base64.encodeBase64String(b1));
assertEquals("byteToString \"\"", "", base64.encodeToString(b2));
assertEquals("byteToString static \"\"", "", Base64.encodeBase64String(b2));
assertEquals("byteToString null", null, base64.encodeToString(b3));
assertEquals("byteToString static null", null, Base64.encodeBase64String(b3));
assertEquals("byteToString UUID", "K/fMJwH+Q5e0nr7tWsxwkA==", base64.encodeToString(b4));
- assertEquals("byteToString static UUID", "K/fMJwH+Q5e0nr7tWsxwkA==\r\n", Base64.encodeBase64String(b4));
+ assertEquals("byteToString static UUID", "K/fMJwH+Q5e0nr7tWsxwkA==", Base64.encodeBase64String(b4));
assertEquals("byteToString static-url-safe UUID", "K_fMJwH-Q5e0nr7tWsxwkA", Base64.encodeBase64URLSafeString(b4));
}
Re: svn commit: r1062330 - in /commons/proper/codec/trunk/src:
java/org/apache/commons/codec/binary/Base64.java test/org/apache/commons/codec/binary/Base64Test.java
Posted by Julius Davies <ju...@gmail.com>.
Fixed now, thanks for pointing this out!!!! Oops!
On Sun, Jan 23, 2011 at 5:19 AM, sebb <se...@gmail.com> wrote:
> On 23 January 2011 05:52, <ju...@apache.org> wrote:
>> Author: julius
>> Date: Sun Jan 23 05:52:42 2011
>> New Revision: 1062330
>>
>> URL: http://svn.apache.org/viewvc?rev=1062330&view=rev
>> Log:
>> CODEC-99 - Base64.encodeBase64String() should not chunk
>>
>> Modified:
>> commons/proper/codec/trunk/src/java/org/apache/commons/codec/binary/Base64.java
>> commons/proper/codec/trunk/src/test/org/apache/commons/codec/binary/Base64Test.java
>>
>> Modified: commons/proper/codec/trunk/src/java/org/apache/commons/codec/binary/Base64.java
>> URL: http://svn.apache.org/viewvc/commons/proper/codec/trunk/src/java/org/apache/commons/codec/binary/Base64.java?rev=1062330&r1=1062329&r2=1062330&view=diff
>> ==============================================================================
>> --- commons/proper/codec/trunk/src/java/org/apache/commons/codec/binary/Base64.java (original)
>> +++ commons/proper/codec/trunk/src/java/org/apache/commons/codec/binary/Base64.java Sun Jan 23 05:52:42 2011
>> @@ -667,7 +667,7 @@ public class Base64 implements BinaryEnc
>> * @since 1.4
>> */
>> public static String encodeBase64String(byte[] binaryData) {
>> - return StringUtils.newStringUtf8(encodeBase64(binaryData, true));
>> + return StringUtils.newStringUtf8(encodeBase64(binaryData, false));
>
> The Javadoc needs to be updated to make this clear.
>
>> }
>>
>> /**
>>
>> Modified: commons/proper/codec/trunk/src/test/org/apache/commons/codec/binary/Base64Test.java
>> URL: http://svn.apache.org/viewvc/commons/proper/codec/trunk/src/test/org/apache/commons/codec/binary/Base64Test.java?rev=1062330&r1=1062329&r2=1062330&view=diff
>> ==============================================================================
>> --- commons/proper/codec/trunk/src/test/org/apache/commons/codec/binary/Base64Test.java (original)
>> +++ commons/proper/codec/trunk/src/test/org/apache/commons/codec/binary/Base64Test.java Sun Jan 23 05:52:42 2011
>> @@ -583,12 +583,12 @@ public class Base64Test extends TestCase
>> */
>> public void testRfc4648Section10Encode() {
>> assertEquals("", Base64.encodeBase64String(StringUtils.getBytesUtf8("")));
>> - //assertEquals("Zg==", Base64.encodeBase64String(StringUtils.getBytesUtf8("f")));
>> - //assertEquals("Zm8=", Base64.encodeBase64String(StringUtils.getBytesUtf8("fo")));
>> - //assertEquals("Zm9v", Base64.encodeBase64String(StringUtils.getBytesUtf8("foo")));
>> - //assertEquals("Zm9vYg==", Base64.encodeBase64String(StringUtils.getBytesUtf8("foob")));
>> - //assertEquals("Zm9vYmE=", Base64.encodeBase64String(StringUtils.getBytesUtf8("fooba")));
>> - //assertEquals("Zm9vYmFy", Base64.encodeBase64String(StringUtils.getBytesUtf8("foobar")));
>> + assertEquals("Zg==", Base64.encodeBase64String(StringUtils.getBytesUtf8("f")));
>> + assertEquals("Zm8=", Base64.encodeBase64String(StringUtils.getBytesUtf8("fo")));
>> + assertEquals("Zm9v", Base64.encodeBase64String(StringUtils.getBytesUtf8("foo")));
>> + assertEquals("Zm9vYg==", Base64.encodeBase64String(StringUtils.getBytesUtf8("foob")));
>> + assertEquals("Zm9vYmE=", Base64.encodeBase64String(StringUtils.getBytesUtf8("fooba")));
>> + assertEquals("Zm9vYmFy", Base64.encodeBase64String(StringUtils.getBytesUtf8("foobar")));
>> }
>>
>> /**
>> @@ -1126,13 +1126,13 @@ public class Base64Test extends TestCase
>> byte[] b4 = Hex.decodeHex("2bf7cc2701fe4397b49ebeed5acc7090".toCharArray()); // for url-safe tests
>>
>> assertEquals("byteToString Hello World", "SGVsbG8gV29ybGQ=", base64.encodeToString(b1));
>> - assertEquals("byteToString static Hello World", "SGVsbG8gV29ybGQ=\r\n", Base64.encodeBase64String(b1));
>> + assertEquals("byteToString static Hello World", "SGVsbG8gV29ybGQ=", Base64.encodeBase64String(b1));
>> assertEquals("byteToString \"\"", "", base64.encodeToString(b2));
>> assertEquals("byteToString static \"\"", "", Base64.encodeBase64String(b2));
>> assertEquals("byteToString null", null, base64.encodeToString(b3));
>> assertEquals("byteToString static null", null, Base64.encodeBase64String(b3));
>> assertEquals("byteToString UUID", "K/fMJwH+Q5e0nr7tWsxwkA==", base64.encodeToString(b4));
>> - assertEquals("byteToString static UUID", "K/fMJwH+Q5e0nr7tWsxwkA==\r\n", Base64.encodeBase64String(b4));
>> + assertEquals("byteToString static UUID", "K/fMJwH+Q5e0nr7tWsxwkA==", Base64.encodeBase64String(b4));
>> assertEquals("byteToString static-url-safe UUID", "K_fMJwH-Q5e0nr7tWsxwkA", Base64.encodeBase64URLSafeString(b4));
>> }
>>
>>
>>
>>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@commons.apache.org
> For additional commands, e-mail: dev-help@commons.apache.org
>
>
--
yours,
Julius Davies
250-592-2284 (Home)
$ sudo apt-get install cowsay
$ echo "Moo." | cowsay | cowsay -n | cowsay -n
http://juliusdavies.ca/cowsay/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@commons.apache.org
For additional commands, e-mail: dev-help@commons.apache.org
Re: svn commit: r1062330 - in /commons/proper/codec/trunk/src:
java/org/apache/commons/codec/binary/Base64.java test/org/apache/commons/codec/binary/Base64Test.java
Posted by sebb <se...@gmail.com>.
On 23 January 2011 05:52, <ju...@apache.org> wrote:
> Author: julius
> Date: Sun Jan 23 05:52:42 2011
> New Revision: 1062330
>
> URL: http://svn.apache.org/viewvc?rev=1062330&view=rev
> Log:
> CODEC-99 - Base64.encodeBase64String() should not chunk
>
> Modified:
> commons/proper/codec/trunk/src/java/org/apache/commons/codec/binary/Base64.java
> commons/proper/codec/trunk/src/test/org/apache/commons/codec/binary/Base64Test.java
>
> Modified: commons/proper/codec/trunk/src/java/org/apache/commons/codec/binary/Base64.java
> URL: http://svn.apache.org/viewvc/commons/proper/codec/trunk/src/java/org/apache/commons/codec/binary/Base64.java?rev=1062330&r1=1062329&r2=1062330&view=diff
> ==============================================================================
> --- commons/proper/codec/trunk/src/java/org/apache/commons/codec/binary/Base64.java (original)
> +++ commons/proper/codec/trunk/src/java/org/apache/commons/codec/binary/Base64.java Sun Jan 23 05:52:42 2011
> @@ -667,7 +667,7 @@ public class Base64 implements BinaryEnc
> * @since 1.4
> */
> public static String encodeBase64String(byte[] binaryData) {
> - return StringUtils.newStringUtf8(encodeBase64(binaryData, true));
> + return StringUtils.newStringUtf8(encodeBase64(binaryData, false));
The Javadoc needs to be updated to make this clear.
> }
>
> /**
>
> Modified: commons/proper/codec/trunk/src/test/org/apache/commons/codec/binary/Base64Test.java
> URL: http://svn.apache.org/viewvc/commons/proper/codec/trunk/src/test/org/apache/commons/codec/binary/Base64Test.java?rev=1062330&r1=1062329&r2=1062330&view=diff
> ==============================================================================
> --- commons/proper/codec/trunk/src/test/org/apache/commons/codec/binary/Base64Test.java (original)
> +++ commons/proper/codec/trunk/src/test/org/apache/commons/codec/binary/Base64Test.java Sun Jan 23 05:52:42 2011
> @@ -583,12 +583,12 @@ public class Base64Test extends TestCase
> */
> public void testRfc4648Section10Encode() {
> assertEquals("", Base64.encodeBase64String(StringUtils.getBytesUtf8("")));
> - //assertEquals("Zg==", Base64.encodeBase64String(StringUtils.getBytesUtf8("f")));
> - //assertEquals("Zm8=", Base64.encodeBase64String(StringUtils.getBytesUtf8("fo")));
> - //assertEquals("Zm9v", Base64.encodeBase64String(StringUtils.getBytesUtf8("foo")));
> - //assertEquals("Zm9vYg==", Base64.encodeBase64String(StringUtils.getBytesUtf8("foob")));
> - //assertEquals("Zm9vYmE=", Base64.encodeBase64String(StringUtils.getBytesUtf8("fooba")));
> - //assertEquals("Zm9vYmFy", Base64.encodeBase64String(StringUtils.getBytesUtf8("foobar")));
> + assertEquals("Zg==", Base64.encodeBase64String(StringUtils.getBytesUtf8("f")));
> + assertEquals("Zm8=", Base64.encodeBase64String(StringUtils.getBytesUtf8("fo")));
> + assertEquals("Zm9v", Base64.encodeBase64String(StringUtils.getBytesUtf8("foo")));
> + assertEquals("Zm9vYg==", Base64.encodeBase64String(StringUtils.getBytesUtf8("foob")));
> + assertEquals("Zm9vYmE=", Base64.encodeBase64String(StringUtils.getBytesUtf8("fooba")));
> + assertEquals("Zm9vYmFy", Base64.encodeBase64String(StringUtils.getBytesUtf8("foobar")));
> }
>
> /**
> @@ -1126,13 +1126,13 @@ public class Base64Test extends TestCase
> byte[] b4 = Hex.decodeHex("2bf7cc2701fe4397b49ebeed5acc7090".toCharArray()); // for url-safe tests
>
> assertEquals("byteToString Hello World", "SGVsbG8gV29ybGQ=", base64.encodeToString(b1));
> - assertEquals("byteToString static Hello World", "SGVsbG8gV29ybGQ=\r\n", Base64.encodeBase64String(b1));
> + assertEquals("byteToString static Hello World", "SGVsbG8gV29ybGQ=", Base64.encodeBase64String(b1));
> assertEquals("byteToString \"\"", "", base64.encodeToString(b2));
> assertEquals("byteToString static \"\"", "", Base64.encodeBase64String(b2));
> assertEquals("byteToString null", null, base64.encodeToString(b3));
> assertEquals("byteToString static null", null, Base64.encodeBase64String(b3));
> assertEquals("byteToString UUID", "K/fMJwH+Q5e0nr7tWsxwkA==", base64.encodeToString(b4));
> - assertEquals("byteToString static UUID", "K/fMJwH+Q5e0nr7tWsxwkA==\r\n", Base64.encodeBase64String(b4));
> + assertEquals("byteToString static UUID", "K/fMJwH+Q5e0nr7tWsxwkA==", Base64.encodeBase64String(b4));
> assertEquals("byteToString static-url-safe UUID", "K_fMJwH-Q5e0nr7tWsxwkA", Base64.encodeBase64URLSafeString(b4));
> }
>
>
>
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@commons.apache.org
For additional commands, e-mail: dev-help@commons.apache.org