Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 38425 invoked from network); 5 Jan 2010 14:06:32 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 5 Jan 2010 14:06:32 -0000 Received: (qmail 83813 invoked by uid 500); 5 Jan 2010 14:06:32 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 83751 invoked by uid 500); 5 Jan 2010 14:06:32 -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 83742 invoked by uid 99); 5 Jan 2010 14:06:32 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 05 Jan 2010 14:06:32 +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; Tue, 05 Jan 2010 14:06:28 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 76E6723889FD; Tue, 5 Jan 2010 14:06:06 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r896047 - in /directory/apacheds/branches/apacheds-schema: core-integ/src/main/java/org/apache/directory/server/core/integ/ core-integ/src/main/java/org/apache/directory/server/core/integ/annotations/ core-integ/src/main/java/org/apache/dir... Date: Tue, 05 Jan 2010 14:06:05 -0000 To: commits@directory.apache.org From: kayyagari@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100105140606.76E6723889FD@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: kayyagari Date: Tue Jan 5 14:06:04 2010 New Revision: 896047 URL: http://svn.apache.org/viewvc?rev=896047&view=rev Log: o removed unused annotations and classes o updated ldap-api-test classes accordingly Removed: directory/apacheds/branches/apacheds-schema/core-integ/src/main/java/org/apache/directory/server/core/integ/AnnotationUtils.java directory/apacheds/branches/apacheds-schema/core-integ/src/main/java/org/apache/directory/server/core/integ/CiRunner.java directory/apacheds/branches/apacheds-schema/core-integ/src/main/java/org/apache/directory/server/core/integ/CiSuite.java directory/apacheds/branches/apacheds-schema/core-integ/src/main/java/org/apache/directory/server/core/integ/DirectoryServiceFactory.java directory/apacheds/branches/apacheds-schema/core-integ/src/main/java/org/apache/directory/server/core/integ/InheritableSettings.java directory/apacheds/branches/apacheds-schema/core-integ/src/main/java/org/apache/directory/server/core/integ/Level.java directory/apacheds/branches/apacheds-schema/core-integ/src/main/java/org/apache/directory/server/core/integ/SetupMode.java directory/apacheds/branches/apacheds-schema/core-integ/src/main/java/org/apache/directory/server/core/integ/annotations/ApplyLdifFiles.java directory/apacheds/branches/apacheds-schema/core-integ/src/main/java/org/apache/directory/server/core/integ/annotations/ApplyLdifs.java directory/apacheds/branches/apacheds-schema/core-integ/src/main/java/org/apache/directory/server/core/integ/annotations/CleanupLevel.java directory/apacheds/branches/apacheds-schema/core-integ/src/main/java/org/apache/directory/server/core/integ/annotations/Factory.java directory/apacheds/branches/apacheds-schema/core-integ/src/main/java/org/apache/directory/server/core/integ/annotations/Mode.java directory/apacheds/branches/apacheds-schema/core-integ/src/main/java/org/apache/directory/server/core/integ/state/ directory/apacheds/branches/apacheds-schema/server-integ/src/main/java/org/apache/directory/server/integ/InheritableServerSettings.java directory/apacheds/branches/apacheds-schema/server-integ/src/main/java/org/apache/directory/server/integ/LdapServerFactory.java directory/apacheds/branches/apacheds-schema/server-integ/src/main/java/org/apache/directory/server/integ/SiRunner.java directory/apacheds/branches/apacheds-schema/server-integ/src/main/java/org/apache/directory/server/integ/SiSuite.java directory/apacheds/branches/apacheds-schema/server-integ/src/main/java/org/apache/directory/server/integ/state/ Modified: directory/apacheds/branches/apacheds-schema/ldap-api-test/src/test/java/org/apache/directory/shared/client/api/LdapConnectionTest.java directory/apacheds/branches/apacheds-schema/ldap-api-test/src/test/java/org/apache/directory/shared/client/api/LdapSSLConnectionTest.java directory/apacheds/branches/apacheds-schema/ldap-api-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientAbandonRequestTest.java directory/apacheds/branches/apacheds-schema/ldap-api-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientAddRequestTest.java directory/apacheds/branches/apacheds-schema/ldap-api-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientBindRequestTest.java directory/apacheds/branches/apacheds-schema/ldap-api-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientCompareRequestTest.java directory/apacheds/branches/apacheds-schema/ldap-api-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientDeleteRequestTest.java directory/apacheds/branches/apacheds-schema/ldap-api-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientExtendedRequestTest.java directory/apacheds/branches/apacheds-schema/ldap-api-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientModifyDnRequestTest.java directory/apacheds/branches/apacheds-schema/ldap-api-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientModifyRequestTest.java Modified: directory/apacheds/branches/apacheds-schema/ldap-api-test/src/test/java/org/apache/directory/shared/client/api/LdapConnectionTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/ldap-api-test/src/test/java/org/apache/directory/shared/client/api/LdapConnectionTest.java?rev=896047&r1=896046&r2=896047&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-schema/ldap-api-test/src/test/java/org/apache/directory/shared/client/api/LdapConnectionTest.java (original) +++ directory/apacheds/branches/apacheds-schema/ldap-api-test/src/test/java/org/apache/directory/shared/client/api/LdapConnectionTest.java Tue Jan 5 14:06:04 2010 @@ -19,17 +19,17 @@ */ package org.apache.directory.shared.client.api; -import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; import static org.junit.Assert.fail; import java.io.IOException; import java.util.List; -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.annotations.CreateLdapServer; +import org.apache.directory.server.annotations.CreateTransport; +import org.apache.directory.server.core.integ.AbstractLdapTestUnit; +import org.apache.directory.server.core.integ.FrameworkRunner; import org.apache.directory.shared.ldap.client.api.LdapConnection; import org.apache.directory.shared.ldap.client.api.exception.LdapException; import org.apache.directory.shared.ldap.client.api.messages.BindResponse; @@ -43,13 +43,15 @@ * @author Apache Directory Project * @version $Rev$, $Date$ */ -@RunWith ( SiRunner.class ) -@CleanupLevel ( Level.CLASS ) -public class LdapConnectionTest +@RunWith ( FrameworkRunner.class ) +@CreateLdapServer ( + transports = + { + @CreateTransport( protocol = "LDAP" ), + @CreateTransport( protocol = "LDAPS" ) + }) +public class LdapConnectionTest extends AbstractLdapTestUnit { - /** The server instance */ - public static LdapServer ldapServer; - /** * Test a successful bind request Modified: directory/apacheds/branches/apacheds-schema/ldap-api-test/src/test/java/org/apache/directory/shared/client/api/LdapSSLConnectionTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/ldap-api-test/src/test/java/org/apache/directory/shared/client/api/LdapSSLConnectionTest.java?rev=896047&r1=896046&r2=896047&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-schema/ldap-api-test/src/test/java/org/apache/directory/shared/client/api/LdapSSLConnectionTest.java (original) +++ directory/apacheds/branches/apacheds-schema/ldap-api-test/src/test/java/org/apache/directory/shared/client/api/LdapSSLConnectionTest.java Tue Jan 5 14:06:04 2010 @@ -26,37 +26,27 @@ import java.io.IOException; import java.security.cert.CertificateException; import java.security.cert.X509Certificate; -import java.util.HashMap; import java.util.List; -import java.util.Map; import javax.net.ssl.TrustManager; import javax.net.ssl.X509TrustManager; -import org.apache.directory.server.core.DefaultDirectoryService; -import org.apache.directory.server.core.DirectoryService; -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.LdapServer; -import org.apache.directory.server.ldap.handlers.bind.MechanismHandler; -import org.apache.directory.server.ldap.handlers.bind.SimpleMechanismHandler; +import org.apache.directory.server.annotations.CreateLdapServer; +import org.apache.directory.server.annotations.CreateTransport; +import org.apache.directory.server.annotations.SaslMechanism; +import org.apache.directory.server.core.integ.AbstractLdapTestUnit; +import org.apache.directory.server.core.integ.FrameworkRunner; import org.apache.directory.server.ldap.handlers.bind.cramMD5.CramMd5MechanismHandler; import org.apache.directory.server.ldap.handlers.bind.digestMD5.DigestMd5MechanismHandler; import org.apache.directory.server.ldap.handlers.bind.gssapi.GssapiMechanismHandler; import org.apache.directory.server.ldap.handlers.bind.ntlm.NtlmMechanismHandler; +import org.apache.directory.server.ldap.handlers.bind.plain.PlainMechanismHandler; import org.apache.directory.server.ldap.handlers.extended.StoredProcedureExtendedOperationHandler; -import org.apache.directory.server.protocol.shared.transport.TcpTransport; import org.apache.directory.shared.ldap.client.api.LdapConnection; import org.apache.directory.shared.ldap.client.api.LdapConnectionConfig; -import org.apache.directory.shared.ldap.client.api.exception.LdapException; import org.apache.directory.shared.ldap.client.api.messages.BindResponse; import org.apache.directory.shared.ldap.constants.SupportedSaslMechanisms; import org.apache.directory.shared.ldap.name.LdapDN; -import org.apache.mina.util.AvailablePortFinder; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -67,65 +57,31 @@ * @author Apache Directory Project * @version $Rev$, $Date$ */ -@RunWith ( SiRunner.class ) -@CleanupLevel ( Level.CLASS ) -@Factory ( LdapSSLConnectionTest.Factory.class ) -public class LdapSSLConnectionTest +@RunWith ( FrameworkRunner.class ) +@CreateLdapServer ( + transports = + { + @CreateTransport( protocol = "LDAP" ), + @CreateTransport( protocol = "LDAPS" ) + }, + saslHost="localhost", + saslMechanisms = + { + @SaslMechanism( name=SupportedSaslMechanisms.PLAIN, implClass=PlainMechanismHandler.class ), + @SaslMechanism( name=SupportedSaslMechanisms.CRAM_MD5, implClass=CramMd5MechanismHandler.class), + @SaslMechanism( name=SupportedSaslMechanisms.DIGEST_MD5, implClass=DigestMd5MechanismHandler.class), + @SaslMechanism( name=SupportedSaslMechanisms.GSSAPI, implClass=GssapiMechanismHandler.class), + @SaslMechanism( name=SupportedSaslMechanisms.NTLM, implClass=NtlmMechanismHandler.class), + @SaslMechanism( name=SupportedSaslMechanisms.GSS_SPNEGO, implClass=NtlmMechanismHandler.class) + }, + extendedOpHandlers = + { + StoredProcedureExtendedOperationHandler.class + }) +public class LdapSSLConnectionTest extends AbstractLdapTestUnit { - /** The server instance */ - public static LdapServer ldapServer; - private LdapConnectionConfig config; - public static class Factory implements LdapServerFactory - { - public LdapServer newInstance() throws Exception - { - DirectoryService service = new DefaultDirectoryService(); - IntegrationUtils.doDelete( service.getWorkingDirectory() ); - service.getChangeLog().setEnabled( true ); - service.setShutdownHookEnabled( false ); - - // change the working directory to something that is unique - // on the system and somewhere either under target directory - // or somewhere in a temp area of the machine. - - LdapServer ldapServer = new LdapServer(); - ldapServer.setDirectoryService( service ); - int port = AvailablePortFinder.getNextAvailable( 1024 ); - TcpTransport tcpTransport = new TcpTransport( port ); - int portSSL = port + 1; - TcpTransport tcpTransportSsl = new TcpTransport( portSSL ); - tcpTransportSsl.enableSSL( true ); - ldapServer.setTransports( tcpTransport, tcpTransportSsl ); - ldapServer.setEnabled( true ); - ldapServer.setConfidentialityRequired( true ); - ldapServer.addExtendedOperationHandler( new StoredProcedureExtendedOperationHandler() ); - - // Setup SASL Mechanisms - - Map mechanismHandlerMap = new HashMap(); - mechanismHandlerMap.put( SupportedSaslMechanisms.PLAIN, new SimpleMechanismHandler() ); - - CramMd5MechanismHandler cramMd5MechanismHandler = new CramMd5MechanismHandler(); - mechanismHandlerMap.put( SupportedSaslMechanisms.CRAM_MD5, cramMd5MechanismHandler ); - - DigestMd5MechanismHandler digestMd5MechanismHandler = new DigestMd5MechanismHandler(); - mechanismHandlerMap.put( SupportedSaslMechanisms.DIGEST_MD5, digestMd5MechanismHandler ); - - GssapiMechanismHandler gssapiMechanismHandler = new GssapiMechanismHandler(); - mechanismHandlerMap.put( SupportedSaslMechanisms.GSSAPI, gssapiMechanismHandler ); - - NtlmMechanismHandler ntlmMechanismHandler = new NtlmMechanismHandler(); - mechanismHandlerMap.put( SupportedSaslMechanisms.NTLM, ntlmMechanismHandler ); - mechanismHandlerMap.put( SupportedSaslMechanisms.GSS_SPNEGO, ntlmMechanismHandler ); - - ldapServer.setSaslMechanismHandlers( mechanismHandlerMap ); - - return ldapServer; - } - } - @Before public void setup() Modified: directory/apacheds/branches/apacheds-schema/ldap-api-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientAbandonRequestTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/ldap-api-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientAbandonRequestTest.java?rev=896047&r1=896046&r2=896047&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-schema/ldap-api-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientAbandonRequestTest.java (original) +++ directory/apacheds/branches/apacheds-schema/ldap-api-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientAbandonRequestTest.java Tue Jan 5 14:06:04 2010 @@ -27,11 +27,11 @@ import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicInteger; +import org.apache.directory.server.annotations.CreateLdapServer; +import org.apache.directory.server.annotations.CreateTransport; import org.apache.directory.server.core.CoreSession; -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.apache.directory.shared.ldap.client.api.LdapConnection; import org.apache.directory.shared.ldap.client.api.exception.LdapException; import org.apache.directory.shared.ldap.client.api.listeners.SearchListener; @@ -60,12 +60,15 @@ * @author Apache Directory Project * @version $Rev$, $Date$ */ -@RunWith(SiRunner.class) -@CleanupLevel(Level.CLASS) -public class ClientAbandonRequestTest +@RunWith(FrameworkRunner.class) +@CreateLdapServer ( + transports = + { + @CreateTransport( protocol = "LDAP" ), + @CreateTransport( protocol = "LDAPS" ) + }) +public class ClientAbandonRequestTest extends AbstractLdapTestUnit { - /** The server instance */ - public static LdapServer ldapServer; private LdapConnection connection; Modified: directory/apacheds/branches/apacheds-schema/ldap-api-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientAddRequestTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/ldap-api-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientAddRequestTest.java?rev=896047&r1=896046&r2=896047&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-schema/ldap-api-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientAddRequestTest.java (original) +++ directory/apacheds/branches/apacheds-schema/ldap-api-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientAddRequestTest.java Tue Jan 5 14:06:04 2010 @@ -27,10 +27,11 @@ import java.util.concurrent.Semaphore; +import org.apache.directory.server.annotations.CreateLdapServer; +import org.apache.directory.server.annotations.CreateTransport; import org.apache.directory.server.core.CoreSession; -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.core.integ.AbstractLdapTestUnit; +import org.apache.directory.server.core.integ.FrameworkRunner; import org.apache.directory.server.ldap.LdapServer; import org.apache.directory.shared.ldap.client.api.LdapConnection; import org.apache.directory.shared.ldap.client.api.exception.LdapException; @@ -52,13 +53,15 @@ * @author Apache Directory Project * @version $Rev$, $Date$ */ -@RunWith(SiRunner.class) -@CleanupLevel(Level.CLASS) -public class ClientAddRequestTest +@RunWith(FrameworkRunner.class) +@CreateLdapServer ( + transports = + { + @CreateTransport( protocol = "LDAP" ), + @CreateTransport( protocol = "LDAPS" ) + }) +public class ClientAddRequestTest extends AbstractLdapTestUnit { - /** The server instance */ - public static LdapServer ldapServer; - private LdapConnection connection; private CoreSession session; Modified: directory/apacheds/branches/apacheds-schema/ldap-api-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientBindRequestTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/ldap-api-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientBindRequestTest.java?rev=896047&r1=896046&r2=896047&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-schema/ldap-api-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientBindRequestTest.java (original) +++ directory/apacheds/branches/apacheds-schema/ldap-api-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientBindRequestTest.java Tue Jan 5 14:06:04 2010 @@ -26,10 +26,10 @@ import java.io.IOException; import java.util.concurrent.Semaphore; -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.annotations.CreateLdapServer; +import org.apache.directory.server.annotations.CreateTransport; +import org.apache.directory.server.core.integ.AbstractLdapTestUnit; +import org.apache.directory.server.core.integ.FrameworkRunner; import org.apache.directory.shared.ldap.client.api.LdapConnection; import org.apache.directory.shared.ldap.client.api.exception.LdapException; import org.apache.directory.shared.ldap.client.api.listeners.BindListener; @@ -46,13 +46,15 @@ * @author Apache Directory Project * @version $Rev$, $Date$ */ -@RunWith ( SiRunner.class ) -@CleanupLevel ( Level.CLASS ) -public class ClientBindRequestTest +@RunWith ( FrameworkRunner.class ) +@CreateLdapServer ( + transports = + { + @CreateTransport( protocol = "LDAP" ), + @CreateTransport( protocol = "LDAPS" ) + }) +public class ClientBindRequestTest extends AbstractLdapTestUnit { - /** The server instance */ - public static LdapServer ldapServer; - private LdapConnection connection; @Before Modified: directory/apacheds/branches/apacheds-schema/ldap-api-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientCompareRequestTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/ldap-api-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientCompareRequestTest.java?rev=896047&r1=896046&r2=896047&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-schema/ldap-api-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientCompareRequestTest.java (original) +++ directory/apacheds/branches/apacheds-schema/ldap-api-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientCompareRequestTest.java Tue Jan 5 14:06:04 2010 @@ -25,11 +25,11 @@ import java.util.concurrent.Semaphore; +import org.apache.directory.server.annotations.CreateLdapServer; +import org.apache.directory.server.annotations.CreateTransport; import org.apache.directory.server.core.CoreSession; -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.apache.directory.shared.ldap.client.api.LdapConnection; import org.apache.directory.shared.ldap.client.api.exception.LdapException; import org.apache.directory.shared.ldap.client.api.listeners.CompareListener; @@ -47,13 +47,15 @@ * @author Apache Directory Project * @version $Rev$, $Date$ */ -@RunWith(SiRunner.class) -@CleanupLevel(Level.CLASS) -public class ClientCompareRequestTest +@RunWith(FrameworkRunner.class) +@CreateLdapServer ( + transports = + { + @CreateTransport( protocol = "LDAP" ), + @CreateTransport( protocol = "LDAPS" ) + }) +public class ClientCompareRequestTest extends AbstractLdapTestUnit { - /** The server instance */ - public static LdapServer ldapServer; - private LdapConnection connection; private CoreSession session; Modified: directory/apacheds/branches/apacheds-schema/ldap-api-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientDeleteRequestTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/ldap-api-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientDeleteRequestTest.java?rev=896047&r1=896046&r2=896047&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-schema/ldap-api-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientDeleteRequestTest.java (original) +++ directory/apacheds/branches/apacheds-schema/ldap-api-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientDeleteRequestTest.java Tue Jan 5 14:06:04 2010 @@ -31,12 +31,12 @@ import java.util.concurrent.Semaphore; import java.util.concurrent.atomic.AtomicInteger; +import org.apache.directory.server.annotations.CreateLdapServer; +import org.apache.directory.server.annotations.CreateTransport; import org.apache.directory.server.core.CoreSession; -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 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.apache.directory.shared.ldap.client.api.LdapConnection; import org.apache.directory.shared.ldap.client.api.exception.LdapException; import org.apache.directory.shared.ldap.client.api.listeners.DeleteListener; @@ -55,46 +55,49 @@ * @author Apache Directory Project * @version $Rev$, $Date$ */ -@RunWith(SiRunner.class) -@CleanupLevel(Level.METHOD) +@RunWith(FrameworkRunner.class) +@CreateLdapServer ( + transports = + { + @CreateTransport( protocol = "LDAP" ), + @CreateTransport( protocol = "LDAPS" ) + }) @ApplyLdifs( { - "dn: cn=parent,ou=system\n" + - "objectClass: person\n" + - "cn: parent_cn\n" + - "sn: parent_sn\n" + - - "\n" + - - "dn: cn=child1,cn=parent,ou=system\n" + - "objectClass: person\n" + - "cn: child1_cn\n" + - "sn: child1_sn\n" + - - "\n" + - - "dn: cn=child2,cn=parent,ou=system\n" + - "objectClass: person\n" + - "cn: child2_cn\n" + - "sn: child2_sn\n" + - - "\n" + - - "dn: cn=grand_child11,cn=child1,cn=parent,ou=system\n" + - "objectClass: person\n" + - "cn: grand_child11_cn\n" + - "sn: grand_child11_sn\n" + - - "\n" + - - "dn: cn=grand_child12,cn=child1,cn=parent,ou=system\n" + - "objectClass: person\n" + - "cn: grand_child12_cn\n" + - "sn: grand_child12_sn\n" + "dn: cn=parent,ou=system", + "objectClass: person", + "cn: parent_cn", + "sn: parent_sn", + + "", + + "dn: cn=child1,cn=parent,ou=system", + "objectClass: person", + "cn: child1_cn", + "sn: child1_sn", + + "", + + "dn: cn=child2,cn=parent,ou=system", + "objectClass: person", + "cn: child2_cn", + "sn: child2_sn", + + "", + + "dn: cn=grand_child11,cn=child1,cn=parent,ou=system", + "objectClass: person", + "cn: grand_child11_cn", + "sn: grand_child11_sn", + + "", + + "dn: cn=grand_child12,cn=child1,cn=parent,ou=system", + "objectClass: person", + "cn: grand_child12_cn", + "sn: grand_child12_sn" }) -public class ClientDeleteRequestTest +public class ClientDeleteRequestTest extends AbstractLdapTestUnit { - public static LdapServer ldapServer; - private LdapConnection connection; private CoreSession session; Modified: directory/apacheds/branches/apacheds-schema/ldap-api-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientExtendedRequestTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/ldap-api-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientExtendedRequestTest.java?rev=896047&r1=896046&r2=896047&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-schema/ldap-api-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientExtendedRequestTest.java (original) +++ directory/apacheds/branches/apacheds-schema/ldap-api-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientExtendedRequestTest.java Tue Jan 5 14:06:04 2010 @@ -28,10 +28,10 @@ import javax.naming.ldap.StartTlsRequest; -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.annotations.CreateLdapServer; +import org.apache.directory.server.annotations.CreateTransport; +import org.apache.directory.server.core.integ.AbstractLdapTestUnit; +import org.apache.directory.server.core.integ.FrameworkRunner; import org.apache.directory.shared.ldap.client.api.LdapConnection; import org.apache.directory.shared.ldap.client.api.exception.LdapException; import org.apache.directory.shared.ldap.client.api.listeners.ExtendedListener; @@ -49,13 +49,15 @@ * @author Apache Directory Project * @version $Rev$, $Date$ */ -@RunWith(SiRunner.class) -@CleanupLevel(Level.CLASS) -public class ClientExtendedRequestTest +@RunWith(FrameworkRunner.class) +@CreateLdapServer ( + transports = + { + @CreateTransport( protocol = "LDAP" ), + @CreateTransport( protocol = "LDAPS" ) + }) +public class ClientExtendedRequestTest extends AbstractLdapTestUnit { - /** The server instance */ - public static LdapServer ldapServer; - private LdapConnection connection; @Before Modified: directory/apacheds/branches/apacheds-schema/ldap-api-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientModifyDnRequestTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/ldap-api-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientModifyDnRequestTest.java?rev=896047&r1=896046&r2=896047&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-schema/ldap-api-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientModifyDnRequestTest.java (original) +++ directory/apacheds/branches/apacheds-schema/ldap-api-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientModifyDnRequestTest.java Tue Jan 5 14:06:04 2010 @@ -28,12 +28,12 @@ import java.util.concurrent.Semaphore; +import org.apache.directory.server.annotations.CreateLdapServer; +import org.apache.directory.server.annotations.CreateTransport; import org.apache.directory.server.core.CoreSession; -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 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.apache.directory.shared.ldap.client.api.LdapConnection; import org.apache.directory.shared.ldap.client.api.exception.LdapException; import org.apache.directory.shared.ldap.client.api.listeners.ModifyDnListener; @@ -53,18 +53,21 @@ * @author Apache Directory Project * @version $Rev$, $Date$ */ -@RunWith(SiRunner.class) -@CleanupLevel(Level.METHOD) +@RunWith(FrameworkRunner.class) @ApplyLdifs( { - "dn: cn=modDn,ou=system\n" + - "objectClass: person\n" + - "cn: modDn\n" + - "sn: snModDn\n" + "dn: cn=modDn,ou=system", + "objectClass: person", + "cn: modDn", + "sn: snModDn" }) -public class ClientModifyDnRequestTest +@CreateLdapServer ( + transports = + { + @CreateTransport( protocol = "LDAP" ), + @CreateTransport( protocol = "LDAPS" ) + }) +public class ClientModifyDnRequestTest extends AbstractLdapTestUnit { - public static LdapServer ldapServer; - private LdapConnection connection; private CoreSession session; Modified: directory/apacheds/branches/apacheds-schema/ldap-api-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientModifyRequestTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/ldap-api-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientModifyRequestTest.java?rev=896047&r1=896046&r2=896047&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-schema/ldap-api-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientModifyRequestTest.java (original) +++ directory/apacheds/branches/apacheds-schema/ldap-api-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientModifyRequestTest.java Tue Jan 5 14:06:04 2010 @@ -26,12 +26,12 @@ import java.util.concurrent.Semaphore; +import org.apache.directory.server.annotations.CreateLdapServer; +import org.apache.directory.server.annotations.CreateTransport; import org.apache.directory.server.core.CoreSession; 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.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.apache.directory.shared.ldap.client.api.LdapConnection; import org.apache.directory.shared.ldap.client.api.exception.LdapException; import org.apache.directory.shared.ldap.client.api.listeners.ModifyListener; @@ -54,13 +54,15 @@ * @author Apache Directory Project * @version $Rev$, $Date$ */ -@RunWith(SiRunner.class) -@CleanupLevel(Level.CLASS) -public class ClientModifyRequestTest +@RunWith(FrameworkRunner.class) +@CreateLdapServer ( + transports = + { + @CreateTransport( protocol = "LDAP" ), + @CreateTransport( protocol = "LDAPS" ) + }) +public class ClientModifyRequestTest extends AbstractLdapTestUnit { - /** The server instance */ - public static LdapServer ldapServer; - private LdapConnection connection; private CoreSession session;