From 0c4fd5b96ee97c414f6a120e7bb683e94bdd1caf Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Mon, 04 Apr 2016 13:38:34 +0000
Subject: [PATCH] Replace server's AdminTestCaseUtils by the SDK equivalent
---
opendj-server-legacy/src/test/java/org/opends/server/plugins/EntryUUIDPluginTestCase.java | 36 ++++++++----------------------------
1 files changed, 8 insertions(+), 28 deletions(-)
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/plugins/EntryUUIDPluginTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/plugins/EntryUUIDPluginTestCase.java
index 6990a36..9be6fdd 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/plugins/EntryUUIDPluginTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/plugins/EntryUUIDPluginTestCase.java
@@ -20,20 +20,19 @@
import java.io.ByteArrayInputStream;
import java.util.ArrayList;
-import java.util.HashSet;
import java.util.List;
import java.util.UUID;
import org.forgerock.opendj.config.server.ConfigException;
import org.opends.server.TestCaseUtils;
-import org.forgerock.opendj.config.server.AdminTestCaseUtils;
import org.forgerock.opendj.server.config.meta.EntryUUIDPluginCfgDefn;
-import org.forgerock.opendj.server.config.server.EntryUUIDPluginCfg;
import org.opends.server.api.plugin.PluginType;
import org.opends.server.core.DirectoryServer;
+import org.opends.server.extensions.InitializationUtils;
import org.forgerock.opendj.ldap.schema.AttributeType;
import org.forgerock.opendj.ldap.DN;
import org.opends.server.types.Entry;
+import org.opends.server.types.InitializationException;
import org.opends.server.types.LDIFImportConfig;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.DataProvider;
@@ -121,14 +120,7 @@
public void testInitializeWithValidConfigs(Entry e)
throws Exception
{
- HashSet<PluginType> pluginTypes = TestCaseUtils.getPluginTypes(e);
-
- EntryUUIDPluginCfg configuration =
- AdminTestCaseUtils.getConfiguration(
- EntryUUIDPluginCfgDefn.getInstance(), e);
-
- EntryUUIDPlugin plugin = new EntryUUIDPlugin();
- plugin.initializePlugin(pluginTypes, configuration);
+ EntryUUIDPlugin plugin = initializePlugin(e);
plugin.finalizePlugin();
}
@@ -149,14 +141,7 @@
AttributeType entryUUIDType = DirectoryServer.getAttributeType("entryuuid");
DirectoryServer.deregisterAttributeType(entryUUIDType);
- HashSet<PluginType> pluginTypes = TestCaseUtils.getPluginTypes(e);
-
- EntryUUIDPluginCfg configuration =
- AdminTestCaseUtils.getConfiguration(
- EntryUUIDPluginCfgDefn.getInstance(), e);
-
- EntryUUIDPlugin plugin = new EntryUUIDPlugin();
- plugin.initializePlugin(pluginTypes, configuration);
+ EntryUUIDPlugin plugin = initializePlugin(e);
plugin.finalizePlugin();
@@ -219,17 +204,12 @@
public void testInitializeWithInvalidConfigs(Entry e)
throws Exception
{
- HashSet<PluginType> pluginTypes = TestCaseUtils.getPluginTypes(e);
-
- EntryUUIDPluginCfg configuration =
- AdminTestCaseUtils.getConfiguration(
- EntryUUIDPluginCfgDefn.getInstance(), e);
-
- EntryUUIDPlugin plugin = new EntryUUIDPlugin();
- plugin.initializePlugin(pluginTypes, configuration);
+ initializePlugin(e);
}
-
+ private EntryUUIDPlugin initializePlugin(Entry e) throws ConfigException, InitializationException {
+ return InitializationUtils.initializePlugin(new EntryUUIDPlugin(), e, EntryUUIDPluginCfgDefn.getInstance());
+ }
/**
* Tests the <CODE>doLDIFImport</CODE> method.
--
Gitblit v1.10.0