From c38f72900e121badd214396309a318991940f01d Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Wed, 01 Jun 2016 20:24:40 +0000
Subject: [PATCH] OPENDJ-3037 remove two register*() methods from Schema class
---
opendj-server-legacy/src/test/java/org/opends/server/plugins/LastModPluginTestCase.java | 24 ++++++++++++------------
1 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/plugins/LastModPluginTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/plugins/LastModPluginTestCase.java
index 6bd451b..febec70 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/plugins/LastModPluginTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/plugins/LastModPluginTestCase.java
@@ -24,24 +24,24 @@
import java.util.List;
import org.forgerock.opendj.config.server.ConfigException;
+import org.forgerock.opendj.ldap.DN;
import org.forgerock.opendj.ldap.ModificationType;
+import org.forgerock.opendj.ldap.RDN;
import org.forgerock.opendj.ldap.ResultCode;
-import org.opends.server.TestCaseUtils;
+import org.forgerock.opendj.ldap.schema.AttributeType;
import org.forgerock.opendj.server.config.meta.LastModPluginCfgDefn;
+import org.opends.server.TestCaseUtils;
import org.opends.server.api.plugin.PluginType;
import org.opends.server.core.DirectoryServer;
import org.opends.server.core.ModifyDNOperation;
import org.opends.server.core.ModifyOperation;
import org.opends.server.extensions.InitializationUtils;
import org.opends.server.protocols.internal.InternalClientConnection;
-import org.forgerock.opendj.ldap.schema.AttributeType;
import org.opends.server.types.Attributes;
-import org.forgerock.opendj.ldap.DN;
import org.opends.server.types.DirectoryConfig;
import org.opends.server.types.Entry;
import org.opends.server.types.InitializationException;
import org.opends.server.types.Modification;
-import org.forgerock.opendj.ldap.RDN;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;
@@ -138,11 +138,11 @@
public void testInitializeWithValidConfigs(Entry e)
throws Exception
{
- LastModPlugin plugin = pp(e);
+ LastModPlugin plugin = initializePlugin(e);
plugin.finalizePlugin();
}
- private LastModPlugin pp(Entry e) throws ConfigException, InitializationException {
+ private LastModPlugin initializePlugin(Entry e) throws ConfigException, InitializationException {
return InitializationUtils.initializePlugin(new LastModPlugin(), e, LastModPluginCfgDefn.getInstance());
}
@@ -169,14 +169,14 @@
DirectoryServer.getSchema().deregisterAttributeType(mnType);
- LastModPlugin plugin = pp(e);
+ LastModPlugin plugin = initializePlugin(e);
plugin.finalizePlugin();
- DirectoryServer.getSchema().registerAttributeType(ctType, false);
- DirectoryServer.getSchema().registerAttributeType(cnType, false);
- DirectoryServer.getSchema().registerAttributeType(mtType, false);
- DirectoryServer.getSchema().registerAttributeType(mnType, false);
+ DirectoryServer.getSchema().registerAttributeType(ctType, null, false);
+ DirectoryServer.getSchema().registerAttributeType(cnType, null, false);
+ DirectoryServer.getSchema().registerAttributeType(mtType, null, false);
+ DirectoryServer.getSchema().registerAttributeType(mnType, null, false);
}
@@ -236,7 +236,7 @@
public void testInitializeWithInvalidConfigs(Entry e)
throws Exception
{
- LastModPlugin plugin = pp(e);
+ LastModPlugin plugin = initializePlugin(e);
plugin.finalizePlugin();
}
--
Gitblit v1.10.0