Replace sleep with conditional wait

22 files changed, 64 insertions, 139 deletions

diff --git a/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/EntryEditorTest.java b/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/EntryEditorTest.java
index 6c38518cf..220dc2073 100644
--- a/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/EntryEditorTest.java
+++ b/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/EntryEditorTest.java
@@ -322,7 +322,6 @@ public class EntryEditorTest extends AbstractTestBase
         dnEditorBot.clickOkButton();
 
         // assert value after saved and reloaded from server
-        SWTUtils.sleep( 1000 );
         assertEquals( 13, entryEditorBot.getAttributeValues().size() );
         assertTrue( entryEditorBot.getAttributeValues().contains( "member: " + MULTI_VALUED_RDN_DN.getName() ) );
         dnEditorBot = entryEditorBot.editValueExpectingDnEditor( "member", MULTI_VALUED_RDN_DN.getName() );
@@ -400,7 +399,6 @@ public class EntryEditorTest extends AbstractTestBase
         watcher.waitUntilDone();
 
         // assert pasted values are visible in editor
-        SWTUtils.sleep( 1000 );
         assertEquals( 27, entryEditorBot.getAttributeValues().size() );
         assertTrue( entryEditorBot.getAttributeValues().contains( "uid: hnelson" ) );
         assertTrue( entryEditorBot.getAttributeValues().contains( "description: " + Characters.ALL ) );
@@ -422,7 +420,7 @@ public class EntryEditorTest extends AbstractTestBase
      * DIRSTUDIO-738: Add support for modular crypt format password
      */
     @ParameterizedTest
-    @LdapServersSource
+    @LdapServersSource(mode=Mode.All)
     public void testPasswordValueEditor( TestLdapServer server ) throws Exception
     {
         connectionsViewBot.createTestConnection( server );
@@ -469,7 +467,6 @@ public class EntryEditorTest extends AbstractTestBase
         pwdEditorBot.clickOkButton();
 
         // assert value after saved and reloaded from server
-        SWTUtils.sleep( 1000 );
         assertTrue( entryEditorBot.getAttributeValues().contains( "userPassword: CRYPT-SHA-512 hashed password" ) );
 
         // verify and bind with the correct password
@@ -498,11 +495,8 @@ public class EntryEditorTest extends AbstractTestBase
         pwdEditorBot.setShowNewPasswordDetails( true );
         assertHashMethod( pwdEditorBot, LdapSecurityConstants.HASH_METHOD_SSHA256, PasswordUtil.SHA256_LENGTH, 8 );
         pwdEditorBot.clickOkButton();
-        SWTUtils.sleep( 1000 );
         assertTrue( entryEditorBot.getAttributeValues().contains( "userPassword: SSHA-256 hashed password" ) );
     }
-
-
     private void assertHashMethod( PasswordEditorDialogBot passwordEditorBot, LdapSecurityConstants hashMethod,
         int passwordLength, int saltLength ) throws Exception
     {
@@ -803,7 +797,6 @@ public class EntryEditorTest extends AbstractTestBase
 
         aciItemEditor.clickOkButton();
 
-        SWTUtils.sleep( 1000 );
         modificationLogsViewBot.waitForText( "delete: entryACI\n" );
         modificationLogsViewBot.waitForText( "add: entryACI\n" );
     }
@@ -845,7 +838,6 @@ public class EntryEditorTest extends AbstractTestBase
 
         aciItemEditor.clickOkButton();
 
-        SWTUtils.sleep( 1000 );
         modificationLogsViewBot.waitForText( "delete: entryACI\n" );
         modificationLogsViewBot.waitForText( "add: entryACI\n" );
     }
@@ -876,7 +868,6 @@ public class EntryEditorTest extends AbstractTestBase
 
         aciItemEditor.clickOkButton();
 
-        SWTUtils.sleep( 1000 );
         modificationLogsViewBot.waitForText( "delete: prescriptiveACI\n" );
         modificationLogsViewBot.waitForText( "add: prescriptiveACI\n" );
     }
