From be1dd275a4b4fcae00e4c3c48b3e8e4b1d84ba2b Mon Sep 17 00:00:00 2001 From: Alisen Chung Date: Thu, 14 Mar 2024 22:54:21 +0000 Subject: [PATCH] 8328130: Remove applet usage from JColorChooser tests Test4759934 Reviewed-by: prr --- .../swing/JColorChooser/Test4759934.html | 37 -------- .../swing/JColorChooser/Test4759934.java | 91 ++++++++++++------- 2 files changed, 59 insertions(+), 69 deletions(-) delete mode 100644 test/jdk/javax/swing/JColorChooser/Test4759934.html diff --git a/test/jdk/javax/swing/JColorChooser/Test4759934.html b/test/jdk/javax/swing/JColorChooser/Test4759934.html deleted file mode 100644 index 64dec2db159..00000000000 --- a/test/jdk/javax/swing/JColorChooser/Test4759934.html +++ /dev/null @@ -1,37 +0,0 @@ - - - - -1. Press button "Show Dialog" at the frame "Test" and - the dialog with button "Show ColorChooser" should appears. -2. Press button "Show ColorChooser" at the dialog "Dialog" and - the colorchooser should appears. -3. Press the button "Cancel" of colorchooser. - If the focus will come to the frame "Test" then test fails. - If the focus will come to the dialog "Dialog" then test passes. - - - - - diff --git a/test/jdk/javax/swing/JColorChooser/Test4759934.java b/test/jdk/javax/swing/JColorChooser/Test4759934.java index 620de37e2d4..72a1ed4dcec 100644 --- a/test/jdk/javax/swing/JColorChooser/Test4759934.java +++ b/test/jdk/javax/swing/JColorChooser/Test4759934.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2008, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 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,60 +21,87 @@ * questions. */ -/* - * @test - * @bug 4759934 - * @summary Tests windows activation problem - * @author Andrey Pikalev - * @run applet/manual=yesno Test4759934.html - */ - import java.awt.Color; import java.awt.Component; import java.awt.Window; 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.JDialog; import javax.swing.JFrame; -public class Test4759934 extends JApplet implements ActionListener { +/* + * @test + * @bug 4759934 + * @library /java/awt/regtesthelpers + * @build PassFailJFrame + * @summary Tests windows activation problem + * @run main/manual Test4759934 + */ +public class Test4759934 { private static final String CMD_DIALOG = "Show Dialog"; // NON-NLS: first button private static final String CMD_CHOOSER = "Show ColorChooser"; // NON-NLS: second button - private final JFrame frame = new JFrame("Test"); // NON-NLS: frame title + private static JFrame frame; - public void init() { - show(this.frame, CMD_DIALOG); + private static ActionListener al = new ActionListener() { + @Override + public void actionPerformed(ActionEvent event) { + String command = event.getActionCommand(); + if (CMD_DIALOG.equals(command)) { + JDialog dialog = new JDialog(frame, "Dialog"); // NON-NLS: dialog title + dialog.setLocation(200, 0); + show(dialog, CMD_CHOOSER, true); + } + else if (CMD_CHOOSER.equals(command)) { + Object source = event.getSource(); + Component component = (source instanceof Component) + ? (Component) source + : null; + + JColorChooser.showDialog(component, "ColorChooser", Color.BLUE); // NON-NLS: title + } + } + }; + + public static void main(String[] args) throws Exception { + String instructions = "1. Press button \"Show Dialog\" at the frame \"Test\" and\n" + + " the dialog with button \"Show ColorChooser\" should appears.\n" + + "2. Press button \"Show ColorChooser\" at the dialog \"Dialog\" and\n" + + " the colorchooser should appears.\n" + + "3. Press the button \"Cancel\" of colorchooser.\n" + + " If the focus will come to the frame \"Test\" then test fails.\n" + + " If the focus will come to the dialog \"Dialog\" then test passes."; + + PassFailJFrame.builder() + .title("Test4759934") + .instructions(instructions) + .rows(5) + .columns(40) + .testTimeOut(10) + .testUI(Test4759934::test) + .build() + .awaitAndCheck(); } - public void actionPerformed(ActionEvent event) { - String command = event.getActionCommand(); - if (CMD_DIALOG.equals(command)) { - JDialog dialog = new JDialog(this.frame, "Dialog"); // NON-NLS: dialog title - dialog.setLocation(200, 0); - show(dialog, CMD_CHOOSER); - } - else if (CMD_CHOOSER.equals(command)) { - Object source = event.getSource(); - Component component = (source instanceof Component) - ? (Component) source - : null; - - JColorChooser.showDialog(component, "ColorChooser", Color.BLUE); // NON-NLS: title - } + public static JFrame test() { + frame = new JFrame("ColorChooser dialog on button press test"); + show(frame, CMD_DIALOG, false); + return frame; } - private void show(Window window, String command) { + private static void show(Window window, String command, boolean setVisible) { JButton button = new JButton(command); button.setActionCommand(command); - button.addActionListener(this); + button.addActionListener(al); + button.setFont(button.getFont().deriveFont(64.0f)); window.add(button); window.pack(); - window.setVisible(true); + if (setVisible) { + window.setVisible(true); + } } }