Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 12224 invoked from network); 7 May 2008 17:18:49 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 7 May 2008 17:18:49 -0000 Received: (qmail 67899 invoked by uid 500); 7 May 2008 17:18:51 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 67867 invoked by uid 500); 7 May 2008 17:18:51 -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 67856 invoked by uid 99); 7 May 2008 17:18:51 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 07 May 2008 10:18:51 -0700 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, 07 May 2008 17:18:04 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 719BB2388970; Wed, 7 May 2008 10:18:25 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r654176 - in /directory/apacheds/branches/bigbang/protocol-ldap/src/test/java/org/apache/directory/server/ldap: LdapServerTest.java SettingAlternativeHandlersTest.java Date: Wed, 07 May 2008 17:18:24 -0000 To: commits@directory.apache.org From: akarasulu@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080507171825.719BB2388970@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: akarasulu Date: Wed May 7 10:18:22 2008 New Revision: 654176 URL: http://svn.apache.org/viewvc?rev=654176&view=rev Log: removing test that was starting server which does not need to be the case Added: directory/apacheds/branches/bigbang/protocol-ldap/src/test/java/org/apache/directory/server/ldap/SettingAlternativeHandlersTest.java - copied, changed from r653971, directory/apacheds/branches/bigbang/protocol-ldap/src/test/java/org/apache/directory/server/ldap/LdapServerTest.java Removed: directory/apacheds/branches/bigbang/protocol-ldap/src/test/java/org/apache/directory/server/ldap/LdapServerTest.java Copied: directory/apacheds/branches/bigbang/protocol-ldap/src/test/java/org/apache/directory/server/ldap/SettingAlternativeHandlersTest.java (from r653971, directory/apacheds/branches/bigbang/protocol-ldap/src/test/java/org/apache/directory/server/ldap/LdapServerTest.java) URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/protocol-ldap/src/test/java/org/apache/directory/server/ldap/SettingAlternativeHandlersTest.java?p2=directory/apacheds/branches/bigbang/protocol-ldap/src/test/java/org/apache/directory/server/ldap/SettingAlternativeHandlersTest.java&p1=directory/apacheds/branches/bigbang/protocol-ldap/src/test/java/org/apache/directory/server/ldap/LdapServerTest.java&r1=653971&r2=654176&rev=654176&view=diff ============================================================================== --- directory/apacheds/branches/bigbang/protocol-ldap/src/test/java/org/apache/directory/server/ldap/LdapServerTest.java (original) +++ directory/apacheds/branches/bigbang/protocol-ldap/src/test/java/org/apache/directory/server/ldap/SettingAlternativeHandlersTest.java Wed May 7 10:18:22 2008 @@ -21,7 +21,6 @@ import junit.framework.TestCase; -import org.apache.directory.server.core.DefaultDirectoryService; import org.apache.directory.server.core.DirectoryService; import org.apache.directory.server.ldap.handlers.AbandonHandler; import org.apache.directory.server.ldap.handlers.AddHandler; @@ -32,7 +31,6 @@ import org.apache.directory.server.ldap.handlers.ModifyHandler; import org.apache.directory.server.ldap.handlers.SearchHandler; import org.apache.directory.server.ldap.handlers.UnbindHandler; -import org.apache.directory.server.protocol.shared.SocketAcceptor; import org.apache.directory.shared.ldap.NotImplementedException; import org.apache.directory.shared.ldap.exception.LdapNamingException; import org.apache.directory.shared.ldap.message.AbandonRequest; @@ -44,39 +42,23 @@ import org.apache.directory.shared.ldap.message.ModifyRequest; import org.apache.directory.shared.ldap.message.SearchRequest; import org.apache.directory.shared.ldap.message.UnbindRequest; -import org.apache.mina.common.ByteBuffer; import org.apache.mina.common.IoSession; -import org.apache.mina.common.SimpleByteBufferAllocator; -import org.apache.mina.util.AvailablePortFinder; /** - * Tests the . - * FIXME: This test case doesn't test enough now. + * This test is simply used to test that handlers can be set properly. * * @author Apache Directory Project * @version $Rev$ */ -public class LdapServerTest extends TestCase +public class SettingAlternativeHandlersTest extends TestCase { LdapServer ldapServer; - DirectoryService directoryService; - SocketAcceptor tcpAcceptor; public void setUp() throws Exception { - directoryService = new DefaultDirectoryService(); - directoryService.startup(); - - ByteBuffer.setAllocator( new SimpleByteBufferAllocator() ); - ByteBuffer.setUseDirectBuffers( false ); - tcpAcceptor = new SocketAcceptor( null ); - ldapServer = new LdapServer(); - ldapServer.setSocketAcceptor( tcpAcceptor ); - ldapServer.setDirectoryService( directoryService ); - ldapServer.setIpPort( AvailablePortFinder.getNextAvailable( 1024 ) ); if ( getName().equals( "testAlternativeConfiguration" ) ) { @@ -90,15 +72,6 @@ ldapServer.setSearchHandler( new BogusSearchHandler() ); ldapServer.setUnbindHandler( new BogusUnbindHandler() ); } - - ldapServer.start(); - } - - - public void tearDown() throws Exception - { - ldapServer.stop(); - directoryService.shutdown(); } @@ -111,7 +84,6 @@ */ public void testDefaultOperation() throws LdapNamingException { - assertNotNull( ldapServer.getCodecFactory() ); assertEquals( ldapServer.getName(), LdapServer.SERVICE_NAME ); } @@ -134,10 +106,10 @@ assertEquals( ldapServer.getModifyHandler().getClass(), BogusModifyHandler.class ); assertEquals( ldapServer.getSearchHandler().getClass(), BogusSearchHandler.class ); assertEquals( ldapServer.getUnbindHandler().getClass(), BogusUnbindHandler.class ); - assertNotNull( ldapServer.getCodecFactory() ); assertEquals( ldapServer.getName(), LdapServer.SERVICE_NAME ); } + public static class BogusAbandonHandler extends AbandonHandler { public void abandonMessageReceived( IoSession session, AbandonRequest request ) @@ -146,6 +118,7 @@ } } + public static class BogusUnbindHandler extends UnbindHandler { public void unbindMessageReceived( IoSession session, UnbindRequest request )