Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Ferrazzutti2014-04-16 19:10:21 +0000
committerAlexander Kurtakov2014-04-22 14:24:11 +0000
commit3aaff940b63d184248efa2d4af8a4e0313b18845 (patch)
tree5c7eb74709783aa16fdc99e9da0892b6e4902905 /systemtap
parent6b9c08235c58e071f72b849a43aab2184fbf13bd (diff)
downloadorg.eclipse.linuxtools-3aaff940b63d184248efa2d4af8a4e0313b18845.tar.gz
org.eclipse.linuxtools-3aaff940b63d184248efa2d4af8a4e0313b18845.tar.xz
org.eclipse.linuxtools-3aaff940b63d184248efa2d4af8a4e0313b18845.zip
Linuxtools: Circumvent M7 SWTBot test problems.
Where possible, use alternatives to ContextMenuHelper when the workbench's active selection is needed (EBZ #433014). Also perform minor cleanup on some tests. Change-Id: I23834cdc4b89df87b6e6d5666bce8b6f646a6cc0 Signed-off-by: Andrew Ferrazzutti <aferrazz@redhat.com> Reviewed-on: https://git.eclipse.org/r/25236 Tested-by: Hudson CI Reviewed-by: Alexander Kurtakov <akurtako@redhat.com> Tested-by: Alexander Kurtakov <akurtako@redhat.com>
Diffstat (limited to 'systemtap')
-rw-r--r--systemtap/org.eclipse.linuxtools.systemtap.ui.ide.tests/src/org/eclipse/linuxtools/systemtap/ui/ide/test/swtbot/TestCreateSystemtapScript.java9
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 400261c6b8..36989e9b18 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
@@ -294,6 +294,7 @@ public class TestCreateSystemtapScript {
bot.button("Finish").click();
bot.waitUntil(Conditions.shellCloses(shell));
projectExplorer = bot.viewByTitle("Project Explorer");
+ projectExplorer.setFocus();
projectExplorer.bot().tree().select(SYSTEMTAP_PROJECT_NAME)
.contextMenu("Go Into").click();
@@ -1257,8 +1258,6 @@ public class TestCreateSystemtapScript {
bot.button("Run").click();
bot.waitUntil(Conditions.shellCloses(shell));
- SWTBotView console = bot.viewById("org.eclipse.ui.console.ConsoleView");
- console.setFocus();
// Perform mouse hover tests on graphs as they are being updated
SWTBotEditor graphEditor = TestCreateSystemtapScript.bot.editorByTitle(scriptName.concat(" Graphs"));
@@ -1339,10 +1338,8 @@ public class TestCreateSystemtapScript {
private void openRunConfigurations(String scriptName) {
// Focus on project explorer view.
projectExplorer.setFocus();
- SWTBotTree treeBot = bot.tree();
- treeBot.select(scriptName);
- MenuItem menu = ContextMenuHelper.contextMenu(treeBot, "Run As", "Run Configurations...");
- click(menu);
+ projectExplorer.bot().tree().select(scriptName);
+ bot.menu("Run").menu("Run Configurations...").click();
}
private void setupGraphWithTests(String title) {

Back to the top