Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2cfed9eb authored by Svetoslav Ganov's avatar Svetoslav Ganov
Browse files

Accessibility events generated by WebView contain non well formed markup. 

bug:3444147

1. Now that the spans with CSS data are included in the accessibility
   events, such that a client can parse them, the tests are doing so.

Change-Id: I574c68d27a95cd8226dd7634b00a7d404ae387fe
parent b1d884d5

core/tests/coretests/src/android/webkit/AccessibilityInjectorTest.java

+32 −1
Original line number Diff line number Diff line
@@ -56,6 +56,12 @@ public class AccessibilityInjectorTest 
    private static final int META_STATE_ALT_LEFT_ON = KeyEvent.META_ALT_ON

            | KeyEvent.META_ALT_LEFT_ON;



    /** Prefix for the CSS style span appended by WebKit. */

    private static final String APPLE_SPAN_PREFIX = "<span class=\"Apple-style-span\"";



    /** Suffix for the CSS style span appended by WebKit. */

    private static final String APPLE_SPAN_SUFFIX = "</span>";



    /** The value for not specified selection string since null is a valid value. */

    private static final String SELECTION_STRING_UNKNOWN = "Unknown";
@@ -1577,6 +1583,27 @@ public class AccessibilityInjectorTest 
        /* do nothing - avoid superclass behavior */

    }



    /**

     * Strips the apple span appended by WebKit while generating

     * the selection markup.

     *

     * @param markup The markup.

     * @return Stripped from apple spans markup.

     */

    private static String stripAppleSpanFromMarkup(String markup) {

        StringBuilder stripped = new StringBuilder(markup);

        int prefixBegIdx = stripped.indexOf(APPLE_SPAN_PREFIX);

        while (prefixBegIdx >= 0) {

            int prefixEndIdx = stripped.indexOf(">", prefixBegIdx) + 1;

            stripped.replace(prefixBegIdx, prefixEndIdx, "");

            int suffixBegIdx = stripped.lastIndexOf(APPLE_SPAN_SUFFIX);

            int suffixEndIdx = suffixBegIdx + APPLE_SPAN_SUFFIX.length();

            stripped.replace(suffixBegIdx, suffixEndIdx, "");

            prefixBegIdx = stripped.indexOf(APPLE_SPAN_PREFIX);

        }

        return stripped.toString();

    }



    /**

     * Disables accessibility and the mock accessibility service.

     */
@@ -1757,7 +1784,11 @@ public class AccessibilityInjectorTest 
            }

            if (!event.getText().isEmpty()) {

                CharSequence text = event.getText().get(0);

                sReceivedSelectionString = (text != null) ? text.toString() : null;

                if (text != null) {

                    sReceivedSelectionString = stripAppleSpanFromMarkup(text.toString());

                } else {

                    sReceivedSelectionString = null;

                }

            }

            synchronized (sTestLock) {

                sTestLock.notifyAll();