From 55500cf6e3d8e842c2bbf2769db2eb097de07a4d Mon Sep 17 00:00:00 2001 From: duke Date: Wed, 9 Oct 2024 10:55:37 +0000 Subject: [PATCH] Backport 87bd6caca03745c21172c3b5e8b0d28724810352 --- test/jdk/java/awt/List/SetFontTest.java | 96 +++++++ .../awt/List/SetFontTest/SetFontTest.html | 43 ---- .../awt/List/SetFontTest/SetFontTest.java | 234 ------------------ 3 files changed, 96 insertions(+), 277 deletions(-) create mode 100644 test/jdk/java/awt/List/SetFontTest.java delete mode 100644 test/jdk/java/awt/List/SetFontTest/SetFontTest.html delete mode 100644 test/jdk/java/awt/List/SetFontTest/SetFontTest.java diff --git a/test/jdk/java/awt/List/SetFontTest.java b/test/jdk/java/awt/List/SetFontTest.java new file mode 100644 index 00000000000..d529e00f7b3 --- /dev/null +++ b/test/jdk/java/awt/List/SetFontTest.java @@ -0,0 +1,96 @@ +/* + * Copyright (c) 2005, 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 + * 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. + */ + +/* + @test + @bug 5010944 6248072 + @summary List's rows overlap one another + @library /java/awt/regtesthelpers + @run main/manual SetFontTest +*/ + +import java.awt.Button; +import java.awt.FlowLayout; +import java.awt.Font; +import java.awt.Frame; +import java.awt.List; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; + +public class SetFontTest { + + static final String INSTRUCTIONS = """ + 1) Click on the 'Enlarge font' button to enlarge font of the list. + 2) If you see that the rows of the list overlap one another + then the test failed. Otherwise, go to step 3. + 3) Click on the 'Change mode' button to set multiple-selection mode. + 4) If you see that the rows of the list overlap one another + then the test failed. Otherwise, the test passed. + """; + + public static void main(String[] args) throws Exception { + PassFailJFrame.builder() + .title("AWT List Font Test") + .instructions(INSTRUCTIONS) + .rows(10) + .columns(40) + .testUI(SetFontTest::createFontTest) + .build() + .awaitAndCheck(); + } + + static Frame createFontTest() { + + Frame frame = new Frame("List Font Test"); + List list = new List(8, false); + Button button1 = new Button("Enlarge font"); + Button button2 = new Button("Change mode"); + + list.add("111"); + list.add("222"); + list.add("333"); + list.add("444"); + + button1.addActionListener( + new ActionListener(){ + public void actionPerformed(ActionEvent ae) { + list.setFont(new Font("SansSerif", Font.PLAIN, 30)); + list.repaint(); + } + }); + + button2.addActionListener( + new ActionListener(){ + public void actionPerformed(ActionEvent ae){ + list.setMultipleMode(true); + } + }); + + frame.setLayout(new FlowLayout()); + frame.add(list); + frame.add(button1); + frame.add(button2); + frame.setSize(200, 250); + return frame; + } +} diff --git a/test/jdk/java/awt/List/SetFontTest/SetFontTest.html b/test/jdk/java/awt/List/SetFontTest/SetFontTest.html deleted file mode 100644 index 3ac0d99fc51..00000000000 --- a/test/jdk/java/awt/List/SetFontTest/SetFontTest.html +++ /dev/null @@ -1,43 +0,0 @@ - - - - - - SetFontTest - - - -

SetFontTest
Bug ID: 5010944

- -

See the dialog box (usually in upper left corner) for instructions

