directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r1484837 - /directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/search/SearchIT.java
Date Tue, 21 May 2013 15:34:25 GMT
Author: elecharny
Date: Tue May 21 15:34:24 2013
New Revision: 1484837

URL: http://svn.apache.org/r1484837
Log:
Speed up the test, by moving some operations out of the @Before method, so that they are executed only once for all the tests

Modified:
    directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/search/SearchIT.java

Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/search/SearchIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/search/SearchIT.java?rev=1484837&r1=1484836&r2=1484837&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/search/SearchIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/search/SearchIT.java Tue May 21 15:34:24 2013
@@ -21,7 +21,6 @@ package org.apache.directory.server.core
 
 
 import static org.apache.directory.server.core.integ.IntegrationUtils.getRootContext;
-import static org.apache.directory.server.core.integ.IntegrationUtils.getSchemaContext;
 import static org.apache.directory.server.core.integ.IntegrationUtils.getSystemContext;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -38,10 +37,8 @@ import javax.naming.NamingEnumeration;
 import javax.naming.NamingException;
 import javax.naming.directory.Attribute;
 import javax.naming.directory.Attributes;
-import javax.naming.directory.BasicAttribute;
 import javax.naming.directory.DirContext;
 import javax.naming.directory.InvalidSearchFilterException;
-import javax.naming.directory.ModificationItem;
 import javax.naming.directory.SearchControls;
 import javax.naming.directory.SearchResult;
 import javax.naming.ldap.LdapContext;
@@ -65,6 +62,7 @@ import org.apache.directory.api.ldap.mod
 import org.apache.directory.ldap.client.api.LdapConnection;
 import org.apache.directory.server.core.annotations.ApplyLdifs;
 import org.apache.directory.server.core.annotations.CreateDS;
+import org.apache.directory.server.core.annotations.LoadSchema;
 import org.apache.directory.server.core.integ.AbstractLdapTestUnit;
 import org.apache.directory.server.core.integ.FrameworkRunner;
 import org.apache.directory.server.core.integ.IntegrationUtils;
@@ -80,9 +78,11 @@ import org.junit.runner.RunWith;
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
 @RunWith(FrameworkRunner.class)
-@CreateDS(name = "SearchDS")
+@CreateDS(name = "SearchDS",
+    loadedSchemas =
+        { @LoadSchema(name = "nis", enabled = true) })
 @ApplyLdifs(
-    {         
+    {
         "dn: m-oid=2.2.0, ou=attributeTypes, cn=apachemeta, ou=schema",
         "objectclass: metaAttributeType",
         "objectclass: metaTop",
@@ -157,16 +157,46 @@ import org.junit.runner.RunWith;
         "cn: singer",
         "sn: manager",
         "telephoneNumber: 1 801 555 1212 ",
-        "manager: cn=Heather Nova, ou=system"
- })
+        "manager: cn=Heather Nova, ou=system",
+        "",
+        "dn: cn=testGroup0,ou=groups,ou=system",
+        "objectClass: top",
+        "objectClass: posixGroup",
+        "cn: testGroup0",
+        "gidNumber: 0",
+        "",
+        "dn: cn=testGroup1,ou=groups,ou=system",
+        "objectClass: top",
+        "objectClass: posixGroup",
+        "cn: testGroup1",
+        "gidNumber: 1",
+        "",
+        "dn: cn=testGroup2,ou=groups,ou=system",
+        "objectClass: top",
+        "objectClass: posixGroup",
+        "cn: testGroup2",
+        "gidNumber: 2",
+        "",
+        "dn: cn=testGroup4,ou=groups,ou=system",
+        "objectClass: top",
+        "objectClass: posixGroup",
+        "cn: testGroup4",
+        "gidNumber: 4",
+        "",
+        "dn: cn=testGroup5,ou=groups,ou=system",
+        "objectClass: top",
+        "objectClass: posixGroup",
+        "cn: testGroup5",
+        "gidNumber: 5"
+})
 public class SearchIT extends AbstractLdapTestUnit
 {
     private static final String RDN = "cn=Heather Nova";
     private static final String FILTER = "(objectclass=*)";
-
+    
     public static LdapContext sysRoot;
-
-
+    
+    
     /**
      * @param sysRoot the system root to add entries to
      * @throws NamingException on errors
@@ -174,10 +204,8 @@ public class SearchIT extends AbstractLd
     @Before
     public void createData() throws Exception
     {
-        getService().getSchemaManager().enable( "nis" );
-
         sysRoot = getSystemContext( getService() );
-
+    
         /*
          * Check ou=testing00,ou=system
          */
@@ -190,7 +218,7 @@ public class SearchIT extends AbstractLd
         assertNotNull( attribute );
         assertTrue( attribute.contains( "top" ) );
         assertTrue( attribute.contains( "organizationalUnit" ) );
-
+    
         /*
          * check ou=testing01,ou=system
          */
@@ -203,89 +231,66 @@ public class SearchIT extends AbstractLd
         assertNotNull( attribute );
         assertTrue( attribute.contains( "top" ) );
         assertTrue( attribute.contains( "organizationalUnit" ) );
-
+    
         /*
          * Check ou=testing02,ou=system
          */
         ctx = ( DirContext ) sysRoot.lookup( "ou=testing02" );
         assertNotNull( ctx );
-
+    
         attributes = ctx.getAttributes( "" );
         assertNotNull( attributes );
         assertEquals( "testing02", attributes.get( "ou" ).get() );
-
+    
         attribute = attributes.get( "objectClass" );
         assertNotNull( attribute );
         assertTrue( attribute.contains( "top" ) );
         assertTrue( attribute.contains( "organizationalUnit" ) );
-
+    
         /*
          * Check ou=subtest,ou=testing01,ou=system
          */
         ctx = ( DirContext ) sysRoot.lookup( "ou=subtest,ou=testing01" );
         assertNotNull( ctx );
-
+    
         attributes = ctx.getAttributes( "" );
         assertNotNull( attributes );
         assertEquals( "subtest", attributes.get( "ou" ).get() );
-
+    
         attribute = attributes.get( "objectClass" );
         assertNotNull( attribute );
         assertTrue( attribute.contains( "top" ) );
         assertTrue( attribute.contains( "organizationalUnit" ) );
-
+    
         /*
          *  Check entry cn=Heather Nova, ou=system
          */
         ctx = ( DirContext ) sysRoot.lookup( RDN );
         assertNotNull( ctx );
-
-        // -------------------------------------------------------------------
-        // Enable the nis schema
-        // -------------------------------------------------------------------
-
-        // check if nis is disabled
-        LdapContext schemaRoot = getSchemaContext( getService() );
-        Attributes nisAttrs = schemaRoot.getAttributes( "cn=nis" );
-        boolean isNisDisabled = false;
-
-        if ( nisAttrs.get( "m-disabled" ) != null )
-        {
-            isNisDisabled = ( ( String ) nisAttrs.get( "m-disabled" ).get() ).equalsIgnoreCase( "TRUE" );
-        }
-
-        // if nis is disabled then enable it
-        if ( isNisDisabled )
-        {
-            Attribute disabled = new BasicAttribute( "m-disabled" );
-            ModificationItem[] mods = new ModificationItem[]
-                { new ModificationItem( DirContext.REMOVE_ATTRIBUTE, disabled ) };
-            schemaRoot.modifyAttributes( "cn=nis", mods );
-        }
-
+    
         // -------------------------------------------------------------------
         // Add a bunch of nis groups
         // -------------------------------------------------------------------
-        addNisPosixGroup( "testGroup0", 0 );
-        addNisPosixGroup( "testGroup1", 1 );
-        addNisPosixGroup( "testGroup2", 2 );
-        addNisPosixGroup( "testGroup4", 4 );
-        addNisPosixGroup( "testGroup5", 5 );
+        //addNisPosixGroup( "testGroup0", 0 );
+        //addNisPosixGroup( "testGroup1", 1 );
+        //addNisPosixGroup( "testGroup2", 2 );
+        //addNisPosixGroup( "testGroup4", 4 );
+        //addNisPosixGroup( "testGroup5", 5 );
     }
-
-
+    
+    
     /**
      * Create a NIS group
      */
     private static DirContext addNisPosixGroup( String name, int gid ) throws Exception
     {
-        Attributes attrs = LdifUtils.createJndiAttributes("objectClass: top", "objectClass: posixGroup", "cn", name,
-                "gidNumber", String.valueOf(gid));
-
+        Attributes attrs = LdifUtils.createJndiAttributes( "objectClass: top", "objectClass: posixGroup", "cn", name,
+            "gidNumber", String.valueOf( gid ) );
+    
         return getSystemContext( getService() ).createSubcontext( "cn=" + name + ",ou=groups", attrs );
     }
