From 9a20087a7c428eabc2c9abb9c27f01f623dbe042 Mon Sep 17 00:00:00 2001
From: Nicolas Capponi <nicolas.capponi@forgerock.com>
Date: Fri, 17 Jun 2016 09:54:07 +0000
Subject: [PATCH] OPENDJ-2655 Move CompactDN class as inner class of StaticGroup and optimize its implementation
---
opendj-server-legacy/src/test/java/org/opends/server/extensions/CompactDnTestCase.java | 17 ++++++++++-------
1 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/opendj-core/src/test/java/org/forgerock/opendj/ldap/CompactDnTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/extensions/CompactDnTestCase.java
similarity index 86%
rename from opendj-core/src/test/java/org/forgerock/opendj/ldap/CompactDnTestCase.java
rename to opendj-server-legacy/src/test/java/org/opends/server/extensions/CompactDnTestCase.java
index 2b26ad0..ad34c28 100644
--- a/opendj-core/src/test/java/org/forgerock/opendj/ldap/CompactDnTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/extensions/CompactDnTestCase.java
@@ -11,20 +11,23 @@
* Header, with the fields enclosed by brackets [] replaced by your own identifying
* information: "Portions Copyright [year] [name of copyright owner]".
*
- * Copyright 2014 ForgeRock AS.
+ * Copyright 2014-2016 ForgeRock AS.
*/
-package org.forgerock.opendj.ldap;
+package org.opends.server.extensions;
+import org.forgerock.opendj.ldap.DN;
+import org.opends.server.DirectoryServerTestCase;
+import org.opends.server.extensions.StaticGroup.CompactDn;
import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;
import static org.fest.assertions.Assertions.*;
/**
- * This class defines a set of tests for the org.forgerock.opendj.ldap.DN.CompactDn class.
+ * This class defines a set of tests for the inner class StaticGroup.CompactDn.
*/
@SuppressWarnings("javadoc")
-public class CompactDnTestCase extends SdkTestCase {
+public class CompactDnTestCase extends DirectoryServerTestCase {
/**
* DN test data provider.
@@ -80,11 +83,11 @@
@Test(dataProvider = "equivalentDnRepresentations")
public void testEquals(String dn, String otherDn) throws Exception {
- assertThat(DN.valueOf(dn).compact()).isEqualTo(DN.valueOf(otherDn).compact());
+ assertThat(new CompactDn(DN.valueOf(dn))).isEqualTo(new CompactDn(DN.valueOf(otherDn)));
}
@Test(dataProvider = "equivalentDnRepresentations")
public void testCompareTo(String dn, String otherDn) throws Exception {
- assertThat(DN.valueOf(dn).compact().compareTo(DN.valueOf(otherDn).compact())).isEqualTo(0);
+ assertThat(new CompactDn(DN.valueOf(dn)).compareTo(new CompactDn(DN.valueOf(otherDn)))).isEqualTo(0);
}
-}
+}
\ No newline at end of file
--
Gitblit v1.10.0