Make tests consistent

tests/org.pitest.pitclipse.ui.tests/src/org/pitest/pitclipse/ui/behaviours/pageobjects/RefactorMenu.java

@@ -39,7 +39,7 @@ public void renameClass(String newClassName) {
 
     private void clickRename() {
         SWTBotMenuHelper menuHelper = new SWTBotMenuHelper();
-        menuHelper.findMenu(bot.menu(REFACTOR), RENAME).click();
+        menuHelper.findMenu(menuHelper.findWorkbenchMenu(bot, REFACTOR), RENAME).click();
     }
 
     public void renamePackage(String packageName) {

tests/org.pitest.pitclipse.ui.tests/src/org/pitest/pitclipse/ui/behaviours/pageobjects/RunMenu.java

@@ -43,15 +43,14 @@ public RunMenu(SWTWorkbenchBot bot) {
 
     public void runJUnit() {
         SWTBotMenuHelper menuHelper = new SWTBotMenuHelper();
-        menuHelper.findMenu(bot.menu(RUN).menu(RUN_AS), JUNIT_TEST).click();
+        menuHelper.findMenu(menuHelper.findWorkbenchMenu(bot, RUN).menu(RUN_AS), JUNIT_TEST).click();
     }
 
     public void runPit() {
         // focus package explorer to ensure the menu is found
         bot.viewByTitle("Package Explorer").setFocus();
         SWTBotMenuHelper menuHelper = new SWTBotMenuHelper();
-        SWTBotMenu runAsMenu = bot.menu(RUN)
-                                  .menu(RUN_AS);
+        SWTBotMenu runAsMenu = menuHelper.findWorkbenchMenu(bot, RUN).menu(RUN_AS);
         menuHelper.findMenu(runAsMenu, PIT_MUTATION_TEST)
                   .click();
 
@@ -81,7 +80,7 @@ private void ensureSelectTestConfigurationDialogIsClosed() {
 
     public List<PitRunConfiguration> runConfigurations() {
         SWTBotMenuHelper menuHelper = new SWTBotMenuHelper();
-        menuHelper.findMenu(bot.menu(RUN), RUN_CONFIGURATIONS).click();
+        menuHelper.findMenu(menuHelper.findWorkbenchMenu(bot, RUN), RUN_CONFIGURATIONS).click();
         return runConfigurationSelector.getConfigurations();
     }
 

tests/org.pitest.pitclipse.ui.tests/src/org/pitest/pitclipse/ui/behaviours/steps/PitclipseSteps.java

@@ -39,8 +39,6 @@
 import org.eclipse.core.resources.IResource;
 import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.core.runtime.CoreException;
-import org.eclipse.swtbot.swt.finder.exceptions.WidgetNotFoundException;
-import org.eclipse.swtbot.swt.finder.widgets.TimeoutException;
 import org.hamcrest.Description;
 import org.hamcrest.Matcher;
 import org.hamcrest.TypeSafeMatcher;
@@ -166,23 +164,10 @@ private void runPitAndWaitForIt(Runnable runnable) {
         assertNoErrorsInWorkspace();
         // reset Summary result
         PitSummary.INSTANCE.resetSummary();
-        int retryCount = 20;
-        int counter = 0;
-        while (counter < retryCount) {
-            try {
-                runnable.run();
-                PAGES.getRunMenu().runPit();
-                // wait for pit to finish
-                PitSummary.INSTANCE.waitForPitToFinish();
-                return;
-            } catch (TimeoutException te) {
-                counter++;
-                te.printStackTrace();
-            } catch (WidgetNotFoundException wfne) {
-                counter++;
-                wfne.printStackTrace();
-            }
-        }
+        runnable.run();
+        PAGES.getRunMenu().runPit();
+        // wait for pit to finish
+        PitSummary.INSTANCE.waitForPitToFinish();
     }
 
     public void assertNoErrorsInWorkspace() {

tests/org.pitest.pitclipse.ui.tests/src/org/pitest/pitclipse/ui/swtbot/SWTBotMenuHelper.java

@@ -18,13 +18,18 @@
 
 import org.eclipse.swt.widgets.Menu;
 import org.eclipse.swt.widgets.MenuItem;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.swtbot.eclipse.finder.SWTWorkbenchBot;
 import org.eclipse.swtbot.swt.finder.exceptions.WidgetNotFoundException;
 import org.eclipse.swtbot.swt.finder.finders.UIThreadRunnable;
+import org.eclipse.swtbot.swt.finder.results.Result;
 import org.eclipse.swtbot.swt.finder.results.WidgetResult;
 import org.eclipse.swtbot.swt.finder.widgets.SWTBotMenu;
+import org.eclipse.swtbot.swt.finder.widgets.SWTBotShell;
+import org.eclipse.ui.IWorkbenchWindow;
+import org.eclipse.ui.PlatformUI;
 
 public class SWTBotMenuHelper {
-
     private static final class MenuFinder implements WidgetResult<MenuItem> {
         private final SWTBotMenu parentMenu;
         private final String searchString;
@@ -64,4 +69,29 @@ public SWTBotMenu findMenu(final SWTBotMenu parentMenu,
             return new SWTBotMenu(menuItem);
         }
     }
+
+    /**
+     * This method does not rely on the focus and gets the workbench shell and from
+     * that the asked menu. With this we can avoid to wait for focus and be sure we
+     * are getting the correct shell for the menus.
+     * @param bot        which is used to get the display
+     * @param menuString which identifies the menu
+     * @return the asked menu
+     */
+    public SWTBotMenu findWorkbenchMenu(final SWTWorkbenchBot bot, final String menuString) {
+        return (new SWTBotShell(getActiveWorkbenchWindowShell(bot))).menu().menu(menuString);
+    }
+
+    private IWorkbenchWindow getActiveWorkbenchWindow(SWTWorkbenchBot bot) {
+        return UIThreadRunnable.syncExec(bot.getDisplay(), new Result<IWorkbenchWindow>() {
+            @Override
+            public IWorkbenchWindow run() {
+                return PlatformUI.getWorkbench().getActiveWorkbenchWindow();
+            }
+        });
+    }
+
+    private Shell getActiveWorkbenchWindowShell(SWTWorkbenchBot bot) {
+        return getActiveWorkbenchWindow(bot).getShell();
+    }
 }