4949105: Access Bridge lacks html tags parsing

Reviewed-by: aph, andrew
Contributed-by: NAlex Kashchenko <akashche@redhat.com>

src/share/classes/javax/swing/plaf/basic/BasicHTML.java

 /*
- * Copyright (c) 1998, 2006, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2019, 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
@@ -28,6 +28,7 @@ import java.io.*;
 import java.awt.*;
 import java.net.URL;
 
+import javax.accessibility.AccessibleContext;
 import javax.swing.*;
 import javax.swing.text.*;
 import javax.swing.text.html.*;
@@ -212,6 +213,34 @@ public class BasicHTML {
             }
         }
         c.putClientProperty(BasicHTML.propertyKey, value);
+        String currentAccessibleNameProperty =
+            (String) c.getClientProperty(AccessibleContext.ACCESSIBLE_NAME_PROPERTY);
+        String previousParsedText = null;
+        if (currentAccessibleNameProperty != null && oldValue != null) {
+            try {
+                previousParsedText =
+                    (oldValue.getDocument().getText(0, oldValue.getDocument().getLength())).trim();
+            } catch (BadLocationException e) {
+            }
+        }
+
+        // AccessibleContext.ACCESSIBLE_NAME_PROPERTY should be set from here only if,
+        // 1. If AccessibleContext.ACCESSIBLE_NAME_PROPERTY was NOT set before
+        //        i.e. currentAccessibleNameProperty is null. and,
+        // 2. If AccessibleContext.ACCESSIBLE_NAME_PROPERTY was previously set from this method
+        //        using the value.getDocument().getText().
+        if (currentAccessibleNameProperty == null ||
+                currentAccessibleNameProperty.equals(previousParsedText)) {
+            String parsedText = null;
+            if (value != null) {
+                try {
+                    parsedText =
+                        (value.getDocument().getText(0, value.getDocument().getLength())).trim();
+                } catch (BadLocationException e) {
+                }
+            }
+            c.putClientProperty(AccessibleContext.ACCESSIBLE_NAME_PROPERTY, parsedText);
+        }
     }
 
     /**

test/javax/accessibility/AccessibleName/GetAccessibleNameTest.java

+/*
+ * Copyright (c) 2019, 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.
+ */
+
+import javax.accessibility.AccessibleContext;
+import javax.swing.JButton;
+import javax.swing.JCheckBox;
+import javax.swing.JCheckBoxMenuItem;
+import javax.swing.JComponent;
+import javax.swing.JLabel;
+import javax.swing.JMenu;
+import javax.swing.JMenuItem;
+import javax.swing.JRadioButton;
+import javax.swing.JRadioButtonMenuItem;
+import javax.swing.JToggleButton;
+import javax.swing.SwingUtilities;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
+
+/*
+ * @test
+ * @bug 4949105
+ * @summary Access Bridge lacks html tags parsing
+ * @run main GetAccessibleNameTest
+ */
+
+public class GetAccessibleNameTest {
+
+    public static void main(String[] args) throws Exception {
+        testConstructor();
+        testSetText();
+        testAccessibleProperty();
+    }
+
+    private static void testConstructor() {
+        Class[] testClass = new Class[] {
+            JLabel.class, JButton.class, JMenuItem.class,
+            JMenu.class, JCheckBoxMenuItem.class, JRadioButtonMenuItem.class,
+            JToggleButton.class, JRadioButton.class, JCheckBox.class };
+
+        Class[] ctorArg = new Class[1];
+        ctorArg[0] = String.class;
+        String expectedText = "bold italic em mark del small big sup sub ins strong code strike";
+        String inputText = "<html><style>{color:#FF0000;}</style><body>" +
+                   "<b>bold</b> <i>italic</i> <em>em</em> <mark>mark</mark> <del>del</del> " +
+                   "<small>small</small> <big>big</big> <sup>sup</sup> <sub>sub</sub> <ins>ins</ins> " +
+                   "<strong>strong</strong> <code>code</code> <strike>strike</strike>" +
+                   "</body></html>";
+
+        for (Class aClass : testClass) {
+            try {
+                Constructor constructor = aClass.getDeclaredConstructor(ctorArg);
+                JComponent comp = (JComponent) constructor.newInstance(inputText);
+                if (!expectedText.equals(comp.getAccessibleContext().getAccessibleName())) {
+                    throw new RuntimeException("AccessibleName of " + aClass.getName() + " is incorrect." +
+                                       " Expected: " + expectedText +
+                                       " Actual: " + comp.getAccessibleContext().getAccessibleName());
+                }
+            } catch (NoSuchMethodException e) {
+                throw new RuntimeException(aClass.getName() + " does not have a constructor accepting" +
+                    "String parameter.", e.getCause());
+            } catch (InstantiationException e) {
+                throw new RuntimeException(aClass.getName() + " could not be instantiated.",
+                    e.getCause());
+            } catch (IllegalAccessException e) {
+                throw new RuntimeException(aClass.getName() + " constructor cannot be accessed.",
+                    e.getCause());
+            } catch (InvocationTargetException e) {
+                throw new RuntimeException(aClass.getName() + " constructor cannot be invoked.",
+                    e.getCause());
+            }
+        }
+    }
+
+    private static void testSetText() {
+        String text = "html text";
+        JLabel testLabel = new JLabel("<html>" + text + "</html>");
+        if (!text.equals(testLabel.getAccessibleContext().getAccessibleName())) {
+            throw new RuntimeException("Incorrect AccessibleName," +
+                " Expected: " + text +
+                " Actual: " + testLabel.getAccessibleContext().getAccessibleName());
+        }
+
+        text = "Non html text";
+        testLabel.setText(text);
+        if (!text.equals(testLabel.getAccessibleContext().getAccessibleName())) {
+            throw new RuntimeException("Incorrect AccessibleName," +
+                " Expected: " + text +
+                " Actual: " + testLabel.getAccessibleContext().getAccessibleName());
+        }
+    }
+
+    private static void testAccessibleProperty() {
+        String text = "html text";
+        JLabel testLabel = new JLabel("<html>" + text + "</html>");
+        if (!text.equals(testLabel.getClientProperty(AccessibleContext.ACCESSIBLE_NAME_PROPERTY))) {
+            throw new RuntimeException("Incorrect ACCESSIBLE_NAME_PROPERTY," +
+                " Expected: " + text +
+                " Actual: " + testLabel.getClientProperty(AccessibleContext.ACCESSIBLE_NAME_PROPERTY));
+        }
+
+        String namePropertyText = "name property";
+        testLabel.putClientProperty(AccessibleContext.ACCESSIBLE_NAME_PROPERTY, namePropertyText);
+        if (!namePropertyText.equals(testLabel.getClientProperty(AccessibleContext.ACCESSIBLE_NAME_PROPERTY))) {
+            throw new RuntimeException("Incorrect ACCESSIBLE_NAME_PROPERTY," +
+                " Expected: " + namePropertyText +
+                " Actual: " + testLabel.getClientProperty(AccessibleContext.ACCESSIBLE_NAME_PROPERTY));
+        }
+
+        text = "different html text";
+        testLabel.setText("<html>" + text + "</html>");
+        if (!namePropertyText.equals(testLabel.getClientProperty(AccessibleContext.ACCESSIBLE_NAME_PROPERTY))) {
+            throw new RuntimeException("Incorrect ACCESSIBLE_NAME_PROPERTY," +
+                " Expected: " + namePropertyText +
+                " Actual: " + testLabel.getClientProperty(AccessibleContext.ACCESSIBLE_NAME_PROPERTY));
+        }
+    }
+}