Return-Path: X-Original-To: apmail-directory-commits-archive@www.apache.org Delivered-To: apmail-directory-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id F2FDC18AD1 for ; Sat, 23 May 2015 22:51:40 +0000 (UTC) Received: (qmail 77188 invoked by uid 500); 23 May 2015 22:51:40 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 77149 invoked by uid 500); 23 May 2015 22:51:40 -0000 Mailing-List: contact commits-help@directory.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@directory.apache.org Delivered-To: mailing list commits@directory.apache.org Received: (qmail 77140 invoked by uid 99); 23 May 2015 22:51:40 -0000 Received: from eris.apache.org (HELO hades.apache.org) (140.211.11.105) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 23 May 2015 22:51:40 +0000 Received: from hades.apache.org (localhost [127.0.0.1]) by hades.apache.org (ASF Mail Server at hades.apache.org) with ESMTP id C30BFAC06ED for ; Sat, 23 May 2015 22:51:40 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: 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 Date: Sat, 23 May 2015 22:51:40 -0000 To: commits@directory.apache.org From: seelmann@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20150523225140.C30BFAC06ED@hades.apache.org> 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 ); } }