directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From seelm...@apache.org
Subject svn commit: r791545 - in /directory/studio/trunk: test-integration-core/src/main/java/org/apache/directory/studio/test/integration/core/ test-integration-ui/src/main/java/org/apache/directory/studio/test/integration/ui/
Date Mon, 06 Jul 2009 17:22:25 GMT
Author: seelmann
Date: Mon Jul  6 17:22:24 2009
New Revision: 791545

URL: http://svn.apache.org/viewvc?rev=791545&view=rev
Log:
LdapService -> LdapServer

Modified:
    directory/studio/trunk/test-integration-core/src/main/java/org/apache/directory/studio/test/integration/core/JNDIConnectionWrapperTest.java
    directory/studio/trunk/test-integration-ui/src/main/java/org/apache/directory/studio/test/integration/ui/BrowserTest.java
    directory/studio/trunk/test-integration-ui/src/main/java/org/apache/directory/studio/test/integration/ui/EntryEditorTest.java
    directory/studio/trunk/test-integration-ui/src/main/java/org/apache/directory/studio/test/integration/ui/ImportExportTest.java
    directory/studio/trunk/test-integration-ui/src/main/java/org/apache/directory/studio/test/integration/ui/NewConnectionWizardTest.java
    directory/studio/trunk/test-integration-ui/src/main/java/org/apache/directory/studio/test/integration/ui/NewEntryWizardTest.java
    directory/studio/trunk/test-integration-ui/src/main/java/org/apache/directory/studio/test/integration/ui/ReferralDialogTest.java
    directory/studio/trunk/test-integration-ui/src/main/java/org/apache/directory/studio/test/integration/ui/RenameEntryDialogTest.java
    directory/studio/trunk/test-integration-ui/src/main/java/org/apache/directory/studio/test/integration/ui/SearchTest.java
    directory/studio/trunk/test-integration-ui/src/main/java/org/apache/directory/studio/test/integration/ui/SwtResourcesTest.java

