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/MockLDAPProfile.java | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 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 7a05390..a22c96f 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
@@ -55,14 +55,14 @@
TestParentCfgDefn td = TestParentCfgDefn.getInstance();
if (pd == (PropertyDefinition<?>)td.getMandatoryBooleanPropertyPropertyDefinition()) {
- return "ds-cfg-virtual-attribute-enabled";
+ return "ds-cfg-enabled";
} else if (pd == (PropertyDefinition<?>)td.getMandatoryClassPropertyPropertyDefinition()) {
- return "ds-cfg-virtual-attribute-class";
+ return "ds-cfg-java-class";
} else if (pd == (PropertyDefinition<?>)td
.getMandatoryReadOnlyAttributeTypePropertyPropertyDefinition()) {
- return "ds-cfg-virtual-attribute-type";
+ return "ds-cfg-attribute-type";
} else if (pd == (PropertyDefinition<?>)td.getOptionalMultiValuedDNPropertyPropertyDefinition()) {
- return "ds-cfg-virtual-attribute-base-dn";
+ return "ds-cfg-base-dn";
} else {
throw new RuntimeException("Unexpected test-parent property"
+ pd.getName());
@@ -71,18 +71,18 @@
TestChildCfgDefn td = TestChildCfgDefn.getInstance();
if (pd == (PropertyDefinition<?>)td.getMandatoryBooleanPropertyPropertyDefinition()) {
- return "ds-cfg-virtual-attribute-enabled";
+ return "ds-cfg-enabled";
} else if (pd == (PropertyDefinition<?>)td.getMandatoryClassPropertyPropertyDefinition()) {
- return "ds-cfg-virtual-attribute-class";
+ return "ds-cfg-java-class";
} else if (pd == (PropertyDefinition<?>)td
.getMandatoryReadOnlyAttributeTypePropertyPropertyDefinition()) {
- return "ds-cfg-virtual-attribute-type";
+ return "ds-cfg-attribute-type";
} else if (pd == (PropertyDefinition<?>)td.getOptionalMultiValuedDNProperty1PropertyDefinition()) {
- return "ds-cfg-virtual-attribute-base-dn";
+ return "ds-cfg-base-dn";
} else if (pd == (PropertyDefinition<?>)td.getOptionalMultiValuedDNProperty2PropertyDefinition()) {
- return "ds-cfg-virtual-attribute-group-dn";
+ return "ds-cfg-group-dn";
} else if (pd.getName().equals("aggregation-property")) {
- return "ds-cfg-backend-base-dn";
+ return "ds-cfg-rotation-policy";
} else {
throw new RuntimeException("Unexpected test-child property"
+ pd.getName());
--
Gitblit v1.10.0