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 2006/11/20 20:30:04 UTC
svn commit: r477301 - in
/directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core:
exception/ExceptionServiceITest.java jndi/ReferralITest.java
Author: elecharny
Date: Mon Nov 20 11:30:03 2006
New Revision: 477301
URL: http://svn.apache.org/viewvc?view=rev&rev=477301
Log:
Changed the ResultCodeEnum to become an enum instead of an subclass
of ValuedEnum (Java 5 migration)
Modified:
directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/exception/ExceptionServiceITest.java
directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/jndi/ReferralITest.java
Modified: directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/exception/ExceptionServiceITest.java
URL: http://svn.apache.org/viewvc/directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/exception/ExceptionServiceITest.java?view=diff&rev=477301&r1=477300&r2=477301
==============================================================================
--- directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/exception/ExceptionServiceITest.java (original)
+++ directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/exception/ExceptionServiceITest.java Mon Nov 20 11:30:03 2006
@@ -67,7 +67,7 @@
catch ( LdapNameNotFoundException e )
{
assertEquals( "ou=system", e.getResolvedName().toString() );
- assertEquals( ResultCodeEnum.NOSUCHOBJECT, e.getResultCode() );
+ assertEquals( ResultCodeEnum.NO_SUCH_OBJECT, e.getResultCode() );
}
}
@@ -110,7 +110,7 @@
catch ( LdapNameAlreadyBoundException e )
{
assertEquals( "ou=users,ou=groups,ou=system", e.getResolvedName().toString() );
- assertEquals( ResultCodeEnum.ENTRYALREADYEXISTS, e.getResultCode() );
+ assertEquals( ResultCodeEnum.ENTRY_ALREADY_EXISTS, e.getResultCode() );
}
try
@@ -124,7 +124,7 @@
catch ( LdapNameAlreadyBoundException e )
{
assertEquals( "ou=uzerz,ou=groups,ou=system", e.getResolvedName().toString() );
- assertEquals( ResultCodeEnum.ENTRYALREADYEXISTS, e.getResultCode() );
+ assertEquals( ResultCodeEnum.ENTRY_ALREADY_EXISTS, e.getResultCode() );
}
}
@@ -142,7 +142,7 @@
catch ( LdapNameNotFoundException e )
{
assertEquals( "ou=system", e.getResolvedName().toString() );
- assertEquals( ResultCodeEnum.NOSUCHOBJECT, e.getResultCode() );
+ assertEquals( ResultCodeEnum.NO_SUCH_OBJECT, e.getResultCode() );
}
try
@@ -155,7 +155,7 @@
catch ( LdapNameNotFoundException e )
{
assertEquals( "ou=system", e.getResolvedName().toString() );
- assertEquals( ResultCodeEnum.NOSUCHOBJECT, e.getResultCode() );
+ assertEquals( ResultCodeEnum.NO_SUCH_OBJECT, e.getResultCode() );
}
}
@@ -199,7 +199,7 @@
catch ( LdapNameAlreadyBoundException e )
{
assertEquals( "ou=groups,ou=system", e.getResolvedName().toString() );
- assertEquals( ResultCodeEnum.ENTRYALREADYEXISTS, e.getResultCode() );
+ assertEquals( ResultCodeEnum.ENTRY_ALREADY_EXISTS, e.getResultCode() );
}
}
@@ -217,7 +217,7 @@
catch ( LdapNameNotFoundException e )
{
assertEquals( "ou=system", e.getResolvedName().toString() );
- assertEquals( ResultCodeEnum.NOSUCHOBJECT, e.getResultCode() );
+ assertEquals( ResultCodeEnum.NO_SUCH_OBJECT, e.getResultCode() );
}
}
@@ -267,7 +267,7 @@
catch ( LdapNameNotFoundException e )
{
assertEquals( "ou=system", e.getResolvedName().toString() );
- assertEquals( ResultCodeEnum.NOSUCHOBJECT, e.getResultCode() );
+ assertEquals( ResultCodeEnum.NO_SUCH_OBJECT, e.getResultCode() );
}
ModificationItem[] mods = new ModificationItem[]
@@ -281,7 +281,7 @@
catch ( LdapNameNotFoundException e )
{
assertEquals( "ou=system", e.getResolvedName().toString() );
- assertEquals( ResultCodeEnum.NOSUCHOBJECT, e.getResultCode() );
+ assertEquals( ResultCodeEnum.NO_SUCH_OBJECT, e.getResultCode() );
}
}
@@ -331,7 +331,7 @@
catch ( LdapNameNotFoundException e )
{
assertEquals( "ou=system", e.getResolvedName().toString() );
- assertEquals( ResultCodeEnum.NOSUCHOBJECT, e.getResultCode() );
+ assertEquals( ResultCodeEnum.NO_SUCH_OBJECT, e.getResultCode() );
}
}
@@ -365,7 +365,7 @@
catch ( LdapNameNotFoundException e )
{
assertEquals( "ou=system", e.getResolvedName().toString() );
- assertEquals( ResultCodeEnum.NOSUCHOBJECT, e.getResultCode() );
+ assertEquals( ResultCodeEnum.NO_SUCH_OBJECT, e.getResultCode() );
}
}
@@ -415,7 +415,7 @@
catch ( LdapNamingException e )
{
assertEquals( "cn=toanother,ou=system", e.getResolvedName().toString() );
- assertEquals( ResultCodeEnum.ALIASPROBLEM, e.getResultCode() );
+ assertEquals( ResultCodeEnum.ALIAS_PROBLEM, e.getResultCode() );
}
}
@@ -434,7 +434,7 @@
catch ( LdapNameNotFoundException e )
{
assertEquals( "ou=system", e.getResolvedName().toString() );
- assertEquals( ResultCodeEnum.NOSUCHOBJECT, e.getResultCode() );
+ assertEquals( ResultCodeEnum.NO_SUCH_OBJECT, e.getResultCode() );
}
}
@@ -454,7 +454,7 @@
catch ( LdapNameAlreadyBoundException e )
{
assertEquals( "ou=blah,ou=system", e.getResolvedName().toString() );
- assertEquals( ResultCodeEnum.ENTRYALREADYEXISTS, e.getResultCode() );
+ assertEquals( ResultCodeEnum.ENTRY_ALREADY_EXISTS, e.getResultCode() );
}
}
@@ -491,7 +491,7 @@
catch ( LdapContextNotEmptyException e )
{
assertEquals( "ou=blah,ou=system", e.getResolvedName().toString() );
- assertEquals( ResultCodeEnum.NOTALLOWEDONNONLEAF, e.getResultCode() );
+ assertEquals( ResultCodeEnum.NOT_ALLOWED_ON_NON_LEAF, e.getResultCode() );
}
}
@@ -510,7 +510,7 @@
catch ( LdapNameNotFoundException e )
{
assertEquals( "ou=system", e.getResolvedName().toString() );
- assertEquals( ResultCodeEnum.NOSUCHOBJECT, e.getResultCode() );
+ assertEquals( ResultCodeEnum.NO_SUCH_OBJECT, e.getResultCode() );
}
}
@@ -533,7 +533,7 @@
catch ( LdapNameNotFoundException e )
{
assertEquals( "ou=system", e.getResolvedName().toString() );
- assertEquals( ResultCodeEnum.NOSUCHOBJECT, e.getResultCode() );
+ assertEquals( ResultCodeEnum.NO_SUCH_OBJECT, e.getResultCode() );
}
}
}
Modified: directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/jndi/ReferralITest.java
URL: http://svn.apache.org/viewvc/directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/jndi/ReferralITest.java?view=diff&rev=477301&r1=477300&r2=477301
==============================================================================
--- directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/jndi/ReferralITest.java (original)
+++ directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/jndi/ReferralITest.java Mon Nov 20 11:30:03 2006
@@ -702,7 +702,7 @@
}
catch ( LdapNamingException e )
{
- assertTrue( e.getResultCode() == ResultCodeEnum.AFFECTSMULTIPLEDSAS );
+ assertTrue( e.getResultCode() == ResultCodeEnum.AFFECTS_MULTIPLE_DSAS );
}
}
@@ -731,7 +731,7 @@
}
catch ( LdapNamingException e )
{
- assertTrue( e.getResultCode() == ResultCodeEnum.AFFECTSMULTIPLEDSAS );
+ assertTrue( e.getResultCode() == ResultCodeEnum.AFFECTS_MULTIPLE_DSAS );
}
}
@@ -760,7 +760,7 @@
}
catch ( LdapNamingException e )
{
- assertTrue( e.getResultCode() == ResultCodeEnum.AFFECTSMULTIPLEDSAS );
+ assertTrue( e.getResultCode() == ResultCodeEnum.AFFECTS_MULTIPLE_DSAS );
}
}
@@ -789,7 +789,7 @@
}
catch ( LdapNamingException e )
{
- assertTrue( e.getResultCode() == ResultCodeEnum.AFFECTSMULTIPLEDSAS );
+ assertTrue( e.getResultCode() == ResultCodeEnum.AFFECTS_MULTIPLE_DSAS );
}
}