From 8182a5e7e6e25e7f49118be19dfabe8faa4741c0 Mon Sep 17 00:00:00 2001
From: Matthew Swift <matthew.swift@forgerock.com>
Date: Tue, 04 Sep 2012 16:42:35 +0000
Subject: [PATCH] Back out previous additional fix OPENDJ-369: Consider exposing base 64 encode/decode APIs
---
opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/ByteStringTestCase.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/ByteStringTestCase.java b/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/ByteStringTestCase.java
index 162eb1f..cdea5c3 100644
--- a/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/ByteStringTestCase.java
+++ b/opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/ByteStringTestCase.java
@@ -54,9 +54,9 @@
return new Object[][] {
{ ByteString.empty(), new byte[0] },
- { ByteString.valueOfBase64String("AAA="), new byte[] { 0x00, 0x00 }},
- { ByteString.valueOfBase64String("AAAA"), new byte[] { 0x00, 0x00, 0x00 }},
- { ByteString.valueOfBase64String("AAAAAA=="), new byte[] { 0x00, 0x00, 0x00, 0x00 }},
+ { ByteString.valueOfBase64("AAA="), new byte[] { 0x00, 0x00 }},
+ { ByteString.valueOfBase64("AAAA"), new byte[] { 0x00, 0x00, 0x00 }},
+ { ByteString.valueOfBase64("AAAAAA=="), new byte[] { 0x00, 0x00, 0x00, 0x00 }},
{ ByteString.valueOf(1),
new byte[] { (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x01 } },
{ ByteString.valueOf(Integer.MAX_VALUE),
@@ -230,13 +230,13 @@
expectedExceptions = { LocalizedIllegalArgumentException.class })
public void testValueOfBase64ThrowsLIAE(final String invalidBase64) throws Exception {
Assert.fail("Expected exception but got result: "
- + Arrays.toString(new ByteString[] { ByteString.valueOfBase64String(invalidBase64) }));
+ + Arrays.toString(new ByteString[] { ByteString.valueOfBase64(invalidBase64) }));
}
@Test(dataProvider = "validBase64Data")
public void testValueOfBase64(final String hexData, final String encodedData) throws Exception {
final byte[] data = DatatypeConverter.parseHexBinary(hexData);
- final byte[] decodedData = ByteString.valueOfBase64String(encodedData).toByteArray();
+ final byte[] decodedData = ByteString.valueOfBase64(encodedData).toByteArray();
Assert.assertEquals(decodedData, data);
}
}
--
Gitblit v1.10.0