From 22094368c2865dcfb6daf8366425212b721a4657 Mon Sep 17 00:00:00 2001
From: matthew_swift <matthew_swift@localhost>
Date: Thu, 05 Feb 2009 17:42:14 +0000
Subject: [PATCH] Merge ASN1 branch to trunk
---
opends/tests/unit-tests-testng/src/server/org/opends/server/schema/CollationMatchingRuleTest.java | 25 +++++++++++++------------
1 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/CollationMatchingRuleTest.java b/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/CollationMatchingRuleTest.java
index 97cdd7d..ba958db 100644
--- a/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/CollationMatchingRuleTest.java
+++ b/opends/tests/unit-tests-testng/src/server/org/opends/server/schema/CollationMatchingRuleTest.java
@@ -28,21 +28,22 @@
package org.opends.server.schema;
+import static org.testng.Assert.*;
+
import java.util.List;
-
-import org.opends.server.protocols.asn1.ASN1OctetString;
import org.opends.server.TestCaseUtils;
import org.opends.server.protocols.internal.InternalClientConnection;
import org.opends.server.protocols.internal.InternalSearchOperation;
import org.opends.server.protocols.ldap.LDAPFilter;
import org.opends.server.tools.LDAPModify;
+import org.opends.server.types.ByteString;
import org.opends.server.types.DereferencePolicy;
import org.opends.server.types.ResultCode;
import org.opends.server.types.SearchResultEntry;
import org.opends.server.types.SearchScope;
-import org.testng.annotations.*;
-import static org.testng.Assert.*;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Test;
/**
@@ -83,7 +84,7 @@
"departmentNumber:: w4NiYzExMQ==",
"carLicense:: w6liZTI=",
"uid: user",
- "cn:: U8ODbmNoZXo=",
+ "cn:: U8ODbmNoZXo=",
"sn:: UXXDqWJlYw==");
String[] args = new String []
{
@@ -117,7 +118,7 @@
InternalClientConnection.nextOperationID(),
InternalClientConnection.nextMessageID(),
null,
- new ASN1OctetString("uid=user,o=test"),
+ ByteString.valueOf("uid=user,o=test"),
SearchScope.WHOLE_SUBTREE,
DereferencePolicy.NEVER_DEREF_ALIASES,
Integer.MAX_VALUE,
@@ -154,7 +155,7 @@
InternalClientConnection.nextOperationID(),
InternalClientConnection.nextMessageID(),
null,
- new ASN1OctetString("uid=user,o=test"),
+ ByteString.valueOf("uid=user,o=test"),
SearchScope.WHOLE_SUBTREE,
DereferencePolicy.NEVER_DEREF_ALIASES,
Integer.MAX_VALUE,
@@ -190,7 +191,7 @@
InternalClientConnection.nextOperationID(),
InternalClientConnection.nextMessageID(),
null,
- new ASN1OctetString("uid=user,o=test"),
+ ByteString.valueOf("uid=user,o=test"),
SearchScope.WHOLE_SUBTREE,
DereferencePolicy.NEVER_DEREF_ALIASES,
Integer.MAX_VALUE,
@@ -228,7 +229,7 @@
InternalClientConnection.nextOperationID(),
InternalClientConnection.nextMessageID(),
null,
- new ASN1OctetString("uid=user,o=test"),
+ ByteString.valueOf("uid=user,o=test"),
SearchScope.WHOLE_SUBTREE,
DereferencePolicy.NEVER_DEREF_ALIASES,
Integer.MAX_VALUE,
@@ -266,7 +267,7 @@
InternalClientConnection.nextOperationID(),
InternalClientConnection.nextMessageID(),
null,
- new ASN1OctetString("uid=user,o=test"),
+ ByteString.valueOf("uid=user,o=test"),
SearchScope.WHOLE_SUBTREE,
DereferencePolicy.NEVER_DEREF_ALIASES,
Integer.MAX_VALUE,
@@ -304,7 +305,7 @@
InternalClientConnection.nextOperationID(),
InternalClientConnection.nextMessageID(),
null,
- new ASN1OctetString("uid=user,o=test"),
+ ByteString.valueOf("uid=user,o=test"),
SearchScope.WHOLE_SUBTREE,
DereferencePolicy.NEVER_DEREF_ALIASES,
Integer.MAX_VALUE,
@@ -345,7 +346,7 @@
InternalClientConnection.nextOperationID(),
InternalClientConnection.nextMessageID(),
null,
- new ASN1OctetString("uid=user,o=test"),
+ ByteString.valueOf("uid=user,o=test"),
SearchScope.WHOLE_SUBTREE,
DereferencePolicy.NEVER_DEREF_ALIASES,
Integer.MAX_VALUE,
--
Gitblit v1.10.0