8169954: JFileChooser/8021253: java.lang.RuntimeException: Default button is not pressed

Reviewed-by: serb

Author: prsadhuk

test/jdk/ProblemList.txt

@@ -768,7 +768,6 @@ javax/swing/text/JTextComponent/5074573/bug5074573.java 8196100 windows-all
 javax/swing/JFileChooser/6798062/bug6798062.java 8146446 windows-all
 javax/swing/JComboBox/8182031/ComboPopupTest.java 8196465 linux-all,macosx-all
 javax/swing/JFileChooser/6738668/bug6738668.java 8194946 generic-all
-javax/swing/JFileChooser/8021253/bug8021253.java 8169954 windows-all,linux-all,macosx-all
 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

test/jdk/javax/swing/JFileChooser/8021253/bug8021253.java

@@ -47,42 +47,49 @@ public class bug8021253 {
     private static volatile boolean defaultKeyPressed;
     private static JFileChooser fileChooser;
     private static File file;
+    private static JFrame frame;
 
     public static void main(String[] args) throws Exception {
+        try {
+            Robot robot = new Robot();
+            robot.setAutoDelay(100);
 
-        Robot robot = new Robot();
-        robot.setAutoDelay(50);
-
-        SwingUtilities.invokeAndWait(new Runnable() {
-            public void run() {
-                createAndShowGUI();
-            }
-        });
+            SwingUtilities.invokeAndWait(new Runnable() {
+                public void run() {
+                    createAndShowGUI();
+                }
+            });
 
-        robot.waitForIdle();
+            robot.waitForIdle();
+            robot.delay(1000);
 
-        SwingUtilities.invokeAndWait(new Runnable() {
-            public void run() {
-                fileChooser.setSelectedFile(file);
-            }
-        });
+            SwingUtilities.invokeAndWait(new Runnable() {
+                public void run() {
+                    fileChooser.setSelectedFile(file);
+                }
+            });
 
-        robot.waitForIdle();
+            robot.waitForIdle();
 
-        robot.keyPress(KeyEvent.VK_ENTER);
-        robot.keyRelease(KeyEvent.VK_ENTER);
-        robot.waitForIdle();
+            robot.keyPress(KeyEvent.VK_ENTER);
+            robot.keyRelease(KeyEvent.VK_ENTER);
+            robot.waitForIdle();
 
-        if (!defaultKeyPressed) {
-            throw new RuntimeException("Default button is not pressed");
+            if (!defaultKeyPressed) {
+                throw new RuntimeException("Default button is not pressed");
+            }
+        } finally {
+            if (frame != null) {
+                SwingUtilities.invokeAndWait(frame::dispose);
+            }
         }
     }
 
     private static void createAndShowGUI() {
 
         file = getTempFile();
 
-        final JFrame frame = new JFrame("Test");
+        frame = new JFrame("Test");
         frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
         frame.setSize(200, 300);
 
@@ -97,6 +104,7 @@ public void actionPerformed(ActionEvent e) {
 
         frame.getContentPane().add(BorderLayout.CENTER, fileChooser);
         frame.setSize(fileChooser.getPreferredSize());
+        frame.setLocationRelativeTo(null);
         frame.setVisible(true);
     }