diff --git a/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/ExtendedOperationsTest.java b/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/ExtendedOperationsTest.java
index f2c867f08..926845086 100644
--- a/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/ExtendedOperationsTest.java
+++ b/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/ExtendedOperationsTest.java
@@ -34,7 +34,6 @@ import org.apache.directory.studio.test.integration.junit5.LdapServerType;
 import org.apache.directory.studio.test.integration.junit5.LdapServersSource;
 import org.apache.directory.studio.test.integration.junit5.LdapServersSource.Mode;
 import org.apache.directory.studio.test.integration.junit5.TestLdapServer;
-import org.apache.directory.studio.test.integration.ui.bots.BotUtils;
 import org.apache.directory.studio.test.integration.ui.bots.EntryEditorBot;
 import org.apache.directory.studio.test.integration.ui.bots.ErrorDialogBot;
 import org.apache.directory.studio.test.integration.ui.bots.GeneratedPasswordDialogBot;
@@ -121,7 +120,7 @@ public class ExtendedOperationsTest extends AbstractTestBase
 
 
     @ParameterizedTest
-    @LdapServersSource(except = LdapServerType.Fedora389ds, reason = "389ds requires secure connection")
+    @LdapServersSource(mode=Mode.All, except = LdapServerType.Fedora389ds, reason = "389ds requires secure connection")
     public void testPasswordModifyExtendedOperationDialogSetNewPassword( TestLdapServer server ) throws Exception
     {
         connectionsViewBot.createTestConnection( server );
@@ -140,7 +139,6 @@ public class ExtendedOperationsTest extends AbstractTestBase
 
         // Verify and bind with the correct password
         browserViewBot.refresh();
-        BotUtils.sleep( 1000L );
         EntryEditorBot entryEditorBot = studioBot.getEntryEditorBot( USER1_DN.getName() );
         entryEditorBot.activate();
         PasswordEditorDialogBot pwdEditorBot = entryEditorBot.editValueExpectingPasswordEditor( "userPassword", null );
@@ -152,7 +150,6 @@ public class ExtendedOperationsTest extends AbstractTestBase
         pwdEditorBot.clickCancelButton();
     }
 
-
     @ParameterizedTest
     @LdapServersSource(mode=Mode.All, except = LdapServerType.Fedora389ds, reason = "389ds requires secure connection")
     public void testPasswordModifyExtendedOperationDialogGenerateNewPassword( TestLdapServer server ) throws Exception
@@ -187,7 +184,6 @@ public class ExtendedOperationsTest extends AbstractTestBase
 
             // Verify and bind with the correct password
             browserViewBot.refresh();
