Commit 7a636d09 authored by Jay Jay Billings's avatar Jay Jay Billings
Browse files

Merge branch 'next' of https://github.com/eclipse/ice into next

parents c95a9fb2 5b3deaa7
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
......@@ -51,10 +51,6 @@ public class MOOSETester extends AbstractWorkbenchTester {
// TODO Write tests for the other options once they are implemented
// Close the Script unit test
bot.shell("MOOSE - Eclipse SDK").setFocus();
bot.viewByPartName("Script Unit Test").close();
// Test the import button then cancel out, as we can't create a SWTbot
// test for the OS provided file browser.
bot.toolbarButtonWithTooltip(
......@@ -137,7 +133,6 @@ public class MOOSETester extends AbstractWorkbenchTester {
// See if the tab can be changed
bot.cTabItem("Mesh and Output Files").activate();
}
/**
......
......@@ -57,9 +57,6 @@ public class MaterialsDatabaseTester extends AbstractSWTTester {
// before ICE's UI has had time to properly update.
SWTBotPreferences.PLAYBACK_DELAY = 50;
// Close the initial eclipse welcome window
bot.viewByTitle("Welcome").close();
// Open the ICE perspective
bot.menu("Window").menu("Perspective").menu("Open Perspective")
.menu("Other...").click();
......@@ -409,7 +406,6 @@ public class MaterialsDatabaseTester extends AbstractSWTTester {
assertTrue("Abs xs".equals(cellName));
cellValue = (double) realTable.getDataValueByPosition(2, 1);
assertEquals(0.231, cellValue);
}
/*
......
......@@ -122,23 +122,23 @@ public class ReflectivityModelTester extends AbstractWorkbenchTester {
// Select the new row and try to move it down a row. This shouldn't do
// anything.
table.selectCell(bot, 0, 5);
bot.button(5).click();
bot.button("v").click();
cellName = (String) realTable.getDataValueByPosition(1, 6);
assertTrue("107Ag".equals(cellName));
// Move it up two rows
bot.button(4).click();
bot.button(4).click();
bot.button("^").click();
bot.button("^").click();
cellName = (String) realTable.getDataValueByPosition(1, 4);
assertTrue("107Ag".equals(cellName));
// Move it up five times. This should let it reach the top of the table
// then stop.
bot.button(4).click();
bot.button(4).click();
bot.button(4).click();
bot.button(4).click();
bot.button(4).click();
bot.button("^").click();
bot.button("^").click();
bot.button("^").click();
bot.button("^").click();
bot.button("^").click();
cellName = (String) realTable.getDataValueByPosition(1, 1);
assertTrue("107Ag".equals(cellName));
......
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