From 101f3a4e573e376a4525cb9f742a0c87aee56071 Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Mon, 07 Mar 2016 15:04:02 +0000
Subject: [PATCH] OPENDJ-1342 Migrate AVA, RDN, and DN classes: Switched imports

---
 opendj-server-legacy/src/test/java/org/forgerock/opendj/adapter/server3x/ConvertersTestCase.java |   13 ++++++-------
 1 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/opendj-server-legacy/src/test/java/org/forgerock/opendj/adapter/server3x/ConvertersTestCase.java b/opendj-server-legacy/src/test/java/org/forgerock/opendj/adapter/server3x/ConvertersTestCase.java
index 5ab98f3..6e68933 100644
--- a/opendj-server-legacy/src/test/java/org/forgerock/opendj/adapter/server3x/ConvertersTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/forgerock/opendj/adapter/server3x/ConvertersTestCase.java
@@ -24,6 +24,7 @@
 import java.util.List;
 
 import org.forgerock.opendj.ldap.ByteString;
+import org.forgerock.opendj.ldap.DN;
 import org.forgerock.opendj.ldap.Filter;
 import org.forgerock.opendj.ldap.LinkedAttribute;
 import org.forgerock.opendj.ldap.LinkedHashMapEntry;
@@ -104,8 +105,7 @@
     @Test
     public final void testToSearchResultEntry() throws Exception {
         org.forgerock.opendj.ldap.responses.SearchResultEntry entry =
-            Responses.newSearchResultEntry(org.forgerock.opendj.ldap.DN
-                .valueOf("uid=scarter,ou=People,dc=example,dc=com"));
+            Responses.newSearchResultEntry(DN.valueOf("uid=scarter,ou=People,dc=example,dc=com"));
         for (Control control : generateSdkControlsList()) {
             entry.addControl(control);
         }
@@ -125,8 +125,7 @@
     @Test
     public final void testToEntry() throws Exception {
         org.forgerock.opendj.ldap.Entry entry =
-            new LinkedHashMapEntry(org.forgerock.opendj.ldap.DN
-                .valueOf("uid=scarter,ou=People,dc=example,dc=com"));
+            new LinkedHashMapEntry(DN.valueOf("uid=scarter,ou=People,dc=example,dc=com"));
         entry.addAttribute(new LinkedAttribute("test", "value1"));
         entry.addAttribute(new LinkedAttribute("Another", ByteString.valueOfUtf8("myValue")));
 
@@ -147,7 +146,7 @@
         org.forgerock.opendj.ldap.DN sdkDN =
                 org.forgerock.opendj.ldap.DN.valueOf(dnString);
 
-        org.opends.server.types.DN srvDN = to(sdkDN);
+        org.forgerock.opendj.ldap.DN srvDN = to(sdkDN);
         assertThat(srvDN.toString()).isEqualTo(dnString);
     }
 
@@ -157,7 +156,7 @@
         org.forgerock.opendj.ldap.RDN sdkRDN =
                 org.forgerock.opendj.ldap.RDN.valueOf(rdnString);
 
-        org.opends.server.types.RDN srvRDN = to(sdkRDN);
+        org.forgerock.opendj.ldap.RDN srvRDN = to(sdkRDN);
         assertThat(srvRDN.toString()).isEqualTo(rdnString);
     }
 
@@ -486,7 +485,7 @@
     @Test
     public final void testFromDN() throws DirectoryException {
         final String dnString = "uid=scarter,ou=People,dc=example,dc=com";
-        org.opends.server.types.DN srvDN = org.opends.server.types.DN.valueOf(dnString);
+        org.forgerock.opendj.ldap.DN srvDN = org.forgerock.opendj.ldap.DN.valueOf(dnString);
         org.forgerock.opendj.ldap.DN sdkDN = from(srvDN);
 
         assertThat(sdkDN.toString()).isEqualTo(dnString);

--
Gitblit v1.10.0