Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 67428 invoked from network); 27 Dec 2010 16:12:32 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 27 Dec 2010 16:12:32 -0000 Received: (qmail 29786 invoked by uid 500); 27 Dec 2010 16:12:32 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 29735 invoked by uid 500); 27 Dec 2010 16:12:32 -0000 Mailing-List: contact commits-help@directory.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@directory.apache.org Delivered-To: mailing list commits@directory.apache.org Received: (qmail 29728 invoked by uid 99); 27 Dec 2010 16:12:31 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 27 Dec 2010 16:12:31 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 27 Dec 2010 16:12:29 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 313022388A2C; Mon, 27 Dec 2010 16:12:08 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1053096 - /directory/apacheds/branches/apacheds-AP/core-integ/src/test/java/org/apache/directory/server/core/subtree/SubentryAddOperationIT.java Date: Mon, 27 Dec 2010 16:12:08 -0000 To: commits@directory.apache.org From: elecharny@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20101227161208.313022388A2C@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: elecharny Date: Mon Dec 27 16:12:07 2010 New Revision: 1053096 URL: http://svn.apache.org/viewvc?rev=1053096&view=rev Log: Adding some additional checks Modified: directory/apacheds/branches/apacheds-AP/core-integ/src/test/java/org/apache/directory/server/core/subtree/SubentryAddOperationIT.java Modified: directory/apacheds/branches/apacheds-AP/core-integ/src/test/java/org/apache/directory/server/core/subtree/SubentryAddOperationIT.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-AP/core-integ/src/test/java/org/apache/directory/server/core/subtree/SubentryAddOperationIT.java?rev=1053096&r1=1053095&r2=1053096&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-AP/core-integ/src/test/java/org/apache/directory/server/core/subtree/SubentryAddOperationIT.java (original) +++ directory/apacheds/branches/apacheds-AP/core-integ/src/test/java/org/apache/directory/server/core/subtree/SubentryAddOperationIT.java Mon Dec 27 16:12:07 2010 @@ -26,6 +26,8 @@ import static org.junit.Assert.assertNot import static org.junit.Assert.assertTrue; import org.apache.directory.ldap.client.api.LdapConnection; +import org.apache.directory.server.core.administrative.AdministrativePoint; +import org.apache.directory.server.core.administrative.Subentry; import org.apache.directory.server.core.annotations.ApplyLdifs; import org.apache.directory.server.core.annotations.CreateDS; import org.apache.directory.server.core.integ.AbstractLdapTestUnit; @@ -36,6 +38,7 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.ldif.LdifUtils; import org.apache.directory.shared.ldap.message.AddResponse; import org.apache.directory.shared.ldap.message.ResultCodeEnum; +import org.apache.directory.shared.ldap.name.DN; import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -817,6 +820,32 @@ public class SubentryAddOperationIT exte response = adminConnection.add( subentry ); assertEquals( ResultCodeEnum.SUCCESS, response.getLdapResult().getResultCode() ); + + DN subentryDN = new DN( "cn=test, ou=AAP2,ou=system" ); + + // Get back the subentry + Entry addedSE = adminConnection.lookup( subentryDN, "+" ); + String subentryUUID = addedSE.get( "entryUUID" ).getString(); + + DN apDn = new DN( "ou=AAP2,ou=system" ); + apDn.normalize( service.getSchemaManager() ); + + // Check that we have a ref to the added subentry in the two APs (AC and CA) + AdministrativePoint apAC = service.getAccessControlAPCache().getElement( apDn ); + + assertNotNull( apAC.getSubentries() ); + assertEquals( 1, apAC.getSubentries().size() ); + Subentry subentryAC = (Subentry)(apAC.getSubentries().toArray()[0]); + + assertEquals( subentryAC.getUuid(), subentryUUID ); + + AdministrativePoint apCA = service.getCollectiveAttributeAPCache().getElement( apDn ); + + assertNotNull( apCA.getSubentries() ); + assertEquals( 1, apCA.getSubentries().size() ); + Subentry subentryCA = (Subentry)(apCA.getSubentries().toArray()[0]); + + assertEquals( subentryCA.getUuid(), subentryUUID ); }