-
-
+    
+    
     @Test
     public void testSearchOneLevel() throws Exception
     {
@@ -295,24 +300,24 @@ public class SearchIT extends AbstractLd
         sysRoot.addToEnvironment( JndiPropertyConstants.JNDI_LDAP_DAP_DEREF_ALIASES, AliasDerefMode.NEVER_DEREF_ALIASES
             .getJndiValue() );
         HashMap<String, Attributes> map = new HashMap<String, Attributes>();
-
+    
         NamingEnumeration<SearchResult> list = sysRoot.search( "", "(ou=*)", controls );
-
+    
         while ( list.hasMore() )
         {
             SearchResult result = list.next();
             map.put( result.getName(), result.getAttributes() );
         }
-
+    
         list.close();
-
+    
         assertEquals( "Expected number of results returned was incorrect!", 9, map.size() );
         assertTrue( map.containsKey( "ou=testing00,ou=system" ) );
         assertTrue( map.containsKey( "ou=testing01,ou=system" ) );
         assertTrue( map.containsKey( "ou=testing02,ou=system" ) );
     }
-
-
+    
+    
     @Test
     public void testSearchSubTreeLevel() throws Exception
     {
@@ -321,18 +326,18 @@ public class SearchIT extends AbstractLd
         controls.setDerefLinkFlag( false );
         sysRoot.addToEnvironment( JndiPropertyConstants.JNDI_LDAP_DAP_DEREF_ALIASES, AliasDerefMode.NEVER_DEREF_ALIASES
             .getJndiValue() );
-
+    
         HashMap<String, Attributes> map = new HashMap<String, Attributes>();
         NamingEnumeration<SearchResult> list = sysRoot.search( "", "(ou=*)", controls );
-
+    
         while ( list.hasMore() )
         {
             SearchResult result = list.next();
             map.put( result.getName(), result.getAttributes() );
         }
-
+    
         list.close();
-
+    
         assertEquals( "Expected number of results returned was incorrect", 14, map.size() );
         assertTrue( map.containsKey( "ou=system" ) );
         assertTrue( map.containsKey( "ou=testing00,ou=system" ) );
@@ -340,8 +345,8 @@ public class SearchIT extends AbstractLd
         assertTrue( map.containsKey( "ou=testing02,ou=system" ) );
         assertTrue( map.containsKey( "ou=subtest,ou=testing01,ou=system" ) );
     }
-
-
+    
+    
     @Test
     public void testSearchSubTreeLevelNoAttributes() throws Exception
     {
@@ -350,28 +355,28 @@ public class SearchIT extends AbstractLd
         controls.setDerefLinkFlag( false );
         controls.setReturningAttributes( new String[]
             { "1.1" } );
-
+    
         sysRoot.addToEnvironment( JndiPropertyConstants.JNDI_LDAP_DAP_DEREF_ALIASES, AliasDerefMode.NEVER_DEREF_ALIASES
             .getJndiValue() );
-
+    
         HashMap<String, Attributes> map = new HashMap<String, Attributes>();
         NamingEnumeration<SearchResult> list = sysRoot.search( "", "(ou=testing02)", controls );
-
+    
         while ( list.hasMore() )
         {
             SearchResult result = list.next();
             map.put( result.getName(), result.getAttributes() );
         }
-
+    
         list.close();
-
+    
         assertEquals( "Expected number of results returned was incorrect", 1, map.size() );
         assertTrue( map.containsKey( "ou=testing02,ou=system" ) );
         Attributes attrs = map.get( "ou=testing02,ou=system" );
         assertEquals( 0, attrs.size() );
     }
-
-
+    
+    
     @Test
     public void testSearchSubstringSubTreeLevel() throws Exception
     {
@@ -380,18 +385,18 @@ public class SearchIT extends AbstractLd
         controls.setDerefLinkFlag( false );
         sysRoot.addToEnvironment( JndiPropertyConstants.JNDI_LDAP_DAP_DEREF_ALIASES, AliasDerefMode.NEVER_DEREF_ALIASES
             .getJndiValue() );
-
+    
         HashMap<String, Attributes> map = new HashMap<String, Attributes>();
         NamingEnumeration<SearchResult> list = sysRoot.search( "", "(objectClass=organ*)", controls );
-
+    
         while ( list.hasMore() )
         {
             SearchResult result = list.next();
             map.put( result.getName(), result.getAttributes() );
         }
-
+    
         list.close();
-
+    
         // 16 because it also matches organizationalPerson which the admin is
         assertEquals( "Expected number of results returned was incorrect", 17, map.size() );
         assertTrue( map.containsKey( "ou=system" ) );
@@ -408,8 +413,8 @@ public class SearchIT extends AbstractLd
         assertTrue( map.containsKey( "prefNodeName=sysPrefRoot,ou=system" ) );
         assertTrue( map.containsKey( "uid=admin,ou=system" ) );
     }
