You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by se...@apache.org on 2009/01/01 13:21:55 UTC
svn commit: r730533 - 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/
Author: seelmann
Date: Thu Jan 1 04:21:55 2009
New Revision: 730533
URL: http://svn.apache.org/viewvc?rev=730533&view=rev
Log:
Compilation problems due to API change
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/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/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=730533&r1=730532&r2=730533&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 Thu Jan 1 04:21:55 2009
@@ -70,7 +70,7 @@
public void testConnect()
{
StudioProgressMonitor monitor = getProgressMonitor();
- ConnectionParameter connectionParameter = new ConnectionParameter( null, "localhost", ldapService.getIpPort(),
+ ConnectionParameter connectionParameter = new ConnectionParameter( null, "localhost", ldapService.getPort(),
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", ldapService.getIpPort() + 1,
+ connectionParameter = new ConnectionParameter( null, "localhost", ldapService.getPort() + 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", ldapService.getIpPort(),
+ connectionParameter = new ConnectionParameter( null, "555.555.555.555", ldapService.getPort(),
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", ldapService.getIpPort(),
+ ConnectionParameter connectionParameter = new ConnectionParameter( null, "localhost", ldapService.getPort(),
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", ldapService.getIpPort(),
+ connectionParameter = new ConnectionParameter( null, "localhost", ldapService.getPort(),
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", ldapService.getIpPort(),
+ connectionParameter = new ConnectionParameter( null, "localhost", ldapService.getPort(),
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", ldapService.getIpPort(),
+ connectionParameter = new ConnectionParameter( null, "localhost", ldapService.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/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=730533&r1=730532&r2=730533&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 Thu Jan 1 04:21:55 2009
@@ -45,7 +45,7 @@
super.loadTestLdif( true );
bot = new SWTEclipseBot();
SWTBotUtils.openLdapPerspective( bot );
- SWTBotUtils.createTestConnection( bot, "EntryEditorTest", ldapService.getIpPort() );
+ SWTBotUtils.createTestConnection( bot, "EntryEditorTest", ldapService.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=730533&r1=730532&r2=730533&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 Thu Jan 1 04:21:55 2009
@@ -50,7 +50,7 @@
super.loadTestLdif( false );
bot = new SWTEclipseBot();
SWTBotUtils.openLdapPerspective( bot );
- SWTBotUtils.createTestConnection( bot, "ImportExportTest", ldapService.getIpPort() );
+ SWTBotUtils.createTestConnection( bot, "ImportExportTest", ldapService.getPort() );
}
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=730533&r1=730532&r2=730533&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 Thu Jan 1 04:21:55 2009
@@ -95,7 +95,7 @@
SWTBotCombo hostnameCombo = bot.comboBoxWithLabel( "Hostname:" );
hostnameCombo.setText( "localhost" );
SWTBotCombo portCombo = bot.comboBoxWithLabel( "Port:" );
- portCombo.setText( Integer.toString( ldapService.getIpPort() ) );
+ portCombo.setText( Integer.toString( ldapService.getPort() ) );
// 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( ldapService.getIpPort(), connection.getPort() );
+ assertEquals( ldapService.getPort(), 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( ldapService.getIpPort() ) );
+ portCombo.setText( Integer.toString( ldapService.getPort() ) );
// 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( ldapService.getIpPort() + 1 ) );
+ portCombo.setText( Integer.toString( ldapService.getPort() + 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=730533&r1=730532&r2=730533&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 Thu Jan 1 04:21:55 2009
@@ -70,7 +70,7 @@
bot = new SWTEclipseBot();
SWTBotUtils.openLdapPerspective( bot );
- SWTBotUtils.createTestConnection( bot, "NewEntryWizardTest", ldapService.getIpPort() );
+ SWTBotUtils.createTestConnection( bot, "NewEntryWizardTest", ldapService.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=730533&r1=730532&r2=730533&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 Thu Jan 1 04:21:55 2009
@@ -54,7 +54,7 @@
super.setUp();
bot = new SWTEclipseBot();
SWTBotUtils.openLdapPerspective( bot );
- connection = SWTBotUtils.createTestConnection( bot, "ReferralDialogTest", ldapService.getIpPort() );
+ connection = SWTBotUtils.createTestConnection( bot, "ReferralDialogTest", ldapService.getPort() );
}
@@ -104,11 +104,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.getIpPort()
+ SWTBotTreeItem referralNode = systemNode.getNode( "ldap://localhost:" + ldapService.getPort()
+ "/ou=users,ou=system" );
assertNotNull( referralNode );
SWTBotUtils.selectEntry( bot, browserTree, false, "DIT", "Root DSE", "ou=system", "ldap://localhost:"
- + ldapService.getIpPort() + "/ou=users,ou=system" );
+ + ldapService.getPort() + "/ou=users,ou=system" );
}
@@ -155,7 +155,7 @@
SWTBotTreeItem referralNode = null;
try
{
- referralNode = systemNode.getNode( "ldap://localhost:" + ldapService.getIpPort() + "/ou=users,ou=system" );
+ referralNode = systemNode.getNode( "ldap://localhost:" + ldapService.getPort() + "/ou=users,ou=system" );
}
catch ( WidgetNotFoundException wnfe )
{
@@ -190,7 +190,7 @@
SWTBotTreeItem referralNode1 = null;
try
{
- referralNode1 = systemNode.getNode( "ldap://localhost:" + ldapService.getIpPort() + "/ou=users,ou=system" );
+ referralNode1 = systemNode.getNode( "ldap://localhost:" + ldapService.getPort() + "/ou=users,ou=system" );
}
catch ( WidgetNotFoundException wnfe )
{
@@ -244,7 +244,7 @@
entry.setDn( new LdapDN("cn=referralDialogTest,ou=system" ) );
entry.add( "objectClass", "top", "referral", "extensibleObject" );
entry.add( "cn", "referralDialogTest" );
- entry.add( "ref", "ldap://localhost:" + ldapService.getIpPort() + "/ou=users,ou=system" );
+ entry.add( "ref", "ldap://localhost:" + ldapService.getPort() + "/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=730533&r1=730532&r2=730533&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 Thu Jan 1 04:21:55 2009
@@ -45,7 +45,7 @@
super.loadTestLdif( true );
bot = new SWTEclipseBot();
SWTBotUtils.openLdapPerspective( bot );
- SWTBotUtils.createTestConnection( bot, "RenameEntryDialogTest", ldapService.getIpPort() );
+ SWTBotUtils.createTestConnection( bot, "RenameEntryDialogTest", ldapService.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=730533&r1=730532&r2=730533&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 Thu Jan 1 04:21:55 2009
@@ -49,7 +49,7 @@
super.setUp();
bot = new SWTEclipseBot();
SWTBotUtils.openLdapPerspective( bot );
- SWTBotUtils.createTestConnection( bot, "SwtResourcesTest", ldapService.getIpPort() );
+ SWTBotUtils.createTestConnection( bot, "SwtResourcesTest", ldapService.getPort() );
}