From 70d3c6a9d98e5b002fda985a8ac0a60c0cb79026 Mon Sep 17 00:00:00 2001
From: neil_a_wilson <neil_a_wilson@localhost>
Date: Wed, 04 Oct 2006 21:47:08 +0000
Subject: [PATCH] Add a new org.opends.server.types.DirectoryConfig class that can be used to expose a number of the methods from the DirectoryServer class as part of the public interface while reducing the need for extensions to reference code in the org.opends.server.core package.
---
opends/tests/unit-tests-testng/src/server/org/opends/server/plugins/EntryUUIDPluginTestCase.java | 23 +++++++++++------------
1 files changed, 11 insertions(+), 12 deletions(-)
diff --git a/opends/tests/unit-tests-testng/src/server/org/opends/server/plugins/EntryUUIDPluginTestCase.java b/opends/tests/unit-tests-testng/src/server/org/opends/server/plugins/EntryUUIDPluginTestCase.java
index 5beac4a..0f25c24 100644
--- a/opends/tests/unit-tests-testng/src/server/org/opends/server/plugins/EntryUUIDPluginTestCase.java
+++ b/opends/tests/unit-tests-testng/src/server/org/opends/server/plugins/EntryUUIDPluginTestCase.java
@@ -51,6 +51,7 @@
import org.opends.server.types.AttributeValue;
import org.opends.server.types.AuthenticationInfo;
import org.opends.server.types.Control;
+import org.opends.server.types.DirectoryConfig;
import org.opends.server.types.DN;
import org.opends.server.types.Entry;
import org.opends.server.types.LDIFImportConfig;
@@ -154,12 +155,11 @@
ConfigEntry parentEntry =
- DirectoryServer.getConfigEntry(DN.decode("cn=Plugins,cn=config"));
+ DirectoryConfig.getConfigEntry(DN.decode("cn=Plugins,cn=config"));
ConfigEntry configEntry = new ConfigEntry(e, parentEntry);
EntryUUIDPlugin plugin = new EntryUUIDPlugin();
- plugin.initializePlugin(DirectoryServer.getInstance(), pluginTypes,
- configEntry);
+ plugin.initializePlugin(pluginTypes, configEntry);
}
@@ -176,7 +176,8 @@
public void testInitializeWithValidConfigsWithoutSchema(Entry e)
throws Exception
{
- AttributeType entryUUIDType = DirectoryServer.getAttributeType("entryuuid");
+ AttributeType entryUUIDType = DirectoryConfig.getAttributeType("entryuuid",
+ false);
DirectoryServer.deregisterAttributeType(entryUUIDType);
@@ -192,12 +193,11 @@
ConfigEntry parentEntry =
- DirectoryServer.getConfigEntry(DN.decode("cn=Plugins,cn=config"));
+ DirectoryConfig.getConfigEntry(DN.decode("cn=Plugins,cn=config"));
ConfigEntry configEntry = new ConfigEntry(e, parentEntry);
EntryUUIDPlugin plugin = new EntryUUIDPlugin();
- plugin.initializePlugin(DirectoryServer.getInstance(), pluginTypes,
- configEntry);
+ plugin.initializePlugin(pluginTypes, configEntry);
DirectoryServer.registerAttributeType(entryUUIDType, false);
@@ -270,12 +270,11 @@
ConfigEntry parentEntry =
- DirectoryServer.getConfigEntry(DN.decode("cn=Plugins,cn=config"));
+ DirectoryConfig.getConfigEntry(DN.decode("cn=Plugins,cn=config"));
ConfigEntry configEntry = new ConfigEntry(e, parentEntry);
EntryUUIDPlugin plugin = new EntryUUIDPlugin();
- plugin.initializePlugin(DirectoryServer.getInstance(), pluginTypes,
- configEntry);
+ plugin.initializePlugin(pluginTypes, configEntry);
}
@@ -380,7 +379,7 @@
e.getOperationalAttributes());
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
- e = DirectoryServer.getEntry(e.getDN());
+ e = DirectoryConfig.getEntry(e.getDN());
assertNotNull(e);
assertNotNull(e.getAttribute("entryuuid"));
}
@@ -412,7 +411,7 @@
e.getOperationalAttributes());
assertEquals(addOperation.getResultCode(), ResultCode.SUCCESS);
- e = DirectoryServer.getEntry(e.getDN());
+ e = DirectoryConfig.getEntry(e.getDN());
assertNotNull(e);
assertNotNull(e.getAttribute("entryuuid"));
}
--
Gitblit v1.10.0