diff options
author | Lakshmi Shanmugam | 2018-08-16 06:57:17 +0000 |
---|---|---|
committer | Lakshmi Shanmugam | 2018-08-16 10:50:19 +0000 |
commit | 1bed5097125869173fe23b4f4ba7becb2bd06208 (patch) | |
tree | ebbbbbb44d66e9d4ee2370812070682ab051f495 | |
parent | daaa7345f5057c0eac56d3ae436dfc4909c7029c (diff) | |
download | eclipse.platform.swt-1bed5097125869173fe23b4f4ba7becb2bd06208.tar.gz eclipse.platform.swt-1bed5097125869173fe23b4f4ba7becb2bd06208.tar.xz eclipse.platform.swt-1bed5097125869173fe23b4f4ba7becb2bd06208.zip |
Bug 536564: Test failures on Mac OS X 10.13 from I20180628-0230
Temp code in attempt to fix failing tests - added sleep before asserts
and capture screenshots.
Change-Id: I78920da73ff1ed91219174964f9fc80ca6ebf6b4
2 files changed, 25 insertions, 4 deletions
diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_Display.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_Display.java index b740730fa4..174058ee1f 100644 --- a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_Display.java +++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_Display.java @@ -219,7 +219,10 @@ public void test_getActiveShell() { Shell shell = new Shell(display); shell.setText("test_getActiveShell"); shell.open(); - drainEventQueue(display, 2000); // workaround for https://bugs.eclipse.org/506680 + drainEventQueue(display, 5000); // workaround for https://bugs.eclipse.org/506680 + if (SwtTestUtil.isCocoa) { + Screenshots.takeScreenshot(this.getClass(), "test_setActive2"); + } assertSame(shell, display.getActiveShell()); shell.dispose(); } finally { diff --git a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_Shell.java b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_Shell.java index 73554654ba..dfc5f2ef3b 100644 --- a/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_Shell.java +++ b/tests/org.eclipse.swt.tests/JUnit Tests/org/eclipse/swt/tests/junit/Test_org_eclipse_swt_widgets_Shell.java @@ -34,6 +34,7 @@ import org.eclipse.swt.widgets.Button; import org.eclipse.swt.widgets.Display; import org.eclipse.swt.widgets.Event; import org.eclipse.swt.widgets.Shell; +import org.eclipse.test.Screenshots; import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -506,32 +507,49 @@ public void test_setActive() { } /* Create shell2 and make it active. */ Shell shell2 = new Shell(); + shell2.setText("Shell2"); shell2.open(); - if (SwtTestUtil.isCocoa) { - drainEventQueue(shell.getDisplay(), 5000); //workaround for Bug 536564 - } /* Test setActive for visible shell. */ shell.setVisible(true); shell.setActive(); + if (SwtTestUtil.isCocoa) { //workaround for Bug 536564 + drainEventQueue(shell.getDisplay(), 5000); + Screenshots.takeScreenshot(this.getClass(), "test_setActive1"); + } assertTrue("visible shell was not made active", shell.getDisplay().getActiveShell() == shell); /* Test setActive for visible dialog shell. */ shell2.setActive(); + testShell.setBounds(shell.getBounds()); testShell.setVisible(true); testShell.setActive(); + if (SwtTestUtil.isCocoa) { //workaround for Bug 536564 + drainEventQueue(shell.getDisplay(), 2000); + Screenshots.takeScreenshot(this.getClass(), "test_setActive2"); + } assertTrue("visible dialog shell was not made active", testShell.getDisplay().getActiveShell() == testShell); /* Test setActive for non-visible shell. */ shell2.setActive(); shell.setVisible(false); shell.setActive(); + shell2.setText("Shell2: Not active"); + if (SwtTestUtil.isCocoa) { //workaround for Bug 536564 + drainEventQueue(shell.getDisplay(), 2000); + Screenshots.takeScreenshot(this.getClass(), "test_setActive3"); + } assertTrue("non-visible shell was made active", shell.getDisplay().getActiveShell() != shell); /* Test setActive for non-visible dialog shell. */ shell2.setActive(); testShell.setVisible(false); testShell.setActive(); + shell2.setText("Shell2: Not active"); + if (SwtTestUtil.isCocoa) { //workaround for Bug 536564 + drainEventQueue(shell.getDisplay(), 2000); + Screenshots.takeScreenshot(this.getClass(), "test_setActive4"); + } assertTrue("non-visible dialog shell was made active", testShell.getDisplay().getActiveShell() != testShell); shell2.dispose(); |