From e0e6d30a905e47931a89b7e9063d752a6f28106d Mon Sep 17 00:00:00 2001
From: Matthew Swift <matthew.swift@forgerock.com>
Date: Wed, 05 Feb 2014 22:45:49 +0000
Subject: [PATCH] OPENDJ-1235: Migrate configuration framework
---
opendj-config/src/test/java/org/forgerock/opendj/config/server/AggregationServerTest.java | 23 +++++++++++------------
1 files changed, 11 insertions(+), 12 deletions(-)
diff --git a/opendj-config/src/test/java/org/forgerock/opendj/config/server/AggregationServerTest.java b/opendj-config/src/test/java/org/forgerock/opendj/config/server/AggregationServerTest.java
index c6a7604..dc2d16c 100644
--- a/opendj-config/src/test/java/org/forgerock/opendj/config/server/AggregationServerTest.java
+++ b/opendj-config/src/test/java/org/forgerock/opendj/config/server/AggregationServerTest.java
@@ -43,7 +43,6 @@
import org.forgerock.opendj.config.AdministratorAction;
import org.forgerock.opendj.config.AggregationPropertyDefinition;
import org.forgerock.opendj.config.PropertyException;
-import org.forgerock.opendj.config.PropertyDefinitionsOptions;
import org.forgerock.opendj.config.PropertyOption;
import org.forgerock.opendj.config.TestCfg;
import org.forgerock.opendj.config.TestChildCfg;
@@ -296,7 +295,7 @@
ConfigurationRepository configRepository =
createConfigRepositoryWithEntries(TEST_PARENT_1, TEST_CHILD_3, LDAP_CONN_HANDLER_ENTRY);
ServerManagementContext context =
- new ServerManagementContext(configRepository, PropertyDefinitionsOptions.NO_VALIDATION_OPTIONS);
+ new ServerManagementContext(configRepository);
TestParentCfg parentCfg = getParentCfg(TEST_PARENT_1, context);
try {
parentCfg.getTestChild(entryName(TEST_CHILD_3));
@@ -321,7 +320,7 @@
ConfigurationRepository configRepository =
createConfigRepositoryWithEntries(TEST_PARENT_1, TEST_CHILD_5, LDAP_CONN_HANDLER_ENTRY);
ServerManagementContext context =
- new ServerManagementContext(configRepository, PropertyDefinitionsOptions.NO_VALIDATION_OPTIONS);
+ new ServerManagementContext(configRepository);
TestParentCfg parentCfg = getParentCfg(TEST_PARENT_1, context);
try {
@@ -344,7 +343,7 @@
ConfigurationRepository configRepository =
createConfigRepositoryWithEntries(TEST_PARENT_1, TEST_CHILD_6, TEST_CONNECTION_HANDLER_ENTRY_DISABLED);
ServerManagementContext context =
- new ServerManagementContext(configRepository, PropertyDefinitionsOptions.NO_VALIDATION_OPTIONS);
+ new ServerManagementContext(configRepository);
registerAggregationDefinitionWithTargetEnabled();
@@ -371,7 +370,7 @@
ConfigurationRepository configRepository =
createConfigRepositoryWithEntries(TEST_PARENT_1, TEST_CHILD_7, TEST_CONNECTION_HANDLER_ENTRY_DISABLED);
ServerManagementContext context =
- new ServerManagementContext(configRepository, PropertyDefinitionsOptions.NO_VALIDATION_OPTIONS);
+ new ServerManagementContext(configRepository);
registerAggregationDefinitionWithTargetEnabled();
@@ -399,7 +398,7 @@
ConfigurationRepository configRepository =
createConfigRepositoryWithEntries(TEST_PARENT_1, TEST_CHILD_6, TEST_CONNECTION_HANDLER_ENTRY_DISABLED);
ServerManagementContext context =
- new ServerManagementContext(configRepository, PropertyDefinitionsOptions.NO_VALIDATION_OPTIONS);
+ new ServerManagementContext(configRepository);
registerAggregationDefinitionWithTargetAndSourceEnabled();
@@ -426,7 +425,7 @@
ConfigurationRepository configRepository =
createConfigRepositoryWithEntries(TEST_PARENT_1, TEST_CHILD_7, TEST_CONNECTION_HANDLER_ENTRY_DISABLED);
ServerManagementContext context =
- new ServerManagementContext(configRepository, PropertyDefinitionsOptions.NO_VALIDATION_OPTIONS);
+ new ServerManagementContext(configRepository);
registerAggregationDefinitionWithTargetAndSourceEnabled();
@@ -446,7 +445,7 @@
public void testAggregationEmpty() throws Exception {
ConfigurationRepository configRepository = createConfigRepositoryWithEntries(TEST_PARENT_1, TEST_CHILD_1);
ServerManagementContext context =
- new ServerManagementContext(configRepository, PropertyDefinitionsOptions.NO_VALIDATION_OPTIONS);
+ new ServerManagementContext(configRepository);
TestParentCfg parentCfg = getParentCfg(TEST_PARENT_1, context);
TestChildCfg testChildCfg = parentCfg.getTestChild(entryName(TEST_CHILD_1));
@@ -467,7 +466,7 @@
createConfigRepositoryWithEntries(TEST_PARENT_1, TEST_CHILD_4, LDAP_CONN_HANDLER_ENTRY,
LDAPS_CONN_HANDLER_ENTRY);
ServerManagementContext context =
- new ServerManagementContext(configRepository, PropertyDefinitionsOptions.NO_VALIDATION_OPTIONS);
+ new ServerManagementContext(configRepository);
TestParentCfg parentCfg = getParentCfg(TEST_PARENT_1, context);
TestChildCfg testChildCfg = parentCfg.getTestChild(entryName(TEST_CHILD_4));
@@ -487,7 +486,7 @@
ConfigurationRepository configRepository =
createConfigRepositoryWithEntries(TEST_PARENT_1, TEST_CHILD_2, LDAP_CONN_HANDLER_ENTRY);
ServerManagementContext context =
- new ServerManagementContext(configRepository, PropertyDefinitionsOptions.NO_VALIDATION_OPTIONS);
+ new ServerManagementContext(configRepository);
TestParentCfg parentCfg = getParentCfg(TEST_PARENT_1, context);
TestChildCfg testChildCfg = parentCfg.getTestChild(entryName(TEST_CHILD_2));
@@ -513,7 +512,7 @@
createConfigRepositoryWithEntries(TEST_PARENTS, TEST_PARENT_1, TEST_BASE_CHILD, TEST_CHILD_7,
CONN_HANDLER_ENTRY, TEST_CONNECTION_HANDLER_ENTRY_ENABLED);
ServerManagementContext context =
- new ServerManagementContext(configRepository, PropertyDefinitionsOptions.NO_VALIDATION_OPTIONS);
+ new ServerManagementContext(configRepository);
registerAggregationDefinitionWithTargetEnabled();
@@ -551,7 +550,7 @@
createConfigRepositoryWithEntries(TEST_PARENTS, TEST_PARENT_1, TEST_BASE_CHILD, TEST_CHILD_7,
CONN_HANDLER_ENTRY, TEST_CONNECTION_HANDLER_ENTRY_ENABLED);
ServerManagementContext context =
- new ServerManagementContext(configRepository, PropertyDefinitionsOptions.NO_VALIDATION_OPTIONS);
+ new ServerManagementContext(configRepository);
registerAggregationDefinitionWithTargetEnabled();
--
Gitblit v1.10.0