-
-
+    
+    
     /**
      * Tests to make sure undefined attributes in filter assertions are pruned and do not
      * result in exceptions.
@@ -419,46 +424,46 @@ public class SearchIT extends AbstractLd
     {
         boolean oldSetAllowAnnonymousAccess = getService().isAllowAnonymousAccess();
         getService().setAllowAnonymousAccess( true );
-
+    
         SearchControls cons = new SearchControls();
         NamingEnumeration<SearchResult> e = sysRoot.search( "", "(bogusAttribute=abc123)", cons );
         assertNotNull( e );
-
+    
         e.close();
-        
+    
         e = sysRoot.search( "", "(!(bogusAttribute=abc123))", cons );
         assertNotNull( e );
         assertFalse( e.hasMore() );
-
+    
         e.close();
-
+    
         e = sysRoot.search( "", "(|(bogusAttribute=abc123)(bogusAttribute=abc123))", cons );
         assertNotNull( e );
         assertFalse( e.hasMore() );
-
+    
         e.close();
-
+    
         e = sysRoot.search( "", "(|(bogusAttribute=abc123)(ou=abc123))", cons );
         assertNotNull( e );
         assertFalse( e.hasMore() );
-
+    
         e.close();
-
+    
         e = sysRoot.search( "", "(OBJECTclass=*)", cons );
         assertNotNull( e );
         assertTrue( e.hasMore() );
-
+    
         e.close();
-
+    
         e = sysRoot.search( "", "(objectclass=*)", cons );
         assertNotNull( e );
-
+    
         e.close();
-
+    
         getService().setAllowAnonymousAccess( oldSetAllowAnnonymousAccess );
     }
-
-
+    
+    
     @Test
     public void testSearchFilterArgs() throws Exception
     {
@@ -468,24 +473,24 @@ public class SearchIT extends AbstractLd
         sysRoot.addToEnvironment( JndiPropertyConstants.JNDI_LDAP_DAP_DEREF_ALIASES, AliasDerefMode.NEVER_DEREF_ALIASES
             .getJndiValue() );
         HashMap<String, Attributes> map = new HashMap<String, Attributes>();
-
+    
         NamingEnumeration<SearchResult> list = sysRoot.search( "", "(|(ou={0})(ou={1}))", new Object[]
             { "testing00", "testing01" }, controls );
-
+    
         while ( list.hasMore() )
         {
             SearchResult result = list.next();
             map.put( result.getName(), result.getAttributes() );
         }
-
+    
         list.close();
-
+    
         assertEquals( "Expected number of results returned was incorrect!", 2, map.size() );
         assertTrue( map.containsKey( "ou=testing00,ou=system" ) );
         assertTrue( map.containsKey( "ou=testing01,ou=system" ) );
     }
-
-
+    
+    
     @Test
     public void testFilterExpansion0() throws Exception
     {
@@ -494,23 +499,23 @@ public class SearchIT extends AbstractLd
         controls.setDerefLinkFlag( false );
         sysRoot.addToEnvironment( JndiPropertyConstants.JNDI_LDAP_DAP_DEREF_ALIASES, AliasDerefMode.NEVER_DEREF_ALIASES
             .getJndiValue() );
-
+    
         HashMap<String, Attributes> map = new HashMap<String, Attributes>();
         NamingEnumeration<SearchResult> list = sysRoot.search( "", "(name=testing00)", controls );
-
+    
         while ( list.hasMore() )
         {
             SearchResult result = list.next();
             map.put( result.getName(), result.getAttributes() );
         }
-        
+    
         list.close();
-
+    
         assertEquals( "size of results", 1, map.size() );
         assertTrue( "contains ou=testing00,ou=system", map.containsKey( "ou=testing00,ou=system" ) );
     }
-
-
+    
+    
     @Test
     public void testFilterExpansion1() throws Exception
     {
@@ -519,18 +524,18 @@ public class SearchIT extends AbstractLd
         controls.setDerefLinkFlag( false );
         sysRoot.addToEnvironment( JndiPropertyConstants.JNDI_LDAP_DAP_DEREF_ALIASES, AliasDerefMode.NEVER_DEREF_ALIASES
             .getJndiValue() );
-
+    
         HashMap<String, Attributes> map = new HashMap<String, Attributes>();
         NamingEnumeration<SearchResult> list = sysRoot.search( "", "(name=*)", controls );
-
+    
         while ( list.hasMore() )
         {
             SearchResult result = list.next();
             map.put( result.getName(), result.getAttributes() );
         }
-
+    
         list.close();
-
+    
         assertEquals( "size of results", 23, map.size() );
         assertTrue( "contains ou=testing00,ou=system", map.containsKey( "ou=testing00,ou=system" ) );
         assertTrue( "contains ou=testing01,ou=system", map.containsKey( "ou=testing01,ou=system" ) );
@@ -550,8 +555,8 @@ public class SearchIT extends AbstractLd
         assertTrue( "contains cn=administrators,ou=groups,ou=system", map
             .containsKey( "cn=Administrators,ou=groups,ou=system" ) );
     }
-
-
+    
+    
     @Test
     public void testFilterExpansion2() throws Exception
     {
@@ -560,24 +565,24 @@ public class SearchIT extends AbstractLd
         controls.setDerefLinkFlag( false );
         sysRoot.addToEnvironment( JndiPropertyConstants.JNDI_LDAP_DAP_DEREF_ALIASES, AliasDerefMode.NEVER_DEREF_ALIASES
             .getJndiValue() );
-
+    
         HashMap<String, Attributes> map = new HashMap<String, Attributes>();
         NamingEnumeration<SearchResult> list = sysRoot.search( "", "(|(name=testing00)(name=testing01))", controls );
-
+    
         while ( list.hasMore() )
         {
             SearchResult result = list.next();
             map.put( result.getName(), result.getAttributes() );
         }
-
+    
         list.close();
-
+    
         assertEquals( "size of results", 2, map.size() );
         assertTrue( "contains ou=testing00,ou=system", map.containsKey( "ou=testing00,ou=system" ) );
         assertTrue( "contains ou=testing01,ou=system", map.containsKey( "ou=testing01,ou=system" ) );
     }
-
-
+    
+    
     @Test
     public void testFilterExpansion4() throws Exception
     {
@@ -586,18 +591,18 @@ public class SearchIT extends AbstractLd
         controls.setDerefLinkFlag( false );
         sysRoot.addToEnvironment( JndiPropertyConstants.JNDI_LDAP_DAP_DEREF_ALIASES, AliasDerefMode.NEVER_DEREF_ALIASES
             .getJndiValue() );
-
+    
         HashMap<String, Attributes> map = new HashMap<String, Attributes>();
         NamingEnumeration<SearchResult> list = sysRoot.search( "", "(name=testing*)", controls );
-
+    
         while ( list.hasMore() )
         {
             SearchResult result = list.next();
             map.put( result.getName(), result.getAttributes() );
         }
-
+    
         list.close();
-
+    
         assertEquals( "size of results", 6, map.size() );
         assertTrue( "contains ou=testing00,ou=system", map.containsKey( "ou=testing00,ou=system" ) );
         assertTrue( "contains ou=testing01,ou=system", map.containsKey( "ou=testing01,ou=system" ) );
@@ -606,8 +611,8 @@ public class SearchIT extends AbstractLd
         assertTrue( "contains ou=testing04,ou=system", map.containsKey( "ou=testing04,ou=system" ) );
         assertTrue( "contains ou=testing05,ou=system", map.containsKey( "ou=testing05,ou=system" ) );
     }
-
-
+    
+    
     @Test
     public void testFilterExpansion5() throws Exception
     {
@@ -616,7 +621,7 @@ public class SearchIT extends AbstractLd
         controls.setDerefLinkFlag( false );
         sysRoot.addToEnvironment( JndiPropertyConstants.JNDI_LDAP_DAP_DEREF_ALIASES, AliasDerefMode.NEVER_DEREF_ALIASES
             .getJndiValue() );
-
+    
         HashMap<String, Attributes> map = new HashMap<String, Attributes>();
         String filter = "(|(2.5.4.11.1=testing*)(2.5.4.54=testing*)(2.5.4.10=testing*)"
             + "(2.5.4.6=testing*)(2.5.4.43=testing*)(2.5.4.7.1=testing*)(2.5.4.10.1=testing*)"
@@ -624,15 +629,15 @@ public class SearchIT extends AbstractLd
             + "(2.5.4.12=testing*)(1.3.6.1.4.1.18060.0.4.1.2.3=testing*)"
             + "(2.5.4.7=testing*)(2.5.4.3=testing*)(2.5.4.8=testing*)(2.5.4.42=testing*))";
         NamingEnumeration<SearchResult> list = sysRoot.search( "", filter, controls );
-
+    
         while ( list.hasMore() )
         {
             SearchResult result = list.next();
             map.put( result.getName(), result.getAttributes() );
         }
-
+    
         list.close();
-
+    
         assertEquals( "size of results", 6, map.size() );
         assertTrue( "contains ou=testing00,ou=system", map.containsKey( "ou=testing00,ou=system" ) );
         assertTrue( "contains ou=testing01,ou=system", map.containsKey( "ou=testing01,ou=system" ) );
@@ -641,8 +646,8 @@ public class SearchIT extends AbstractLd
         assertTrue( "contains ou=testing04,ou=system", map.containsKey( "ou=testing04,ou=system" ) );
         assertTrue( "contains ou=testing05,ou=system", map.containsKey( "ou=testing05,ou=system" ) );
     }
-
-
+    
+    
     @Test
     public void testOpAttrDenormalizationOff() throws Exception
     {
@@ -654,25 +659,25 @@ public class SearchIT extends AbstractLd
         sysRoot.addToEnvironment( JndiPropertyConstants.JNDI_LDAP_DAP_DEREF_ALIASES, AliasDerefMode.NEVER_DEREF_ALIASES
             .getJndiValue() );
         HashMap<String, Attributes> map = new HashMap<String, Attributes>();
-
+    
         NamingEnumeration<SearchResult> list = sysRoot.search( "", "(ou=testing00)", controls );
-
+    
         while ( list.hasMore() )
         {
             SearchResult result = list.next();
             map.put( result.getName(), result.getAttributes() );
         }
-
+    
         list.close();
-
+    
         assertEquals( "Expected number of results returned was incorrect!", 1, map.size() );
         assertTrue( map.containsKey( "ou=testing00,ou=system" ) );
         Attributes attrs = map.get( "ou=testing00,ou=system" );
         assertEquals( "normalized creator's name", "0.9.2342.19200300.100.1.1=admin,2.5.4.11=system", attrs.get(
             "creatorsName" ).get() );
     }
-
-
+    
+    
     @Test
     public void testOpAttrDenormalizationOn() throws Exception
     {
@@ -685,24 +690,24 @@ public class SearchIT extends AbstractLd
         sysRoot.addToEnvironment( JndiPropertyConstants.JNDI_LDAP_DAP_DEREF_ALIASES, AliasDerefMode.NEVER_DEREF_ALIASES
             .getJndiValue() );
         HashMap<String, Attributes> map = new HashMap<String, Attributes>();
-
+    
         NamingEnumeration<SearchResult> list = sysRoot.search( "", "(ou=testing00)", controls );
-
+    
         while ( list.hasMore() )
         {
             SearchResult result = list.next();
             map.put( result.getName(), result.getAttributes() );
         }
-
+    
         list.close();
-
+    
         assertEquals( "Expected number of results returned was incorrect!", 1, map.size() );
         assertTrue( map.containsKey( "ou=testing00,ou=system" ) );
         Attributes attrs = map.get( "ou=testing00,ou=system" );
         assertEquals( "normalized creator's name", "uid=admin,ou=system", attrs.get( "creatorsName" ).get() );
     }
-
-
+    
+    
     /**
      * Creation of required attributes of a person entry.
      *
@@ -714,26 +719,26 @@ public class SearchIT extends AbstractLd
     {
         Attributes attributes = LdifUtils.createJndiAttributes( "objectClass: top", "objectClass: top",
             "objectClass: person", "cn", cn, "sn", sn );
-
+    
         return attributes;
     }
-
-
+    
+    
     @Test
     public void testBinaryAttributesInFilter() throws Exception
     {
         byte[] certData = new byte[]
             { 0x34, 0x56, 0x4e, 0x5f };
-
+    
         // First let's add a some binary data representing a userCertificate
         Attributes attrs = getPersonAttributes( "Bush", "Kate Bush" );
         attrs.put( "userCertificate", certData );
-
+    
         Attribute objectClasses = attrs.get( "objectClass" );
         objectClasses.add( "strongAuthenticationUser" );
-
+    
         sysRoot.createSubcontext( "cn=Kate Bush", attrs );
-
+    
         // Search for kate by cn first
         SearchControls controls = new SearchControls();
         controls.setSearchScope( SearchControls.ONELEVEL_SCOPE );
@@ -742,22 +747,22 @@ public class SearchIT extends AbstractLd
         SearchResult sr = enm.next();
         assertNotNull( sr );
         assertFalse( enm.hasMore() );
-        
+    
         enm.close();
-        
+    
         assertEquals( "cn=Kate Bush,ou=system", sr.getName() );
-
+    
         enm = sysRoot.search( "", "(userCertificate=\\34\\56\\4E\\5F)", controls );
         assertTrue( enm.hasMore() );
         sr = enm.next();
         assertNotNull( sr );
         assertFalse( enm.hasMore() );
         assertEquals( "cn=Kate Bush,ou=system", sr.getName() );
-
+    
         enm.close();
     }
-
-
+    
+    
     @Test
     public void testSearchOperationalAttr() throws Exception
     {
@@ -769,28 +774,28 @@ public class SearchIT extends AbstractLd
         sysRoot.addToEnvironment( JndiPropertyConstants.JNDI_LDAP_DAP_DEREF_ALIASES, AliasDerefMode.NEVER_DEREF_ALIASES
             .getJndiValue() );
         HashMap<String, Attributes> map = new HashMap<String, Attributes>();
-
+    
         NamingEnumeration<SearchResult> list = sysRoot.search( "", "(ou=testing01)", controls );
-
+    
         while ( list.hasMore() )
         {
             SearchResult result = list.next();
             map.put( result.getName(), result.getAttributes() );
         }
-
+    
         list.close();
-
+    
         assertEquals( "Expected number of results returned was incorrect!", 1, map.size() );
-
+    
         Attributes attrs = map.get( "ou=testing01,ou=system" );
-
+    
         assertNotNull( attrs.get( "createTimestamp" ) );
         assertNotNull( attrs.get( "creatorsName" ) );
         assertNull( attrs.get( "objectClass" ) );
         assertNull( attrs.get( "ou" ) );
     }
-
-
+    
+    
     @Test
     public void testSearchUserAttr() throws Exception
     {
@@ -802,28 +807,28 @@ public class SearchIT extends AbstractLd
         sysRoot.addToEnvironment( JndiPropertyConstants.JNDI_LDAP_DAP_DEREF_ALIASES, AliasDerefMode.NEVER_DEREF_ALIASES
             .getJndiValue() );
         HashMap<String, Attributes> map = new HashMap<String, Attributes>();
-
+    
         NamingEnumeration<SearchResult> list = sysRoot.search( "", "(ou=testing01)", controls );
-
+    
         while ( list.hasMore() )
         {
             SearchResult result = list.next();
             map.put( result.getName(), result.getAttributes() );
         }
-
+    
         list.close();
-
+    
         assertEquals( "Expected number of results returned was incorrect!", 1, map.size() );
-
+    
         Attributes attrs = map.get( "ou=testing01,ou=system" );
-
+    
         assertNotNull( attrs.get( "objectClass" ) );
         assertNotNull( attrs.get( "ou" ) );
         assertNull( attrs.get( "createTimestamp" ) );
         assertNull( attrs.get( "creatorsName" ) );
     }
-
-
+    
+    
     @Test
     public void testSearchUserAttrAndOpAttr() throws Exception
     {
@@ -835,28 +840,28 @@ public class SearchIT extends AbstractLd
         sysRoot.addToEnvironment( JndiPropertyConstants.JNDI_LDAP_DAP_DEREF_ALIASES, AliasDerefMode.NEVER_DEREF_ALIASES
             .getJndiValue() );
         HashMap<String, Attributes> map = new HashMap<String, Attributes>();
-
+    
         NamingEnumeration<SearchResult> list = sysRoot.search( "", "(ou=testing01)", controls );
-
+    
         while ( list.hasMore() )
         {
             SearchResult result = list.next();
             map.put( result.getName(), result.getAttributes() );
         }
-
+    
         list.close();
-
+    
         assertEquals( "Expected number of results returned was incorrect!", 1, map.size() );
-
+    
         Attributes attrs = map.get( "ou=testing01,ou=system" );
-
+    
         assertNotNull( attrs.get( "objectClass" ) );
         assertNotNull( attrs.get( "ou" ) );
         assertNotNull( attrs.get( "creatorsName" ) );
         assertNull( attrs.get( "createTimestamp" ) );
     }
-
-
+    
+    
     @Test
     public void testSearchUserAttrAndNoAttr() throws Exception
     {
@@ -868,28 +873,28 @@ public class SearchIT extends AbstractLd
         sysRoot.addToEnvironment( JndiPropertyConstants.JNDI_LDAP_DAP_DEREF_ALIASES, AliasDerefMode.NEVER_DEREF_ALIASES
             .getJndiValue() );
         HashMap<String, Attributes> map = new HashMap<String, Attributes>();
-
+    
         NamingEnumeration<SearchResult> list = sysRoot.search( "", "(ou=testing01)", controls );
-
+    
         while ( list.hasMore() )
         {
             SearchResult result = list.next();
             map.put( result.getName(), result.getAttributes() );
         }
-
+    
         list.close();
-
+    
         assertEquals( "Expected number of results returned was incorrect!", 1, map.size() );
-
+    
         Attributes attrs = map.get( "ou=testing01,ou=system" );
-
+    
         assertNull( attrs.get( "objectClass" ) );
         assertNotNull( attrs.get( "ou" ) );
         assertNull( attrs.get( "creatorsName" ) );
         assertNull( attrs.get( "createTimestamp" ) );
     }
-
-
+    
+    
     @Test
     public void testSearchNoAttr() throws Exception
     {
@@ -901,28 +906,28 @@ public class SearchIT extends AbstractLd
         sysRoot.addToEnvironment( JndiPropertyConstants.JNDI_LDAP_DAP_DEREF_ALIASES, AliasDerefMode.NEVER_DEREF_ALIASES
             .getJndiValue() );
         HashMap<String, Attributes> map = new HashMap<String, Attributes>();
-
+    
         NamingEnumeration<SearchResult> list = sysRoot.search( "", "(ou=testing01)", controls );
-
+    
         while ( list.hasMore() )
         {
             SearchResult result = list.next();
             map.put( result.getName(), result.getAttributes() );
         }
-
+    
         list.close();
-
+    
         assertEquals( "Expected number of results returned was incorrect!", 1, map.size() );
-
+    
         Attributes attrs = map.get( "ou=testing01,ou=system" );
-
+    
         assertNull( attrs.get( "objectClass" ) );
         assertNull( attrs.get( "ou" ) );
         assertNull( attrs.get( "creatorsName" ) );
         assertNull( attrs.get( "createTimestamp" ) );
     }
-
-
+    
+    
     @Test
     public void testSearchAllAttr() throws Exception
     {
@@ -934,28 +939,28 @@ public class SearchIT extends AbstractLd
         sysRoot.addToEnvironment( JndiPropertyConstants.JNDI_LDAP_DAP_DEREF_ALIASES, AliasDerefMode.NEVER_DEREF_ALIASES
             .getJndiValue() );
         HashMap<String, Attributes> map = new HashMap<String, Attributes>();
-
+    
         NamingEnumeration<SearchResult> list = sysRoot.search( "", "(ou=testing01)", controls );
-
+    
         while ( list.hasMore() )
         {
             SearchResult result = list.next();
             map.put( result.getName(), result.getAttributes() );
         }
-
+    
         list.close();
-
+    
         assertEquals( "Expected number of results returned was incorrect!", 1, map.size() );
-
+    
         Attributes attrs = map.get( "ou=testing01,ou=system" );
-
+    
         assertNotNull( attrs.get( "createTimestamp" ) );
         assertNotNull( attrs.get( "creatorsName" ) );
         assertNotNull( attrs.get( "objectClass" ) );
         assertNotNull( attrs.get( "ou" ) );
     }
-
-
+    
+    
     /**
      * Search an entry and fetch an attribute with unknown option
      * @throws NamingException if there are errors
@@ -968,18 +973,18 @@ public class SearchIT extends AbstractLd
         ctls.setSearchScope( SearchControls.OBJECT_SCOPE );
         ctls.setReturningAttributes( new String[]
             { "cn", "sn;unknownOption", "badAttr" } );
-
+    
         NamingEnumeration<SearchResult> result = sysRoot.search( RDN, FILTER, ctls );
-
+    
         if ( result.hasMore() )
         {
             SearchResult entry = result.next();
             Attributes attrs = entry.getAttributes();
             Attribute cn = attrs.get( "cn" );
-
+    
             assertNotNull( cn );
             assertEquals( "Heather Nova", cn.get().toString() );
-
+    
             Attribute sn = attrs.get( "sn" );
             assertNull( sn );
         }
@@ -987,11 +992,11 @@ public class SearchIT extends AbstractLd
         {
             fail( "entry " + RDN + " not found" );
         }
-
+    
         result.close();
     }
-
-
+    
+    
     /**
      * Search an entry and fetch an attribute and all its subtypes
      * @throws NamingException if there are errors
@@ -1003,23 +1008,23 @@ public class SearchIT extends AbstractLd
         ctls.setSearchScope( SearchControls.OBJECT_SCOPE );
         ctls.setReturningAttributes( new String[]
             { "name" } );
-
+    
         NamingEnumeration<SearchResult> result = sysRoot.search( RDN, FILTER, ctls );
-
+    
         if ( result.hasMore() )
         {
             SearchResult entry = result.next();
             Attributes attrs = entry.getAttributes();
-
+    
             // We should have get cn and sn only
             assertEquals( 2, attrs.size() );
-
+    
             // Check CN
             Attribute cn = attrs.get( "cn" );
-
+    
             assertNotNull( cn );
             assertEquals( "Heather Nova", cn.get().toString() );
-
+    
             // Assert SN
             Attribute sn = attrs.get( "sn" );
             assertNotNull( sn );
@@ -1029,11 +1034,11 @@ public class SearchIT extends AbstractLd
         {
             fail( "entry " + RDN + " not found" );
         }
-
+    
         result.close();
     }
-
-
+    
+    
     /**
      * Search an entry and fetch an attribute with twice the same attributeType
      * @throws NamingException if there are errors
@@ -1045,15 +1050,15 @@ public class SearchIT extends AbstractLd
         ctls.setSearchScope( SearchControls.OBJECT_SCOPE );
         ctls.setReturningAttributes( new String[]
             { "cn", "cn" } );
-
+    
         NamingEnumeration<SearchResult> result = sysRoot.search( RDN, FILTER, ctls );
-
+    
         if ( result.hasMore() )
         {
             SearchResult entry = result.next();
             Attributes attrs = entry.getAttributes();
             Attribute cn = attrs.get( "cn" );
-
+    
             assertNotNull( cn );
             assertEquals( "Heather Nova", cn.get().toString() );
         }
@@ -1061,11 +1066,11 @@ public class SearchIT extends AbstractLd
         {
             fail( "entry " + RDN + " not found" );
         }
-
+    
         result.close();
     }
-
-
+    
+    
     // this one is failing because it returns the admin user twice: count = 15
     //    public void testFilterExpansion3() throws Exception
     //    {
@@ -1097,7 +1102,7 @@ public class SearchIT extends AbstractLd
     //        assertTrue( "contains uid=admin,ou=system", map.contains( "uid=admin,ou=system" ) );
     //        assertTrue( "contains cn=administrators,ou=groups,ou=system", map.contains( "cn=administrators,ou=groups,ou=system" ) );
     //    }
-
+    
     /**
      *  Convenience method that performs a one level search using the
      *  specified filter returning their DNs as Strings in a set.
@@ -1113,22 +1118,22 @@ public class SearchIT extends AbstractLd
         {
             controls = new SearchControls();
         }
-
+    
         Set<String> results = new HashSet<String>();
         NamingEnumeration<SearchResult> list = getSystemContext( getService() ).search( "ou=groups", filter, controls );
-
+    
         while ( list.hasMore() )
         {
             SearchResult result = list.next();
             results.add( result.getName() );
         }
-        
+    
         list.close();
-
+    
         return results;
     }
-
-
+    
+    
     /**
      *  Convenience method that performs a one level search using the
      *  specified filter returning their DNs as Strings in a set.
@@ -1141,8 +1146,8 @@ public class SearchIT extends AbstractLd
     {
         return searchGroups( filter, null );
     }
-
-
+    
+    
     /**
      *  Convenience method that performs a one level search using the
      *  specified filter returning their DNs as Strings in a set.
@@ -1154,22 +1159,22 @@ public class SearchIT extends AbstractLd
     public Set<String> searchRevisions( String filter ) throws Exception
     {
         SearchControls controls = new SearchControls();
-
+    
         Set<String> results = new HashSet<String>();
         NamingEnumeration<SearchResult> list = getSystemContext( getService() ).search( "", filter, controls );
-
+    
         while ( list.hasMore() )
         {
             SearchResult result = list.next();
             results.add( result.getName() );
         }
-        
+    
         list.close();
-
+    
         return results;
     }
-
-
+    
+    
     /**
      *  Convenience method that performs a one level search using the
      *  specified filter returning their DNs as Strings in a set.
@@ -1185,22 +1190,22 @@ public class SearchIT extends AbstractLd
         {
             controls = new SearchControls();
         }
-
+    
         Set<String> results = new HashSet<String>();
         NamingEnumeration<SearchResult> list = getSystemContext( getService() ).search( "", filter, controls );
-
+    
         while ( list.hasMore() )
         {
             SearchResult result = list.next();
             results.add( result.getName() );
         }
-        
+    
         list.close();
-
+    
         return results;
     }
-
-
+    
+    
     @Test
     public void testSetup() throws Exception
     {
@@ -1212,8 +1217,8 @@ public class SearchIT extends AbstractLd
         assertTrue( results.contains( "cn=testGroup4,ou=groups,ou=system" ) );
         assertTrue( results.contains( "cn=testGroup5,ou=groups,ou=system" ) );
     }
-
-
+    
+    
     @Test
     public void testLessThanSearch() throws Exception
     {
@@ -1224,7 +1229,7 @@ public class SearchIT extends AbstractLd
         assertFalse( results.contains( "cn=testGroup3,ou=groups,ou=system" ) );
         assertTrue( results.contains( "cn=testGroup4,ou=groups,ou=system" ) );
         assertTrue( results.contains( "cn=testGroup5,ou=groups,ou=system" ) );
-
+    
         results = searchGroups( "(gidNumber<=4)" );
         assertTrue( results.contains( "cn=testGroup0,ou=groups,ou=system" ) );
         assertTrue( results.contains( "cn=testGroup1,ou=groups,ou=system" ) );
@@ -1232,7 +1237,7 @@ public class SearchIT extends AbstractLd
         assertFalse( results.contains( "cn=testGroup3,ou=groups,ou=system" ) );
         assertTrue( results.contains( "cn=testGroup4,ou=groups,ou=system" ) );
         assertFalse( results.contains( "cn=testGroup5,ou=groups,ou=system" ) );
-
+    
         results = searchGroups( "(gidNumber<=3)" );
         assertTrue( results.contains( "cn=testGroup0,ou=groups,ou=system" ) );
         assertTrue( results.contains( "cn=testGroup1,ou=groups,ou=system" ) );
@@ -1240,7 +1245,7 @@ public class SearchIT extends AbstractLd
         assertFalse( results.contains( "cn=testGroup3,ou=groups,ou=system" ) );
         assertFalse( results.contains( "cn=testGroup4,ou=groups,ou=system" ) );
         assertFalse( results.contains( "cn=testGroup5,ou=groups,ou=system" ) );
-
+    
         results = searchGroups( "(gidNumber<=0)" );
         assertTrue( results.contains( "cn=testGroup0,ou=groups,ou=system" ) );
         assertFalse( results.contains( "cn=testGroup1,ou=groups,ou=system" ) );
@@ -1248,7 +1253,7 @@ public class SearchIT extends AbstractLd
         assertFalse( results.contains( "cn=testGroup3,ou=groups,ou=system" ) );
         assertFalse( results.contains( "cn=testGroup4,ou=groups,ou=system" ) );
         assertFalse( results.contains( "cn=testGroup5,ou=groups,ou=system" ) );
-
+    
         results = searchGroups( "(gidNumber<=-1)" );
         assertFalse( results.contains( "cn=testGroup0,ou=groups,ou=system" ) );
         assertFalse( results.contains( "cn=testGroup1,ou=groups,ou=system" ) );
@@ -1257,8 +1262,8 @@ public class SearchIT extends AbstractLd
         assertFalse( results.contains( "cn=testGroup4,ou=groups,ou=system" ) );
         assertFalse( results.contains( "cn=testGroup5,ou=groups,ou=system" ) );
     }
-
-
+    
+    
     @Test
     public void testGreaterThanSearch() throws Exception
     {
@@ -1269,7 +1274,7 @@ public class SearchIT extends AbstractLd
         assertFalse( results.contains( "cn=testGroup3,ou=groups,ou=system" ) );
         assertTrue( results.contains( "cn=testGroup4,ou=groups,ou=system" ) );
         assertTrue( results.contains( "cn=testGroup5,ou=groups,ou=system" ) );
-
+    
         results = searchGroups( "(gidNumber>=1)" );
         assertFalse( results.contains( "cn=testGroup0,ou=groups,ou=system" ) );
         assertTrue( results.contains( "cn=testGroup1,ou=groups,ou=system" ) );
@@ -1277,7 +1282,7 @@ public class SearchIT extends AbstractLd
         assertFalse( results.contains( "cn=testGroup3,ou=groups,ou=system" ) );
         assertTrue( results.contains( "cn=testGroup4,ou=groups,ou=system" ) );
         assertTrue( results.contains( "cn=testGroup5,ou=groups,ou=system" ) );
-
+    
         results = searchGroups( "(gidNumber>=3)" );
         assertFalse( results.contains( "cn=testGroup0,ou=groups,ou=system" ) );
         assertFalse( results.contains( "cn=testGroup1,ou=groups,ou=system" ) );
@@ -1285,7 +1290,7 @@ public class SearchIT extends AbstractLd
         assertFalse( results.contains( "cn=testGroup3,ou=groups,ou=system" ) );
         assertTrue( results.contains( "cn=testGroup4,ou=groups,ou=system" ) );
         assertTrue( results.contains( "cn=testGroup5,ou=groups,ou=system" ) );
-
+    
         results = searchGroups( "(gidNumber>=6)" );
         assertFalse( results.contains( "cn=testGroup0,ou=groups,ou=system" ) );
         assertFalse( results.contains( "cn=testGroup1,ou=groups,ou=system" ) );
@@ -1294,8 +1299,8 @@ public class SearchIT extends AbstractLd
         assertFalse( results.contains( "cn=testGroup4,ou=groups,ou=system" ) );
         assertFalse( results.contains( "cn=testGroup5,ou=groups,ou=system" ) );
     }
-
-
+    
+    
     @Test
     public void testNotOperator() throws Exception
     {
@@ -1307,14 +1312,14 @@ public class SearchIT extends AbstractLd
         assertFalse( results.contains( "cn=testGroup4,ou=groups,ou=system" ) );
         assertTrue( results.contains( "cn=testGroup5,ou=groups,ou=system" ) );
     }
-
-
+    
+    
     @Test
     public void testNotOperatorSubtree() throws Exception
     {
         SearchControls controls = new SearchControls();
         controls.setSearchScope( SearchControls.SUBTREE_SCOPE );
-
+    
         Set<String> results = searchGroups( "(!(gidNumber=4))", controls );
         assertTrue( results.contains( "cn=testGroup0,ou=groups,ou=system" ) );
         assertTrue( results.contains( "cn=testGroup1,ou=groups,ou=system" ) );
@@ -1323,73 +1328,73 @@ public class SearchIT extends AbstractLd
         assertFalse( results.contains( "cn=testGroup4,ou=groups,ou=system" ) );
         assertTrue( results.contains( "cn=testGroup5,ou=groups,ou=system" ) );
     }
-
-
+    
+    
     @Test
     public void testSearchWithEscapedCharsInFilter() throws Exception
     {
         // Create entry cn=Sid Vicious, ou=system
         Attributes vicious = LdifUtils.createJndiAttributes( "objectClass: top", "objectClass: person", "cn: Sid Vicious",
             "sn: Vicious", "description: (sex*pis\\tols)" );
-
+    
         DirContext ctx = sysRoot.createSubcontext( "cn=Sid Vicious", vicious );
         assertNotNull( ctx );
-
+    
         ctx = ( DirContext ) sysRoot.lookup( "cn=Sid Vicious" );
         assertNotNull( ctx );
-
+    
         Attributes attributes = ctx.getAttributes( "" );
-
+    
         assertEquals( "(sex*pis\\tols)", attributes.get( "description" ).get() );
-
+    
         // Now, search for the description
         SearchControls controls = new SearchControls();
         controls.setSearchScope( SearchControls.SUBTREE_SCOPE );
         controls.setDerefLinkFlag( false );
-
+    
         controls.setReturningAttributes( new String[]
             { "*" } );
         sysRoot.addToEnvironment( JndiPropertyConstants.JNDI_LDAP_DAP_DEREF_ALIASES, AliasDerefMode.NEVER_DEREF_ALIASES
             .getJndiValue() );
         HashMap<String, Attributes> map = new HashMap<String, Attributes>();
-
+    
         NamingEnumeration<SearchResult> list = sysRoot
             .search( "", "(description=\\28sex\\2Apis\\5Ctols\\29)", controls );
-
+    
         while ( list.hasMore() )
         {
             SearchResult result = list.next();
             map.put( result.getName(), result.getAttributes() );
         }
-
+    
         list.close();
-
+    
         assertEquals( "Expected number of results returned was incorrect!", 1, map.size() );
-
+    
         Attributes attrs = map.get( "cn=Sid Vicious,ou=system" );
-
+    
         assertNotNull( attrs.get( "objectClass" ) );
         assertNotNull( attrs.get( "cn" ) );
     }
-
-
+    
+    
     @Test
     public void testSubstringSearchWithEscapedCharsInFilter() throws Exception
     {
         // Create entry cn=Sid Vicious, ou=system
         Attributes vicious = LdifUtils.createJndiAttributes( "objectClass: top", "objectClass: person", "cn: Sid Vicious",
             "sn: Vicious", "description: (sex*pis\\tols)" );
-
+    
         DirContext ctx = sysRoot.createSubcontext( "cn=Sid Vicious", vicious );
         assertNotNull( ctx );
-
+    
         ctx = ( DirContext ) sysRoot.lookup( "cn=Sid Vicious" );
         assertNotNull( ctx );
-
+    
         Attributes attributes = ctx.getAttributes( "" );
-
+    
         assertEquals( "(sex*pis\\tols)", attributes.get( "description" ).get() );
-
+    
         // Now, search for the description
         SearchControls controls = new SearchControls();
         controls.setSearchScope( SearchControls.SUBTREE_SCOPE );
@@ -1398,64 +1403,64 @@ public class SearchIT extends AbstractLd
             { "*" } );
         sysRoot.addToEnvironment( JndiPropertyConstants.JNDI_LDAP_DAP_DEREF_ALIASES, AliasDerefMode.NEVER_DEREF_ALIASES
             .getJndiValue() );
-
+    
         String[] filters = new String[]
             { "(description=*\\28*)", "(description=*\\29*)", "(description=*\\2A*)", "(description=*\\5C*)" };
-        
+    
         for ( String filter : filters )
         {
             HashMap<String, Attributes> map = new HashMap<String, Attributes>();
             NamingEnumeration<SearchResult> list = sysRoot.search( "", filter, controls );
-
+    
             while ( list.hasMore() )
             {
                 SearchResult result = list.next();
                 map.put( result.getName(), result.getAttributes() );
             }
-
+    
             list.close();
-
+    
             assertEquals( "Expected number of results returned was incorrect!", 1, map.size() );
-
+    
             Attributes attrs = map.get( "cn=Sid Vicious,ou=system" );
-
+    
             assertNotNull( attrs.get( "objectClass" ) );
             assertNotNull( attrs.get( "cn" ) );
         }
     }
-
-
+    
+    
     @Test
     public void testSubstringSearchWithEscapedAsterisksInFilter_DIRSERVER_1181() throws Exception
     {
         Attributes vicious = LdifUtils.createJndiAttributes( "objectClass: top", "objectClass: person", "cn: x*y*z*",
             "sn: x*y*z*", "description: (sex*pis\\tols)" );
-
+    
         sysRoot.createSubcontext( "cn=x*y*z*", vicious );
-
+    
         SearchControls controls = new SearchControls();
         controls.setSearchScope( SearchControls.ONELEVEL_SCOPE );
         controls.setReturningAttributes( new String[]
             { "cn" } );
         NamingEnumeration<SearchResult> res;
-
+    
         res = sysRoot.search( "", "(cn=*x\\2Ay\\2Az\\2A*)", controls );
         assertTrue( res.hasMore() );
         assertEquals( "x*y*z*", res.next().getAttributes().get( "cn" ).get() );
         assertFalse( res.hasMore() );
-
+    
         res.close();
-        
+    
         res = sysRoot.search( "", "(cn=*{0}*)", new String[]
             { "x*y*z*" }, controls );
         assertTrue( res.hasMore() );
         assertEquals( "x*y*z*", res.next().getAttributes().get( "cn" ).get() );
         assertFalse( res.hasMore() );
-        
+    
         res.close();
     }
-
-
+    
+    
     /**
      * Test a search with a bad filter : there is a missing closing ')'
      */
