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/UniqueAttributePluginTestCase.java | 26 +++++++++-----------------
1 files changed, 9 insertions(+), 17 deletions(-)
diff --git a/opendj-server-legacy/src/test/java/org/opends/server/plugins/UniqueAttributePluginTestCase.java b/opendj-server-legacy/src/test/java/org/opends/server/plugins/UniqueAttributePluginTestCase.java
index e89d91b..421554f 100644
--- a/opendj-server-legacy/src/test/java/org/opends/server/plugins/UniqueAttributePluginTestCase.java
+++ b/opendj-server-legacy/src/test/java/org/opends/server/plugins/UniqueAttributePluginTestCase.java
@@ -16,7 +16,6 @@
*/
package org.opends.server.plugins;
-import java.util.HashSet;
import java.util.List;
import org.forgerock.opendj.config.server.ConfigException;
@@ -25,16 +24,15 @@
import org.forgerock.opendj.ldap.requests.ModifyDNRequest;
import org.forgerock.opendj.ldap.requests.ModifyRequest;
import org.opends.server.TestCaseUtils;
-import org.forgerock.opendj.config.server.AdminTestCaseUtils;
import org.forgerock.opendj.server.config.meta.UniqueAttributePluginCfgDefn;
-import org.forgerock.opendj.server.config.server.UniqueAttributePluginCfg;
-import org.opends.server.api.plugin.PluginType;
import org.opends.server.core.AddOperation;
import org.opends.server.core.ModifyDNOperation;
import org.opends.server.core.ModifyOperation;
+import org.opends.server.extensions.InitializationUtils;
import org.opends.server.types.Attributes;
import org.opends.server.types.DirectoryException;
import org.opends.server.types.Entry;
+import org.opends.server.types.InitializationException;
import org.testng.annotations.AfterClass;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.BeforeMethod;
@@ -193,13 +191,7 @@
public void testInitializeWithValidConfigs(Entry e)
throws Exception
{
- HashSet<PluginType> pluginTypes = TestCaseUtils.getPluginTypes(e);
- UniqueAttributePluginCfg configuration =
- AdminTestCaseUtils.getConfiguration(
- UniqueAttributePluginCfgDefn.getInstance(), e);
-
- UniqueAttributePlugin plugin = new UniqueAttributePlugin();
- plugin.initializePlugin(pluginTypes, configuration);
+ UniqueAttributePlugin plugin = initializePlugin(e);
plugin.finalizePlugin();
}
@@ -305,15 +297,15 @@
public void testInitializeWithInvalidConfigs(Entry e)
throws Exception
{
- HashSet<PluginType> pluginTypes = TestCaseUtils.getPluginTypes(e);
- UniqueAttributePluginCfg configuration =
- AdminTestCaseUtils.getConfiguration(
- UniqueAttributePluginCfgDefn.getInstance(), e);
- UniqueAttributePlugin plugin = new UniqueAttributePlugin();
- plugin.initializePlugin(pluginTypes, configuration);
+ UniqueAttributePlugin plugin = initializePlugin(e);
plugin.finalizePlugin();
}
+ private UniqueAttributePlugin initializePlugin(Entry e) throws ConfigException, InitializationException {
+ return InitializationUtils.initializePlugin(
+ new UniqueAttributePlugin(), e, UniqueAttributePluginCfgDefn.getInstance());
+ }
+
/**
* Test modify DN operation with various scenarios. See method comments.
*
--
Gitblit v1.10.0