directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r894878 - in /directory/apacheds/branches/apacheds-schema/server-integ/src/test/java/org/apache/directory/server: operations/extended/ operations/modify/ operations/search/ ssl/
Date Thu, 31 Dec 2009 16:11:00 GMT
Author: elecharny
Date: Thu Dec 31 16:10:59 2009
New Revision: 894878

URL: http://svn.apache.org/viewvc?rev=894878&view=rev
Log:
Some more tests migration

Modified:
    directory/apacheds/branches/apacheds-schema/server-integ/src/test/java/org/apache/directory/server/operations/extended/ExtendedIT.java
    directory/apacheds/branches/apacheds-schema/server-integ/src/test/java/org/apache/directory/server/operations/extended/StoredProcedureIT.java
    directory/apacheds/branches/apacheds-schema/server-integ/src/test/java/org/apache/directory/server/operations/modify/ModifyMultipleChangesIT.java
    directory/apacheds/branches/apacheds-schema/server-integ/src/test/java/org/apache/directory/server/operations/search/IndexedNegationSearchIT.java
    directory/apacheds/branches/apacheds-schema/server-integ/src/test/java/org/apache/directory/server/operations/search/PagedSearchIT.java
    directory/apacheds/branches/apacheds-schema/server-integ/src/test/java/org/apache/directory/server/ssl/LdapsIT.java

Modified: directory/apacheds/branches/apacheds-schema/server-integ/src/test/java/org/apache/directory/server/operations/extended/ExtendedIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/server-integ/src/test/java/org/apache/directory/server/operations/extended/ExtendedIT.java?rev=894878&r1=894877&r2=894878&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/server-integ/src/test/java/org/apache/directory/server/operations/extended/ExtendedIT.java
(original)
+++ directory/apacheds/branches/apacheds-schema/server-integ/src/test/java/org/apache/directory/server/operations/extended/ExtendedIT.java
Thu Dec 31 16:10:59 2009
@@ -20,23 +20,20 @@
 package org.apache.directory.server.operations.extended;
 
 
+import static org.apache.directory.server.integ.ServerIntegrationUtils.getWiredContext;
+import static org.junit.Assert.fail;
+
 import javax.naming.CommunicationException;
 import javax.naming.NamingException;
 import javax.naming.ldap.ExtendedRequest;
 import javax.naming.ldap.ExtendedResponse;
 import javax.naming.ldap.LdapContext;
 
-import static org.apache.directory.server.integ.ServerIntegrationUtils.getWiredContext;
-
-import org.apache.directory.server.core.integ.Level;
-import org.apache.directory.server.core.integ.annotations.CleanupLevel;
-import org.apache.directory.server.integ.SiRunner;
-import org.apache.directory.server.ldap.LdapServer;
+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;
 
-import static org.junit.Assert.fail;
-
 
 /**
  * Various extended operation tests.
@@ -44,13 +41,9 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev: 545029 $
  */
