From 6b7839d9d70958b85da5c9340a53d1f21bd12c31 Mon Sep 17 00:00:00 2001
From: Matthew Swift <matthew.swift@forgerock.com>
Date: Wed, 21 Sep 2011 16:06:11 +0000
Subject: [PATCH] Fix OPENDJ-291: Do not use String representation of byte[] when constructing attribute values and byte strings.
---
opendj3/opendj-ldap-sdk/src/test/java/org/forgerock/opendj/ldap/ByteStringTestCase.java | 23 ++++++++++++++++++++++-
1 files changed, 22 insertions(+), 1 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 136199b..bc46de0 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
@@ -23,6 +23,7 @@
*
*
* Copyright 2010 Sun Microsystems, Inc.
+ * Portions copyright 2011 ForgeRock AS
*/
package org.forgerock.opendj.ldap;
@@ -51,6 +52,10 @@
@DataProvider(name = "byteSequenceProvider")
public Object[][] byteSequenceProvider() throws Exception
{
+ byte[] testBytes = new byte[] { (byte) 0x01, (byte) 0x02, (byte) 0x03,
+ (byte) 0x04, (byte) 0x05, (byte) 0x06, (byte) 0x07,
+ (byte) 0x08 };
+
return new Object[][] {
{ ByteString.empty(), new byte[0] },
{ ByteString.valueOf(1),
@@ -68,6 +73,12 @@
new byte[] { (byte) 0x80, (byte) 0x00, (byte) 0x00, (byte) 0x00,
(byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x00 } },
{ ByteString.valueOf("cn=testvalue"), "cn=testvalue".getBytes("UTF-8") },
+ { ByteString.valueOf((Object) "cn=testvalue"), "cn=testvalue".getBytes("UTF-8") },
+ { ByteString.valueOf("cn=testvalue".toCharArray()), "cn=testvalue".getBytes("UTF-8") },
+ { ByteString.valueOf((Object) "cn=testvalue".toCharArray()), "cn=testvalue".getBytes("UTF-8") },
+ { ByteString.valueOf(testBytes), testBytes },
+ { ByteString.valueOf((Object) testBytes), testBytes },
+ { ByteString.valueOf(ByteString.valueOf("cn=testvalue")), "cn=testvalue".getBytes("UTF-8") },
{ ByteString.wrap(new byte[0]), new byte[0] },
{
ByteString
@@ -159,7 +170,7 @@
@Test(dataProvider = "byteStringCharArrayProvider")
- public void testToCharArray(final String s)
+ public void testFromStringToCharArray(final String s)
{
ByteString bs = ByteString.valueOf(s);
Assert.assertTrue(Arrays.equals(bs.toCharArray(), s.toCharArray()));
@@ -168,6 +179,16 @@
@Test(dataProvider = "byteStringCharArrayProvider")
+ public void testFromCharArrayToCharArray(final String s)
+ {
+ final char[] chars = s.toCharArray();
+ ByteString bs = ByteString.valueOf(chars);
+ Assert.assertTrue(Arrays.equals(bs.toCharArray(), chars));
+ }
+
+
+
+ @Test(dataProvider = "byteStringCharArrayProvider")
public void testValueOfCharArray(final String s)
{
ByteString bs = ByteString.valueOf(s.toCharArray());
--
Gitblit v1.10.0