From a68f5d7331c2e6c4bc51eee95abcbabb5a19b484 Mon Sep 17 00:00:00 2001 From: Tejesh R Date: Wed, 20 Mar 2024 05:59:22 +0000 Subject: [PATCH] 8327879: Convert javax/swing/border/Test4760089.java applet test to main Reviewed-by: abhiscxk, prr --- test/jdk/javax/swing/border/Test4760089.html | 33 ------------ test/jdk/javax/swing/border/Test4760089.java | 53 ++++++++++++++------ 2 files changed, 38 insertions(+), 48 deletions(-) delete mode 100644 test/jdk/javax/swing/border/Test4760089.html diff --git a/test/jdk/javax/swing/border/Test4760089.html b/test/jdk/javax/swing/border/Test4760089.html deleted file mode 100644 index 63c1ff87e06..00000000000 --- a/test/jdk/javax/swing/border/Test4760089.html +++ /dev/null @@ -1,33 +0,0 @@ - - - - -When applet starts, you'll see a panel with a compound titled border. -If one of its titles is overstriken with the border's line then test fails. -Otherwise test passes. - - - - - diff --git a/test/jdk/javax/swing/border/Test4760089.java b/test/jdk/javax/swing/border/Test4760089.java index 81762c729f2..da5e7f30530 100644 --- a/test/jdk/javax/swing/border/Test4760089.java +++ b/test/jdk/javax/swing/border/Test4760089.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2010, 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,29 +21,52 @@ * questions. */ -/* - * @test - * @bug 4760089 - * @summary Tests that titled border do not paint inner titled border over its caption - * @author Sergey Malenkov - * @run applet/manual=yesno Test4760089.html - */ - -import javax.swing.JApplet; +import java.awt.Dimension; +import javax.swing.BorderFactory; +import javax.swing.Box; +import javax.swing.JComponent; import javax.swing.JPanel; import javax.swing.border.Border; import javax.swing.border.EtchedBorder; import javax.swing.border.TitledBorder; -public class Test4760089 extends JApplet { - @Override - public void init() { +/* + * @test + * @bug 4760089 + * @summary Tests that titled border do not paint inner titled border over its caption + * @library /java/awt/regtesthelpers + * @build PassFailJFrame + * @run main/manual Test4760089 + */ + +public class Test4760089 { + public static void main(String[] args) throws Exception { + String testInstructions = """ + When test starts, a panel with a compound titled border is seen. + If one of its titles is overstruck with the border's + line then test fails. Otherwise test passes."""; + + PassFailJFrame.builder() + .title("Test Instructions") + .instructions(testInstructions) + .rows(4) + .columns(35) + .splitUI(Test4760089::init) + .build() + .awaitAndCheck(); + } + + public static JComponent init() { Border border = new EtchedBorder(); - border = new TitledBorder(border, "LEFT", TitledBorder.LEFT, TitledBorder.TOP); + border = new TitledBorder(border, "LEFT", TitledBorder.LEFT, TitledBorder.TOP); border = new TitledBorder(border, "RIGHT", TitledBorder.RIGHT, TitledBorder.TOP); JPanel panel = new JPanel(); panel.setBorder(border); - getContentPane().add(panel); + panel.setPreferredSize(new Dimension(200, 100)); + Box main = Box.createVerticalBox(); + main.setBorder(BorderFactory.createEmptyBorder(8, 8, 8, 8)); + main.add(panel); + return main; } }