diff options
author | parentej <parentej@google.com> | 2017-01-20 16:04:41 +0000 |
---|---|---|
committer | parentej <parentej@google.com> | 2017-01-20 17:46:37 +0000 |
commit | 012066b0c23667baefbbfea2727f5b50a0ae4bb8 (patch) | |
tree | 0dc3003b8fa15d7ca265b5d1d243379728b2c9bf | |
parent | 5774220cb6e4cb58fcaa80690cd6275054d2982c (diff) | |
download | swing-testing-012066b0c23667baefbbfea2727f5b50a0ae4bb8.tar.gz |
fix Bug157_MacOsxMenuBar_Test
Need to press on the menu, for its menu item to become visible
Test: this is a test
Change-Id: I6c0d7478e105938ee8a4466cd9a43effb469950a
-rwxr-xr-x[-rw-r--r--] | fest-swing/src/test/java/org/fest/swing/fixture/Bug157_MacOsxMenuBar_Test.java | 24 |
1 files changed, 6 insertions, 18 deletions
diff --git a/fest-swing/src/test/java/org/fest/swing/fixture/Bug157_MacOsxMenuBar_Test.java b/fest-swing/src/test/java/org/fest/swing/fixture/Bug157_MacOsxMenuBar_Test.java index d80dcdd5..6231a207 100644..100755 --- a/fest-swing/src/test/java/org/fest/swing/fixture/Bug157_MacOsxMenuBar_Test.java +++ b/fest-swing/src/test/java/org/fest/swing/fixture/Bug157_MacOsxMenuBar_Test.java @@ -15,12 +15,10 @@ package org.fest.swing.fixture; import static org.fest.assertions.Assertions.assertThat; -import static org.fest.swing.edt.GuiActionRunner.execute; import static org.fest.swing.finder.WindowFinder.findFrame; +import static org.fest.swing.test.recorder.ClickRecorder.attachTo; import java.awt.Dimension; -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; import javax.swing.JMenu; import javax.swing.JMenuBar; @@ -29,6 +27,7 @@ import javax.swing.JMenuItem; 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; import org.fest.swing.test.swing.TestWindow; import org.junit.Test; @@ -46,32 +45,21 @@ public class Bug157_MacOsxMenuBar_Test extends RobotBasedTestCase { System.setProperty("apple.laf.useScreenMenuBar", "true"); robot.showWindow(MyWindow.createNew()); FrameFixture frameFixture = findFrame("myWindow").withTimeout(2000).using(robot); + frameFixture.menuItem("menu").click(); menuItemFixture = frameFixture.menuItem("menuItem"); } @Test public void should_select_menu() { - final boolean[] selected = new boolean[1]; - JMenuItem menu = menuItemFixture.target(); - menu.addActionListener(new ActionListener() { - @Override - public void actionPerformed(ActionEvent event) { - selected[0] = true; - } - }); + ClickRecorder clickRecorder = attachTo(menuItemFixture.target()); menuItemFixture.click(); - assertThat(selected[0]).isTrue(); + assertThat(clickRecorder).wasClicked(); } private static class MyWindow extends TestWindow { @RunsInEDT static MyWindow createNew() { - return execute(new GuiQuery<MyWindow>() { - @Override - protected MyWindow executeInEDT() { - return new MyWindow(); - } - }); + return GuiQuery.get(() -> new MyWindow()); } private MyWindow() { |