Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 45885 invoked from network); 19 Mar 2010 22:17:05 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 19 Mar 2010 22:17:05 -0000 Received: (qmail 9490 invoked by uid 500); 19 Mar 2010 22:17:05 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 9451 invoked by uid 500); 19 Mar 2010 22:17:05 -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 9444 invoked by uid 99); 19 Mar 2010 22:17:05 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 19 Mar 2010 22:17:05 +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; Fri, 19 Mar 2010 22:17:01 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 38A0A23889F1; Fri, 19 Mar 2010 22:16:40 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r925459 - /directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/ Date: Fri, 19 Mar 2010 22:16:40 -0000 To: commits@directory.apache.org From: elecharny@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100319221640.38A0A23889F1@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: elecharny Date: Fri Mar 19 22:16:39 2010 New Revision: 925459 URL: http://svn.apache.org/viewvc?rev=925459&view=rev Log: Fixed the exceptions Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/AddReferralIT.java directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/CompareReferralIT.java directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/DeleteReferralIT.java directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/ModifyReferralIT.java directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/MoveReferralIT.java directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/RenameReferralIT.java directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/SearchReferralIT.java Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/AddReferralIT.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/AddReferralIT.java?rev=925459&r1=925458&r2=925459&view=diff ============================================================================== --- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/AddReferralIT.java (original) +++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/AddReferralIT.java Fri Mar 19 22:16:39 2010 @@ -45,6 +45,7 @@ import org.apache.directory.server.core. import org.apache.directory.server.core.entry.ServerEntry; import org.apache.directory.server.core.integ.AbstractLdapTestUnit; import org.apache.directory.server.core.integ.FrameworkRunner; +import org.apache.directory.shared.ldap.exception.LdapReferralException; import org.apache.directory.shared.ldap.name.DN; import org.junit.Before; import org.junit.Test; @@ -251,7 +252,7 @@ public class AddReferralIT extends Abstr session.add( serverEntry, false ); fail(); } - catch ( ReferralException re ) + catch ( LdapReferralException re ) { assertTrue( true ); Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/CompareReferralIT.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/CompareReferralIT.java?rev=925459&r1=925458&r2=925459&view=diff ============================================================================== --- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/CompareReferralIT.java (original) +++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/CompareReferralIT.java Fri Mar 19 22:16:39 2010 @@ -47,6 +47,7 @@ import org.apache.directory.server.core. import org.apache.directory.server.core.entry.ServerEntry; import org.apache.directory.server.core.integ.AbstractLdapTestUnit; import org.apache.directory.server.core.integ.FrameworkRunner; +import org.apache.directory.shared.ldap.exception.LdapReferralException; import org.apache.directory.shared.ldap.name.DN; import org.junit.Before; import org.junit.Test; @@ -234,7 +235,7 @@ public class CompareReferralIT extends A session.compare( new DN( "cn=Emmanuel Lecharny,ou=Roles,o=MNN,c=WW,ou=system" ), "cn", "Emmanuel Lecharny", false ); fail(); } - catch ( ReferralException re ) + catch ( LdapReferralException re ) { int nbRefs = 0; Set expectedRefs = new HashSet(); @@ -388,7 +389,7 @@ public class CompareReferralIT extends A session.compare( new DN( "ou=Roles,o=MNN,c=WW,ou=system" ), "ou", "roles", false ); fail(); } - catch ( ReferralException re ) + catch ( LdapReferralException re ) { int nbRefs = 0; Set expectedRefs = new HashSet(); Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/DeleteReferralIT.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/DeleteReferralIT.java?rev=925459&r1=925458&r2=925459&view=diff ============================================================================== --- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/DeleteReferralIT.java (original) +++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/DeleteReferralIT.java Fri Mar 19 22:16:39 2010 @@ -41,6 +41,8 @@ import org.apache.directory.server.core. import org.apache.directory.server.core.entry.ServerEntry; import org.apache.directory.server.core.integ.AbstractLdapTestUnit; import org.apache.directory.server.core.integ.FrameworkRunner; +import org.apache.directory.shared.ldap.exception.LdapNoSuchObjectException; +import org.apache.directory.shared.ldap.exception.LdapReferralException; import org.apache.directory.shared.ldap.name.DN; import org.junit.Before; import org.junit.Test; @@ -190,7 +192,7 @@ public class DeleteReferralIT extends Ab session.delete( new DN( "cn=Emmanuel Lecharny,ou=Roles" ) ); fail(); } - catch ( NameNotFoundException nnfe ) + catch ( LdapNoSuchObjectException lnsoe ) { assertTrue( true ); } @@ -213,7 +215,7 @@ public class DeleteReferralIT extends Ab session.lookup( dn, new String[]{} ); fail(); } - catch ( NameNotFoundException nnfe ) + catch ( LdapNoSuchObjectException lnsoe ) { assertTrue( true ); } @@ -277,7 +279,7 @@ public class DeleteReferralIT extends Ab session.lookup( dn, new String[]{} ); fail(); } - catch ( NameNotFoundException nnfe ) + catch ( LdapNoSuchObjectException lnsoe ) { assertTrue( true ); } @@ -299,7 +301,7 @@ public class DeleteReferralIT extends Ab session.delete( dn, false ); fail(); } - catch ( ReferralException re ) + catch ( LdapReferralException re ) { int nbRefs = 0; Set expectedRefs = new HashSet(); @@ -337,7 +339,7 @@ public class DeleteReferralIT extends Ab session.lookup( dn, new String[]{} ); fail(); } - catch ( NameNotFoundException nnfe ) + catch ( LdapNoSuchObjectException lnsoe ) { assertTrue( true ); } Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/ModifyReferralIT.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/ModifyReferralIT.java?rev=925459&r1=925458&r2=925459&view=diff ============================================================================== --- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/ModifyReferralIT.java (original) +++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/ModifyReferralIT.java Fri Mar 19 22:16:39 2010 @@ -53,6 +53,8 @@ import org.apache.directory.shared.ldap. import org.apache.directory.shared.ldap.entry.client.ClientAttribute; import org.apache.directory.shared.ldap.entry.client.ClientModification; import org.apache.directory.shared.ldap.entry.client.DefaultClientAttribute; +import org.apache.directory.shared.ldap.exception.LdapNoSuchObjectException; +import org.apache.directory.shared.ldap.exception.LdapReferralException; import org.apache.directory.shared.ldap.name.DN; import org.junit.Before; import org.junit.Test; @@ -248,7 +250,7 @@ public class ModifyReferralIT extends Ab session.modify( new DN( "cn=Emmanuel Lecharny,ou=Roles,c=MNN,o=WW,ou=system" ), mods ); fail(); } - catch ( NameNotFoundException nnfe ) + catch ( LdapNoSuchObjectException lnsoe ) { assertTrue( true ); } @@ -276,7 +278,7 @@ public class ModifyReferralIT extends Ab session.modify( new DN( "cn=Emmanuel Lecharny,ou=Roles,c=MNN,o=WW,ou=system" ), mods, true ); fail(); } - catch ( NameNotFoundException nnfe ) + catch ( LdapNoSuchObjectException lnsoe ) { assertTrue( true ); } @@ -384,7 +386,7 @@ public class ModifyReferralIT extends Ab session.modify( new DN( "ou=Roles,o=MNN,c=WW,ou=system" ), mods, false ); fail(); } - catch ( ReferralException re ) + catch ( LdapReferralException re ) { int nbRefs = 0; Set expectedRefs = new HashSet(); Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/MoveReferralIT.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/MoveReferralIT.java?rev=925459&r1=925458&r2=925459&view=diff ============================================================================== --- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/MoveReferralIT.java (original) +++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/MoveReferralIT.java Fri Mar 19 22:16:39 2010 @@ -44,6 +44,7 @@ import org.apache.directory.server.core. import org.apache.directory.server.core.entry.ServerEntry; import org.apache.directory.server.core.integ.AbstractLdapTestUnit; import org.apache.directory.server.core.integ.FrameworkRunner; +import org.apache.directory.shared.ldap.exception.LdapReferralException; import org.apache.directory.shared.ldap.name.DN; import org.junit.Before; import org.junit.Test; @@ -235,7 +236,7 @@ public class MoveReferralIT extends Abst coreSession.move( dn, newParent, false ); fail(); } - catch ( ReferralException re ) + catch ( LdapReferralException re ) { int nbRefs = 0; Set expectedRefs = new HashSet(); @@ -428,7 +429,7 @@ public class MoveReferralIT extends Abst coreSession.move( orig, dest, false ); fail(); } - catch ( ReferralException re ) + catch ( LdapReferralException re ) { int nbRefs = 0; Set expectedRefs = new HashSet(); Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/RenameReferralIT.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/RenameReferralIT.java?rev=925459&r1=925458&r2=925459&view=diff ============================================================================== --- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/RenameReferralIT.java (original) +++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/RenameReferralIT.java Fri Mar 19 22:16:39 2010 @@ -44,6 +44,9 @@ import org.apache.directory.server.core. import org.apache.directory.server.core.entry.ServerEntry; import org.apache.directory.server.core.integ.AbstractLdapTestUnit; import org.apache.directory.server.core.integ.FrameworkRunner; +import org.apache.directory.shared.ldap.exception.LdapEntryAlreadyExistsException; +import org.apache.directory.shared.ldap.exception.LdapNoSuchObjectException; +import org.apache.directory.shared.ldap.exception.LdapReferralException; import org.apache.directory.shared.ldap.name.DN; import org.apache.directory.shared.ldap.name.RDN; import org.junit.Before; @@ -234,7 +237,7 @@ public class RenameReferralIT extends Ab session.rename( dn, newRdn, false, false ); fail(); } - catch ( ReferralException re ) + catch ( LdapReferralException re ) { int nbRefs = 0; Set expectedRefs = new HashSet(); @@ -409,7 +412,7 @@ public class RenameReferralIT extends Ab session.rename( dn, newRdn, false, false ); fail(); } - catch ( ReferralException re ) + catch ( LdapReferralException re ) { int nbRefs = 0; Set expectedRefs = new HashSet(); @@ -451,7 +454,7 @@ public class RenameReferralIT extends Ab renamed = session.lookup( dnGroups ); fail(); } - catch ( NameNotFoundException nnfe ) + catch ( LdapNoSuchObjectException lnsoe ) { assertTrue( true ); } @@ -465,7 +468,7 @@ public class RenameReferralIT extends Ab renamed = session.lookup( dnRoles ); fail(); } - catch ( NameNotFoundException nnfe ) + catch ( LdapNoSuchObjectException lnsoe ) { assertTrue( true ); } @@ -563,7 +566,7 @@ public class RenameReferralIT extends Ab session.rename( dn, newRdn, false, false ); fail(); } - catch ( ReferralException re ) + catch ( LdapReferralException re ) { int nbRefs = 0; Set expectedRefs = new HashSet(); @@ -599,7 +602,7 @@ public class RenameReferralIT extends Ab session.rename( dn, newRdn, false, true ); fail(); } - catch ( NameAlreadyBoundException nabe ) + catch ( LdapEntryAlreadyExistsException leaee ) { assertTrue( true ); } Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/SearchReferralIT.java URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/SearchReferralIT.java?rev=925459&r1=925458&r2=925459&view=diff ============================================================================== --- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/SearchReferralIT.java (original) +++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/SearchReferralIT.java Fri Mar 19 22:16:39 2010 @@ -48,6 +48,7 @@ import org.apache.directory.server.core. import org.apache.directory.server.core.integ.AbstractLdapTestUnit; import org.apache.directory.server.core.integ.FrameworkRunner; import org.apache.directory.shared.ldap.entry.Entry; +import org.apache.directory.shared.ldap.exception.LdapReferralException; import org.apache.directory.shared.ldap.name.DN; import org.junit.Before; import org.junit.Test; @@ -240,7 +241,7 @@ public class SearchReferralIT extends Ab coreSession.search( dn, "(ObjectClass=*)", false ); fail(); } - catch ( ReferralException re ) + catch ( LdapReferralException re ) { int nbRefs = 0; Set expectedRefs = new HashSet(); @@ -392,7 +393,7 @@ public class SearchReferralIT extends Ab coreSession.search( dn, "(ObjectClass=*)", false ); fail(); } - catch ( ReferralException re ) + catch ( LdapReferralException re ) { int nbRefs = 0; Set expectedRefs = new HashSet();