From 5ceb2e9601d2501d021d0c61188ec913076555a0 Mon Sep 17 00:00:00 2001
From: matthew_swift <matthew_swift@localhost>
Date: Wed, 26 Sep 2007 12:21:02 +0000
Subject: [PATCH] Merge branches/temp-admin@3208 onto trunk@3208.
---
opends/tests/unit-tests-testng/src/server/org/opends/server/admin/TestCfg.java | 30 +++++++++++++++++-------------
1 files changed, 17 insertions(+), 13 deletions(-)
diff --git a/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/TestCfg.java b/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/TestCfg.java
index 4d4d0cb..66b2249 100644
--- a/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/TestCfg.java
+++ b/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/TestCfg.java
@@ -95,10 +95,10 @@
String ocd = "( 1.3.6.1.4.1.26027.1.2.4455114401 "
+ "NAME 'ds-cfg-test-parent-dummy' "
+ "SUP top STRUCTURAL "
- + "MUST ( cn $ ds-cfg-virtual-attribute-class $ "
- + "ds-cfg-virtual-attribute-enabled $ ds-cfg-virtual-attribute-type ) "
- + "MAY ( ds-cfg-virtual-attribute-base-dn $ ds-cfg-virtual-attribute-group-dn $ "
- + "ds-cfg-virtual-attribute-filter $ ds-cfg-virtual-attribute-conflict-behavior ) "
+ + "MUST ( cn $ ds-cfg-java-class $ "
+ + "ds-cfg-enabled $ ds-cfg-attribute-type ) "
+ + "MAY ( ds-cfg-base-dn $ ds-cfg-group-dn $ "
+ + "ds-cfg-filter $ ds-cfg-conflict-behavior ) "
+ "X-ORIGIN 'OpenDS Directory Server' )";
ByteString b = ByteStringFactory.create(ocd);
@@ -110,11 +110,11 @@
String ocd = "( 1.3.6.1.4.1.26027.1.2.4455114402 "
+ "NAME 'ds-cfg-test-child-dummy' "
+ "SUP top STRUCTURAL "
- + "MUST ( cn $ ds-cfg-virtual-attribute-class $ "
- + "ds-cfg-virtual-attribute-enabled $ ds-cfg-virtual-attribute-type ) "
- + "MAY ( ds-cfg-virtual-attribute-base-dn $ ds-cfg-virtual-attribute-group-dn $ "
- + "ds-cfg-virtual-attribute-filter $ ds-cfg-virtual-attribute-conflict-behavior $"
- + "ds-cfg-backend-base-dn) " + "X-ORIGIN 'OpenDS Directory Server' )";
+ + "MUST ( cn $ ds-cfg-java-class $ "
+ + "ds-cfg-enabled $ ds-cfg-attribute-type ) "
+ + "MAY ( ds-cfg-base-dn $ ds-cfg-group-dn $ "
+ + "ds-cfg-filter $ ds-cfg-conflict-behavior $"
+ + "ds-cfg-rotation-policy) " + "X-ORIGIN 'OpenDS Directory Server' )";
ByteString b = ByteStringFactory.create(ocd);
TEST_CHILD_OCD = ObjectClassSyntax.decodeObjectClass(b, DirectoryServer
@@ -127,6 +127,7 @@
// Register the test parent resource bundle.
TestParentCfgDefn d = TestParentCfgDefn.getInstance();
+ d.registerInParent();
d.initialize();
String baseName = d.getClass().getName();
ResourceBundle resourceBundle = ResourceBundle.getBundle(baseName);
@@ -140,6 +141,7 @@
// Register the test child resource bundle.
TestChildCfgDefn d = TestChildCfgDefn.getInstance();
+ d.registerInParent();
d.initialize();
String baseName = d.getClass().getName();
ResourceBundle resourceBundle = ResourceBundle.getBundle(baseName);
@@ -166,19 +168,21 @@
LDAPProfile.getInstance().popWrapper();
{
- RootCfgDefn.getInstance().deregisterRelationDefinition(
- RD_TEST_ONE_TO_MANY_PARENT);
- RootCfgDefn.getInstance().deregisterRelationDefinition(
- RD_TEST_ONE_TO_ZERO_OR_ONE_PARENT);
+ AbstractManagedObjectDefinition<?, ?> root = RootCfgDefn.getInstance();
+ root.deregisterRelationDefinition(RD_TEST_ONE_TO_MANY_PARENT);
+ root.deregisterRelationDefinition(RD_TEST_ONE_TO_ZERO_OR_ONE_PARENT);
+
DirectoryServer.deregisterObjectClass(TEST_PARENT_OCD);
TestParentCfgDefn d = TestParentCfgDefn.getInstance();
ManagedObjectDefinitionI18NResource.getInstance().removeResourceBundle(d);
+ d.deregisterFromParent();
}
{
DirectoryServer.deregisterObjectClass(TEST_CHILD_OCD);
TestChildCfgDefn d = TestChildCfgDefn.getInstance();
ManagedObjectDefinitionI18NResource.getInstance().removeResourceBundle(d);
+ d.deregisterFromParent();
}
}
--
Gitblit v1.10.0