directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pamarce...@apache.org
Subject svn commit: r693036 - 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, 08 Sep 2008 09:35:59 GMT
Author: pamarcelot
Date: Mon Sep  8 02:35:57 2008
New Revision: 693036

URL: http://svn.apache.org/viewvc?rev=693036&view=rev
Log:
Fixed build issues. Thanks Felix for the patch! ;)

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/EntryEditorTest.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/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=693036&r1=693035&r2=693036&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 Sep  8 02:35:57 2008
@@ -70,7 +70,7 @@
     public void testConnect()
     {
         StudioProgressMonitor monitor = getProgressMonitor();
-        ConnectionParameter connectionParameter = new ConnectionParameter( null, "localhost",
ldapServer.getIpPort(),
+        ConnectionParameter connectionParameter = new ConnectionParameter( null, "localhost",
ldapService.getIpPort(),
             EncryptionMethod.NONE, AuthenticationMethod.NONE, null, null, null, true, null
);
         Connection connection = new Connection( connectionParameter );
         JNDIConnectionWrapper connectionWrapper = connection.getJNDIConnectionWrapper();
@@ -100,7 +100,7 @@
 
         // invalid port
         monitor = getProgressMonitor();
-        connectionParameter = new ConnectionParameter( null, "localhost", ldapServer.getIpPort()
+ 1,
+        connectionParameter = new ConnectionParameter( null, "localhost", ldapService.getIpPort()
+ 1,
             EncryptionMethod.NONE, AuthenticationMethod.NONE, null, null, null, true, null
);
         connection = new Connection( connectionParameter );
         connectionWrapper = connection.getJNDIConnectionWrapper();
@@ -113,7 +113,7 @@
 
         // unknown host
         monitor = getProgressMonitor();
-        connectionParameter = new ConnectionParameter( null, "555.555.555.555", ldapServer.getIpPort(),
+        connectionParameter = new ConnectionParameter( null, "555.555.555.555", ldapService.getIpPort(),
             EncryptionMethod.NONE, AuthenticationMethod.NONE, null, null, null, true, null
);
         connection = new Connection( connectionParameter );
         connectionWrapper = connection.getJNDIConnectionWrapper();
@@ -134,7 +134,7 @@
     public void testBind()
     {
         StudioProgressMonitor monitor = getProgressMonitor();
-        ConnectionParameter connectionParameter = new ConnectionParameter( null, "localhost",
ldapServer.getIpPort(),
+        ConnectionParameter connectionParameter = new ConnectionParameter( null, "localhost",
ldapService.getIpPort(),
             EncryptionMethod.NONE, AuthenticationMethod.SIMPLE, "uid=admin,ou=system", "secret",
null, true, null );
         Connection connection = new Connection( connectionParameter );
         JNDIConnectionWrapper connectionWrapper = connection.getJNDIConnectionWrapper();
@@ -167,7 +167,7 @@
 
         // simple auth without principal and credential
         monitor = getProgressMonitor();
-        connectionParameter = new ConnectionParameter( null, "localhost", ldapServer.getIpPort(),
+        connectionParameter = new ConnectionParameter( null, "localhost", ldapService.getIpPort(),
             EncryptionMethod.NONE, AuthenticationMethod.SIMPLE, null, null, null, true, null
);
         connection = new Connection( connectionParameter );
         connectionWrapper = connection.getJNDIConnectionWrapper();
@@ -179,7 +179,7 @@
 
         // simple auth with invalid principal and credential
         monitor = getProgressMonitor();
-        connectionParameter = new ConnectionParameter( null, "localhost", ldapServer.getIpPort(),
+        connectionParameter = new ConnectionParameter( null, "localhost", ldapService.getIpPort(),
             EncryptionMethod.NONE, AuthenticationMethod.SIMPLE, "uid=admin,ou=system", "bar",
null, true, null );
         connection = new Connection( connectionParameter );
         connectionWrapper = connection.getJNDIConnectionWrapper();
@@ -203,7 +203,7 @@
 
         // simple auth without principal and credential
         monitor = getProgressMonitor();
-        connectionParameter = new ConnectionParameter( null, "localhost", ldapServer.getIpPort(),
+        connectionParameter = new ConnectionParameter( null, "localhost", ldapService.getIpPort(),
             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/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=693036&r1=693035&r2=693036&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 Sep  8 02:35:57 2008
@@ -45,7 +45,7 @@
         super.loadTestLdif( true );
         bot = new SWTEclipseBot();
         SWTBotUtils.openLdapPerspective( bot );
-        SWTBotUtils.createTestConnection( bot, "EntryEditorTest", ldapServer.getIpPort()
);
+        SWTBotUtils.createTestConnection( bot, "EntryEditorTest", ldapService.getIpPort()
);
     }
 
 

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=693036&r1=693035&r2=693036&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 Sep  8 02:35:57 2008
@@ -95,7 +95,7 @@
         SWTBotCombo hostnameCombo = bot.comboBoxWithLabel( "Hostname:" );
         hostnameCombo.setText( "localhost" );
         SWTBotCombo portCombo = bot.comboBoxWithLabel( "Port:" );
-        portCombo.setText( Integer.toString( ldapServer.getIpPort() ) );
+        portCombo.setText( Integer.toString( ldapService.getIpPort() ) );
 
         // ensure "Next >" button is enabled, "Finish" button is disabled
         assertFalse( backButton.isEnabled() );
@@ -136,7 +136,7 @@
         Connection connection = connectionManager.getConnections()[0];
         assertEquals( "NewConnectionWizardTest", connection.getName() );
         assertEquals( "localhost", connection.getHost() );
-        assertEquals( ldapServer.getIpPort(), connection.getPort() );
+        assertEquals( ldapService.getIpPort(), connection.getPort() );
         assertEquals( AuthenticationMethod.SIMPLE, connection.getAuthMethod() );
         assertEquals( "uid=admin,ou=system", connection.getBindPrincipal() );
         assertEquals( "secret", connection.getBindPassword() );
@@ -172,7 +172,7 @@
         SWTBotCombo hostnameCombo = bot.comboBoxWithLabel( "Hostname:" );
         hostnameCombo.setText( "localhost" );
         SWTBotCombo portCombo = bot.comboBoxWithLabel( "Port:" );
-        portCombo.setText( Integer.toString( ldapServer.getIpPort() ) );
+        portCombo.setText( Integer.toString( ldapService.getIpPort() ) );
 
         // click "Check Network Parameter" button
         SWTBotButton checkButton = bot.button( "Check Network Parameter" );
@@ -222,7 +222,7 @@
         SWTBotCombo hostnameCombo = bot.comboBoxWithLabel( "Hostname:" );
         hostnameCombo.setText( "localhost" );
         SWTBotCombo portCombo = bot.comboBoxWithLabel( "Port:" );
-        portCombo.setText( Integer.toString( ldapServer.getIpPort() + 1 ) );
+        portCombo.setText( Integer.toString( ldapService.getIpPort() + 1 ) );
 
         // click "Check Network Parameter" button
         SWTBotButton checkButton = bot.button( "Check Network Parameter" );

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=693036&r1=693035&r2=693036&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 Sep  8 02:35:57 2008
@@ -70,7 +70,7 @@
 
         bot = new SWTEclipseBot();
         SWTBotUtils.openLdapPerspective( bot );
-        SWTBotUtils.createTestConnection( bot, "NewEntryWizardTest", ldapServer.getIpPort()
);
+        SWTBotUtils.createTestConnection( bot, "NewEntryWizardTest", ldapService.getIpPort()
);
     }
 
 

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=693036&r1=693035&r2=693036&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 Sep  8 02:35:57 2008
@@ -52,7 +52,7 @@
         super.setUp();
         bot = new SWTEclipseBot();
         SWTBotUtils.openLdapPerspective( bot );
-        connection = SWTBotUtils.createTestConnection( bot, "ReferralDialogTest", ldapServer.getIpPort()
);
+        connection = SWTBotUtils.createTestConnection( bot, "ReferralDialogTest", ldapService.getIpPort()
);
     }
 
 
@@ -102,11 +102,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:" + ldapServer.getIpPort()
+        SWTBotTreeItem referralNode = systemNode.getNode( "ldap://localhost:" + ldapService.getIpPort()
             + "/ou=users,ou=system" );
         assertNotNull( referralNode );
         SWTBotUtils.selectEntry( bot, browserTree, false, "DIT", "Root DSE", "ou=system",
"ldap://localhost:"
-            + ldapServer.getIpPort() + "/ou=users,ou=system" );
+            + ldapService.getIpPort() + "/ou=users,ou=system" );
 
     }
 
@@ -150,7 +150,7 @@
         SWTBotUtils.selectEntry( bot, browserTree, true, "DIT", "Root DSE", "ou=system" );
 
         // ensure that the referral URL and target is not visible
-        SWTBotTreeItem referralNode = systemNode.getNode( "ldap://localhost:" + ldapServer.getIpPort()
+        SWTBotTreeItem referralNode = systemNode.getNode( "ldap://localhost:" + ldapService.getIpPort()
             + "/ou=users,ou=system" );
         assertNull( referralNode );
     }
@@ -178,7 +178,7 @@
         SWTBotTreeItem systemNode = SWTBotUtils.selectEntry( bot, browserTree, true, "DIT",
"Root DSE", "ou=system" );
 
         // ensure that the referral entry is not visible
-        SWTBotTreeItem referralNode1 = systemNode.getNode( "ldap://localhost:" + ldapServer.getIpPort()
+        SWTBotTreeItem referralNode1 = systemNode.getNode( "ldap://localhost:" + ldapService.getIpPort()
             + "/ou=users,ou=system" );
         assertNull( referralNode1 );
         SWTBotTreeItem referralNode2 = systemNode.getNode( "cn=referralDialogTest" );
@@ -220,7 +220,7 @@
         entry.setDn( new LdapDN("cn=referralDialogTest,ou=system"  ) );
         entry.add( "objectClass", "top", "referral", "extensibleObject" );
         entry.add( "cn", "referralDialogTest" );
-        entry.add( "ref", "ldap://localhost:" + ldapServer.getIpPort() + "/ou=users,ou=system"
);
+        entry.add( "ref", "ldap://localhost:" + ldapService.getIpPort() + "/ou=users,ou=system"
);
         rootDSE.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=693036&r1=693035&r2=693036&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 Sep  8 02:35:57 2008
@@ -45,7 +45,7 @@
         super.loadTestLdif( true );
         bot = new SWTEclipseBot();
         SWTBotUtils.openLdapPerspective( bot );
-        SWTBotUtils.createTestConnection( bot, "RenameEntryDialogTest", ldapServer.getIpPort()
);
+        SWTBotUtils.createTestConnection( bot, "RenameEntryDialogTest", ldapService.getIpPort()
);
     }
 
 

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=693036&r1=693035&r2=693036&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 Sep  8 02:35:57 2008
@@ -49,7 +49,7 @@
         super.setUp();
         bot = new SWTEclipseBot();
         SWTBotUtils.openLdapPerspective( bot );
-        SWTBotUtils.createTestConnection( bot, "SwtResourcesTest", ldapServer.getIpPort()
);
+        SWTBotUtils.createTestConnection( bot, "SwtResourcesTest", ldapService.getIpPort()
);
     }
 
 



Mime
View raw message