directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r896599 [6/30] - in /directory/apacheds/trunk: ./ avl-partition/ avl-partition/src/ avl-partition/src/main/ avl-partition/src/main/java/ avl-partition/src/main/java/org/ avl-partition/src/main/java/org/apache/ avl-partition/src/main/java/or...
Date Wed, 06 Jan 2010 18:27:19 GMT
Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/DestroyContextIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/DestroyContextIT.java?rev=896599&r1=896598&r2=896599&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/DestroyContextIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/DestroyContextIT.java Wed Jan  6 18:26:43 2010
@@ -20,25 +20,20 @@
 package org.apache.directory.server.core.jndi;
 
 
-import org.apache.directory.server.core.DirectoryService;
-import org.apache.directory.server.core.integ.CiRunner;
 import static org.apache.directory.server.core.integ.IntegrationUtils.getSystemContext;
-import org.apache.directory.shared.ldap.exception.LdapNameNotFoundException;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
-import org.junit.Test;
-import org.junit.runner.RunWith;
 
 import javax.naming.NamingException;
-import javax.naming.directory.Attribute;
-import javax.naming.directory.Attributes;
-import javax.naming.directory.BasicAttribute;
-import javax.naming.directory.BasicAttributes;
-import javax.naming.directory.DirContext;
 import javax.naming.ldap.LdapContext;
 
+import org.apache.directory.server.core.annotations.ApplyLdifs;
+import org.apache.directory.server.core.integ.AbstractLdapTestUnit;
+import org.apache.directory.server.core.integ.FrameworkRunner;
+import org.apache.directory.shared.ldap.exception.LdapNameNotFoundException;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
 
 /**
  * Tests the destroyContext methods of the provider.
@@ -46,117 +41,30 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$
  */
