From 3992079ec3669ff88c6e7a84ce2bc8b988361105 Mon Sep 17 00:00:00 2001
From: Nicolas Capponi <nicolas.capponi@forgerock.com>
Date: Thu, 26 Dec 2013 09:23:44 +0000
Subject: [PATCH] Checkpoint commit for OPENDJ-1235 : Migrate configuration framework

---
 opendj-admin/src/test/java/org/opends/server/admin/client/ldap/AggregationClientTest.java |  183 +++++++++++++++++++++++++--------------------
 1 files changed, 102 insertions(+), 81 deletions(-)

diff --git a/opendj-admin/src/test/java/org/opends/server/admin/client/ldap/AggregationClientTest.java b/opendj-admin/src/test/java/org/opends/server/admin/client/ldap/AggregationClientTest.java
index 5fcfd2b..d8504b1 100644
--- a/opendj-admin/src/test/java/org/opends/server/admin/client/ldap/AggregationClientTest.java
+++ b/opendj-admin/src/test/java/org/opends/server/admin/client/ldap/AggregationClientTest.java
@@ -54,87 +54,108 @@
 
     // Test LDIF.
     private static final String[] TEST_LDIF = new String[] {
-            // Base entries.
-            "dn: cn=config",
-            "objectclass: top",
-            "objectclass: ds-cfg-branch",
-            "cn: config",
-            "",
-            "dn: cn=test parents,cn=config",
-            "objectclass: top",
-            "objectclass: ds-cfg-branch",
-            "cn: test-parents",
-            "",
-            // Parent 1 - uses default values for
-            // optional-multi-valued-dn-property.
-            "dn: cn=test parent 1,cn=test parents,cn=config",
-            "objectclass: top",
-            "objectclass: ds-cfg-test-parent-dummy",
-            "cn: test parent 1",
-            "ds-cfg-enabled: true",
-            "ds-cfg-java-class: org.opends.server.extensions.UserDefinedVirtualAttributeProvider",
-            "ds-cfg-attribute-type: description",
-            "",
-            // Child base entry.
-            "dn:cn=test children,cn=test parent 1,cn=test parents,cn=config",
-            "objectclass: top",
-            "objectclass: ds-cfg-branch",
-            "cn: multiple children",
-            "",
-            // Child 1 has no references.
-            "dn: cn=test child 1,cn=test children,cn=test parent 1,cn=test parents,cn=config",
-            "objectclass: top",
-            "objectclass: ds-cfg-test-child-dummy",
-            "cn: test child 1",
-            "ds-cfg-enabled: true",
-            "ds-cfg-java-class: org.opends.server.extensions.UserDefinedVirtualAttributeProvider",
-            "ds-cfg-attribute-type: description",
-            "",
-            // Child 2 has a single valid reference.
-            "dn: cn=test child 2,cn=test children,cn=test parent 1,cn=test parents,cn=config",
-            "objectclass: top",
-            "objectclass: ds-cfg-test-child-dummy",
-            "cn: test child 2",
-            "ds-cfg-enabled: true",
-            "ds-cfg-java-class: org.opends.server.extensions.UserDefinedVirtualAttributeProvider",
-            "ds-cfg-attribute-type: description",
-            "ds-cfg-rotation-policy: cn=LDAP Connection Handler, cn=connection handlers, cn=config",
-            "",
-            // Child 3 has a multiple valid references.
-            "dn: cn=test child 3,cn=test children,cn=test parent 1,cn=test parents,cn=config",
-            "objectclass: top",
-            "objectclass: ds-cfg-test-child-dummy",
-            "cn: test child 3",
-            "ds-cfg-enabled: true",
-            "ds-cfg-java-class: org.opends.server.extensions.UserDefinedVirtualAttributeProvider",
-            "ds-cfg-attribute-type: description",
-            "ds-cfg-rotation-policy: cn=LDAP Connection Handler, cn=connection handlers, cn=config",
-            "ds-cfg-rotation-policy: cn=LDAPS Connection Handler, cn=connection handlers, cn=config",
-            "",
-            // Child 4 has a single bad reference.
-            "dn: cn=test child 4,cn=test children,cn=test parent 1,cn=test parents,cn=config", "objectclass: top",
-            "objectclass: ds-cfg-test-child-dummy", "cn: test child 4", "ds-cfg-enabled: true",
-            "ds-cfg-java-class: org.opends.server.extensions.UserDefinedVirtualAttributeProvider",
-            "ds-cfg-attribute-type: description",
-            "ds-cfg-rotation-policy: cn=LDAP Connection Handler, cn=bad rdn, cn=config", "",
-            "dn: cn=Connection Handlers,cn=config", "objectClass: top", "objectClass: ds-cfg-branch",
-            "cn: Connection Handlers", "", "dn: cn=LDAP Connection Handler,cn=Connection Handlers,cn=config",
-            "objectClass: top", "objectClass: ds-cfg-connection-handler",
-            "objectClass: ds-cfg-ldap-connection-handler", "cn: LDAP Connection Handler",
-            "ds-cfg-java-class: org.opends.server.protocols.ldap.LDAPConnectionHandler", "ds-cfg-enabled: true",
-            "ds-cfg-listen-address: 0.0.0.0", "ds-cfg-listen-port: 389", "",
-            "dn: cn=LDAPS Connection Handler,cn=Connection Handlers,cn=config", "objectClass: top",
-            "objectClass: ds-cfg-connection-handler", "objectClass: ds-cfg-ldap-connection-handler",
-            "cn: LDAPS Connection Handler",
-            "ds-cfg-java-class: org.opends.server.protocols.ldap.LDAPConnectionHandler", "ds-cfg-enabled: false",
-            "ds-cfg-listen-address: 0.0.0.0", "ds-cfg-listen-port: 636", "ds-cfg-use-ssl: true",
-            "ds-cfg-ssl-client-auth-policy: optional", "ds-cfg-ssl-cert-nickname: server-cert",
-            "ds-cfg-key-manager-provider: cn=JKS,cn=Key Manager Providers,cn=config",
-            "ds-cfg-trust-manager-provider: cn=JKS,cn=Trust Manager Providers,cn=config", "",
-            "dn: cn=JMX Connection Handler,cn=Connection Handlers,cn=config", "objectClass: top",
-            "objectClass: ds-cfg-connection-handler", "objectClass: ds-cfg-jmx-connection-handler",
-            "cn: JMX Connection Handler", "ds-cfg-java-class: org.opends.server.protocols.jmx.JmxConnectionHandler",
-            "ds-cfg-enabled: false", "ds-cfg-listen-port: 1689", "" };
+        // Base entries.
+        "dn: cn=config",
+        "objectclass: top",
+        "objectclass: ds-cfg-branch",
+        "cn: config",
+        "",
+        "dn: cn=test parents,cn=config",
+        "objectclass: top",
+        "objectclass: ds-cfg-branch",
+        "cn: test-parents",
+        "",
+        // Parent 1 - uses default values for
+        // optional-multi-valued-dn-property.
+        "dn: cn=test parent 1,cn=test parents,cn=config",
+        "objectclass: top",
+        "objectclass: ds-cfg-test-parent-dummy",
+        "cn: test parent 1",
+        "ds-cfg-enabled: true",
+        "ds-cfg-java-class: org.opends.server.extensions.UserDefinedVirtualAttributeProvider",
+        "ds-cfg-attribute-type: description",
+        "",
+        // Child base entry.
+        "dn:cn=test children,cn=test parent 1,cn=test parents,cn=config",
+        "objectclass: top",
+        "objectclass: ds-cfg-branch",
+        "cn: multiple children",
+        "",
+        // Child 1 has no references.
+        "dn: cn=test child 1,cn=test children,cn=test parent 1,cn=test parents,cn=config",
+        "objectclass: top",
+        "objectclass: ds-cfg-test-child-dummy",
+        "cn: test child 1",
+        "ds-cfg-enabled: true",
+        "ds-cfg-java-class: org.opends.server.extensions.UserDefinedVirtualAttributeProvider",
+        "ds-cfg-attribute-type: description",
+        "",
+        // Child 2 has a single valid reference.
+        "dn: cn=test child 2,cn=test children,cn=test parent 1,cn=test parents,cn=config",
+        "objectclass: top",
+        "objectclass: ds-cfg-test-child-dummy",
+        "cn: test child 2",
+        "ds-cfg-enabled: true",
+        "ds-cfg-java-class: org.opends.server.extensions.UserDefinedVirtualAttributeProvider",
+        "ds-cfg-attribute-type: description",
+        "ds-cfg-rotation-policy: cn=LDAP Connection Handler, cn=connection handlers, cn=config",
+        "",
+        // Child 3 has a multiple valid references.
+        "dn: cn=test child 3,cn=test children,cn=test parent 1,cn=test parents,cn=config",
+        "objectclass: top",
+        "objectclass: ds-cfg-test-child-dummy",
+        "cn: test child 3",
+        "ds-cfg-enabled: true",
+        "ds-cfg-java-class: org.opends.server.extensions.UserDefinedVirtualAttributeProvider",
+        "ds-cfg-attribute-type: description",
+        "ds-cfg-rotation-policy: cn=LDAP Connection Handler, cn=connection handlers, cn=config",
+        "ds-cfg-rotation-policy: cn=LDAPS Connection Handler, cn=connection handlers, cn=config",
+        "",
+        // Child 4 has a single bad reference.
+        "dn: cn=test child 4,cn=test children,cn=test parent 1,cn=test parents,cn=config", "objectclass: top",
+        "objectclass: ds-cfg-test-child-dummy", "cn: test child 4", "ds-cfg-enabled: true",
+        "ds-cfg-java-class: org.opends.server.extensions.UserDefinedVirtualAttributeProvider",
+        "ds-cfg-attribute-type: description",
+        "ds-cfg-rotation-policy: cn=LDAP Connection Handler, cn=bad rdn, cn=config",
+        "",
+        "dn: cn=Connection Handlers,cn=config",
+        "objectClass: top",
+        "objectClass: ds-cfg-branch",
+        "cn: Connection Handlers",
+        "",
+        "dn: cn=LDAP Connection Handler,cn=Connection Handlers,cn=config",
+        "objectClass: top",
+        "objectClass: ds-cfg-connection-handler",
+        "objectClass: ds-cfg-ldap-connection-handler",
+        "cn: LDAP Connection Handler",
+        "ds-cfg-java-class: org.opends.server.protocols.ldap.LDAPConnectionHandler",
+        "ds-cfg-enabled: true",
+        "ds-cfg-listen-address: 0.0.0.0", "ds-cfg-listen-port: 389",
+        "",
+        "dn: cn=LDAPS Connection Handler,cn=Connection Handlers,cn=config",
+        "objectClass: top",
+        "objectClass: ds-cfg-connection-handler",
+        "objectClass: ds-cfg-ldap-connection-handler",
+        "cn: LDAPS Connection Handler",
+        "ds-cfg-java-class: org.opends.server.protocols.ldap.LDAPConnectionHandler",
+        "ds-cfg-enabled: false",
+        "ds-cfg-listen-address: 0.0.0.0",
+        "ds-cfg-listen-port: 636",
+        "ds-cfg-use-ssl: true",
+        "ds-cfg-ssl-client-auth-policy: optional",
+        "ds-cfg-ssl-cert-nickname: server-cert",
+        "ds-cfg-key-manager-provider: cn=JKS,cn=Key Manager Providers,cn=config",
+        "ds-cfg-trust-manager-provider: cn=JKS,cn=Trust Manager Providers,cn=config",
+        "",
+        "dn: cn=JMX Connection Handler,cn=Connection Handlers,cn=config",
+        "objectClass: top",
+        "objectClass: ds-cfg-connection-handler",
+        "objectClass: ds-cfg-jmx-connection-handler",
+        "cn: JMX Connection Handler",
+        "ds-cfg-java-class: org.opends.server.protocols.jmx.JmxConnectionHandler",
+        "ds-cfg-enabled: false",
+        "ds-cfg-listen-port: 1689",
+        "" };
 
     @BeforeClass
     public void setUp() throws Exception {

--
Gitblit v1.10.0