8327980: Convert javax/swing/JToggleButton/4128979/bug4128979.java applet test to main

Reviewed-by: honkar, tr
This commit is contained in:
Abhishek Kumar 2024-03-22 03:40:33 +00:00
parent 177b8a241c
commit 256d48b196
2 changed files with 55 additions and 90 deletions

View File

@ -1,41 +0,0 @@
<!--
Copyright (c) 1998, 2021, 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>
This test requires Windows look and feel, just press Pass if you
run it not on Windows.
When the test starts you'll see toggle buttons in three rows
two of which are toolbars.
Make these buttons pressed, their background color must change
to halftones between the button background colors and the ToggleButton
highlight color (it is shown in the square below).
If the background color does not change correctly for at least one button,
the test fails.
<applet code="bug4128979.class" width=600 height=190></applet>
</body>
</html>

View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1998, 2021, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1998, 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,28 +21,6 @@
* questions.
*/
/* @test
@bug 4128979
@requires (os.family == "windows")
@summary Tests that background changes correctly in WinLF for JToggleButton when pressed
@key headful
@run applet/manual=yesno bug4128979.html
*/
import javax.swing.BorderFactory;
import javax.swing.BoxLayout;
import javax.swing.Icon;
import javax.swing.JApplet;
import javax.swing.JFrame;
import javax.swing.JLabel;
import javax.swing.JOptionPane;
import javax.swing.JPanel;
import javax.swing.JToggleButton;
import javax.swing.JToolBar;
import javax.swing.UIManager;
import javax.swing.UnsupportedLookAndFeelException;
import javax.swing.WindowConstants;
import java.awt.BorderLayout;
import java.awt.Color;
import java.awt.Component;
import java.awt.ComponentOrientation;
@ -50,35 +28,60 @@ import java.awt.Container;
import java.awt.FlowLayout;
import java.awt.Graphics;
public class bug4128979 extends JApplet {
import javax.swing.BorderFactory;
import javax.swing.BoxLayout;
import javax.swing.Icon;
import javax.swing.JFrame;
import javax.swing.JLabel;
import javax.swing.JPanel;
import javax.swing.JToggleButton;
import javax.swing.JToolBar;
import javax.swing.UIManager;
public static void main(String[] args) {
JApplet applet = new bug4128979();
applet.init();
applet.start();
import jtreg.SkippedException;
import sun.awt.OSInfo;
JFrame frame = new JFrame("Test window");
frame.setDefaultCloseOperation(WindowConstants.EXIT_ON_CLOSE);
frame.setLayout(new BorderLayout());
frame.add(applet, BorderLayout.CENTER);
frame.setSize(600, 240);
frame.setVisible(true);
/* @test
* @bug 4128979
* @requires (os.family == "windows")
* @modules java.desktop/sun.awt
* @library /java/awt/regtesthelpers /test/lib
* @build PassFailJFrame jtreg.SkippedException
* @summary Tests that background changes correctly in WinLF for JToggleButton when pressed
* @run main/manual bug4128979
*/
public class bug4128979 {
private static final String INSTRUCTIONS = """
When the test starts, toggle buttons are visible in three rows
two of which are toolbars.
Press these buttons, their background color must change
to half tones between the button background colors and the ToggleButton
highlight color (it is shown in the square below).
If the background color does not change correctly for at least one button,
the test fails.""";
public static void main(String[] args) throws Exception {
if (OSInfo.getOSType() != OSInfo.OSType.WINDOWS) {
throw new SkippedException("This test is for Windows only");
}
UIManager.setLookAndFeel("com.sun.java.swing.plaf.windows.WindowsClassicLookAndFeel");
PassFailJFrame.builder()
.title("JToggleButton Instructions")
.instructions(INSTRUCTIONS)
.rows(15)
.columns(60)
.testUI(bug4128979::createAndShowUI)
.build()
.awaitAndCheck();
}
public void init() {
try {
UIManager.setLookAndFeel("com.sun.java.swing.plaf.windows.WindowsClassicLookAndFeel");
} catch (UnsupportedLookAndFeelException e) {
JOptionPane.showMessageDialog(this,
"This test requires Windows look and feel, so just press Pass\n as "+
" this look and feel is unsupported on this platform.",
"Unsupported LF", JOptionPane.ERROR_MESSAGE);
return;
} catch (Exception e) {
throw new RuntimeException("Couldn't set look and feel");
}
public static JFrame createAndShowUI() {
JFrame frame = new JFrame("JToggleButton's Background Color Test");
frame.setLayout(new FlowLayout());
setLayout(new FlowLayout());
JPanel p = new JPanel();
p.setLayout(new BoxLayout(p, BoxLayout.Y_AXIS));
@ -113,8 +116,11 @@ public class bug4128979 extends JApplet {
return 50;
}
});
add(p);
add(label);
frame.getContentPane().add(p);
frame.getContentPane().add(label);
frame.setSize(600, 250);
return frame;
}
static void addButtons(Container c) {