Modified: directory/studio/trunk/test-integration-core/src/main/java/org/apache/directory/studio/test/integration/core/JNDIConnectionWrapperTest.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/test-integration-core/src/main/java/org/apache/directory/studio/test/integration/core/JNDIConnectionWrapperTest.java?rev=791545&r1=791544&r2=791545&view=diff
==============================================================================
--- directory/studio/trunk/test-integration-core/src/main/java/org/apache/directory/studio/test/integration/core/JNDIConnectionWrapperTest.java
(original)
+++ directory/studio/trunk/test-integration-core/src/main/java/org/apache/directory/studio/test/integration/core/JNDIConnectionWrapperTest.java
Mon Jul  6 17:22:24 2009
@@ -66,7 +66,7 @@
     public void testConnect()
     {
         StudioProgressMonitor monitor = getProgressMonitor();
-        ConnectionParameter connectionParameter = new ConnectionParameter( null, "localhost",
ldapService.getPort(),
+        ConnectionParameter connectionParameter = new ConnectionParameter( null, "localhost",
ldapServer.getPort(),
             EncryptionMethod.NONE, AuthenticationMethod.NONE, null, null, null, true, null
);
         Connection connection = new Connection( connectionParameter );
         JNDIConnectionWrapper connectionWrapper = connection.getJNDIConnectionWrapper();
@@ -96,7 +96,7 @@
 
         // invalid port
         monitor = getProgressMonitor();
-        connectionParameter = new ConnectionParameter( null, "localhost", ldapService.getPort()
+ 1,
+        connectionParameter = new ConnectionParameter( null, "localhost", ldapServer.getPort()
+ 1,
             EncryptionMethod.NONE, AuthenticationMethod.NONE, null, null, null, true, null
);
         connection = new Connection( connectionParameter );
         connectionWrapper = connection.getJNDIConnectionWrapper();
@@ -109,7 +109,7 @@
 
         // unknown host
         monitor = getProgressMonitor();
-        connectionParameter = new ConnectionParameter( null, "555.555.555.555", ldapService.getPort(),
+        connectionParameter = new ConnectionParameter( null, "555.555.555.555", ldapServer.getPort(),
             EncryptionMethod.NONE, AuthenticationMethod.NONE, null, null, null, true, null
);
         connection = new Connection( connectionParameter );
         connectionWrapper = connection.getJNDIConnectionWrapper();
@@ -130,7 +130,7 @@
     public void testBind()
     {
         StudioProgressMonitor monitor = getProgressMonitor();
-        ConnectionParameter connectionParameter = new ConnectionParameter( null, "localhost",
ldapService.getPort(),
+        ConnectionParameter connectionParameter = new ConnectionParameter( null, "localhost",
ldapServer.getPort(),
             EncryptionMethod.NONE, AuthenticationMethod.SIMPLE, "uid=admin,ou=system", "secret",
null, true, null );
         Connection connection = new Connection( connectionParameter );
         JNDIConnectionWrapper connectionWrapper = connection.getJNDIConnectionWrapper();
@@ -161,7 +161,7 @@
 
         // simple auth without principal and credential
         monitor = getProgressMonitor();
-        connectionParameter = new ConnectionParameter( null, "localhost", ldapService.getPort(),
+        connectionParameter = new ConnectionParameter( null, "localhost", ldapServer.getPort(),
             EncryptionMethod.NONE, AuthenticationMethod.SIMPLE, "uid=admin", "invalid", null,
true, null );
         connection = new Connection( connectionParameter );
         connectionWrapper = connection.getJNDIConnectionWrapper();
@@ -173,7 +173,7 @@
 
         // simple auth with invalid principal and credential
         monitor = getProgressMonitor();
-        connectionParameter = new ConnectionParameter( null, "localhost", ldapService.getPort(),
+        connectionParameter = new ConnectionParameter( null, "localhost", ldapServer.getPort(),
             EncryptionMethod.NONE, AuthenticationMethod.SIMPLE, "uid=admin,ou=system", "bar",
null, true, null );
         connection = new Connection( connectionParameter );
         connectionWrapper = connection.getJNDIConnectionWrapper();
@@ -197,7 +197,7 @@
 
         // simple auth without principal and credential
         monitor = getProgressMonitor();
-        connectionParameter = new ConnectionParameter( null, "localhost", ldapService.getPort(),
+        connectionParameter = new ConnectionParameter( null, "localhost", ldapServer.getPort(),
             EncryptionMethod.NONE, AuthenticationMethod.SIMPLE, "uid=admin,ou=system", "secret",
null, true, null );
         connection = new Connection( connectionParameter );
         connectionWrapper = connection.getJNDIConnectionWrapper();

Modified: directory/studio/trunk/test-integration-ui/src/main/java/org/apache/directory/studio/test/integration/ui/BrowserTest.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/test-integration-ui/src/main/java/org/apache/directory/studio/test/integration/ui/BrowserTest.java?rev=791545&r1=791544&r2=791545&view=diff
==============================================================================
--- directory/studio/trunk/test-integration-ui/src/main/java/org/apache/directory/studio/test/integration/ui/BrowserTest.java
(original)
+++ directory/studio/trunk/test-integration-ui/src/main/java/org/apache/directory/studio/test/integration/ui/BrowserTest.java
Mon Jul  6 17:22:24 2009
@@ -27,7 +27,7 @@
 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.LdapService;
+import org.apache.directory.server.ldap.LdapServer;
 import org.eclipse.swtbot.eclipse.finder.SWTWorkbenchBot;
 import org.eclipse.swtbot.swt.finder.widgets.SWTBotStyledText;
 import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree;
@@ -47,7 +47,7 @@
 @CleanupLevel(Level.SUITE)
 public class BrowserTest
 {
-    public static LdapService ldapService;
+    public static LdapServer ldapServer;
 
     private SWTWorkbenchBot bot;
 
@@ -57,7 +57,7 @@
     {
         bot = new SWTWorkbenchBot();
         SWTBotUtils.openLdapPerspective( bot );
-        SWTBotUtils.createTestConnection( bot, "BrowserTest", ldapService.getPort() );
+        SWTBotUtils.createTestConnection( bot, "BrowserTest", ldapServer.getPort() );
     }
 
 

Modified: directory/studio/trunk/test-integration-ui/src/main/java/org/apache/directory/studio/test/integration/ui/EntryEditorTest.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/test-integration-ui/src/main/java/org/apache/directory/studio/test/integration/ui/EntryEditorTest.java?rev=791545&r1=791544&r2=791545&view=diff
==============================================================================
--- directory/studio/trunk/test-integration-ui/src/main/java/org/apache/directory/studio/test/integration/ui/EntryEditorTest.java
(original)
+++ directory/studio/trunk/test-integration-ui/src/main/java/org/apache/directory/studio/test/integration/ui/EntryEditorTest.java
Mon Jul  6 17:22:24 2009
@@ -27,7 +27,7 @@
 import org.apache.directory.server.core.integ.annotations.ApplyLdifFiles;
 import org.apache.directory.server.core.integ.annotations.CleanupLevel;
 import org.apache.directory.server.integ.SiRunner;
-import org.apache.directory.server.ldap.LdapService;
+import org.apache.directory.server.ldap.LdapServer;
 import org.eclipse.swtbot.eclipse.finder.SWTWorkbenchBot;
 import org.eclipse.swtbot.swt.finder.waits.DefaultCondition;
 import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree;
@@ -49,7 +49,7 @@
     { "EntryEditorTest.ldif" })
 public class EntryEditorTest
 {
-    public static LdapService ldapService;
+    public static LdapServer ldapServer;
 
     private SWTWorkbenchBot bot;
 
@@ -59,7 +59,7 @@
     {
         bot = new SWTWorkbenchBot();
         SWTBotUtils.openLdapPerspective( bot );
-        SWTBotUtils.createTestConnection( bot, "EntryEditorTest", ldapService.getPort() );
+        SWTBotUtils.createTestConnection( bot, "EntryEditorTest", ldapServer.getPort() );
     }
 
 

Modified: directory/studio/trunk/test-integration-ui/src/main/java/org/apache/directory/studio/test/integration/ui/ImportExportTest.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/test-integration-ui/src/main/java/org/apache/directory/studio/test/integration/ui/ImportExportTest.java?rev=791545&r1=791544&r2=791545&view=diff
==============================================================================
--- directory/studio/trunk/test-integration-ui/src/main/java/org/apache/directory/studio/test/integration/ui/ImportExportTest.java
(original)
+++ directory/studio/trunk/test-integration-ui/src/main/java/org/apache/directory/studio/test/integration/ui/ImportExportTest.java
Mon Jul  6 17:22:24 2009
@@ -38,7 +38,7 @@
 import org.apache.directory.server.core.partition.Partition;
 import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmPartition;
 import org.apache.directory.server.integ.SiRunner;
-import org.apache.directory.server.ldap.LdapService;
+import org.apache.directory.server.ldap.LdapServer;
 import org.apache.directory.studio.ldapbrowser.core.events.EventRegistry;
 import org.eclipse.core.runtime.Platform;
 import org.eclipse.swtbot.eclipse.finder.SWTWorkbenchBot;
@@ -63,7 +63,7 @@
     { "ImportExportTest.ldif" })
 public class ImportExportTest
 {
-    public static LdapService ldapService;
+    public static LdapServer ldapServer;
 
     private SWTWorkbenchBot eBot;
 
@@ -73,7 +73,7 @@
     {
         eBot = new SWTWorkbenchBot();
         SWTBotUtils.openLdapPerspective( eBot );
-        SWTBotUtils.createTestConnection( eBot, "ImportExportTest", ldapService.getPort()
);
+        SWTBotUtils.createTestConnection( eBot, "ImportExportTest", ldapServer.getPort()
);
     }
 
 
@@ -238,7 +238,7 @@
         Partition partition = new JdbmPartition();
         partition.setId( "example" );
         partition.setSuffix( "dc=example,dc=com" );
-        ldapService.getDirectoryService().addPartition( partition );
+        ldapServer.getDirectoryService().addPartition( partition );
 
         // refresh root DSE and ensure that the partition is in root DSE
         SWTBotTreeItem rootDSE = SWTBotUtils.selectEntry( eBot, browserTree, false, "DIT",
"Root DSE" );

Modified: directory/studio/trunk/test-integration-ui/src/main/java/org/apache/directory/studio/test/integration/ui/NewConnectionWizardTest.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/test-integration-ui/src/main/java/org/apache/directory/studio/test/integration/ui/NewConnectionWizardTest.java?rev=791545&r1=791544&r2=791545&view=diff
==============================================================================
--- directory/studio/trunk/test-integration-ui/src/main/java/org/apache/directory/studio/test/integration/ui/NewConnectionWizardTest.java
(original)
+++ directory/studio/trunk/test-integration-ui/src/main/java/org/apache/directory/studio/test/integration/ui/NewConnectionWizardTest.java
Mon Jul  6 17:22:24 2009
@@ -50,8 +50,7 @@
 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.LdapService;
-import org.apache.directory.server.protocol.shared.transport.TcpTransport;
+import org.apache.directory.server.ldap.LdapServer;
 import org.apache.directory.shared.ldap.entry.Modification;
 import org.apache.directory.shared.ldap.entry.ModificationOperation;
 import org.apache.directory.shared.ldap.entry.client.ClientModification;
@@ -66,7 +65,6 @@
 import org.apache.directory.studio.test.integration.ui.bots.ErrorDialogBot;
 import org.apache.directory.studio.test.integration.ui.bots.NewConnectionWizardBot;
 import org.apache.directory.studio.test.integration.ui.bots.StudioBot;
-import org.apache.mina.util.AvailablePortFinder;
 import org.bouncycastle.x509.X509V1CertificateGenerator;
 import org.junit.After;
 import org.junit.Before;
@@ -85,8 +83,8 @@
 @CleanupLevel(Level.CLASS)
 public class NewConnectionWizardTest
 {
-    public static LdapService ldapService;
-    public static LdapService ldapsService;
+    public static LdapServer ldapServer;
+    public static LdapServer ldapsService;
     private File ksFile;
 
     private StudioBot studioBot;
@@ -97,17 +95,18 @@
     @Before
     public void setUpLdaps() throws Exception
     {
-        if ( ldapsService == null )
-        {
-            ldapsService = new LdapService();
-            ldapsService.setDirectoryService( ldapService.getDirectoryService() );
-            int port = AvailablePortFinder.getNextAvailable( ldapService.getPort() + 10 );
-            ldapsService.setTcpTransport( new TcpTransport( port ) );
-            ldapsService.setEnabled( true );
-            ldapsService.setEnableLdaps( true );
-            ldapsService.setConfidentialityRequired( true );
-            ldapsService.start();
-        }
+        // TODO: setup LDAPS
+//        if ( ldapsService == null )
+//        {
+//            ldapsService = new LdapServer();
+//            ldapsService.setDirectoryService( ldapService.getDirectoryService() );
+//            int port = AvailablePortFinder.getNextAvailable( ldapService.getPort() + 10
);
+//            ldapsService.setTcpTransport( new TcpTransport( port ) );
+//            ldapsService.setEnabled( true );
+//            ldapsService.setEnableLdaps( true );
+//            ldapsService.setConfidentialityRequired( true );
+//            ldapsService.start();
+//        }
     }
 
 
@@ -177,7 +176,7 @@
         // enter connection parameter
         wizardBot.typeConnectionName( "NewConnectionWizardTest" );
         wizardBot.typeHost( "localhost" );
-        wizardBot.typePort( ldapService.getPort() );
+        wizardBot.typePort( ldapServer.getPort() );
         // ensure "Next >" button is enabled
         assertFalse( wizardBot.isBackButtonEnabled() );
         assertTrue( wizardBot.isNextButtonEnabled() );
@@ -311,7 +310,7 @@
         // enter connection parameter
         wizardBot.typeConnectionName( "NewConnectionWizardTest" );
         wizardBot.typeHost( "localhost" );
-        wizardBot.typePort( ldapService.getPort() );
+        wizardBot.typePort( ldapServer.getPort() );
 
         // jump to auth page
         wizardBot.clickNextButton();
@@ -331,7 +330,7 @@
         Connection connection = connectionManager.getConnections()[0];
         assertEquals( "NewConnectionWizardTest", connection.getName() );
         assertEquals( "localhost", connection.getHost() );
-        assertEquals( ldapService.getPort(), connection.getPort() );
+        assertEquals( ldapServer.getPort(), connection.getPort() );
         assertEquals( AuthenticationMethod.SIMPLE, connection.getAuthMethod() );
         assertEquals( "uid=admin,ou=system", connection.getBindPrincipal() );
         assertEquals( "secret", connection.getBindPassword() );
@@ -353,7 +352,7 @@
         // enter connection parameter with host name
         wizardBot.typeConnectionName( "NewConnectionWizardTest" );
         wizardBot.typeHost( "localhost" );
-        wizardBot.typePort( ldapService.getPort() );
+        wizardBot.typePort( ldapServer.getPort() );
 
         // click "Check Network Parameter" button
         String result1 = wizardBot.clickCheckNetworkParameterButton();
@@ -361,7 +360,7 @@
 
         // enter connection parameter with IPv4 address
         wizardBot.typeHost( "127.0.0.1" );
-        wizardBot.typePort( ldapService.getPort() );
+        wizardBot.typePort( ldapServer.getPort() );
 
         // click "Check Network Parameter" button
         String result2 = wizardBot.clickCheckNetworkParameterButton();
@@ -391,7 +390,7 @@
     {
         // enter connection parameter with invalid port
         wizardBot.typeConnectionName( "NewConnectionWizardTest" );
-        int port = ldapService.getPort() + 1;
+        int port = ldapServer.getPort() + 1;
         wizardBot.typeHost( "localhost" );
         wizardBot.typePort( port );
 
@@ -404,7 +403,7 @@
         // enter connection parameter with invalid host name
         String hostname = "qwertzuiop.asdfghjkl.yxcvbnm";
         wizardBot.typeHost( hostname );
-        wizardBot.typePort( ldapService.getPort() );
+        wizardBot.typePort( ldapServer.getPort() );
 
         // click "Check Network Parameter" button and get the result
         String result2 = wizardBot.clickCheckNetworkParameterButton();
@@ -415,7 +414,7 @@
         // enter connection parameter with non-routed IP address
         String ipAddress = "10.11.12.13";
         wizardBot.typeHost( ipAddress );
-        wizardBot.typePort( ldapService.getPort() );
+        wizardBot.typePort( ldapServer.getPort() );
 
         // click "Check Network Parameter" button and get the result
         String result3 = wizardBot.clickCheckNetworkParameterButton();
@@ -436,7 +435,7 @@
         // enter connection parameter
         wizardBot.typeConnectionName( "NewConnectionWizardTest" );
         wizardBot.typeHost( "localhost" );
-        wizardBot.typePort( ldapService.getPort() );
+        wizardBot.typePort( ldapServer.getPort() );
         wizardBot.clickNextButton();
 
         // enter correct authentication parameter
@@ -460,7 +459,7 @@
         // enter connection parameter
         wizardBot.typeConnectionName( "NewConnectionWizardTest" );
         wizardBot.typeHost( "localhost" );
-        wizardBot.typePort( ldapService.getPort() );
+        wizardBot.typePort( ldapServer.getPort() );
         wizardBot.clickNextButton();
 
         // enter incorrect authentication parameter
@@ -501,7 +500,7 @@
         // enter connection parameter
         wizardBot.typeConnectionName( "NewConnectionWizardTest" );
         wizardBot.typeHost( "localhost" );
-        wizardBot.typePort( ldapService.getPort() );
+        wizardBot.typePort( ldapServer.getPort() );
         wizardBot.selectStartTlsEncryption();
 
         // check the certificate, should be OK
@@ -536,7 +535,7 @@
         // enter connection parameter
         wizardBot.typeConnectionName( "NewConnectionWizardTest" );
         wizardBot.typeHost( "localhost" );
-        wizardBot.typePort( ldapService.getPort() );
+        wizardBot.typePort( ldapServer.getPort() );
         wizardBot.selectStartTlsEncryption();
 
         // check the certificate, expecting the trust dialog
@@ -571,7 +570,7 @@
         // enter connection parameter
         wizardBot.typeConnectionName( "NewConnectionWizardTest" );
         wizardBot.typeHost( "localhost" );
-        wizardBot.typePort( ldapService.getPort() );
+        wizardBot.typePort( ldapServer.getPort() );
         wizardBot.selectStartTlsEncryption();
 
         // check the certificate, expecting the trust dialog
@@ -606,7 +605,7 @@
         // enter connection parameter
         wizardBot.typeConnectionName( "NewConnectionWizardTest" );
         wizardBot.typeHost( "localhost" );
-        wizardBot.typePort( ldapService.getPort() );
+        wizardBot.typePort( ldapServer.getPort() );
         wizardBot.selectStartTlsEncryption();
 
         // check the certificate, expecting the trust dialog
@@ -642,7 +641,7 @@
         // enter connection parameter and authentication parameter
         wizardBot.typeConnectionName( "NewConnectionWizardTest" );
         wizardBot.typeHost( "localhost" );
-        wizardBot.typePort( ldapService.getPort() );
+        wizardBot.typePort( ldapServer.getPort() );
         wizardBot.selectStartTlsEncryption();
         wizardBot.clickNextButton();
         wizardBot.typeUser( "uid=admin,ou=system" );
@@ -683,7 +682,7 @@
         // enter connection parameter and authentication parameter
         wizardBot.typeConnectionName( "NewConnectionWizardTest" );
         wizardBot.typeHost( "localhost" );
-        wizardBot.typePort( ldapService.getPort() );
+        wizardBot.typePort( ldapServer.getPort() );
         wizardBot.selectStartTlsEncryption();
 
         // check trust, expect trust dialog, select don't trust
@@ -750,7 +749,7 @@
         // enter connection parameter and authentication parameter
         wizardBot.typeConnectionName( "NewConnectionWizardTest" );
         wizardBot.typeHost( "localhost" );
-        wizardBot.typePort( ldapService.getPort() );
+        wizardBot.typePort( ldapServer.getPort() );
         wizardBot.selectStartTlsEncryption();
         wizardBot.clickNextButton();
         wizardBot.typeUser( "uid=admin,ou=system" );
@@ -796,7 +795,7 @@
         // enter connection parameter and authentication parameter
         wizardBot.typeConnectionName( "NewConnectionWizardTest" );
         wizardBot.typeHost( "localhost" );
-        wizardBot.typePort( ldapService.getPort() );
+        wizardBot.typePort( ldapServer.getPort() );
         wizardBot.selectStartTlsEncryption();
 
         // check trust, expect trust dialog, select trust temporary
@@ -1079,7 +1078,7 @@
         List<Modification> modifications = new ArrayList<Modification>();
 
         // Get old key algorithm
-        ClonedServerEntry entry = ldapService.getDirectoryService().getAdminSession().lookup(
dn );
+        ClonedServerEntry entry = ldapServer.getDirectoryService().getAdminSession().lookup(
dn );
         String keyAlgo = entry.get( KEY_ALGORITHM_AT ).getString();
 
         // Generate key pair
@@ -1118,7 +1117,7 @@
             USER_CERTIFICATE_AT, cert.getEncoded() ) ) );
 
         // Write the modifications
-        ldapService.getDirectoryService().getAdminSession().modify( dn, modifications );
+        ldapServer.getDirectoryService().getAdminSession().modify( dn, modifications );
         
         // TODO: activate when DIRSERVER-1373 is fixed
         //ldapService.reloadSslContext();
@@ -1134,7 +1133,7 @@
         }
         ksFile = File.createTempFile( "testStore", "ks" );
 
-        CoreSession session = ldapService.getDirectoryService().getAdminSession();
+        CoreSession session = ldapServer.getDirectoryService().getAdminSession();
         ClonedServerEntry entry = session.lookup( new LdapDN( "uid=admin,ou=system" ), new
String[]
             { USER_CERTIFICATE_AT } );
         byte[] userCertificate = entry.get( USER_CERTIFICATE_AT ).getBytes();

Modified: directory/studio/trunk/test-integration-ui/src/main/java/org/apache/directory/studio/test/integration/ui/NewEntryWizardTest.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/test-integration-ui/src/main/java/org/apache/directory/studio/test/integration/ui/NewEntryWizardTest.java?rev=791545&r1=791544&r2=791545&view=diff
==============================================================================
--- directory/studio/trunk/test-integration-ui/src/main/java/org/apache/directory/studio/test/integration/ui/NewEntryWizardTest.java
(original)
+++ directory/studio/trunk/test-integration-ui/src/main/java/org/apache/directory/studio/test/integration/ui/NewEntryWizardTest.java
Mon Jul  6 17:22:24 2009
@@ -33,7 +33,7 @@
 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.LdapService;
+import org.apache.directory.server.ldap.LdapServer;
 import org.eclipse.swtbot.eclipse.finder.SWTWorkbenchBot;
 import org.eclipse.swtbot.swt.finder.waits.DefaultCondition;
 import org.eclipse.swtbot.swt.finder.widgets.SWTBotCombo;
@@ -56,7 +56,7 @@
 @CleanupLevel(Level.SUITE)
 public class NewEntryWizardTest
 {
-    public static LdapService ldapService;
+    public static LdapServer ldapServer;
 
     private SWTWorkbenchBot bot;
 
@@ -65,7 +65,7 @@
     public void setUp() throws Exception
     {
         // check if krb5kdc is disabled
-        DirContext schemaRoot = ( DirContext ) getWiredContext( ldapService ).lookup( "ou=schema"
);
+        DirContext schemaRoot = ( DirContext ) getWiredContext( ldapServer ).lookup( "ou=schema"
);
         Attributes krb5kdcAttrs = schemaRoot.getAttributes( "cn=Krb5kdc" );
         boolean isKrb5KdcDisabled = false;
         if ( krb5kdcAttrs.get( "m-disabled" ) != null )
@@ -83,7 +83,7 @@
 
         bot = new SWTWorkbenchBot();
         SWTBotUtils.openLdapPerspective( bot );
-        SWTBotUtils.createTestConnection( bot, "NewEntryWizardTest", ldapService.getPort()
);
+        SWTBotUtils.createTestConnection( bot, "NewEntryWizardTest", ldapServer.getPort()
);
     }
 
 

Modified: directory/studio/trunk/test-integration-ui/src/main/java/org/apache/directory/studio/test/integration/ui/ReferralDialogTest.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/test-integration-ui/src/main/java/org/apache/directory/studio/test/integration/ui/ReferralDialogTest.java?rev=791545&r1=791544&r2=791545&view=diff
==============================================================================
--- directory/studio/trunk/test-integration-ui/src/main/java/org/apache/directory/studio/test/integration/ui/ReferralDialogTest.java
(original)
+++ directory/studio/trunk/test-integration-ui/src/main/java/org/apache/directory/studio/test/integration/ui/ReferralDialogTest.java
Mon Jul  6 17:22:24 2009
@@ -30,7 +30,7 @@
 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.LdapService;
+import org.apache.directory.server.ldap.LdapServer;
 import org.apache.directory.shared.ldap.name.LdapDN;
 import org.apache.directory.studio.connection.core.Connection;
 import org.apache.directory.studio.connection.core.Connection.ReferralHandlingMethod;
@@ -57,7 +57,7 @@
 @CleanupLevel(Level.SUITE)
 public class ReferralDialogTest
 {
-    public static LdapService ldapService;
+    public static LdapServer ldapServer;
 
     private SWTWorkbenchBot bot;
     private Connection connection;
@@ -68,7 +68,7 @@
     {
         bot = new SWTWorkbenchBot();
         SWTBotUtils.openLdapPerspective( bot );
-        connection = SWTBotUtils.createTestConnection( bot, "ReferralDialogTest", ldapService.getPort()
);
+        connection = SWTBotUtils.createTestConnection( bot, "ReferralDialogTest", ldapServer.getPort()
);
     }
 
 
@@ -121,11 +121,11 @@
         SWTBotUtils.selectEntry( bot, browserTree, true, "DIT", "Root DSE", "ou=system" );
 
         // ensure that the referral URL and target is visible
-        SWTBotTreeItem referralNode = systemNode.getNode( "ldap://localhost:" + ldapService.getPort()
+        SWTBotTreeItem referralNode = systemNode.getNode( "ldap://localhost:" + ldapServer.getPort()
             + "/ou=users,ou=system" );
         assertNotNull( referralNode );
         SWTBotUtils.selectEntry( bot, browserTree, false, "DIT", "Root DSE", "ou=system",
"ldap://localhost:"
-            + ldapService.getPort() + "/ou=users,ou=system" );
+            + ldapServer.getPort() + "/ou=users,ou=system" );
 
     }
 
@@ -175,7 +175,7 @@
         SWTBotTreeItem referralNode = null;
         try
         {
-            referralNode = systemNode.getNode( "ldap://localhost:" + ldapService.getPort()
+ "/ou=users,ou=system" );
+            referralNode = systemNode.getNode( "ldap://localhost:" + ldapServer.getPort()
+ "/ou=users,ou=system" );
         }
         catch ( WidgetNotFoundException wnfe )
         {
@@ -213,7 +213,7 @@
         SWTBotTreeItem referralNode1 = null;
         try
         {
-            referralNode1 = systemNode.getNode( "ldap://localhost:" + ldapService.getPort()
+ "/ou=users,ou=system" );
+            referralNode1 = systemNode.getNode( "ldap://localhost:" + ldapServer.getPort()
+ "/ou=users,ou=system" );
         }
         catch ( WidgetNotFoundException wnfe )
         {
@@ -266,11 +266,11 @@
 
     private void createReferralEntry() throws Exception
     {
-        ServerEntry entry = new DefaultServerEntry( ldapService.getDirectoryService().getRegistries()
);
+        ServerEntry entry = new DefaultServerEntry( ldapServer.getDirectoryService().getRegistries()
);
         entry.setDn( new LdapDN( "cn=referralDialogTest,ou=system" ) );
         entry.add( "objectClass", "top", "referral", "extensibleObject" );
         entry.add( "cn", "referralDialogTest" );
-        entry.add( "ref", "ldap://localhost:" + ldapService.getPort() + "/ou=users,ou=system"
);
-        ldapService.getDirectoryService().getAdminSession().add( entry );
+        entry.add( "ref", "ldap://localhost:" + ldapServer.getPort() + "/ou=users,ou=system"
);
+        ldapServer.getDirectoryService().getAdminSession().add( entry );
     }
 }

Modified: directory/studio/trunk/test-integration-ui/src/main/java/org/apache/directory/studio/test/integration/ui/RenameEntryDialogTest.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/test-integration-ui/src/main/java/org/apache/directory/studio/test/integration/ui/RenameEntryDialogTest.java?rev=791545&r1=791544&r2=791545&view=diff
==============================================================================
--- directory/studio/trunk/test-integration-ui/src/main/java/org/apache/directory/studio/test/integration/ui/RenameEntryDialogTest.java
(original)
+++ directory/studio/trunk/test-integration-ui/src/main/java/org/apache/directory/studio/test/integration/ui/RenameEntryDialogTest.java
Mon Jul  6 17:22:24 2009
@@ -25,7 +25,7 @@
 import org.apache.directory.server.core.integ.annotations.ApplyLdifFiles;
 import org.apache.directory.server.core.integ.annotations.CleanupLevel;
 import org.apache.directory.server.integ.SiRunner;
-import org.apache.directory.server.ldap.LdapService;
+import org.apache.directory.server.ldap.LdapServer;
 import org.eclipse.swtbot.eclipse.finder.SWTWorkbenchBot;
 import org.eclipse.swtbot.swt.finder.widgets.SWTBotMenu;
 import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree;
@@ -46,7 +46,7 @@
 @ApplyLdifFiles("RenameEntryDialogTest.ldif")
 public class RenameEntryDialogTest
 {
-    public static LdapService ldapService;
+    public static LdapServer ldapServer;
 
     private SWTWorkbenchBot bot;
 
@@ -56,7 +56,7 @@
     {
         bot = new SWTWorkbenchBot();
         SWTBotUtils.openLdapPerspective( bot );
-        SWTBotUtils.createTestConnection( bot, "RenameEntryDialogTest", ldapService.getPort()
);
+        SWTBotUtils.createTestConnection( bot, "RenameEntryDialogTest", ldapServer.getPort()
);
     }
 
 

Modified: directory/studio/trunk/test-integration-ui/src/main/java/org/apache/directory/studio/test/integration/ui/SearchTest.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/test-integration-ui/src/main/java/org/apache/directory/studio/test/integration/ui/SearchTest.java?rev=791545&r1=791544&r2=791545&view=diff
==============================================================================
--- directory/studio/trunk/test-integration-ui/src/main/java/org/apache/directory/studio/test/integration/ui/SearchTest.java
(original)
+++ directory/studio/trunk/test-integration-ui/src/main/java/org/apache/directory/studio/test/integration/ui/SearchTest.java
Mon Jul  6 17:22:24 2009
@@ -26,7 +26,7 @@
 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.LdapService;
+import org.apache.directory.server.ldap.LdapServer;
 import org.apache.directory.studio.ldapbrowser.core.BrowserConnectionManager;
 import org.apache.directory.studio.ldapbrowser.core.BrowserCorePlugin;
 import org.apache.directory.studio.ldapbrowser.core.model.IBrowserConnection;
@@ -49,7 +49,7 @@
 @CleanupLevel(Level.SUITE)
 public class SearchTest
 {
-    public static LdapService ldapService;
+    public static LdapServer ldapServer;
 
     private SWTWorkbenchBot bot;
 
@@ -59,8 +59,8 @@
     {
         bot = new SWTWorkbenchBot();
         SWTBotUtils.openLdapPerspective( bot );
-        SWTBotUtils.createTestConnection( bot, "SearchTest1", ldapService.getPort() );
-        SWTBotUtils.createTestConnection( bot, "SearchTest2", ldapService.getPort() );
+        SWTBotUtils.createTestConnection( bot, "SearchTest1", ldapServer.getPort() );
+        SWTBotUtils.createTestConnection( bot, "SearchTest2", ldapServer.getPort() );
     }
 
 

Modified: directory/studio/trunk/test-integration-ui/src/main/java/org/apache/directory/studio/test/integration/ui/SwtResourcesTest.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/test-integration-ui/src/main/java/org/apache/directory/studio/test/integration/ui/SwtResourcesTest.java?rev=791545&r1=791544&r2=791545&view=diff
==============================================================================
--- directory/studio/trunk/test-integration-ui/src/main/java/org/apache/directory/studio/test/integration/ui/SwtResourcesTest.java
(original)
+++ directory/studio/trunk/test-integration-ui/src/main/java/org/apache/directory/studio/test/integration/ui/SwtResourcesTest.java
Mon Jul  6 17:22:24 2009
@@ -27,7 +27,7 @@
 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.LdapService;
+import org.apache.directory.server.ldap.LdapServer;
 import org.eclipse.swt.graphics.DeviceData;
 import org.eclipse.swtbot.eclipse.finder.SWTWorkbenchBot;
 import org.eclipse.swtbot.swt.finder.finders.UIThreadRunnable;
@@ -52,7 +52,7 @@
 @CleanupLevel(Level.SUITE)
 public class SwtResourcesTest
 {
-    public static LdapService ldapService;
+    public static LdapServer ldapServer;
 
     private SWTWorkbenchBot bot;
 
@@ -62,7 +62,7 @@
     {
         bot = new SWTWorkbenchBot();
         SWTBotUtils.openLdapPerspective( bot );
-        SWTBotUtils.createTestConnection( bot, "SwtResourcesTest", ldapService.getPort()
);
+        SWTBotUtils.createTestConnection( bot, "SwtResourcesTest", ldapServer.getPort() );
     }
 
 



Mime
View raw message