7151826: [TEST_BUG] [macosx] The test javax/swing/JPopupMenu/4966112/bug4966112.java not for mac

Reviewed-by: serb, jdv

Author: trebari

test/jdk/ProblemList.txt

@@ -777,7 +777,6 @@ javax/swing/JFileChooser/8062561/bug8062561.java 8196466 linux-all,macosx-all
 javax/swing/JInternalFrame/Test6325652.java 8224977 macosx-all
 javax/swing/JInternalFrame/8146321/JInternalFrameIconTest.java 8225045 linux-all
 javax/swing/JPopupMenu/4870644/bug4870644.java 8194130 macosx-all,linux-all
-javax/swing/JPopupMenu/4966112/bug4966112.java 8064915 macosx-all
 javax/swing/MultiUIDefaults/Test6860438.java 8198391 generic-all
 javax/swing/UITest/UITest.java 8198392 generic-all
 javax/swing/plaf/basic/BasicComboBoxEditor/Test8015336.java 8198394 generic-all

test/jdk/javax/swing/JPopupMenu/4966112/bug4966112.java

@@ -31,11 +31,27 @@
  * @author Alexander Zuev
  * @run main bug4966112
  */
-import javax.swing.*;
+import javax.swing.JButton;
+import javax.swing.JComponent;
+import javax.swing.JFileChooser;
+import javax.swing.JFrame;
+import javax.swing.JPanel;
+import javax.swing.JPopupMenu;
+import javax.swing.JSpinner;
+import javax.swing.JSplitPane;
+import javax.swing.SwingUtilities;
+import javax.swing.UIManager;
 import javax.swing.event.PopupMenuListener;
 import javax.swing.event.PopupMenuEvent;
-import java.awt.*;
-import java.awt.event.*;
+
+import java.awt.BorderLayout;
+import java.awt.Dimension;
+import java.awt.Robot;
+import java.awt.Point;
+import java.awt.event.InputEvent;
+import java.awt.event.KeyEvent;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
 
 public class bug4966112 {
 
@@ -48,6 +64,7 @@ public class bug4966112 {
     private static volatile JFileChooser filec;
     private static int buttonMask;
     private static Robot robot;
+    private static boolean isAquaFileChooser;
 
     public static void main(String[] args) throws Exception {
         robot = new Robot();
@@ -99,6 +116,11 @@ public static void main(String[] args) throws Exception {
         createAndShowFileChooser();
         robot.waitForIdle();
 
+        if ((UIManager.getLookAndFeel().getID()).equals("Aqua")) {
+            isAquaFileChooser = true;
+        } else {
+            isAquaFileChooser = false;
+        }
         clickMouse(filec);
         robot.waitForIdle();
 
@@ -146,7 +168,11 @@ private static void setClickPoint(final JComponent c) throws Exception {
             public void run() {
                 Point p = c.getLocationOnScreen();
                 Dimension size = c.getSize();
-                result[0] = new Point(p.x + size.width / 2, p.y + size.height / 2);
+                if (isAquaFileChooser) {
+                    result[0] = new Point(p.x + size.width / 2, p.y + 5);
+                } else {
+                    result[0] = new Point(p.x + size.width / 2, p.y + size.height / 2);
+                }
             }
         });