From a43c3cc3476f18c048809bcd08f81fc4288ca399 Mon Sep 17 00:00:00 2001 From: Tejesh R Date: Thu, 14 Mar 2024 10:50:06 +0000 Subject: [PATCH] 8327826: Convert javax/swing/border/Test4243289.java applet test to main Reviewed-by: aivanov, abhiscxk --- test/jdk/javax/swing/border/Test4243289.html | 32 ------------- test/jdk/javax/swing/border/Test4243289.java | 49 ++++++++++++++------ 2 files changed, 36 insertions(+), 45 deletions(-) delete mode 100644 test/jdk/javax/swing/border/Test4243289.html diff --git a/test/jdk/javax/swing/border/Test4243289.html b/test/jdk/javax/swing/border/Test4243289.html deleted file mode 100644 index 5616bd835ac..00000000000 --- a/test/jdk/javax/swing/border/Test4243289.html +++ /dev/null @@ -1,32 +0,0 @@ - - - - -When applet starts, you'll see a panel with a TitledBorder with title "Panel Title". -If this title is overstriken with the border line, test fails, otherwise it passes. - - - - - diff --git a/test/jdk/javax/swing/border/Test4243289.java b/test/jdk/javax/swing/border/Test4243289.java index ae535a1e517..4b89239bc19 100644 --- a/test/jdk/javax/swing/border/Test4243289.java +++ b/test/jdk/javax/swing/border/Test4243289.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2008, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 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,32 +21,55 @@ * questions. */ +import java.awt.Dimension; +import java.awt.Font; +import javax.swing.BorderFactory; +import javax.swing.Box; +import javax.swing.JComponent; +import javax.swing.JPanel; +import javax.swing.border.TitledBorder; + /* * @test * @bug 4243289 * @summary Tests that TitledBorder do not draw line through its caption - * @author Peter Zhelezniakov - * @run applet/manual=yesno Test4243289.html + * @library /java/awt/regtesthelpers + * @build PassFailJFrame + * @run main/manual Test4243289 */ -import java.awt.Font; -import javax.swing.BorderFactory; -import javax.swing.JApplet; -import javax.swing.JPanel; -import javax.swing.border.TitledBorder; +public class Test4243289 { + public static void main(String[] args) throws Exception { + String testInstructions = """ + If TitledBorder with title "Panel Title" is overstruck with + the border line, test fails, otherwise it passes. + """; -public class Test4243289 extends JApplet { - public void init() { - Font font = new Font("Dialog", Font.PLAIN, 12); // NON-NLS: the font name + PassFailJFrame.builder() + .title("Test Instructions") + .instructions(testInstructions) + .rows(3) + .columns(35) + .splitUI(Test4243289::init) + .build() + .awaitAndCheck(); + } + + public static JComponent init() { + Font font = new Font(Font.DIALOG, Font.PLAIN, 12); TitledBorder border = BorderFactory.createTitledBorder( BorderFactory.createEtchedBorder(), - "Panel Title", // NON-NLS: the title of the border + "Panel Title", TitledBorder.DEFAULT_JUSTIFICATION, TitledBorder.DEFAULT_POSITION, font); JPanel panel = new JPanel(); panel.setBorder(border); - getContentPane().add(panel); + panel.setPreferredSize(new Dimension(100, 100)); + Box main = Box.createVerticalBox(); + main.setBorder(BorderFactory.createEmptyBorder(8, 8, 8, 8)); + main.add(panel); + return main; } }