From ace2bd4146fe55154c0d716f20d9cbff3a2297d3 Mon Sep 17 00:00:00 2001
From: matthew_swift <matthew_swift@localhost>
Date: Thu, 27 Sep 2007 14:50:30 +0000
Subject: [PATCH] Improvements to aggregation support and foundation work for expressing arbitrary constraints within components.
---
opends/tests/unit-tests-testng/src/server/org/opends/server/admin/server/AggregationTest.java | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/server/AggregationTest.java b/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/server/AggregationTest.java
index fdbc7d2..f156ea0 100644
--- a/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/server/AggregationTest.java
+++ b/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/server/AggregationTest.java
@@ -52,6 +52,7 @@
import org.opends.server.admin.UndefinedDefaultBehaviorProvider;
import org.opends.server.admin.client.OperationRejectedException;
import org.opends.server.admin.client.ldap.JNDIDirContextAdaptor;
+import org.opends.server.admin.condition.Conditions;
import org.opends.server.admin.std.client.ConnectionHandlerCfgClient;
import org.opends.server.admin.std.client.LDAPConnectionHandlerCfgClient;
import org.opends.server.admin.std.client.RootCfgClient;
@@ -306,7 +307,7 @@
.setDefaultBehaviorProvider(new UndefinedDefaultBehaviorProvider<String>());
builder.setParentPath("/");
builder.setRelationDefinition("connection-handler");
- builder.setTargetEnabledPropertyName("enabled");
+ builder.setTargetIsEnabledCondition(Conditions.contains("enabled", "true"));
aggregationPropertyDefinitionTargetMustBeEnabled = builder.getInstance();
TestCfg.initializePropertyDefinition(aggregationPropertyDefinitionTargetMustBeEnabled);
@@ -319,8 +320,8 @@
.setDefaultBehaviorProvider(new UndefinedDefaultBehaviorProvider<String>());
builder.setParentPath("/");
builder.setRelationDefinition("connection-handler");
- builder.setTargetEnabledPropertyName("enabled");
- builder.addSourceEnabledPropertyName("mandatory-boolean-property");
+ builder.setTargetIsEnabledCondition(Conditions.contains("enabled", "true"));
+ builder.setTargetNeedsEnablingCondition(Conditions.contains("mandatory-boolean-property", "true"));
aggregationPropertyDefinitionTargetAndSourceMustBeEnabled = builder
.getInstance();
TestCfg.initializePropertyDefinition(aggregationPropertyDefinitionTargetAndSourceMustBeEnabled);
--
Gitblit v1.10.0