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/replication/ReplicationTestCase.java | 22 ++++------------------
1 files changed, 4 insertions(+), 18 deletions(-)
diff --git a/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/ReplicationTestCase.java b/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/ReplicationTestCase.java
index 53ef7fc..e5d2c99 100644
--- a/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/ReplicationTestCase.java
+++ b/opends/tests/unit-tests-testng/src/server/org/opends/server/replication/ReplicationTestCase.java
@@ -67,25 +67,11 @@
import org.opends.server.replication.protocol.ReplicationMsg;
import org.opends.server.schema.DirectoryStringSyntax;
import org.opends.server.schema.IntegerSyntax;
-import org.opends.server.types.Attribute;
-import org.opends.server.types.AttributeType;
-import org.opends.server.types.AttributeValue;
-import org.opends.server.types.Attributes;
-import org.opends.server.types.ByteStringFactory;
-import org.opends.server.types.DN;
-import org.opends.server.types.Entry;
-import org.opends.server.types.LockManager;
-import org.opends.server.types.Modification;
-import org.opends.server.types.ModificationType;
-import org.opends.server.types.ResultCode;
-import org.opends.server.types.SearchFilter;
-import org.opends.server.types.SearchResultEntry;
-import org.opends.server.types.SearchScope;
+import org.opends.server.types.*;
import org.testng.annotations.AfterClass;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
import org.opends.server.TestCaseUtils;
-import org.opends.server.protocols.asn1.ASN1OctetString;
import org.opends.server.replication.plugin.MultimasterReplication;
/**
@@ -591,7 +577,7 @@
{
// Search for matching entries in config backend
InternalSearchOperation op = connection.processSearch(
- new ASN1OctetString("cn=config"),
+ ByteString.valueOf("cn=config"),
SearchScope.WHOLE_SUBTREE,
LDAPFilter.decode(filter));
@@ -658,7 +644,7 @@
if (count++>0)
Thread.sleep(100);
op = connection.processSearch(
- ByteStringFactory.create("cn=monitor"),
+ ByteString.valueOf("cn=monitor"),
SearchScope.SINGLE_LEVEL,
LDAPFilter.decode(monitorFilter));
}
@@ -716,7 +702,7 @@
AttributeType attrType =
DirectoryServer.getAttributeType(attrTypeStr, true);
- found = tmpAttr.contains(new AttributeValue(attrType, valueString));
+ found = tmpAttr.contains(AttributeValues.create(attrType, valueString));
}
}
--
Gitblit v1.10.0