Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 26760 invoked from network); 30 Dec 2009 15:55:17 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 30 Dec 2009 15:55:17 -0000 Received: (qmail 94810 invoked by uid 500); 30 Dec 2009 15:55:17 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 94748 invoked by uid 500); 30 Dec 2009 15:55:17 -0000 Mailing-List: contact commits-help@directory.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@directory.apache.org Delivered-To: mailing list commits@directory.apache.org Received: (qmail 94739 invoked by uid 99); 30 Dec 2009 15:55:17 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 30 Dec 2009 15:55:17 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 30 Dec 2009 15:54:02 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 549FF2388A56; Wed, 30 Dec 2009 15:53:40 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r894653 [2/2] - in /directory/apacheds/branches/apacheds-schema/server-integ/src/test/java/org/apache/directory/server: operations/add/ operations/bind/ operations/compare/ operations/delete/ operations/modify/ operations/modifydn/ operatio... Date: Wed, 30 Dec 2009 15:53:39 -0000 To: commits@directory.apache.org From: kayyagari@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20091230155340.549FF2388A56@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Modified: directory/apacheds/branches/apacheds-schema/server-integ/src/test/java/org/apache/directory/server/operations/search/SearchIT.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/server-integ/src/test/java/org/apache/directory/server/operations/search/SearchIT.java?rev=894653&r1=894652&r2=894653&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-schema/server-integ/src/test/java/org/apache/directory/server/operations/search/SearchIT.java (original) +++ directory/apacheds/branches/apacheds-schema/server-integ/src/test/java/org/apache/directory/server/operations/search/SearchIT.java Wed Dec 30 15:53:38 2009 @@ -54,11 +54,10 @@ import netscape.ldap.LDAPMessage; import netscape.ldap.LDAPSearchListener; -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.annotations.ApplyLdifs; +import org.apache.directory.server.core.integ.AbstractLdapTestUnit; +import org.apache.directory.server.core.integ.FrameworkRunner; import org.apache.directory.server.core.subtree.SubentryInterceptor; -import org.apache.directory.server.integ.SiRunner; import org.apache.directory.server.ldap.LdapServer; import org.apache.directory.shared.ldap.constants.SchemaConstants; import org.apache.directory.shared.ldap.message.control.SubentriesControl; @@ -75,107 +74,106 @@ * @author Apache Directory Project * @version $Rev: 682556 $ */ -@RunWith ( SiRunner.class ) -@CleanupLevel ( Level.CLASS ) +@RunWith ( FrameworkRunner.class ) @ApplyLdifs( { // Entry # 0 - "dn: cn=Kate Bush,ou=system\n" + - "objectClass: person\n" + - "objectClass: organizationalPerson\n" + - "objectClass: inetOrgPerson\n" + - "objectClass: strongAuthenticationUser\n" + - "objectClass: top\n" + - "userCertificate:: NFZOXw==\n" + - "cn: Kate Bush\n" + - "description: this is a person\n" + - "sn: Bush\n" + - "jpegPhoto:: /9j/4AAQSkZJRgABAQEASABIAAD/4QAWRXhpZgAATU0AKgAAAAgAAAAAAAD//gAX\n" + - " Q3JlYXRlZCB3aXRoIFRoZSBHSU1Q/9sAQwAQCwwODAoQDg0OEhEQExgoGhgWFhgxIyUdKDozPTw\n" + - " 5Mzg3QEhcTkBEV0U3OFBtUVdfYmdoZz5NcXlwZHhcZWdj/9sAQwEREhIYFRgvGhovY0I4QmNjY2\n" + - " NjY2NjY2NjY2NjY2NjY2NjY2NjY2NjY2NjY2NjY2NjY2NjY2NjY2NjY2NjY2Nj/8AAEQgAAQABA\n" + - " wEiAAIRAQMRAf/EABUAAQEAAAAAAAAAAAAAAAAAAAAF/8QAFBABAAAAAAAAAAAAAAAAAAAAAP/E\n" + - " ABUBAQEAAAAAAAAAAAAAAAAAAAUG/8QAFBEBAAAAAAAAAAAAAAAAAAAAAP/aAAwDAQACEQMRAD8\n" + - " AigC14//Z\n\n" + + "dn: cn=Kate Bush,ou=system", + "objectClass: person", + "objectClass: organizationalPerson", + "objectClass: inetOrgPerson", + "objectClass: strongAuthenticationUser", + "objectClass: top", + "userCertificate:: NFZOXw==", + "cn: Kate Bush", + "description: this is a person", + "sn: Bush", + "jpegPhoto:: /9j/4AAQSkZJRgABAQEASABIAAD/4QAWRXhpZgAATU0AKgAAAAgAAAAAAAD//gAX", + " Q3JlYXRlZCB3aXRoIFRoZSBHSU1Q/9sAQwAQCwwODAoQDg0OEhEQExgoGhgWFhgxIyUdKDozPTw", + " 5Mzg3QEhcTkBEV0U3OFBtUVdfYmdoZz5NcXlwZHhcZWdj/9sAQwEREhIYFRgvGhovY0I4QmNjY2", + " NjY2NjY2NjY2NjY2NjY2NjY2NjY2NjY2NjY2NjY2NjY2NjY2NjY2NjY2NjY2Nj/8AAEQgAAQABA", + " wEiAAIRAQMRAf/EABUAAQEAAAAAAAAAAAAAAAAAAAAF/8QAFBABAAAAAAAAAAAAAAAAAAAAAP/E", + " ABUBAQEAAAAAAAAAAAAAAAAAAAUG/8QAFBEBAAAAAAAAAAAAAAAAAAAAAP/aAAwDAQACEQMRAD8", + " AigC14//Z", // Entry # 2 - "dn: cn=Tori Amos,ou=system\n" + - "objectClass: person\n" + - "objectClass: organizationalPerson\n" + - "objectClass: inetOrgPerson\n" + - "objectClass: strongAuthenticationUser\n" + - "objectClass: top\n" + - "userCertificate:: NFZOXw==\n" + - "cn: Tori Amos\n" + - "description: an American singer-songwriter\n" + - "sn: Amos\n" + - "jpegPhoto:: /9j/4AAQSkZJRgABAQEASABIAAD/4QAWRXhpZgAATU0AKgAAAAgAAAAAAAD//gAX\n" + - " Q3JlYXRlZCB3aXRoIFRoZSBHSU1Q/9sAQwAQCwwODAoQDg0OEhEQExgoGhgWFhgxIyUdKDozPTw\n" + - " 5Mzg3QEhcTkBEV0U3OFBtUVdfYmdoZz5NcXlwZHhcZWdj/9sAQwEREhIYFRgvGhovY0I4QmNjY2\n" + - " NjY2NjY2NjY2NjY2NjY2NjY2NjY2NjY2NjY2NjY2NjY2NjY2NjY2NjY2NjY2Nj/8AAEQgAAQABA\n" + - " wEiAAIRAQMRAf/EABUAAQEAAAAAAAAAAAAAAAAAAAAF/8QAFBABAAAAAAAAAAAAAAAAAAAAAP/E\n" + - " ABUBAQEAAAAAAAAAAAAAAAAAAAUG/8QAFBEBAAAAAAAAAAAAAAAAAAAAAP/aAAwDAQACEQMRAD8\n" + - " AigC14//Z\n\n" + + "dn: cn=Tori Amos,ou=system", + "objectClass: person", + "objectClass: organizationalPerson", + "objectClass: inetOrgPerson", + "objectClass: strongAuthenticationUser", + "objectClass: top", + "userCertificate:: NFZOXw==", + "cn: Tori Amos", + "description: an American singer-songwriter", + "sn: Amos", + "jpegPhoto:: /9j/4AAQSkZJRgABAQEASABIAAD/4QAWRXhpZgAATU0AKgAAAAgAAAAAAAD//gAX", + " Q3JlYXRlZCB3aXRoIFRoZSBHSU1Q/9sAQwAQCwwODAoQDg0OEhEQExgoGhgWFhgxIyUdKDozPTw", + " 5Mzg3QEhcTkBEV0U3OFBtUVdfYmdoZz5NcXlwZHhcZWdj/9sAQwEREhIYFRgvGhovY0I4QmNjY2", + " NjY2NjY2NjY2NjY2NjY2NjY2NjY2NjY2NjY2NjY2NjY2NjY2NjY2NjY2NjY2Nj/8AAEQgAAQABA", + " wEiAAIRAQMRAf/EABUAAQEAAAAAAAAAAAAAAAAAAAAF/8QAFBABAAAAAAAAAAAAAAAAAAAAAP/E", + " ABUBAQEAAAAAAAAAAAAAAAAAAAUG/8QAFBEBAAAAAAAAAAAAAAAAAAAAAP/aAAwDAQACEQMRAD8", + " AigC14//Z", // Entry # 3 - "dn: cn=Rolling-Stones,ou=system\n" + - "objectClass: person\n" + - "objectClass: organizationalPerson\n" + - "objectClass: inetOrgPerson\n" + - "objectClass: strongAuthenticationUser\n" + - "objectClass: top\n" + - "userCertificate:: NFZOXw==\n" + - "cn: Rolling-Stones\n" + - "description: an English singer-songwriter\n" + - "sn: Jagger\n" + - "jpegPhoto:: /9j/4AAQSkZJRgABAQEASABIAAD/4QAWRXhpZgAATU0AKgAAAAgAAAAAAAD//gAX\n" + - " Q3JlYXRlZCB3aXRoIFRoZSBHSU1Q/9sAQwAQCwwODAoQDg0OEhEQExgoGhgWFhgxIyUdKDozPTw\n" + - " 5Mzg3QEhcTkBEV0U3OFBtUVdfYmdoZz5NcXlwZHhcZWdj/9sAQwEREhIYFRgvGhovY0I4QmNjY2\n" + - " NjY2NjY2NjY2NjY2NjY2NjY2NjY2NjY2NjY2NjY2NjY2NjY2NjY2NjY2NjY2Nj/8AAEQgAAQABA\n" + - " wEiAAIRAQMRAf/EABUAAQEAAAAAAAAAAAAAAAAAAAAF/8QAFBABAAAAAAAAAAAAAAAAAAAAAP/E\n" + - " ABUBAQEAAAAAAAAAAAAAAAAAAAUG/8QAFBEBAAAAAAAAAAAAAAAAAAAAAP/aAAwDAQACEQMRAD8\n" + - " AigC14//Z\n\n" + + "dn: cn=Rolling-Stones,ou=system", + "objectClass: person", + "objectClass: organizationalPerson", + "objectClass: inetOrgPerson", + "objectClass: strongAuthenticationUser", + "objectClass: top", + "userCertificate:: NFZOXw==", + "cn: Rolling-Stones", + "description: an English singer-songwriter", + "sn: Jagger", + "jpegPhoto:: /9j/4AAQSkZJRgABAQEASABIAAD/4QAWRXhpZgAATU0AKgAAAAgAAAAAAAD//gAX", + " Q3JlYXRlZCB3aXRoIFRoZSBHSU1Q/9sAQwAQCwwODAoQDg0OEhEQExgoGhgWFhgxIyUdKDozPTw", + " 5Mzg3QEhcTkBEV0U3OFBtUVdfYmdoZz5NcXlwZHhcZWdj/9sAQwEREhIYFRgvGhovY0I4QmNjY2", + " NjY2NjY2NjY2NjY2NjY2NjY2NjY2NjY2NjY2NjY2NjY2NjY2NjY2NjY2NjY2Nj/8AAEQgAAQABA", + " wEiAAIRAQMRAf/EABUAAQEAAAAAAAAAAAAAAAAAAAAF/8QAFBABAAAAAAAAAAAAAAAAAAAAAP/E", + " ABUBAQEAAAAAAAAAAAAAAAAAAAUG/8QAFBEBAAAAAAAAAAAAAAAAAAAAAP/aAAwDAQACEQMRAD8", + " AigC14//Z", // Entry # 4 - "dn: cn=Heather Nova,ou=system\n" + - "objectClass: person\n" + - "objectClass: organizationalPerson\n" + - "objectClass: inetOrgPerson\n" + - "objectClass: strongAuthenticationUser\n" + - "objectClass: top\n" + - "userCertificate:: NFZOXw==\n" + - "cn: Heather Nova\n" + - "sn: Nova\n" + - "jpegPhoto:: /9j/4AAQSkZJRgABAQEASABIAAD/4QAWRXhpZgAATU0AKgAAAAgAAAAAAAD//gAX\n" + - " Q3JlYXRlZCB3aXRoIFRoZSBHSU1Q/9sAQwAQCwwODAoQDg0OEhEQExgoGhgWFhgxIyUdKDozPTw\n" + - " 5Mzg3QEhcTkBEV0U3OFBtUVdfYmdoZz5NcXlwZHhcZWdj/9sAQwEREhIYFRgvGhovY0I4QmNjY2\n" + - " NjY2NjY2NjY2NjY2NjY2NjY2NjY2NjY2NjY2NjY2NjY2NjY2NjY2NjY2NjY2Nj/8AAEQgAAQABA\n" + - " wEiAAIRAQMRAf/EABUAAQEAAAAAAAAAAAAAAAAAAAAF/8QAFBABAAAAAAAAAAAAAAAAAAAAAP/E\n" + - " ABUBAQEAAAAAAAAAAAAAAAAAAAUG/8QAFBEBAAAAAAAAAAAAAAAAAAAAAP/aAAwDAQACEQMRAD8\n" + - " AigC14//Z\n\n" + + "dn: cn=Heather Nova,ou=system", + "objectClass: person", + "objectClass: organizationalPerson", + "objectClass: inetOrgPerson", + "objectClass: strongAuthenticationUser", + "objectClass: top", + "userCertificate:: NFZOXw==", + "cn: Heather Nova", + "sn: Nova", + "jpegPhoto:: /9j/4AAQSkZJRgABAQEASABIAAD/4QAWRXhpZgAATU0AKgAAAAgAAAAAAAD//gAX", + " Q3JlYXRlZCB3aXRoIFRoZSBHSU1Q/9sAQwAQCwwODAoQDg0OEhEQExgoGhgWFhgxIyUdKDozPTw", + " 5Mzg3QEhcTkBEV0U3OFBtUVdfYmdoZz5NcXlwZHhcZWdj/9sAQwEREhIYFRgvGhovY0I4QmNjY2", + " NjY2NjY2NjY2NjY2NjY2NjY2NjY2NjY2NjY2NjY2NjY2NjY2NjY2NjY2NjY2Nj/8AAEQgAAQABA", + " wEiAAIRAQMRAf/EABUAAQEAAAAAAAAAAAAAAAAAAAAF/8QAFBABAAAAAAAAAAAAAAAAAAAAAP/E", + " ABUBAQEAAAAAAAAAAAAAAAAAAAUG/8QAFBEBAAAAAAAAAAAAAAAAAAAAAP/aAAwDAQACEQMRAD8", + " AigC14//Z", // Entry #5 - "dn: cn=Janis Joplin,ou=system\n" + - "objectClass: person\n" + - "objectClass: organizationalPerson\n" + - "objectClass: inetOrgPerson\n" + - "objectClass: top\n" + - "objectClass: strongAuthenticationUser\n" + - "cn: Janis Joplin\n" + - "sn: Joplin\n" + - "userCertificate:: \n\n" + + "dn: cn=Janis Joplin,ou=system", + "objectClass: person", + "objectClass: organizationalPerson", + "objectClass: inetOrgPerson", + "objectClass: top", + "objectClass: strongAuthenticationUser", + "cn: Janis Joplin", + "sn: Joplin", + "userCertificate:: ", // Entry #6 - "dn: cn=Kim Wilde,ou=system\n" + - "objectClass: person\n" + - "objectClass: top\n" + - "cn: Kim Wilde\n" + - "sn: Wilde\n" + - "description: an American singer-songwriter+sexy blond\n\n" + "dn: cn=Kim Wilde,ou=system", + "objectClass: person", + "objectClass: top", + "cn: Kim Wilde", + "sn: Wilde", + "description: an American singer-songwriter+sexy blond" } ) -public class SearchIT +public class SearchIT extends AbstractLdapTestUnit { private static final String BASE = "ou=system"; Modified: directory/apacheds/branches/apacheds-schema/server-integ/src/test/java/org/apache/directory/server/operations/search/SearchLimitsIT.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/server-integ/src/test/java/org/apache/directory/server/operations/search/SearchLimitsIT.java?rev=894653&r1=894652&r2=894653&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-schema/server-integ/src/test/java/org/apache/directory/server/operations/search/SearchLimitsIT.java (original) +++ directory/apacheds/branches/apacheds-schema/server-integ/src/test/java/org/apache/directory/server/operations/search/SearchLimitsIT.java Wed Dec 30 15:53:38 2009 @@ -20,39 +20,38 @@ 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.HashSet; +import java.util.Set; + +import javax.naming.NamingEnumeration; +import javax.naming.SizeLimitExceededException; +import javax.naming.TimeLimitExceededException; +import javax.naming.directory.DirContext; +import javax.naming.directory.SearchControls; +import javax.naming.directory.SearchResult; + +import org.apache.directory.server.core.annotations.ApplyLdifs; import org.apache.directory.server.core.entry.ClonedServerEntry; import org.apache.directory.server.core.filtering.EntryFilter; import org.apache.directory.server.core.filtering.EntryFilteringCursor; -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.server.core.interceptor.BaseInterceptor; import org.apache.directory.server.core.interceptor.Interceptor; import org.apache.directory.server.core.interceptor.NextInterceptor; import org.apache.directory.server.core.interceptor.context.SearchOperationContext; import org.apache.directory.server.core.interceptor.context.SearchingOperationContext; -import org.apache.directory.server.integ.SiRunner; -import static org.apache.directory.server.integ.ServerIntegrationUtils.getWiredContext; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; - import org.apache.directory.server.ldap.LdapServer; import org.junit.After; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import javax.naming.NamingEnumeration; -import javax.naming.SizeLimitExceededException; -import javax.naming.TimeLimitExceededException; -import javax.naming.directory.DirContext; -import javax.naming.directory.SearchControls; -import javax.naming.directory.SearchResult; - -import java.util.HashSet; -import java.util.Set; - /** * A set of tests to make sure the negation operator is working @@ -61,65 +60,62 @@ * @author Apache Directory Project * @version $Rev$, $Date$ */ -@RunWith ( SiRunner.class ) -@CleanupLevel ( Level.SUITE ) +@RunWith ( FrameworkRunner.class ) @ApplyLdifs( { - "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" + - "userPassword: secret\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" + - "userPassword: secret\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" + - "userPassword: secret\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" + - "userPassword: secret\n" + - "cn: Joe Newbie\n" + - "sn: Newbie\n\n" + "dn: ou=actors,ou=system", + "objectClass: top", + "objectClass: organizationalUnit", + "ou: actors", + + "dn: uid=jblack,ou=actors,ou=system", + "objectClass: top", + "objectClass: person", + "objectClass: organizationalPerson", + "objectClass: uidObject", + "uid: jblack", + "ou: comedy", + "ou: adventure", + "cn: Jack Black", + "userPassword: secret", + "sn: Black", + + "dn: uid=bpitt,ou=actors,ou=system", + "objectClass: top", + "objectClass: person", + "objectClass: organizationalPerson", + "objectClass: uidObject", + "uid: bpitt", + "ou: drama", + "ou: adventure", + "userPassword: secret", + "cn: Brad Pitt", + "sn: Pitt", + + "dn: uid=gcloony,ou=actors,ou=system", + "objectClass: top", + "objectClass: person", + "objectClass: organizationalPerson", + "objectClass: uidObject", + "uid: gcloony", + "ou: drama", + "userPassword: secret", + "cn: Goerge Cloony", + "sn: Cloony", + + "dn: uid=jnewbie,ou=actors,ou=system", + "objectClass: top", + "objectClass: person", + "objectClass: organizationalPerson", + "objectClass: uidObject", + "uid: jnewbie", + "userPassword: secret", + "cn: Joe Newbie", + "sn: Newbie" } ) -public class SearchLimitsIT +public class SearchLimitsIT extends AbstractLdapTestUnit { - public static LdapServer ldapServer; - /** * An {@link Interceptor} that fakes a specified amount of delay to each * search iteration so we can make sure search time limits are adhered to. Modified: directory/apacheds/branches/apacheds-schema/server-integ/src/test/java/org/apache/directory/server/ssl/StartTlsIT.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/server-integ/src/test/java/org/apache/directory/server/ssl/StartTlsIT.java?rev=894653&r1=894652&r2=894653&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-schema/server-integ/src/test/java/org/apache/directory/server/ssl/StartTlsIT.java (original) +++ directory/apacheds/branches/apacheds-schema/server-integ/src/test/java/org/apache/directory/server/ssl/StartTlsIT.java Wed Dec 30 15:53:38 2009 @@ -20,6 +20,11 @@ package org.apache.directory.server.ssl; +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 java.io.ByteArrayInputStream; import java.io.File; import java.io.FileOutputStream; @@ -54,12 +59,10 @@ import org.apache.directory.server.core.CoreSession; import org.apache.directory.server.core.entry.ClonedServerEntry; import org.apache.directory.server.core.entry.ServerEntry; -import org.apache.directory.server.core.integ.Level; -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.server.core.security.TlsKeyGenerator; import org.apache.directory.server.integ.ServerIntegrationUtils; -import org.apache.directory.server.integ.SiRunner; -import org.apache.directory.server.ldap.LdapServer; import org.apache.directory.shared.ldap.name.LdapDN; import org.junit.After; import org.junit.Before; @@ -69,12 +72,6 @@ import org.slf4j.LoggerFactory; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; - - /** * Test case to verify proper operation of confidentiality requirements as * specified in https://issues.apache.org/jira/browse/DIRSERVER-1189. @@ -86,9 +83,8 @@ * @author Apache Directory Project * @version $Rev: 639006 $ */ -@RunWith ( SiRunner.class ) -@CleanupLevel ( Level.SUITE ) -public class StartTlsIT +@RunWith ( FrameworkRunner.class ) +public class StartTlsIT extends AbstractLdapTestUnit { private static final Logger LOG = LoggerFactory.getLogger( StartTlsIT.class ); private static final String[] CERT_IDS = new String[] { "userCertificate" }; @@ -97,7 +93,6 @@ private File ksFile; - public static LdapServer ldapServer; boolean oldConfidentialityRequiredValue; Modified: directory/apacheds/branches/apacheds-schema/server-integ/src/test/java/org/apache/directory/server/suites/StockServerISuite2.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/server-integ/src/test/java/org/apache/directory/server/suites/StockServerISuite2.java?rev=894653&r1=894652&r2=894653&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-schema/server-integ/src/test/java/org/apache/directory/server/suites/StockServerISuite2.java (original) +++ directory/apacheds/branches/apacheds-schema/server-integ/src/test/java/org/apache/directory/server/suites/StockServerISuite2.java Wed Dec 30 15:53:38 2009 @@ -27,12 +27,28 @@ import org.apache.directory.server.core.annotations.CreateIndex; import org.apache.directory.server.core.annotations.CreatePartition; import org.apache.directory.server.core.integ.FrameworkSuite; +import org.apache.directory.server.operations.add.AddIT; import org.apache.directory.server.operations.add.AddingEntriesWithSpecialCharactersInRDNIT; +import org.apache.directory.server.operations.bind.BindIT; +import org.apache.directory.server.operations.bind.SimpleBindIT; import org.apache.directory.server.operations.compare.CompareIT; import org.apache.directory.server.operations.compare.MatchingRuleCompareIT; import org.apache.directory.server.operations.delete.DeleteIT; import org.apache.directory.server.operations.modify.IllegalModificationIT; import org.apache.directory.server.operations.modify.ModifyAddIT; +import org.apache.directory.server.operations.modify.ModifyReferralIT; +import org.apache.directory.server.operations.modify.ModifyRemoveIT; +import org.apache.directory.server.operations.modify.ModifyReplaceIT; +import org.apache.directory.server.operations.modifydn.ModifyDnReferralIT; +import org.apache.directory.server.operations.modifydn.ModifyRdnIT; +import org.apache.directory.server.operations.modifydn.MoveIT; +import org.apache.directory.server.operations.search.NegationSearchIT; +import org.apache.directory.server.operations.search.PersistentSearchIT; +import org.apache.directory.server.operations.search.ReferralSearchIT; +import org.apache.directory.server.operations.search.SchemaSearchIT; +import org.apache.directory.server.operations.search.SearchIT; +import org.apache.directory.server.operations.search.SearchLimitsIT; +import org.apache.directory.server.ssl.StartTlsIT; import org.junit.runner.RunWith; import org.junit.runners.Suite; @@ -46,12 +62,12 @@ @RunWith ( FrameworkSuite.class ) @Suite.SuiteClasses ( { AddingEntriesWithSpecialCharactersInRDNIT.class, - //AddIT.class, For this test, we need to be able to declare a LdapServer at the class level + AddIT.class, CompareIT.class, MatchingRuleCompareIT.class, DeleteIT.class, IllegalModificationIT.class, - ModifyAddIT.class/*, + ModifyAddIT.class, ModifyReferralIT.class, ModifyRemoveIT.class, ModifyReplaceIT.class, @@ -66,7 +82,7 @@ StartTlsIT.class, ModifyDnReferralIT.class, PersistentSearchIT.class, - SearchLimitsIT.class*/ + SearchLimitsIT.class } ) @CreateDS( name = "SuiteDS", @@ -85,7 +101,7 @@ { @CreateIndex( attribute = "objectClass" ), @CreateIndex( attribute = "dc" ), - @CreateIndex( attribute = "ou" ), + @CreateIndex( attribute = "ou" ) } ) } ) @CreateLdapServer (