/** Test Class setup */
@BeforeClass
public static void init() {
- SWTBotUtils.failIfUIThread();
+ SWTBotUtils.initialize();
/* set up for swtbot */
SWTBotPreferences.TIMEOUT = 50000; /* 50 second timeout */
*/
@Before
public void init() {
- SWTBotUtils.failIfUIThread();
+ SWTBotUtils.initialize();
Thread.currentThread().setName("SWTBot Thread"); // for the debugger
/* set up for swtbot */
SWTBotPreferences.TIMEOUT = 20000; /* 20 second timeout */
*/
@BeforeClass
public static void beforeClass() {
- SWTBotUtils.failIfUIThread();
+ SWTBotUtils.initialize();
/* set up for swtbot */
SWTBotPreferences.TIMEOUT = 20000; /* 20 second timeout */
*/
@BeforeClass
public static void init() {
- SWTBotUtils.failIfUIThread();
+ SWTBotUtils.initialize();
/* Set up for swtbot */
SWTBotPreferences.TIMEOUT = 20000; /* 20 second timeout */
*/
@BeforeClass
public static void init() {
- SWTBotUtils.failIfUIThread();
+ SWTBotUtils.initialize();
Thread.currentThread().setName("SWTBot Thread"); // for the debugger
/* set up for swtbot */
@BeforeClass
public static void init() {
- SWTBotUtils.failIfUIThread();
+ SWTBotUtils.initialize();
/* set up for swtbot */
SWTBotPreferences.TIMEOUT = 300000; /* 300 second timeout */
@BeforeClass
public static void init() {
SWTBotPreferences.KEYBOARD_LAYOUT = "EN_US";
- SWTBotUtils.failIfUIThread();
+ SWTBotUtils.initialize();
SWTBotPreferences.TIMEOUT = 20000; /* 20 second timeout */
Logger.getRootLogger().addAppender(new NullAppender());
fBot = new SWTWorkbenchBot();
/** Test Class setup */
@BeforeClass
public static void beforeInit() {
- SWTBotUtils.failIfUIThread();
+ SWTBotUtils.initialize();
/* set up for swtbot */
SWTBotPreferences.TIMEOUT = 50000; /* 50 second timeout */
import org.eclipse.swt.graphics.Point;
import org.eclipse.swt.graphics.Rectangle;
import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Shell;
import org.eclipse.swt.widgets.Table;
import org.eclipse.swt.widgets.TableItem;
import org.eclipse.swtbot.eclipse.finder.SWTWorkbenchBot;
});
}
+ /**
+ * Initialize the environment for SWTBot
+ */
+ public static void initialize() {
+ failIfUIThread();
+
+ SWTWorkbenchBot bot = new SWTWorkbenchBot();
+ UIThreadRunnable.syncExec(() -> {
+ Shell shell = bot.activeShell().widget;
+
+ // Only adjust shell if it appears to be the top-most
+ if (shell.getParent() == null) {
+ makeShellFullyVisible(shell);
+ }
+ });
+ }
+
/**
* If the test is running in the UI thread then fail
*/
- public static void failIfUIThread() {
+ private static void failIfUIThread() {
if (Display.getCurrent() != null && Display.getCurrent().getThread() == Thread.currentThread()) {
fail("SWTBot test needs to run in a non-UI thread. Make sure that \"Run in UI thread\" is unchecked in your launch configuration or"
+ " that useUIThread is set to false in the pom.xml");
}
+ }
+ /**
+ * Try to make the shell fully visible in the display. If the shell cannot
+ * fit the display, it will be positioned so that top-left corner is at
+ * <code>(0, 0)</code> in display-relative coordinates.
+ *
+ * @param shell
+ * the shell to make fully visible
+ */
+ private static void makeShellFullyVisible(Shell shell) {
+ Rectangle displayBounds = shell.getDisplay().getBounds();
+ Point absCoord = shell.toDisplay(0, 0);
+ Point shellSize = shell.getSize();
+
+ Point newLocation = new Point(absCoord.x, absCoord.y);
+ newLocation.x = Math.max(0, Math.min(absCoord.x, displayBounds.width - shellSize.x));
+ newLocation.y = Math.max(0, Math.min(absCoord.y, displayBounds.height - shellSize.y));
+ if (!newLocation.equals(absCoord)) {
+ shell.setLocation(newLocation);
+ }
}
/**
/** Test Class setup */
@BeforeClass
public static void init() {
- SWTBotUtils.failIfUIThread();
+ SWTBotUtils.initialize();
Thread.currentThread().setName("SWTBot Thread"); // for the debugger
/* set up for swtbot */
SWTBotPreferences.TIMEOUT = 20000; /* 20 second timeout */
*/
@BeforeClass
public static void init() {
- SWTBotUtils.failIfUIThread();
+ SWTBotUtils.initialize();
/* set up test trace*/
URL location = FileLocator.find(TmfCoreTestPlugin.getDefault().getBundle(), new Path(CALLSITE_TRACE_PATH), null);
*/
@BeforeClass
public static void init() {
- SWTBotUtils.failIfUIThread();
+ SWTBotUtils.initialize();
/* set up test trace*/
URL location = FileLocator.find(TmfCoreTestPlugin.getDefault().getBundle(), new Path(COLLAPSE_TRACE_PATH), null);
*/
@BeforeClass
public static void init() throws IOException {
- SWTBotUtils.failIfUIThread();
+ SWTBotUtils.initialize();
Thread.currentThread().setName("SWTBot Thread"); // for the debugger
/* set up for swtbot */
SWTBotPreferences.TIMEOUT = 20000; /* 20 second timeout */
*/
@BeforeClass
public static void beforeClass() {
- SWTBotUtils.failIfUIThread();
+ SWTBotUtils.initialize();
/* set up test trace */
URL location = FileLocator.find(TmfCoreTestPlugin.getDefault().getBundle(), new Path(COLUMN_TRACE_PATH), null);
*/
@BeforeClass
public static void beforeClass() {
- SWTBotUtils.failIfUIThread();
+ SWTBotUtils.initialize();
/* set up test trace */
URL location = FileLocator.find(TmfCoreTestPlugin.getDefault().getBundle(), new Path(TRACE_PATH), null);
*/
@BeforeClass
public static void init() {
- SWTBotUtils.failIfUIThread();
+ SWTBotUtils.initialize();
/* set up test trace */
URL location = FileLocator.find(TmfCoreTestPlugin.getDefault().getBundle(), new Path(COLUMN_TRACE_PATH), null);
*/
@BeforeClass
public static void init() throws IOException {
- SWTBotUtils.failIfUIThread();
+ SWTBotUtils.initialize();
Thread.currentThread().setName("SWTBot Thread"); // for the debugger
/* set up for swtbot */
SWTBotPreferences.TIMEOUT = 20000; /* 20 second timeout */
*/
@BeforeClass
public static void init() {
- SWTBotUtils.failIfUIThread();
+ SWTBotUtils.initialize();
/* set up test trace */
URL location = FileLocator.find(TmfCoreTestPlugin.getDefault().getBundle(), new Path(COLUMN_TRACE_PATH), null);
*/
@BeforeClass
public static void init() {
- SWTBotUtils.failIfUIThread();
+ SWTBotUtils.initialize();
/* set up test trace */
URL location = FileLocator.find(TmfCoreTestPlugin.getDefault().getBundle(), new Path(COLUMN_TRACE_PATH), null);
*/
@BeforeClass
public static void init() throws IOException {
- SWTBotUtils.failIfUIThread();
+ SWTBotUtils.initialize();
Thread.currentThread().setName("SWTBot Thread"); // for the debugger
/* set up for swtbot */
SWTBotPreferences.TIMEOUT = 20000; /* 20 second timeout */
@BeforeClass
public static void init() {
SWTBotPreferences.KEYBOARD_LAYOUT = "EN_US";
- SWTBotUtils.failIfUIThread();
+ SWTBotUtils.initialize();
SWTBotPreferences.TIMEOUT = 20000; /* 20 second timeout */
Logger.getRootLogger().addAppender(new NullAppender());
fBot = new SWTWorkbenchBot();
*/
@Before
public void init() throws IOException {
- SWTBotUtils.failIfUIThread();
+ SWTBotUtils.initialize();
Thread.currentThread().setName("SWTBot Thread"); // for the debugger
/* set up for swtbot */
SWTBotPreferences.TIMEOUT = 20000; /* 20 second timeout */
*/
@BeforeClass
public static void init() throws IOException {
- SWTBotUtils.failIfUIThread();
+ SWTBotUtils.initialize();
Thread.currentThread().setName("SWTBot Thread"); // for the debugger
/* set up for swtbot */
SWTBotPreferences.TIMEOUT = 20000; /* 20 second timeout */
*/
@BeforeClass
public static void init() {
- SWTBotUtils.failIfUIThread();
+ SWTBotUtils.initialize();
zipTrace();
fLogger.removeAllAppenders();
fLogger.addAppender(new NullAppender());
@BeforeClass
public static void init() {
SWTBotPreferences.KEYBOARD_LAYOUT = "EN_US";
- SWTBotUtils.failIfUIThread();
+ SWTBotUtils.initialize();
Thread.currentThread().setName(SWT_BOT_THREAD_NAME); // for the debugger
/* set up for swtbot */
SWTBotPreferences.TIMEOUT = 20000; /* 20 second timeout */
projects / deliverable / tracecompass.git / commitdiff
