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/server/DefaultBehaviorTest.java | 96 ++++++++++++++++++++++++------------------------
1 files changed, 48 insertions(+), 48 deletions(-)
diff --git a/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/server/DefaultBehaviorTest.java b/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/server/DefaultBehaviorTest.java
index a6e5511..320ac1e 100644
--- a/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/server/DefaultBehaviorTest.java
+++ b/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/server/DefaultBehaviorTest.java
@@ -181,10 +181,10 @@
"objectclass: top",
"objectclass: ds-cfg-test-child-dummy",
"cn: test child 1",
- "ds-cfg-virtual-attribute-enabled: true",
- "ds-cfg-virtual-attribute-class: org.opends.server.extensions.UserDefinedVirtualAttributeProvider",
- "ds-cfg-virtual-attribute-type: description",
- "ds-cfg-virtual-attribute-conflict-behavior: virtual-overrides-real"
+ "ds-cfg-enabled: true",
+ "ds-cfg-java-class: org.opends.server.extensions.UserDefinedVirtualAttributeProvider",
+ "ds-cfg-attribute-type: description",
+ "ds-cfg-conflict-behavior: virtual-overrides-real"
};
// Test child 2 LDIF.
@@ -193,12 +193,12 @@
"objectclass: top",
"objectclass: ds-cfg-test-child-dummy",
"cn: test child 2",
- "ds-cfg-virtual-attribute-enabled: true",
- "ds-cfg-virtual-attribute-class: org.opends.server.extensions.UserDefinedVirtualAttributeProvider",
- "ds-cfg-virtual-attribute-type: description",
- "ds-cfg-virtual-attribute-conflict-behavior: virtual-overrides-real",
- "ds-cfg-virtual-attribute-base-dn: dc=default value c2v1,dc=com",
- "ds-cfg-virtual-attribute-base-dn: dc=default value c2v2,dc=com"
+ "ds-cfg-enabled: true",
+ "ds-cfg-java-class: org.opends.server.extensions.UserDefinedVirtualAttributeProvider",
+ "ds-cfg-attribute-type: description",
+ "ds-cfg-conflict-behavior: virtual-overrides-real",
+ "ds-cfg-base-dn: dc=default value c2v1,dc=com",
+ "ds-cfg-base-dn: dc=default value c2v2,dc=com"
};
// Test child 3 LDIF.
@@ -207,14 +207,14 @@
"objectclass: top",
"objectclass: ds-cfg-test-child-dummy",
"cn: test child 3",
- "ds-cfg-virtual-attribute-enabled: true",
- "ds-cfg-virtual-attribute-class: org.opends.server.extensions.UserDefinedVirtualAttributeProvider",
- "ds-cfg-virtual-attribute-type: description",
- "ds-cfg-virtual-attribute-conflict-behavior: virtual-overrides-real",
- "ds-cfg-virtual-attribute-base-dn: dc=default value c3v1,dc=com",
- "ds-cfg-virtual-attribute-base-dn: dc=default value c3v2,dc=com",
- "ds-cfg-virtual-attribute-group-dn: dc=default value c3v3,dc=com",
- "ds-cfg-virtual-attribute-group-dn: dc=default value c3v4,dc=com"
+ "ds-cfg-enabled: true",
+ "ds-cfg-java-class: org.opends.server.extensions.UserDefinedVirtualAttributeProvider",
+ "ds-cfg-attribute-type: description",
+ "ds-cfg-conflict-behavior: virtual-overrides-real",
+ "ds-cfg-base-dn: dc=default value c3v1,dc=com",
+ "ds-cfg-base-dn: dc=default value c3v2,dc=com",
+ "ds-cfg-group-dn: dc=default value c3v3,dc=com",
+ "ds-cfg-group-dn: dc=default value c3v4,dc=com"
};
// Test child 4 LDIF.
@@ -223,10 +223,10 @@
"objectclass: top",
"objectclass: ds-cfg-test-child-dummy",
"cn: test child 4",
- "ds-cfg-virtual-attribute-enabled: true",
- "ds-cfg-virtual-attribute-class: org.opends.server.extensions.UserDefinedVirtualAttributeProvider",
- "ds-cfg-virtual-attribute-type: description",
- "ds-cfg-virtual-attribute-conflict-behavior: virtual-overrides-real"
+ "ds-cfg-enabled: true",
+ "ds-cfg-java-class: org.opends.server.extensions.UserDefinedVirtualAttributeProvider",
+ "ds-cfg-attribute-type: description",
+ "ds-cfg-conflict-behavior: virtual-overrides-real"
};
// Test LDIF.
@@ -243,10 +243,10 @@
"objectclass: top",
"objectclass: ds-cfg-test-parent-dummy",
"cn: test parent 1",
- "ds-cfg-virtual-attribute-enabled: true",
- "ds-cfg-virtual-attribute-class: org.opends.server.extensions.UserDefinedVirtualAttributeProvider",
- "ds-cfg-virtual-attribute-type: description",
- "ds-cfg-virtual-attribute-conflict-behavior: virtual-overrides-real",
+ "ds-cfg-enabled: true",
+ "ds-cfg-java-class: org.opends.server.extensions.UserDefinedVirtualAttributeProvider",
+ "ds-cfg-attribute-type: description",
+ "ds-cfg-conflict-behavior: virtual-overrides-real",
"",
// Parent 2 - overrides default values for
// optional-multi-valued-dn-property.
@@ -254,12 +254,12 @@
"objectclass: top",
"objectclass: ds-cfg-test-parent-dummy",
"cn: test parent 2",
- "ds-cfg-virtual-attribute-enabled: true",
- "ds-cfg-virtual-attribute-class: org.opends.server.extensions.UserDefinedVirtualAttributeProvider",
- "ds-cfg-virtual-attribute-type: description",
- "ds-cfg-virtual-attribute-conflict-behavior: virtual-overrides-real",
- "ds-cfg-virtual-attribute-base-dn: dc=default value p2v1,dc=com",
- "ds-cfg-virtual-attribute-base-dn: dc=default value p2v2,dc=com",
+ "ds-cfg-enabled: true",
+ "ds-cfg-java-class: org.opends.server.extensions.UserDefinedVirtualAttributeProvider",
+ "ds-cfg-attribute-type: description",
+ "ds-cfg-conflict-behavior: virtual-overrides-real",
+ "ds-cfg-base-dn: dc=default value p2v1,dc=com",
+ "ds-cfg-base-dn: dc=default value p2v2,dc=com",
"",
// Child base entries.
"dn:cn=test children,cn=test parent 1,cn=test parents,cn=config",
@@ -449,13 +449,13 @@
String[] changes = new String[] {
"dn: cn=test child 1,cn=test children,cn=test parent 1,cn=test parents,cn=config",
"changetype: modify",
- "replace: ds-cfg-virtual-attribute-base-dn",
- "ds-cfg-virtual-attribute-base-dn: dc=new value 1,dc=com",
- "ds-cfg-virtual-attribute-base-dn: dc=new value 2,dc=com",
+ "replace: ds-cfg-base-dn",
+ "ds-cfg-base-dn: dc=new value 1,dc=com",
+ "ds-cfg-base-dn: dc=new value 2,dc=com",
"-",
- "replace: ds-cfg-virtual-attribute-group-dn",
- "ds-cfg-virtual-attribute-group-dn: dc=new value 3,dc=com",
- "ds-cfg-virtual-attribute-group-dn: dc=new value 4,dc=com"
+ "replace: ds-cfg-group-dn",
+ "ds-cfg-group-dn: dc=new value 3,dc=com",
+ "ds-cfg-group-dn: dc=new value 4,dc=com"
};
TestCaseUtils.applyModifications(changes);
@@ -502,9 +502,9 @@
String[] changes = new String[] {
"dn: cn=test child 1,cn=test children,cn=test parent 1,cn=test parents,cn=config",
"changetype: modify",
- "replace: ds-cfg-virtual-attribute-base-dn",
- "ds-cfg-virtual-attribute-base-dn: dc=new value 1,dc=com",
- "ds-cfg-virtual-attribute-base-dn: dc=new value 2,dc=com"
+ "replace: ds-cfg-base-dn",
+ "ds-cfg-base-dn: dc=new value 1,dc=com",
+ "ds-cfg-base-dn: dc=new value 2,dc=com"
};
TestCaseUtils.applyModifications(changes);
@@ -550,9 +550,9 @@
String[] changes = new String[] {
"dn: cn=test child 1,cn=test children,cn=test parent 1,cn=test parents,cn=config",
"changetype: modify",
- "replace: ds-cfg-virtual-attribute-group-dn",
- "ds-cfg-virtual-attribute-group-dn: dc=new value 1,dc=com",
- "ds-cfg-virtual-attribute-group-dn: dc=new value 2,dc=com"
+ "replace: ds-cfg-group-dn",
+ "ds-cfg-group-dn: dc=new value 1,dc=com",
+ "ds-cfg-group-dn: dc=new value 2,dc=com"
};
TestCaseUtils.applyModifications(changes);
@@ -599,9 +599,9 @@
String[] changes = new String[] {
"dn: cn=test parent 1,cn=test parents,cn=config",
"changetype: modify",
- "replace: ds-cfg-virtual-attribute-base-dn",
- "ds-cfg-virtual-attribute-base-dn: dc=new value 1,dc=com",
- "ds-cfg-virtual-attribute-base-dn: dc=new value 2,dc=com"
+ "replace: ds-cfg-base-dn",
+ "ds-cfg-base-dn: dc=new value 1,dc=com",
+ "ds-cfg-base-dn: dc=new value 2,dc=com"
};
TestCaseUtils.applyModifications(changes);
@@ -624,7 +624,7 @@
String[] changes = new String[] {
"dn: cn=test parent 1,cn=test parents,cn=config",
"changetype: modify",
- "delete: ds-cfg-virtual-attribute-base-dn"
+ "delete: ds-cfg-base-dn"
};
TestCaseUtils.applyModifications(changes);
}
--
Gitblit v1.10.0