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/03/19 23:16:40 UTC
svn commit: r925459 -
/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/
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<String> expectedRefs = new HashSet<String>();
@@ -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<String> expectedRefs = new HashSet<String>();
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<String> expectedRefs = new HashSet<String>();
@@ -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<String> expectedRefs = new HashSet<String>();
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<String> expectedRefs = new HashSet<String>();
@@ -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<String> expectedRefs = new HashSet<String>();
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<String> expectedRefs = new HashSet<String>();
@@ -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<String> expectedRefs = new HashSet<String>();
@@ -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<String> expectedRefs = new HashSet<String>();
@@ -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<String> expectedRefs = new HashSet<String>();
@@ -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<String> expectedRefs = new HashSet<String>();