@@ -1467,7 +1472,7 @@ public class SearchIT extends AbstractLd
         controls.setDerefLinkFlag( false );
         sysRoot.addToEnvironment( JndiPropertyConstants.JNDI_LDAP_DAP_DEREF_ALIASES, AliasDerefMode.NEVER_DEREF_ALIASES
             .getJndiValue() );
-
+    
         try
         {
             sysRoot.search( "", "(|(name=testing00)(name=testing01)", controls );
@@ -1478,8 +1483,8 @@ public class SearchIT extends AbstractLd
             assertTrue( true );
         }
     }
-
-
+    
+    
     /**
      * Search operation with a base Dn with quotes
      * Commented as it's not valid by RFC 5514
@@ -1488,21 +1493,21 @@ public class SearchIT extends AbstractLd
     {
         LdapContext sysRoot = getSystemContext( getService() );
         createData( sysRoot );
-
+    
         SearchControls ctls = new SearchControls();
         ctls.setSearchScope( SearchControls.OBJECT_SCOPE );
         String filter = "(cn=Tori Amos)";
         ctls.setReturningAttributes( new String[]
             { "cn", "cn" } );
-
+    
         // Search for cn="Tori Amos" (with quotes)
         String base = "cn=\"Tori Amos\"";
-
+    
         try {
             // Check entry
             NamingEnumeration<SearchResult> result = sysRoot.search( base, filter, ctls );
             assertTrue( result.hasMore() );
-
+    
             while ( result.hasMore() )
             {
                 SearchResult sr = result.next();
@@ -1517,7 +1522,7 @@ public class SearchIT extends AbstractLd
         }
     }
     */
