8328717: Convert javax/swing/JColorChooser/8065098/bug8065098.java applet test to main

Reviewed-by: honkar, tr
This commit is contained in:
Damon Nguyen 2024-03-25 16:00:14 +00:00
parent 26b2ec4847
commit a1fbbffb5e
3 changed files with 40 additions and 60 deletions

View File

@ -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);
});
}
}

View File

@ -1,40 +0,0 @@
<!--
Copyright (c) 2014, 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>
1. Compile the java test JColorChooserDnDTest.java:
> <path-to-the-tested-jdk>/bin/javac JColorChooserDnDTest.java
2. Run the first instance of the java test:
> <path-to-the-tested-jdk>/bin/java JColorChooserDnDTest
3. Select a color in the color chooser
4. Run the second instance of the java test:
> <path-to-the-tested-jdk>/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.
<applet width="500" height="1" code="bug8065098.class">
</applet>
</body>
</html>

View File

@ -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:
> <path-to-the-tested-jdk>/bin/javac JColorChooserDnDTest.java
2. Run the first instance of the java test:
> <path-to-the-tested-jdk>/bin/java JColorChooserDnDTest
3. Select a color in the color chooser.
4. Run the second instance of the java test:
> <path-to-the-tested-jdk>/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();
}
}