From e6319741eef92618c785ba7d00e712bb7b07d015 Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Thu, 25 Feb 2016 17:28:31 +0000
Subject: [PATCH] Prep work for OPENDJ-1342: align APIs for DNs
---
opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestAddResponseProtocolOp.java | 8 +-------
opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestDeleteResponseProtocolOp.java | 8 +-------
opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestModifyResponseProtocolOp.java | 8 +-------
opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestModifyDNResponseProtocolOp.java | 8 +-------
opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestCompareResponseProtocolOp.java | 8 +-------
5 files changed, 5 insertions(+), 35 deletions(-)
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestAddResponseProtocolOp.java b/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestAddResponseProtocolOp.java
index b7e4fee..22547c8 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestAddResponseProtocolOp.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestAddResponseProtocolOp.java
@@ -28,15 +28,11 @@
import org.forgerock.opendj.io.ASN1;
import org.forgerock.opendj.io.ASN1Reader;
import org.forgerock.opendj.io.ASN1Writer;
-import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.ByteStringBuilder;
import org.opends.server.DirectoryServerTestCase;
import org.opends.server.TestCaseUtils;
-import org.opends.server.core.DirectoryServer;
-import org.forgerock.opendj.ldap.schema.AttributeType;
import org.opends.server.types.DN;
import org.opends.server.types.LDAPException;
-import org.opends.server.types.RDN;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
@@ -62,9 +58,7 @@
TestCaseUtils.startServer();
//Setup the DN to use in the response tests.
- AttributeType attribute = DirectoryServer.getAttributeType("testAttribute");
- ByteString attributeValue = ByteString.valueOfUtf8("testValue");
- dn = new DN(new RDN[] { new RDN(attribute, attributeValue) });
+ dn = DN.valueOf("testAttribute=testValue");
}
/**
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestCompareResponseProtocolOp.java b/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestCompareResponseProtocolOp.java
index c53b8b3..4b7b8b5 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestCompareResponseProtocolOp.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestCompareResponseProtocolOp.java
@@ -24,14 +24,10 @@
import org.forgerock.opendj.io.ASN1;
import org.forgerock.opendj.io.ASN1Reader;
import org.forgerock.opendj.io.ASN1Writer;
-import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.ByteStringBuilder;
-import org.forgerock.opendj.ldap.schema.AttributeType;
import org.opends.server.TestCaseUtils;
-import org.opends.server.core.DirectoryServer;
import org.opends.server.types.DN;
import org.opends.server.types.LDAPException;
-import org.opends.server.types.RDN;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
@@ -62,9 +58,7 @@
TestCaseUtils.startServer();
//Setup the DN to use in the response tests.
- AttributeType attribute = DirectoryServer.getAttributeType("testAttribute");
- ByteString attributeValue = ByteString.valueOfUtf8("testValue");
- dn = new DN(new RDN[] { new RDN(attribute, attributeValue) });
+ dn = DN.valueOf("testAttribute=testValue");
}
/**
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestDeleteResponseProtocolOp.java b/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestDeleteResponseProtocolOp.java
index 2ea3ef9..027ac24 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestDeleteResponseProtocolOp.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestDeleteResponseProtocolOp.java
@@ -24,14 +24,10 @@
import org.forgerock.opendj.io.ASN1;
import org.forgerock.opendj.io.ASN1Reader;
import org.forgerock.opendj.io.ASN1Writer;
-import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.ByteStringBuilder;
-import org.forgerock.opendj.ldap.schema.AttributeType;
import org.opends.server.TestCaseUtils;
-import org.opends.server.core.DirectoryServer;
import org.opends.server.types.DN;
import org.opends.server.types.LDAPException;
-import org.opends.server.types.RDN;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
@@ -62,9 +58,7 @@
TestCaseUtils.startServer();
//Setup the DN to use in the response tests.
- AttributeType attribute = DirectoryServer.getAttributeType("testAttribute");
- ByteString attributeValue = ByteString.valueOfUtf8("testValue");
- dn = new DN(new RDN[] { new RDN(attribute, attributeValue) });
+ dn = DN.valueOf("testAttribute=testValue");
}
/**
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestModifyDNResponseProtocolOp.java b/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestModifyDNResponseProtocolOp.java
index 6713fea..2f0d6b3 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestModifyDNResponseProtocolOp.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestModifyDNResponseProtocolOp.java
@@ -28,15 +28,11 @@
import org.forgerock.opendj.io.ASN1;
import org.forgerock.opendj.io.ASN1Reader;
import org.forgerock.opendj.io.ASN1Writer;
-import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.ByteStringBuilder;
import org.opends.server.DirectoryServerTestCase;
import org.opends.server.TestCaseUtils;
-import org.opends.server.core.DirectoryServer;
-import org.forgerock.opendj.ldap.schema.AttributeType;
import org.opends.server.types.DN;
import org.opends.server.types.LDAPException;
-import org.opends.server.types.RDN;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
@@ -63,9 +59,7 @@
TestCaseUtils.startServer();
//Setup the DN to use in the response tests.
- AttributeType attribute = DirectoryServer.getAttributeType("testAttribute");
- ByteString attributeValue = ByteString.valueOfUtf8("testValue");
- dn = new DN(new RDN[] { new RDN(attribute, attributeValue) });
+ dn = DN.valueOf("testAttribute=testValue");
}
/**
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestModifyResponseProtocolOp.java b/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestModifyResponseProtocolOp.java
index 3a56dca..458ecad 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestModifyResponseProtocolOp.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/protocols/ldap/TestModifyResponseProtocolOp.java
@@ -24,14 +24,10 @@
import org.forgerock.opendj.io.ASN1;
import org.forgerock.opendj.io.ASN1Reader;
import org.forgerock.opendj.io.ASN1Writer;
-import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.ByteStringBuilder;
-import org.forgerock.opendj.ldap.schema.AttributeType;
import org.opends.server.TestCaseUtils;
-import org.opends.server.core.DirectoryServer;
import org.opends.server.types.DN;
import org.opends.server.types.LDAPException;
-import org.opends.server.types.RDN;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
@@ -62,9 +58,7 @@
TestCaseUtils.startServer();
//Setup the DN to use in the response tests.
- AttributeType attribute = DirectoryServer.getAttributeType("testAttribute");
- ByteString attributeValue = ByteString.valueOfUtf8("testValue");
- dn = new DN(new RDN[] { new RDN(attribute, attributeValue) });
+ dn = DN.valueOf("testAttribute=testValue");
}
/**
--
Gitblit v1.10.0