From b08bd4dd4b0d4d17d4907c605dba11020cf11922 Mon Sep 17 00:00:00 2001
From: matthew_swift <matthew_swift@localhost>
Date: Fri, 28 Sep 2007 15:47:50 +0000
Subject: [PATCH] Add support for specifying arbitrary constraints in managed object definitions and use it within the LDAP and JMX connection handlers to enforce their SSL/StartTLS settings. This feature will be re-used for other managed object definitions as the need arises.

---
 opends/tests/unit-tests-testng/src/server/org/opends/server/admin/server/AggregationTest.java |   83 +++++++++++++++++++++++++++--------------
 1 files changed, 54 insertions(+), 29 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 f156ea0..629c525 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
@@ -309,7 +309,8 @@
     builder.setRelationDefinition("connection-handler");
     builder.setTargetIsEnabledCondition(Conditions.contains("enabled", "true"));
     aggregationPropertyDefinitionTargetMustBeEnabled = builder.getInstance();
-    TestCfg.initializePropertyDefinition(aggregationPropertyDefinitionTargetMustBeEnabled);
+    TestCfg
+        .initializePropertyDefinition(aggregationPropertyDefinitionTargetMustBeEnabled);
 
     builder = AggregationPropertyDefinition.createBuilder(d,
         "aggregation-property");
@@ -321,10 +322,12 @@
     builder.setParentPath("/");
     builder.setRelationDefinition("connection-handler");
     builder.setTargetIsEnabledCondition(Conditions.contains("enabled", "true"));
-    builder.setTargetNeedsEnablingCondition(Conditions.contains("mandatory-boolean-property", "true"));
+    builder.setTargetNeedsEnablingCondition(Conditions.contains(
+        "mandatory-boolean-property", "true"));
     aggregationPropertyDefinitionTargetAndSourceMustBeEnabled = builder
         .getInstance();
-    TestCfg.initializePropertyDefinition(aggregationPropertyDefinitionTargetAndSourceMustBeEnabled);
+    TestCfg
+        .initializePropertyDefinition(aggregationPropertyDefinitionTargetAndSourceMustBeEnabled);
   }
 
 
@@ -452,10 +455,12 @@
     }
 
     // Register the temporary aggregation definition.
-    TestCfg.removeConstraint(aggregationPropertyDefinitionDefault);
+    TestCfg.removeConstraint(aggregationPropertyDefinitionDefault
+        .getSourceConstraint());
     TestCfg
         .addPropertyDefinition(aggregationPropertyDefinitionTargetMustBeEnabled);
