diff --git a/test/jdk/javax/swing/JColorChooser/8065098/JColorChooserDnDTest.java b/test/jdk/javax/swing/JColorChooser/8065098/JColorChooserDnDTest.java index fdd66248c18..96756394b4f 100644 --- a/test/jdk/javax/swing/JColorChooser/8065098/JColorChooserDnDTest.java +++ b/test/jdk/javax/swing/JColorChooser/8065098/JColorChooserDnDTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 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 @@ -34,21 +34,17 @@ import javax.swing.SwingUtilities; public class JColorChooserDnDTest { public static void main(String[] args) { - SwingUtilities.invokeLater(new Runnable() { - - @Override - public void run() { - JFrame frame = new JFrame(); - frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); - JPanel panel = new JPanel(); - JColorChooser colorChooser = new JColorChooser(); - colorChooser.setDragEnabled(true); - panel.setBorder(BorderFactory.createTitledBorder("JColorChoosers")); - panel.add(colorChooser); - frame.setContentPane(panel); - frame.pack(); - frame.setVisible(true); - } + SwingUtilities.invokeLater(() -> { + JFrame frame = new JFrame(); + frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); + JPanel panel = new JPanel(); + JColorChooser colorChooser = new JColorChooser(); + colorChooser.setDragEnabled(true); + panel.setBorder(BorderFactory.createTitledBorder("JColorChoosers")); + panel.add(colorChooser); + frame.setContentPane(panel); + frame.pack(); + frame.setVisible(true); }); } } diff --git a/test/jdk/javax/swing/JColorChooser/8065098/bug8065098.html b/test/jdk/javax/swing/JColorChooser/8065098/bug8065098.html deleted file mode 100644 index 3fc612cccf2..00000000000 --- a/test/jdk/javax/swing/JColorChooser/8065098/bug8065098.html +++ /dev/null @@ -1,40 +0,0 @@ - - - - - 1. Compile the java test JColorChooserDnDTest.java: - > /bin/javac JColorChooserDnDTest.java - 2. Run the first instance of the java test: - > /bin/java JColorChooserDnDTest - 3. Select a color in the color chooser - 4. Run the second instance of the java test: - > /bin/java JColorChooserDnDTest - 5. Drag and drop the selected color from the first color chooser - preview panel to the second color chooser preview panel - 6. If the color is dragged to the second color chooser then the test passes. - - - - - diff --git a/test/jdk/javax/swing/JColorChooser/8065098/bug8065098.java b/test/jdk/javax/swing/JColorChooser/8065098/bug8065098.java index 0fadffc4247..0402607644e 100644 --- a/test/jdk/javax/swing/JColorChooser/8065098/bug8065098.java +++ b/test/jdk/javax/swing/JColorChooser/8065098/bug8065098.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 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 @@ -20,15 +20,39 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -import javax.swing.JApplet; /* * @test * @bug 8065098 + * @library /java/awt/regtesthelpers + * @build PassFailJFrame * @summary JColorChooser no longer supports drag and drop * between two JVM instances - * @run applet/manual=yesno bug8065098.html + * @run main/manual bug8065098 */ -public class bug8065098 extends JApplet { +public class bug8065098 { + private static final String INSTRUCTIONS = """ + 1. Compile the java test JColorChooserDnDTest.java: + > /bin/javac JColorChooserDnDTest.java + 2. Run the first instance of the java test: + > /bin/java JColorChooserDnDTest + 3. Select a color in the color chooser. + 4. Run the second instance of the java test: + > /bin/java JColorChooserDnDTest + 5. Drag and drop the selected color from the first color chooser + preview panel to the second color chooser preview panel + 6. If the color is dragged to the second color chooser, then the + test passes. Otherwise, the test fails. + """; + + public static void main(String[] args) throws Exception { + PassFailJFrame.builder() + .title("bug8065098 Test Instructions") + .instructions(INSTRUCTIONS) + .rows((int) INSTRUCTIONS.lines().count() + 2) + .columns(40) + .build() + .awaitAndCheck(); + } }