Commit f9caf5f6 authored by Jay Jay Billings's avatar Jay Jay Billings

Merge remote-tracking branch 'origin/next' into 2.2.1

Signed-off-by: default avatarJay Jay Billings <billingsjj@ornl.gov>
parents 1214ec84 27a0577b
......@@ -22,7 +22,6 @@ import org.eclipse.ice.datastructures.resource.ICEResource;
import org.eclipse.ice.datastructures.resource.VizResource;
import org.eclipse.swt.widgets.Display;
import org.eclipse.swtbot.eclipse.finder.SWTWorkbenchBot;
import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotView;
import org.eclipse.swtbot.swt.finder.exceptions.WidgetNotFoundException;
import org.eclipse.swtbot.swt.finder.utils.SWTBotPreferences;
import org.eclipse.ui.IEditorInput;
......@@ -58,8 +57,8 @@ import org.junit.BeforeClass;
* @author Jordan Deyton
*
*/
public abstract class AbstractWorkbenchTester extends
AbstractICEUITester<SWTWorkbenchBot> {
public abstract class AbstractWorkbenchTester
extends AbstractICEUITester<SWTWorkbenchBot> {
/**
* The {@code SWTBot} for this test class instance. This bot is to aid in
......@@ -243,7 +242,8 @@ public abstract class AbstractWorkbenchTester extends
* The Eclipse editor's ID as defined in the plug-in extensions.
* @return The opened editor, or {@code null} if it could not be opened.
*/
protected IEditorReference openICEFormEditor(ICEFormInput input, String id) {
protected IEditorReference openICEFormEditor(ICEFormInput input,
String id) {
return openEditor(input, id);
}
......@@ -266,20 +266,20 @@ public abstract class AbstractWorkbenchTester extends
* seen in the plug-in extensions and the UI itself.
* @return The view wrapped by the {@code SWTBot}.
*/
protected SWTBotView openView(String category, String name) {
protected void openView(String category, String name) {
SWTWorkbenchBot bot = getBot();
// Open "Window" > "Show View" > "Other..."
bot.menu("Window").click();
bot.menu("Window").menu("Show View").click();
bot.menu("Window").menu("Show View").menu("Other...").click();
// To pick from the dialog, we must activate it.
bot.shell("Show View").activate();
// Select "category" > "name"
bot.tree().expandNode(category, false).select(name);
// Close the dialog by clicking OK.
bot.button("OK").click();
// Return the view itself.
return bot.viewByTitle(name);
bot.button().click();
}
/**
......
......@@ -206,7 +206,8 @@ public class VIBEModelTester extends AbstractWorkbenchTester {
bot.text(8).typeText("Test");
// Delete a row and make sure it's gone
bot.table().select(0);
bot.table(1).select(0);
bot.text(1).selectAll();
bot.button(3).click();
assertTrue("11 DUALFOIL".equals(bot.table(1).cell(9, 0)));
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment