directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r1175816 - in /directory/apacheds/trunk/server-integ/src: main/java/org/apache/directory/server/integ/ test/java/org/apache/directory/server/operations/add/ test/java/org/apache/directory/server/operations/compare/ test/java/org/apache/dire...
Date Mon, 26 Sep 2011 12:07:22 GMT
Author: elecharny
Date: Mon Sep 26 12:07:21 2011
New Revision: 1175816

URL: http://svn.apache.org/viewvc?rev=1175816&view=rev
Log:
o Replaced the getClientApiConnection by getAdminConnection
o Added Javadoc
o Added the getAdminConnection and renamed the getClientApiConnection to getLdapConnection

Modified:
    directory/apacheds/trunk/server-integ/src/main/java/org/apache/directory/server/integ/ServerIntegrationUtils.java
    directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/add/AddAliasIT.java
    directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/add/AddIT.java
    directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/add/AddingEntriesWithSpecialCharactersInRDNIT.java
    directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/compare/CompareIT.java
    directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/delete/DeleteAliasIT.java
    directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/delete/DeleteIT.java
    directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/lookup/LookupIT.java
    directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/lookup/LookupPerfIT.java
    directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/modify/IllegalModificationIT.java
    directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/modifydn/MoveIT.java
    directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/search/SearchIT.java

Modified: directory/apacheds/trunk/server-integ/src/main/java/org/apache/directory/server/integ/ServerIntegrationUtils.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-integ/src/main/java/org/apache/directory/server/integ/ServerIntegrationUtils.java?rev=1175816&r1=1175815&r2=1175816&view=diff
==============================================================================
--- directory/apacheds/trunk/server-integ/src/main/java/org/apache/directory/server/integ/ServerIntegrationUtils.java
(original)
+++ directory/apacheds/trunk/server-integ/src/main/java/org/apache/directory/server/integ/ServerIntegrationUtils.java
Mon Sep 26 12:07:21 2011
@@ -209,20 +209,52 @@ public class ServerIntegrationUtils exte
     }
 
 
+    /**
+     * Gets a LDAP connection instance on a server, authenticating a user.
+     * 
+     * @param ldapServer The server we want to connect to
+     * @param principalDn The user's DN
+     * @param password The user's password
+     * @return A LdapConnection instance if we got one
+     * @throws Exception If the connection cannot be created
+     */
     public static LDAPConnection getWiredConnection( LdapServer ldapServer, String principalDn,
String password )
         throws Exception
     {
-        LDAPConnection conn = new LDAPConnection();
-        conn.connect( 3, "localhost", ldapServer.getPort(), principalDn, password );
-        return conn;
+        LDAPConnection connection = new LDAPConnection();
+        connection.connect( 3, "localhost", ldapServer.getPort(), principalDn, password );
+        
+        return connection;
     }
 
 
-    public static LdapConnection getClientApiConnection( LdapServer ldapServer ) throws Exception
+    /**
+     * Gets a LDAP connection instance on a server. We won't bind on the server.
+     * 
+     * @param ldapServer The server we want to connect to
+     * @return A LdapConnection instance if we got one
+     * @throws Exception If the connection cannot be created
+     */
+    public static LdapConnection getLdapConnection( LdapServer ldapServer ) throws Exception
     {
-        LdapConnection conn = new LdapNetworkConnection( "localhost", ldapServer.getPort()
);
-        conn.bind( ServerDNConstants.ADMIN_SYSTEM_DN, "secret" );
-        return conn;
+        LdapConnection connection = new LdapNetworkConnection( "localhost", ldapServer.getPort()
);
+        
+        return connection;
     }
 
+
+    /**
+     * Gets a LDAP connection instance on a server. We will bind as Admin
+     * 
+     * @param ldapServer The server we want to connect to
+     * @return A LdapConnection instance if we got one
+     * @throws Exception If the connection cannot be created
+     */
+    public static LdapConnection getAdminConnection( LdapServer ldapServer ) throws Exception
+    {
+        LdapConnection connection = new LdapNetworkConnection( "localhost", ldapServer.getPort()
);
+        connection.bind( ServerDNConstants.ADMIN_SYSTEM_DN, "secret" );
+        
+        return connection;
+    }
 }

Modified: directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/add/AddAliasIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/add/AddAliasIT.java?rev=1175816&r1=1175815&r2=1175816&view=diff
==============================================================================
--- directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/add/AddAliasIT.java
(original)
+++ directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/add/AddAliasIT.java
Mon Sep 26 12:07:21 2011
@@ -20,7 +20,7 @@
 package org.apache.directory.server.operations.add;
 
 
-import static org.apache.directory.server.integ.ServerIntegrationUtils.getClientApiConnection;
+import static org.apache.directory.server.integ.ServerIntegrationUtils.getAdminConnection;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
@@ -59,7 +59,7 @@ public class AddAliasIT extends Abstract
     {
         try
         {
-            conn = getClientApiConnection( getLdapServer() );
+            conn = getAdminConnection( getLdapServer() );
             conn.setTimeOut( -1L );
             
             conn.add( new DefaultEntry( 
@@ -97,7 +97,7 @@ public class AddAliasIT extends Abstract
     {
         try
         {
-            conn = getClientApiConnection( getLdapServer() );
+            conn = getAdminConnection( getLdapServer() );
             conn.setTimeOut( -1L );
             
             conn.add( new DefaultEntry( 
@@ -164,7 +164,7 @@ public class AddAliasIT extends Abstract
     {
         try
         {
-            conn = getClientApiConnection( getLdapServer() );
+            conn = getAdminConnection( getLdapServer() );
             conn.setTimeOut( -1L );
             
             conn.add( new DefaultEntry( 

Modified: directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/add/AddIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/add/AddIT.java?rev=1175816&r1=1175815&r2=1175816&view=diff
==============================================================================
--- directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/add/AddIT.java
(original)
+++ directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/add/AddIT.java
Mon Sep 26 12:07:21 2011
@@ -20,7 +20,7 @@
 package org.apache.directory.server.operations.add;
 
 
-import static org.apache.directory.server.integ.ServerIntegrationUtils.getClientApiConnection;
+import static org.apache.directory.server.integ.ServerIntegrationUtils.getAdminConnection;
 import static org.apache.directory.server.integ.ServerIntegrationUtils.getWiredConnection;
 import static org.apache.directory.server.integ.ServerIntegrationUtils.getWiredContext;
 import static org.apache.directory.server.integ.ServerIntegrationUtils.getWiredContextThrowOnRefferal;
@@ -289,7 +289,7 @@ public class AddIT extends AbstractLdapT
     @Test
     public void testAddEntryWithTwoDescriptions() throws Exception
     {
-        LdapConnection con = getClientApiConnection( getLdapServer() );
+        LdapConnection con = getAdminConnection( getLdapServer() );
 
         String dn = "cn=Kate Bush," + BASE;
         Entry kate = new DefaultEntry( dn );
@@ -329,7 +329,7 @@ public class AddIT extends AbstractLdapT
     @Test
     public void testAddEntryWithTwoDescriptionsVariant() throws Exception
     {
-        LdapConnection con = getClientApiConnection( getLdapServer() );
+        LdapConnection con = getAdminConnection( getLdapServer() );
 
         String dn = "cn=Kate Bush," + BASE;
         Entry kate = new DefaultEntry( dn );
@@ -369,7 +369,7 @@ public class AddIT extends AbstractLdapT
     @Test
     public void testAddEntryWithTwoDescriptionsSecondVariant() throws Exception
     {
-        LdapConnection con = getClientApiConnection( getLdapServer() );
+        LdapConnection con = getAdminConnection( getLdapServer() );
 
         String dn = "cn=Kate Bush," + BASE;
         Entry kate = new DefaultEntry( dn );
@@ -1272,7 +1272,7 @@ public class AddIT extends AbstractLdapT
     @Test
     public void testAddEntryUUIDAndCSNAttributes() throws Exception
     {
-        LdapConnection con = getClientApiConnection( getLdapServer() );
+        LdapConnection con = getAdminConnection( getLdapServer() );
 
         String dn = "cn=Kate Bush," + BASE;
         Entry entry = new DefaultEntry( dn );
@@ -1396,7 +1396,7 @@ public class AddIT extends AbstractLdapT
     @Test
     public void testAddEntryNonExistingAT() throws Exception
     {
-        LdapConnection connection = ServerIntegrationUtils.getClientApiConnection( getLdapServer()
);
+        LdapConnection connection = getAdminConnection( getLdapServer() );
 
         Dn dn = new Dn( "cn=Kate Bush," + BASE );
 
@@ -1432,7 +1432,7 @@ public class AddIT extends AbstractLdapT
     @Test( expected = LdapOperationException.class )
     public void testAddEntryNonExistingOC() throws Exception
     {
-        LdapConnection connection = ServerIntegrationUtils.getClientApiConnection( getLdapServer()
);
+        LdapConnection connection = getAdminConnection( getLdapServer() );
 
         Dn dn = new Dn( "cn=Kate Bush," + BASE );
 
@@ -1454,7 +1454,7 @@ public class AddIT extends AbstractLdapT
     @Test( expected = LdapException.class )
     public void testAddEntry100KData() throws Exception
     {
-        LdapConnection connection = ServerIntegrationUtils.getClientApiConnection( getLdapServer()
);
+        LdapConnection connection = getAdminConnection( getLdapServer() );
 
         int size = 100*1024;
         byte[] dataBytes = new byte[size];

Modified: directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/add/AddingEntriesWithSpecialCharactersInRDNIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/add/AddingEntriesWithSpecialCharactersInRDNIT.java?rev=1175816&r1=1175815&r2=1175816&view=diff
==============================================================================
--- directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/add/AddingEntriesWithSpecialCharactersInRDNIT.java
(original)
+++ directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/add/AddingEntriesWithSpecialCharactersInRDNIT.java
Mon Sep 26 12:07:21 2011
@@ -41,6 +41,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.model.name.Dn;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import static org.apache.directory.server.integ.ServerIntegrationUtils.getAdminConnection;
 
 
 /**
@@ -83,7 +84,7 @@ public class AddingEntriesWithSpecialCha
     @Test
     public void testAddingWithHashRdn() throws Exception
     {
-        LdapConnection connection = ServerIntegrationUtils.getClientApiConnection( getLdapServer()
);
+        LdapConnection connection = getAdminConnection( getLdapServer() );
 
         Entry personEntry = getPersonEntry( "Bush", "Kate#Bush" );
         String dn = "cn=Kate\\#Bush,ou=system";
@@ -120,7 +121,7 @@ public class AddingEntriesWithSpecialCha
     @Test
     public void testAddingWithCommaInRdn() throws Exception
     {
-        LdapConnection connection = ServerIntegrationUtils.getClientApiConnection( getLdapServer()
);
+        LdapConnection connection = getAdminConnection( getLdapServer() );
 
         Entry entry = getPersonEntry( "Bush", "Bush, Kate" );
         String dn = "cn=Bush\\, Kate,ou=system";
@@ -156,7 +157,7 @@ public class AddingEntriesWithSpecialCha
     @Test
     public void testAddingWithQuotesInRdn() throws Exception
     {
-        LdapConnection connection = ServerIntegrationUtils.getClientApiConnection( getLdapServer()
);
+        LdapConnection connection = getAdminConnection( getLdapServer() );
 
         Entry entry = getPersonEntry( "Messer", "Mackie \"The Knife\" Messer" );
         String dn = "cn=Mackie \\\"The Knife\\\" Messer,ou=system";
@@ -190,7 +191,7 @@ public class AddingEntriesWithSpecialCha
     @Test
     public void testAddingWithBackslashInRdn() throws Exception
     {
-        LdapConnection connection = ServerIntegrationUtils.getClientApiConnection( getLdapServer()
);
+        LdapConnection connection = getAdminConnection( getLdapServer() );
 
         Entry entry = getOrgUnitEntry( "AC\\DC" );
         String dn = "ou=AC\\\\DC,ou=system";
@@ -225,7 +226,7 @@ public class AddingEntriesWithSpecialCha
     @Test
     public void testAddingWithGreaterSignInRdn() throws Exception
     {
-        LdapConnection connection = ServerIntegrationUtils.getClientApiConnection( getLdapServer()
);
+        LdapConnection connection = getAdminConnection( getLdapServer() );
 
         Entry entry = getOrgUnitEntry( "East -> West" );
         String dn = "ou=East -\\> West,ou=system";
@@ -263,7 +264,7 @@ public class AddingEntriesWithSpecialCha
     @Test
     public void testAddingWithLessSignInRdn() throws Exception
     {
-        LdapConnection connection = ServerIntegrationUtils.getClientApiConnection( getLdapServer()
);
+        LdapConnection connection = getAdminConnection( getLdapServer() );
 
         Entry entry = getOrgUnitEntry( "Scissors 8<" );
         String dn = "ou=Scissors 8\\<,ou=system";
@@ -301,7 +302,7 @@ public class AddingEntriesWithSpecialCha
     @Test
     public void testAddingWithSemicolonInRdn() throws Exception
     {
-        LdapConnection connection = ServerIntegrationUtils.getClientApiConnection( getLdapServer()
);
+        LdapConnection connection = getAdminConnection( getLdapServer() );
 
         Entry entry = getOrgUnitEntry( "semicolon group;" );
         String dn = "ou=semicolon group\\;,ou=system";
@@ -339,7 +340,7 @@ public class AddingEntriesWithSpecialCha
     @Test
     public void testAddingWithEqualsInRdn() throws Exception
     {
-        LdapConnection connection = ServerIntegrationUtils.getClientApiConnection( getLdapServer()
);
+        LdapConnection connection = getAdminConnection( getLdapServer() );
 
         Entry entry = getOrgUnitEntry( "nomen=omen" );
         String dn = "ou=nomen\\=omen,ou=system";
@@ -371,7 +372,7 @@ public class AddingEntriesWithSpecialCha
     @Test
     public void testAddRdnWithEscapedSpaces() throws Exception 
     {
-        LdapConnection connection = ServerIntegrationUtils.getClientApiConnection( getLdapServer()
);
+        LdapConnection connection = getAdminConnection( getLdapServer() );
         connection.setTimeOut( -1 );
 
         Entry entry = new DefaultEntry( 

Modified: directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/compare/CompareIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/compare/CompareIT.java?rev=1175816&r1=1175815&r2=1175816&view=diff
==============================================================================
--- directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/compare/CompareIT.java
(original)
+++ directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/compare/CompareIT.java
Mon Sep 26 12:07:21 2011
@@ -20,7 +20,7 @@
 package org.apache.directory.server.operations.compare;
 
 
-import static org.apache.directory.server.integ.ServerIntegrationUtils.getClientApiConnection;
+import static org.apache.directory.server.integ.ServerIntegrationUtils.getAdminConnection;
 import static org.apache.directory.server.integ.ServerIntegrationUtils.getWiredConnection;
 import static org.apache.directory.server.integ.ServerIntegrationUtils.getWiredContextThrowOnRefferal;
 import static org.junit.Assert.assertEquals;
@@ -93,7 +93,7 @@ public class CompareIT extends AbstractL
     @Test
     public void testNormalCompare() throws Exception
     {
-        LdapConnection conn = getClientApiConnection( getLdapServer() );
+        LdapConnection conn = getAdminConnection( getLdapServer() );
 
         // comparison success
         boolean response = conn.compare( "uid=akarasulu,ou=users,ou=system", "sn", "karasulu"
);

Modified: directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/delete/DeleteAliasIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/delete/DeleteAliasIT.java?rev=1175816&r1=1175815&r2=1175816&view=diff
==============================================================================
--- directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/delete/DeleteAliasIT.java
(original)
+++ directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/delete/DeleteAliasIT.java
Mon Sep 26 12:07:21 2011
@@ -20,7 +20,7 @@
 package org.apache.directory.server.operations.delete;
 
 
-import static org.apache.directory.server.integ.ServerIntegrationUtils.getClientApiConnection;
+import static org.apache.directory.server.integ.ServerIntegrationUtils.getAdminConnection;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 
@@ -55,7 +55,7 @@ public class DeleteAliasIT extends Abstr
     @Before
     public void setup() throws Exception
     {
-        conn = getClientApiConnection( getLdapServer() );
+        conn = getAdminConnection( getLdapServer() );
         
         if ( conn.lookup( "cn=foo,ou=system" ) == null )
         {
@@ -107,7 +107,7 @@ public class DeleteAliasIT extends Abstr
     @Test
     public void testDeleteEntryThenAlias() throws Exception
     {
-        conn = getClientApiConnection( getLdapServer() );
+        conn = getAdminConnection( getLdapServer() );
 
         // Delete the entry
         assertNotNull( conn.lookup( "cn=foo,ou=system" ) );

Modified: directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/delete/DeleteIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/delete/DeleteIT.java?rev=1175816&r1=1175815&r2=1175816&view=diff
==============================================================================
--- directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/delete/DeleteIT.java
(original)
+++ directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/delete/DeleteIT.java
Mon Sep 26 12:07:21 2011
@@ -20,7 +20,7 @@
 package org.apache.directory.server.operations.delete;
 
 
-import static org.apache.directory.server.integ.ServerIntegrationUtils.getClientApiConnection;
+import static org.apache.directory.server.integ.ServerIntegrationUtils.getAdminConnection;
 import static org.apache.directory.server.integ.ServerIntegrationUtils.getWiredConnection;
 import static org.apache.directory.server.integ.ServerIntegrationUtils.getWiredContextThrowOnRefferal;
 import static org.junit.Assert.assertEquals;
@@ -94,7 +94,7 @@ public class DeleteIT extends AbstractLd
     @Test
     public void testNormalDeleteFailContextNotEmpty() throws Exception
     {
-        LdapConnection conn = getClientApiConnection( getLdapServer() );
+        LdapConnection conn = getAdminConnection( getLdapServer() );
 
         // delete failure on non-leaf entry
         try
@@ -119,7 +119,7 @@ public class DeleteIT extends AbstractLd
     @Test
     public void testNormalDelete() throws Exception
     {
-        LdapConnection conn = getClientApiConnection( getLdapServer() );
+        LdapConnection conn = getAdminConnection( getLdapServer() );
 
         // delete success
         conn.delete( "ou=computers,uid=akarasulu,ou=users,ou=system" );
@@ -147,7 +147,7 @@ public class DeleteIT extends AbstractLd
     @Test
     public void testDeleteNonExistent() throws Exception
     {
-        LdapConnection conn = getClientApiConnection( getLdapServer() );
+        LdapConnection conn = getAdminConnection( getLdapServer() );
 
         // delete failure non-existent entry
         try
@@ -297,7 +297,7 @@ public class DeleteIT extends AbstractLd
     @Test
     public void testDeleteWithIllegalName() throws Exception
     {
-        LdapConnection conn = getClientApiConnection( getLdapServer() );
+        LdapConnection conn = getAdminConnection( getLdapServer() );
 
         try
         {

Modified: directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/lookup/LookupIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/lookup/LookupIT.java?rev=1175816&r1=1175815&r2=1175816&view=diff
==============================================================================
--- directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/lookup/LookupIT.java
(original)
+++ directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/lookup/LookupIT.java
Mon Sep 26 12:07:21 2011
@@ -50,7 +50,7 @@ public class LookupIT extends AbstractLd
     @Test
     public void testLookupPerfAPI() throws Exception
     {
-        LdapConnection connection = ServerIntegrationUtils.getClientApiConnection( getLdapServer()
);
+        LdapConnection connection = ServerIntegrationUtils.getAdminConnection( getLdapServer()
);
 
         Entry entry = connection.lookup( "uid=admin,ou=system", "name" );
         assertNotNull( entry );

Modified: directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/lookup/LookupPerfIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/lookup/LookupPerfIT.java?rev=1175816&r1=1175815&r2=1175816&view=diff
==============================================================================
--- directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/lookup/LookupPerfIT.java
(original)
+++ directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/lookup/LookupPerfIT.java
Mon Sep 26 12:07:21 2011
@@ -61,7 +61,7 @@ public class LookupPerfIT extends Abstra
     @Test
     public void testLookupPerfAPI() throws Exception
     {
-        LdapConnection connection = ServerIntegrationUtils.getClientApiConnection( getLdapServer()
);
+        LdapConnection connection = ServerIntegrationUtils.getAdminConnection( getLdapServer()
);
 
         Entry entry = connection.lookup( "uid=admin,ou=system" );
         assertNotNull( entry );

Modified: directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/modify/IllegalModificationIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/modify/IllegalModificationIT.java?rev=1175816&r1=1175815&r2=1175816&view=diff
==============================================================================
--- directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/modify/IllegalModificationIT.java
(original)
+++ directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/modify/IllegalModificationIT.java
Mon Sep 26 12:07:21 2011
@@ -20,7 +20,7 @@
 package org.apache.directory.server.operations.modify;
 
 
-import static org.apache.directory.server.integ.ServerIntegrationUtils.getClientApiConnection;
+import static org.apache.directory.server.integ.ServerIntegrationUtils.getAdminConnection;
 import static org.apache.directory.server.integ.ServerIntegrationUtils.getWiredConnection;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.fail;
@@ -82,7 +82,7 @@ public class IllegalModificationIT exten
     @Test
     public void testIllegalModification() throws Exception
     {
-        LdapConnection con = getClientApiConnection( getLdapServer() );
+        LdapConnection con = getAdminConnection( getLdapServer() );
 
         ModifyRequest modReq = new ModifyRequestImpl();
         modReq.setName( new Dn( DN ) );

Modified: directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/modifydn/MoveIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/modifydn/MoveIT.java?rev=1175816&r1=1175815&r2=1175816&view=diff
==============================================================================
--- directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/modifydn/MoveIT.java
(original)
+++ directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/modifydn/MoveIT.java
Mon Sep 26 12:07:21 2011
@@ -20,7 +20,7 @@
 package org.apache.directory.server.operations.modifydn;
 
 
-import static org.apache.directory.server.integ.ServerIntegrationUtils.getClientApiConnection;
+import static org.apache.directory.server.integ.ServerIntegrationUtils.getAdminConnection;
 import static org.apache.directory.server.integ.ServerIntegrationUtils.getWiredContext;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
@@ -119,7 +119,7 @@ public class MoveIT extends AbstractLdap
     public void testIllegalMove() throws Exception
     {
 
-        LdapConnection con = getClientApiConnection( getLdapServer() );
+        LdapConnection con = getAdminConnection( getLdapServer() );
 
         //now do something bad: make the parent a child of its own child 
         try
@@ -139,7 +139,7 @@ public class MoveIT extends AbstractLdap
     @Test
     public void testIllegalMoveToSameDN() throws Exception
     {
-        LdapConnection con = getClientApiConnection( getLdapServer() );
+        LdapConnection con = getAdminConnection( getLdapServer() );
 
         //now do something bad: try to move the entry to the same Dn
         try

Modified: directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/search/SearchIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/search/SearchIT.java?rev=1175816&r1=1175815&r2=1175816&view=diff
==============================================================================
--- directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/search/SearchIT.java
(original)
+++ directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/search/SearchIT.java
Mon Sep 26 12:07:21 2011
@@ -20,7 +20,7 @@
 package org.apache.directory.server.operations.search;
 
 
-import static org.apache.directory.server.integ.ServerIntegrationUtils.getClientApiConnection;
+import static org.apache.directory.server.integ.ServerIntegrationUtils.getAdminConnection;
 import static org.apache.directory.server.integ.ServerIntegrationUtils.getWiredContext;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -1671,7 +1671,7 @@ public class SearchIT extends AbstractLd
     public void testSearchSizeLimit() throws Exception
     {
         long sizeLimit = 7;
-        LdapConnection connection = getClientApiConnection( getLdapServer() );
+        LdapConnection connection = getAdminConnection( getLdapServer() );
         SearchRequest req = new org.apache.directory.shared.ldap.model.message.SearchRequestImpl();
         req.setBase( new Dn( "ou=system" ) );
         req.setFilter( "(ou=*)" );
@@ -1696,7 +1696,7 @@ public class SearchIT extends AbstractLd
     @Ignore("This test is failing because of the timing issue. Note that the SearchHandler
handles time based searches correctly, this is just the below test's problem")
     public void testSearchTimeLimit() throws Exception, InterruptedException
     {
-        LdapConnection connection = getClientApiConnection( getLdapServer() );
+        LdapConnection connection = getAdminConnection( getLdapServer() );
         SearchRequest req = new SearchRequestImpl();
         req.setBase( new Dn( "ou=schema" ) );
         req.setFilter( "(objectClass=*)" );



Mime
View raw message