-
+    
     /**
     * Added to test correct comparison of integer attribute types when searching.
     * testGreaterThanSearch and testLesserThanSearch fail to detect the problem using values less than 10.
@@ -1536,8 +1541,8 @@ public class SearchIT extends AbstractLd
         assertFalse( results.contains( "ou=testing04,ou=system" ) );
         assertFalse( results.contains( "ou=testing05,ou=system" ) );
     }
-
-
+    
+    
     /**
      * Added to test correct comparison of integer attribute types when searching.
      * testGreaterThanSearch and testLesserThanSearch fail to detect the problem using values less than 10.
@@ -1556,8 +1561,8 @@ public class SearchIT extends AbstractLd
         assertTrue( results.contains( "ou=testing04,ou=system" ) );
         assertTrue( results.contains( "ou=testing05,ou=system" ) );
     }
-
-
+    
+    
     /**
      * Added to test correct comparison of integer attribute types when searching.
      * testGreaterThanSearch and testLesserThanSearch fail to detect the problem using values less than 10.
@@ -1576,8 +1581,8 @@ public class SearchIT extends AbstractLd
         assertTrue( results.contains( "ou=testing04,ou=system" ) );
         assertTrue( results.contains( "ou=testing05,ou=system" ) );
     }
-
-
+    
+    
     /**
      * Added to test correct comparison of integer attribute types when searching.
      * testGreaterThanSearch and testLesserThanSearch fail to detect the problem using values less than 10.
@@ -1597,31 +1602,31 @@ public class SearchIT extends AbstractLd
         assertFalse( results.contains( "ou=testing04,ou=system" ) );
         assertTrue( results.contains( "ou=testing05,ou=system" ) );
     }
-
-
+    
+    
     @Test
     public void testSearchTelephoneNumber() throws Exception
     {
         SearchControls controls = new SearchControls();
         controls.setSearchScope( SearchControls.ONELEVEL_SCOPE );
-
+    
         HashMap<String, Attributes> map = new HashMap<String, Attributes>();
-
+    
         NamingEnumeration<SearchResult> list = sysRoot.search( "", "(telephoneNumber=18015551212)", controls );
-
+    
         while ( list.hasMore() )
         {
             SearchResult result = list.next();
             map.put( result.getName(), result.getAttributes() );
         }
-
+    
         list.close();
-
+    
         assertEquals( "Expected number of results returned was incorrect!", 2, map.size() );
         assertTrue( map.containsKey( "cn=Heather Nova, ou=system" ) || map.containsKey( "cn=Heather Nova,ou=system" ) );
     }
-
-
+    
+    
     @Test
     public void testSearchDN() throws Exception
     {
@@ -1630,24 +1635,24 @@ public class SearchIT extends AbstractLd
         controls.setDerefLinkFlag( false );
         sysRoot.addToEnvironment( JndiPropertyConstants.JNDI_LDAP_DAP_DEREF_ALIASES, AliasDerefMode.NEVER_DEREF_ALIASES
             .getJndiValue() );
-
+    
         HashMap<String, Attributes> map = new HashMap<String, Attributes>();
-
+    
         NamingEnumeration<SearchResult> list = sysRoot.search( "", "(manager=cn=Heather Nova, ou=system)", controls );
-
+    
         while ( list.hasMore() )
         {
             SearchResult result = list.next();
             map.put( result.getName(), result.getAttributes() );
         }
-
+    
         list.close();
-
+    
         assertEquals( "Expected number of results returned was incorrect", 1, map.size() );
         assertTrue( map.containsKey( "cn=with-dn, ou=system" ) || map.containsKey( "cn=with-dn,ou=system" ) );
     }
-
-
+    
+    
     @Test
     public void testComplexFilter() throws Exception
     {
@@ -1656,25 +1661,25 @@ public class SearchIT extends AbstractLd
         controls.setDerefLinkFlag( false );
         sysRoot.addToEnvironment( JndiPropertyConstants.JNDI_LDAP_DAP_DEREF_ALIASES, AliasDerefMode.NEVER_DEREF_ALIASES
             .getJndiValue() );
-
+    
         // Create an entry which does not match
         Attributes attrs = LdifUtils.createJndiAttributes( "objectClass: top", "objectClass: groupOfUniqueNames",
             "cn: testGroup3", "uniqueMember: uid=admin,ou=system" );
-
+    
         getSystemContext( getService() ).createSubcontext( "cn=testGroup3,ou=groups", attrs );
-
+    
         HashMap<String, Attributes> map = new HashMap<String, Attributes>();
         String filter = "(|(&(|(2.5.4.0=posixgroup)(2.5.4.0=groupofuniquenames)(2.5.4.0=groupofnames)(2.5.4.0=group))(!(|(2.5.4.50=uid=admin,ou=system)(2.5.4.31=0.9.2342.19200300.100.1.1=admin,2.5.4.11=system))))(objectClass=referral))";
         NamingEnumeration<SearchResult> list = sysRoot.search( "", filter, controls );
-
+    
         while ( list.hasMore() )
         {
             SearchResult result = list.next();
             map.put( result.getName(), result.getAttributes() );
         }
-        
+    
         list.close();
-
+    
         assertEquals( "size of results", 5, map.size() );
         assertTrue( map.containsKey( "cn=testGroup0,ou=groups,ou=system" ) );
         assertTrue( map.containsKey( "cn=testGroup1,ou=groups,ou=system" ) );
@@ -1683,8 +1688,8 @@ public class SearchIT extends AbstractLd
         assertTrue( map.containsKey( "cn=testGroup5,ou=groups,ou=system" ) );
         assertFalse( map.containsKey( "cn=testGroup3,ou=groups,ou=system" ) );
     }
-
-
+    
+    
     /**
      *  NO attributes should be returned
      */
