From 39fb26309091c573b915529452d40bd24e97d1f3 Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Wed, 04 May 2016 08:44:50 +0000
Subject: [PATCH] OPENDJ-2987 DirectoryServer.getDefaultObjectClass() => DirectoryServer.getObjectClass2()
---
opendj-server-legacy/src/test/java/org/opends/server/backends/pluggable/TestDnKeyFormat.java | 24 ++++++++++++------------
1 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/backends/pluggable/TestDnKeyFormat.java b/opendj-server-legacy/src/test/java/org/opends/server/backends/pluggable/TestDnKeyFormat.java
index 7e22af0..f485c92 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/backends/pluggable/TestDnKeyFormat.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/backends/pluggable/TestDnKeyFormat.java
@@ -16,6 +16,10 @@
*/
package org.opends.server.backends.pluggable;
+import static org.assertj.core.api.Assertions.*;
+import static org.opends.server.util.StaticUtils.*;
+import static org.testng.Assert.*;
+
import java.io.ByteArrayInputStream;
import java.util.List;
import java.util.Map;
@@ -23,21 +27,22 @@
import org.forgerock.opendj.ldap.ByteString;
import org.forgerock.opendj.ldap.ByteStringBuilder;
import org.forgerock.opendj.ldap.DN;
+import org.forgerock.opendj.ldap.schema.AttributeType;
import org.opends.server.DirectoryServerTestCase;
import org.opends.server.TestCaseUtils;
import org.opends.server.backends.pluggable.spi.TreeName;
import org.opends.server.core.DirectoryServer;
-import org.forgerock.opendj.ldap.schema.AttributeType;
-import org.opends.server.types.*;
+import org.opends.server.types.Attribute;
+import org.opends.server.types.DirectoryException;
+import org.opends.server.types.Entry;
+import org.opends.server.types.EntryEncodeConfig;
+import org.opends.server.types.LDIFImportConfig;
+import org.opends.server.types.ObjectClass;
import org.opends.server.util.LDIFReader;
import org.opends.server.util.StaticUtils;
import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;
-import static org.assertj.core.api.Assertions.*;
-import static org.opends.server.util.StaticUtils.*;
-import static org.testng.Assert.*;
-
/**
* DnKeyFormat Tester.
*/
@@ -371,13 +376,8 @@
// check the object classes were not changed
for (String ocBefore : entryBefore.getObjectClasses().values()) {
- ObjectClass objectClass = DirectoryServer.getObjectClass(ocBefore
- .toLowerCase());
- if (objectClass == null) {
- objectClass = DirectoryServer.getDefaultObjectClass(ocBefore);
- }
+ ObjectClass objectClass = DirectoryServer.getObjectClass2(ocBefore);
String ocAfter = entryAfter.getObjectClasses().get(objectClass);
-
assertEquals(ocBefore, ocAfter);
}
--
Gitblit v1.10.0