Stop SWTBot test hangs by forcing dialog focus.

Change-Id: I4374f454e8e74f59649b6cd0381a0201d107e51c
Signed-off-by: Andrew Ferrazzutti <aferrazz@redhat.com>
Reviewed-on: https://git.eclipse.org/r/29002
Tested-by: Hudson CI
Reviewed-by: Alexander Kurtakov <akurtako@redhat.com>
Tested-by: Alexander Kurtakov <akurtako@redhat.com>

1 files changed, 3 insertions, 6 deletions

diff --git a/systemtap/org.eclipse.linuxtools.systemtap.ui.ide.tests/src/org/eclipse/linuxtools/systemtap/ui/ide/test/swtbot/TestCreateSystemtapScript.java b/systemtap/org.eclipse.linuxtools.systemtap.ui.ide.tests/src/org/eclipse/linuxtools/systemtap/ui/ide/test/swtbot/TestCreateSystemtapScript.java
index ac5f469508..d3ca853b01 100644
--- a/systemtap/org.eclipse.linuxtools.systemtap.ui.ide.tests/src/org/eclipse/linuxtools/systemtap/ui/ide/test/swtbot/TestCreateSystemtapScript.java
+++ b/systemtap/org.eclipse.linuxtools.systemtap.ui.ide.tests/src/org/eclipse/linuxtools/systemtap/ui/ide/test/swtbot/TestCreateSystemtapScript.java
@@ -590,8 +590,7 @@ public class TestCreateSystemtapScript {
 
         table.select(3);
         editButton.click();
-        bot.waitUntil(Conditions.shellIsActive("Edit Graph"));
-        SWTBotShell graphShell = bot.activeShell();
+        SWTBotShell graphShell = bot.shell("Edit Graph").activate();
         SWTBotButton finishButton = bot.button("Finish");
         assertTrue(!finishButton.isEnabled());
         bot.comboBox("<Deleted>").setSelection("NA");
@@ -623,8 +622,7 @@ public class TestCreateSystemtapScript {
 
         table.select(table.rowCount() - 1);
         editButton.click();
-        bot.waitUntil(Conditions.shellIsActive("Edit Graph"));
-        graphShell = bot.activeShell();
+        graphShell = bot.shell("Edit Graph").activate();
         finishButton = bot.button("Finish");
         assertFalse(finishButton.isEnabled());
         bot.radio(0).click();
@@ -672,8 +670,7 @@ public class TestCreateSystemtapScript {
         // Confirm that a blank regex is not removed when other data is not empty.
         combo.setText("(a)");
         bot.button(Messages.SystemTapScriptGraphOptionsTab_AddGraphButton).click();
-        bot.waitUntil(Conditions.shellIsActive("Create Graph"));
-        SWTBotShell graphShell = bot.activeShell();
+        SWTBotShell graphShell = bot.shell("Create Graph").activate();
         graphShell.setFocus();
         bot.textWithLabel("Title:").setText("Test");
         bot.button("Finish").click();