You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by el...@apache.org on 2010/09/10 12:04:29 UTC
svn commit: r995729 - in
/directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/admin:
./ AdministrativePointPersistentIT.java
Author: elecharny
Date: Fri Sep 10 10:04:29 2010
New Revision: 995729
URL: http://svn.apache.org/viewvc?rev=995729&view=rev
Log:
Added some test to check that the Administrative Points were still present after a server restart
Added:
directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/admin/
directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/admin/AdministrativePointPersistentIT.java
Added: directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/admin/AdministrativePointPersistentIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/admin/AdministrativePointPersistentIT.java?rev=995729&view=auto
==============================================================================
--- directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/admin/AdministrativePointPersistentIT.java (added)
+++ directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/admin/AdministrativePointPersistentIT.java Fri Sep 10 10:04:29 2010
@@ -0,0 +1,180 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+package org.apache.directory.server.admin;
+
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+import org.apache.directory.ldap.client.api.LdapConnection;
+import org.apache.directory.server.annotations.CreateLdapServer;
+import org.apache.directory.server.annotations.CreateTransport;
+import org.apache.directory.server.core.annotations.ApplyLdifs;
+import org.apache.directory.server.core.integ.AbstractLdapTestUnit;
+import org.apache.directory.server.core.integ.FrameworkRunner;
+import org.apache.directory.server.core.integ.IntegrationUtils;
+import org.apache.directory.shared.ldap.entry.Entry;
+import org.apache.directory.shared.ldap.entry.EntryAttribute;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+
+/**
+ * Test cases for the AdministrativePoint interceptor, checking that the cache is correctly updated
+ * when the server is started.
+ *
+ * We will create the following data structure :
+ * <pre>
+ * ou=system
+ * |
+ * +-ou=noAP1
+ * | |
+ * | +-<ou=AAP1>
+ * | |
+ * | +-ou=noAP2
+ * +-<ou=AAP2>
+ * |
+ * +-ou=noAP3
+ * |
+ * +-<ou=subAAP1>
+ * |
+ * +-ou=noAP4
+ * </pre>
+ *
+ * and check that it's present when the server is stopped and restarted
+ *
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ */
+@RunWith(FrameworkRunner.class)
+@CreateLdapServer(transports =
+ { @CreateTransport(protocol = "LDAP") })
+@ApplyLdifs(
+ {
+ // Entry # 1
+ "dn: ou=noAP1,ou=system",
+ "ObjectClass: top",
+ "ObjectClass: organizationalUnit",
+ "ou: noAP1",
+ "",
+ // Entry # 2
+ "dn: ou=AAP1,ou=noAP1,ou=system",
+ "ObjectClass: top",
+ "ObjectClass: organizationalUnit",
+ "ou: AAP1",
+ "administrativeRole: autonomousArea",
+ "",
+ // Entry # 3
+ "dn: ou=noAP2,ou=AAP1,ou=noAP1,ou=system",
+ "ObjectClass: top",
+ "ObjectClass: organizationalUnit",
+ "ou: noAP2",
+ "",
+ // Entry # 4
+ "dn: ou=AAP2,ou=system",
+ "ObjectClass: top",
+ "ObjectClass: organizationalUnit",
+ "ou: AAP2",
+ "administrativeRole: autonomousArea",
+ "",
+ // Entry # 5
+ "dn: ou=noAP3,ou=AAP2,ou=system",
+ "ObjectClass: top",
+ "ObjectClass: organizationalUnit",
+ "ou: noAP3",
+ "",
+ // Entry # 6
+ "dn: ou=subAAP1,ou=noAP3,ou=AAP2,ou=system",
+ "ObjectClass: top",
+ "ObjectClass: organizationalUnit",
+ "ou: subAAP1",
+ "administrativeRole: autonomousArea",
+ "",
+ // Entry # 7
+ "dn: ou=noAP4,ou=subAAP1,ou=noAP3,ou=AAP2,ou=system",
+ "ObjectClass: top",
+ "ObjectClass: organizationalUnit",
+ "ou: noAP4",
+ ""
+ })
+public class AdministrativePointPersistentIT extends AbstractLdapTestUnit
+{
+ // The shared LDAP connection
+ private static LdapConnection connection;
+
+ @Before
+ public void init() throws Exception
+ {
+ connection = IntegrationUtils.getAdminConnection( service );
+ }
+
+
+ @After
+ public void shutdown() throws Exception
+ {
+ connection.close();
+ }
+
+
+ private EntryAttribute getAdminRole( String dn ) throws Exception
+ {
+ Entry lookup = connection.lookup( dn, "administrativeRole" );
+
+ assertNotNull( lookup );
+
+ return lookup.get( "administrativeRole" );
+ }
+
+
+ // -------------------------------------------------------------------
+ // Test the Add operation
+ // -------------------------------------------------------------------
+ /**
+ * Test the addition of an autonomous area
+ * @throws Exception
+ */
+ @Test
+ public void testAddAutonomousArea() throws Exception
+ {
+ assertTrue( ldapServer.isStarted() );
+
+ // Stop the server now, we will restart it immediately
+ ldapServer.stop();
+ assertFalse( ldapServer.isStarted() );
+
+ // And shutdown the DS too
+ ldapServer.getDirectoryService().shutdown();
+ assertFalse( ldapServer.getDirectoryService().isStarted() );
+
+ // And restart
+ ldapServer.getDirectoryService().startup();
+ ldapServer.start();
+ assertTrue( service.isStarted() );
+ assertTrue( ldapServer.getDirectoryService().isStarted() );
+
+ // Check that the roles are present
+ assertEquals( "autonomousArea", getAdminRole( "ou=AAP1,ou=noAP1,ou=system" ).getString() );
+ assertEquals( "autonomousArea", getAdminRole( "ou=AAP2,ou=system" ).getString() );
+ assertEquals( "autonomousArea", getAdminRole( "ou=subAAP1,ou=noAP3,ou=AAP2,ou=system" ).getString() );
+ }
+}