-    TestCfg.addConstraint(aggregationPropertyDefinitionTargetMustBeEnabled);
+    TestCfg.addConstraint(aggregationPropertyDefinitionTargetMustBeEnabled
+        .getSourceConstraint());
 
     try {
       TestParentCfg parent = getParent("test parent 1");
@@ -475,10 +480,11 @@
       }
     } finally {
       // Put back the default aggregation definition.
-      TestCfg
-          .removeConstraint(aggregationPropertyDefinitionTargetMustBeEnabled);
+      TestCfg.removeConstraint(aggregationPropertyDefinitionTargetMustBeEnabled
+          .getSourceConstraint());
       TestCfg.addPropertyDefinition(aggregationPropertyDefinitionDefault);
-      TestCfg.addConstraint(aggregationPropertyDefinitionDefault);
+      TestCfg.addConstraint(aggregationPropertyDefinitionDefault
+          .getSourceConstraint());
 
       try {
         deleteSubtree(TEST_CHILD_6_DN);
@@ -510,10 +516,12 @@
     }
 
     // Register the temporary aggregation definition.
-    TestCfg.removeConstraint(aggregationPropertyDefinitionDefault);
+    TestCfg.removeConstraint(aggregationPropertyDefinitionDefault
+        .getSourceConstraint());
     TestCfg
         .addPropertyDefinition(aggregationPropertyDefinitionTargetMustBeEnabled);
-    TestCfg.addConstraint(aggregationPropertyDefinitionTargetMustBeEnabled);
+    TestCfg.addConstraint(aggregationPropertyDefinitionTargetMustBeEnabled
+        .getSourceConstraint());
 
     try {
       TestParentCfg parent = getParent("test parent 1");
@@ -533,10 +541,11 @@
       }
     } finally {
       // Put back the default aggregation definition.
-      TestCfg
-          .removeConstraint(aggregationPropertyDefinitionTargetMustBeEnabled);
+      TestCfg.removeConstraint(aggregationPropertyDefinitionTargetMustBeEnabled
+          .getSourceConstraint());
       TestCfg.addPropertyDefinition(aggregationPropertyDefinitionDefault);
-      TestCfg.addConstraint(aggregationPropertyDefinitionDefault);
+      TestCfg.addConstraint(aggregationPropertyDefinitionDefault
+          .getSourceConstraint());
 
       try {
         deleteSubtree(TEST_CHILD_7_DN);
@@ -569,11 +578,13 @@
     }
 
     // Register the temporary aggregation definition.
-    TestCfg.removeConstraint(aggregationPropertyDefinitionDefault);
+    TestCfg.removeConstraint(aggregationPropertyDefinitionDefault
+        .getSourceConstraint());
     TestCfg
         .addPropertyDefinition(aggregationPropertyDefinitionTargetAndSourceMustBeEnabled);
     TestCfg
-        .addConstraint(aggregationPropertyDefinitionTargetAndSourceMustBeEnabled);
+        .addConstraint(aggregationPropertyDefinitionTargetAndSourceMustBeEnabled
+            .getSourceConstraint());
 
     try {
       TestParentCfg parent = getParent("test parent 1");
@@ -594,9 +605,11 @@
     } finally {
       // Put back the default aggregation definition.
       TestCfg
-          .removeConstraint(aggregationPropertyDefinitionTargetAndSourceMustBeEnabled);
+          .removeConstraint(aggregationPropertyDefinitionTargetAndSourceMustBeEnabled
+              .getSourceConstraint());
       TestCfg.addPropertyDefinition(aggregationPropertyDefinitionDefault);
-      TestCfg.addConstraint(aggregationPropertyDefinitionDefault);
+      TestCfg.addConstraint(aggregationPropertyDefinitionDefault
+          .getSourceConstraint());
 
       try {
         deleteSubtree(TEST_CHILD_6_DN);
@@ -628,11 +641,13 @@
     }
 
     // Register the temporary aggregation definition.
-    TestCfg.removeConstraint(aggregationPropertyDefinitionDefault);
+    TestCfg.removeConstraint(aggregationPropertyDefinitionDefault
+        .getSourceConstraint());
     TestCfg
         .addPropertyDefinition(aggregationPropertyDefinitionTargetAndSourceMustBeEnabled);
     TestCfg
-        .addConstraint(aggregationPropertyDefinitionTargetAndSourceMustBeEnabled);
+        .addConstraint(aggregationPropertyDefinitionTargetAndSourceMustBeEnabled
+            .getSourceConstraint());
 
     try {
       TestParentCfg parent = getParent("test parent 1");
@@ -640,9 +655,11 @@
     } finally {
       // Put back the default aggregation definition.
       TestCfg
-          .removeConstraint(aggregationPropertyDefinitionTargetAndSourceMustBeEnabled);
+          .removeConstraint(aggregationPropertyDefinitionTargetAndSourceMustBeEnabled
+              .getSourceConstraint());
       TestCfg.addPropertyDefinition(aggregationPropertyDefinitionDefault);
-      TestCfg.addConstraint(aggregationPropertyDefinitionDefault);
+      TestCfg.addConstraint(aggregationPropertyDefinitionDefault
+          .getSourceConstraint());
 
       try {
         deleteSubtree(TEST_CHILD_7_DN);
@@ -740,10 +757,12 @@
     }
 
     // Register the temporary aggregation definition.
-    TestCfg.removeConstraint(aggregationPropertyDefinitionDefault);
+    TestCfg.removeConstraint(aggregationPropertyDefinitionDefault
+        .getSourceConstraint());
     TestCfg
         .addPropertyDefinition(aggregationPropertyDefinitionTargetMustBeEnabled);
-    TestCfg.addConstraint(aggregationPropertyDefinitionTargetMustBeEnabled);
+    TestCfg.addConstraint(aggregationPropertyDefinitionTargetMustBeEnabled
+        .getSourceConstraint());
 
     ConfigurationDeleteListener<TestChildCfg> dl = new DummyDeleteListener();
     ConfigurationChangeListener<TestChildCfg> cl = new DummyChangeListener();
@@ -780,9 +799,11 @@
 
           // Put back the default aggregation definition.
           TestCfg
-              .removeConstraint(aggregationPropertyDefinitionTargetAndSourceMustBeEnabled);
+              .removeConstraint(aggregationPropertyDefinitionTargetMustBeEnabled
+                  .getSourceConstraint());
           TestCfg.addPropertyDefinition(aggregationPropertyDefinitionDefault);
-          TestCfg.addConstraint(aggregationPropertyDefinitionDefault);
+          TestCfg.addConstraint(aggregationPropertyDefinitionDefault
+              .getSourceConstraint());
         }
       }
     }
@@ -810,10 +831,12 @@
     }
 
     // Register the temporary aggregation definition.
-    TestCfg.removeConstraint(aggregationPropertyDefinitionDefault);
+    TestCfg.removeConstraint(aggregationPropertyDefinitionDefault
+        .getSourceConstraint());
     TestCfg
         .addPropertyDefinition(aggregationPropertyDefinitionTargetMustBeEnabled);
-    TestCfg.addConstraint(aggregationPropertyDefinitionTargetMustBeEnabled);
+    TestCfg.addConstraint(aggregationPropertyDefinitionTargetMustBeEnabled
+        .getSourceConstraint());
 
     ConfigurationDeleteListener<TestChildCfg> dl = new DummyDeleteListener();
     ConfigurationChangeListener<TestChildCfg> cl = new DummyChangeListener();
@@ -852,9 +875,11 @@
 
           // Put back the default aggregation definition.
           TestCfg
-              .removeConstraint(aggregationPropertyDefinitionTargetAndSourceMustBeEnabled);
+              .removeConstraint(aggregationPropertyDefinitionTargetMustBeEnabled
+                  .getSourceConstraint());
           TestCfg.addPropertyDefinition(aggregationPropertyDefinitionDefault);
-          TestCfg.addConstraint(aggregationPropertyDefinitionDefault);
+          TestCfg.addConstraint(aggregationPropertyDefinitionDefault
+              .getSourceConstraint());
         }
       }
     }

--
Gitblit v1.10.0