@@ -1699,27 +1704,27 @@ public class SearchIT extends AbstractLd
         sysRoot.addToEnvironment( JndiPropertyConstants.JNDI_LDAP_DAP_DEREF_ALIASES, AliasDerefMode.NEVER_DEREF_ALIASES
             .getJndiValue() );
         sysRoot.addToEnvironment( "java.naming.ldap.typesOnly", "true" );
-
+    
         HashMap<String, Attributes> map = new HashMap<String, Attributes>();
-
+    
         NamingEnumeration<SearchResult> list = sysRoot.search( "", "(ou=testing01)", controls );
-
+    
         while ( list.hasMore() )
         {
             SearchResult result = list.next();
             map.put( result.getName(), result.getAttributes() );
         }
-
+    
         list.close();
-
+    
         assertEquals( "Expected number of results returned was incorrect!", 1, map.size() );
-
+    
         Attributes attrs = map.get( "ou=testing01,ou=system" );
-
+    
         assertEquals( 0, attrs.size() );
     }
-
-
+    
+    
     /**
      * operational attributes with no values must be returned
      */
@@ -1734,31 +1739,31 @@ public class SearchIT extends AbstractLd
         sysRoot.addToEnvironment( JndiPropertyConstants.JNDI_LDAP_DAP_DEREF_ALIASES, AliasDerefMode.NEVER_DEREF_ALIASES
             .getJndiValue() );
         sysRoot.addToEnvironment( "java.naming.ldap.typesOnly", "true" );
