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 15:30:16 UTC
svn commit: r1681451 - in
/directory/studio/trunk/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/bots:
DeleteDialogBot.java EntryEditorWidgetBot.java
Author: seelmann
Date: Sun May 24 13:30:15 2015
New Revision: 1681451
URL: http://svn.apache.org/r1681451
Log:
Fix more flaky tests
Modified:
directory/studio/trunk/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/bots/DeleteDialogBot.java
directory/studio/trunk/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/bots/EntryEditorWidgetBot.java
Modified: directory/studio/trunk/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/bots/DeleteDialogBot.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/DeleteDialogBot.java?rev=1681451&r1=1681450&r2=1681451&view=diff
==============================================================================
--- directory/studio/trunk/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/bots/DeleteDialogBot.java (original)
+++ directory/studio/trunk/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/bots/DeleteDialogBot.java Sun May 24 13:30:15 2015
@@ -19,7 +19,6 @@
*/
package org.apache.directory.studio.test.integration.ui.bots;
-import org.apache.directory.studio.ldapbrowser.core.BrowserCoreMessages;
import org.apache.directory.studio.test.integration.ui.bots.utils.JobWatcher;
@@ -46,26 +45,9 @@ public class DeleteDialogBot extends Dia
public void clickOkButton()
{
- JobWatcher watcher = null;
- if ( DELETE_ENTRY_TITLE.equals( title ) )
- {
- watcher = new JobWatcher( BrowserCoreMessages.jobs__delete_entries_name_1 );
- }
- else if ( DELETE_ENTRIES_TITLE.equals( title ) )
- {
- watcher = new JobWatcher( BrowserCoreMessages.jobs__delete_entries_name_n );
- }
- else if ( DELETE_SERVER.equals( title ) )
- {
- watcher = new JobWatcher( "Delete Server" );
- }
-
+ JobWatcher watcher = new JobWatcher( title );
super.clickButton( "OK" );
-
- if ( watcher != null )
- {
- watcher.waitUntilDone();
- }
+ watcher.waitUntilDone();
}
Modified: directory/studio/trunk/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/bots/EntryEditorWidgetBot.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/EntryEditorWidgetBot.java?rev=1681451&r1=1681450&r2=1681451&view=diff
==============================================================================
--- directory/studio/trunk/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/bots/EntryEditorWidgetBot.java (original)
+++ directory/studio/trunk/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/bots/EntryEditorWidgetBot.java Sun May 24 13:30:15 2015
@@ -23,7 +23,9 @@ package org.apache.directory.studio.test
import java.util.ArrayList;
import java.util.List;
+import org.apache.directory.studio.ldapbrowser.core.BrowserCoreMessages;
import org.apache.directory.studio.test.integration.ui.ContextMenuHelper;
+import org.apache.directory.studio.test.integration.ui.bots.utils.JobWatcher;
import org.eclipse.swtbot.swt.finder.SWTBot;
import org.eclipse.swtbot.swt.finder.exceptions.WidgetNotFoundException;
import org.eclipse.swtbot.swt.finder.keyboard.Keystrokes;
@@ -80,7 +82,10 @@ class EntryEditorWidgetBot
SWTBotPreferences.KEYBOARD_LAYOUT = "org.eclipse.swtbot.swt.finder.keyboard.EN_US";
SWTBotText text = bot.text( 1 );
text.setText( value );
+
+ JobWatcher jobWatcher = new JobWatcher( BrowserCoreMessages.jobs__execute_ldif_name );
bot.tree().pressShortcut( Keystrokes.LF );
+ jobWatcher.waitUntilDone();
}