8273573: [macos12] ActionListenerCalledTwiceTest.java fails on macOS 12

Reviewed-by: psadhukhan, serb

Author: Alexander Zvegintsev

test/jdk/ProblemList.txt

@@ -672,7 +672,6 @@ javax/swing/JPopupMenu/4870644/bug4870644.java 8194130 macosx-all,linux-all
 javax/swing/dnd/8139050/NativeErrorsInTableDnD.java 8202765  macosx-all,linux-all
 javax/swing/Popup/TaskbarPositionTest.java 8065097 macosx-all,linux-all
 javax/swing/JEditorPane/6917744/bug6917744.java 8213124 macosx-all
-javax/swing/JMenuItem/ActionListenerCalledTwice/ActionListenerCalledTwiceTest.java 8273573 macosx-all
 
 # Several tests which fail on some hidpi systems/macosx12-aarch64 system
 java/awt/Window/8159168/SetShapeTest.java 8274106 macosx-aarch64

test/jdk/javax/swing/JMenuItem/ActionListenerCalledTwice/ActionListenerCalledTwiceTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -21,42 +21,45 @@
  * questions.
  */
 
-/**
+/*
  * @test
  * @key headful
  * @bug 7160951 8152492 8178448
  * @summary [macosx] ActionListener called twice for JMenuItem using ScreenMenuBar
- * @author vera.akulova@oracle.com
- * @modules java.desktop/java.awt:open
- * @library /test/lib
- * @build jdk.test.lib.Platform
+ * @requires (os.family == "mac")
  * @run main ActionListenerCalledTwiceTest
  */
 
-import jdk.test.lib.Platform;
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
+import java.awt.Desktop;
+import java.awt.Robot;
+import java.awt.event.InputEvent;
+import java.awt.event.KeyEvent;
+import javax.swing.JFrame;
+import javax.swing.JMenu;
+import javax.swing.JMenuBar;
+import javax.swing.JMenuItem;
+import javax.swing.KeyStroke;
+import javax.swing.SwingUtilities;
 
 public class ActionListenerCalledTwiceTest {
 
-    static String menuItems[] = {"Item1", "Item2", "Item3",
-                                    "Item4", "Item5", "Item6"};
-    static KeyStroke keyStrokes[] = {
-        KeyStroke.getKeyStroke(KeyEvent.VK_E, InputEvent.META_MASK),
+    static final String[] menuItems = { "Item1", "Item2", "Item3",
+                                        "Item4", "Item5", "Item6" };
+    static final KeyStroke[] keyStrokes = {
+        KeyStroke.getKeyStroke(KeyEvent.VK_E, InputEvent.META_DOWN_MASK),
         KeyStroke.getKeyStroke(KeyEvent.VK_DELETE, 0),
-        KeyStroke.getKeyStroke(KeyEvent.VK_UP, InputEvent.SHIFT_MASK),
-        KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, InputEvent.META_MASK),
-        KeyStroke.getKeyStroke(KeyEvent.VK_E, InputEvent.CTRL_MASK),
-        KeyStroke.getKeyStroke(KeyEvent.VK_EQUALS, InputEvent.META_MASK)
+        KeyStroke.getKeyStroke(KeyEvent.VK_UP, InputEvent.SHIFT_DOWN_MASK),
+        KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, InputEvent.META_DOWN_MASK),
+        KeyStroke.getKeyStroke(KeyEvent.VK_E, InputEvent.CTRL_DOWN_MASK),
+        KeyStroke.getKeyStroke(KeyEvent.VK_EQUALS, InputEvent.META_DOWN_MASK)
     };
 
     static JMenuBar bar;
     static JFrame frame;
     static volatile int listenerCallCounter = 0;
 
     public static void main(String[] args) throws Exception {
-        if (!Platform.isOSX()) {
+        if (!System.getProperty("os.name").toLowerCase().startsWith("mac")) {
             System.out.println("This test is for MacOS only." +
                     " Automatically passed on other platforms.");
             return;
@@ -81,7 +84,10 @@ public static void main(String[] args) throws Exception {
 
             testForTwice(robot, "DefaultMenuBar");
         } finally {
-            SwingUtilities.invokeAndWait(() -> frame.dispose());
+            SwingUtilities.invokeAndWait(() -> {
+                frame.dispose();
+                Desktop.getDesktop().setDefaultMenuBar(null);
+            });
         }
     }