8341447: Open source closed frame tests # 5

Reviewed-by: honkar

test/jdk/ProblemList.txt

@@ -121,8 +121,9 @@ java/awt/Focus/AutoRequestFocusTest/AutoRequestFocusToFrontTest.java 6848406 gen
 java/awt/Focus/AutoRequestFocusTest/AutoRequestFocusSetVisibleTest.java 6848407 generic-all
 java/awt/Frame/MaximizedUndecorated/MaximizedUndecorated.java 8022302 generic-all
 java/awt/Frame/RestoreToOppositeScreen/RestoreToOppositeScreen.java 8286840 linux-all
-java/awt/Frame/InitialIconifiedTest.java 8203920 macosx-all,linux-all
+java/awt/Frame/InitialIconifiedTest.java 7144049,8203920 macosx-all,linux-all
 java/awt/Frame/ShapeNotSetSometimes/ShapeNotSetSometimes.java 8341370 macosx-all
+java/awt/Frame/FocusTest.java 8341480 macosx-all
 java/awt/FileDialog/FileDialogIconTest/FileDialogIconTest.java 8160558 windows-all
 java/awt/event/MouseWheelEvent/InfiniteRecursion/InfiniteRecursion.java 8060176 windows-all,macosx-all
 java/awt/event/MouseWheelEvent/InfiniteRecursion/InfiniteRecursion_1.java 8060176 windows-all,macosx-all

test/jdk/java/awt/Frame/FocusTest.java

@@ -0,0 +1,151 @@
+/*
+ * Copyright (c) 1999, 2024, 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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.awt.Canvas;
+import java.awt.Color;
+import java.awt.Dimension;
+import java.awt.Frame;
+import java.awt.Graphics;
+import java.awt.GridLayout;
+import java.awt.Panel;
+import java.awt.Window;
+import java.awt.event.FocusEvent;
+import java.awt.event.FocusListener;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+import java.awt.event.WindowAdapter;
+import java.awt.event.WindowEvent;
+
+/*
+ * @test
+ * @bug 4140293
+ * @summary Tests that focus is returned to the correct Component when a Frame
+ *          is reactivated.
+ * @library /java/awt/regtesthelpers
+ * @build PassFailJFrame
+ * @run main/manual FocusTest
+ */
+
+public class FocusTest {
+    private static final String INSTRUCTIONS = """
+              Click on the bottom rectangle. Move the mouse slightly.
+              A focus rectangle should appear around the bottom rectangle.
+
+              Now, deactivate the window and then reactivate it.
+              (You would click on the caption bar of another window,
+              and then on the caption bar of the FocusTest Frame.)
+
+              If the focus rectangle appears again, the test passes.
+              If it does not appear, or appears around the top rectangle,
+              the test fails.
+              """;
+
+    public static void main(String[] args) throws Exception {
+        PassFailJFrame.builder()
+                .title("FocusTest Instructions")
+                .instructions(INSTRUCTIONS)
+                .columns(45)
+                .logArea(6)
+                .testUI(FocusTest::createAndShowUI)
+                .build()
+                .awaitAndCheck();
+    }
+
+    private static Window createAndShowUI() {
+        Frame frame = new Frame("FocusTest");
+
+        frame.add(new FocusTestPanel());
+        frame.setSize(400, 400);
+
+        frame.addWindowListener(new WindowAdapter() {
+            public void windowClosing(WindowEvent e) {
+                frame.dispose();
+            }
+        });
+
+        frame.validate();
+        return frame;
+    }
+
+    private static class FocusTestPanel extends Panel {
+        PassiveClient pc1 = new PassiveClient("pc1");
+        PassiveClient pc2 = new PassiveClient("pc2");
+
+        public FocusTestPanel() {
+            super();
+            setLayout(new GridLayout(2, 1, 10, 10));
+            add(pc1);
+            add(pc2);
+        }
+    }
+
+    private static class PassiveClient extends Canvas implements FocusListener {
+        boolean haveFocus = false;
+        final String name;
+
+        PassiveClient(String name) {
+            super();
+            this.name = name;
+            setSize(400, 100);
+            setBackground(Color.cyan);
+            setVisible(true);
+            setEnabled(true);
+            addMouseListener(new MouseAdapter() {
+                @Override
+                public void mouseClicked(MouseEvent e) {
+                    requestFocus();
+                }
+            });
+            addFocusListener(this);
+        }
+
+        public void paint(Graphics g) {
+            g.setColor(getBackground());
+            Dimension size = getSize();
+            g.fillRect(0, 0, size.width, size.height);
+            if (haveFocus) {
+                g.setColor(Color.black);
+                g.drawRect(0, 0, size.width - 1, size.height - 1);
+                g.drawRect(1, 1, size.width - 3, size.height - 3);
+            }
+            g.setColor(getForeground());
+        }
+
+        public void focusGained(FocusEvent event) {
+            haveFocus = true;
+            paint(getGraphics());
+            PassFailJFrame.log("<<<< %s Got focus!! %s>>>>".formatted(this, event));
+        }
+
+        public void focusLost(FocusEvent event) {
+            haveFocus = false;
+            paint(getGraphics());
+            PassFailJFrame.log("<<<< %s Lost focus!! %s>>>>".formatted(this, event));
+        }
+
+        @Override
+        public String toString() {
+            return "PassiveClient " + name;
+        }
+    }
+}

