From cc6110aa2530e6a1ce0ae09ec26b4593d364bed4 Mon Sep 17 00:00:00 2001
From: Alisen Chung <alisen.chung@oracle.com>
Date: Mon, 18 Mar 2024 13:05:01 -0700
Subject: [PATCH 1/3] init commit

---
 .../swing/JColorChooser/Test6348456.java      | 66 ++++++++++++-------
 1 file changed, 44 insertions(+), 22 deletions(-)

diff --git a/test/jdk/javax/swing/JColorChooser/Test6348456.java b/test/jdk/javax/swing/JColorChooser/Test6348456.java
index c6d34e45582b7..24ee44ecef4a9 100644
--- a/test/jdk/javax/swing/JColorChooser/Test6348456.java
+++ b/test/jdk/javax/swing/JColorChooser/Test6348456.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 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,43 +21,65 @@
  * questions.
  */
 
-/*
- * @test
- * @bug 6348456
- * @summary Tests model changing
- * @author Sergey Malenkov
- * @run applet/manual=yesno Test6348456.html
- */
-
 import java.awt.BorderLayout;
 import java.awt.Color;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
-import javax.swing.JApplet;
 import javax.swing.JButton;
 import javax.swing.JColorChooser;
+import javax.swing.JFrame;
 import javax.swing.colorchooser.DefaultColorSelectionModel;
 
-public final class Test6348456 extends JApplet implements ActionListener {
+/*
+ * @test
+ * @bug 6348456
+ * @library /java/awt/regtesthelpers
+ * @build PassFailJFrame
+ * @summary Tests model changing
+ * @run main/manual Test6348456
+ */
+
+public final class Test6348456 {
 
     private static final DefaultColorSelectionModel WHITE = new DefaultColorSelectionModel(Color.WHITE);
     private static final DefaultColorSelectionModel BLACK = new DefaultColorSelectionModel(Color.BLACK);
 
-    private JColorChooser chooser;
+    private static JColorChooser chooser;
+
+    public static void main(String[] args) throws Exception {
+        String instructions = "When test starts, you'll see that the preview is white.\n" +
+                "When you swap models, you'll see that the preview color is changed.\n" +
+                "Click pass if so, otherwise fail.";
 
-    @Override
-    public void init() {
+        PassFailJFrame.builder()
+                .title("Test6348456")
+                .instructions(instructions)
+                .rows(5)
+                .columns(40)
+                .testTimeOut(10)
+                .testUI(Test6348456::test)
+                .build()
+                .awaitAndCheck();
+    }
+
+    public static JFrame test() {
+        JFrame frame = new JFrame("temp");
         JButton button = new JButton("Swap models");
-        button.addActionListener(this);
+        button.addActionListener(new ActionListener() {
+            @Override
+            public void actionPerformed(ActionEvent event) {
+                chooser.setSelectionModel(chooser.getSelectionModel() == BLACK ? WHITE : BLACK);
 
-        this.chooser = new JColorChooser(Color.RED);
-        this.chooser.setSelectionModel(WHITE);
+            }
+        });
 
-        add(BorderLayout.NORTH, button);
-        add(BorderLayout.CENTER, this.chooser);
-    }
+        chooser = new JColorChooser(Color.RED);
+        chooser.setSelectionModel(WHITE);
+
+        frame.add(BorderLayout.NORTH, button);
+        frame.add(BorderLayout.CENTER, chooser);
+        frame.pack();
 
-    public void actionPerformed(ActionEvent event){
-        this.chooser.setSelectionModel(this.chooser.getSelectionModel() == BLACK ? WHITE : BLACK);
+        return frame;
     }
 }

From c6e99a27afc56b6dbe99f59dcbae493d3adb2849 Mon Sep 17 00:00:00 2001
From: Alisen Chung <alisen.chung@oracle.com>
Date: Mon, 18 Mar 2024 13:07:12 -0700
Subject: [PATCH 2/3] remove html

---
 .../swing/JColorChooser/Test6348456.html      | 32 -------------------
 1 file changed, 32 deletions(-)
 delete mode 100644 test/jdk/javax/swing/JColorChooser/Test6348456.html

diff --git a/test/jdk/javax/swing/JColorChooser/Test6348456.html b/test/jdk/javax/swing/JColorChooser/Test6348456.html
deleted file mode 100644
index d4a49c0f24608..0000000000000
--- a/test/jdk/javax/swing/JColorChooser/Test6348456.html
+++ /dev/null
@@ -1,32 +0,0 @@
-<!--
- Copyright (c) 2008, 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>
-When applet starts, you'll see that the preview is white.
-When you swap models, you'll see that the preview color is changed.
-
-<applet width="500" height="400" code="Test6348456.class">
-</applet>
-</body>
-</html>

From ff633d323e6df6fca8d83918809b6b2acfd8f8d9 Mon Sep 17 00:00:00 2001
From: Alisen Chung <alisen.chung@oracle.com>
Date: Mon, 25 Mar 2024 09:48:14 -0700
Subject: [PATCH 3/3] fix line length and frame title

---
 test/jdk/javax/swing/JColorChooser/Test6348456.java | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/test/jdk/javax/swing/JColorChooser/Test6348456.java b/test/jdk/javax/swing/JColorChooser/Test6348456.java
index 24ee44ecef4a9..b1830979295b1 100644
--- a/test/jdk/javax/swing/JColorChooser/Test6348456.java
+++ b/test/jdk/javax/swing/JColorChooser/Test6348456.java
@@ -41,8 +41,10 @@
 
 public final class Test6348456 {
 
-    private static final DefaultColorSelectionModel WHITE = new DefaultColorSelectionModel(Color.WHITE);
-    private static final DefaultColorSelectionModel BLACK = new DefaultColorSelectionModel(Color.BLACK);
+    private static final DefaultColorSelectionModel WHITE =
+            new DefaultColorSelectionModel(Color.WHITE);
+    private static final DefaultColorSelectionModel BLACK =
+            new DefaultColorSelectionModel(Color.BLACK);
 
     private static JColorChooser chooser;
 
@@ -63,7 +65,7 @@ public static void main(String[] args) throws Exception {
     }
 
     public static JFrame test() {
-        JFrame frame = new JFrame("temp");
+        JFrame frame = new JFrame("JColor Swap Models Test");
         JButton button = new JButton("Swap models");
         button.addActionListener(new ActionListener() {
             @Override