-@RunWith ( SiRunner.class ) 
-@CleanupLevel ( Level.SUITE )
-public class ExtendedIT 
+@RunWith ( FrameworkRunner.class ) 
+public class ExtendedIT extends AbstractLdapTestUnit
 {
-    public static LdapServer ldapServer;
-    
-
     /**
      * Calls an extended exception, which does not exist. Expected behaviour is
      * a CommunicationException.

Modified: directory/apacheds/branches/apacheds-schema/server-integ/src/test/java/org/apache/directory/server/operations/extended/StoredProcedureIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/server-integ/src/test/java/org/apache/directory/server/operations/extended/StoredProcedureIT.java?rev=894878&r1=894877&r2=894878&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/server-integ/src/test/java/org/apache/directory/server/operations/extended/StoredProcedureIT.java
(original)
+++ directory/apacheds/branches/apacheds-schema/server-integ/src/test/java/org/apache/directory/server/operations/extended/StoredProcedureIT.java
Thu Dec 31 16:10:59 2009
@@ -20,14 +20,27 @@
 package org.apache.directory.server.operations.extended;
 
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Hashtable;
+import java.util.Map;
+import java.util.Set;
+
+import javax.naming.directory.Attributes;
+import javax.naming.directory.BasicAttributes;
+import javax.naming.ldap.InitialLdapContext;
+import javax.naming.ldap.LdapContext;
+
 import org.apache.directory.server.core.DefaultDirectoryService;
 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.server.core.integ.IntegrationUtils;
-import org.apache.directory.server.core.integ.Level;
-import org.apache.directory.server.core.integ.annotations.CleanupLevel;
 import org.apache.directory.server.core.integ.annotations.Factory;
 import org.apache.directory.server.integ.LdapServerFactory;
-import org.apache.directory.server.integ.SiRunner;
 import org.apache.directory.server.ldap.ExtendedOperationHandler;
 import org.apache.directory.server.ldap.LdapServer;
 import org.apache.directory.server.ldap.handlers.bind.MechanismHandler;
@@ -47,38 +60,20 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
-import javax.naming.directory.Attributes;
-import javax.naming.directory.BasicAttributes;
-import javax.naming.ldap.InitialLdapContext;
-import javax.naming.ldap.LdapContext;
-
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Hashtable;
-import java.util.Map;
-import java.util.Set;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-
 
 /**
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev:$
  */
-@RunWith ( SiRunner.class ) 
-@CleanupLevel ( Level.CLASS )
+@RunWith ( FrameworkRunner.class ) 
 @Factory ( StoredProcedureIT.Factory.class )
-public class StoredProcedureIT
+public class StoredProcedureIT extends AbstractLdapTestUnit
 {
     private LdapContext ctx;
     private LdapContext spCtx;
     private Map<String, OidNormalizer> oids;
 
     
-    public static LdapServer ldapServer;
-
-    
     public static class Factory implements LdapServerFactory
     {
         public LdapServer newInstance() throws Exception

Modified: directory/apacheds/branches/apacheds-schema/server-integ/src/test/java/org/apache/directory/server/operations/modify/ModifyMultipleChangesIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/server-integ/src/test/java/org/apache/directory/server/operations/modify/ModifyMultipleChangesIT.java?rev=894878&r1=894877&r2=894878&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/server-integ/src/test/java/org/apache/directory/server/operations/modify/ModifyMultipleChangesIT.java
(original)
+++ directory/apacheds/branches/apacheds-schema/server-integ/src/test/java/org/apache/directory/server/operations/modify/ModifyMultipleChangesIT.java
Thu Dec 31 16:10:59 2009
@@ -20,6 +20,11 @@
 package org.apache.directory.server.operations.modify;
 
 
+import static org.apache.directory.server.integ.ServerIntegrationUtils.getWiredContext;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
 import javax.naming.NamingEnumeration;
 import javax.naming.directory.Attribute;
 import javax.naming.directory.Attributes;
@@ -30,18 +35,11 @@
 import javax.naming.directory.SearchControls;
 import javax.naming.directory.SearchResult;
 
-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.integ.SiRunner;
-import static org.apache.directory.server.integ.ServerIntegrationUtils.getWiredContext;
-
-import org.apache.directory.server.ldap.LdapServer;
+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.junit.Test;
 import org.junit.runner.RunWith;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
 
 
 /**
@@ -50,38 +48,34 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$
  */
-@RunWith ( SiRunner.class ) 
-@CleanupLevel ( Level.SUITE )
+@RunWith ( FrameworkRunner.class ) 
 @ApplyLdifs( {
     // Entry # 1
-    "dn: cn=Tori Amos,ou=system\n" +
-    "objectClass: inetOrgPerson\n" +
-    "objectClass: organizationalPerson\n" +
-    "objectClass: person\n" +
-    "objectClass: top\n" +
-    "description: an American singer-songwriter\n" +
-    "cn: Tori Amos\n" +
-    "sn: Amos\n\n" + 
+    "dn: cn=Tori Amos,ou=system",
+    "objectClass: inetOrgPerson", 
+    "objectClass: organizationalPerson", 
+    "objectClass: person", 
+    "objectClass: top", 
+    "description: an American singer-songwriter", 
+    "cn: Tori Amos", 
+    "sn: Amos",  
     // Entry # 2
-    "dn: cn=Debbie Harry,ou=system\n" +
-    "objectClass: inetOrgPerson\n" +
-    "objectClass: organizationalPerson\n" +
-    "objectClass: person\n" +
-    "objectClass: top\n" +
-    "cn: Debbie Harry\n" +
-    "sn: Harry\n\n" 
+    "dn: cn=Debbie Harry,ou=system", 
+    "objectClass: inetOrgPerson", 
+    "objectClass: organizationalPerson", 
+    "objectClass: person", 
+    "objectClass: top", 
+    "cn: Debbie Harry", 
+    "sn: Harry" 
     }
 )
-public class ModifyMultipleChangesIT 
+public class ModifyMultipleChangesIT  extends AbstractLdapTestUnit
 {
     private static final String BASE = "ou=system";
     private static final String RDN_TORI_AMOS = "cn=Tori Amos";
     private static final String PERSON_DESCRIPTION = "an American singer-songwriter";
     private static final String RDN_DEBBIE_HARRY = "cn=Debbie Harry";
 
-    public static LdapServer ldapServer;
-    
-
     /**
      * Creation of required attributes of a person entry.
      */

Modified: directory/apacheds/branches/apacheds-schema/server-integ/src/test/java/org/apache/directory/server/operations/search/IndexedNegationSearchIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/server-integ/src/test/java/org/apache/directory/server/operations/search/IndexedNegationSearchIT.java?rev=894878&r1=894877&r2=894878&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/server-integ/src/test/java/org/apache/directory/server/operations/search/IndexedNegationSearchIT.java
(original)
+++ directory/apacheds/branches/apacheds-schema/server-integ/src/test/java/org/apache/directory/server/operations/search/IndexedNegationSearchIT.java
Thu Dec 31 16:10:59 2009
@@ -20,21 +20,32 @@
 package org.apache.directory.server.operations.search;
 
 
+import static org.apache.directory.server.integ.ServerIntegrationUtils.getWiredContext;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
+import javax.naming.NamingEnumeration;
+import javax.naming.directory.DirContext;
+import javax.naming.directory.SearchControls;
+import javax.naming.directory.SearchResult;
+
 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.AbstractLdapTestUnit;
+import org.apache.directory.server.core.integ.FrameworkRunner;
 import org.apache.directory.server.core.integ.IntegrationUtils;
-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.annotations.Factory;
-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.server.integ.LdapServerFactory;
-import org.apache.directory.server.integ.SiRunner;
-import static org.apache.directory.server.integ.ServerIntegrationUtils.getWiredContext;
-
 import org.apache.directory.server.ldap.LdapServer;
 import org.apache.directory.server.ldap.handlers.bind.MechanismHandler;
 import org.apache.directory.server.ldap.handlers.bind.SimpleMechanismHandler;
@@ -45,26 +56,13 @@
 import org.apache.directory.server.ldap.handlers.extended.StartTlsHandler;
 import org.apache.directory.server.ldap.handlers.extended.StoredProcedureExtendedOperationHandler;
 import org.apache.directory.server.protocol.shared.transport.TcpTransport;
+import org.apache.directory.server.xdbm.Index;
 import org.apache.directory.shared.ldap.constants.SchemaConstants;
 import org.apache.directory.shared.ldap.constants.SupportedSaslMechanisms;
 import org.apache.mina.util.AvailablePortFinder;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
-import javax.naming.NamingEnumeration;
-import javax.naming.directory.DirContext;
-import javax.naming.directory.SearchControls;
-import javax.naming.directory.SearchResult;
-
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-
 
 /**
  * A set of tests to make sure the negation operator is working 
@@ -73,85 +71,81 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$, $Date$
  */
-@RunWith ( SiRunner.class ) 
-@CleanupLevel ( Level.CLASS )
+@RunWith ( FrameworkRunner.class ) 
 @Factory ( IndexedNegationSearchIT.Factory.class )
 @ApplyLdifs( {
-    "dn: ou=test,ou=system\n" +
-    "objectClass: top\n" +
-    "objectClass: organizationalUnit\n" +
-    "ou: test\n\n" +
-
-    "dn: uid=test1,ou=test,ou=system\n" +
-    "objectClass: top\n" +
-    "objectClass: account\n" +
-    "uid: test1\n" +
-    "ou: test1\n\n" +
-
-    "dn: uid=test2,ou=test,ou=system\n" +
-    "objectClass: top\n" +
-    "objectClass: account\n" +
-    "uid: test2\n" +
-    "ou: test2\n\n" +
-
-    "dn: uid=testNoOU,ou=test,ou=system\n" +
-    "objectClass: top\n" +
-    "objectClass: account\n" +
-    "uid: testNoOU\n\n" +
+    "dn: ou=test,ou=system", 
+    "objectClass: top", 
+    "objectClass: organizationalUnit", 
+    "ou: test", 
+
+    "dn: uid=test1,ou=test,ou=system", 
+    "objectClass: top", 
+    "objectClass: account", 
+    "uid: test1", 
+    "ou: test1", 
+
+    "dn: uid=test2,ou=test,ou=system", 
+    "objectClass: top", 
+    "objectClass: account", 
+    "uid: test2", 
+    "ou: test2", 
+
+    "dn: uid=testNoOU,ou=test,ou=system", 
+    "objectClass: top", 
+    "objectClass: account", 
+    "uid: testNoOU", 
     
-    "dn: ou=actors,ou=system\n" +
-    "objectClass: top\n" +
-    "objectClass: organizationalUnit\n" +
-    "ou: actors\n\n" +
-
-    "dn: uid=jblack,ou=actors,ou=system\n" +
-    "objectClass: top\n" +
-    "objectClass: person\n" +
-    "objectClass: organizationalPerson\n" +
-    "objectClass: uidObject\n" +
-    "uid: jblack\n" +
-    "ou: comedy\n" +
-    "ou: adventure\n" +
-    "cn: Jack Black\n" +
-    "sn: Black\n\n" +
-
-    "dn: uid=bpitt,ou=actors,ou=system\n" +
-    "objectClass: top\n" +
-    "objectClass: person\n" +
-    "objectClass: organizationalPerson\n" +
-    "objectClass: uidObject\n" +
-    "uid: bpitt\n" +
-    "ou: drama\n" +
-    "ou: adventure\n" +
-    "cn: Brad Pitt\n" +
-    "sn: Pitt\n\n" +
-
-    "dn: uid=gcloony,ou=actors,ou=system\n" +
-    "objectClass: top\n" +
-    "objectClass: person\n" +
-    "objectClass: organizationalPerson\n" +
-    "objectClass: uidObject\n" +
-    "uid: gcloony\n" +
-    "ou: drama\n" +
-    "cn: Goerge Cloony\n" +
-    "sn: Cloony\n\n" +
-
-    "dn: uid=jnewbie,ou=actors,ou=system\n" +
-    "objectClass: top\n" +
-    "objectClass: person\n" +
-    "objectClass: organizationalPerson\n" +
-    "objectClass: uidObject\n" +
-    "uid: jnewbie\n" +
-    "cn: Joe Newbie\n" +
-    "sn: Newbie\n\n" 
+    "dn: ou=actors,ou=system", 
+    "objectClass: top", 
+    "objectClass: organizationalUnit", 
+    "ou: actors\n", 
+
+    "dn: uid=jblack,ou=actors,ou=system", 
+    "objectClass: top", 
+    "objectClass: person", 
+    "objectClass: organizationalPerson", 
+    "objectClass: uidObject", 
+    "uid: jblack", 
+    "ou: comedy", 
+    "ou: adventure", 
+    "cn: Jack Black", 
+    "sn: Black", 
+
+    "dn: uid=bpitt,ou=actors,ou=system", 
+    "objectClass: top", 
+    "objectClass: person", 
+    "objectClass: organizationalPerson", 
+    "objectClass: uidObject", 
+    "uid: bpitt", 
+    "ou: drama", 
+    "ou: adventure", 
+    "cn: Brad Pitt", 
+    "sn: Pitt", 
+
+    "dn: uid=gcloony,ou=actors,ou=system", 
+    "objectClass: top", 
+    "objectClass: person", 
+    "objectClass: organizationalPerson", 
+    "objectClass: uidObject", 
+    "uid: gcloony", 
+    "ou: drama", 
+    "cn: Goerge Cloony", 
+    "sn: Cloony", 
+
+    "dn: uid=jnewbie,ou=actors,ou=system", 
+    "objectClass: top", 
+    "objectClass: person", 
+    "objectClass: organizationalPerson", 
+    "objectClass: uidObject", 
+    "uid: jnewbie", 
+    "cn: Joe Newbie", 
+    "sn: Newbie" 
 
     }
 )
-public class IndexedNegationSearchIT 
+public class IndexedNegationSearchIT extends AbstractLdapTestUnit
 {
-    public static LdapServer ldapServer;
-
-    
     public static class Factory implements LdapServerFactory
     {
         public LdapServer newInstance() throws Exception

Modified: directory/apacheds/branches/apacheds-schema/server-integ/src/test/java/org/apache/directory/server/operations/search/PagedSearchIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/server-integ/src/test/java/org/apache/directory/server/operations/search/PagedSearchIT.java?rev=894878&r1=894877&r2=894878&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/server-integ/src/test/java/org/apache/directory/server/operations/search/PagedSearchIT.java
(original)
+++ directory/apacheds/branches/apacheds-schema/server-integ/src/test/java/org/apache/directory/server/operations/search/PagedSearchIT.java
Thu Dec 31 16:10:59 2009
@@ -20,6 +20,10 @@
 package org.apache.directory.server.operations.search;
 
  
+import static org.apache.directory.server.integ.ServerIntegrationUtils.getWiredContext;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
 import java.util.ArrayList;
 import java.util.List;
 
@@ -33,11 +37,9 @@
 import javax.naming.ldap.LdapContext;
 import javax.naming.ldap.PagedResultsResponseControl;
 
+import org.apache.directory.server.core.integ.AbstractLdapTestUnit;
+import org.apache.directory.server.core.integ.FrameworkRunner;
 import org.apache.directory.server.core.integ.annotations.ApplyLdifs;
-import org.apache.directory.server.integ.SiRunner;
-
-import static org.apache.directory.server.integ.ServerIntegrationUtils.getWiredContext;
-
 import org.apache.directory.server.ldap.LdapServer;
 import org.apache.directory.shared.ldap.message.control.PagedSearchControl;
 import org.apache.directory.shared.ldap.util.StringTools;
@@ -45,9 +47,6 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
 
 /**
  * Test the PagedSearchControl. The following tables covers all the
@@ -108,88 +107,85 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev: 545029 $
  */
-@RunWith ( SiRunner.class )
+@RunWith ( FrameworkRunner.class )
 @ApplyLdifs( {
     // Add 10 new entries
-    "dn: dc=users,ou=system\n" +
-    "objectClass: top\n" +
-    "objectClass: domain\n" +
-    "dc: users\n" +
-    "\n" +
-    "dn: cn=user0,dc=users,ou=system\n" +
-    "objectClass: top\n" +
-    "objectClass: person\n" +
-    "cn: user0\n" +
-    "sn: user 0\n" +
-    "\n" +
-    "dn: cn=user1,dc=users,ou=system\n" +
-    "objectClass: top\n" +
-    "objectClass: person\n" +
-    "cn: user1\n" +
-    "sn: user 1\n" +
-    "\n" +
-    "dn: cn=user2,dc=users,ou=system\n" +
-    "objectClass: top\n" +
-    "objectClass: person\n" +
-    "cn: user2\n" +
-    "sn: user 2\n" +
-    "\n" +
-    "dn: cn=user3,dc=users,ou=system\n" +
-    "objectClass: top\n" +
-    "objectClass: person\n" +
-    "cn: user3\n" +
-    "sn: user 3\n" +
-    "\n" +
-    "dn: cn=user4,dc=users,ou=system\n" +
-    "objectClass: top\n" +
-    "objectClass: person\n" +
-    "cn: user4\n" +
-    "sn: user 4\n" +
-    "\n" +
-    "dn: cn=user5,dc=users,ou=system\n" +
-    "objectClass: top\n" +
-    "objectClass: person\n" +
-    "cn: user5\n" +
-    "sn: user 5\n" +
-    "\n" +
-    "dn: cn=user6,dc=users,ou=system\n" +
-    "objectClass: top\n" +
-    "objectClass: person\n" +
-    "cn: user6\n" +
-    "sn: user 6\n" +
-    "\n" +
-    "dn: cn=user7,dc=users,ou=system\n" +
-    "objectClass: top\n" +
-    "objectClass: person\n" +
-    "cn: user7\n" +
-    "sn: user 7\n" +
-    "\n" +
-    "dn: cn=user8,dc=users,ou=system\n" +
-    "objectClass: top\n" +
-    "objectClass: person\n" +
-    "cn: user8\n" +
-    "sn: user 8\n" +
-    "\n" +
-    "dn: cn=user9,dc=users,ou=system\n" +
-    "objectClass: top\n" +
-    "objectClass: person\n" +
-    "cn: user9\n" +
-    "sn: user 9\n" +
-    "\n" +
+    "dn: dc=users,ou=system", 
+    "objectClass: top", 
+    "objectClass: domain", 
+    "dc: users", 
+    //
+    "dn: cn=user0,dc=users,ou=system", 
+    "objectClass: top", 
+    "objectClass: person", 
+    "cn: user0", 
+    "sn: user 0", 
+    //
+    "dn: cn=user1,dc=users,ou=system", 
+    "objectClass: top", 
+    "objectClass: person", 
+    "cn: user1", 
+    "sn: user 1", 
+    //
+    "dn: cn=user2,dc=users,ou=system", 
+    "objectClass: top", 
+    "objectClass: person", 
+    "cn: user2", 
+    "sn: user 2", 
+    //
+    "dn: cn=user3,dc=users,ou=system", 
+    "objectClass: top", 
+    "objectClass: person", 
+    "cn: user3", 
+    "sn: user 3", 
+    //
+    "dn: cn=user4,dc=users,ou=system", 
+    "objectClass: top", 
+    "objectClass: person", 
+    "cn: user4", 
+    "sn: user 4", 
+    //
+    "dn: cn=user5,dc=users,ou=system", 
+    "objectClass: top", 
+    "objectClass: person", 
+    "cn: user5", 
+    "sn: user 5", 
+    //
+    "dn: cn=user6,dc=users,ou=system", 
+    "objectClass: top", 
+    "objectClass: person", 
+    "cn: user6", 
+    "sn: user 6", 
+    //
+    "dn: cn=user7,dc=users,ou=system", 
+    "objectClass: top", 
+    "objectClass: person", 
+    "cn: user7", 
+    "sn: user 7", 
+    //
+    "dn: cn=user8,dc=users,ou=system", 
+    "objectClass: top", 
+    "objectClass: person", 
+    "cn: user8", 
+    "sn: user 8", 
+    // 
+    "dn: cn=user9,dc=users,ou=system", 
+    "objectClass: top", 
+    "objectClass: person", 
+    "cn: user9", 
+    "sn: user 9", 
+    "", 
     // Add another user for non admin tests
-    "dn: cn=user,ou=system\n" +
-    "objectClass: top\n" +
-    "objectClass: person\n" +
-    "cn: user\n" +
-    "userPassword: secret\n" +
-    "sn: user\n" +
-    "\n"
+    "dn: cn=user,ou=system", 
+    "objectClass: top", 
+    "objectClass: person", 
+    "cn: user", 
+    "userPassword: secret", 
+    "sn: user"
     }
 )
-public class PagedSearchIT
+public class PagedSearchIT extends AbstractLdapTestUnit
 {
-    public static LdapServer ldapServer;
-
     /**
      * Create the searchControls with a paged size
      */

Modified: directory/apacheds/branches/apacheds-schema/server-integ/src/test/java/org/apache/directory/server/ssl/LdapsIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/server-integ/src/test/java/org/apache/directory/server/ssl/LdapsIT.java?rev=894878&r1=894877&r2=894878&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-schema/server-integ/src/test/java/org/apache/directory/server/ssl/LdapsIT.java
(original)
+++ directory/apacheds/branches/apacheds-schema/server-integ/src/test/java/org/apache/directory/server/ssl/LdapsIT.java
Thu Dec 31 16:10:59 2009
@@ -20,16 +20,32 @@
 package org.apache.directory.server.ssl;
 
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+import java.security.cert.X509Certificate;
+import java.util.HashMap;
+import java.util.Hashtable;
+import java.util.Map;
+
+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.InitialDirContext;
+import javax.naming.directory.ModificationItem;
+
 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.AbstractLdapTestUnit;
+import org.apache.directory.server.core.integ.FrameworkRunner;
 import org.apache.directory.server.core.integ.IntegrationUtils;
-import org.apache.directory.server.core.integ.Level;
-import org.apache.directory.server.core.integ.annotations.CleanupLevel;
 import org.apache.directory.server.core.integ.annotations.Factory;
 import org.apache.directory.server.core.security.TlsKeyGenerator;
 import org.apache.directory.server.integ.LdapServerFactory;
-import org.apache.directory.server.integ.SiRunner;
 import org.apache.directory.server.ldap.LdapServer;
 import org.apache.directory.server.ldap.handlers.bind.MechanismHandler;
 import org.apache.directory.server.ldap.handlers.bind.SimpleMechanismHandler;
@@ -44,22 +60,6 @@
 import org.apache.mina.util.AvailablePortFinder;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-
-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.InitialDirContext;
-import javax.naming.directory.ModificationItem;
-
-import java.security.cert.X509Certificate;
-import java.util.HashMap;
-import java.util.Hashtable;
-import java.util.Map;
 
 
 /**
@@ -69,15 +69,12 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev: 642496 $
  */
-@RunWith ( SiRunner.class ) 
-@CleanupLevel ( Level.CLASS )
+@RunWith ( FrameworkRunner.class ) 
 @Factory ( LdapsIT.Factory.class )
-public class LdapsIT
+public class LdapsIT extends AbstractLdapTestUnit
 {
     private static final String RDN = "cn=The Person";
 
-    
-    public static LdapServer ldapServer;
 
     
     public static class Factory implements LdapServerFactory



Mime
View raw message