-@RunWith ( CiRunner.class )
-public class DestroyContextIT
+@RunWith ( FrameworkRunner.class )
+@ApplyLdifs({
+    "dn: ou=testing00,ou=system",
+    "objectclass: top",
+    "objectclass: organizationalUnit",
+    "ou: testing00",
+    "",
+    "dn: ou=testing01,ou=system",
+    "objectclass: top",
+    "objectclass: organizationalUnit",
+    "ou: testing01",
+    "",
+    "dn: ou=testing02,ou=system",
+    "objectclass: top",
+    "objectclass: organizationalUnit",
+    "ou: testing02",
+    "",
+    "dn: ou=subtest,ou=testing01,ou=system",
+    "objectclass: top",
+    "objectclass: organizationalUnit",
+    "ou: subtest"
+})
+public class DestroyContextIT extends AbstractLdapTestUnit
 {
-    public static DirectoryService service;
-
-    
-    /**
-     * @todo Replace this with an LDIF directive!!!!!!
-     *
-     * @throws NamingException on error
-     */
-    public void createEntries() throws Exception
-    {
-        LdapContext sysRoot = getSystemContext( service );
-
-        /*
-         * create ou=testing00,ou=system
-         */
-        Attributes attributes = new BasicAttributes( true );
-        Attribute attribute = new BasicAttribute( "objectClass" );
-        attribute.add( "top" );
-        attribute.add( "organizationalUnit" );
-        attributes.put( attribute );
-        attributes.put( "ou", "testing00" );
-        DirContext ctx = sysRoot.createSubcontext( "ou=testing00", attributes );
-        assertNotNull( ctx );
-
-        ctx = ( DirContext ) sysRoot.lookup( "ou=testing00" );
-        assertNotNull( ctx );
-
-        attributes = ctx.getAttributes( "" );
-        assertNotNull( attributes );
-        assertEquals( "testing00", attributes.get( "ou" ).get() );
-        attribute = attributes.get( "objectClass" );
-        assertNotNull( attribute );
-        assertTrue( attribute.contains( "top" ) );
-        assertTrue( attribute.contains( "organizationalUnit" ) );
-
-        /*
-         * create ou=testing01,ou=system
-         */
-        attributes = new BasicAttributes( true );
-        attribute = new BasicAttribute( "objectClass" );
-        attribute.add( "top" );
-        attribute.add( "organizationalUnit" );
-        attributes.put( attribute );
-        attributes.put( "ou", "testing01" );
-        ctx = sysRoot.createSubcontext( "ou=testing01", attributes );
-        assertNotNull( ctx );
-
-        ctx = ( DirContext ) sysRoot.lookup( "ou=testing01" );
-        assertNotNull( ctx );
-
-        attributes = ctx.getAttributes( "" );
-        assertNotNull( attributes );
-        assertEquals( "testing01", attributes.get( "ou" ).get() );
-        attribute = attributes.get( "objectClass" );
-        assertNotNull( attribute );
-        assertTrue( attribute.contains( "top" ) );
-        assertTrue( attribute.contains( "organizationalUnit" ) );
-
-        /*
-         * create ou=testing02,ou=system
-         */
-        attributes = new BasicAttributes( true );
-        attribute = new BasicAttribute( "objectClass" );
-        attribute.add( "top" );
-        attribute.add( "organizationalUnit" );
-        attributes.put( attribute );
-        attributes.put( "ou", "testing02" );
-        ctx = sysRoot.createSubcontext( "ou=testing02", attributes );
-        assertNotNull( ctx );
-
-        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" ) );
-
-        /*
-         * create ou=subtest,ou=testing01,ou=system
-         */
-        ctx = ( DirContext ) sysRoot.lookup( "ou=testing01" );
-
-        attributes = new BasicAttributes( true );
-        attribute = new BasicAttribute( "objectClass" );
-        attribute.add( "top" );
-        attribute.add( "organizationalUnit" );
-        attributes.put( attribute );
-        attributes.put( "ou", "subtest" );
-        ctx = ctx.createSubcontext( "ou=subtest", attributes );
-        assertNotNull( ctx );
-
-        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" ) );
-    }
-
-
     /**
      * Tests the creation and subsequent read of a new JNDI context under the
      * system context root.
@@ -168,8 +76,6 @@
     {
         LdapContext sysRoot = getSystemContext( service );
 
-        createEntries();
-
         /*
          * delete ou=testing00,ou=system
          */

Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/ExtensibleObjectIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/ExtensibleObjectIT.java?rev=896599&r1=896598&r2=896599&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/ExtensibleObjectIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/ExtensibleObjectIT.java Wed Jan  6 18:26:43 2010
@@ -20,11 +20,10 @@
 package org.apache.directory.server.core.jndi;
 
 
-import org.apache.directory.server.core.DirectoryService;
-import org.apache.directory.server.core.integ.CiRunner;
 import static org.apache.directory.server.core.integ.IntegrationUtils.getSystemContext;
-import org.junit.Test;import static org.junit.Assert.assertNotNull;import static org.junit.Assert.assertEquals;import static org.junit.Assert.assertTrue;
-import org.junit.runner.RunWith;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
 
 import javax.naming.directory.Attribute;
 import javax.naming.directory.Attributes;
@@ -33,6 +32,13 @@
 import javax.naming.directory.DirContext;
 import javax.naming.ldap.LdapContext;
 
+import org.apache.directory.server.core.annotations.CreateDS;
+import org.apache.directory.server.core.factory.DefaultDirectoryServiceFactory;
+import org.apache.directory.server.core.integ.AbstractLdapTestUnit;
+import org.apache.directory.server.core.integ.FrameworkRunner;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
 
 /**
  * Tests the use of extensible objects.
@@ -40,11 +46,10 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$
  */
-@RunWith ( CiRunner.class )
-public class ExtensibleObjectIT
+@RunWith ( FrameworkRunner.class )
+@CreateDS( factory=DefaultDirectoryServiceFactory.class, name="ExtensibleObjectIT-class" )
+public class ExtensibleObjectIT extends AbstractLdapTestUnit
 {
-    public static DirectoryService service;
-
 
     @Test
     public void testExtensibleObjectModify() throws Exception

Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/ListIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/ListIT.java?rev=896599&r1=896598&r2=896599&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/ListIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/ListIT.java Wed Jan  6 18:26:43 2010
@@ -20,23 +20,24 @@
 package org.apache.directory.server.core.jndi;
 
 
-import org.apache.directory.server.core.DirectoryService;
-import org.apache.directory.server.core.entry.DefaultServerEntry;
-import org.apache.directory.server.core.integ.CiRunner;
-import static org.apache.directory.server.core.integ.IntegrationUtils.getUserAddLdif;
 import static org.apache.directory.server.core.integ.IntegrationUtils.getContext;
 import static org.apache.directory.server.core.integ.IntegrationUtils.getSystemContext;
-import org.apache.directory.shared.ldap.ldif.LdifEntry;
-
-import static org.junit.Assert.assertTrue;
+import static org.apache.directory.server.core.integ.IntegrationUtils.getUserAddLdif;
 import static org.junit.Assert.assertFalse;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import static org.junit.Assert.assertTrue;
+
+import java.util.HashSet;
 
 import javax.naming.NameClassPair;
 import javax.naming.NamingEnumeration;
 import javax.naming.ldap.LdapContext;
-import java.util.HashSet;
+
+import org.apache.directory.server.core.entry.DefaultServerEntry;
+import org.apache.directory.server.core.integ.AbstractLdapTestUnit;
+import org.apache.directory.server.core.integ.FrameworkRunner;
+import org.apache.directory.shared.ldap.ldif.LdifEntry;
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
 
 /**
@@ -47,20 +48,18 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$
  */
-@RunWith ( CiRunner.class )
-public class ListIT
+@RunWith ( FrameworkRunner.class )
+public class ListIT extends AbstractLdapTestUnit
 {
-    public static DirectoryService service;
-
 
     @Test
     public void testListSystemAsNonAdmin() throws Exception
     {
         LdifEntry akarasulu = getUserAddLdif();
         service.getAdminSession().add( 
-            new DefaultServerEntry( service.getRegistries(), akarasulu.getEntry() ) ); 
+            new DefaultServerEntry( service.getSchemaManager(), akarasulu.getEntry() ) ); 
 
-        LdapContext sysRoot = getContext( akarasulu.getDn().getUpName(), service, "ou=system" );
+        LdapContext sysRoot = getContext( akarasulu.getDn().getName(), service, "ou=system" );
         HashSet<String> set = new HashSet<String>();
         NamingEnumeration<NameClassPair> list = sysRoot.list( "" );
 
@@ -81,9 +80,9 @@
     {
         LdifEntry akarasulu = getUserAddLdif();
         service.getAdminSession().add( 
-            new DefaultServerEntry( service.getRegistries(), akarasulu.getEntry() ) ); 
+            new DefaultServerEntry( service.getSchemaManager(), akarasulu.getEntry() ) ); 
 
-        LdapContext sysRoot = getContext( akarasulu.getDn().getUpName(), service, "ou=system" );
+        LdapContext sysRoot = getContext( akarasulu.getDn().getName(), service, "ou=system" );
         HashSet<String> set = new HashSet<String>();
         NamingEnumeration<NameClassPair> list = sysRoot.list( "ou=users" );
 
@@ -124,7 +123,7 @@
         HashSet<String> set = new HashSet<String>();
         LdifEntry akarasulu = getUserAddLdif();
         service.getAdminSession().add( 
-            new DefaultServerEntry( service.getRegistries(), akarasulu.getEntry() ) ); 
+            new DefaultServerEntry( service.getSchemaManager(), akarasulu.getEntry() ) ); 
                 
 
         NamingEnumeration<NameClassPair> list = sysRoot.list( "ou=users" );

Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/MixedCaseITest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/MixedCaseITest.java?rev=896599&r1=896598&r2=896599&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/MixedCaseITest.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/MixedCaseITest.java Wed Jan  6 18:26:43 2010
@@ -20,45 +20,33 @@
 package org.apache.directory.server.core.jndi;
 
 
-import org.apache.directory.server.core.DefaultDirectoryService;
-import org.apache.directory.server.core.DirectoryService;
-import org.apache.directory.server.core.entry.ServerEntry;
-import org.apache.directory.server.core.integ.CiRunner;
-import org.apache.directory.server.core.integ.DirectoryServiceFactory;
 import static org.apache.directory.server.core.integ.IntegrationUtils.getContext;
-import org.apache.directory.server.core.integ.Level;
-import org.apache.directory.server.core.integ.annotations.Factory;
-import org.apache.directory.server.core.integ.annotations.CleanupLevel;
-import org.apache.directory.server.core.partition.Partition;
-import org.apache.directory.server.xdbm.Index;
-import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmIndex;
-import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmPartition;
-import org.apache.directory.shared.ldap.exception.LdapNameNotFoundException;
-import org.apache.directory.shared.ldap.name.LdapDN;
-
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
 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.BasicAttributes;
 import javax.naming.directory.DirContext;
 import javax.naming.directory.ModificationItem;
 import javax.naming.directory.SearchControls;
 import javax.naming.directory.SearchResult;
 import javax.naming.ldap.LdapContext;
-import java.util.HashSet;
-import java.util.Set;
+
+import org.apache.directory.server.core.annotations.ContextEntry;
+import org.apache.directory.server.core.annotations.CreateDS;
+import org.apache.directory.server.core.annotations.CreateIndex;
+import org.apache.directory.server.core.annotations.CreatePartition;
+import org.apache.directory.server.core.integ.AbstractLdapTestUnit;
+import org.apache.directory.server.core.integ.FrameworkRunner;
+import org.apache.directory.shared.ldap.exception.LdapNameNotFoundException;
+import org.apache.directory.shared.ldap.util.AttributeUtils;
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
 
 /**
@@ -67,52 +55,31 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$
  */
-@RunWith ( CiRunner.class )
-@CleanupLevel ( Level.CLASS )
-@Factory ( MixedCaseITest.MyFactory.class )
-public class MixedCaseITest
+@RunWith(FrameworkRunner.class)
+@CreateDS(name = "MixedCaseITest-class",
+    partitions =
+        {
+            @CreatePartition(
+                name = "apache",
+                suffix = "dc=Apache,dc=Org",
+                contextEntry = @ContextEntry( 
+                    entryLdif =
+                        "dn: dc=Apache,dc=Org\n" +
+                        "dc: Apache\n" +
+                        "objectClass: top\n" +
+                        "objectClass: domain\n\n" ),
+                indexes = 
+                {
+                    @CreateIndex( attribute = "objectClass" ),
+                    @CreateIndex( attribute = "ou" ),
+                    @CreateIndex( attribute = "uid" )
+                } )
+        } )
+public class MixedCaseITest extends AbstractLdapTestUnit
 {
-    public static DirectoryService service;
 
     private static final String SUFFIX_DN = "dc=Apache,dc=Org";
 
-
-    public static class MyFactory implements DirectoryServiceFactory
-    {
-        public DirectoryService newInstance() throws NamingException
-        {
-            DirectoryService service = new DefaultDirectoryService();
-            service.getChangeLog().setEnabled( true );
-
-            JdbmPartition partition = new JdbmPartition();
-            partition.setId( "apache" );
-            partition.setSuffix( SUFFIX_DN );
-
-            HashSet<Index<?, ServerEntry>> indexedAttributes = new HashSet<Index<?, ServerEntry>>();
-            indexedAttributes.add( new JdbmIndex<String,ServerEntry>( "objectClass" ) );
-            indexedAttributes.add( new JdbmIndex<String,ServerEntry>( "ou" ) );
-            indexedAttributes.add( new JdbmIndex<String,ServerEntry>( "uid" ) );
-            partition.setIndexedAttributes( indexedAttributes );
-
-            Set<Partition> partitions = new HashSet<Partition>();
-            partitions.add( partition );
-
-            service.setPartitions( partitions );
-            return service;
-        }
-    }
-
-    
-    @Before
-    public void setUp() throws Exception
-    {
-        LdapDN dn = new LdapDN( "dc=Apache,dc=Org" );
-        ServerEntry entry = service.newEntry( dn );
-        entry.add( "objectClass", "top", "domain", "extensibleObject" );
-        entry.add( "dc", "Apache" );
-        service.getAdminSession().add( entry );
-    }
-    
     
     @Test
     public void testSearch() throws Exception
@@ -138,12 +105,8 @@
 
         String dn = "ou=Test";
 
-        Attributes attributes = new BasicAttributes( true );
-        Attribute attribute = new BasicAttribute( "objectClass" );
-        attribute.add( "top" );
-        attribute.add( "organizationalUnit" );
-        attributes.put( attribute );
-        attributes.put( "ou", "Test" );
+        Attributes attributes = AttributeUtils.createAttributes( "objectClass: top", "objectClass: organizationalUnit",
+            "ou: Test" );
 
         DirContext ctx = ctxRoot.createSubcontext( dn, attributes );
         assertNotNull( ctx );
@@ -168,13 +131,8 @@
         String dn = "ou=Test";
         String description = "New Value";
 
-        Attributes attributes = new BasicAttributes( true );
-        Attribute attribute = new BasicAttribute( "objectClass" );
-        attribute.add( "top" );
-        attribute.add( "organizationalUnit" );
-        attributes.put( attribute );
-        attributes.put( "ou", "Test" );
-        attributes.put( "description", "Old Value" );
+        Attributes attributes = AttributeUtils.createAttributes( "objectClass: top", "objectClass: organizationalUnit",
+            "ou: Test", "description: Old Value" );
 
         DirContext ctx = ctxRoot.createSubcontext( dn, attributes );
         assertNotNull( ctx );
@@ -194,7 +152,7 @@
         assertEquals( "The entry returned should be the entry added earlier.", dn + "," + SUFFIX_DN, sr.getName() );
 
         attributes = sr.getAttributes();
-        attribute = attributes.get( "description" );
+        Attribute attribute = attributes.get( "description" );
 
         assertEquals( "The description attribute should contain the new value.", description, attribute.get() );
         assertFalse( "Search should return no more entries.", ne.hasMore() );
@@ -208,12 +166,8 @@
 
         String dn = "ou=Test";
 
-        Attributes attributes = new BasicAttributes( true );
-        Attribute attribute = new BasicAttribute( "objectClass" );
-        attribute.add( "top" );
-        attribute.add( "organizationalUnit" );
-        attributes.put( attribute );
-        attributes.put( "ou", "Test" );
+        Attributes attributes = AttributeUtils.createAttributes( "objectClass: top", "objectClass: organizationalUnit",
+            "ou: Test" );
 
         DirContext ctx = ctxRoot.createSubcontext( dn, attributes );
         assertNotNull( ctx );

Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/ModifyContextIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/ModifyContextIT.java?rev=896599&r1=896598&r2=896599&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/ModifyContextIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/ModifyContextIT.java Wed Jan  6 18:26:43 2010
@@ -20,21 +20,13 @@
 package org.apache.directory.server.core.jndi;
 
 
-import org.apache.directory.server.core.DirectoryService;
-import org.apache.directory.server.core.entry.DefaultServerEntry;
-import org.apache.directory.server.core.integ.CiRunner;
 import static org.apache.directory.server.core.integ.IntegrationUtils.getSystemContext;
 import static org.apache.directory.server.core.integ.IntegrationUtils.getUserAddLdif;
-import org.apache.directory.shared.ldap.exception.LdapInvalidAttributeValueException;
-import org.apache.directory.shared.ldap.exception.LdapNoSuchAttributeException;
-import org.apache.directory.shared.ldap.ldif.LdifEntry;
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
-import org.junit.Test;
-import org.junit.runner.RunWith;
 
 import javax.naming.NamingException;
 import javax.naming.directory.Attribute;
@@ -44,6 +36,17 @@
 import javax.naming.directory.DirContext;
 import javax.naming.ldap.LdapContext;
 
+import org.apache.directory.server.core.annotations.CreateDS;
+import org.apache.directory.server.core.entry.DefaultServerEntry;
+import org.apache.directory.server.core.factory.DefaultDirectoryServiceFactory;
+import org.apache.directory.server.core.integ.AbstractLdapTestUnit;
+import org.apache.directory.server.core.integ.FrameworkRunner;
+import org.apache.directory.shared.ldap.exception.LdapInvalidAttributeValueException;
+import org.apache.directory.shared.ldap.exception.LdapNoSuchAttributeException;
+import org.apache.directory.shared.ldap.ldif.LdifEntry;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
 
 /**
  * Tests the methods on JNDI contexts that are analogous to entry modify
@@ -52,11 +55,10 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$
  */
-@RunWith ( CiRunner.class )
-public class ModifyContextIT
+@RunWith ( FrameworkRunner.class )
+@CreateDS( factory=DefaultDirectoryServiceFactory.class, name="ModifyContextIT-class" )
+public class ModifyContextIT extends AbstractLdapTestUnit
 {
-    public static DirectoryService service;
-
 
     /**
      * @todo put this into an ldif annotation
@@ -67,7 +69,7 @@
     {
         LdifEntry akarasulu = getUserAddLdif();
         service.getAdminSession().add( 
-            new DefaultServerEntry( service.getRegistries(), akarasulu.getEntry() ) ); 
+            new DefaultServerEntry( service.getSchemaManager(), akarasulu.getEntry() ) ); 
 
         LdapContext sysRoot = getSystemContext( service );
 

Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/ObjStateFactoryIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/ObjStateFactoryIT.java?rev=896599&r1=896598&r2=896599&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/ObjStateFactoryIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/ObjStateFactoryIT.java Wed Jan  6 18:26:43 2010
@@ -20,19 +20,13 @@
 package org.apache.directory.server.core.jndi;
 
 
-import org.apache.directory.server.core.DirectoryService;
-import org.apache.directory.server.core.entry.DefaultServerEntry;
-import org.apache.directory.server.core.integ.CiRunner;
 import static org.apache.directory.server.core.integ.IntegrationUtils.getSystemContext;
 import static org.apache.directory.server.core.integ.IntegrationUtils.getUserAddLdif;
-import org.apache.directory.shared.ldap.util.ArrayUtils;
-import org.apache.directory.shared.ldap.util.StringTools;
-import org.apache.directory.shared.ldap.ldif.LdifEntry;
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.assertNull;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import static org.junit.Assert.assertTrue;
+
+import java.util.Hashtable;
 
 import javax.naming.Context;
 import javax.naming.Name;
@@ -45,7 +39,15 @@
 import javax.naming.ldap.LdapContext;
 import javax.naming.spi.DirObjectFactory;
 import javax.naming.spi.DirStateFactory;
-import java.util.Hashtable;
+
+import org.apache.directory.server.core.entry.DefaultServerEntry;
+import org.apache.directory.server.core.integ.AbstractLdapTestUnit;
+import org.apache.directory.server.core.integ.FrameworkRunner;
+import org.apache.directory.shared.ldap.ldif.LdifEntry;
+import org.apache.directory.shared.ldap.util.ArrayUtils;
+import org.apache.directory.shared.ldap.util.StringTools;
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
 
 /**
@@ -54,18 +56,16 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$
  */
-@RunWith ( CiRunner.class )
-public class ObjStateFactoryIT
+@RunWith ( FrameworkRunner.class )
+public class ObjStateFactoryIT extends AbstractLdapTestUnit
 {
-    public static DirectoryService service;
-
 
     @Test
     public void testObjectFactory() throws Exception
     {
         LdifEntry akarasulu = getUserAddLdif();
         service.getAdminSession().add( 
-            new DefaultServerEntry( service.getRegistries(), akarasulu.getEntry() ) ); 
+            new DefaultServerEntry( service.getSchemaManager(), akarasulu.getEntry() ) ); 
 
 
         LdapContext sysRoot = getSystemContext( service );

Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/RFC2713IT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/RFC2713IT.java?rev=896599&r1=896598&r2=896599&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/RFC2713IT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/RFC2713IT.java Wed Jan  6 18:26:43 2010
@@ -20,19 +20,21 @@
 package org.apache.directory.server.core.jndi;
 
 
-import org.apache.directory.server.core.DirectoryService;
-import org.apache.directory.server.core.integ.CiRunner;
-import static org.apache.directory.server.core.integ.IntegrationUtils.*;
+import static org.apache.directory.server.core.integ.IntegrationUtils.getSystemContext;
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.assertNotNull;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import static org.junit.Assert.assertTrue;
+
+import java.util.ArrayList;
 
 import javax.naming.directory.Attribute;
 import javax.naming.directory.Attributes;
 import javax.naming.ldap.LdapContext;
-import java.util.ArrayList;
+
+import org.apache.directory.server.core.integ.AbstractLdapTestUnit;
+import org.apache.directory.server.core.integ.FrameworkRunner;
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
 
 /**
@@ -42,11 +44,9 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$
  */
-@RunWith ( CiRunner.class )
-public class RFC2713IT
+@RunWith ( FrameworkRunner.class )
+public class RFC2713IT extends AbstractLdapTestUnit
 {
-    public static DirectoryService service;
-    
 
     @Test
     @SuppressWarnings("unchecked")

Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/ReferralIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/ReferralIT.java?rev=896599&r1=896598&r2=896599&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/ReferralIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/ReferralIT.java Wed Jan  6 18:26:43 2010
@@ -20,26 +20,17 @@
 package org.apache.directory.server.core.jndi;
 
 
-import org.apache.directory.server.core.DirectoryService;
-import org.apache.directory.server.core.entry.DefaultServerEntry;
-import org.apache.directory.server.core.entry.ServerEntry;
-import org.apache.directory.server.core.integ.CiRunner;
 import static org.apache.directory.server.core.integ.IntegrationUtils.getSystemContext;
 import static org.apache.directory.server.core.integ.IntegrationUtils.getUserAddLdif;
-import org.apache.directory.shared.ldap.constants.SchemaConstants;
-import org.apache.directory.shared.ldap.exception.LdapNamingException;
-import org.apache.directory.shared.ldap.exception.LdapReferralException;
-import org.apache.directory.shared.ldap.ldif.LdifEntry;
-import org.apache.directory.shared.ldap.message.ResultCodeEnum;
-import org.apache.directory.shared.ldap.name.LdapDN;
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+
+import java.util.HashMap;
+import java.util.Map;
 
 import javax.naming.Context;
 import javax.naming.Name;
@@ -58,8 +49,19 @@
 import javax.naming.directory.SearchControls;
 import javax.naming.directory.SearchResult;
 import javax.naming.ldap.LdapContext;
-import java.util.HashMap;
-import java.util.Map;
+
+import org.apache.directory.server.core.entry.DefaultServerEntry;
+import org.apache.directory.server.core.entry.ServerEntry;
+import org.apache.directory.server.core.integ.AbstractLdapTestUnit;
+import org.apache.directory.server.core.integ.FrameworkRunner;
+import org.apache.directory.shared.ldap.constants.SchemaConstants;
+import org.apache.directory.shared.ldap.exception.LdapNamingException;
+import org.apache.directory.shared.ldap.exception.LdapReferralException;
+import org.apache.directory.shared.ldap.ldif.LdifEntry;
+import org.apache.directory.shared.ldap.message.ResultCodeEnum;
+import org.apache.directory.shared.ldap.name.LdapDN;
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
 
 /**
@@ -68,10 +70,9 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$
  */
-@RunWith ( CiRunner.class )
-public class ReferralIT
+@RunWith ( FrameworkRunner.class )
+public class ReferralIT extends AbstractLdapTestUnit
 {
-    public static DirectoryService service;
     private TestData td = new TestData();
 
 
@@ -104,7 +105,7 @@
 
         LdifEntry akarasulu = getUserAddLdif();
         service.getAdminSession().add( 
-            new DefaultServerEntry( service.getRegistries(), akarasulu.getEntry() ), true ); 
+            new DefaultServerEntry( service.getSchemaManager(), akarasulu.getEntry() ), true ); 
 
         // -------------------------------------------------------------------
         // Adds a referral entry regardless of referral handling settings
@@ -271,7 +272,7 @@
         }
         catch ( PartialResultException pre )
         {
-            assertEquals( "cn=alex karasulu,ou=apache", ((LdapDN)pre.getRemainingName()).getUpName() );
+            assertEquals( "cn=alex karasulu,ou=apache", ((LdapDN)pre.getRemainingName()).getName() );
             assertEquals( LdapDN.EMPTY_LDAPDN, pre.getResolvedName() );
         }
     }
@@ -307,8 +308,8 @@
         }
         catch ( LdapReferralException lre )
         {
-            assertEquals( "cn=alex karasulu,ou=apache", ((LdapDN)lre.getRemainingName()).getUpName() );
-            assertEquals( "ou=users,ou=system", ((LdapDN)lre.getResolvedName()).getUpName() );
+            assertEquals( "cn=alex karasulu,ou=apache", ((LdapDN)lre.getRemainingName()).getName() );
+            assertEquals( "ou=users,ou=system", ((LdapDN)lre.getResolvedName()).getName() );
         }
     }
 
@@ -329,7 +330,7 @@
         // encounter referral errors with referral setting set to throw.
         // -------------------------------------------------------------------
         LdapDN userDN = new LdapDN( "cn=alex karasulu,ou=apache,ou=users,ou=system" );
-        ServerEntry userEntry = new DefaultServerEntry( service.getRegistries(), userDN );
+        ServerEntry userEntry = new DefaultServerEntry( service.getSchemaManager(), userDN );
         
         userEntry.add(  "ObjectClass", "top", "person" );
         userEntry.add( "sn", "karasulu" );
@@ -342,7 +343,7 @@
         }
         catch ( PartialResultException pre )
         {
-            assertEquals( "cn=alex karasulu,ou=apache", ((LdapDN)pre.getRemainingName()).getUpName() );
+            assertEquals( "cn=alex karasulu,ou=apache", ((LdapDN)pre.getRemainingName()).getName() );
             assertEquals( LdapDN.EMPTY_LDAPDN, pre.getResolvedName() );
         }
     }

Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/RootDSEIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/RootDSEIT.java?rev=896599&r1=896598&r2=896599&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/RootDSEIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/RootDSEIT.java Wed Jan  6 18:26:43 2010
@@ -20,15 +20,12 @@
 package org.apache.directory.server.core.jndi;
 
 