-            BotUtils.sleep( 1000L );
             EntryEditorBot entryEditorBot = studioBot.getEntryEditorBot( USER1_DN.getName() );
             entryEditorBot.activate();
             PasswordEditorDialogBot pwdEditorBot = entryEditorBot.editValueExpectingPasswordEditor( "userPassword",
diff --git a/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/NewEntryWizardTest.java b/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/NewEntryWizardTest.java
index c14599f8f..742601e12 100644
--- a/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/NewEntryWizardTest.java
+++ b/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/NewEntryWizardTest.java
@@ -266,6 +266,7 @@ public class NewEntryWizardTest extends AbstractTestBase
         wizardBot.clickNextButton();
 
         DnEditorDialogBot dnEditorBot = new DnEditorDialogBot();
+        dnEditorBot.setWaitAfterClickOkButton( false );
         dnEditorBot.setDnText( USER1_DN.getName() );
         dnEditorBot.clickOkButton();
         wizardBot.clickFinishButton();
@@ -299,6 +300,7 @@ public class NewEntryWizardTest extends AbstractTestBase
         wizardBot.clickNextButton();
 
         SubtreeSpecificationEditorDialogBot subtreeEditorBot = new SubtreeSpecificationEditorDialogBot();
+        subtreeEditorBot.setWaitAfterClickOkButton( false );
         subtreeEditorBot.clickOkButton();
         wizardBot.clickFinishButton();
 
@@ -632,6 +634,7 @@ public class NewEntryWizardTest extends AbstractTestBase
         wizardBot.activate();
         wizardBot.editValue( "cACertificate;binary", null );
         CertificateEditorDialogBot certEditorBot = new CertificateEditorDialogBot();
+        certEditorBot.setWaitAfterClickOkButton( false );
         assertTrue( certEditorBot.isVisible() );
         certEditorBot.typeFile( certFile );
         certEditorBot.clickOkButton();
@@ -645,6 +648,7 @@ public class NewEntryWizardTest extends AbstractTestBase
         wizardBot.activate();
         wizardBot.editValue( "certificateRevocationList;binary", null );
         HexEditorDialogBot hexEditorBot = new HexEditorDialogBot();
+        hexEditorBot.setWaitAfterClickOkButton( false );
         assertTrue( hexEditorBot.isVisible() );
         hexEditorBot.typeFile( crlFile );
         hexEditorBot.clickOkButton();
diff --git a/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/SearchTest.java b/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/SearchTest.java
index 24fff97a4..a291fa715 100644
--- a/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/SearchTest.java
+++ b/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/SearchTest.java
@@ -107,7 +107,7 @@ public class SearchTest extends AbstractTestBase
         browserViewBot.copy();
         connectionsViewBot.select( connection2.getName() );
         browserViewBot.selectEntry( "Searches" );
-        SearchPropertiesDialogBot searchPropertiesDialogBot = browserViewBot.pasteSearch();
+        SearchPropertiesDialogBot searchPropertiesDialogBot = browserViewBot.pasteSearch( "Search all persons" );
         assertTrue( searchPropertiesDialogBot.isVisible() );
         searchPropertiesDialogBot.clickCancelButton();
 
diff --git a/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/bots/AciItemEditorDialogBot.java b/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/bots/AciItemEditorDialogBot.java
index f6322fddb..2b85df185 100644
--- a/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/bots/AciItemEditorDialogBot.java
+++ b/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/bots/AciItemEditorDialogBot.java
@@ -21,6 +21,7 @@ package org.apache.directory.studio.test.integration.ui.bots;
 
 
 import org.apache.directory.api.ldap.model.constants.AuthenticationLevel;
+import org.apache.directory.studio.ldapbrowser.core.BrowserCoreMessages;
 
 
 public class AciItemEditorDialogBot extends DialogBot
@@ -29,6 +30,7 @@ public class AciItemEditorDialogBot extends DialogBot
     public AciItemEditorDialogBot()
     {
         super( "ACI Item Editor" );
+        super.setWaitAfterClickOkButton( true, BrowserCoreMessages.jobs__execute_ldif_name );
     }
 
 
diff --git a/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/bots/BrowserViewBot.java b/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/bots/BrowserViewBot.java
index ac9ebbad2..13792d579 100644
--- a/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/bots/BrowserViewBot.java
+++ b/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/bots/BrowserViewBot.java
@@ -235,10 +235,10 @@ public class BrowserViewBot
     }
 
 
-    public SearchPropertiesDialogBot pasteSearch()
+    public SearchPropertiesDialogBot pasteSearch( String searchName )
     {
         ContextMenuHelper.clickContextMenu( browserBot.getTree(), "Paste" );
-        return new SearchPropertiesDialogBot();
+        return new SearchPropertiesDialogBot( searchName );
     }
 
 
diff --git a/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/bots/CertificateEditorDialogBot.java b/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/bots/CertificateEditorDialogBot.java
index cdb02c844..3535e4daa 100644
--- a/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/bots/CertificateEditorDialogBot.java
+++ b/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/bots/CertificateEditorDialogBot.java
@@ -20,6 +20,7 @@
 package org.apache.directory.studio.test.integration.ui.bots;
 
 
+import org.apache.directory.studio.ldapbrowser.core.BrowserCoreMessages;
 import org.apache.directory.studio.valueeditors.certificate.CertificateDialog;
 
 
@@ -29,6 +30,7 @@ public class CertificateEditorDialogBot extends DialogBot
     public CertificateEditorDialogBot()
     {
         super( "Certificate Editor" );
+        super.setWaitAfterClickOkButton( true, BrowserCoreMessages.jobs__execute_ldif_name );
     }
 
 
