From 35285891f6c6884e8fe6eb83cdb0292186c8417f Mon Sep 17 00:00:00 2001
From: Harshitha Onkar <harshitha.onkar@oracle.com>
Date: Wed, 5 Nov 2025 16:57:29 -0800
Subject: [PATCH 1/2] test update

---
 test/jdk/javax/swing/JFileChooser/bug4759934.java | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/test/jdk/javax/swing/JFileChooser/bug4759934.java b/test/jdk/javax/swing/JFileChooser/bug4759934.java
index 08ccdebfb2be0..94422792890f1 100644
--- a/test/jdk/javax/swing/JFileChooser/bug4759934.java
+++ b/test/jdk/javax/swing/JFileChooser/bug4759934.java
@@ -31,6 +31,8 @@
  * @run main bug4759934
  */
 
+import java.awt.Component;
+import java.awt.Container;
 import java.awt.Dialog;
 import java.awt.Point;
 import java.awt.Robot;
@@ -72,8 +74,10 @@ public static void main(String[] args) throws Exception {
             robot.mouseRelease(MouseEvent.BUTTON1_DOWN_MASK);
             robot.delay(500);
 
-            robot.keyPress(KeyEvent.VK_ESCAPE);
-            robot.keyRelease(KeyEvent.VK_ESCAPE);
+            SwingUtilities.invokeAndWait(() -> {
+                JButton cancelBtn = findCancelButton(jfc);
+                cancelBtn.doClick();
+            });
             robot.delay(500);
 
             SwingUtilities.invokeAndWait(() -> {
@@ -121,4 +125,11 @@ private static void createDialog() {
         dlg.setLocation(fr.getX() + fr.getWidth() + 10, fr.getY());
         dlg.setVisible(true);
     }
+
+    private static JButton findCancelButton(final Container container) {
+        Component result = Util.findComponent(container,
+                                              c -> c instanceof JButton button
+                                                   && "Cancel".equals(button.getText()));
+        return (JButton) result;
+    }
 }

From f2d59e995f1e4bb17159aa3ca1ac8c18150a73eb Mon Sep 17 00:00:00 2001
From: Harshitha Onkar <harshitha.onkar@oracle.com>
Date: Fri, 7 Nov 2025 11:56:22 -0800
Subject: [PATCH 2/2] unused import

---
 test/jdk/javax/swing/JFileChooser/bug4759934.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/test/jdk/javax/swing/JFileChooser/bug4759934.java b/test/jdk/javax/swing/JFileChooser/bug4759934.java
index 94422792890f1..c7f340ccdd0b1 100644
--- a/test/jdk/javax/swing/JFileChooser/bug4759934.java
+++ b/test/jdk/javax/swing/JFileChooser/bug4759934.java
@@ -36,7 +36,6 @@
 import java.awt.Dialog;
 import java.awt.Point;
 import java.awt.Robot;
-import java.awt.event.KeyEvent;
 import java.awt.event.MouseEvent;
 import javax.swing.JButton;
 import javax.swing.JDialog;