diff options
Diffstat (limited to 'fest-swing/src/test/java/org/fest/swing/fixture/Bug159_moveParentToFrontWhenClickingMenuItem_Test.java')
-rwxr-xr-x[-rw-r--r--] | fest-swing/src/test/java/org/fest/swing/fixture/Bug159_moveParentToFrontWhenClickingMenuItem_Test.java | 26 |
1 files changed, 3 insertions, 23 deletions
diff --git a/fest-swing/src/test/java/org/fest/swing/fixture/Bug159_moveParentToFrontWhenClickingMenuItem_Test.java b/fest-swing/src/test/java/org/fest/swing/fixture/Bug159_moveParentToFrontWhenClickingMenuItem_Test.java index 43a12be6..cd4cadb9 100644..100755 --- a/fest-swing/src/test/java/org/fest/swing/fixture/Bug159_moveParentToFrontWhenClickingMenuItem_Test.java +++ b/fest-swing/src/test/java/org/fest/swing/fixture/Bug159_moveParentToFrontWhenClickingMenuItem_Test.java @@ -31,7 +31,6 @@ import javax.swing.JMenuItem; import javax.swing.JPopupMenu; import javax.swing.JTextField; -import org.fest.swing.annotation.RunsInEDT; import org.fest.swing.edt.GuiQuery; import org.fest.swing.test.core.RobotBasedTestCase; import org.fest.swing.test.recorder.ClickRecorder; @@ -53,7 +52,7 @@ public class Bug159_moveParentToFrontWhenClickingMenuItem_Test extends RobotBase @Override protected void onSetUp() { - window = MyWindow.createNew(); + window = GuiQuery.get(() -> new MyWindow()); window.display(); frameToFocus = frame().withTitle("To Focus").createNew(); robot.showWindow(frameToFocus, new Dimension(300, 200)); @@ -61,21 +60,12 @@ public class Bug159_moveParentToFrontWhenClickingMenuItem_Test extends RobotBase } @Test - public void should_select_menu_item_from_menu_bar() { - JMenuItem menuItem = window.menuItemFromMenuBar; - JMenuItemFixture fixture = fixtureFor(menuItem); - pauseBeforeShowingMenu(); - ClickRecorder clickRecorder = attachTo(menuItem); - fixture.click(); - assertThat(clickRecorder).wasClicked(); - } - - @Test public void should_select_menu_item_from_popup_menu() { JMenuItem menuItem = window.menuItemFromPopupMenu; JMenuItemFixture fixture = fixtureFor(menuItem); pauseBeforeShowingMenu(); - robot.showPopupMenu(window.textField); + JPopupMenu popupMenu = robot.showPopupMenu(window.textField); + new JPopupMenuFixture(fixture.robot(), popupMenu).click(); ClickRecorder clickRecorder = attachTo(menuItem); fixture.click(); assertThat(clickRecorder).wasClicked(); @@ -92,16 +82,6 @@ public class Bug159_moveParentToFrontWhenClickingMenuItem_Test extends RobotBase } private static class MyWindow extends TestWindow { - @RunsInEDT - static MyWindow createNew() { - return execute(new GuiQuery<MyWindow>() { - @Override - protected MyWindow executeInEDT() { - return new MyWindow(); - } - }); - } - final JMenuItem menuItemFromMenuBar = new JMenuItem("New"); final JMenuItem menuItemFromPopupMenu = new JMenuItem("Cut"); final JTextField textField; |