You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by el...@apache.org on 2010/02/03 17:34:53 UTC
svn commit: r906114 - in
/directory/clients/ldap/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations:
./ bind/
Author: elecharny
Date: Wed Feb 3 16:34:52 2010
New Revision: 906114
URL: http://svn.apache.org/viewvc?rev=906114&view=rev
Log:
o Added some trace (temporarily)
o Added a shutdown method for all the tests
Modified:
directory/clients/ldap/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientAbandonRequestTest.java
directory/clients/ldap/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientAddRequestTest.java
directory/clients/ldap/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientCompareRequestTest.java
directory/clients/ldap/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientDeleteRequestTest.java
directory/clients/ldap/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientExtendedRequestTest.java
directory/clients/ldap/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientModifyDnRequestTest.java
directory/clients/ldap/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientModifyRequestTest.java
directory/clients/ldap/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/bind/SimpleBindRequestTest.java
Modified: directory/clients/ldap/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientAbandonRequestTest.java
URL: http://svn.apache.org/viewvc/directory/clients/ldap/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientAbandonRequestTest.java?rev=906114&r1=906113&r2=906114&view=diff
==============================================================================
--- directory/clients/ldap/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientAbandonRequestTest.java (original)
+++ directory/clients/ldap/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientAbandonRequestTest.java Wed Feb 3 16:34:52 2010
@@ -23,6 +23,7 @@
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicInteger;
@@ -47,6 +48,7 @@
import org.apache.directory.shared.ldap.filter.SearchScope;
import org.apache.directory.shared.ldap.message.AliasDerefMode;
import org.apache.directory.shared.ldap.name.LdapDN;
+import org.junit.After;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
@@ -81,6 +83,7 @@
@Before
public void setup() throws Exception
{
+ System.out.println( "Setup -------" );
connection = new LdapConnection( "localhost", ldapServer.getPort() );
LdapDN bindDn = new LdapDN( "uid=admin,ou=system" );
connection.setTimeOut( 0L );
@@ -88,6 +91,27 @@
session = ldapServer.getDirectoryService().getSession();
}
+
+
+ /**
+ * Close the LdapConnection
+ */
+ @After
+ public void shutdown()
+ {
+ try
+ {
+ if ( connection != null )
+ {
+ connection.close();
+ System.out.println( "Shutdown -------" );
+ }
+ }
+ catch( Exception ioe )
+ {
+ fail();
+ }
+ }
@Test
Modified: directory/clients/ldap/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientAddRequestTest.java
URL: http://svn.apache.org/viewvc/directory/clients/ldap/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientAddRequestTest.java?rev=906114&r1=906113&r2=906114&view=diff
==============================================================================
--- directory/clients/ldap/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientAddRequestTest.java (original)
+++ directory/clients/ldap/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientAddRequestTest.java Wed Feb 3 16:34:52 2010
@@ -24,6 +24,7 @@
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
import java.util.concurrent.Semaphore;
@@ -42,6 +43,7 @@
import org.apache.directory.shared.ldap.entry.client.DefaultClientEntry;
import org.apache.directory.shared.ldap.message.ResultCodeEnum;
import org.apache.directory.shared.ldap.name.LdapDN;
+import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -68,12 +70,34 @@
@Before
public void setup() throws Exception
{
+ System.out.println( "Setup -------" );
connection = new LdapConnection( "localhost", ldapServer.getPort() );
LdapDN bindDn = new LdapDN( "uid=admin,ou=system" );
connection.bind( bindDn.getName(), "secret" );
session = ldapServer.getDirectoryService().getSession();
}
+
+
+ /**
+ * Close the LdapConnection
+ */
+ @After
+ public void shutdown()
+ {
+ try
+ {
+ if ( connection != null )
+ {
+ connection.close();
+ System.out.println( "Shutdown -------" );
+ }
+ }
+ catch( Exception ioe )
+ {
+ fail();
+ }
+ }
@Test
Modified: directory/clients/ldap/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientCompareRequestTest.java
URL: http://svn.apache.org/viewvc/directory/clients/ldap/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientCompareRequestTest.java?rev=906114&r1=906113&r2=906114&view=diff
==============================================================================
--- directory/clients/ldap/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientCompareRequestTest.java (original)
+++ directory/clients/ldap/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientCompareRequestTest.java Wed Feb 3 16:34:52 2010
@@ -22,6 +22,7 @@
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
import java.util.concurrent.Semaphore;
@@ -37,6 +38,7 @@
import org.apache.directory.server.core.integ.FrameworkRunner;
import org.apache.directory.shared.ldap.constants.SchemaConstants;
import org.apache.directory.shared.ldap.name.LdapDN;
+import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -63,12 +65,34 @@
@Before
public void setup() throws Exception
{
+ System.out.println( "Setup -------" );
connection = new LdapConnection( "localhost", ldapServer.getPort() );
LdapDN bindDn = new LdapDN( "uid=admin,ou=system" );
connection.bind( bindDn.getName(), "secret" );
session = ldapServer.getDirectoryService().getSession();
}
+
+
+ /**
+ * Close the LdapConnection
+ */
+ @After
+ public void shutdown()
+ {
+ try
+ {
+ if ( connection != null )
+ {
+ connection.close();
+ System.out.println( "Shutdown -------" );
+ }
+ }
+ catch( Exception ioe )
+ {
+ fail();
+ }
+ }
@Test
Modified: directory/clients/ldap/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientDeleteRequestTest.java
URL: http://svn.apache.org/viewvc/directory/clients/ldap/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientDeleteRequestTest.java?rev=906114&r1=906113&r2=906114&view=diff
==============================================================================
--- directory/clients/ldap/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientDeleteRequestTest.java (original)
+++ directory/clients/ldap/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientDeleteRequestTest.java Wed Feb 3 16:34:52 2010
@@ -25,6 +25,7 @@
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
import java.lang.reflect.Method;
import java.util.Map;
@@ -105,6 +106,7 @@
@Before
public void setup() throws Exception
{
+ System.out.println( "Setup -------" );
connection = new LdapConnection( "localhost", ldapServer.getPort() );
LdapDN bindDn = new LdapDN( "uid=admin,ou=system" );
@@ -112,11 +114,26 @@
session = ldapServer.getDirectoryService().getAdminSession();
}
+
+ /**
+ * Close the LdapConnection
+ */
@After
- public void clean() throws Exception
+ public void shutdown()
{
- connection.close();
+ try
+ {
+ if ( connection != null )
+ {
+ connection.close();
+ System.out.println( "Shutdown -------" );
+ }
+ }
+ catch( Exception ioe )
+ {
+ fail();
+ }
}
Modified: directory/clients/ldap/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientExtendedRequestTest.java
URL: http://svn.apache.org/viewvc/directory/clients/ldap/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientExtendedRequestTest.java?rev=906114&r1=906113&r2=906114&view=diff
==============================================================================
--- directory/clients/ldap/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientExtendedRequestTest.java (original)
+++ directory/clients/ldap/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientExtendedRequestTest.java Wed Feb 3 16:34:52 2010
@@ -23,6 +23,7 @@
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
+import static org.junit.Assert.fail;
import java.util.concurrent.atomic.AtomicBoolean;
@@ -40,6 +41,7 @@
import org.apache.directory.server.ldap.handlers.extended.StartTlsHandler;
import org.apache.directory.shared.ldap.message.ResultCodeEnum;
import org.apache.directory.shared.ldap.name.LdapDN;
+import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -68,10 +70,32 @@
@Before
public void setup() throws Exception
{
+ System.out.println( "Setup -------" );
connection = new LdapConnection( "localhost", ldapServer.getPort() );
LdapDN bindDn = new LdapDN( "uid=admin,ou=system" );
connection.bind( bindDn.getName(), "secret" );
}
+
+
+ /**
+ * Close the LdapConnection
+ */
+ @After
+ public void shutdown()
+ {
+ try
+ {
+ if ( connection != null )
+ {
+ connection.close();
+ System.out.println( "Shutdown -------" );
+ }
+ }
+ catch( Exception ioe )
+ {
+ fail();
+ }
+ }
@Test
Modified: directory/clients/ldap/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientModifyDnRequestTest.java
URL: http://svn.apache.org/viewvc/directory/clients/ldap/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientModifyDnRequestTest.java?rev=906114&r1=906113&r2=906114&view=diff
==============================================================================
--- directory/clients/ldap/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientModifyDnRequestTest.java (original)
+++ directory/clients/ldap/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientModifyDnRequestTest.java Wed Feb 3 16:34:52 2010
@@ -25,6 +25,7 @@
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
import java.util.concurrent.Semaphore;
@@ -43,6 +44,7 @@
import org.apache.directory.shared.ldap.message.ResultCodeEnum;
import org.apache.directory.shared.ldap.name.LdapDN;
import org.apache.directory.shared.ldap.name.RDN;
+import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -77,6 +79,7 @@
@Before
public void setup() throws Exception
{
+ System.out.println( "Setup -------" );
connection = new LdapConnection( "localhost", ldapServer.getPort() );
LdapDN bindDn = new LdapDN( "uid=admin,ou=system" );
@@ -84,6 +87,27 @@
session = ldapServer.getDirectoryService().getAdminSession();
}
+
+
+ /**
+ * Close the LdapConnection
+ */
+ @After
+ public void shutdown()
+ {
+ try
+ {
+ if ( connection != null )
+ {
+ connection.close();
+ System.out.println( "Shutdown -------" );
+ }
+ }
+ catch( Exception ioe )
+ {
+ fail();
+ }
+ }
@Test
Modified: directory/clients/ldap/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientModifyRequestTest.java
URL: http://svn.apache.org/viewvc/directory/clients/ldap/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientModifyRequestTest.java?rev=906114&r1=906113&r2=906114&view=diff
==============================================================================
--- directory/clients/ldap/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientModifyRequestTest.java (original)
+++ directory/clients/ldap/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientModifyRequestTest.java Wed Feb 3 16:34:52 2010
@@ -23,6 +23,7 @@
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
+import static org.junit.Assert.fail;
import java.util.concurrent.Semaphore;
@@ -43,6 +44,7 @@
import org.apache.directory.shared.ldap.entry.client.DefaultClientEntry;
import org.apache.directory.shared.ldap.message.ResultCodeEnum;
import org.apache.directory.shared.ldap.name.LdapDN;
+import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -70,6 +72,7 @@
@Before
public void setup() throws Exception
{
+ System.out.println( "Setup -------" );
connection = new LdapConnection( "localhost", ldapServer.getPort() );
LdapDN bindDn = new LdapDN( "uid=admin,ou=system" );
@@ -79,6 +82,27 @@
}
+ /**
+ * Close the LdapConnection
+ */
+ @After
+ public void shutdown()
+ {
+ try
+ {
+ if ( connection != null )
+ {
+ connection.close();
+ System.out.println( "Shutdown -------" );
+ }
+ }
+ catch( Exception ioe )
+ {
+ fail();
+ }
+ }
+
+
@Test
public void testModify() throws Exception
{
Modified: directory/clients/ldap/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/bind/SimpleBindRequestTest.java
URL: http://svn.apache.org/viewvc/directory/clients/ldap/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/bind/SimpleBindRequestTest.java?rev=906114&r1=906113&r2=906114&view=diff
==============================================================================
--- directory/clients/ldap/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/bind/SimpleBindRequestTest.java (original)
+++ directory/clients/ldap/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/bind/SimpleBindRequestTest.java Wed Feb 3 16:34:52 2010
@@ -53,7 +53,7 @@
@CreateLdapServer (
transports =
{
- @CreateTransport( protocol = "LDAP" ),
+ @CreateTransport( protocol = "LDAP" ),
@CreateTransport( protocol = "LDAPS" )
})
public class SimpleBindRequestTest extends AbstractLdapTestUnit
@@ -67,6 +67,7 @@
@Before
public void setup() throws Exception
{
+ System.out.println( "Setup -------" );
connection = new LdapConnection( "localhost", ldapServer.getPort() );
}
@@ -81,7 +82,8 @@
{
if ( connection != null )
{
- connection.unBind();
+ connection.close();
+ System.out.println( "Shutdown -------" );
}
}
catch( Exception ioe )
@@ -148,6 +150,7 @@
@Test
public void testSimpleBindAnonymous() throws Exception
{
+ System.out.println("testSimpleBindAnonymous");
// Try with no parameters
BindResponse bindResponse = connection.bind();