diff --git a/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/bots/DeleteDialogBot.java b/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/bots/DeleteDialogBot.java
index 986fa5316..7829fedfd 100644
--- a/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/bots/DeleteDialogBot.java
+++ b/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/bots/DeleteDialogBot.java
@@ -21,7 +21,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.utils.JobWatcher;
 
 
 public class DeleteDialogBot extends DialogBot
@@ -34,26 +33,11 @@ public class DeleteDialogBot extends DialogBot
     public static final String DELETE_SERVER = "Delete Server";
     public static final String DELETE_PROJECT = "Delete Project";
 
-
     public DeleteDialogBot( String title )
     {
         super( title );
-    }
-
-
-    public void clickOkButton()
-    {
-        String jobWatcherTitle = getJobWatcherTitle( title );
-        if ( jobWatcherTitle != null )
-        {
-            JobWatcher watcher = new JobWatcher( jobWatcherTitle );
-            super.clickOkButton();
-            watcher.waitUntilDone();
-        }
-        else
-        {
-            super.clickOkButton();
-        }
+        String jobName = getJobWatcherTitle( title );
+        super.setWaitAfterClickOkButton( jobName != null, jobName );
     }
 
 
@@ -72,9 +56,4 @@ public class DeleteDialogBot extends DialogBot
         }
     }
 
-
-    public void clickCancelButton()
-    {
-        super.clickButton( "Cancel" );
-    }
 }
diff --git a/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/bots/DialogBot.java b/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/bots/DialogBot.java
index 1d4715a96..00a578197 100644
--- a/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/bots/DialogBot.java
+++ b/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/bots/DialogBot.java
@@ -21,6 +21,7 @@ package org.apache.directory.studio.test.integration.ui.bots;
 
 
 import org.apache.commons.lang3.StringUtils;
+import org.apache.directory.studio.test.integration.ui.utils.JobWatcher;
 import org.eclipse.swtbot.eclipse.finder.SWTWorkbenchBot;
 import org.eclipse.swtbot.swt.finder.utils.SWTBotPreferences;
 import org.eclipse.swtbot.swt.finder.waits.DefaultCondition;
@@ -33,7 +34,7 @@ public abstract class DialogBot
 
     protected SWTWorkbenchBot bot = new SWTWorkbenchBot();
     protected String title;
-
+    protected String[] okButtonJobWatcherJobNames = null;
 
     protected DialogBot( String title )
     {
@@ -41,6 +42,19 @@ public abstract class DialogBot
     }
 
 