- - - - diff --git a/test/jdk/java/awt/List/SetFontTest/SetFontTest.java b/test/jdk/java/awt/List/SetFontTest/SetFontTest.java deleted file mode 100644 index 0b68811cd0b..00000000000 --- a/test/jdk/java/awt/List/SetFontTest/SetFontTest.java +++ /dev/null @@ -1,234 +0,0 @@ -/* - * Copyright (c) 2005, 2007, 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. - */ - -/* - test - @bug 5010944 6248072 - @summary List's rows overlap one another - @author Dmitry Cherepanov area=awt-list - @run applet/manual=yesno SetFontTest.html -*/ - -import java.applet.Applet; -import java.awt.*; -import java.awt.event.*; - -public class SetFontTest extends Applet -{ - List list = new List(8, false); - Button button1 = new Button("Enlarge font"); - Button button2 = new Button("Change mode"); - - public void init() - { - list.add("111"); - list.add("222"); - list.add("333"); - list.add("444"); - this.add(list); - - this.add(button1); - this.add(button2); - - button1.addActionListener( - new ActionListener(){ - public void actionPerformed(ActionEvent ae){ - list.setFont( new Font( "SansSerif", Font.PLAIN, 30 ) ); - list.repaint(); - } - }); - - button2.addActionListener( - new ActionListener(){ - public void actionPerformed(ActionEvent ae){ - list.setMultipleMode(true); - } - }); - - this.setLayout (new FlowLayout ()); - - String[] instructions = - { - "1) Click on the 'Enlarge font' button to enlarge font of the list.", - "2) If you see that the rows of the list overlap one another "+ - "then the test failed. Otherwise, goto to the step 3.", - "3) Click on the 'Change mode' button to set multiple-selection mode.", - "4) If you see that the rows of the list overlap one another "+ - "then the test failed. Otherwise, the test passed." - }; - Sysout.createDialogWithInstructions( instructions ); - - }//End init() - - public void start () - { - - setSize (200,200); - setVisible(true); - validate(); - - }// start() -} - -/* Place other classes related to the test after this line */ - - - - - -/**************************************************** - Standard Test Machinery - DO NOT modify anything below -- it's a standard - chunk of code whose purpose is to make user - interaction uniform, and thereby make it simpler - to read and understand someone else's test. - ****************************************************/ - -/** - This is part of the standard test machinery. - It creates a dialog (with the instructions), and is the interface - for sending text messages to the user. - To print the instructions, send an array of strings to Sysout.createDialog - WithInstructions method. Put one line of instructions per array entry. - To display a message for the tester to see, simply call Sysout.println - with the string to be displayed. - This mimics System.out.println but works within the test harness as well - as standalone. - */ - -class Sysout -{ - private static TestDialog dialog; - - public static void createDialogWithInstructions( String[] instructions ) - { - dialog = new TestDialog( new Frame(), "Instructions" ); - dialog.printInstructions( instructions ); - dialog.setVisible(true); - println( "Any messages for the tester will display here." ); - } - - public static void createDialog( ) - { - dialog = new TestDialog( new Frame(), "Instructions" ); - String[] defInstr = { "Instructions will appear here. ", "" } ; - dialog.printInstructions( defInstr ); - dialog.setVisible(true); - println( "Any messages for the tester will display here." ); - } - - - public static void printInstructions( String[] instructions ) - { - dialog.printInstructions( instructions ); - } - - - public static void println( String messageIn ) - { - dialog.displayMessage( messageIn ); - } - -}// Sysout class - -/** - This is part of the standard test machinery. It provides a place for the - test instructions to be displayed, and a place for interactive messages - to the user to be displayed. - To have the test instructions displayed, see Sysout. - To have a message to the user be displayed, see Sysout. - Do not call anything in this dialog directly. - */ -class TestDialog extends Dialog -{ - - TextArea instructionsText; - TextArea messageText; - int maxStringLength = 80; - - //DO NOT call this directly, go through Sysout - public TestDialog( Frame frame, String name ) - { - super( frame, name ); - int scrollBoth = TextArea.SCROLLBARS_BOTH; - instructionsText = new TextArea( "", 15, maxStringLength, scrollBoth ); - add( "North", instructionsText ); - - messageText = new TextArea( "", 5, maxStringLength, scrollBoth ); - add("Center", messageText); - - pack(); - - setVisible(true); - }// TestDialog() - - //DO NOT call this directly, go through Sysout - public void printInstructions( String[] instructions ) - { - //Clear out any current instructions - instructionsText.setText( "" ); - - //Go down array of instruction strings - - String printStr, remainingStr; - for( int i=0; i < instructions.length; i++ ) - { - //chop up each into pieces maxSringLength long - remainingStr = instructions[ i ]; - while( remainingStr.length() > 0 ) - { - //if longer than max then chop off first max chars to print - if( remainingStr.length() >= maxStringLength ) - { - //Try to chop on a word boundary - int posOfSpace = remainingStr. - lastIndexOf( ' ', maxStringLength - 1 ); - - if( posOfSpace <= 0 ) posOfSpace = maxStringLength - 1; - - printStr = remainingStr.substring( 0, posOfSpace + 1 ); - remainingStr = remainingStr.substring( posOfSpace + 1 ); - } - //else just print - else - { - printStr = remainingStr; - remainingStr = ""; - } - - instructionsText.append( printStr + "\n" ); - - }// while - - }// for - - }//printInstructions() - - //DO NOT call this directly, go through Sysout - public void displayMessage( String messageIn ) - { - messageText.append( messageIn + "\n" ); - System.out.println(messageIn); - } - -}// TestDialog class