From 4baece95779dd46a3a59d59d1b7aa5958cf6117d Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Thu, 05 Nov 2015 12:25:29 +0000
Subject: [PATCH] OPENDJ-1802 Make ByteString methods more intentional
---
opendj-server-legacy/src/test/java/org/opends/server/controls/VLVControlTestCase.java | 24 ++++++++++++------------
1 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/controls/VLVControlTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/controls/VLVControlTestCase.java
index f82e71b..8047a8b 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/controls/VLVControlTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/controls/VLVControlTestCase.java
@@ -284,7 +284,7 @@
throws Exception
{
VLVRequestControl vlvRequest =
- new VLVRequestControl(true, 0, 9, 1, 0, ByteString.valueOf("foo"));
+ new VLVRequestControl(true, 0, 9, 1, 0, ByteString.valueOfUtf8("foo"));
assertEquals(vlvRequest.isCritical(), true);
assertEquals(vlvRequest.getBeforeCount(), 0);
@@ -310,7 +310,7 @@
throws Exception
{
VLVRequestControl vlvRequest =
- new VLVRequestControl(0, 9, ByteString.valueOf("a"));
+ new VLVRequestControl(0, 9, ByteString.valueOfUtf8("a"));
assertEquals(vlvRequest.isCritical(), false);
assertEquals(vlvRequest.getBeforeCount(), 0);
@@ -336,7 +336,7 @@
throws Exception
{
VLVRequestControl vlvRequest =
- new VLVRequestControl(true, 0, 9, ByteString.valueOf("a"), null);
+ new VLVRequestControl(true, 0, 9, ByteString.valueOfUtf8("a"), null);
assertEquals(vlvRequest.isCritical(), true);
assertEquals(vlvRequest.getBeforeCount(), 0);
@@ -362,8 +362,8 @@
throws Exception
{
VLVRequestControl vlvRequest =
- new VLVRequestControl(true, 0, 9, ByteString.valueOf("a"),
- ByteString.valueOf("foo"));
+ new VLVRequestControl(true, 0, 9, ByteString.valueOfUtf8("a"),
+ ByteString.valueOfUtf8("foo"));
assertEquals(vlvRequest.isCritical(), true);
assertEquals(vlvRequest.getBeforeCount(), 0);
@@ -388,7 +388,7 @@
ByteStringBuilder builder = new ByteStringBuilder();
ASN1Writer writer = ASN1.getWriter(builder);
VLVResponseControl vlvResponse = new VLVResponseControl(true, 0, 15, 0,
- ByteString.valueOf("foo"));
+ ByteString.valueOfUtf8("foo"));
vlvResponse.writeValue(writer);
ASN1Reader reader = ASN1.getReader(builder.toByteString());
@@ -466,7 +466,7 @@
throws Exception
{
VLVResponseControl vlvResponse =
- new VLVResponseControl(true, 0, 15, 0, ByteString.valueOf("foo"));
+ new VLVResponseControl(true, 0, 15, 0, ByteString.valueOfUtf8("foo"));
assertEquals(vlvResponse.isCritical(), true);
assertEquals(vlvResponse.getTargetPosition(), 0);
@@ -823,7 +823,7 @@
SearchRequest request = newSearchRequest("dc=example,dc=com", SearchScope.WHOLE_SUBTREE, "(objectClass=person)")
.addControl(new ServerSideSortRequestControl("givenName"))
- .addControl(new VLVRequestControl(0, 3, ByteString.valueOf("a")));
+ .addControl(new VLVRequestControl(0, 3, ByteString.valueOfUtf8("a")));
InternalSearchOperation internalSearch = getRootConnection().processSearch(request);
assertEquals(internalSearch.getResultCode(), ResultCode.SUCCESS);
@@ -883,7 +883,7 @@
SearchRequest request = newSearchRequest("dc=example,dc=com", SearchScope.WHOLE_SUBTREE, "(objectClass=person)")
.addControl(new ServerSideSortRequestControl("givenName"))
- .addControl(new VLVRequestControl(0, 3, ByteString.valueOf("aaccf")));
+ .addControl(new VLVRequestControl(0, 3, ByteString.valueOfUtf8("aaccf")));
InternalSearchOperation internalSearch = getRootConnection().processSearch(request);
assertEquals(internalSearch.getResultCode(), ResultCode.SUCCESS);
@@ -945,7 +945,7 @@
SearchRequest request = newSearchRequest("dc=example,dc=com", SearchScope.WHOLE_SUBTREE, "(objectClass=person)")
.addControl(new ServerSideSortRequestControl("givenName"))
- .addControl(new VLVRequestControl(0, 3, ByteString.valueOf("albert")));
+ .addControl(new VLVRequestControl(0, 3, ByteString.valueOfUtf8("albert")));
InternalSearchOperation internalSearch = getRootConnection().processSearch(request);
assertEquals(internalSearch.getResultCode(), ResultCode.SUCCESS);
@@ -1007,7 +1007,7 @@
SearchRequest request = newSearchRequest("dc=example,dc=com", SearchScope.WHOLE_SUBTREE, "(objectClass=person)")
.addControl(new ServerSideSortRequestControl("givenName"))
- .addControl(new VLVRequestControl(1, 3, ByteString.valueOf("albert")));
+ .addControl(new VLVRequestControl(1, 3, ByteString.valueOfUtf8("albert")));
InternalSearchOperation internalSearch = getRootConnection().processSearch(request);
assertEquals(internalSearch.getResultCode(), ResultCode.SUCCESS);
@@ -1075,7 +1075,7 @@
SearchRequest request = newSearchRequest("dc=example,dc=com", SearchScope.WHOLE_SUBTREE, "(objectClass=person)")
.addControl(new ServerSideSortRequestControl("sn"))
- .addControl(new VLVRequestControl(0, 3, ByteString.valueOf("zz")));
+ .addControl(new VLVRequestControl(0, 3, ByteString.valueOfUtf8("zz")));
InternalSearchOperation internalSearch = getRootConnection().processSearch(request);
// It will be successful because the control isn't critical.
--
Gitblit v1.10.0