8328030: Convert javax/swing/text/GlyphView/4984669/bug4984669.java a…

…pplet test to main Reviewed-by: azvegint, prr
TobiHartmann · Mar 14, 2024 · 7502dc9 · 7502dc9
1 parent 357c912
commit 7502dc9
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 43 deletions.
diff --git a/test/jdk/javax/swing/text/GlyphView/4984669/bug4984669.html b/test/jdk/javax/swing/text/GlyphView/4984669/bug4984669.html
diff --git a/...ng/text/GlyphView/4984669/bug4984669.java → ...g/text/GlyphView/htmlUnderliningTest.java b/...ng/text/GlyphView/4984669/bug4984669.java → ...g/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;
     }
 }