-
+    
         HashMap<String, Attributes> map = new HashMap<String, Attributes>();
-
+    
         NamingEnumeration<SearchResult> list = sysRoot.search( "", "(ou=testing01)", controls );
-
+    
         while ( list.hasMore() )
         {
             SearchResult result = list.next();
             map.put( result.getName(), result.getAttributes() );
         }
-
+    
         list.close();
-
+    
         assertEquals( "Expected number of results returned was incorrect!", 1, map.size() );
-
+    
         Attributes attrs = map.get( "ou=testing01,ou=system" );
-
+    
         assertNotNull( attrs.get( SchemaConstants.ENTRY_UUID_AT ) );
         assertNotNull( attrs.get( SchemaConstants.CREATORS_NAME_AT ) );
-
+    
         assertEquals( 0, attrs.get( SchemaConstants.ENTRY_UUID_AT ).size() );
         assertEquals( 0, attrs.get( SchemaConstants.CREATORS_NAME_AT ).size() );
     }
-
-
+    
+    
     /**
      * all user attributes with no values must be returned
      */
@@ -1771,138 +1776,139 @@ public class SearchIT extends AbstractLd
         sysRoot.addToEnvironment( JndiPropertyConstants.JNDI_LDAP_DAP_DEREF_ALIASES, AliasDerefMode.NEVER_DEREF_ALIASES
             .getJndiValue() );
         sysRoot.addToEnvironment( "java.naming.ldap.typesOnly", "true" );
-
+    
         HashMap<String, Attributes> map = new HashMap<String, Attributes>();
-
+    
         NamingEnumeration<SearchResult> list = sysRoot.search( "", "(ou=testing01)", controls );
-
+    
         while ( list.hasMore() )
         {
             SearchResult result = list.next();
             map.put( result.getName(), result.getAttributes() );
         }
-
+    
         list.close();
-
+    
         assertEquals( "Expected number of results returned was incorrect!", 1, map.size() );
-
+    
         Attributes attrs = map.get( "ou=testing01,ou=system" );
-
+    
         assertNotNull( attrs.get( SchemaConstants.OU_AT ) );
         assertNotNull( attrs.get( "integerAttribute" ) );
-
+    
         assertEquals( 0, attrs.get( SchemaConstants.OU_AT ).size() );
         assertEquals( 0, attrs.get( "integerAttribute" ).size() );
-
+    
         assertNull( attrs.get( SchemaConstants.ENTRY_UUID_AT ) );
         assertNull( attrs.get( SchemaConstants.CREATORS_NAME_AT ) );
     }
-
-
+    
+    
     @Test
     public void testSearchEmptyDNWithOneLevelScope() throws Exception
     {
         SearchControls controls = new SearchControls();
         controls.setSearchScope( SearchControls.ONELEVEL_SCOPE );
         controls.setDerefLinkFlag( false );
-
+    
         LdapContext nullRootCtx = getRootContext( getService() );
-
+    
         NamingEnumeration<SearchResult> list = nullRootCtx.search( "", "(objectClass=*)", controls );
         HashMap<String, Attributes> map = new HashMap<String, Attributes>();
-
+    
         while ( list.hasMore() )
         {
             SearchResult result = list.next();
             map.put( result.getName(), result.getAttributes() );
         }
-
+    
         list.close();
-
+    
         assertEquals( 2, map.size() );
-
+    
         assertTrue( map.containsKey( "ou=system" ) );
         assertTrue( map.containsKey( "ou=schema" ) );
     }
