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/10/04 21:04:45 UTC
svn commit: r1004363 -
/directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/admin/AdministrativePointModifyIT.java
Author: elecharny
Date: Mon Oct 4 19:04:44 2010
New Revision: 1004363
URL: http://svn.apache.org/viewvc?rev=1004363&view=rev
Log:
Added some test for the modification operation on APs
Added:
directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/admin/AdministrativePointModifyIT.java
Added: directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/admin/AdministrativePointModifyIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/admin/AdministrativePointModifyIT.java?rev=1004363&view=auto
==============================================================================
--- directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/admin/AdministrativePointModifyIT.java (added)
+++ directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/admin/AdministrativePointModifyIT.java Mon Oct 4 19:04:44 2010
@@ -0,0 +1,312 @@
+/*
+ * 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.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.DefaultEntryAttribute;
+import org.apache.directory.shared.ldap.entry.DefaultModification;
+import org.apache.directory.shared.ldap.entry.Entry;
+import org.apache.directory.shared.ldap.entry.EntryAttribute;
+import org.apache.directory.shared.ldap.entry.Modification;
+import org.apache.directory.shared.ldap.entry.ModificationOperation;
+import org.apache.directory.shared.ldap.message.ModifyResponse;
+import org.apache.directory.shared.ldap.message.ResultCodeEnum;
+import org.apache.directory.shared.ldap.schema.SchemaManager;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+
+/**
+ * Test cases for the AdministrativePoint Delete operation
+ *
+ * We will create the following data structure :
+ * <pre>
+ * ou=system
+ * |
+ * +-ou=SAP-AC
+ * | |
+ * | +-ou=SAP-CA
+ * | | |
+ * | | +-ou=AAP
+ * | | |
+ * | | +-ou=IAP-CA
+ * | | |
+ * | | +-ou=IAP-AC
+ * | | |
+ * | | +-ou=IAP-TE
+ * | |
+ * | +-ou=AAP
+ * | |
+ * | +-ou=AAP
+ * | |
+ * | +-ou=SAP-AC
+ * | |
+ * | +-ou=SAP-CA : OK
+ * | |
+ * | +-ou=IAC-AC : OK
+ * | |
+ * | +-ou=IAC-CA : KO
+ * |
+ * +-ou=AAP
+ * | |
+ * | +-ou=AAP
+ * | |
+ * | +-ou=AAP : OK
+ * | |
+ * | +-ou=SAP-CA : OK
+ * | |
+ * | +-ou=IAP-CA : OK
+ * |
+ * +-ou=AAP1 --> to be deleted
+ * |
+ * +-ou=AAP : OK
+ * |
+ * +-ou=SAP-CA : OK
+ * |
+ * +-ou=IAP-CA : KO
+ * </pre>
+ *
+ * and check that removing entries from this data structure does not break the server
+ *
+ * @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=SAP-AC,ou=system",
+ "ObjectClass: top",
+ "ObjectClass: organizationalUnit",
+ "ou: SAP-AC",
+ "administrativeRole: accessControlSpecificArea",
+ "",
+ // Entry # 2
+ "dn: ou=SAP-CA,ou=SAP-AC,ou=system",
+ "ObjectClass: top",
+ "ObjectClass: organizationalUnit",
+ "ou: SAP-CA",
+ "administrativeRole: collectiveAttributeSpecificArea",
+ "",
+ // Entry # 3
+ "dn: ou=AAP,ou=SAP-CA,ou=SAP-AC,ou=system",
+ "ObjectClass: top",
+ "ObjectClass: organizationalUnit",
+ "ou: AAP",
+ "administrativeRole: autonomousArea",
+ "",
+ // Entry # 4
+ "dn: ou=IAP-CA,ou=AAP,ou=SAP-CA,ou=SAP-AC,ou=system",
+ "ObjectClass: top",
+ "ObjectClass: organizationalUnit",
+ "ou: IAP-CA",
+ "administrativeRole: collectiveAttributeInnerArea",
+ "",
+ // Entry # 5
+ "dn: ou=IAP-AC,ou=AAP,ou=SAP-CA,ou=SAP-AC,ou=system",
+ "ObjectClass: top",
+ "ObjectClass: organizationalUnit",
+ "ou: IAP-AC",
+ "administrativeRole: accessControlInnerArea",
+ "",
+ // Entry # 6
+ "dn: ou=IAP-TE,ou=AAP,ou=SAP-CA,ou=SAP-AC,ou=system",
+ "ObjectClass: top",
+ "ObjectClass: organizationalUnit",
+ "ou: IAP-TE",
+ "administrativeRole: triggerExecutionInnerArea",
+ "",
+ // Entry # 7
+ "dn: ou=AAP,ou=SAP-AC,ou=system",
+ "ObjectClass: top",
+ "ObjectClass: organizationalUnit",
+ "ou: AAP",
+ "administrativeRole: autonomousArea",
+ "",
+ // Entry # 8
+ "dn: ou=AAP,ou=AAP,ou=SAP-AC,ou=system",
+ "ObjectClass: top",
+ "ObjectClass: organizationalUnit",
+ "ou: AAP",
+ "administrativeRole: autonomousArea",
+ "",
+ // Entry # 9
+ "dn: ou=SAP-AC,ou=AAP,ou=SAP-AC,ou=system",
+ "ObjectClass: top",
+ "ObjectClass: organizationalUnit",
+ "ou: SAP-AC",
+ "administrativeRole: accessControlSpecificArea",
+ "",
+ // Entry # 10
+ "dn: ou=SAP-CA,ou=AAP,ou=SAP-AC,ou=system",
+ "ObjectClass: top",
+ "ObjectClass: organizationalUnit",
+ "ou: SAP-CA",
+ "administrativeRole: collectiveAttributeSpecificArea",
+ "",
+ // Entry # 11
+ "dn: ou=IAP-AC,ou=AAP,ou=SAP-AC,ou=system",
+ "ObjectClass: top",
+ "ObjectClass: organizationalUnit",
+ "ou: IAP-AC",
+ "administrativeRole: accessControlInnerArea",
+ "",
+ // Entry # 12
+ "dn: ou=IAP-CA,ou=AAP,ou=SAP-AC,ou=system",
+ "ObjectClass: top",
+ "ObjectClass: organizationalUnit",
+ "ou: IAP-CA",
+ "administrativeRole: collectiveAttributeInnerArea",
+ "",
+ // Entry # 13
+ "dn: ou=AAP,ou=system",
+ "ObjectClass: top",
+ "ObjectClass: organizationalUnit",
+ "ou: AAP",
+ "administrativeRole: autonomousArea",
+ "",
+ // Entry # 14
+ "dn: ou=AAP,ou=AAP,ou=system",
+ "ObjectClass: top",
+ "ObjectClass: organizationalUnit",
+ "ou: AAP",
+ "administrativeRole: autonomousArea",
+ "",
+ // Entry # 15
+ "dn: ou=AAP,ou=AAP,ou=AAP,ou=system",
+ "ObjectClass: top",
+ "ObjectClass: organizationalUnit",
+ "ou: AAP",
+ "administrativeRole: autonomousArea",
+ "",
+ // Entry # 16
+ "dn: ou=SAP-CA,ou=AAP,ou=AAP,ou=system",
+ "ObjectClass: top",
+ "ObjectClass: organizationalUnit",
+ "ou: SAP-CA",
+ "administrativeRole: collectiveAttributeSpecificArea",
+ "",
+ // Entry # 17
+ "dn: ou=IAP-CA,ou=AAP,ou=AAP,ou=system",
+ "ObjectClass: top",
+ "ObjectClass: organizationalUnit",
+ "ou: IAP-CA",
+ "administrativeRole: collectiveAttributeInnerArea",
+ "",
+ // Entry # 18
+ "dn: ou=AAP1,ou=system",
+ "ObjectClass: top",
+ "ObjectClass: organizationalUnit",
+ "ou: AAP1",
+ "administrativeRole: autonomousArea",
+ "",
+ // Entry # 19
+ "dn: ou=AAP,ou=AAP1,ou=system",
+ "ObjectClass: top",
+ "ObjectClass: organizationalUnit",
+ "ou: AAP",
+ "administrativeRole: autonomousArea",
+ "",
+ // Entry # 20
+ "dn: ou=SAP-CA,ou=AAP1,ou=system",
+ "ObjectClass: top",
+ "ObjectClass: organizationalUnit",
+ "ou: SAP-CA",
+ "administrativeRole: collectiveAttributeSpecificArea",
+ "",
+ "",
+ // Entry # 21
+ "dn: ou=IAP-CA,ou=AAP1,ou=system",
+ "ObjectClass: top",
+ "ObjectClass: organizationalUnit",
+ "ou: IAP-CA",
+ "administrativeRole: collectiveAttributeInnerArea",
+ ""
+ })
+public class AdministrativePointModifyIT extends AbstractLdapTestUnit
+{
+ // The shared LDAP connection
+ private static LdapConnection connection;
+
+ // A reference to the schema manager
+ private static SchemaManager schemaManager;
+
+ @Before
+ public void init() throws Exception
+ {
+ connection = IntegrationUtils.getAdminConnection( service );
+ schemaManager = ldapServer.getDirectoryService().getSchemaManager();
+ }
+
+
+ @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 Delete operation
+ // -------------------------------------------------------------------
+ /**
+ * Test the modification of an AAP role to a SAP role, with IAP below
+ */
+ @Test
+ public void testModifyAAPToSAPWithIAPBelow() throws Exception
+ {
+ assertTrue( ldapServer.isStarted() );
+
+ // Remove the AAP
+ Modification modificationDelAap = new DefaultModification( ModificationOperation.REMOVE_ATTRIBUTE,
+ new DefaultEntryAttribute( "administrativeRole" ) );
+ // Add the SAP
+ Modification modificationAddSap = new DefaultModification( ModificationOperation.ADD_ATTRIBUTE,
+ new DefaultEntryAttribute( "administrativeRole", "triggerExecutionSpecificArea" ) );
+ ModifyResponse response = connection.modify( "ou=AAP,ou=SAP-CA,ou=SAP-AC,ou=system", modificationDelAap, modificationAddSap );
+
+ assertNotNull( response );
+ assertEquals( ResultCodeEnum.UNWILLING_TO_PERFORM, response.getLdapResult().getResultCode() );
+ }
+}