+    public void setWaitAfterClickOkButton( boolean wait, String... jobNames )
+    {
+        if ( wait )
+        {
+            this.okButtonJobWatcherJobNames = jobNames;
+        }
+        else
+        {
+            this.okButtonJobWatcherJobNames = null;
+        }
+    }
+
+
     public void activate()
     {
         bot.shell( title ).setFocus();
@@ -69,7 +83,16 @@ public abstract class DialogBot
 
     public void clickOkButton()
     {
-        clickButton( "OK" );
+        if ( okButtonJobWatcherJobNames != null )
+        {
+            JobWatcher jobWatcher = new JobWatcher( okButtonJobWatcherJobNames );
+            clickButton( "OK" );
+            jobWatcher.waitUntilDone();
+        }
+        else
+        {
+            clickButton( "OK" );
+        }
     }
 
 
diff --git a/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/bots/DnEditorDialogBot.java b/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/bots/DnEditorDialogBot.java
index fbf7d56da..cbe97f850 100644
--- a/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/bots/DnEditorDialogBot.java
+++ b/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/bots/DnEditorDialogBot.java
@@ -20,12 +20,16 @@
 package org.apache.directory.studio.test.integration.ui.bots;
 
 
+import org.apache.directory.studio.ldapbrowser.core.BrowserCoreMessages;
+
+
 public class DnEditorDialogBot extends DialogBot
 {
 
     public DnEditorDialogBot()
     {
         super( "DN Editor" );
+        super.setWaitAfterClickOkButton( true, BrowserCoreMessages.jobs__execute_ldif_name );
     }
 
 
diff --git a/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/bots/HexEditorDialogBot.java b/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/bots/HexEditorDialogBot.java
index 2d76811c3..7a318a838 100644
--- a/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/bots/HexEditorDialogBot.java
+++ b/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/bots/HexEditorDialogBot.java
@@ -21,6 +21,7 @@ package org.apache.directory.studio.test.integration.ui.bots;
 
 
 import org.apache.directory.studio.ldapbrowser.common.dialogs.HexDialog;
+import org.apache.directory.studio.ldapbrowser.core.BrowserCoreMessages;
 
 
 public class HexEditorDialogBot extends DialogBot
@@ -29,6 +30,7 @@ public class HexEditorDialogBot extends DialogBot
     public HexEditorDialogBot()
     {
         super( "Hex Editor" );
+        super.setWaitAfterClickOkButton( true, BrowserCoreMessages.jobs__execute_ldif_name );
     }
 
 
diff --git a/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/bots/ImageEditorDialogBot.java b/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/bots/ImageEditorDialogBot.java
index 3233fac9c..a5516684f 100644
--- a/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/bots/ImageEditorDialogBot.java
+++ b/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/bots/ImageEditorDialogBot.java
@@ -19,6 +19,7 @@
  */
 package org.apache.directory.studio.test.integration.ui.bots;
 
+import org.apache.directory.studio.ldapbrowser.core.BrowserCoreMessages;
 
 public class ImageEditorDialogBot extends DialogBot
 {
@@ -26,6 +27,7 @@ public class ImageEditorDialogBot extends DialogBot
     public ImageEditorDialogBot()
     {
         super( "Image Editor" );
+        super.setWaitAfterClickOkButton( true, BrowserCoreMessages.jobs__execute_ldif_name );
     }
 
 
diff --git a/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/bots/MoveEntriesDialogBot.java b/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/bots/MoveEntriesDialogBot.java
index 05795085d..4427027a6 100644
--- a/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/bots/MoveEntriesDialogBot.java
+++ b/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/bots/MoveEntriesDialogBot.java
@@ -21,7 +21,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.utils.JobWatcher;
 
 
 public class MoveEntriesDialogBot extends DialogBot
@@ -30,14 +29,7 @@ public class MoveEntriesDialogBot extends DialogBot
     public MoveEntriesDialogBot()
     {
         super( "Move Entries" );
-    }
-
-
-    public void clickOkButton()
-    {
-        JobWatcher watcher = new JobWatcher( BrowserCoreMessages.jobs__move_entry_name_1 );
-        super.clickOkButton();
-        watcher.waitUntilDone();
+        super.setWaitAfterClickOkButton( true, BrowserCoreMessages.jobs__move_entry_name_1 );
     }
 
 
diff --git a/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/bots/PasswordEditorDialogBot.java b/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/bots/PasswordEditorDialogBot.java
index 6016ec191..acc246448 100644
--- a/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/bots/PasswordEditorDialogBot.java
+++ b/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/bots/PasswordEditorDialogBot.java
@@ -21,6 +21,7 @@ package org.apache.directory.studio.test.integration.ui.bots;
 
 
 import org.apache.directory.api.ldap.model.constants.LdapSecurityConstants;
+import org.apache.directory.studio.ldapbrowser.core.BrowserCoreMessages;
 
 
 public class PasswordEditorDialogBot extends DialogBot
@@ -29,18 +30,7 @@ public class PasswordEditorDialogBot extends DialogBot
     public PasswordEditorDialogBot()
     {
         super( "Password Editor" );
-    }
-
-
-    public void clickOkButton()
-    {
-        super.clickButton( "OK" );
-    }
-
-
-    public void clickCancelButton()
-    {
-        super.clickButton( "Cancel" );
+        super.setWaitAfterClickOkButton( true, BrowserCoreMessages.jobs__execute_ldif_name );
     }
 
 
diff --git a/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/bots/PasswordModifyExtendedOperationDialogBot.java b/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/bots/PasswordModifyExtendedOperationDialogBot.java
index 7590a3df2..fea139f93 100644
--- a/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/bots/PasswordModifyExtendedOperationDialogBot.java
+++ b/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/bots/PasswordModifyExtendedOperationDialogBot.java
@@ -20,11 +20,15 @@
 package org.apache.directory.studio.test.integration.ui.bots;
 
 
+import org.apache.directory.studio.ldapbrowser.core.BrowserCoreMessages;
+
+
 public class PasswordModifyExtendedOperationDialogBot extends DialogBot
 {
     public PasswordModifyExtendedOperationDialogBot()
     {
         super( "Password Modify Extended Operation (RFC 3062)" );
+        super.setWaitAfterClickOkButton( true, BrowserCoreMessages.jobs__extended_operation_name );
     }
 
 
diff --git a/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/bots/ReferralDialogBot.java b/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/bots/ReferralDialogBot.java
index 31a97fc90..a463c4948 100644
--- a/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/bots/ReferralDialogBot.java
+++ b/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/bots/ReferralDialogBot.java
@@ -21,7 +21,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.utils.JobWatcher;
 import org.eclipse.swtbot.swt.finder.utils.TableCollection;
 import org.eclipse.swtbot.swt.finder.utils.TableRow;
 
@@ -32,16 +31,9 @@ public class ReferralDialogBot extends DialogBot
     public ReferralDialogBot()
     {
         super( "Select Referral Connection" );
-    }
-
-
-    public void clickOkButton()
-    {
-        JobWatcher watcher = new JobWatcher( BrowserCoreMessages.jobs__init_entries_title_subonly,
-            BrowserCoreMessages.jobs__init_entries_title_attonly,
-            BrowserCoreMessages.jobs__create_entry_name_1 );
-        super.clickOkButton();
-        watcher.waitUntilDone();
+        super.setWaitAfterClickOkButton( true,
+            BrowserCoreMessages.jobs__init_entries_title_subonly,
+            BrowserCoreMessages.jobs__init_entries_title_attonly, BrowserCoreMessages.jobs__create_entry_name_1 );
     }
 
 
diff --git a/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/bots/RenameEntryDialogBot.java b/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/bots/RenameEntryDialogBot.java
index 1ef636d0d..155adb850 100644
--- a/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/bots/RenameEntryDialogBot.java
+++ b/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/bots/RenameEntryDialogBot.java
@@ -21,7 +21,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.utils.JobWatcher;
 
 
 public class RenameEntryDialogBot extends DialogBot
@@ -30,14 +29,7 @@ public class RenameEntryDialogBot extends DialogBot
     public RenameEntryDialogBot()
     {
         super( "Rename Entry" );
-    }
-
-
-    public void clickOkButton()
-    {
-        JobWatcher watcher = new JobWatcher( BrowserCoreMessages.jobs__rename_entry_name );
-        super.clickOkButton();
-        watcher.waitUntilDone();
+        super.setWaitAfterClickOkButton( true, BrowserCoreMessages.jobs__rename_entry_name );
     }
 
 
diff --git a/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/bots/SearchPropertiesDialogBot.java b/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/bots/SearchPropertiesDialogBot.java
index 6f1b65586..d1352fccc 100644
--- a/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/bots/SearchPropertiesDialogBot.java
+++ b/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/bots/SearchPropertiesDialogBot.java
@@ -25,10 +25,9 @@ public class SearchPropertiesDialogBot extends DialogBot
 
     SearchPageWrapperBot searchPageWrapperBot;
 
-
-    public SearchPropertiesDialogBot()
+    public SearchPropertiesDialogBot( String searchName)
     {
-        super( "" );
+        super( "Properties for " + searchName );
         this.searchPageWrapperBot = new SearchPageWrapperBot( bot );
     }
 
@@ -51,16 +50,4 @@ public class SearchPropertiesDialogBot extends DialogBot
         searchPageWrapperBot.setFilter( string );
     }
 
-
-    public void clickOkButton()
-    {
-        bot.button( "OK" ).click();
-    }
-
-
-    public void clickCancelButton()
-    {
-        bot.button( "Cancel" ).click();
-    }
-
 }
diff --git a/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/bots/SelectCopyDepthDialogBot.java b/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/bots/SelectCopyDepthDialogBot.java
index 03ab8858a..53dacc4f9 100644
--- a/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/bots/SelectCopyDepthDialogBot.java
+++ b/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/bots/SelectCopyDepthDialogBot.java
@@ -21,7 +21,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.utils.JobWatcher;
 
 
 public class SelectCopyDepthDialogBot extends DialogBot
@@ -29,8 +28,6 @@ public class SelectCopyDepthDialogBot extends DialogBot
     private String objectText;
     private String oneLevelText;
     private String subTreeText;
-    private String jobName;
-
 
     public SelectCopyDepthDialogBot( int numEntries )
     {
@@ -40,14 +37,14 @@ public class SelectCopyDepthDialogBot extends DialogBot
             objectText = "Object (Only the copied entries)";
             oneLevelText = "One Level (Only copied entries and their direct children)";
             subTreeText = "Subtree (The whole subtrees)";
-            jobName = BrowserCoreMessages.jobs__copy_entries_name_n;
+            super.setWaitAfterClickOkButton( true, BrowserCoreMessages.jobs__copy_entries_name_n );
         }
         else
         {
             objectText = "Object (Only the copied entry)";
             oneLevelText = "One Level (Only copied entry and its direct children)";
             subTreeText = "Subtree (The whole subtree)";
-            jobName = BrowserCoreMessages.jobs__copy_entries_name_1;
+            super.setWaitAfterClickOkButton( true, BrowserCoreMessages.jobs__copy_entries_name_1 );
         }
         activate();
     }
@@ -70,12 +67,4 @@ public class SelectCopyDepthDialogBot extends DialogBot
         bot.radio( subTreeText ).click();
     }
 