-
-
+    
+    
     @Test
     public void testSearchEmptyDNWithSubLevelScope() throws Exception
     {
         SearchControls controls = new SearchControls();
         controls.setSearchScope( SearchControls.SUBTREE_SCOPE );
         controls.setDerefLinkFlag( false );
-
+    
         LdapContext nullRootCtx = getRootContext( getService() );
-
+    
         NamingEnumeration<SearchResult> list = nullRootCtx.search( "", "(objectClass=organizationalUnit)", controls );
         HashMap<String, Attributes> map = new HashMap<String, Attributes>();
-
+    
         while ( list.hasMore() )
         {
             SearchResult result = list.next();
             map.put( result.getName(), result.getAttributes() );
         }
-
+    
         list.close();
-
+    
         assertTrue( map.size() > 2 );
-
+    
         assertTrue( map.containsKey( "ou=system" ) );
         assertTrue( map.containsKey( "ou=schema" ) );
     }
-
-
+    
+    
     @Test
     public void testSearchEmptyDNWithObjectScopeAndNoObjectClassPresenceFilter() throws Exception
     {
         SearchControls controls = new SearchControls();
         controls.setSearchScope( SearchControls.OBJECT_SCOPE );
         controls.setDerefLinkFlag( false );
-
+    
         LdapContext nullRootCtx = getRootContext( getService() );
-
+    
         NamingEnumeration<SearchResult> list = nullRootCtx.search( "", "(objectClass=domain)", controls );
         HashMap<String, Attributes> map = new HashMap<String, Attributes>();
-
+    
         while ( list.hasMore() )
         {
             SearchResult result = list.next();
             map.put( result.getName(), result.getAttributes() );
         }
-
+    
         list.close();
-
+    
         assertEquals( 0, map.size() );
-
+    
         assertFalse( map.containsKey( "ou=system" ) );
         assertFalse( map.containsKey( "ou=schema" ) );
     }
-
-
+    
+    
     @Test
     public void testSearchRootDSE() throws Exception
     {
         SearchControls controls = new SearchControls();
         controls.setSearchScope( SearchControls.OBJECT_SCOPE );
         controls.setDerefLinkFlag( false );
-        controls.setReturningAttributes( new String[]{ "*", "+" } );
-
+        controls.setReturningAttributes( new String[]
+            { "*", "+" } );
+    
         LdapContext nullRootCtx = getRootContext( getService() );
-
+    
         NamingEnumeration<SearchResult> list = nullRootCtx.search( "", "(objectClass=*)", controls );
         Attributes rootDse = null;
-
+    
         while ( list.hasMore() )
         {
             SearchResult result = list.next();
             rootDse = result.getAttributes();
         }
-
+    
         list.close();
-
+    
         assertNotNull( rootDse );
-        
+    
         assertEquals( 10, rootDse.size() );
         assertNotNull( rootDse.get( "objectClass" ) );
         assertNotNull( rootDse.get( "entryUUID" ) );
@@ -1915,89 +1921,89 @@ public class SearchIT extends AbstractLd
         assertNotNull( rootDse.get( "vendorName" ) );
         assertNotNull( rootDse.get( "vendorVersion" ) );
     }
-
-
+    
+    
     @Test
     public void testSearchEmptyDNWithOneLevelScopeAndNoObjectClassPresenceFilter() throws Exception
     {
         SearchControls controls = new SearchControls();
         controls.setSearchScope( SearchControls.ONELEVEL_SCOPE );
         controls.setDerefLinkFlag( false );
-
+    
         LdapContext nullRootCtx = getRootContext( getService() );
-
+    
         NamingEnumeration<SearchResult> list = nullRootCtx.search( "", "(cn=*)", controls );
         HashMap<String, Attributes> map = new HashMap<String, Attributes>();
-
+    
         while ( list.hasMore() )
         {
             SearchResult result = list.next();
             map.put( result.getName(), result.getAttributes() );
         }
-
+    
         list.close();
-
+    
         assertEquals( 0, map.size() );
-
+    
         assertFalse( map.containsKey( "ou=system" ) );
         assertFalse( map.containsKey( "ou=schema" ) );
     }
-
-
+    
+    
     @Test
     public void testCsnLessEqualitySearch() throws Exception
     {
         LdapConnection connection = IntegrationUtils.getAdminConnection( getService() );
-
+    
         Dn dn = new Dn( "cn=testLowerCsnAdd,ou=system" );
         Entry entry = new DefaultEntry( dn );
         entry.add( "objectClass", SchemaConstants.PERSON_OC );
         entry.add( "cn", "testLowerCsnAdd_cn" );
         entry.add( "sn", "testLowerCsnAdd_sn" );
-
+    
         connection.add( entry );
-
+    
         // add an entry to have a entry with higher CSN value
         Dn dn2 = new Dn( "cn=testHigherCsnAdd,ou=system" );
         Entry entry2 = new DefaultEntry( dn2,
             "objectClass :person",
             "cn: testHigherCsnAdd_cn",
             "sn: testHigherCsnAdd_sn" );
-
+    
         connection.add( entry2 );
-
+    
         entry = connection.lookup( dn.getName(), "+" );
         entry2 = connection.lookup( dn2.getName(), "+" );
-
+    
         String lowerCsn = entry.get( "entryCsn" ).getString();
         String higherCsn = entry2.get( "entryCsn" ).getString();
-
+    
         // usecases
         // 1.1 Less than or Equal ( with the lower csn value)
         testUseCases( lowerCsn, new String[]
             { lowerCsn }, connection, 1 );
-
+    
         // 1.2 Less than or equals with a highest csn value
         testUseCases( higherCsn, new String[]
             { higherCsn, lowerCsn }, connection, 1 );
-
+    
         // 2.1 Greater than or Equal ( with the highest csn value )
         testUseCases( higherCsn, new String[]
             { higherCsn }, connection, 2 );
-
+    
         // 2.2 Greater than or Equal ( with lower csn value )
         testUseCases( lowerCsn, new String[]
             { higherCsn, lowerCsn }, connection, 2 );
     }
-
-
+    
+    
     private void testUseCases( String filterCsnVal, String[] expectedCsns, LdapConnection connection, int useCaseNum )
         throws Exception
     {
         Value<String> val = new StringValue( filterCsnVal );
         AttributeType entryCsnAt = getService().getSchemaManager().getAttributeType( SchemaConstants.ENTRY_CSN_AT );
         ExprNode filter = null;
-
+    
         if ( useCaseNum == 1 )
         {
             filter = new LessEqNode( entryCsnAt, val );
@@ -2006,29 +2012,29 @@ public class SearchIT extends AbstractLd
         {
             filter = new GreaterEqNode( entryCsnAt, val );
         }
-
+    
         Entry loadedEntry = null;
-
+    
         Set<String> csnSet = new HashSet<String>( expectedCsns.length );
         EntryCursor cursor = connection.search( "ou=system", filter.toString(), SearchScope.ONELEVEL, "*", "+" );
-        
+    
         while ( cursor.next() )
         {
             loadedEntry = cursor.get();
             csnSet.add( loadedEntry.get( SchemaConstants.ENTRY_CSN_AT ).getString() );
         }
-        
+    
         cursor.close();
-
+    
         assertTrue( csnSet.size() >= expectedCsns.length );
-
+    
         for ( String csn : expectedCsns )
         {
             assertTrue( csnSet.contains( csn ) );
         }
     }
-
-
+    
+    
     @Test
     public void testSearchFilterWithBadAttributeType() throws Exception
     {
@@ -2038,23 +2044,23 @@ public class SearchIT extends AbstractLd
         sysRoot.addToEnvironment( JndiPropertyConstants.JNDI_LDAP_DAP_DEREF_ALIASES, AliasDerefMode.NEVER_DEREF_ALIASES
             .getJndiValue() );
         HashMap<String, Attributes> map = new HashMap<String, Attributes>();
-
+    
         NamingEnumeration<SearchResult> list = sysRoot.search( "", "(|(badAttr={0})(ou={1}))", new Object[]
             { "testing00", "testing01" }, controls );
-
+    
         while ( list.hasMore() )
         {
             SearchResult result = list.next();
             map.put( result.getName(), result.getAttributes() );
         }
-        
+    
         list.close();
-
+    
         assertEquals( "Expected number of results returned was incorrect!", 1, map.size() );
         assertTrue( map.containsKey( "ou=testing01,ou=system" ) );
     }
-
-
+    
+    
     @Test
     public void testSearchFilterBadAttributeType() throws Exception
     {
@@ -2064,17 +2070,17 @@ public class SearchIT extends AbstractLd
         sysRoot.addToEnvironment( JndiPropertyConstants.JNDI_LDAP_DAP_DEREF_ALIASES, AliasDerefMode.NEVER_DEREF_ALIASES
             .getJndiValue() );
         HashMap<String, Attributes> map = new HashMap<String, Attributes>();
-
+    
         NamingEnumeration<SearchResult> list = sysRoot.search( "", "(badAttr=*)", controls );
-
+    
         while ( list.hasMore() )
         {
             SearchResult result = list.next();
             map.put( result.getName(), result.getAttributes() );
         }
-
+    
         list.close();
-
+    
         assertEquals( "Expected number of results returned was incorrect!", 0, map.size() );
     }
 }



Mime
View raw message