diff --git a/test/jdk/java/awt/Frame/DefaultSizeTest.java b/test/jdk/java/awt/Frame/DefaultSizeTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..62080c3cb38f54c901cc34d6f466114c41bbdc41
--- /dev/null
+++ b/test/jdk/java/awt/Frame/DefaultSizeTest.java
@@ -0,0 +1,67 @@
+/*
+ * Copyright (c) 1998, 2023, 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.EventQueue;
+import java.awt.Frame;
+
+/*
+ * @test 4033151
+ * @summary Test that frame default size is minimum possible size
+ * @library /java/awt/regtesthelpers
+ * @build PassFailJFrame
+ * @run main/manual DefaultSizeTest
+ */
+
+public class DefaultSizeTest {
+
+ private static final String INSTRUCTIONS = """
+ An empty frame is created.
+ It should be located to the right of this window
+ and should be the minimum size allowed by the window manager.
+ For any WM, the frame should be very small.
+ If the frame is not large, click Pass or Fail otherwise.
+ """;
+
+
+ public static void main(String[] args) throws Exception {
+ PassFailJFrame passFailJFrame = new PassFailJFrame.Builder()
+ .title("DefaultSizeTest Instructions Frame")
+ .instructions(INSTRUCTIONS)
+ .testTimeOut(5)
+ .rows(10)
+ .columns(45)
+ .build();
+
+ EventQueue.invokeAndWait(() -> {
+ Frame frame = new Frame("DefaultSize");
+
+ PassFailJFrame.addTestWindow(frame);
+ PassFailJFrame
+ .positionTestWindow(frame, PassFailJFrame.Position.HORIZONTAL);
+
+ frame.setVisible(true);
+ });
+
+ passFailJFrame.awaitAndCheck();
+ }
+}
diff --git a/test/jdk/java/awt/LightweightComponent/LightweightCliprect.java b/test/jdk/java/awt/LightweightComponent/LightweightCliprect.java
new file mode 100644
index 0000000000000000000000000000000000000000..a6b1e3bc95c5b8d89c891d87af21e72eeaf058c7
--- /dev/null
+++ b/test/jdk/java/awt/LightweightComponent/LightweightCliprect.java
@@ -0,0 +1,120 @@
+/*
+ * Copyright (c) 1998, 2023, 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.Color;
+import java.awt.Component;
+import java.awt.Container;
+import java.awt.Dimension;
+import java.awt.EventQueue;
+import java.awt.FlowLayout;
+import java.awt.Frame;
+import java.awt.Graphics;
+import java.awt.Rectangle;
+import java.awt.Shape;
+
+/*
+ * @test
+ * @bug 4116029
+ * @summary drawString does not honor clipping regions for lightweight components
+ * @library /java/awt/regtesthelpers
+ * @build PassFailJFrame
+ * @run main/manual LightweightCliprect
+ */
+
+public class LightweightCliprect {
+
+ private static final String INSTRUCTIONS = """
+ If some text is drawn outside the red rectangle, press "Fail" button.
+ Otherwise, press "Pass" button.
+ """;
+
+ public static void main(String[] args) throws Exception {
+ PassFailJFrame passFailJFrame = new PassFailJFrame.Builder()
+ .title("LightweightCliprect Instructions Frame")
+ .instructions(INSTRUCTIONS)
+ .testTimeOut(5)
+ .rows(10)
+ .columns(45)
+ .build();
+
+ EventQueue.invokeAndWait(() -> {
+ Frame frame = new Frame("DefaultSize");
+
+ Container panel = new MyContainer();
+ MyComponent c = new MyComponent();
+ panel.add(c);
+
+ frame.add(panel);
+ frame.setSize(400, 300);
+
+ PassFailJFrame.addTestWindow(frame);
+ PassFailJFrame
+ .positionTestWindow(frame, PassFailJFrame.Position.HORIZONTAL);
+
+ frame.setVisible(true);
+ });
+
+ passFailJFrame.awaitAndCheck();
+ }
+}
+
+class MyComponent extends Component {
+
+ public void paint(Graphics g) {
+ Color c = g.getColor();
+ g.setColor(Color.red);
+ g.fillRect(20, 20, 400, 200);
+ Shape clip = g.getClip();
+ g.setClip(20, 20, 400, 200);
+ //draw the current java version in the component
+ g.setColor(Color.black);
+ String version = System.getProperty("java.version");
+ String vendor = System.getProperty("java.vendor");
+ int y = 10;
+ for(int i = 0; i < 30; i++) {
+ g.drawString("Lightweight: Java version: " + version +
+ ", Vendor: " + vendor, 10, y += 20);
+ }
+ g.setColor(c);
+ g.setClip(clip);
+ super.paint(g);
+ }
+
+ public Dimension getPreferredSize() {
+ return new Dimension(300, 300);
+ }
+}
+
+class MyContainer extends Container {
+ public MyContainer() {
+ super();
+ setLayout(new FlowLayout());
+ }
+
+ public void paint(Graphics g) {
+ Rectangle bounds = new Rectangle(getSize());
+ g.setColor(Color.cyan);
+ g.drawRect(bounds.x, bounds.y, bounds.width - 1, bounds.height - 1);
+ super.paint(g);
+ }
+}
diff --git a/test/jdk/java/awt/event/KeyEvent/FunctionKeyTest.java b/test/jdk/java/awt/event/KeyEvent/FunctionKeyTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..02e7a890d83e4198c889621489d8549629a24e64
--- /dev/null
+++ b/test/jdk/java/awt/event/KeyEvent/FunctionKeyTest.java
@@ -0,0 +1,136 @@
+/*
+ * Copyright (c) 1998, 2023, 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.BorderLayout;
+import java.awt.Button;
+import java.awt.Color;
+import java.awt.Event;
+import java.awt.EventQueue;
+import java.awt.Frame;
+import java.awt.Label;
+import java.awt.Robot;
+import java.awt.TextArea;
+import java.awt.event.KeyEvent;
+
+/*
+ * @test
+ * @bug 4011219
+ * @summary Test for function key press/release received by Java client.
+ * @key headful
+ */
+
+public class FunctionKeyTest {
+ private static FunctionKeyTester frame;
+ private static Robot robot;
+
+ static volatile boolean keyPressReceived;
+ static volatile boolean keyReleaseReceived;
+
+ static final StringBuilder failures = new StringBuilder();
+
+ private static void testKey(int keyCode, String keyText) {
+ keyPressReceived = false;
+ keyReleaseReceived = false;
+
+ robot.keyPress(keyCode);
+
+ if (!keyPressReceived) {
+ failures.append(keyText).append(" key press is not received\n");
+ }
+
+ robot.keyRelease(keyCode);
+
+ if (!keyReleaseReceived) {
+ failures.append(keyText).append(" key release is not received\n");
+ }
+ }
+
+ public static void main(String[] args) throws Exception {
+ robot = new Robot();
+ robot.setAutoWaitForIdle(true);
+ robot.setAutoDelay(150);
+
+ try {
+ EventQueue.invokeAndWait(() -> {
+ frame = new FunctionKeyTester();
+ frame.setSize(200, 200);
+ frame.setLocationRelativeTo(null);
+ frame.setVisible(true);
+ });
+
+ robot.waitForIdle();
+ robot.delay(1000);
+
+ testKey(KeyEvent.VK_F11, "F11");
+ testKey(KeyEvent.VK_F12, "F12");
+ } finally {
+ EventQueue.invokeAndWait(() -> {
+ if (frame != null) {
+ frame.dispose();
+ }
+ });
+ }
+
+ if (failures.isEmpty()) {
+ System.out.println("Passed");
+ } else {
+ throw new RuntimeException(failures.toString());
+ }
+ }
+}
+
+class FunctionKeyTester extends Frame {
+ Label l = new Label ("NULL");
+ Button b = new Button();
+ TextArea log = new TextArea();
+
+ FunctionKeyTester() {
+ super("Function Key Test");
+ this.setLayout(new BorderLayout());
+ this.add(BorderLayout.NORTH, l);
+ this.add(BorderLayout.SOUTH, b);
+ this.add(BorderLayout.CENTER, log);
+ log.setFocusable(false);
+ log.setEditable(false);
+ l.setBackground(Color.red);
+ setSize(200, 200);
+ }
+
+ public boolean handleEvent(Event e) {
+ String message = "e.id=" + e.id + "\n";
+ System.out.print(message);
+ log.append(message);
+
+ switch (e.id) {
+ case 403 -> FunctionKeyTest.keyPressReceived = true;
+ case 404 -> FunctionKeyTest.keyReleaseReceived = true;
+ }
+
+ return super.handleEvent(e);
+ }
+
+ public boolean keyDown(Event e, int key) {
+ l.setText("e.key=" + Integer.valueOf(e.key).toString());
+ return false;
+ }
+}
diff --git a/test/jdk/javax/swing/JFrame/DefaultCloseOperation.java b/test/jdk/javax/swing/JFrame/DefaultCloseOperation.java
new file mode 100644
index 0000000000000000000000000000000000000000..098000a8bab6877dfd99e377644bc6def3425d3b
--- /dev/null
+++ b/test/jdk/javax/swing/JFrame/DefaultCloseOperation.java
@@ -0,0 +1,221 @@
+/*
+ * Copyright (c) 1998, 2023, 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.Frame;
+import java.awt.FlowLayout;
+import java.awt.Window;
+import java.awt.event.ItemEvent;
+import java.awt.event.WindowEvent;
+import javax.swing.JButton;
+import javax.swing.JComboBox;
+import javax.swing.JDialog;
+import javax.swing.JFrame;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+import javax.swing.SwingUtilities;
+import javax.swing.WindowConstants;
+
+/*
+ * @test
+ * @summary test for defaultCloseOperation property for Swing JFrame and JDialog
+ * @library /java/awt/regtesthelpers
+ * @build PassFailJFrame
+ * @run main/manual DefaultCloseOperation
+ */
+
+public class DefaultCloseOperation extends JPanel {
+
+ private static final String INSTRUCTIONS = """
+ Do the following steps:
+
+ - Click the "Open Frame" button (a TestFrame will appear)
+ - On the TestFrame, select "Close" from the system menu (the window should go away)
+ - Select "Do Nothing" from the "JFrame Default Close Operation" ComboBox
+ - Click the "Open Frame" button
+ - On the TestFrame, select "Close" from the system menu (the window should remain open)
+ - Select "Dispose" from the "JFrame Default Close Operation" ComboBox
+ - On the TestFrame, select "Close" from the system menu (the window should go away)
+
+
+ - Click the "Open Frame" button
+ - Click the "Open Dialog" button (a TestDialog will appear)
+ - On the TestDialog, select "Close" from the system menu (the window should go away)
+ - Select "Do Nothing" from the "JDialog Default Close Operation" ComboBox
+ - Click the "Open Dialog" button
+ - On the TestDialog, select "Close" from the system menu (the window should remain open)
+ - Select "Dispose" from the "JDialog Default Close Operation" ComboBox
+ - On the TestDialog, select "Close" from the system menu (the window should go away)
+ """;
+
+ JComboBox<String> frameCloseOp;
+
+ CloseOpDialog testDialog;
+ JComboBox<String> dialogCloseOp;
+
+ public static void main(String[] args) throws Exception {
+
+ PassFailJFrame passFailJFrame = new PassFailJFrame.Builder()
+ .title("DefaultCloseOperation Manual Test")
+ .instructions(INSTRUCTIONS)
+ .testTimeOut(5)
+ .rows(20)
+ .columns(70)
+ .build();
+
+ SwingUtilities.invokeAndWait(() -> {
+ DefaultCloseOperation dco = new DefaultCloseOperation();
+ dco.init();
+
+ JFrame frame = new JFrame("DefaultCloseOperation");
+ frame.add(dco);
+ frame.setSize(500,200);
+
+ PassFailJFrame.addTestWindow(frame);
+ PassFailJFrame
+ .positionTestWindow(frame, PassFailJFrame.Position.HORIZONTAL);
+
+ frame.setVisible(true);
+ });
+
+ passFailJFrame.awaitAndCheck();
+ }
+
+ public void init() {
+ setLayout(new FlowLayout());
+
+ CloseOpFrame testFrame = new CloseOpFrame();
+ testFrame.setLocationRelativeTo(null);
+ PassFailJFrame.addTestWindow(testFrame);
+
+ add(new JLabel("JFrame Default Close Operation:"));
+ frameCloseOp = new JComboBox<>();
+ frameCloseOp.addItem("Hide");
+ frameCloseOp.addItem("Do Nothing");
+ frameCloseOp.addItem("Dispose");
+ frameCloseOp.addItemListener(e -> {
+ if (e.getStateChange() == ItemEvent.SELECTED) {
+ String item = (String)e.getItem();
+ switch (item) {
+ case "Do Nothing" -> testFrame
+ .setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
+ case "Hide" -> testFrame
+ .setDefaultCloseOperation(WindowConstants.HIDE_ON_CLOSE);
+ case "Dispose" -> testFrame
+ .setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE);
+ }
+ }
+ });
+ add(frameCloseOp);
+
+ JButton b = new JButton("Open Frame...");
+ b.addActionListener(e -> testFrame.setVisible(true));
+ add(b);
+
+ testDialog = new CloseOpDialog(testFrame);
+ testDialog.setLocationRelativeTo(null);
+ PassFailJFrame.addTestWindow(testDialog);
+
+ add(new JLabel("JDialog Default Close Operation:"));
+ dialogCloseOp = new JComboBox<>();
+ dialogCloseOp.addItem("Hide");
+ dialogCloseOp.addItem("Do Nothing");
+ dialogCloseOp.addItem("Dispose");
+ dialogCloseOp.addItemListener(e -> {
+ if (e.getStateChange() == ItemEvent.SELECTED) {
+ String item = (String)e.getItem();
+ switch (item) {
+ case "Do Nothing" -> testDialog
+ .setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
+ case "Hide" -> testDialog
+ .setDefaultCloseOperation(WindowConstants.HIDE_ON_CLOSE);
+ case "Dispose" -> testDialog
+ .setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE);
+ }
+ }
+ });
+ add(dialogCloseOp);
+
+ b = new JButton("Open Dialog...");
+ b.addActionListener(e -> testDialog.setVisible(true));
+ add(b);
+ }
+
+ public static void verifyCloseOperation(Window window, int op) {
+ switch (op) {
+ case WindowConstants.DO_NOTHING_ON_CLOSE -> {
+ if (!window.isVisible()) {
+ PassFailJFrame
+ .forceFail("defaultCloseOperation=DoNothing failed");
+ }
+ }
+ case WindowConstants.HIDE_ON_CLOSE -> {
+ if (window.isVisible()) {
+ PassFailJFrame
+ .forceFail("defaultCloseOperation=Hide failed");
+ }
+ }
+ case WindowConstants.DISPOSE_ON_CLOSE -> {
+ if (window.isVisible() || window.isDisplayable()) {
+ PassFailJFrame
+ .forceFail("defaultCloseOperation=Dispose failed");
+ }
+ }
+ }
+ }
+}
+
+class CloseOpFrame extends JFrame {
+
+ public CloseOpFrame() {
+ super("DefaultCloseOperation Test");
+ getContentPane().add("Center", new JLabel("Test Frame"));
+ pack();
+ }
+
+ protected void processWindowEvent(WindowEvent e) {
+ super.processWindowEvent(e);
+
+ if (e.getID() == WindowEvent.WINDOW_CLOSING) {
+ DefaultCloseOperation
+ .verifyCloseOperation(this, getDefaultCloseOperation());
+ }
+ }
+}
+
+class CloseOpDialog extends JDialog {
+
+ public CloseOpDialog(Frame owner) {
+ super(owner, "DefaultCloseOperation Test Dialog");
+ getContentPane().add("Center", new JLabel("Test Dialog"));
+ pack();
+ }
+
+ protected void processWindowEvent(WindowEvent e) {
+ super.processWindowEvent(e);
+
+ if (e.getID() == WindowEvent.WINDOW_CLOSING) {
+ DefaultCloseOperation
+ .verifyCloseOperation(this, getDefaultCloseOperation());
+ }
+ }
+}