From 738bf70d921471e9fce48fe37fcc15d951081253 Mon Sep 17 00:00:00 2001
From: matthew_swift <matthew_swift@localhost>
Date: Thu, 19 Jul 2007 08:55:15 +0000
Subject: [PATCH] Add support for deregistering relations from managed object definitions and use it in unit tests for better cleanup after tests have completed (previously admin framework unit tests were leaving mock relations registered with the root configuration).
---
opends/tests/unit-tests-testng/src/server/org/opends/server/admin/MockLDAPProfile.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/MockLDAPProfile.java b/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/MockLDAPProfile.java
index a46b778..7fa2c05 100644
--- a/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/MockLDAPProfile.java
+++ b/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/MockLDAPProfile.java
@@ -96,7 +96,7 @@
@Override
public String getInstantiableRelationChildRDNType(
InstantiableRelationDefinition<?, ?> r) {
- if (r == TestCfg.RD_TEST_ONE_TO_MANY_PARENT
+ if (r == TestCfg.getTestOneToManyParentRelationDefinition()
|| r == TestParentCfgDefn.getInstance()
.getTestChildrenRelationDefinition()) {
return "cn";
@@ -129,9 +129,9 @@
*/
@Override
public String getRelationRDNSequence(RelationDefinition<?, ?> r) {
- if (r == TestCfg.RD_TEST_ONE_TO_MANY_PARENT) {
+ if (r == TestCfg.getTestOneToManyParentRelationDefinition()) {
return "cn=test parents,cn=config";
- } else if (r == TestCfg.RD_TEST_ONE_TO_ZERO_OR_ONE_PARENT) {
+ } else if (r == TestCfg.getTestOneToZeroOrOneParentRelationDefinition()) {
return "cn=optional test parent,cn=config";
} else if (r == TestParentCfgDefn.getInstance()
.getTestChildrenRelationDefinition()) {
--
Gitblit v1.10.0