From 5e9f0ffa96acb5b792ab75cf22bca757ab4a5b74 Mon Sep 17 00:00:00 2001
From: parentej <parentej@google.com>
Date: Fri, 20 Jan 2017 17:39:52 +0000
Subject: fix Bug159_moveParentToFrontWhenClickingMenuItem_Test

Tests have a menu structure of: File > New > Cut, and the test was
expecting to be able to click "Cut" without pressing all the sequence

Test: this is a test
Change-Id: I9762f3adf10e83aa02cd2b67d3f0d000bfaaad5f
---
 ...moveParentToFrontWhenClickingMenuItem_Test.java | 26 +++-------------------
 1 file changed, 3 insertions(+), 23 deletions(-)
 mode change 100644 => 100755 fest-swing/src/test/java/org/fest/swing/fixture/Bug159_moveParentToFrontWhenClickingMenuItem_Test.java

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
old mode 100644
new mode 100755
index 43a12be6..cd4cadb9
--- 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,29 +52,20 @@ 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));
     robot.focus(frameToFocus);
   }
 
-  @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;
-- 
cgit v1.2.3