-import org.apache.directory.server.core.DirectoryService;
-import org.apache.directory.server.core.integ.CiRunner;
-import org.apache.directory.shared.ldap.exception.LdapNoPermissionException;
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+
+import java.util.Hashtable;
 
 import javax.naming.Context;
 import javax.naming.InitialContext;
@@ -37,7 +34,12 @@
 import javax.naming.directory.DirContext;
 import javax.naming.directory.ModificationItem;
 
-import java.util.Hashtable;
+import org.apache.directory.server.core.DirectoryService;
+import org.apache.directory.server.core.integ.AbstractLdapTestUnit;
+import org.apache.directory.server.core.integ.FrameworkRunner;
+import org.apache.directory.shared.ldap.exception.LdapNoPermissionException;
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
 
 /**
@@ -46,11 +48,9 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$
  */
-@RunWith ( CiRunner.class )
-public class RootDSEIT
+@RunWith ( FrameworkRunner.class )
+public class RootDSEIT extends AbstractLdapTestUnit
 {
-    public static DirectoryService service;
-
 
     /**
      * Creates an initial context using the empty string for the provider URL.

Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/UniqueMemberIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/UniqueMemberIT.java?rev=896599&r1=896598&r2=896599&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/UniqueMemberIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/UniqueMemberIT.java Wed Jan  6 18:26:43 2010
@@ -20,18 +20,16 @@
 package org.apache.directory.server.core.jndi;
 
 
-import org.apache.directory.server.core.DirectoryService;
-import org.apache.directory.server.core.integ.CiRunner;
 import static org.apache.directory.server.core.integ.IntegrationUtils.getSystemContext;
-import org.apache.directory.shared.ldap.constants.JndiPropertyConstants;
-import org.apache.directory.shared.ldap.message.AliasDerefMode;
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Set;
 
 import javax.naming.NamingEnumeration;
 import javax.naming.NamingException;
@@ -42,9 +40,13 @@
 import javax.naming.directory.SearchControls;
 import javax.naming.directory.SearchResult;
 import javax.naming.ldap.LdapContext;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Set;
+
+import org.apache.directory.server.core.integ.AbstractLdapTestUnit;
+import org.apache.directory.server.core.integ.FrameworkRunner;
+import org.apache.directory.shared.ldap.constants.JndiPropertyConstants;
+import org.apache.directory.shared.ldap.message.AliasDerefMode;
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
 
 /**
@@ -54,11 +56,9 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$
  */
-@RunWith ( CiRunner.class )
-public class UniqueMemberIT
+@RunWith ( FrameworkRunner.class )
+public class UniqueMemberIT extends AbstractLdapTestUnit
 {
-    public static DirectoryService service;
-
     
     /**
      * Test a valid entry

Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/AddReferralIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/AddReferralIT.java?rev=896599&r1=896598&r2=896599&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/AddReferralIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/AddReferralIT.java Wed Jan  6 18:26:43 2010
@@ -40,13 +40,11 @@
 
 import org.apache.directory.server.constants.ServerDNConstants;
 import org.apache.directory.server.core.CoreSession;
-import org.apache.directory.server.core.DirectoryService;
+import org.apache.directory.server.core.annotations.ApplyLdifs;
 import org.apache.directory.server.core.entry.DefaultServerEntry;
 import org.apache.directory.server.core.entry.ServerEntry;
-import org.apache.directory.server.core.integ.CiRunner;
-import org.apache.directory.server.core.integ.Level;
-import org.apache.directory.server.core.integ.annotations.ApplyLdifs;
-import org.apache.directory.server.core.integ.annotations.CleanupLevel;
+import org.apache.directory.server.core.integ.AbstractLdapTestUnit;
+import org.apache.directory.server.core.integ.FrameworkRunner;
 import org.apache.directory.shared.ldap.name.LdapDN;
 import org.junit.Before;
 import org.junit.Test;
@@ -63,50 +61,47 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev: 691179 $
  */
-@RunWith ( CiRunner.class )
-@CleanupLevel ( Level.CLASS )
+@RunWith ( FrameworkRunner.class )
 @ApplyLdifs( {
     // Root
-    "dn: c=WW,ou=system\n" +
-    "objectClass: country\n" +
-    "objectClass: top\n" +
-    "c: WW\n\n" +
+    "dn: c=WW,ou=system",
+    "objectClass: country",
+    "objectClass: top",
+    "c: WW",
     
     // Sub-root
-    "dn: o=MNN,c=WW,ou=system\n" +
-    "objectClass: organization\n" +
-    "objectClass: top\n" +
-    "o: MNN\n\n" +
+    "dn: o=MNN,c=WW,ou=system",
+    "objectClass: organization",
+    "objectClass: top",
+    "o: MNN",
     
     // Referral #1
-    "dn: ou=Roles,o=MNN,c=WW,ou=system\n" +
-    "objectClass: extensibleObject\n" +
-    "objectClass: referral\n" +
-    "objectClass: top\n" +
-    "ou: Roles\n" +
-    "ref: ldap://hostd/ou=Roles,dc=apache,dc=org\n\n" +
+    "dn: ou=Roles,o=MNN,c=WW,ou=system",
+    "objectClass: extensibleObject",
+    "objectClass: referral",
+    "objectClass: top",
+    "ou: Roles",
+    "ref: ldap://hostd/ou=Roles,dc=apache,dc=org",
     
     // Referral #2
-    "dn: ou=People,o=MNN,c=WW,ou=system\n" +
-    "objectClass: extensibleObject\n" +
-    "objectClass: referral\n" +
-    "objectClass: top\n" +
-    "ou: People\n" +
-    "ref: ldap://hostb/OU=People,DC=example,DC=com\n" +
-    "ref: ldap://hostc/OU=People,O=MNN,C=WW\n\n" +
+    "dn: ou=People,o=MNN,c=WW,ou=system",
+    "objectClass: extensibleObject",
+    "objectClass: referral",
+    "objectClass: top",
+    "ou: People",
+    "ref: ldap://hostb/OU=People,DC=example,DC=com",
+    "ref: ldap://hostc/OU=People,O=MNN,C=WW",
     
     // Entry # 1
-    "dn: cn=Alex Karasulu,o=MNN,c=WW,ou=system\n" +
-    "objectClass: person\n" +
-    "objectClass: top\n" +
-    "cn: Alex Karasulu\n" +
-    "sn: akarasulu\n\n"
+    "dn: cn=Alex Karasulu,o=MNN,c=WW,ou=system",
+    "objectClass: person",
+    "objectClass: top",
+    "cn: Alex Karasulu",
+    "sn: akarasulu"
     }
 )
-public class AddReferralIT
+public class AddReferralIT extends AbstractLdapTestUnit
 {
-    /** The directory service */
-    public static DirectoryService service;
 
     /** The Context we are using to inject entries with JNDI */
     LdapContext MNNCtx;
@@ -128,7 +123,7 @@
         
         // Core API entry
         LdapDN dn = new LdapDN( "cn=Emmanuel Lecharny, ou=apache, ou=people, o=MNN, c=WW, ou=system" );
-        serverEntry = new DefaultServerEntry( service.getRegistries(), dn );
+        serverEntry = new DefaultServerEntry( service.getSchemaManager(), dn );
 
         serverEntry.put( "ObjectClass", "top", "person" );
         serverEntry.put( "sn", "elecharny" );

Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/CompareReferralIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/CompareReferralIT.java?rev=896599&r1=896598&r2=896599&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/CompareReferralIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/CompareReferralIT.java Wed Jan  6 18:26:43 2010
@@ -21,9 +21,9 @@
 
 import static org.apache.directory.server.core.integ.IntegrationUtils.getContext;
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
-import static org.junit.Assert.assertNotNull;
 
 import java.util.HashSet;
 import java.util.Set;
@@ -42,13 +42,11 @@
 
 import org.apache.directory.server.constants.ServerDNConstants;
 import org.apache.directory.server.core.CoreSession;
-import org.apache.directory.server.core.DirectoryService;
+import org.apache.directory.server.core.annotations.ApplyLdifs;
 import org.apache.directory.server.core.entry.DefaultServerEntry;
 import org.apache.directory.server.core.entry.ServerEntry;
-import org.apache.directory.server.core.integ.CiRunner;
-import org.apache.directory.server.core.integ.Level;
-import org.apache.directory.server.core.integ.annotations.ApplyLdifs;
-import org.apache.directory.server.core.integ.annotations.CleanupLevel;
+import org.apache.directory.server.core.integ.AbstractLdapTestUnit;
+import org.apache.directory.server.core.integ.FrameworkRunner;
 import org.apache.directory.shared.ldap.name.LdapDN;
 import org.junit.Before;
 import org.junit.Test;
@@ -65,50 +63,47 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev: 691179 $
  */
-@RunWith ( CiRunner.class )
-@CleanupLevel ( Level.CLASS )
+@RunWith ( FrameworkRunner.class )
 @ApplyLdifs( {
     // Root
-    "dn: c=WW,ou=system\n" +
-    "objectClass: country\n" +
-    "objectClass: top\n" +
-    "c: WW\n\n" +
+    "dn: c=WW,ou=system",
+    "objectClass: country",
+    "objectClass: top",
+    "c: WW",
     
     // Sub-root
-    "dn: o=MNN,c=WW,ou=system\n" +
-    "objectClass: organization\n" +
-    "objectClass: top\n" +
-    "o: MNN\n\n" +
+    "dn: o=MNN,c=WW,ou=system",
+    "objectClass: organization",
+    "objectClass: top",
+    "o: MNN",
     
     // Referral #1
-    "dn: ou=Roles,o=MNN,c=WW,ou=system\n" +
-    "objectClass: extensibleObject\n" +
-    "objectClass: referral\n" +
-    "objectClass: top\n" +
-    "ou: Roles\n" +
-    "ref: ldap://hostd/ou=Roles,dc=apache,dc=org\n\n" +
+    "dn: ou=Roles,o=MNN,c=WW,ou=system",
+    "objectClass: extensibleObject",
+    "objectClass: referral",
+    "objectClass: top",
+    "ou: Roles",
+    "ref: ldap://hostd/ou=Roles,dc=apache,dc=org",
     
     // Referral #2
-    "dn: ou=People,o=MNN,c=WW,ou=system\n" +
-    "objectClass: extensibleObject\n" +
-    "objectClass: referral\n" +
-    "objectClass: top\n" +
-    "ou: People\n" +
-    "ref: ldap://hostb/OU=People,DC=example,DC=com\n" +
-    "ref: ldap://hostc/OU=People,O=MNN,C=WW\n\n" +
+    "dn: ou=People,o=MNN,c=WW,ou=system",
+    "objectClass: extensibleObject",
+    "objectClass: referral",
+    "objectClass: top",
+    "ou: People",
+    "ref: ldap://hostb/OU=People,DC=example,DC=com",
+    "ref: ldap://hostc/OU=People,O=MNN,C=WW",
     
     // Entry # 1
-    "dn: cn=Alex Karasulu,o=MNN,c=WW,ou=system\n" +
-    "objectClass: person\n" +
-    "objectClass: top\n" +
-    "cn: Alex Karasulu\n" +
-    "sn: akarasulu\n\n"
+    "dn: cn=Alex Karasulu,o=MNN,c=WW,ou=system",
+    "objectClass: person",
+    "objectClass: top",
+    "cn: Alex Karasulu",
+    "sn: akarasulu"
     }
 )
-public class CompareReferralIT
+public class CompareReferralIT extends AbstractLdapTestUnit
 {
-    /** The directory service */
-    public static DirectoryService service;
 
     /** The Context we are using to inject entries with JNDI */
     LdapContext MNNCtx;
@@ -133,7 +128,7 @@
         
         // Core API entry
         LdapDN dn = new LdapDN( "cn=Emmanuel Lecharny, ou=apache, ou=people, o=MNN, c=WW, ou=system" );
-        serverEntry = new DefaultServerEntry( service.getRegistries(), dn );
+        serverEntry = new DefaultServerEntry( service.getSchemaManager(), dn );
 
         serverEntry.put( "ObjectClass", "top", "person" );
         serverEntry.put( "sn", "elecharny" );

Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/DeleteReferralIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/DeleteReferralIT.java?rev=896599&r1=896598&r2=896599&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/DeleteReferralIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/DeleteReferralIT.java Wed Jan  6 18:26:43 2010
@@ -36,13 +36,11 @@
 
 import org.apache.directory.server.constants.ServerDNConstants;
 import org.apache.directory.server.core.CoreSession;
-import org.apache.directory.server.core.DirectoryService;
+import org.apache.directory.server.core.annotations.ApplyLdifs;
 import org.apache.directory.server.core.entry.DefaultServerEntry;
 import org.apache.directory.server.core.entry.ServerEntry;
-import org.apache.directory.server.core.integ.CiRunner;
-import org.apache.directory.server.core.integ.Level;
-import org.apache.directory.server.core.integ.annotations.ApplyLdifs;
-import org.apache.directory.server.core.integ.annotations.CleanupLevel;
+import org.apache.directory.server.core.integ.AbstractLdapTestUnit;
+import org.apache.directory.server.core.integ.FrameworkRunner;
 import org.apache.directory.shared.ldap.name.LdapDN;
 import org.junit.Before;
 import org.junit.Test;
@@ -59,50 +57,47 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev: 691179 $
  */
-@RunWith ( CiRunner.class )
-@CleanupLevel ( Level.CLASS )
+@RunWith ( FrameworkRunner.class )
 @ApplyLdifs( {
     // Root
-    "dn: c=WW,ou=system\n" +
-    "objectClass: country\n" +
-    "objectClass: top\n" +
-    "c: WW\n\n" +
+    "dn: c=WW,ou=system",
+    "objectClass: country",
+    "objectClass: top",
+    "c: WW",
     
     // Sub-root
-    "dn: o=MNN,c=WW,ou=system\n" +
-    "objectClass: organization\n" +
-    "objectClass: top\n" +
-    "o: MNN\n\n" +
+    "dn: o=MNN,c=WW,ou=system",
+    "objectClass: organization",
+    "objectClass: top",
+    "o: MNN",
     
     // Referral #1
-    "dn: ou=Roles,o=MNN,c=WW,ou=system\n" +
-    "objectClass: extensibleObject\n" +
-    "objectClass: referral\n" +
-    "objectClass: top\n" +
-    "ou: Roles\n" +
-    "ref: ldap://hostd/ou=Roles,dc=apache,dc=org\n\n" +
+    "dn: ou=Roles,o=MNN,c=WW,ou=system",
+    "objectClass: extensibleObject",
+    "objectClass: referral",
+    "objectClass: top",
+    "ou: Roles",
+    "ref: ldap://hostd/ou=Roles,dc=apache,dc=org",
     
     // Referral #2
-    "dn: ou=People,o=MNN,c=WW,ou=system\n" +
-    "objectClass: extensibleObject\n" +
-    "objectClass: referral\n" +
-    "objectClass: top\n" +
-    "ou: People\n" +
-    "ref: ldap://hostb/OU=People,DC=example,DC=com\n" +
-    "ref: ldap://hostc/OU=People,O=MNN,C=WW\n\n" +
+    "dn: ou=People,o=MNN,c=WW,ou=system",
+    "objectClass: extensibleObject",
+    "objectClass: referral",
+    "objectClass: top",
+    "ou: People",
+    "ref: ldap://hostb/OU=People,DC=example,DC=com",
+    "ref: ldap://hostc/OU=People,O=MNN,C=WW",
     
     // Entry # 1
-    "dn: cn=Alex Karasulu,o=MNN,c=WW,ou=system\n" +
-    "objectClass: person\n" +
-    "objectClass: top\n" +
-    "cn: Alex Karasulu\n" +
-    "sn: akarasulu\n\n"
+    "dn: cn=Alex Karasulu,o=MNN,c=WW,ou=system",
+    "objectClass: person",
+    "objectClass: top",
+    "cn: Alex Karasulu",
+    "sn: akarasulu"
     }
 )
-public class DeleteReferralIT
+public class DeleteReferralIT extends AbstractLdapTestUnit
 {
-    /** The directory service */
-    public static DirectoryService service;
 
     /** The Context we are using to inject entries with JNDI */
     LdapContext MNNCtx;
@@ -124,7 +119,7 @@
         
         // Core API entry
         LdapDN dn = new LdapDN( "cn=Emmanuel Lecharny, ou=apache, ou=people, o=MNN, c=WW, ou=system" );
-        serverEntry = new DefaultServerEntry( service.getRegistries(), dn );
+        serverEntry = new DefaultServerEntry( service.getSchemaManager(), dn );
 
         serverEntry.put( "ObjectClass", "top", "person" );
         serverEntry.put( "sn", "elecharny" );

Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/ModifyReferralIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/ModifyReferralIT.java?rev=896599&r1=896598&r2=896599&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/ModifyReferralIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/ModifyReferralIT.java Wed Jan  6 18:26:43 2010
@@ -21,9 +21,9 @@
 
 import static org.apache.directory.server.core.integ.IntegrationUtils.getContext;
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
-import static org.junit.Assert.assertNotNull;
 
 import java.util.ArrayList;
 import java.util.HashSet;
@@ -43,13 +43,11 @@
 
 import org.apache.directory.server.constants.ServerDNConstants;
 import org.apache.directory.server.core.CoreSession;
-import org.apache.directory.server.core.DirectoryService;
+import org.apache.directory.server.core.annotations.ApplyLdifs;
 import org.apache.directory.server.core.entry.DefaultServerEntry;
 import org.apache.directory.server.core.entry.ServerEntry;
-import org.apache.directory.server.core.integ.CiRunner;
-import org.apache.directory.server.core.integ.Level;
-import org.apache.directory.server.core.integ.annotations.ApplyLdifs;
-import org.apache.directory.server.core.integ.annotations.CleanupLevel;
+import org.apache.directory.server.core.integ.AbstractLdapTestUnit;
+import org.apache.directory.server.core.integ.FrameworkRunner;
 import org.apache.directory.shared.ldap.entry.Modification;
 import org.apache.directory.shared.ldap.entry.ModificationOperation;
 import org.apache.directory.shared.ldap.entry.client.ClientAttribute;
@@ -71,50 +69,47 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev: 691179 $
  */
-@RunWith ( CiRunner.class )
-@CleanupLevel ( Level.CLASS )
+@RunWith ( FrameworkRunner.class )
 @ApplyLdifs( {
     // Root
-    "dn: c=WW,ou=system\n" +
-    "objectClass: country\n" +
-    "objectClass: top\n" +
-    "c: WW\n\n" +
+    "dn: c=WW,ou=system",
+    "objectClass: country",
+    "objectClass: top",
+    "c: WW",
     
     // Sub-root
-    "dn: o=MNN,c=WW,ou=system\n" +
-    "objectClass: organization\n" +
-    "objectClass: top\n" +
-    "o: MNN\n\n" +
+    "dn: o=MNN,c=WW,ou=system",
+    "objectClass: organization",
+    "objectClass: top",
+    "o: MNN",
     
     // Referral #1
-    "dn: ou=Roles,o=MNN,c=WW,ou=system\n" +
-    "objectClass: extensibleObject\n" +
-    "objectClass: referral\n" +
-    "objectClass: top\n" +
-    "ou: Roles\n" +
-    "ref: ldap://hostd/ou=Roles,dc=apache,dc=org\n\n" +
+    "dn: ou=Roles,o=MNN,c=WW,ou=system",
+    "objectClass: extensibleObject",
+    "objectClass: referral",
+    "objectClass: top",
+    "ou: Roles",
+    "ref: ldap://hostd/ou=Roles,dc=apache,dc=org",
     
     // Referral #2
-    "dn: ou=People,o=MNN,c=WW,ou=system\n" +
-    "objectClass: extensibleObject\n" +
-    "objectClass: referral\n" +
-    "objectClass: top\n" +
-    "ou: People\n" +
-    "ref: ldap://hostb/OU=People,DC=example,DC=com\n" +
-    "ref: ldap://hostc/OU=People,O=MNN,C=WW\n\n" +
+    "dn: ou=People,o=MNN,c=WW,ou=system",
+    "objectClass: extensibleObject",
+    "objectClass: referral",
+    "objectClass: top",
+    "ou: People",
+    "ref: ldap://hostb/OU=People,DC=example,DC=com",
+    "ref: ldap://hostc/OU=People,O=MNN,C=WW",
     
     // Entry # 1
-    "dn: cn=Alex Karasulu,o=MNN,c=WW,ou=system\n" +
-    "objectClass: person\n" +
-    "objectClass: top\n" +
-    "cn: Alex Karasulu\n" +
-    "sn: akarasulu\n\n"
+    "dn: cn=Alex Karasulu,o=MNN,c=WW,ou=system",
+    "objectClass: person",
+    "objectClass: top",
+    "cn: Alex Karasulu",
+    "sn: akarasulu"
     }
 )
-public class ModifyReferralIT
+public class ModifyReferralIT extends AbstractLdapTestUnit
 {
-    /** The directory service */
-    public static DirectoryService service;
 
     /** The Context we are using to inject entries with JNDI */
     LdapContext MNNCtx;
@@ -136,7 +131,7 @@
         
         // Core API entry
         LdapDN dn = new LdapDN( "cn=Emmanuel Lecharny, ou=apache, ou=people, o=MNN, c=WW, ou=system" );
-        serverEntry = new DefaultServerEntry( service.getRegistries(), dn );
+        serverEntry = new DefaultServerEntry( service.getSchemaManager(), dn );
 
         serverEntry.put( "ObjectClass", "top", "person" );
         serverEntry.put( "sn", "elecharny" );

Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/MoveAndRenameReferralIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/MoveAndRenameReferralIT.java?rev=896599&r1=896598&r2=896599&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/MoveAndRenameReferralIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/MoveAndRenameReferralIT.java Wed Jan  6 18:26:43 2010
@@ -21,9 +21,9 @@
 
 import static org.apache.directory.server.core.integ.IntegrationUtils.getContext;
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
-import static org.junit.Assert.assertNotNull;
 
 import java.util.HashSet;
 import java.util.Set;
@@ -40,13 +40,11 @@
 
 import org.apache.directory.server.constants.ServerDNConstants;
 import org.apache.directory.server.core.CoreSession;
-import org.apache.directory.server.core.DirectoryService;
+import org.apache.directory.server.core.annotations.ApplyLdifs;
 import org.apache.directory.server.core.entry.DefaultServerEntry;
 import org.apache.directory.server.core.entry.ServerEntry;
-import org.apache.directory.server.core.integ.CiRunner;
-import org.apache.directory.server.core.integ.Level;
-import org.apache.directory.server.core.integ.annotations.ApplyLdifs;
-import org.apache.directory.server.core.integ.annotations.CleanupLevel;
+import org.apache.directory.server.core.integ.AbstractLdapTestUnit;
+import org.apache.directory.server.core.integ.FrameworkRunner;
 import org.apache.directory.shared.ldap.exception.LdapNamingException;
 import org.apache.directory.shared.ldap.message.ResultCodeEnum;
 import org.apache.directory.shared.ldap.name.LdapDN;
@@ -66,70 +64,67 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev: 691179 $
  */
-@RunWith ( CiRunner.class )
-@CleanupLevel ( Level.CLASS )
+@RunWith ( FrameworkRunner.class )
 @ApplyLdifs( {
     // Root
-    "dn: c=WW,ou=system\n" +
-    "objectClass: country\n" +
-    "objectClass: top\n" +
-    "c: WW\n\n" +
+    "dn: c=WW,ou=system",
+    "objectClass: country",
+    "objectClass: top",
+    "c: WW",
     
     // Sub-root #1
-    "dn: o=MNN,c=WW,ou=system\n" +
-    "objectClass: organization\n" +
-    "objectClass: top\n" +
-    "o: MNN\n\n" +
+    "dn: o=MNN,c=WW,ou=system",
+    "objectClass: organization",
+    "objectClass: top",
+    "o: MNN",
     
     // Sub-root #2
-    "dn: o=PNN,c=WW,ou=system\n" +
-    "objectClass: organization\n" +
-    "objectClass: top\n" +
-    "o: PNN\n\n" +
+    "dn: o=PNN,c=WW,ou=system",
+    "objectClass: organization",
+    "objectClass: top",
+    "o: PNN",
 
     // Referral #1
-    "dn: ou=Roles,o=MNN,c=WW,ou=system\n" +
-    "objectClass: extensibleObject\n" +
-    "objectClass: referral\n" +
-    "objectClass: top\n" +
-    "ou: Roles\n" +
-    "ref: ldap://hostd/ou=Roles,dc=apache,dc=org\n\n" +
+    "dn: ou=Roles,o=MNN,c=WW,ou=system",
+    "objectClass: extensibleObject",
+    "objectClass: referral",
+    "objectClass: top",
+    "ou: Roles",
+    "ref: ldap://hostd/ou=Roles,dc=apache,dc=org",
     
     // Referral #2
-    "dn: ou=People,o=MNN,c=WW,ou=system\n" +
-    "objectClass: extensibleObject\n" +
-    "objectClass: referral\n" +
-    "objectClass: top\n" +
-    "ou: People\n" +
-    "ref: ldap://hostb/OU=People,DC=example,DC=com\n" +
-    "ref: ldap://hostc/OU=People,O=MNN,C=WW\n\n" +
+    "dn: ou=People,o=MNN,c=WW,ou=system",
+    "objectClass: extensibleObject",
+    "objectClass: referral",
+    "objectClass: top",
+    "ou: People",
+    "ref: ldap://hostb/OU=People,DC=example,DC=com",
+    "ref: ldap://hostc/OU=People,O=MNN,C=WW",
     
     // Entry # 1
-    "dn: cn=Alex Karasulu,o=MNN,c=WW,ou=system\n" +
-    "objectClass: person\n" +
-    "objectClass: top\n" +
-    "cn: Alex Karasulu\n" +
-    "sn: akarasulu\n\n" +
+    "dn: cn=Alex Karasulu,o=MNN,c=WW,ou=system",
+    "objectClass: person",
+    "objectClass: top",
+    "cn: Alex Karasulu",
+    "sn: akarasulu",
     
     // Entry # 2
-    "dn: cn=Alex,o=MNN,c=WW,ou=system\n" +
-    "objectClass: person\n" +
-    "objectClass: top\n" +
-    "cn: Alex\n" +
-    "sn: akarasulu\n\n" +
+    "dn: cn=Alex,o=MNN,c=WW,ou=system",
+    "objectClass: person",
+    "objectClass: top",
+    "cn: Alex",
+    "sn: akarasulu",
     
     // Entry # 3
-    "dn: cn=Emmanuel,o=PNN,c=WW,ou=system\n" +
-    "objectClass: person\n" +
-    "objectClass: top\n" +
-    "cn: Emmanuel\n" +
-    "sn: elecharny\n\n"
+    "dn: cn=Emmanuel,o=PNN,c=WW,ou=system",
+    "objectClass: person",
+    "objectClass: top",
+    "cn: Emmanuel",
+    "sn: elecharny"
     }
 )
-public class MoveAndRenameReferralIT
+public class MoveAndRenameReferralIT extends AbstractLdapTestUnit
 {
-    /** The directory service */
-    public static DirectoryService service;
 
     /** The Context we are using to inject entries with JNDI */
     LdapContext MNNCtx;
@@ -155,7 +150,7 @@
         
         // Core API entry
         LdapDN dn = new LdapDN( "cn=Emmanuel Lecharny, ou=apache, ou=people, o=MNN, c=WW, ou=system" );
-        serverEntry = new DefaultServerEntry( service.getRegistries(), dn );
+        serverEntry = new DefaultServerEntry( service.getSchemaManager(), dn );
 
         serverEntry.put( "ObjectClass", "top", "person" );
         serverEntry.put( "sn", "elecharny" );

Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/MoveReferralIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/MoveReferralIT.java?rev=896599&r1=896598&r2=896599&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/MoveReferralIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/MoveReferralIT.java Wed Jan  6 18:26:43 2010
@@ -21,9 +21,9 @@
 
 import static org.apache.directory.server.core.integ.IntegrationUtils.getContext;
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
-import static org.junit.Assert.assertNotNull;
 
 import java.util.HashSet;
 import java.util.Set;
@@ -39,13 +39,11 @@
 
 import org.apache.directory.server.constants.ServerDNConstants;
 import org.apache.directory.server.core.CoreSession;
-import org.apache.directory.server.core.DirectoryService;
+import org.apache.directory.server.core.annotations.ApplyLdifs;
 import org.apache.directory.server.core.entry.DefaultServerEntry;
 import org.apache.directory.server.core.entry.ServerEntry;
-import org.apache.directory.server.core.integ.CiRunner;
-import org.apache.directory.server.core.integ.Level;
-import org.apache.directory.server.core.integ.annotations.ApplyLdifs;
-import org.apache.directory.server.core.integ.annotations.CleanupLevel;
+import org.apache.directory.server.core.integ.AbstractLdapTestUnit;
+import org.apache.directory.server.core.integ.FrameworkRunner;
 import org.apache.directory.shared.ldap.exception.LdapNamingException;
 import org.apache.directory.shared.ldap.message.ResultCodeEnum;
 import org.apache.directory.shared.ldap.name.LdapDN;
@@ -64,63 +62,60 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev: 691179 $
  */
-@RunWith ( CiRunner.class )
-@CleanupLevel ( Level.CLASS )
+@RunWith ( FrameworkRunner.class )
 @ApplyLdifs( {
     // Root
-    "dn: c=WW,ou=system\n" +
-    "objectClass: country\n" +
-    "objectClass: top\n" +
-    "c: WW\n\n" +
+    "dn: c=WW,ou=system",
+    "objectClass: country",
+    "objectClass: top",
+    "c: WW",
     
     // Sub-root #1
-    "dn: o=MNN,c=WW,ou=system\n" +
-    "objectClass: organization\n" +
-    "objectClass: top\n" +
-    "o: MNN\n\n" +
+    "dn: o=MNN,c=WW,ou=system",
+    "objectClass: organization",
+    "objectClass: top",
+    "o: MNN",
     
     // Sub-root #2
-    "dn: o=PNN,c=WW,ou=system\n" +
-    "objectClass: organization\n" +
-    "objectClass: top\n" +
-    "o: PNN\n\n" +
+    "dn: o=PNN,c=WW,ou=system",
+    "objectClass: organization",
+    "objectClass: top",
+    "o: PNN",
     
     // Referral #1
-    "dn: ou=Roles,o=MNN,c=WW,ou=system\n" +
-    "objectClass: extensibleObject\n" +
-    "objectClass: referral\n" +
-    "objectClass: top\n" +
-    "ou: Roles\n" +
-    "ref: ldap://hostd/ou=Roles,dc=apache,dc=org\n\n" +
+    "dn: ou=Roles,o=MNN,c=WW,ou=system",
+    "objectClass: extensibleObject",
+    "objectClass: referral",
+    "objectClass: top",
+    "ou: Roles",
+    "ref: ldap://hostd/ou=Roles,dc=apache,dc=org",
     
     // Referral #2
-    "dn: ou=People,o=MNN,c=WW,ou=system\n" +
-    "objectClass: extensibleObject\n" +
-    "objectClass: referral\n" +
-    "objectClass: top\n" +
-    "ou: People\n" +
-    "ref: ldap://hostb/OU=People,DC=example,DC=com\n" +
-    "ref: ldap://hostc/OU=People,O=MNN,C=WW\n\n" +
+    "dn: ou=People,o=MNN,c=WW,ou=system",
+    "objectClass: extensibleObject",
+    "objectClass: referral",
+    "objectClass: top",
+    "ou: People",
+    "ref: ldap://hostb/OU=People,DC=example,DC=com",
+    "ref: ldap://hostc/OU=People,O=MNN,C=WW",
     
     // Entry # 1
-    "dn: cn=Alex Karasulu,o=MNN,c=WW,ou=system\n" +
-    "objectClass: person\n" +
-    "objectClass: top\n" +
-    "cn: Alex Karasulu\n" +
-    "sn: akarasulu\n\n" +
+    "dn: cn=Alex Karasulu,o=MNN,c=WW,ou=system",
+    "objectClass: person",
+    "objectClass: top",
+    "cn: Alex Karasulu",
+    "sn: akarasulu",
     
     // Entry # 2
-    "dn: cn=Alex,o=MNN,c=WW,ou=system\n" +
-    "objectClass: person\n" +
-    "objectClass: top\n" +
-    "cn: Alex\n" +
-    "sn: akarasulu\n\n"
+    "dn: cn=Alex,o=MNN,c=WW,ou=system",
+    "objectClass: person",
+    "objectClass: top",
+    "cn: Alex",
+    "sn: akarasulu"
     }
 )
-public class MoveReferralIT
+public class MoveReferralIT extends AbstractLdapTestUnit
 {
-    /** The directory service */
-    public static DirectoryService service;
 
     /** The Contexts we are using to inject entries with JNDI */
     LdapContext MNNCtx;
@@ -146,7 +141,7 @@
         
         // Core API entry
         LdapDN dn = new LdapDN( "cn=Emmanuel Lecharny, ou=apache, ou=people, o=MNN, c=WW, ou=system" );
-        serverEntry = new DefaultServerEntry( service.getRegistries(), dn );
+        serverEntry = new DefaultServerEntry( service.getSchemaManager(), dn );
 
         serverEntry.put( "ObjectClass", "top", "person" );
         serverEntry.put( "sn", "elecharny" );

Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/RenameReferralIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/RenameReferralIT.java?rev=896599&r1=896598&r2=896599&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/RenameReferralIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/RenameReferralIT.java Wed Jan  6 18:26:43 2010
@@ -21,9 +21,9 @@
 
 import static org.apache.directory.server.core.integ.IntegrationUtils.getContext;
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
-import static org.junit.Assert.assertNotNull;
 
 import java.util.HashSet;
 import java.util.Set;
@@ -39,13 +39,11 @@
 
 import org.apache.directory.server.constants.ServerDNConstants;
 import org.apache.directory.server.core.CoreSession;
-import org.apache.directory.server.core.DirectoryService;
+import org.apache.directory.server.core.annotations.ApplyLdifs;
 import org.apache.directory.server.core.entry.DefaultServerEntry;
 import org.apache.directory.server.core.entry.ServerEntry;
-import org.apache.directory.server.core.integ.CiRunner;
-import org.apache.directory.server.core.integ.Level;
-import org.apache.directory.server.core.integ.annotations.ApplyLdifs;
-import org.apache.directory.server.core.integ.annotations.CleanupLevel;
+import org.apache.directory.server.core.integ.AbstractLdapTestUnit;
+import org.apache.directory.server.core.integ.FrameworkRunner;
 import org.apache.directory.shared.ldap.name.LdapDN;
 import org.apache.directory.shared.ldap.name.Rdn;
 import org.junit.Before;
@@ -65,63 +63,60 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev: 691179 $
  */
-@RunWith ( CiRunner.class )
-@CleanupLevel ( Level.CLASS )
+@RunWith ( FrameworkRunner.class )
 @ApplyLdifs( {
     // Root
-    "dn: c=WW,ou=system\n" +
-    "objectClass: country\n" +
-    "objectClass: top\n" +
-    "c: WW\n\n" +
+    "dn: c=WW,ou=system",
+    "objectClass: country",
+    "objectClass: top",
+    "c: WW",
     
     // Sub-root
-    "dn: o=MNN,c=WW,ou=system\n" +
-    "objectClass: organization\n" +
-    "objectClass: top\n" +
-    "o: MNN\n\n" +
+    "dn: o=MNN,c=WW,ou=system",
+    "objectClass: organization",
+    "objectClass: top",
+    "o: MNN",
     
     // Another Sub-root
-    "dn: o=PNN,c=WW,ou=system\n" +
-    "objectClass: organization\n" +
-    "objectClass: top\n" +
-    "o: MNN\n\n" +
+    "dn: o=PNN,c=WW,ou=system",
+    "objectClass: organization",
+    "objectClass: top",
+    "o: MNN",
     
     // Referral #1
-    "dn: ou=Roles,o=MNN,c=WW,ou=system\n" +
-    "objectClass: extensibleObject\n" +
-    "objectClass: referral\n" +
-    "objectClass: top\n" +
-    "ou: Roles\n" +
-    "ref: ldap://hostd/ou=Roles,dc=apache,dc=org\n\n" +
+    "dn: ou=Roles,o=MNN,c=WW,ou=system",
+    "objectClass: extensibleObject",
+    "objectClass: referral",
+    "objectClass: top",
+    "ou: Roles",
+    "ref: ldap://hostd/ou=Roles,dc=apache,dc=org",
     
     // Referral #2
-    "dn: ou=People,o=MNN,c=WW,ou=system\n" +
-    "objectClass: extensibleObject\n" +
-    "objectClass: referral\n" +
-    "objectClass: top\n" +
-    "ou: People\n" +
-    "ref: ldap://hostb/OU=People,DC=example,DC=com\n" +
-    "ref: ldap://hostc/OU=People,O=MNN,C=WW\n\n" +
+    "dn: ou=People,o=MNN,c=WW,ou=system",
+    "objectClass: extensibleObject",
+    "objectClass: referral",
+    "objectClass: top",
+    "ou: People",
+    "ref: ldap://hostb/OU=People,DC=example,DC=com",
+    "ref: ldap://hostc/OU=People,O=MNN,C=WW",
     
     // Entry # 1
-    "dn: cn=Alex Karasulu,o=MNN,c=WW,ou=system\n" +
-    "objectClass: person\n" +
-    "objectClass: top\n" +
-    "cn: Alex Karasulu\n" +
-    "sn: akarasulu\n\n" +
+    "dn: cn=Alex Karasulu,o=MNN,c=WW,ou=system",
+    "objectClass: person",
+    "objectClass: top",
+    "cn: Alex Karasulu",
+    "sn: akarasulu",
     
     // Entry # 2
-    "dn: cn=Alex,o=MNN,c=WW,ou=system\n" +
-    "objectClass: person\n" +
-    "objectClass: top\n" +
-    "cn: Alex\n" +
-    "sn: akarasulu\n\n"
+    "dn: cn=Alex,o=MNN,c=WW,ou=system",
+    "objectClass: person",
+    "objectClass: top",
+    "cn: Alex",
+    "sn: akarasulu"
     }
 )
-public class RenameReferralIT
+public class RenameReferralIT extends AbstractLdapTestUnit
 {
-    /** The directory service */
-    public static DirectoryService service;
 
     /** The Context we are using to inject entries with JNDI */
     LdapContext MNNCtx;
@@ -143,7 +138,7 @@
         
         // Core API entry
         LdapDN dn = new LdapDN( "cn=Emmanuel Lecharny, ou=apache, ou=people, o=MNN, c=WW, ou=system" );
-        serverEntry = new DefaultServerEntry( service.getRegistries(), dn );
+        serverEntry = new DefaultServerEntry( service.getSchemaManager(), dn );
 
         serverEntry.put( "ObjectClass", "top", "person" );
         serverEntry.put( "sn", "elecharny" );

Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/SearchReferralIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/SearchReferralIT.java?rev=896599&r1=896598&r2=896599&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/SearchReferralIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/referral/SearchReferralIT.java Wed Jan  6 18:26:43 2010
@@ -21,9 +21,9 @@
 
 import static org.apache.directory.server.core.integ.IntegrationUtils.getContext;
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
-import static org.junit.Assert.assertNotNull;
 
 import java.util.HashSet;
 import java.util.Set;
@@ -41,14 +41,12 @@
 
 import org.apache.directory.server.constants.ServerDNConstants;
 import org.apache.directory.server.core.CoreSession;
-import org.apache.directory.server.core.DirectoryService;
+import org.apache.directory.server.core.annotations.ApplyLdifs;
 import org.apache.directory.server.core.entry.DefaultServerEntry;
 import org.apache.directory.server.core.entry.ServerEntry;
 import org.apache.directory.server.core.filtering.EntryFilteringCursor;
-import org.apache.directory.server.core.integ.CiRunner;
-import org.apache.directory.server.core.integ.Level;
-import org.apache.directory.server.core.integ.annotations.ApplyLdifs;
-import org.apache.directory.server.core.integ.annotations.CleanupLevel;
+import org.apache.directory.server.core.integ.AbstractLdapTestUnit;
+import org.apache.directory.server.core.integ.FrameworkRunner;
 import org.apache.directory.shared.ldap.entry.Entry;
 import org.apache.directory.shared.ldap.name.LdapDN;
 import org.junit.Before;
@@ -66,63 +64,60 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev: 691179 $
  */
-@RunWith ( CiRunner.class )
-@CleanupLevel ( Level.CLASS )
+@RunWith ( FrameworkRunner.class )
 @ApplyLdifs( {
     // Root
-    "dn: c=WW,ou=system\n" +
-    "objectClass: country\n" +
-    "objectClass: top\n" +
-    "c: WW\n\n" +
+    "dn: c=WW,ou=system",
+    "objectClass: country",
+    "objectClass: top",
+    "c: WW",
     
     // Sub-root
-    "dn: o=MNN,c=WW,ou=system\n" +
-    "objectClass: organization\n" +
-    "objectClass: top\n" +
-    "o: MNN\n\n" +
+    "dn: o=MNN,c=WW,ou=system",
+    "objectClass: organization",
+    "objectClass: top",
+    "o: MNN",
     
     // Another Sub-root
-    "dn: o=PNN,c=WW,ou=system\n" +
-    "objectClass: organization\n" +
-    "objectClass: top\n" +
-    "o: MNN\n\n" +
+    "dn: o=PNN,c=WW,ou=system",
+    "objectClass: organization",
+    "objectClass: top",
+    "o: MNN",
     
     // Referral #1
-    "dn: ou=Roles,o=MNN,c=WW,ou=system\n" +
-    "objectClass: extensibleObject\n" +
-    "objectClass: referral\n" +
-    "objectClass: top\n" +
-    "ou: Roles\n" +
-    "ref: ldap://hostd/ou=Roles,dc=apache,dc=org\n\n" +
+    "dn: ou=Roles,o=MNN,c=WW,ou=system",
+    "objectClass: extensibleObject",
+    "objectClass: referral",
+    "objectClass: top",
+    "ou: Roles",
+    "ref: ldap://hostd/ou=Roles,dc=apache,dc=org",
     
     // Referral #2
-    "dn: ou=People,o=MNN,c=WW,ou=system\n" +
-    "objectClass: extensibleObject\n" +
-    "objectClass: referral\n" +
-    "objectClass: top\n" +
-    "ou: People\n" +
-    "ref: ldap://hostb/OU=People,DC=example,DC=com\n" +
-    "ref: ldap://hostc/OU=People,O=MNN,C=WW\n\n" +
+    "dn: ou=People,o=MNN,c=WW,ou=system",
+    "objectClass: extensibleObject",
+    "objectClass: referral",
+    "objectClass: top",
+    "ou: People",
+    "ref: ldap://hostb/OU=People,DC=example,DC=com",
+    "ref: ldap://hostc/OU=People,O=MNN,C=WW",
     
     // Entry # 1
-    "dn: cn=Alex Karasulu,o=MNN,c=WW,ou=system\n" +
-    "objectClass: person\n" +
-    "objectClass: top\n" +
-    "cn: Alex Karasulu\n" +
-    "sn: akarasulu\n\n" +
+    "dn: cn=Alex Karasulu,o=MNN,c=WW,ou=system",
+    "objectClass: person",
+    "objectClass: top",
+    "cn: Alex Karasulu",
+    "sn: akarasulu",
     
     // Entry # 2
-    "dn: cn=Alex,o=MNN,c=WW,ou=system\n" +
-    "objectClass: person\n" +
-    "objectClass: top\n" +
-    "cn: Alex\n" +
-    "sn: akarasulu\n\n"
+    "dn: cn=Alex,o=MNN,c=WW,ou=system",
+    "objectClass: person",
+    "objectClass: top",
+    "cn: Alex",
+    "sn: akarasulu"
     }
 )
-public class SearchReferralIT
+public class SearchReferralIT extends AbstractLdapTestUnit
 {
-    /** The directory service */
-    public static DirectoryService service;
 
     /** The Context we are using to inject entries with JNDI */
     LdapContext MNNCtx;
@@ -144,7 +139,7 @@
         
         // Core API entry
         LdapDN dn = new LdapDN( "cn=Emmanuel Lecharny, ou=apache, ou=people, o=MNN, c=WW, ou=system" );
-        serverEntry = new DefaultServerEntry( service.getRegistries(), dn );
+        serverEntry = new DefaultServerEntry( service.getSchemaManager(), dn );
 
         serverEntry.put( "ObjectClass", "top", "person" );
         serverEntry.put( "sn", "elecharny" );

Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/normalization/NormalizationServiceIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/normalization/NormalizationServiceIT.java?rev=896599&r1=896598&r2=896599&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/normalization/NormalizationServiceIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/normalization/NormalizationServiceIT.java Wed Jan  6 18:26:43 2010
@@ -20,20 +20,21 @@
 package org.apache.directory.server.core.normalization;
 
 
-import org.apache.directory.server.core.DirectoryService;
-import org.apache.directory.server.core.integ.CiRunner;
 import static org.apache.directory.server.core.integ.IntegrationUtils.getSystemContext;
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.assertNotNull;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import static org.junit.Assert.assertTrue;
 
 import javax.naming.directory.Attribute;
 import javax.naming.directory.Attributes;
 import javax.naming.directory.BasicAttributes;
 import javax.naming.ldap.LdapContext;
 
+import org.apache.directory.server.core.integ.AbstractLdapTestUnit;
+import org.apache.directory.server.core.integ.FrameworkRunner;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
 
 
 /**
@@ -42,11 +43,9 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$
  */
-@RunWith ( CiRunner.class )
-public final class NormalizationServiceIT
+@RunWith ( FrameworkRunner.class )
+public final class NormalizationServiceIT extends AbstractLdapTestUnit
 {
-    public static DirectoryService service;
-
 
     @Test
     public void testDireve308Example() throws Exception

Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operational/OperationalAttributeServiceIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operational/OperationalAttributeServiceIT.java?rev=896599&r1=896598&r2=896599&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operational/OperationalAttributeServiceIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operational/OperationalAttributeServiceIT.java Wed Jan  6 18:26:43 2010
@@ -20,23 +20,14 @@
 package org.apache.directory.server.core.operational;
 
 
-import org.apache.directory.server.core.DirectoryService;
-import org.apache.directory.server.core.entry.DefaultServerEntry;
-import org.apache.directory.server.core.integ.CiRunner;
 import static org.apache.directory.server.core.integ.IntegrationUtils.getSystemContext;
 import static org.apache.directory.server.core.integ.IntegrationUtils.getUserAddLdif;
-import org.apache.directory.shared.ldap.constants.JndiPropertyConstants;
-import org.apache.directory.shared.ldap.ldif.LdifEntry;
-import org.apache.directory.shared.ldap.message.AliasDerefMode;
-import org.apache.directory.shared.ldap.util.StringTools;
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
-import org.junit.Test;
-import org.junit.runner.RunWith;
 
 import javax.naming.NamingEnumeration;
 import javax.naming.NamingException;
@@ -52,6 +43,17 @@
 import javax.naming.directory.SearchResult;
 import javax.naming.ldap.LdapContext;
 
+import org.apache.directory.server.core.entry.DefaultServerEntry;
+import org.apache.directory.server.core.integ.AbstractLdapTestUnit;
+import org.apache.directory.server.core.integ.FrameworkRunner;
+import org.apache.directory.shared.ldap.constants.JndiPropertyConstants;
+import org.apache.directory.shared.ldap.exception.LdapSchemaViolationException;
+import org.apache.directory.shared.ldap.ldif.LdifEntry;
+import org.apache.directory.shared.ldap.message.AliasDerefMode;
+import org.apache.directory.shared.ldap.util.StringTools;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
 
 /**
  * Tests the methods on JNDI contexts that are analogous to entry modify
@@ -60,16 +62,12 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$
  */
-@RunWith ( CiRunner.class )
-public class OperationalAttributeServiceIT
+@RunWith ( FrameworkRunner.class )
+public class OperationalAttributeServiceIT extends AbstractLdapTestUnit
 {
     private static final String BINARY_KEY = "java.naming.ldap.attributes.binary";
     private static final String RDN_KATE_BUSH = "cn=Kate Bush";
 
-
-    public static DirectoryService service;
-
-
     protected Attributes getPersonAttributes( String sn, String cn )
     {
         Attributes attrs = new BasicAttributes( true );
@@ -268,7 +266,7 @@
     {
         LdifEntry akarasulu = getUserAddLdif();
         service.getAdminSession().add( 
-            new DefaultServerEntry( service.getRegistries(), akarasulu.getEntry() ) ); 
+            new DefaultServerEntry( service.getSchemaManager(), akarasulu.getEntry() ) ); 
 
         LdapContext sysRoot = getSystemContext( service );
         createData( sysRoot );
@@ -369,29 +367,19 @@
      *
      * @throws NamingException on error
      */
-    @Test
+    @Test( expected=LdapSchemaViolationException.class )
     public void testModifyOperationalAttributeAdd() throws Exception
     {
         LdapContext sysRoot = getSystemContext( service );
         createData( sysRoot );
 
-        ModificationItem modifyOp = new ModificationItem( DirContext.ADD_ATTRIBUTE, new BasicAttribute(
+        ModificationItem modifyOp = new ModificationItem( DirContext.ADD_ATTRIBUTE, 
+            new BasicAttribute(
             "modifiersName", "cn=Tori Amos,dc=example,dc=com" ) );
 
-        try
-        {
-            sysRoot.modifyAttributes( RDN_KATE_BUSH, new ModificationItem[]
-                { modifyOp } );
-            fail( "modification of entry should fail" );
-        }
-        catch ( InvalidAttributeValueException e )
-        {
-            // expected
-        }
-        catch ( NoPermissionException e )
-        {
-            // expected
-        }
+        sysRoot.modifyAttributes( RDN_KATE_BUSH, new ModificationItem[]
+            { modifyOp } );
+        fail( "modification of entry should fail" );
     }
 
 

Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/bind/SimpleBindIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/bind/SimpleBindIT.java?rev=896599&r1=896598&r2=896599&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/bind/SimpleBindIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/bind/SimpleBindIT.java Wed Jan  6 18:26:43 2010
@@ -20,6 +20,12 @@
 package org.apache.directory.server.core.operations.bind;
 
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
 import java.util.Hashtable;
 
 import javax.naming.Context;
@@ -33,7 +39,8 @@
 import javax.naming.directory.SearchResult;
 
 import org.apache.directory.server.core.DirectoryService;
-import org.apache.directory.server.core.integ.CiRunner;
+import org.apache.directory.server.core.integ.AbstractLdapTestUnit;
+import org.apache.directory.server.core.integ.FrameworkRunner;
 import org.apache.directory.server.core.jndi.CoreContextFactory;
 import org.apache.directory.shared.ldap.constants.JndiPropertyConstants;
 import org.apache.directory.shared.ldap.exception.LdapAuthenticationException;
@@ -41,11 +48,6 @@
 import org.apache.directory.shared.ldap.message.AliasDerefMode;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
 
 
 /**
@@ -54,12 +56,10 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$
  */
-@RunWith ( CiRunner.class )
-public class SimpleBindIT
+@RunWith ( FrameworkRunner.class )
+public class SimpleBindIT extends AbstractLdapTestUnit
 {
-    /** The directory service */
-    public static DirectoryService service;
-    
+
     /**
      * A method to do a search
      */



Mime
View raw message