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 2015/05/24 00:51:40 UTC

svn commit: r1681395 - in /directory/studio/trunk/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui: ApacheDSPluginTest.java bots/ConnectionFromServerDialogBot.java

Author: seelmann
Date: Sat May 23 22:51:40 2015
New Revision: 1681395

URL: http://svn.apache.org/r1681395
Log:
Fix detection of dialog and button

Modified:
    directory/studio/trunk/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/ApacheDSPluginTest.java
    directory/studio/trunk/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/bots/ConnectionFromServerDialogBot.java

Modified: directory/studio/trunk/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/ApacheDSPluginTest.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/ApacheDSPluginTest.java?rev=1681395&r1=1681394&r2=1681395&view=diff
==============================================================================
--- directory/studio/trunk/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/ApacheDSPluginTest.java (original)
+++ directory/studio/trunk/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/ApacheDSPluginTest.java Sat May 23 22:51:40 2015
@@ -38,8 +38,6 @@ import org.apache.directory.studio.test.
 import org.apache.directory.studio.test.integration.ui.bots.NewApacheDSServerWizardBot;
 import org.apache.directory.studio.test.integration.ui.bots.StudioBot;
 import org.apache.directory.studio.test.integration.ui.bots.utils.FrameworkRunnerWithScreenshotCaptureListener;
-import org.eclipse.swtbot.eclipse.finder.SWTWorkbenchBot;
-import org.eclipse.swtbot.swt.finder.waits.DefaultCondition;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;

Modified: directory/studio/trunk/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/bots/ConnectionFromServerDialogBot.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/bots/ConnectionFromServerDialogBot.java?rev=1681395&r1=1681394&r2=1681395&view=diff
==============================================================================
--- directory/studio/trunk/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/bots/ConnectionFromServerDialogBot.java (original)
+++ directory/studio/trunk/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/bots/ConnectionFromServerDialogBot.java Sat May 23 22:51:40 2015
@@ -19,21 +19,20 @@
  */
 package org.apache.directory.studio.test.integration.ui.bots;
 
-import org.eclipse.swtbot.swt.finder.keyboard.Keystrokes;
-
 
 public class ConnectionFromServerDialogBot extends DialogBot
 {
+    private static final String TITLE = "Connection created";
+
+
     public void clickOkButton()
     {
-        // TODO: handle native dialogs
-        //super.clickButton( "OK" );
-        super.bot.activeShell().pressShortcut( Keystrokes.SPACE );
+        bot.shell( TITLE ).bot().button( "OK" ).click();
     }
 
 
     public boolean isVisible()
     {
-        return isVisible( "Connection created" );
+        return isVisible( TITLE );
     }
 }