test/jdk/java/awt/Frame/InitialIconifiedTest.java

@@ -50,36 +50,75 @@ public class InitialIconifiedTest {
 
     private static Robot robot;
 
+    private static final StringBuilder FAILURES = new StringBuilder();
+
     public static void main(String[] args) throws Exception {
         robot = new Robot();
-
         try {
-            EventQueue.invokeAndWait(InitialIconifiedTest::initAndShowGui);
+            EventQueue.invokeAndWait(InitialIconifiedTest::initAndShowBackground);
             robot.waitForIdle();
             robot.delay(500);
-            test();
+
+            test(false);
+            test(true);
         } finally {
             EventQueue.invokeAndWait(() -> {
                 backgroundFrame.dispose();
                 testedFrame.dispose();
             });
         }
+
+        if (!FAILURES.isEmpty()) {
+            throw new RuntimeException(FAILURES.toString());
+        }
+    }
+
+    private static void test(boolean isUndecorated) throws Exception {
+        String prefix = isUndecorated ? "undecorated" : "decorated";
+
+        EventQueue.invokeAndWait(() -> initAndShowTestedFrame(isUndecorated));
+        // On macos, we can observe the animation of the window from the initial
+        // NORMAL state to the ICONIFIED state,
+        // even if the window was created in the ICONIFIED state.
+        // The following delay is commented out to capture this animation
+        // robot.waitForIdle();
+        // robot.delay(500);
+        if (!testIfIconified(prefix + "_no_extra_delay")) {
+            FAILURES.append("Case %s frame with no extra delay failed\n"
+                    .formatted(isUndecorated ? "undecorated" : "decorated"));
+        }
+
+        EventQueue.invokeAndWait(() -> initAndShowTestedFrame(isUndecorated));
+        robot.waitForIdle();
+        robot.delay(500);
+        if (!testIfIconified(prefix + "_with_extra_delay")) {
+            FAILURES.append("Case %s frame with extra delay failed\n"
+                    .formatted(isUndecorated ? "undecorated" : "decorated"));
+        }
     }
 
-    private static void initAndShowGui() {
+    private static void initAndShowBackground() {
         backgroundFrame = new Frame("DisposeTest background");
         backgroundFrame.setUndecorated(true);
         backgroundFrame.setBackground(Color.RED);
         backgroundFrame.setBounds(backgroundFrameBounds);
         backgroundFrame.setVisible(true);
+    }
 
+    private static void initAndShowTestedFrame(boolean isUndecorated) {
+        if (testedFrame != null) {
+            testedFrame.dispose();
+        }
         testedFrame = new Frame("Should have started ICONIC");
+        if (isUndecorated) {
+            testedFrame.setUndecorated(true);
+        }
         testedFrame.setExtendedState(Frame.ICONIFIED);
         testedFrame.setBounds(testedFrameBounds);
         testedFrame.setVisible(true);
     }
 
-    private static void test() {
+    private static boolean testIfIconified(String prefix) {
         BufferedImage bi = robot.createScreenCapture(backgroundFrameBounds);
         int redPix = Color.RED.getRGB();
 
@@ -88,11 +127,12 @@ private static void test() {
                 if (bi.getRGB(x, y) != redPix) {
                     try {
                         ImageIO.write(bi, "png",
-                                new File("failure.png"));
+                                new File(prefix + "_failure.png"));
                     } catch (IOException ignored) {}
-                    throw new RuntimeException("Test failed");
+                    return false;
                 }
             }
         }
+        return true;
     }
 }