8233551: [TESTBUG] SelectEditTableCell.java fails on MacOS

Reviewed-by: mdoerr
Backport-of: 9b3fb5d

Author: GoeLin

test/jdk/ProblemList.txt

@@ -697,7 +697,6 @@ javax/swing/JWindow/ShapedAndTranslucentWindows/TranslucentJComboBox.java 802462
 javax/swing/JComboBox/8033069/bug8033069ScrollBar.java 8163367 generic-all
 javax/swing/JColorChooser/Test6827032.java 8197825 windows-all
 javax/swing/JColorChooser/Test7194184.java 8194126 linux-all,macosx-all
-javax/swing/JTable/7124218/SelectEditTableCell.java 8148958 linux-all,macosx-all
 javax/swing/JSplitPane/4201995/bug4201995.java 8079127 generic-all
 javax/swing/JTree/DnD/LastNodeLowerHalfDrop.java 8159131 linux-all
 javax/swing/JTree/4633594/JTreeFocusTest.java 8173125 macosx-all

test/jdk/javax/swing/JTable/7124218/SelectEditTableCell.java

@@ -50,23 +50,28 @@ public class SelectEditTableCell {
 
     public static void main(String[] args) throws Exception {
         robot = new Robot();
-        robot.delay(2000);
+        robot.setAutoDelay(100);
         UIManager.LookAndFeelInfo[] lookAndFeelArray
                 = UIManager.getInstalledLookAndFeels();
         for (UIManager.LookAndFeelInfo lookAndFeelItem : lookAndFeelArray) {
             executeCase(lookAndFeelItem.getClassName());
         }
-
     }
 
     private static void executeCase(String lookAndFeelString) throws Exception {
-        if (tryLookAndFeel(lookAndFeelString)) {
-            createUI(lookAndFeelString);
-            robot.delay(2000);
-            runTestCase();
-            robot.delay(2000);
-            cleanUp();
-            robot.delay(2000);
+        try {
+            if (tryLookAndFeel(lookAndFeelString)) {
+                createUI(lookAndFeelString);
+                robot.delay(2000);
+                runTestCase();
+                robot.delay(2000);
+                cleanUp();
+                robot.delay(2000);
+            }
+        } finally {
+            if (frame != null) {
+                SwingUtilities.invokeAndWait(frame::dispose);
+            }
         }
 
     }
@@ -100,6 +105,7 @@ private static void runTestCase() throws Exception {
         robot.mouseMove(centerPoint.x, centerPoint.y);
         robot.mousePress(InputEvent.BUTTON1_MASK);
         robot.mouseRelease(InputEvent.BUTTON1_MASK);
+        robot.waitForIdle();
         SwingUtilities.invokeAndWait(new Runnable() {
             @Override
             public void run() {
@@ -112,7 +118,7 @@ public void run() {
                 }
             }
         });
-        robot.waitForIdle();
+
         int fetchKeyCode;
         keyTap(fetchKeyCode = isMac(lookAndFeel)
                 ? KeyEvent.VK_ENTER : KeyEvent.VK_SPACE);
@@ -129,7 +135,7 @@ public void run() {
                 }
             }
         });
-        robot.waitForIdle();
+
         keyTap(KeyEvent.VK_SPACE);
         robot.waitForIdle();
         SwingUtilities.invokeAndWait(new Runnable() {
@@ -149,10 +155,12 @@ public void run() {
                 }
             }
         });
-        robot.waitForIdle();
+
         // hitting a letter key will start editing
         keyTap(KeyEvent.VK_A);
+        robot.waitForIdle();
         keyTap(KeyEvent.VK_SPACE);
+        robot.waitForIdle();
         keyTap(KeyEvent.VK_A);
         robot.waitForIdle();
         SwingUtilities.invokeAndWait(new Runnable() {