You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by ak...@apache.org on 2006/02/20 04:58:21 UTC
svn commit: r379013 [5/45] - in /directory/trunks/apacheds: ./ core-plugin/
core-plugin/src/main/java/org/apache/directory/server/core/tools/schema/
core-plugin/src/test/java/org/apache/directory/server/core/tools/schema/
core-shared/ core-shared/src/m...
Modified: directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/jndi/ReferralTest.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/jndi/ReferralTest.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/jndi/ReferralTest.java (original)
+++ directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/jndi/ReferralTest.java Sun Feb 19 19:57:02 2006
@@ -57,27 +57,27 @@
private static final boolean SUNJNDI = false;
private boolean sunjndi = System.getProperty( "sunjndi" ) != null || SUNJNDI;
TestData td = new TestData();
-
-
+
+
public void setUp() throws Exception
{
- if ( ! sunjndi )
+ if ( !sunjndi )
{
super.setUp();
}
-
+
addReferralEntry();
}
-
-
+
+
public void tearDown() throws Exception
{
if ( td.refCtx != null )
{
td.refCtx.close();
}
-
- if ( ! sunjndi )
+
+ if ( !sunjndi )
{
super.tearDown();
}
@@ -87,7 +87,7 @@
}
}
-
+
/*
* NOTE: We may encounter conflicting circumstances where the ManageDsaIT control
* is included in the request controls yet the Context.REFERRAL is set to
@@ -108,11 +108,11 @@
*/
private LdapContext getSystemRoot() throws NamingException
{
- if ( ! sunjndi )
+ if ( !sunjndi )
{
return sysRoot;
}
-
+
Hashtable env = new Hashtable();
env.put( "java.naming.factory.initial", "com.sun.jndi.ldap.LdapCtxFactory" );
env.put( "java.naming.provider.url", "ldap://hertz.karasulu.homeip.net:10390/ou=system" );
@@ -121,16 +121,16 @@
env.put( "java.naming.security.authentication", "simple" );
return new InitialLdapContext( env, null );
}
-
-
- class TestData {
+
+ class TestData
+ {
LdapContext rootCtx;
Name ctxDn;
LdapContext refCtx;
List refs;
}
-
-
+
+
public void addReferralEntry() throws NamingException
{
String ref0 = "ldap://fermi:10389/ou=users,ou=system";
@@ -141,7 +141,7 @@
// -------------------------------------------------------------------
// Adds a referral entry regardless of referral handling settings
// -------------------------------------------------------------------
-
+
// Add a referral entry ( should be fine with or without the control )
Attributes referral = new BasicAttributes( "objectClass", "top", true );
referral.get( "objectClass" ).add( "referral" );
@@ -153,13 +153,27 @@
// Just in case if server is a remote server destroy remaing referral
td.rootCtx.addToEnvironment( Context.REFERRAL, "ignore" );
- try { td.rootCtx.destroySubcontext( "uid=akarasulu,ou=users" ); } catch( NameNotFoundException e ) { e.printStackTrace(); }
- try { td.rootCtx.destroySubcontext( "ou=users" ); } catch( NameNotFoundException e ) { e.printStackTrace(); }
+ try
+ {
+ td.rootCtx.destroySubcontext( "uid=akarasulu,ou=users" );
+ }
+ catch ( NameNotFoundException e )
+ {
+ e.printStackTrace();
+ }
+ try
+ {
+ td.rootCtx.destroySubcontext( "ou=users" );
+ }
+ catch ( NameNotFoundException e )
+ {
+ e.printStackTrace();
+ }
try
{
td.refCtx = ( LdapContext ) td.rootCtx.createSubcontext( "ou=users", referral );
}
- catch( NameAlreadyBoundException e )
+ catch ( NameAlreadyBoundException e )
{
td.refCtx = ( LdapContext ) td.rootCtx.lookup( "ou=users" );
}
@@ -168,19 +182,18 @@
assertTrue( referral.get( "objectClass" ).contains( "referral" ) );
}
-
+
public void checkAncestorReferrals( ReferralException e ) throws Exception
{
assertEquals( "ldap://fermi:10389", e.getReferralInfo() );
assertTrue( e.skipReferral() );
- assertEquals( "ldap://hertz:10389/cn=alex karasulu,ou=apache,ou=users,dc=example,dc=com",
- e.getReferralInfo() );
+ assertEquals( "ldap://hertz:10389/cn=alex karasulu,ou=apache,ou=users,dc=example,dc=com", e.getReferralInfo() );
assertTrue( e.skipReferral() );
assertEquals( "ldap://maxwell:10389", e.getReferralInfo() );
assertFalse( e.skipReferral() );
}
-
+
public void checkParentReferrals( ReferralException e ) throws Exception
{
assertEquals( "ldap://fermi:10389", e.getReferralInfo() );
@@ -190,8 +203,8 @@
assertEquals( "ldap://maxwell:10389", e.getReferralInfo() );
assertFalse( e.skipReferral() );
}
-
-
+
+
/**
* Checks for correct core behavoir when Context.REFERRAL is set to <b>throw</b>
* for an add operation with the parent context being a referral.
@@ -211,18 +224,18 @@
userEntry.put( "sn", "karasulu" );
userEntry.put( "cn", "alex karasulu" );
- try
+ try
{
td.refCtx.createSubcontext( "cn=alex karasulu", userEntry );
fail( "Should fail here throwing a ReferralException" );
}
- catch( ReferralException e )
+ catch ( ReferralException e )
{
checkParentReferrals( e );
}
}
-
-
+
+
/**
* Checks for correct core behavoir when Context.REFERRAL is set to <b>throw</b>
* for an add operation with an ancestor context being a referral.
@@ -242,18 +255,18 @@
userEntry.put( "sn", "karasulu" );
userEntry.put( "cn", "alex karasulu" );
- try
+ try
{
td.refCtx.createSubcontext( "cn=alex karasulu,ou=apache", userEntry );
fail( "Should fail here throwing a ReferralException" );
}
- catch( ReferralException e )
+ catch ( ReferralException e )
{
checkAncestorReferrals( e );
}
}
-
-
+
+
/**
* Checks for correct core behavoir when Context.REFERRAL is set to <b>throw</b>
* for an delete operation with the parent context being a referral.
@@ -269,18 +282,18 @@
// -------------------------------------------------------------------
td.refCtx.addToEnvironment( Context.REFERRAL, "throw" );
- try
+ try
{
td.refCtx.destroySubcontext( "cn=alex karasulu" );
fail( "Should fail here throwing a ReferralException" );
}
- catch( ReferralException e )
+ catch ( ReferralException e )
{
checkParentReferrals( e );
}
}
-
-
+
+
/**
* Checks for correct core behavoir when Context.REFERRAL is set to <b>throw</b>
* for a delete operation with an ancestor context being a referral.
@@ -296,18 +309,18 @@
// -------------------------------------------------------------------
td.refCtx.addToEnvironment( Context.REFERRAL, "throw" );
- try
+ try
{
td.refCtx.destroySubcontext( "cn=alex karasulu,ou=apache" );
fail( "Should fail here throwing a ReferralException" );
}
- catch( ReferralException e )
+ catch ( ReferralException e )
{
checkAncestorReferrals( e );
}
}
-
-
+
+
/**
* Checks for correct core behavoir when Context.REFERRAL is set to <b>throw</b>
* for an delete operation with the parent context being a referral.
@@ -323,7 +336,7 @@
// -------------------------------------------------------------------
td.refCtx.addToEnvironment( Context.REFERRAL, "throw" );
- try
+ try
{
if ( td.refCtx instanceof ServerLdapContext )
{
@@ -337,13 +350,13 @@
}
fail( "Should fail here throwing a ReferralException" );
}
- catch( ReferralException e )
+ catch ( ReferralException e )
{
checkParentReferrals( e );
}
}
-
-
+
+
/**
* Checks for correct core behavoir when Context.REFERRAL is set to <b>throw</b>
* for a compare operation with an ancestor context being a referral.
@@ -359,7 +372,7 @@
// -------------------------------------------------------------------
td.refCtx.addToEnvironment( Context.REFERRAL, "throw" );
- try
+ try
{
if ( td.refCtx instanceof ServerLdapContext )
{
@@ -373,13 +386,13 @@
}
fail( "Should fail here throwing a ReferralException" );
}
- catch( ReferralException e )
+ catch ( ReferralException e )
{
checkAncestorReferrals( e );
}
}
-
-
+
+
/**
* Checks for correct core behavoir when Context.REFERRAL is set to <b>throw</b>
* for a modify operation with the parent context being a referral.
@@ -395,19 +408,19 @@
// -------------------------------------------------------------------
td.refCtx.addToEnvironment( Context.REFERRAL, "throw" );
- try
+ try
{
- td.refCtx.modifyAttributes( "cn=alex karasulu", DirContext.ADD_ATTRIBUTE,
- new BasicAttributes( "description", "just some text", true ) );
+ td.refCtx.modifyAttributes( "cn=alex karasulu", DirContext.ADD_ATTRIBUTE, new BasicAttributes(
+ "description", "just some text", true ) );
fail( "Should fail here throwing a ReferralException" );
}
- catch( ReferralException e )
+ catch ( ReferralException e )
{
checkParentReferrals( e );
}
}
-
-
+
+
/**
* Checks for correct core behavoir when Context.REFERRAL is set to <b>throw</b>
* for a modify operation with an ancestor context being a referral.
@@ -423,19 +436,19 @@
// -------------------------------------------------------------------
td.refCtx.addToEnvironment( Context.REFERRAL, "throw" );
- try
+ try
{
- td.refCtx.modifyAttributes( "cn=alex karasulu,ou=apache", DirContext.ADD_ATTRIBUTE,
- new BasicAttributes( "description", "just some text", true ) );
+ td.refCtx.modifyAttributes( "cn=alex karasulu,ou=apache", DirContext.ADD_ATTRIBUTE, new BasicAttributes(
+ "description", "just some text", true ) );
fail( "Should fail here throwing a ReferralException" );
}
- catch( ReferralException e )
+ catch ( ReferralException e )
{
checkAncestorReferrals( e );
}
}
-
-
+
+
/**
* Checks for correct core behavoir when Context.REFERRAL is set to <b>throw</b>
* for a modify operation with the parent context being a referral.
@@ -451,20 +464,20 @@
// -------------------------------------------------------------------
td.refCtx.addToEnvironment( Context.REFERRAL, "throw" );
- try
+ try
{
- ModificationItem[] mods = new ModificationItem[] { new ModificationItem(
- DirContext.ADD_ATTRIBUTE, new BasicAttribute( "description", "just some text" ) ) };
+ ModificationItem[] mods = new ModificationItem[]
+ { new ModificationItem( DirContext.ADD_ATTRIBUTE, new BasicAttribute( "description", "just some text" ) ) };
td.refCtx.modifyAttributes( "cn=alex karasulu", mods );
fail( "Should fail here throwing a ReferralException" );
}
- catch( ReferralException e )
+ catch ( ReferralException e )
{
checkParentReferrals( e );
}
}
-
-
+
+
/**
* Checks for correct core behavoir when Context.REFERRAL is set to <b>throw</b>
* for a modify operation with an ancestor context being a referral.
@@ -480,20 +493,20 @@
// -------------------------------------------------------------------
td.refCtx.addToEnvironment( Context.REFERRAL, "throw" );
- try
+ try
{
- ModificationItem[] mods = new ModificationItem[] { new ModificationItem(
- DirContext.ADD_ATTRIBUTE, new BasicAttribute( "description", "just some text" ) ) };
+ ModificationItem[] mods = new ModificationItem[]
+ { new ModificationItem( DirContext.ADD_ATTRIBUTE, new BasicAttribute( "description", "just some text" ) ) };
td.refCtx.modifyAttributes( "cn=alex karasulu,ou=apache", mods );
fail( "Should fail here throwing a ReferralException" );
}
- catch( ReferralException e )
+ catch ( ReferralException e )
{
checkAncestorReferrals( e );
}
}
-
+
/**
* Checks for correct core behavoir when Context.REFERRAL is set to <b>throw</b>
* for a modify rdn interceptor operation (corresponds to a subset of the modify
@@ -510,18 +523,18 @@
// -------------------------------------------------------------------
td.refCtx.addToEnvironment( Context.REFERRAL, "throw" );
- try
+ try
{
td.refCtx.rename( "cn=alex karasulu", "cn=aok" );
fail( "Should fail here throwing a ReferralException" );
}
- catch( ReferralException e )
+ catch ( ReferralException e )
{
checkParentReferrals( e );
}
}
-
-
+
+
/**
* Checks for correct core behavoir when Context.REFERRAL is set to <b>throw</b>
* for a modify rdn interceptor operation (corresponds to a subset of the modify
@@ -538,18 +551,18 @@
// -------------------------------------------------------------------
td.refCtx.addToEnvironment( Context.REFERRAL, "throw" );
- try
+ try
{
td.refCtx.rename( "cn=alex karasulu,ou=apache", "cn=aok,ou=apache" );
fail( "Should fail here throwing a ReferralException" );
}
- catch( ReferralException e )
+ catch ( ReferralException e )
{
checkAncestorReferrals( e );
}
}
-
+
/**
* Checks for correct core behavoir when Context.REFERRAL is set to <b>throw</b>
* for a move interceptor operation (corresponds to a subset of the modify
@@ -566,18 +579,18 @@
// -------------------------------------------------------------------
td.refCtx.addToEnvironment( Context.REFERRAL, "throw" );
- try
+ try
{
td.refCtx.rename( "cn=alex karasulu", "cn=alex karasulu,ou=groups" );
fail( "Should fail here throwing a ReferralException" );
}
- catch( ReferralException e )
+ catch ( ReferralException e )
{
checkParentReferrals( e );
}
}
-
-
+
+
/**
* Checks for correct core behavoir when Context.REFERRAL is set to <b>throw</b>
* for a move interceptor operation (corresponds to a subset of the modify
@@ -594,18 +607,18 @@
// -------------------------------------------------------------------
td.refCtx.addToEnvironment( Context.REFERRAL, "throw" );
- try
+ try
{
td.refCtx.rename( "cn=alex karasulu,ou=apache", "cn=alex karasulu,ou=groups" );
fail( "Should fail here throwing a ReferralException" );
}
- catch( ReferralException e )
+ catch ( ReferralException e )
{
checkAncestorReferrals( e );
}
}
-
+
/**
* Checks for correct core behavoir when Context.REFERRAL is set to <b>throw</b>
* for a move interceptor operation (corresponds to a subset of the modify
@@ -622,18 +635,18 @@
// -------------------------------------------------------------------
td.refCtx.addToEnvironment( Context.REFERRAL, "throw" );
- try
+ try
{
td.refCtx.rename( "cn=alex karasulu", "cn=aok,ou=groups" );
fail( "Should fail here throwing a ReferralException" );
}
- catch( ReferralException e )
+ catch ( ReferralException e )
{
checkParentReferrals( e );
}
}
-
-
+
+
/**
* Checks for correct core behavoir when Context.REFERRAL is set to <b>throw</b>
* for a move interceptor operation (corresponds to a subset of the modify
@@ -650,18 +663,18 @@
// -------------------------------------------------------------------
td.refCtx.addToEnvironment( Context.REFERRAL, "throw" );
- try
+ try
{
td.refCtx.rename( "cn=alex karasulu,ou=apache", "cn=aok,ou=groups" );
fail( "Should fail here throwing a ReferralException" );
}
- catch( ReferralException e )
+ catch ( ReferralException e )
{
checkAncestorReferrals( e );
}
}
-
+
/**
* Checks for correct core behavoir when Context.REFERRAL is set to <b>throw</b>
* for a move interceptor operation (corresponds to a subset of the modify
@@ -679,18 +692,18 @@
createLocalUser();
td.rootCtx.addToEnvironment( Context.REFERRAL, "throw" );
- try
+ try
{
td.rootCtx.rename( "cn=akarasulu", "cn=akarasulu,ou=users" );
fail( "Should fail here throwing a LdapNamingException with ResultCodeEnum = AFFECTSMULTIPLEDSAS" );
}
- catch( LdapNamingException e )
+ catch ( LdapNamingException e )
{
assertTrue( e.getResultCode() == ResultCodeEnum.AFFECTSMULTIPLEDSAS );
}
}
-
-
+
+
/**
* Checks for correct core behavoir when Context.REFERRAL is set to <b>throw</b>
* for a move interceptor operation (corresponds to a subset of the modify
@@ -708,18 +721,18 @@
createDeepLocalUser();
td.rootCtx.addToEnvironment( Context.REFERRAL, "throw" );
- try
+ try
{
td.rootCtx.rename( "cn=akarasulu,ou=deep", "cn=akarasulu,ou=users" );
fail( "Should fail here throwing a LdapNamingException with ResultCodeEnum = AFFECTSMULTIPLEDSAS" );
}
- catch( LdapNamingException e )
+ catch ( LdapNamingException e )
{
assertTrue( e.getResultCode() == ResultCodeEnum.AFFECTSMULTIPLEDSAS );
}
}
-
+
/**
* Checks for correct core behavoir when Context.REFERRAL is set to <b>throw</b>
* for a move interceptor operation (corresponds to a subset of the modify
@@ -737,18 +750,18 @@
createLocalUser();
td.rootCtx.addToEnvironment( Context.REFERRAL, "throw" );
- try
+ try
{
td.rootCtx.rename( "cn=akarasulu", "cn=aok,ou=users" );
fail( "Should fail here throwing a LdapNamingException with ResultCodeEnum = AFFECTSMULTIPLEDSAS" );
}
- catch( LdapNamingException e )
+ catch ( LdapNamingException e )
{
assertTrue( e.getResultCode() == ResultCodeEnum.AFFECTSMULTIPLEDSAS );
}
}
-
-
+
+
/**
* Checks for correct core behavoir when Context.REFERRAL is set to <b>throw</b>
* for a move interceptor operation (corresponds to a subset of the modify
@@ -766,18 +779,18 @@
createDeepLocalUser();
td.rootCtx.addToEnvironment( Context.REFERRAL, "throw" );
- try
+ try
{
td.rootCtx.rename( "cn=akarasulu,ou=deep", "cn=aok,ou=users" );
fail( "Should fail here throwing a LdapNamingException with ResultCodeEnum = AFFECTSMULTIPLEDSAS" );
}
- catch( LdapNamingException e )
+ catch ( LdapNamingException e )
{
assertTrue( e.getResultCode() == ResultCodeEnum.AFFECTSMULTIPLEDSAS );
}
}
-
-
+
+
public void createLocalUser() throws Exception
{
LdapContext userCtx = null;
@@ -786,12 +799,18 @@
referral.put( "cn", "akarasulu" );
referral.put( "sn", "karasulu" );
- try { td.rootCtx.destroySubcontext( "uid=akarasulu" ); } catch( NameNotFoundException e ) {}
+ try
+ {
+ td.rootCtx.destroySubcontext( "uid=akarasulu" );
+ }
+ catch ( NameNotFoundException e )
+ {
+ }
try
{
userCtx = ( LdapContext ) td.rootCtx.createSubcontext( "cn=akarasulu", referral );
}
- catch( NameAlreadyBoundException e )
+ catch ( NameAlreadyBoundException e )
{
td.refCtx = ( LdapContext ) td.rootCtx.lookup( "cn=akarasulu" );
}
@@ -799,8 +818,8 @@
assertTrue( referral.get( "cn" ).contains( "akarasulu" ) );
assertTrue( referral.get( "sn" ).contains( "karasulu" ) );
}
-
-
+
+
public void createDeepLocalUser() throws Exception
{
LdapContext userCtx = null;
@@ -809,14 +828,26 @@
referral.put( "cn", "akarasulu" );
referral.put( "sn", "karasulu" );
- try { td.rootCtx.destroySubcontext( "uid=akarasulu,ou=deep" ); } catch( NameNotFoundException e ) {}
- try { td.rootCtx.destroySubcontext( "ou=deep" ); } catch( NameNotFoundException e ) {}
+ try
+ {
+ td.rootCtx.destroySubcontext( "uid=akarasulu,ou=deep" );
+ }
+ catch ( NameNotFoundException e )
+ {
+ }
+ try
+ {
+ td.rootCtx.destroySubcontext( "ou=deep" );
+ }
+ catch ( NameNotFoundException e )
+ {
+ }
try
{
td.rootCtx.createSubcontext( "ou=deep" );
userCtx = ( LdapContext ) td.rootCtx.createSubcontext( "cn=akarasulu,ou=deep", referral );
}
- catch( NameAlreadyBoundException e )
+ catch ( NameAlreadyBoundException e )
{
td.refCtx = ( LdapContext ) td.rootCtx.lookup( "cn=akarasulu,ou=deep" );
}
@@ -824,8 +855,8 @@
assertTrue( referral.get( "cn" ).contains( "akarasulu" ) );
assertTrue( referral.get( "sn" ).contains( "karasulu" ) );
}
-
-
+
+
public void testSearchBaseIsReferral() throws Exception
{
SearchControls controls = new SearchControls();
@@ -836,7 +867,7 @@
td.rootCtx.search( "ou=users", "(objectClass=*)", controls );
fail( "should never get here" );
}
- catch( ReferralException e )
+ catch ( ReferralException e )
{
assertEquals( "ldap://fermi:10389/ou=users,ou=system??sub", e.getReferralInfo() );
assertTrue( e.skipReferral() );
@@ -847,7 +878,7 @@
}
}
-
+
public void testSearchBaseParentIsReferral() throws Exception
{
SearchControls controls = new SearchControls();
@@ -857,7 +888,7 @@
{
td.refCtx.search( "cn=alex karasulu", "(objectClass=*)", controls );
}
- catch( ReferralException e )
+ catch ( ReferralException e )
{
assertEquals( "ldap://fermi:10389/cn=alex karasulu,ou=users,ou=system??base", e.getReferralInfo() );
assertTrue( e.skipReferral() );
@@ -868,7 +899,7 @@
}
}
-
+
public void testSearchBaseAncestorIsReferral() throws Exception
{
SearchControls controls = new SearchControls();
@@ -878,18 +909,20 @@
{
td.refCtx.search( "cn=alex karasulu,ou=apache", "(objectClass=*)", controls );
}
- catch( ReferralException e )
+ catch ( ReferralException e )
{
assertEquals( "ldap://fermi:10389/cn=alex karasulu,ou=apache,ou=users,ou=system??base", e.getReferralInfo() );
assertTrue( e.skipReferral() );
- assertEquals( "ldap://hertz:10389/cn=alex karasulu,ou=apache,ou=users,dc=example,dc=com??base", e.getReferralInfo() );
+ assertEquals( "ldap://hertz:10389/cn=alex karasulu,ou=apache,ou=users,dc=example,dc=com??base", e
+ .getReferralInfo() );
assertTrue( e.skipReferral() );
- assertEquals( "ldap://maxwell:10389/cn=alex karasulu,ou=apache,ou=users,ou=system??base", e.getReferralInfo() );
+ assertEquals( "ldap://maxwell:10389/cn=alex karasulu,ou=apache,ou=users,ou=system??base", e
+ .getReferralInfo() );
assertFalse( e.skipReferral() );
}
}
-
+
public void testSearchContinuations() throws Exception
{
SearchControls controls = new SearchControls();
@@ -898,29 +931,29 @@
Map results = new HashMap();
while ( list.hasMore() )
{
- SearchResult result = ( SearchResult) list.next();
- results.put ( result.getName(), result );
+ SearchResult result = ( SearchResult ) list.next();
+ results.put( result.getName(), result );
}
-
+
assertNotNull( results.get( "ou=users,ou=system" ) );
-
+
// -------------------------------------------------------------------
// Now we will throw exceptions when searching for referrals
// -------------------------------------------------------------------
-
+
td.rootCtx.addToEnvironment( Context.REFERRAL, "throw" );
list = td.rootCtx.search( "", "(objectClass=*)", controls );
results = new HashMap();
-
+
try
{
while ( list.hasMore() )
{
SearchResult result = ( SearchResult ) list.next();
- results.put ( result.getName(), result );
+ results.put( result.getName(), result );
}
}
- catch( ReferralException e )
+ catch ( ReferralException e )
{
assertEquals( "ldap://fermi:10389/ou=users,ou=system??sub", e.getReferralInfo() );
assertTrue( e.skipReferral() );
@@ -929,24 +962,24 @@
assertEquals( "ldap://maxwell:10389/ou=users,ou=system??sub", e.getReferralInfo() );
assertFalse( e.skipReferral() );
}
-
+
assertNull( results.get( "ou=users" ) );
// try again but this time with single level scope
-
+
controls.setSearchScope( SearchControls.ONELEVEL_SCOPE );
list = td.rootCtx.search( "", "(objectClass=*)", controls );
results = new HashMap();
-
+
try
{
while ( list.hasMore() )
{
SearchResult result = ( SearchResult ) list.next();
- results.put ( result.getName(), result );
+ results.put( result.getName(), result );
}
}
- catch( ReferralException e )
+ catch ( ReferralException e )
{
assertEquals( "ldap://fermi:10389/ou=users,ou=system??base", e.getReferralInfo() );
assertTrue( e.skipReferral() );
@@ -955,7 +988,7 @@
assertEquals( "ldap://maxwell:10389/ou=users,ou=system??base", e.getReferralInfo() );
assertFalse( e.skipReferral() );
}
-
+
assertNull( results.get( "ou=users" ) );
}
}
Propchange: directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/jndi/ReferralTest.java
------------------------------------------------------------------------------
--- svn:keywords (added)
+++ svn:keywords Sun Feb 19 19:57:02 2006
@@ -0,0 +1,4 @@
+Rev
+Revision
+Date
+Id
Modified: directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/jndi/SearchContextTest.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/jndi/SearchContextTest.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/jndi/SearchContextTest.java (original)
+++ directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/jndi/SearchContextTest.java Sun Feb 19 19:57:02 2006
@@ -62,7 +62,7 @@
DirContext ctx = sysRoot.createSubcontext( "ou=testing00", attributes );
assertNotNull( ctx );
-
+
ctx = ( DirContext ) sysRoot.lookup( "ou=testing00" );
assertNotNull( ctx );
attributes = ctx.getAttributes( "" );
@@ -194,7 +194,7 @@
assertTrue( map.containsKey( "ou=subtest,ou=testing01,ou=system" ) );
}
-
+
public void testSearchSubstringSubTreeLevel() throws NamingException
{
SearchControls controls = new SearchControls();
@@ -219,7 +219,7 @@
assertTrue( map.containsKey( "ou=subtest,ou=testing01,ou=system" ) );
}
-
+
public void testSearchFilterArgs() throws NamingException
{
SearchControls controls = new SearchControls();
@@ -228,7 +228,8 @@
sysRoot.addToEnvironment( DerefAliasesEnum.JNDI_PROP, DerefAliasesEnum.NEVERDEREFALIASES.getName() );
HashMap map = new HashMap();
- NamingEnumeration list = sysRoot.search( "", "(| (ou={0}) (ou={1}))", new Object[] {"testing00", "testing01"}, controls );
+ NamingEnumeration list = sysRoot.search( "", "(| (ou={0}) (ou={1}))", new Object[]
+ { "testing00", "testing01" }, controls );
while ( list.hasMore() )
{
SearchResult result = ( SearchResult ) list.next();
@@ -239,8 +240,8 @@
assertTrue( map.containsKey( "ou=testing00,ou=system" ) );
assertTrue( map.containsKey( "ou=testing01,ou=system" ) );
}
-
-
+
+
public void testSearchSizeLimit() throws NamingException
{
SearchControls controls = new SearchControls();
@@ -251,7 +252,7 @@
HashMap map = new HashMap();
NamingEnumeration list = sysRoot.search( "", "(ou=*)", controls );
-
+
try
{
while ( list.hasMore() )
@@ -261,7 +262,9 @@
}
fail( "Should not get here due to a SizeLimitExceededException" );
}
- catch( LdapSizeLimitExceededException e ){}
+ catch ( LdapSizeLimitExceededException e )
+ {
+ }
assertEquals( "Expected number of results returned was incorrect", 7, map.size() );
}
@@ -277,8 +280,10 @@
HashMap map = new HashMap();
NamingEnumeration list = sysRoot.search( "", "(ou=*)", controls );
SearchResultFilteringEnumeration srfe = ( SearchResultFilteringEnumeration ) list;
- srfe.addResultFilter( new SearchResultFilter() {
- public boolean accept(Invocation invocation, SearchResult result, SearchControls controls) throws NamingException
+ srfe.addResultFilter( new SearchResultFilter()
+ {
+ public boolean accept( Invocation invocation, SearchResult result, SearchControls controls )
+ throws NamingException
{
try
{
@@ -290,8 +295,8 @@
}
return true;
}
- });
-
+ } );
+
try
{
while ( list.hasMore() )
@@ -301,7 +306,9 @@
}
fail( "Should not get here due to a TimeLimitExceededException" );
}
- catch( LdapTimeLimitExceededException e ){}
+ catch ( LdapTimeLimitExceededException e )
+ {
+ }
assertEquals( "Expected number of results returned was incorrect", 1, map.size() );
}
}
Propchange: directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/jndi/SearchContextTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/jndi/SearchContextTest.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Sun Feb 19 19:57:02 2006
@@ -1 +1,4 @@
-HeadURL Id LastChangedBy LastChangedDate LastChangedRevision
+Rev
+Revision
+Date
+Id
Modified: directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/jndi/ShutdownTest.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/jndi/ShutdownTest.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/jndi/ShutdownTest.java (original)
+++ directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/jndi/ShutdownTest.java Sun Feb 19 19:57:02 2006
@@ -61,7 +61,7 @@
// restart the system now
setSysRoot( "uid=admin,ou=system", "secret", configuration );
-
+
// Shutdown again (tearDown is overriden)
setSysRoot( "uid=admin,ou=system", "secret", new ShutdownConfiguration() );
}
Propchange: directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/jndi/ShutdownTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/jndi/ShutdownTest.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Sun Feb 19 19:57:02 2006
@@ -1 +1,4 @@
-HeadURL Id LastChangedBy LastChangedDate LastChangedRevision
+Rev
+Revision
+Date
+Id
Modified: directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/jndi/SyncTest.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/jndi/SyncTest.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/jndi/SyncTest.java (original)
+++ directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/jndi/SyncTest.java Sun Feb 19 19:57:02 2006
@@ -53,7 +53,7 @@
public void testPostSyncLookup() throws Exception
{
sysRoot = setSysRoot( "uid=admin,ou=system", "secret", new SyncConfiguration() );
-
+
Attributes users = sysRoot.getAttributes( "ou=users" );
// assert making sure the entry is ok
Propchange: directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/jndi/SyncTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/jndi/SyncTest.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Sun Feb 19 19:57:02 2006
@@ -1 +1,4 @@
-HeadURL Id LastChangedBy LastChangedDate LastChangedRevision
+Rev
+Revision
+Date
+Id
Modified: directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/normalization/NormalizationServiceTest.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/normalization/NormalizationServiceTest.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/normalization/NormalizationServiceTest.java (original)
+++ directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/normalization/NormalizationServiceTest.java Sun Feb 19 19:57:02 2006
@@ -36,8 +36,8 @@
{
super.setLoadClass( getClass() );
}
-
-
+
+
public void testDireve308Example() throws NamingException
{
Attributes attrs = sysRoot.getAttributes( "ou=corporate category\\, operations,ou=direct report view" );
Propchange: directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/normalization/NormalizationServiceTest.java
------------------------------------------------------------------------------
--- svn:keywords (added)
+++ svn:keywords Sun Feb 19 19:57:02 2006
@@ -0,0 +1,4 @@
+Rev
+Revision
+Date
+Id
Modified: directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/operational/BinaryAttributeFilterTest.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/operational/BinaryAttributeFilterTest.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/operational/BinaryAttributeFilterTest.java (original)
+++ directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/operational/BinaryAttributeFilterTest.java Sun Feb 19 19:57:02 2006
@@ -50,37 +50,38 @@
sysRoot.createSubcontext( "ou=test", attributes );
// test without turning on the property
- DirContext ctx = ( DirContext ) sysRoot.lookup( "ou=test" ) ;
+ DirContext ctx = ( DirContext ) sysRoot.lookup( "ou=test" );
Attribute ou = ctx.getAttributes( "" ).get( "ou" );
Object value = ou.get();
assertTrue( value instanceof String );
// test with the property now making ou into a binary value
sysRoot.addToEnvironment( BINARY_KEY, "ou" );
- ctx = ( DirContext ) sysRoot.lookup( "ou=test" ) ;
+ ctx = ( DirContext ) sysRoot.lookup( "ou=test" );
ou = ctx.getAttributes( "" ).get( "ou" );
value = ou.get();
assertEquals( "test", value );
// try krb5Key which should be binary automatically - use ou as control
- byte[] keyValue = new byte[] { 0x45, 0x23, 0x7d, 0x7f };
+ byte[] keyValue = new byte[]
+ { 0x45, 0x23, 0x7d, 0x7f };
attributes.put( "jpegPhoto", keyValue );
sysRoot.createSubcontext( "ou=anothertest", attributes );
- ctx = ( DirContext ) sysRoot.lookup( "ou=anothertest" ) ;
+ ctx = ( DirContext ) sysRoot.lookup( "ou=anothertest" );
ou = ctx.getAttributes( "" ).get( "ou" );
value = ou.get();
assertEquals( "anothertest", value );
Attribute jpegPhoto = ctx.getAttributes( "" ).get( "jpegPhoto" );
value = jpegPhoto.get();
assertTrue( value instanceof byte[] );
- assertEquals( "0x45 0x23 0x7D 0x7F ", StringTools.dumpBytes( (byte[])value ) );
+ assertEquals( "0x45 0x23 0x7D 0x7F ", StringTools.dumpBytes( ( byte[] ) value ) );
// try jpegPhoto which should be binary automatically but use String to
// create so we should still get back a byte[] - use ou as control
attributes.remove( "jpegPhoto" );
attributes.put( "jpegPhoto", "testing a string" );
sysRoot.createSubcontext( "ou=yetanothertest", attributes );
- ctx = ( DirContext ) sysRoot.lookup( "ou=yetanothertest" ) ;
+ ctx = ( DirContext ) sysRoot.lookup( "ou=yetanothertest" );
ou = ctx.getAttributes( "" ).get( "ou" );
value = ou.get();
assertEquals( "yetanothertest", value );
Propchange: directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/operational/BinaryAttributeFilterTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/operational/BinaryAttributeFilterTest.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Sun Feb 19 19:57:02 2006
@@ -1 +1,4 @@
-HeadURL Id LastChangedBy LastChangedDate LastChangedRevision
+Rev
+Revision
+Date
+Id
Modified: directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/operational/OperationalAttributeServiceTest.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/operational/OperationalAttributeServiceTest.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/operational/OperationalAttributeServiceTest.java (original)
+++ directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/operational/OperationalAttributeServiceTest.java Sun Feb 19 19:57:02 2006
@@ -75,8 +75,7 @@
ctls.setReturningAttributes( new String[]
{ "ou", "createTimestamp", "creatorsName" } );
- sysRoot.addToEnvironment( DerefAliasesEnum.JNDI_PROP,
- DerefAliasesEnum.NEVERDEREFALIASES_NAME );
+ sysRoot.addToEnvironment( DerefAliasesEnum.JNDI_PROP, DerefAliasesEnum.NEVERDEREFALIASES_NAME );
NamingEnumeration list;
list = sysRoot.search( "", "(ou=testing00)", ctls );
SearchResult result = ( SearchResult ) list.next();
@@ -113,7 +112,8 @@
assertNull( attributes.get( "createTimestamp" ) );
// now we ask for all the op attributes and check to get them
- String[] ids = new String[] { "creatorsName", "createTimestamp" };
+ String[] ids = new String[]
+ { "creatorsName", "createTimestamp" };
controls.setReturningAttributes( ids );
list = sysRoot.search( "", "(objectClass=*)", controls );
result = ( SearchResult ) list.next();
@@ -136,8 +136,9 @@
*/
public void testConfirmNonAdminUserDnIsCreatorsName() throws NamingException
{
- Attributes attributes = sysRoot.getAttributes( "uid=akarasulu,ou=users", new String[] { "creatorsName" } );
-
+ Attributes attributes = sysRoot.getAttributes( "uid=akarasulu,ou=users", new String[]
+ { "creatorsName" } );
+
assertFalse( "uid=akarasulu,ou=users,ou=system".equals( attributes.get( "creatorsName" ).get() ) );
}
}
Propchange: directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/operational/OperationalAttributeServiceTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/operational/OperationalAttributeServiceTest.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Sun Feb 19 19:57:02 2006
@@ -1 +1,4 @@
-HeadURL Id LastChangedBy LastChangedDate LastChangedRevision
+Rev
+Revision
+Date
+Id
Propchange: directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/prefs/ServerPreferencesFactoryTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/prefs/ServerPreferencesFactoryTest.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Sun Feb 19 19:57:02 2006
@@ -1 +1,4 @@
-HeadURL Id LastChangedBy LastChangedDate LastChangedRevision
+Rev
+Revision
+Date
+Id
Modified: directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/prefs/ServerSystemPreferencesTest.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/prefs/ServerSystemPreferencesTest.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/prefs/ServerSystemPreferencesTest.java (original)
+++ directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/prefs/ServerSystemPreferencesTest.java Sun Feb 19 19:57:02 2006
@@ -33,13 +33,15 @@
public class ServerSystemPreferencesTest extends AbstractAdminTestCase
{
private ServerSystemPreferences prefs;
-
+
+
public void setUp() throws Exception
{
super.setUp();
prefs = new ServerSystemPreferences();
}
-
+
+
/**
* Tests to make sure the system preferences root has entry (test, abc123).
*/
@@ -48,6 +50,7 @@
assertEquals( "sysPrefRoot", prefs.get( "prefNodeName", "not the value" ) );
}
+
/**
* Tests the creation and use of a new preferences node.
*
@@ -86,7 +89,7 @@
assertEquals( true, testNode.getBoolean( "boolKey", false ) );
assertTrue( 3.14 == testNode.getDouble( "doubleKey", 9.20 ) );
- assertTrue( (float) 3.14 == testNode.getFloat( "floatKey", (float) 3.90 ) );
+ assertTrue( ( float ) 3.14 == testNode.getFloat( "floatKey", ( float ) 3.90 ) );
assertEquals( 345, testNode.getInt( "intKey", 87 ) );
assertEquals( 75449559185447L, testNode.getLong( "longKey", 75449547L ) );
}
@@ -116,7 +119,7 @@
assertEquals( true, testNode.getBoolean( "boolKey", false ) );
assertTrue( 3.14 == testNode.getDouble( "doubleKey", 9.20 ) );
- assertTrue( (float) 3.14 == testNode.getFloat( "floatKey", (float) 3.90 ) );
+ assertTrue( ( float ) 3.14 == testNode.getFloat( "floatKey", ( float ) 3.90 ) );
assertEquals( 345, testNode.getInt( "intKey", 87 ) );
assertEquals( 75449559185447L, testNode.getLong( "longKey", 75449547L ) );
Propchange: directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/prefs/ServerSystemPreferencesTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/prefs/ServerSystemPreferencesTest.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Sun Feb 19 19:57:02 2006
@@ -1 +1,4 @@
-HeadURL Id LastChangedBy LastChangedDate LastChangedRevision
+Rev
+Revision
+Date
+Id
Modified: directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/schema/SchemaServiceTest.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/schema/SchemaServiceTest.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/schema/SchemaServiceTest.java (original)
+++ directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/schema/SchemaServiceTest.java Sun Feb 19 19:57:02 2006
@@ -44,8 +44,8 @@
super.setLdifPath( "./nonspecific.ldif", getClass() );
super.setUp();
}
-
-
+
+
public void testFillInObjectClasses() throws NamingException
{
Attribute ocs = sysRoot.getAttributes( "cn=person0" ).get( "objectClass" );
@@ -82,17 +82,17 @@
// admin is extra
assertEquals( 4, persons.size() );
-
+
Attributes person = null;
Attribute ocs = null;
-
+
person = ( Attributes ) persons.get( "cn=person0,ou=system" );
assertNotNull( person );
ocs = person.get( "objectClass" );
assertEquals( 2, ocs.size() );
assertTrue( ocs.contains( "top" ) );
assertTrue( ocs.contains( "person" ) );
-
+
person = ( Attributes ) persons.get( "cn=person1,ou=system" );
assertNotNull( person );
ocs = person.get( "objectClass" );
@@ -100,7 +100,7 @@
assertTrue( ocs.contains( "top" ) );
assertTrue( ocs.contains( "person" ) );
assertTrue( ocs.contains( "organizationalPerson" ) );
-
+
person = ( Attributes ) persons.get( "cn=person2,ou=system" );
assertNotNull( person );
ocs = person.get( "objectClass" );
@@ -123,13 +123,13 @@
SearchResult result = ( SearchResult ) results.next();
orgPersons.put( result.getName(), result.getAttributes() );
}
-
+
// admin is extra
assertEquals( 3, orgPersons.size() );
-
+
Attributes orgPerson = null;
Attribute ocs = null;
-
+
orgPerson = ( Attributes ) orgPersons.get( "cn=person1,ou=system" );
assertNotNull( orgPerson );
ocs = orgPerson.get( "objectClass" );
@@ -137,7 +137,7 @@
assertTrue( ocs.contains( "top" ) );
assertTrue( ocs.contains( "person" ) );
assertTrue( ocs.contains( "organizationalPerson" ) );
-
+
orgPerson = ( Attributes ) orgPersons.get( "cn=person2,ou=system" );
assertNotNull( orgPerson );
ocs = orgPerson.get( "objectClass" );
@@ -160,13 +160,13 @@
SearchResult result = ( SearchResult ) results.next();
inetOrgPersons.put( result.getName(), result.getAttributes() );
}
-
+
// admin is extra
assertEquals( 2, inetOrgPersons.size() );
-
+
Attributes inetOrgPerson = null;
Attribute ocs = null;
-
+
inetOrgPerson = ( Attributes ) inetOrgPersons.get( "cn=person2,ou=system" );
assertNotNull( inetOrgPerson );
ocs = inetOrgPerson.get( "objectClass" );
Propchange: directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/schema/SchemaServiceTest.java
------------------------------------------------------------------------------
--- svn:keywords (added)
+++ svn:keywords Sun Feb 19 19:57:02 2006
@@ -0,0 +1,4 @@
+Rev
+Revision
+Date
+Id
Modified: directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/subtree/SubentryServiceTest.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/subtree/SubentryServiceTest.java?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/subtree/SubentryServiceTest.java (original)
+++ directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/subtree/SubentryServiceTest.java Sun Feb 19 19:57:02 2006
@@ -86,7 +86,8 @@
Attribute attribute = new LockableAttributeImpl( "administrativeRole" );
attribute.add( role );
ModificationItem item = new ModificationItem( DirContext.ADD_ATTRIBUTE, attribute );
- super.sysRoot.modifyAttributes( "", new ModificationItem[] { item } );
+ super.sysRoot.modifyAttributes( "", new ModificationItem[]
+ { item } );
}
@@ -95,7 +96,8 @@
Map resultMap = new HashMap();
SearchControls controls = new SearchControls();
controls.setSearchScope( SearchControls.SUBTREE_SCOPE );
- controls.setReturningAttributes( new String[] { "+", "*" } );
+ controls.setReturningAttributes( new String[]
+ { "+", "*" } );
NamingEnumeration results = super.sysRoot.search( "", "(objectClass=*)", controls );
while ( results.hasMore() )
{
@@ -129,8 +131,8 @@
// --------------------------------------------------------------------
Attributes unmarked = ( Attributes ) results.get( "cn=unmarked,ou=system" );
- assertNull( "cn=unmarked,ou=system should not be marked",
- unmarked.get( SubentryService.AUTONOUMOUS_AREA_SUBENTRY ) );
+ assertNull( "cn=unmarked,ou=system should not be marked", unmarked
+ .get( SubentryService.AUTONOUMOUS_AREA_SUBENTRY ) );
}
@@ -141,7 +143,9 @@
super.sysRoot.createSubcontext( "cn=testsubentry", getTestSubentry() );
fail( "should never get here: cannot create subentry under regular entries" );
}
- catch ( LdapNoSuchAttributeException e ) {}
+ catch ( LdapNoSuchAttributeException e )
+ {
+ }
addAdministrativeRole( "autonomousArea" );
super.sysRoot.createSubcontext( "cn=testsubentry", getTestSubentry() );
@@ -180,24 +184,20 @@
// --------------------------------------------------------------------
Attributes system = ( Attributes ) results.get( "ou=system" );
- assertNull( "ou=system should not be marked",
- system.get( SubentryService.AUTONOUMOUS_AREA_SUBENTRY ) );
+ assertNull( "ou=system should not be marked", system.get( SubentryService.AUTONOUMOUS_AREA_SUBENTRY ) );
Attributes users = ( Attributes ) results.get( "ou=users,ou=system" );
- assertNull( "ou=users,ou=system should not be marked",
- users.get( SubentryService.AUTONOUMOUS_AREA_SUBENTRY ) );
+ assertNull( "ou=users,ou=system should not be marked", users.get( SubentryService.AUTONOUMOUS_AREA_SUBENTRY ) );
Attributes groups = ( Attributes ) results.get( "ou=groups,ou=system" );
- assertNull( "ou=groups,ou=system should not be marked",
- groups.get( SubentryService.AUTONOUMOUS_AREA_SUBENTRY ) );
+ assertNull( "ou=groups,ou=system should not be marked", groups.get( SubentryService.AUTONOUMOUS_AREA_SUBENTRY ) );
Attributes admin = ( Attributes ) results.get( "uid=admin,ou=system" );
- assertNull( "uid=admin,ou=system should not be marked",
- admin.get( SubentryService.AUTONOUMOUS_AREA_SUBENTRY ) );
+ assertNull( "uid=admin,ou=system should not be marked", admin.get( SubentryService.AUTONOUMOUS_AREA_SUBENTRY ) );
Attributes sysPrefRoot = ( Attributes ) results.get( "prefNodeName=sysPrefRoot,ou=system" );
- assertNull( "prefNode=sysPrefRoot,ou=system should not be marked",
- sysPrefRoot.get( SubentryService.AUTONOUMOUS_AREA_SUBENTRY ) );
+ assertNull( "prefNode=sysPrefRoot,ou=system should not be marked", sysPrefRoot
+ .get( SubentryService.AUTONOUMOUS_AREA_SUBENTRY ) );
}
@@ -241,24 +241,20 @@
// --------------------------------------------------------------------
Attributes system = ( Attributes ) results.get( "ou=system" );
- assertNull( "ou=system should not be marked",
- system.get( SubentryService.AUTONOUMOUS_AREA_SUBENTRY ) );
+ assertNull( "ou=system should not be marked", system.get( SubentryService.AUTONOUMOUS_AREA_SUBENTRY ) );
Attributes users = ( Attributes ) results.get( "ou=users,ou=system" );
- assertNull( "ou=users,ou=system should not be marked",
- users.get( SubentryService.AUTONOUMOUS_AREA_SUBENTRY ) );
+ assertNull( "ou=users,ou=system should not be marked", users.get( SubentryService.AUTONOUMOUS_AREA_SUBENTRY ) );
Attributes groups = ( Attributes ) results.get( "ou=groups,ou=system" );
- assertNull( "ou=groups,ou=system should not be marked",
- groups.get( SubentryService.AUTONOUMOUS_AREA_SUBENTRY ) );
+ assertNull( "ou=groups,ou=system should not be marked", groups.get( SubentryService.AUTONOUMOUS_AREA_SUBENTRY ) );
Attributes admin = ( Attributes ) results.get( "uid=admin,ou=system" );
- assertNull( "uid=admin,ou=system should not be marked",
- admin.get( SubentryService.AUTONOUMOUS_AREA_SUBENTRY ) );
+ assertNull( "uid=admin,ou=system should not be marked", admin.get( SubentryService.AUTONOUMOUS_AREA_SUBENTRY ) );
Attributes sysPrefRoot = ( Attributes ) results.get( "prefNodeName=sysPrefRoot,ou=system" );
- assertNull( "prefNode=sysPrefRoot,ou=system should not be marked",
- sysPrefRoot.get( SubentryService.AUTONOUMOUS_AREA_SUBENTRY ) );
+ assertNull( "prefNode=sysPrefRoot,ou=system should not be marked", sysPrefRoot
+ .get( SubentryService.AUTONOUMOUS_AREA_SUBENTRY ) );
// --------------------------------------------------------------------
// Now modify the subentry by introducing an exclusion
@@ -267,7 +263,8 @@
Attribute subtreeSpecification = new LockableAttributeImpl( "subtreeSpecification" );
subtreeSpecification.add( "{ base \"ou=configuration\", specificExclusions { chopBefore:\"ou=services\" } }" );
ModificationItem item = new ModificationItem( DirContext.REPLACE_ATTRIBUTE, subtreeSpecification );
- super.sysRoot.modifyAttributes( "cn=testsubentry", new ModificationItem[] { item } );
+ super.sysRoot.modifyAttributes( "cn=testsubentry", new ModificationItem[]
+ { item } );
results = getAllEntries();
// --------------------------------------------------------------------
@@ -297,31 +294,26 @@
// --------------------------------------------------------------------
system = ( Attributes ) results.get( "ou=system" );
- assertNull( "ou=system should not be marked",
- system.get( SubentryService.AUTONOUMOUS_AREA_SUBENTRY ) );
+ assertNull( "ou=system should not be marked", system.get( SubentryService.AUTONOUMOUS_AREA_SUBENTRY ) );
users = ( Attributes ) results.get( "ou=users,ou=system" );
- assertNull( "ou=users,ou=system should not be marked",
- users.get( SubentryService.AUTONOUMOUS_AREA_SUBENTRY ) );
+ assertNull( "ou=users,ou=system should not be marked", users.get( SubentryService.AUTONOUMOUS_AREA_SUBENTRY ) );
groups = ( Attributes ) results.get( "ou=groups,ou=system" );
- assertNull( "ou=groups,ou=system should not be marked",
- groups.get( SubentryService.AUTONOUMOUS_AREA_SUBENTRY ) );
+ assertNull( "ou=groups,ou=system should not be marked", groups.get( SubentryService.AUTONOUMOUS_AREA_SUBENTRY ) );
admin = ( Attributes ) results.get( "uid=admin,ou=system" );
- assertNull( "uid=admin,ou=system should not be marked",
- admin.get( SubentryService.AUTONOUMOUS_AREA_SUBENTRY ) );
+ assertNull( "uid=admin,ou=system should not be marked", admin.get( SubentryService.AUTONOUMOUS_AREA_SUBENTRY ) );
sysPrefRoot = ( Attributes ) results.get( "prefNodeName=sysPrefRoot,ou=system" );
- assertNull( "prefNode=sysPrefRoot,ou=system should not be marked",
- sysPrefRoot.get( SubentryService.AUTONOUMOUS_AREA_SUBENTRY ) );
+ assertNull( "prefNode=sysPrefRoot,ou=system should not be marked", sysPrefRoot
+ .get( SubentryService.AUTONOUMOUS_AREA_SUBENTRY ) );
services = ( Attributes ) results.get( "ou=services,ou=configuration,ou=system" );
autonomousSubentry = services.get( SubentryService.AUTONOUMOUS_AREA_SUBENTRY );
if ( autonomousSubentry != null )
{
- assertEquals( "ou=services,ou=configuration,ou=system should not be marked",
- 0, autonomousSubentry.size() );
+ assertEquals( "ou=services,ou=configuration,ou=system should not be marked", 0, autonomousSubentry.size() );
}
}
@@ -365,24 +357,20 @@
// --------------------------------------------------------------------
Attributes system = ( Attributes ) results.get( "ou=system" );
- assertNull( "ou=system should not be marked",
- system.get( SubentryService.AUTONOUMOUS_AREA_SUBENTRY ) );
+ assertNull( "ou=system should not be marked", system.get( SubentryService.AUTONOUMOUS_AREA_SUBENTRY ) );
Attributes users = ( Attributes ) results.get( "ou=users,ou=system" );
- assertNull( "ou=users,ou=system should not be marked",
- users.get( SubentryService.AUTONOUMOUS_AREA_SUBENTRY ) );
+ assertNull( "ou=users,ou=system should not be marked", users.get( SubentryService.AUTONOUMOUS_AREA_SUBENTRY ) );
Attributes groups = ( Attributes ) results.get( "ou=groups,ou=system" );
- assertNull( "ou=groups,ou=system should not be marked",
- groups.get( SubentryService.AUTONOUMOUS_AREA_SUBENTRY ) );
+ assertNull( "ou=groups,ou=system should not be marked", groups.get( SubentryService.AUTONOUMOUS_AREA_SUBENTRY ) );
Attributes admin = ( Attributes ) results.get( "uid=admin,ou=system" );
- assertNull( "uid=admin,ou=system should not be marked",
- admin.get( SubentryService.AUTONOUMOUS_AREA_SUBENTRY ) );
+ assertNull( "uid=admin,ou=system should not be marked", admin.get( SubentryService.AUTONOUMOUS_AREA_SUBENTRY ) );
Attributes sysPrefRoot = ( Attributes ) results.get( "prefNodeName=sysPrefRoot,ou=system" );
- assertNull( "prefNode=sysPrefRoot,ou=system should not be marked",
- sysPrefRoot.get( SubentryService.AUTONOUMOUS_AREA_SUBENTRY ) );
+ assertNull( "prefNode=sysPrefRoot,ou=system should not be marked", sysPrefRoot
+ .get( SubentryService.AUTONOUMOUS_AREA_SUBENTRY ) );
// --------------------------------------------------------------------
// Now modify the subentry by introducing an exclusion
@@ -390,7 +378,7 @@
Attributes changes = new LockableAttributesImpl();
changes.put( "subtreeSpecification",
- "{ base \"ou=configuration\", specificExclusions { chopBefore:\"ou=services\" } }" );
+ "{ base \"ou=configuration\", specificExclusions { chopBefore:\"ou=services\" } }" );
super.sysRoot.modifyAttributes( "cn=testsubentry", DirContext.REPLACE_ATTRIBUTE, changes );
results = getAllEntries();
@@ -421,31 +409,26 @@
// --------------------------------------------------------------------
system = ( Attributes ) results.get( "ou=system" );
- assertNull( "ou=system should not be marked",
- system.get( SubentryService.AUTONOUMOUS_AREA_SUBENTRY ) );
+ assertNull( "ou=system should not be marked", system.get( SubentryService.AUTONOUMOUS_AREA_SUBENTRY ) );
users = ( Attributes ) results.get( "ou=users,ou=system" );
- assertNull( "ou=users,ou=system should not be marked",
- users.get( SubentryService.AUTONOUMOUS_AREA_SUBENTRY ) );
+ assertNull( "ou=users,ou=system should not be marked", users.get( SubentryService.AUTONOUMOUS_AREA_SUBENTRY ) );
groups = ( Attributes ) results.get( "ou=groups,ou=system" );
- assertNull( "ou=groups,ou=system should not be marked",
- groups.get( SubentryService.AUTONOUMOUS_AREA_SUBENTRY ) );
+ assertNull( "ou=groups,ou=system should not be marked", groups.get( SubentryService.AUTONOUMOUS_AREA_SUBENTRY ) );
admin = ( Attributes ) results.get( "uid=admin,ou=system" );
- assertNull( "uid=admin,ou=system should not be marked",
- admin.get( SubentryService.AUTONOUMOUS_AREA_SUBENTRY ) );
+ assertNull( "uid=admin,ou=system should not be marked", admin.get( SubentryService.AUTONOUMOUS_AREA_SUBENTRY ) );
sysPrefRoot = ( Attributes ) results.get( "prefNodeName=sysPrefRoot,ou=system" );
- assertNull( "prefNode=sysPrefRoot,ou=system should not be marked",
- sysPrefRoot.get( SubentryService.AUTONOUMOUS_AREA_SUBENTRY ) );
+ assertNull( "prefNode=sysPrefRoot,ou=system should not be marked", sysPrefRoot
+ .get( SubentryService.AUTONOUMOUS_AREA_SUBENTRY ) );
services = ( Attributes ) results.get( "ou=services,ou=configuration,ou=system" );
autonomousSubentry = services.get( SubentryService.AUTONOUMOUS_AREA_SUBENTRY );
if ( autonomousSubentry != null )
{
- assertEquals( "ou=services,ou=configuration,ou=system should not be marked",
- 0, autonomousSubentry.size() );
+ assertEquals( "ou=services,ou=configuration,ou=system should not be marked", 0, autonomousSubentry.size() );
}
}
@@ -473,41 +456,36 @@
autonomousSubentry = interceptors.get( SubentryService.AUTONOUMOUS_AREA_SUBENTRY );
if ( autonomousSubentry != null )
{
- assertEquals( "ou=interceptors,ou=configuration,ou=system should not be marked",
- 0,autonomousSubentry.size() );
+ assertEquals( "ou=interceptors,ou=configuration,ou=system should not be marked", 0, autonomousSubentry
+ .size() );
}
Attributes partitions = ( Attributes ) results.get( "ou=partitions,ou=configuration,ou=system" );
autonomousSubentry = partitions.get( SubentryService.AUTONOUMOUS_AREA_SUBENTRY );
if ( autonomousSubentry != null )
{
- assertEquals( "ou=partitions,ou=configuration,ou=system should not be marked",
- 0, autonomousSubentry.size() );
+ assertEquals( "ou=partitions,ou=configuration,ou=system should not be marked", 0, autonomousSubentry.size() );
}
Attributes services = ( Attributes ) results.get( "ou=services,ou=configuration,ou=system" );
autonomousSubentry = services.get( SubentryService.AUTONOUMOUS_AREA_SUBENTRY );
if ( autonomousSubentry != null )
{
- assertEquals( "ou=services,ou=configuration,ou=system should not be marked",
- 0, autonomousSubentry.size() );
+ assertEquals( "ou=services,ou=configuration,ou=system should not be marked", 0, autonomousSubentry.size() );
}
Attributes system = ( Attributes ) results.get( "ou=system" );
- assertNull( "ou=system should not be marked",
- system.get( SubentryService.AUTONOUMOUS_AREA_SUBENTRY ) );
+ assertNull( "ou=system should not be marked", system.get( SubentryService.AUTONOUMOUS_AREA_SUBENTRY ) );
Attributes users = ( Attributes ) results.get( "ou=users,ou=system" );
- assertNull( "ou=users,ou=system should not be marked",
- users.get( SubentryService.AUTONOUMOUS_AREA_SUBENTRY ) );
+ assertNull( "ou=users,ou=system should not be marked", users.get( SubentryService.AUTONOUMOUS_AREA_SUBENTRY ) );
Attributes admin = ( Attributes ) results.get( "uid=admin,ou=system" );
- assertNull( "uid=admin,ou=system should not be marked",
- admin.get( SubentryService.AUTONOUMOUS_AREA_SUBENTRY ) );
+ assertNull( "uid=admin,ou=system should not be marked", admin.get( SubentryService.AUTONOUMOUS_AREA_SUBENTRY ) );
Attributes sysPrefRoot = ( Attributes ) results.get( "prefNodeName=sysPrefRoot,ou=system" );
- assertNull( "prefNode=sysPrefRoot,ou=system should not be marked",
- sysPrefRoot.get( SubentryService.AUTONOUMOUS_AREA_SUBENTRY ) );
+ assertNull( "prefNode=sysPrefRoot,ou=system should not be marked", sysPrefRoot
+ .get( SubentryService.AUTONOUMOUS_AREA_SUBENTRY ) );
}
@@ -552,24 +530,20 @@
// --------------------------------------------------------------------
Attributes system = ( Attributes ) results.get( "ou=system" );
- assertNull( "ou=system should not be marked",
- system.get( SubentryService.AUTONOUMOUS_AREA_SUBENTRY ) );
+ assertNull( "ou=system should not be marked", system.get( SubentryService.AUTONOUMOUS_AREA_SUBENTRY ) );
Attributes users = ( Attributes ) results.get( "ou=users,ou=system" );
- assertNull( "ou=users,ou=system should not be marked",
- users.get( SubentryService.AUTONOUMOUS_AREA_SUBENTRY ) );
+ assertNull( "ou=users,ou=system should not be marked", users.get( SubentryService.AUTONOUMOUS_AREA_SUBENTRY ) );
Attributes groups = ( Attributes ) results.get( "ou=groups,ou=system" );
- assertNull( "ou=groups,ou=system should not be marked",
- groups.get( SubentryService.AUTONOUMOUS_AREA_SUBENTRY ) );
+ assertNull( "ou=groups,ou=system should not be marked", groups.get( SubentryService.AUTONOUMOUS_AREA_SUBENTRY ) );
Attributes admin = ( Attributes ) results.get( "uid=admin,ou=system" );
- assertNull( "uid=admin,ou=system should not be marked",
- admin.get( SubentryService.AUTONOUMOUS_AREA_SUBENTRY ) );
+ assertNull( "uid=admin,ou=system should not be marked", admin.get( SubentryService.AUTONOUMOUS_AREA_SUBENTRY ) );
Attributes sysPrefRoot = ( Attributes ) results.get( "prefNodeName=sysPrefRoot,ou=system" );
- assertNull( "prefNode=sysPrefRoot,ou=system should not be marked",
- sysPrefRoot.get( SubentryService.AUTONOUMOUS_AREA_SUBENTRY ) );
+ assertNull( "prefNode=sysPrefRoot,ou=system should not be marked", sysPrefRoot
+ .get( SubentryService.AUTONOUMOUS_AREA_SUBENTRY ) );
}
@@ -621,28 +595,24 @@
// --------------------------------------------------------------------
Attributes system = ( Attributes ) results.get( "ou=system" );
- assertNull( "ou=system should not be marked",
- system.get( SubentryService.AUTONOUMOUS_AREA_SUBENTRY ) );
+ assertNull( "ou=system should not be marked", system.get( SubentryService.AUTONOUMOUS_AREA_SUBENTRY ) );
Attributes users = ( Attributes ) results.get( "ou=users,ou=system" );
- assertNull( "ou=users,ou=system should not be marked",
- users.get( SubentryService.AUTONOUMOUS_AREA_SUBENTRY ) );
+ assertNull( "ou=users,ou=system should not be marked", users.get( SubentryService.AUTONOUMOUS_AREA_SUBENTRY ) );
Attributes groups = ( Attributes ) results.get( "ou=groups,ou=system" );
- assertNull( "ou=groups,ou=system should not be marked",
- groups.get( SubentryService.AUTONOUMOUS_AREA_SUBENTRY ) );
+ assertNull( "ou=groups,ou=system should not be marked", groups.get( SubentryService.AUTONOUMOUS_AREA_SUBENTRY ) );
Attributes admin = ( Attributes ) results.get( "uid=admin,ou=system" );
- assertNull( "uid=admin,ou=system should not be marked",
- admin.get( SubentryService.AUTONOUMOUS_AREA_SUBENTRY ) );
+ assertNull( "uid=admin,ou=system should not be marked", admin.get( SubentryService.AUTONOUMOUS_AREA_SUBENTRY ) );
Attributes sysPrefRoot = ( Attributes ) results.get( "prefNodeName=sysPrefRoot,ou=system" );
- assertNull( "prefNode=sysPrefRoot,ou=system should not be marked",
- sysPrefRoot.get( SubentryService.AUTONOUMOUS_AREA_SUBENTRY ) );
+ assertNull( "prefNode=sysPrefRoot,ou=system should not be marked", sysPrefRoot
+ .get( SubentryService.AUTONOUMOUS_AREA_SUBENTRY ) );
Attributes unmarked = ( Attributes ) results.get( "cn=unmarked,ou=configuration,ou=system" );
- assertNull( "cn=unmarked,ou=configuration,ou=system should not be marked",
- unmarked.get( SubentryService.AUTONOUMOUS_AREA_SUBENTRY ) );
+ assertNull( "cn=unmarked,ou=configuration,ou=system should not be marked", unmarked
+ .get( SubentryService.AUTONOUMOUS_AREA_SUBENTRY ) );
// --------------------------------------------------------------------
// Now destry one of the marked/unmarked and rename to deleted entry
@@ -653,8 +623,8 @@
results = getAllEntries();
unmarked = ( Attributes ) results.get( "cn=unmarked,ou=configuration,ou=system" );
- assertNull( "cn=unmarked,ou=configuration,ou=system should not be marked",
- unmarked.get( SubentryService.AUTONOUMOUS_AREA_SUBENTRY ) );
+ assertNull( "cn=unmarked,ou=configuration,ou=system should not be marked", unmarked
+ .get( SubentryService.AUTONOUMOUS_AREA_SUBENTRY ) );
assertNull( results.get( "cn=marked,ou=configuration,ou=system" ) );
// --------------------------------------------------------------------
@@ -720,28 +690,24 @@
// --------------------------------------------------------------------
Attributes system = ( Attributes ) results.get( "ou=system" );
- assertNull( "ou=system should not be marked",
- system.get( SubentryService.AUTONOUMOUS_AREA_SUBENTRY ) );
+ assertNull( "ou=system should not be marked", system.get( SubentryService.AUTONOUMOUS_AREA_SUBENTRY ) );
Attributes users = ( Attributes ) results.get( "ou=users,ou=system" );
- assertNull( "ou=users,ou=system should not be marked",
- users.get( SubentryService.AUTONOUMOUS_AREA_SUBENTRY ) );
+ assertNull( "ou=users,ou=system should not be marked", users.get( SubentryService.AUTONOUMOUS_AREA_SUBENTRY ) );
Attributes groups = ( Attributes ) results.get( "ou=groups,ou=system" );
- assertNull( "ou=groups,ou=system should not be marked",
- groups.get( SubentryService.AUTONOUMOUS_AREA_SUBENTRY ) );
+ assertNull( "ou=groups,ou=system should not be marked", groups.get( SubentryService.AUTONOUMOUS_AREA_SUBENTRY ) );
Attributes admin = ( Attributes ) results.get( "uid=admin,ou=system" );
- assertNull( "uid=admin,ou=system should not be marked",
- admin.get( SubentryService.AUTONOUMOUS_AREA_SUBENTRY ) );
+ assertNull( "uid=admin,ou=system should not be marked", admin.get( SubentryService.AUTONOUMOUS_AREA_SUBENTRY ) );
Attributes sysPrefRoot = ( Attributes ) results.get( "prefNodeName=sysPrefRoot,ou=system" );
- assertNull( "prefNode=sysPrefRoot,ou=system should not be marked",
- sysPrefRoot.get( SubentryService.AUTONOUMOUS_AREA_SUBENTRY ) );
+ assertNull( "prefNode=sysPrefRoot,ou=system should not be marked", sysPrefRoot
+ .get( SubentryService.AUTONOUMOUS_AREA_SUBENTRY ) );
Attributes unmarked = ( Attributes ) results.get( "cn=unmarked,ou=system" );
- assertNull( "cn=unmarked,ou=system should not be marked",
- unmarked.get( SubentryService.AUTONOUMOUS_AREA_SUBENTRY ) );
+ assertNull( "cn=unmarked,ou=system should not be marked", unmarked
+ .get( SubentryService.AUTONOUMOUS_AREA_SUBENTRY ) );
// --------------------------------------------------------------------
// Now destry one of the marked/unmarked and rename to deleted entry
@@ -752,8 +718,8 @@
results = getAllEntries();
unmarked = ( Attributes ) results.get( "cn=unmarked,ou=system" );
- assertNull( "cn=unmarked,ou=system should not be marked",
- unmarked.get( SubentryService.AUTONOUMOUS_AREA_SUBENTRY ) );
+ assertNull( "cn=unmarked,ou=system should not be marked", unmarked
+ .get( SubentryService.AUTONOUMOUS_AREA_SUBENTRY ) );
assertNull( results.get( "cn=marked,ou=configuration,ou=system" ) );
// --------------------------------------------------------------------
@@ -819,28 +785,24 @@
// --------------------------------------------------------------------
Attributes system = ( Attributes ) results.get( "ou=system" );
- assertNull( "ou=system should not be marked",
- system.get( SubentryService.AUTONOUMOUS_AREA_SUBENTRY ) );
+ assertNull( "ou=system should not be marked", system.get( SubentryService.AUTONOUMOUS_AREA_SUBENTRY ) );
Attributes users = ( Attributes ) results.get( "ou=users,ou=system" );
- assertNull( "ou=users,ou=system should not be marked",
- users.get( SubentryService.AUTONOUMOUS_AREA_SUBENTRY ) );
+ assertNull( "ou=users,ou=system should not be marked", users.get( SubentryService.AUTONOUMOUS_AREA_SUBENTRY ) );
Attributes groups = ( Attributes ) results.get( "ou=groups,ou=system" );
- assertNull( "ou=groups,ou=system should not be marked",
- groups.get( SubentryService.AUTONOUMOUS_AREA_SUBENTRY ) );
+ assertNull( "ou=groups,ou=system should not be marked", groups.get( SubentryService.AUTONOUMOUS_AREA_SUBENTRY ) );
Attributes admin = ( Attributes ) results.get( "uid=admin,ou=system" );
- assertNull( "uid=admin,ou=system should not be marked",
- admin.get( SubentryService.AUTONOUMOUS_AREA_SUBENTRY ) );
+ assertNull( "uid=admin,ou=system should not be marked", admin.get( SubentryService.AUTONOUMOUS_AREA_SUBENTRY ) );
Attributes sysPrefRoot = ( Attributes ) results.get( "prefNodeName=sysPrefRoot,ou=system" );
- assertNull( "prefNode=sysPrefRoot,ou=system should not be marked",
- sysPrefRoot.get( SubentryService.AUTONOUMOUS_AREA_SUBENTRY ) );
+ assertNull( "prefNode=sysPrefRoot,ou=system should not be marked", sysPrefRoot
+ .get( SubentryService.AUTONOUMOUS_AREA_SUBENTRY ) );
Attributes unmarked = ( Attributes ) results.get( "cn=unmarked,ou=system" );
- assertNull( "cn=unmarked,ou=system should not be marked",
- unmarked.get( SubentryService.AUTONOUMOUS_AREA_SUBENTRY ) );
+ assertNull( "cn=unmarked,ou=system should not be marked", unmarked
+ .get( SubentryService.AUTONOUMOUS_AREA_SUBENTRY ) );
// --------------------------------------------------------------------
// Now destry one of the marked/unmarked and rename to deleted entry
@@ -861,8 +823,8 @@
assertEquals( "cn=testsubentry,ou=system", autonomousSubentry.get() );
assertEquals( 1, autonomousSubentry.size() );
}
-
-
+
+
public void testSubentriesControl() throws Exception
{
addAdministrativeRole( "autonomousArea" );
@@ -878,14 +840,15 @@
SearchResult result = ( SearchResult ) list.next();
entries.put( result.getName(), result );
}
- assertTrue( entries.size() > 1 );
+ assertTrue( entries.size() > 1 );
assertNull( entries.get( "cn=testsubentry,ou=system" ) );
-
+
// now add the control with visibility set to true where all entries
// except subentries disappear
SubentriesControl ctl = new SubentriesControl();
ctl.setVisibility( true );
- super.sysRoot.setRequestControls( new Control[] { ctl } );
+ super.sysRoot.setRequestControls( new Control[]
+ { ctl } );
list = super.sysRoot.search( "", "(objectClass=*)", searchControls );
SearchResult result = ( SearchResult ) list.next();
assertFalse( list.hasMore() );
Propchange: directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/subtree/SubentryServiceTest.java
------------------------------------------------------------------------------
--- svn:keywords (added)
+++ svn:keywords Sun Feb 19 19:57:02 2006
@@ -0,0 +1,4 @@
+Rev
+Revision
+Date
+Id
Modified: directory/trunks/apacheds/core/pom.xml
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds/core/pom.xml?rev=379013&r1=379012&r2=379013&view=diff
==============================================================================
--- directory/trunks/apacheds/core/pom.xml (original)
+++ directory/trunks/apacheds/core/pom.xml Sun Feb 19 19:57:02 2006
@@ -4,16 +4,15 @@
<parent>
<groupId>org.apache.directory.server</groupId>
<artifactId>build</artifactId>
- <version>1.0-RC1-SNAPSHOT</version>
+ <version>1.0-RC1</version>
</parent>
<artifactId>apacheds-core</artifactId>
<name>ApacheDS Core</name>
<packaging>jar</packaging>
<description>
- Server's core contains all backend subsystems. It depends on protocol
- and uses it with seda to service LDAP requests. The core contains the
- JNDI provider, interceptor framework, interceptor services, the schema
- subsystem and the database subsystem. Hence the core is the heart of the server.
+ Server's core contains the JNDI provider, interceptors, schema, and
+ database subsystems. The core is the heart of the server without protocols
+ enabled.
</description>
<!-- <distributionManagement>
<site>