-
-    public void clickOkButton()
-    {
-        JobWatcher watcher = new JobWatcher( jobName );
-        super.clickOkButton();
-        watcher.waitUntilDone();
-    }
-
 }
diff --git a/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/bots/SelectCopyStrategyBot.java b/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/bots/SelectCopyStrategyBot.java
index 0d09a8421..3888c748d 100644
--- a/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/bots/SelectCopyStrategyBot.java
+++ b/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/bots/SelectCopyStrategyBot.java
@@ -21,7 +21,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.utils.JobWatcher;
 
 
 public class SelectCopyStrategyBot extends DialogBot
@@ -29,6 +28,7 @@ public class SelectCopyStrategyBot extends DialogBot
     public SelectCopyStrategyBot()
     {
         super( "Select copy strategy" );
+        super.setWaitAfterClickOkButton( true, BrowserCoreMessages.jobs__copy_entries_name_1 );
         waitForDialog();
         activate();
     }
@@ -71,12 +71,4 @@ public class SelectCopyStrategyBot extends DialogBot
         bot.comboBox( index ).setText( text );
     }
 
-
-    public void clickOkButton()
-    {
-        JobWatcher watcher = new JobWatcher( BrowserCoreMessages.jobs__copy_entries_name_1 );
-        super.clickOkButton();
-        watcher.waitUntilDone();
-    }
-
 }
diff --git a/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/bots/TextEditorDialogBot.java b/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/bots/TextEditorDialogBot.java
index 6db410029..7e94c7d46 100644
--- a/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/bots/TextEditorDialogBot.java
+++ b/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/bots/TextEditorDialogBot.java
@@ -29,18 +29,6 @@ public class TextEditorDialogBot extends DialogBot
     }
 
 
-    public void clickOkButton()
-    {
-        super.clickButton( "OK" );
-    }
-
-
-    public void clickCancelButton()
-    {
-        super.clickButton( "Cancel" );
-    }
-
-
     public void setText( String text )
     {
         bot.text( 0 ).setText( text );
diff --git a/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/bots/WizardBot.java b/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/bots/WizardBot.java
index de5b1aeef..28b8a5fb8 100644
--- a/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/bots/WizardBot.java
+++ b/tests/test.integration.ui/src/main/java/org/apache/directory/studio/test/integration/ui/bots/WizardBot.java
@@ -94,12 +94,6 @@ public abstract class WizardBot extends DialogBot
     }
 
 
-    public void clickCancelButton()
-    {
-        clickButton( "Cancel" );
-    }
-
-
     public boolean existsCategory( String category )
     {
         TreeBot treeBot = new TreeBot( bot.tree() );