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/20 01:26:30 UTC
svn commit: r925502 - in
/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi:
./ referral/
Author: elecharny
Date: Sat Mar 20 00:26:30 2010
New Revision: 925502
URL: http://svn.apache.org/viewvc?rev=925502&view=rev
Log:
Fixed the Exception errors
Modified:
directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/ReferralIT.java
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/MoveAndRenameReferralIT.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/ReferralIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/ReferralIT.java?rev=925502&r1=925501&r2=925502&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/ReferralIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/ReferralIT.java Sat Mar 20 00:26:30 2010
@@ -55,8 +55,8 @@ 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.constants.SchemaConstants;
+import org.apache.directory.shared.ldap.exception.LdapPartialResultException;
import org.apache.directory.shared.ldap.ldif.LdifEntry;
-import org.apache.directory.shared.ldap.message.ResultCodeEnum;
import org.apache.directory.shared.ldap.name.DN;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -270,8 +270,8 @@ public class ReferralIT extends Abstract
}
catch ( PartialResultException pre )
{
- assertEquals( "cn=alex karasulu,ou=apache", ((DN)pre.getRemainingName()).getName() );
- assertEquals( DN.EMPTY_DN, pre.getResolvedName() );
+ assertEquals( "cn=alex karasulu,ou=apache", pre.getRemainingName().toString() );
+ assertEquals( DN.EMPTY_DN, pre.getResolvedName().toString() );
}
}
@@ -306,8 +306,8 @@ public class ReferralIT extends Abstract
}
catch ( ReferralException lre )
{
- assertEquals( "cn=alex karasulu,ou=apache", lre.getRemainingName() );
- assertEquals( "ou=users,ou=system", lre.getResolvedName() );
+ assertEquals( "cn=alex karasulu,ou=apache", lre.getRemainingName().toString() );
+ assertEquals( "ou=users,ou=system", lre.getResolvedName().toString() );
}
}
@@ -339,10 +339,10 @@ public class ReferralIT extends Abstract
service.getAdminSession().add( userEntry );
fail( "Should fail here throwing a ReferralException" );
}
- catch ( PartialResultException pre )
+ catch ( LdapPartialResultException lpre )
{
- assertEquals( "cn=alex karasulu,ou=apache", ((DN)pre.getRemainingName()).getName() );
- assertEquals( DN.EMPTY_DN, pre.getResolvedName() );
+ assertEquals( "cn=alex karasulu,ou=apache", lpre.getRemainingDn().toString() );
+ assertEquals( DN.EMPTY_DN, lpre.getResolvedDn().toString() );
}
}
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=925502&r1=925501&r2=925502&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 Sat Mar 20 00:26:30 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.LdapPartialResultException;
import org.apache.directory.shared.ldap.exception.LdapReferralException;
import org.apache.directory.shared.ldap.name.DN;
import org.junit.Before;
@@ -193,7 +194,7 @@ public class AddReferralIT extends Abstr
session.add( serverEntry, true );
fail();
}
- catch ( PartialResultException pre )
+ catch ( LdapPartialResultException lpre )
{
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=925502&r1=925501&r2=925502&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 Sat Mar 20 00:26:30 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.LdapPartialResultException;
import org.apache.directory.shared.ldap.exception.LdapReferralException;
import org.apache.directory.shared.ldap.name.DN;
import org.junit.Before;
@@ -269,7 +270,7 @@ public class CompareReferralIT extends A
session.compare( new DN( "cn=Emmanuel Lecharny,ou=Roles,o=MNN,c=WW,ou=system" ), "cn", "Emmanuel Lecharny", true );
fail();
}
- catch ( PartialResultException pre )
+ catch ( LdapPartialResultException lpre )
{
assertTrue( true );
}
Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/MoveAndRenameReferralIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/MoveAndRenameReferralIT.java?rev=925502&r1=925501&r2=925502&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/MoveAndRenameReferralIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/MoveAndRenameReferralIT.java Sat Mar 20 00:26:30 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.LdapPartialResultException;
import org.apache.directory.shared.ldap.exception.LdapReferralException;
import org.apache.directory.shared.ldap.name.DN;
import org.apache.directory.shared.ldap.name.RDN;
@@ -282,7 +283,7 @@ public class MoveAndRenameReferralIT ext
coreSession.moveAndRename( dn, newParent, newRdn, false, true );
fail();
}
- catch ( PartialResultException pre )
+ catch ( LdapPartialResultException lpre )
{
assertTrue( true );
}
@@ -470,7 +471,7 @@ public class MoveAndRenameReferralIT ext
coreSession.moveAndRename( dn, newParent, newRdn, false, true );
fail();
}
- catch ( PartialResultException pre )
+ catch ( LdapPartialResultException lpre )
{
assertTrue( true );
}
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=925502&r1=925501&r2=925502&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 Sat Mar 20 00:26:30 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.LdapPartialResultException;
import org.apache.directory.shared.ldap.exception.LdapReferralException;
import org.apache.directory.shared.ldap.name.DN;
import org.junit.Before;
@@ -272,7 +273,7 @@ public class MoveReferralIT extends Abst
coreSession.move( dn, newParent, true );
fail();
}
- catch ( PartialResultException re )
+ catch ( LdapPartialResultException lpre )
{
assertTrue( true );
}
@@ -465,7 +466,7 @@ public class MoveReferralIT extends Abst
coreSession.move( orig, dest, true );
fail();
}
- catch ( PartialResultException pre )
+ catch ( LdapPartialResultException lpre )
{
assertTrue( true );
}
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=925502&r1=925501&r2=925502&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 Sat Mar 20 00:26:30 2010
@@ -46,6 +46,7 @@ import org.apache.directory.server.core.
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.LdapPartialResultException;
import org.apache.directory.shared.ldap.exception.LdapReferralException;
import org.apache.directory.shared.ldap.name.DN;
import org.apache.directory.shared.ldap.name.RDN;
@@ -272,7 +273,7 @@ public class RenameReferralIT extends Ab
session.rename( dn, newRdn, false, true );
fail();
}
- catch ( PartialResultException pre )
+ catch ( LdapPartialResultException lpre )
{
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=925502&r1=925501&r2=925502&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 Sat Mar 20 00:26:30 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.LdapPartialResultException;
import org.apache.directory.shared.ldap.exception.LdapReferralException;
import org.apache.directory.shared.ldap.name.DN;
import org.junit.Before;
@@ -276,7 +277,7 @@ public class SearchReferralIT extends Ab
coreSession.search( dn, "(ObjectClass=*)", true );
fail();
}
- catch ( PartialResultException pre )
+ catch ( LdapPartialResultException lpre )
{
assertTrue( true );
}