From 7502dc99bf23109ef16fb99de25b09bab51e4978 Mon Sep 17 00:00:00 2001 From: Tejesh R Date: Thu, 14 Mar 2024 05:10:42 +0000 Subject: [PATCH] 8328030: Convert javax/swing/text/GlyphView/4984669/bug4984669.java applet test to main Reviewed-by: azvegint, prr --- .../text/GlyphView/4984669/bug4984669.html | 30 ----------- ...g4984669.java => htmlUnderliningTest.java} | 51 ++++++++++++++----- 2 files changed, 38 insertions(+), 43 deletions(-) delete mode 100644 test/jdk/javax/swing/text/GlyphView/4984669/bug4984669.html rename test/jdk/javax/swing/text/GlyphView/{4984669/bug4984669.java => htmlUnderliningTest.java} (54%) diff --git a/test/jdk/javax/swing/text/GlyphView/4984669/bug4984669.html b/test/jdk/javax/swing/text/GlyphView/4984669/bug4984669.html deleted file mode 100644 index f9991a231c1..00000000000 --- a/test/jdk/javax/swing/text/GlyphView/4984669/bug4984669.html +++ /dev/null @@ -1,30 +0,0 @@ - - - - -The four lines printed above in a bold typeface should all be underlined. -It is a bug if any of these lines is underlined only partially. -The very first line should not be underlined at all. - - diff --git a/test/jdk/javax/swing/text/GlyphView/4984669/bug4984669.java b/test/jdk/javax/swing/text/GlyphView/htmlUnderliningTest.java similarity index 54% rename from test/jdk/javax/swing/text/GlyphView/4984669/bug4984669.java rename to test/jdk/javax/swing/text/GlyphView/htmlUnderliningTest.java index ba590f9472a..b12a129dfa2 100644 --- a/test/jdk/javax/swing/text/GlyphView/4984669/bug4984669.java +++ b/test/jdk/javax/swing/text/GlyphView/htmlUnderliningTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 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,24 +21,48 @@ * questions. */ +import javax.swing.JEditorPane; +import javax.swing.JPanel; +import javax.swing.JScrollPane; +import javax.swing.text.MutableAttributeSet; +import javax.swing.text.SimpleAttributeSet; +import javax.swing.text.StyleConstants; +import javax.swing.text.StyledEditorKit; + /* @test - @bug 4984669 8002148 - @summary Tests HTML underlining - @author Peter Zhelezniakov - @run applet/manual=yesno bug4984669.html -*/ -import javax.swing.*; -import javax.swing.text.*; + * @bug 4984669 8002148 + * @summary Tests HTML underlining + * @library /java/awt/regtesthelpers + * @build PassFailJFrame + * @run main/manual htmlUnderliningTest + */ + +public class htmlUnderliningTest { + public static void main(String[] args) throws Exception { + String testInstructions = """ + The four lines printed in a bold typeface should all be underlined. + It is a bug if any of these lines is underlined only partially. + The very first line should not be underlined at all. + """; + + PassFailJFrame.builder() + .title("Test Instructions") + .instructions(testInstructions) + .rows(4) + .columns(35) + .splitUI(htmlUnderliningTest::initializeTest) + .build() + .awaitAndCheck(); + } -public class bug4984669 extends JApplet -{ - public void init() { + public static JPanel initializeTest() { + JPanel panel = new JPanel(); JEditorPane pane = new JEditorPane(); - this.getContentPane().add(new JScrollPane(pane)); + panel.add(new JScrollPane(pane)); pane.setEditorKit(new StyledEditorKit()); try { - pane.getDocument().insertString(0,"12 \n",null); + pane.getDocument().insertString(0, "12 \n", null); MutableAttributeSet attrs = new SimpleAttributeSet(); StyleConstants.setFontSize(attrs, 36); @@ -51,5 +75,6 @@ public void init() { } catch (Exception e) { throw new Error("Failed: Unexpected Exception", e); } + return panel; } }