diff --git a/test/jdk/javax/swing/JOptionPane/8024926/bug8024926.html b/test/jdk/javax/swing/JOptionPane/8024926/bug8024926.html
deleted file mode 100644
index e63e0ea768be7..0000000000000
--- a/test/jdk/javax/swing/JOptionPane/8024926/bug8024926.html
+++ /dev/null
@@ -1,32 +0,0 @@
-<!--
- Copyright (c) 2013, 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.
--->
-
-<html>
- <head>
- <title>High resolution icon test, bug ID 8024926</title>
- </head>
- <body>
- <applet CODE="bug8024926.class" WIDTH=300 HEIGHT=100></applet>
- <p> See the dialog box (usually in upper left corner) for instructions</p>
-</body>
-</html>
diff --git a/test/jdk/javax/swing/JOptionPane/8024926/bug8024926.java b/test/jdk/javax/swing/JOptionPane/8024926/bug8024926.java
deleted file mode 100644
index 89aa754be884b..0000000000000
--- a/test/jdk/javax/swing/JOptionPane/8024926/bug8024926.java
+++ /dev/null
@@ -1,212 +0,0 @@
-/*
- * Copyright (c) 2013, 2018, 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.Dialog;
-import java.awt.EventQueue;
-import java.awt.Frame;
-import java.awt.TextArea;
-import javax.swing.JApplet;
-import javax.swing.JOptionPane;
-
-import jdk.test.lib.Platform;
-
-/**
- * @test
- * @bug 8024926 8040279
- * @summary [macosx] AquaIcon HiDPI support
- * @author Alexander Scherbatiy
- * @library /test/lib
- * @build jdk.test.lib.Platform
- * @run applet/manual=yesno bug8024926.html
- */
-public class bug8024926 extends JApplet {
- //Declare things used in the test, like buttons and labels here
-
- public void init() {
- //Create instructions for the user here, as well as set up
- // the environment -- set the layout manager, add buttons,
- // etc.
- this.setLayout(new BorderLayout());
-
-
- if (Platform.isOSX()) {
- String[] instructions = {
- "Verify that high resolution system icons are used"
- + " in JOptionPane on HiDPI displays.",
- "1) Run the test on Retina display or enable the Quartz Debug"
- + " and select the screen resolution with (HiDPI) label",
- "2) Check that the error icon on the JOptionPane is smooth",
- "If so, press PASS, else press FAIL."
- };
- Sysout.createDialogWithInstructions(instructions);
-
- } else {
- String[] instructions = {
- "This test is not applicable to the current platform. Press PASS."
- };
- Sysout.createDialogWithInstructions(instructions);
- }
-
-
- }//End init()
-
- public void start() {
- //Get things going. Request focus, set size, et cetera
- setSize(200, 200);
- setVisible(true);
- validate();
- EventQueue.invokeLater(new Runnable() {
-
- public void run() {
- createAndShowGUI();
- }
- });
- }// start()
-
- //The rest of this class is the actions which perform the test...
- //Use Sysout.println to communicate with the user NOT System.out!!
- //Sysout.println ("Something Happened!");
- private static void createAndShowGUI() {
- JOptionPane.showMessageDialog(null,
- "Icons should have high resolution.",
- "High resolution icon test.",
- JOptionPane.ERROR_MESSAGE);
- }
-}// class BlockedWindowTest
-
-/* Place other classes related to the test after this line */
-/**
- * **************************************************
- * Standard Test Machinery DO NOT modify anything below -- it's a standard chunk
- * of code whose purpose is to make user interaction uniform, and thereby make
- * it simpler to read and understand someone else's test.
- * **************************************************
- */
-/**
- * This is part of the standard test machinery. It creates a dialog (with the
- * instructions), and is the interface for sending text messages to the user. To
- * print the instructions, send an array of strings to Sysout.createDialog
- * WithInstructions method. Put one line of instructions per array entry. To
- * display a message for the tester to see, simply call Sysout.println with the
- * string to be displayed. This mimics System.out.println but works within the
- * test harness as well as standalone.
- */
-class Sysout {
-
- private static TestDialog dialog;
-
- public static void createDialogWithInstructions(String[] instructions) {
- dialog = new TestDialog(new Frame(), "Instructions");
- dialog.printInstructions(instructions);
- dialog.setVisible(true);
- println("Any messages for the tester will display here.");
- }
-
- public static void createDialog() {
- dialog = new TestDialog(new Frame(), "Instructions");
- String[] defInstr = {"Instructions will appear here. ", ""};
- dialog.printInstructions(defInstr);
- dialog.setVisible(true);
- println("Any messages for the tester will display here.");
- }
-
- public static void printInstructions(String[] instructions) {
- dialog.printInstructions(instructions);
- }
-
- public static void println(String messageIn) {
- dialog.displayMessage(messageIn);
- }
-}// Sysout class
-
-/**
- * This is part of the standard test machinery. It provides a place for the test
- * instructions to be displayed, and a place for interactive messages to the
- * user to be displayed. To have the test instructions displayed, see Sysout. To
- * have a message to the user be displayed, see Sysout. Do not call anything in
- * this dialog directly.
- */
-class TestDialog extends Dialog {
-
- TextArea instructionsText;
- TextArea messageText;
- int maxStringLength = 80;
-
- //DO NOT call this directly, go through Sysout
- public TestDialog(Frame frame, String name) {
- super(frame, name);
- int scrollBoth = TextArea.SCROLLBARS_BOTH;
- instructionsText = new TextArea("", 15, maxStringLength, scrollBoth);
- add("North", instructionsText);
-
- messageText = new TextArea("", 5, maxStringLength, scrollBoth);
- add("Center", messageText);
-
- pack();
-
- setVisible(true);
- }// TestDialog()
-
- //DO NOT call this directly, go through Sysout
- public void printInstructions(String[] instructions) {
- //Clear out any current instructions
- instructionsText.setText("");
-
- //Go down array of instruction strings
-
- String printStr, remainingStr;
- for (int i = 0; i < instructions.length; i++) {
- //chop up each into pieces maxSringLength long
- remainingStr = instructions[ i];
- while (remainingStr.length() > 0) {
- //if longer than max then chop off first max chars to print
- if (remainingStr.length() >= maxStringLength) {
- //Try to chop on a word boundary
- int posOfSpace = remainingStr.lastIndexOf(' ', maxStringLength - 1);
-
- if (posOfSpace <= 0) {
- posOfSpace = maxStringLength - 1;
- }
-
- printStr = remainingStr.substring(0, posOfSpace + 1);
- remainingStr = remainingStr.substring(posOfSpace + 1);
- } //else just print
- else {
- printStr = remainingStr;
- remainingStr = "";
- }
-
- instructionsText.append(printStr + "\n");
-
- }// while
-
- }// for
-
- }//printInstructions()
-
- //DO NOT call this directly, go through Sysout
- public void displayMessage(String messageIn) {
- messageText.append(messageIn + "\n");
- System.out.println(messageIn);
- }
-}// TestDialog class
diff --git a/test/jdk/javax/swing/JOptionPane/bug8024926.java b/test/jdk/javax/swing/JOptionPane/bug8024926.java
new file mode 100644
index 0000000000000..667e21f39f5b4
--- /dev/null
+++ b/test/jdk/javax/swing/JOptionPane/bug8024926.java
@@ -0,0 +1,71 @@
+/*
+ * Copyright (c) 2013, 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.BorderLayout;
+import java.awt.Dialog;
+import java.awt.EventQueue;
+import java.awt.Frame;
+import java.awt.TextArea;
+import javax.swing.JDialog;
+import javax.swing.JOptionPane;
+import javax.swing.SwingUtilities;
+
+/**
+ * @test
+ * @bug 8024926 8040279
+ * @requires (os.family == "mac")
+ * @summary [macosx] AquaIcon HiDPI support
+ * @library /java/awt/regtesthelpers
+ * @build PassFailJFrame
+ * @run main/manual bug8024926
+ */
+public class bug8024926 {
+
+ private static final String INSTRUCTIONS = """
+ Verify that high resolution system icons are used
+ in JOptionPane on HiDPI displays.
+ 1) Run the test on Retina display or enable the Quartz Debug
+ and select the screen resolution with (HiDPI) label.
+ "2) Check that the error icon on the JOptionPane is smooth.
+ "If so, press PASS, else press FAIL.""";
+
+ public static void main(String[] args) throws Exception {
+ PassFailJFrame.builder()
+ .title("AquaIcon HIDPI Instructions")
+ .instructions(INSTRUCTIONS)
+ .rows(10)
+ .columns(35)
+ .testUI(bug8024926::createTestUI)
+ .build()
+ .awaitAndCheck();
+ }
+
+ private static JDialog createTestUI() {
+ JOptionPane optionPane = new JOptionPane("High resolution icon test");
+ optionPane.setMessage("Icons should have high resolutions");
+ optionPane.setMessageType(JOptionPane.ERROR_MESSAGE);
+ JDialog dialog = new JDialog();
+ dialog.setContentPane(optionPane);
+ dialog.pack();
+ return dialog;
+ }
+}