diff --git a/test/jdk/javax/swing/JColorChooser/Test4887836.html b/test/jdk/javax/swing/JColorChooser/Test4887836.html
deleted file mode 100644
index 68192afdbcbc4..0000000000000
--- a/test/jdk/javax/swing/JColorChooser/Test4887836.html
+++ /dev/null
@@ -1,32 +0,0 @@
-<!--
- Copyright (c) 2003, 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>
-<body>
-If you do not see white area under swatches,
-then test passed, otherwise it failed.
-
-<applet width="500" height="400" code="Test4887836.class">
-</applet>
-</body>
-</html>
diff --git a/test/jdk/javax/swing/JColorChooser/Test4887836.java b/test/jdk/javax/swing/JColorChooser/Test4887836.java
index 9972b5fe08509..4043dbdd88ae6 100644
--- a/test/jdk/javax/swing/JColorChooser/Test4887836.java
+++ b/test/jdk/javax/swing/JColorChooser/Test4887836.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 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
@@ -21,23 +21,42 @@
* questions.
*/
+import java.awt.Color;
+import java.awt.Font;
+import javax.swing.JColorChooser;
+import javax.swing.UIManager;
+
/*
* @test
* @bug 4887836
- * @summary Checks if no tooltip modification when no KeyStroke modifier
- * @author Konstantin Eremin
- * @run applet/manual=yesno Test4887836.html
+ * @library /java/awt/regtesthelpers
+ * @build PassFailJFrame
+ * @summary Checks for white area under the JColorChooser Swatch tab
+ * @run main/manual Test4887836
*/
-import java.awt.Color;
-import java.awt.Font;
-import javax.swing.JApplet;
-import javax.swing.JColorChooser;
-import javax.swing.UIManager;
+public class Test4887836 {
+
+ public static void main(String[] args) throws Exception {
+ String instructions = """
+ If you do not see white area under the \"Swatches\" tab,
+ then test passed, otherwise it failed.""";
+
+ PassFailJFrame.builder()
+ .title("Test4759306")
+ .instructions(instructions)
+ .rows(5)
+ .columns(40)
+ .testTimeOut(10)
+ .testUI(Test4887836::createColorChooser)
+ .build()
+ .awaitAndCheck();
+ }
+
+ private static JColorChooser createColorChooser() {
+ JColorChooser chooser = new JColorChooser(Color.LIGHT_GRAY);
-public class Test4887836 extends JApplet {
- public void init() {
- UIManager.put("Label.font", new Font("Perpetua", 0, 36)); // NON-NLS: property and font names
- add(new JColorChooser(Color.LIGHT_GRAY));
+ UIManager.put("Label.font", new Font("Font.DIALOG", 0, 36));
+ return chooser;
}
}