diff options
| author | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-02 01:04:42 +0000 |
|---|---|---|
| committer | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-02 01:04:42 +0000 |
| commit | a515f3fbb078ae5d3d6fa89e58d2547fb808cb60 (patch) | |
| tree | a379b2ab776970a7435e3884d71ae640144c95ad /content/test/data | |
| parent | 221c45d997d7cd70cc4c1af5ff7614875d5b8844 (diff) | |
| download | chromium_src-a515f3fbb078ae5d3d6fa89e58d2547fb808cb60.zip chromium_src-a515f3fbb078ae5d3d6fa89e58d2547fb808cb60.tar.gz chromium_src-a515f3fbb078ae5d3d6fa89e58d2547fb808cb60.tar.bz2 | |
Revert 149510 - Allow filters in accessibility tests to specify which attributes to check.
This may have caused the Win 7 WebKit canary bot to begin crashing; see
http://test-results.appspot.com/dashboards/flakiness_dashboard.html#tests=accessibility%2Floading-iframe-updates-axtree.html
If rolling this out does not fix the bot, I will put it back in later tonight.
With this change, a DumpAccessibilityTree test can specify filters to
control which attributes are printed. This keeps each test expectation file
small and readable, while making it easy to test for all sorts of attributes,
including obscure ones.
Each platform will have a few attributes that print by default, like the
role and name. HTML files add rules of this form to override the defaults:
@MAC-DENY:subrole*
@MAC-DENY:value*
@MAC-ALLOW:description*
You can also specify @MAC-ALLOW:* or @WIN-ALLOW:* if you want to dump everything - helpful
during development sometimes.
BUG=124314
Review URL: https://chromiumcodereview.appspot.com/10662003
TBR=dmazzoni@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10837065
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@149550 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/test/data')
13 files changed, 72 insertions, 86 deletions
diff --git a/content/test/data/accessibility/a-expected-win.txt b/content/test/data/accessibility/a-expected-win.txt index 41b9648..d5c9b7d 100644 --- a/content/test/data/accessibility/a-expected-win.txt +++ b/content/test/data/accessibility/a-expected-win.txt @@ -1,4 +1,4 @@ -ROLE_SYSTEM_DOCUMENT name='' READONLY FOCUSABLE - IA2_ROLE_SECTION name='' READONLY - ROLE_SYSTEM_LINK name='normal link' FOCUSABLE LINKED - ROLE_SYSTEM_TEXT name='normal link' READONLY LINKED +ROLE_SYSTEM_DOCUMENT name='' state=FOCUSED,READONLY,FOCUSABLE + IA2_ROLE_SECTION name='' state=READONLY + ROLE_SYSTEM_LINK name='normal link' state=FOCUSABLE,LINKED + ROLE_SYSTEM_TEXT name='normal link' state=READONLY,LINKED diff --git a/content/test/data/accessibility/a.html b/content/test/data/accessibility/a.html index 4cd8c19..8a7d55f 100644 --- a/content/test/data/accessibility/a.html +++ b/content/test/data/accessibility/a.html @@ -1,6 +1,3 @@ -<!-- -@WIN-ALLOW:LINKED ---> <html> <body> <a href="http://www.google.com">normal link</a> diff --git a/content/test/data/accessibility/aria-application-expected-mac.txt b/content/test/data/accessibility/aria-application-expected-mac.txt index 441fb0f..8510922 100644 --- a/content/test/data/accessibility/aria-application-expected-mac.txt +++ b/content/test/data/accessibility/aria-application-expected-mac.txt @@ -1,2 +1,2 @@ -AXWebArea subrole=(null) title='' value='' +AXWebArea subrole=(null) roleDescription='HTML content' title='' value='' AXGroup subrole=AXLandmarkApplication roleDescription='application' title='' value='' diff --git a/content/test/data/accessibility/aria-application-expected-win.txt b/content/test/data/accessibility/aria-application-expected-win.txt index 0eda87d..e121405 100644 --- a/content/test/data/accessibility/aria-application-expected-win.txt +++ b/content/test/data/accessibility/aria-application-expected-win.txt @@ -1,2 +1,2 @@ -ROLE_SYSTEM_DOCUMENT name='' READONLY FOCUSABLE - IA2_ROLE_SECTION name='' READONLY +ROLE_SYSTEM_DOCUMENT name='' state=FOCUSED,READONLY,FOCUSABLE + IA2_ROLE_SECTION name='' state=READONLY diff --git a/content/test/data/accessibility/aria-application.html b/content/test/data/accessibility/aria-application.html index eeaeccf..f2b14b4 100644 --- a/content/test/data/accessibility/aria-application.html +++ b/content/test/data/accessibility/aria-application.html @@ -1,6 +1,3 @@ -<!-- -@MAC-ALLOW:roleDescription='application' ---> <html> <body role="application" id="testAriaApplication"> </body> diff --git a/content/test/data/accessibility/contenteditable-descendants-expected-win.txt b/content/test/data/accessibility/contenteditable-descendants-expected-win.txt index ea0e3b6c..a3c4998 100644 --- a/content/test/data/accessibility/contenteditable-descendants-expected-win.txt +++ b/content/test/data/accessibility/contenteditable-descendants-expected-win.txt @@ -1,21 +1,21 @@ -ROLE_SYSTEM_DOCUMENT name='' READONLY FOCUSABLE - IA2_ROLE_PARAGRAPH name='' IA2_STATE_EDITABLE - ROLE_SYSTEM_TEXT name='Contentditable with ' IA2_STATE_EDITABLE - ROLE_SYSTEM_LINK name='link' LINKED IA2_STATE_EDITABLE - ROLE_SYSTEM_TEXT name='link' LINKED IA2_STATE_EDITABLE - ROLE_SYSTEM_TEXT name=' and ' IA2_STATE_EDITABLE - ROLE_SYSTEM_GRAPHIC name='image' IA2_STATE_EDITABLE - ROLE_SYSTEM_TEXT name=' and ' IA2_STATE_EDITABLE - ROLE_SYSTEM_PUSHBUTTON name='button' FOCUSABLE IA2_STATE_EDITABLE - ROLE_SYSTEM_TABLE name='' IA2_STATE_EDITABLE - ROLE_SYSTEM_ROW name='' IA2_STATE_EDITABLE - ROLE_SYSTEM_CELL name='' IA2_STATE_EDITABLE - ROLE_SYSTEM_TEXT name='Always expose editable tables as tables' IA2_STATE_EDITABLE - ROLE_SYSTEM_COLUMN name='' UNAVAILABLE IA2_STATE_EDITABLE - IA2_ROLE_SECTION name='' UNAVAILABLE IA2_STATE_EDITABLE - ROLE_SYSTEM_LIST name='' IA2_STATE_EDITABLE - ROLE_SYSTEM_LISTITEM name='' IA2_STATE_EDITABLE - ROLE_SYSTEM_TEXT name='1' READONLY - ROLE_SYSTEM_TEXT name='Editable list item' IA2_STATE_EDITABLE - IA2_ROLE_PARAGRAPH name='' FOCUSABLE IA2_STATE_EDITABLE - ROLE_SYSTEM_TEXT name='Keep the role, just change the state' IA2_STATE_EDITABLE +ROLE_SYSTEM_DOCUMENT name='' state=FOCUSED,READONLY,FOCUSABLE + IA2_ROLE_PARAGRAPH name='' state=IA2_STATE_EDITABLE + ROLE_SYSTEM_TEXT name='Contentditable with ' state=IA2_STATE_EDITABLE + ROLE_SYSTEM_LINK name='link' state=LINKED,IA2_STATE_EDITABLE + ROLE_SYSTEM_TEXT name='link' state=IA2_STATE_EDITABLE + ROLE_SYSTEM_TEXT name=' and ' state=IA2_STATE_EDITABLE + ROLE_SYSTEM_GRAPHIC name='image' state=IA2_STATE_EDITABLE + ROLE_SYSTEM_TEXT name=' and ' state=IA2_STATE_EDITABLE + ROLE_SYSTEM_PUSHBUTTON name='button' state=FOCUSABLE,IA2_STATE_EDITABLE + ROLE_SYSTEM_TABLE name='' state=IA2_STATE_EDITABLE + ROLE_SYSTEM_ROW name='' state=IA2_STATE_EDITABLE + ROLE_SYSTEM_CELL name='' state=IA2_STATE_EDITABLE + ROLE_SYSTEM_TEXT name='Always expose editable tables as tables' state=IA2_STATE_EDITABLE + ROLE_SYSTEM_COLUMN name='' state=UNAVAILABLE,IA2_STATE_EDITABLE + IA2_ROLE_SECTION name='' state=UNAVAILABLE,IA2_STATE_EDITABLE + ROLE_SYSTEM_LIST name='' state=IA2_STATE_EDITABLE + ROLE_SYSTEM_LISTITEM name='' state=IA2_STATE_EDITABLE + ROLE_SYSTEM_TEXT name='1' state=READONLY + ROLE_SYSTEM_TEXT name='Editable list item' state=IA2_STATE_EDITABLE + IA2_ROLE_PARAGRAPH name='' state=FOCUSABLE,IA2_STATE_EDITABLE + ROLE_SYSTEM_TEXT name='Keep the role, just change the state' state=IA2_STATE_EDITABLE diff --git a/content/test/data/accessibility/contenteditable-descendants.html b/content/test/data/accessibility/contenteditable-descendants.html index f605096..43c86b6 100644 --- a/content/test/data/accessibility/contenteditable-descendants.html +++ b/content/test/data/accessibility/contenteditable-descendants.html @@ -1,8 +1,3 @@ -<!-- -@WIN-ALLOW:IA2_STATE_EDITABLE -@WIN-ALLOW:LINKED -@WIN-ALLOW:UNAVAILABLE ---> <div contenteditable> <p>Contentditable with <a href="#">link</a> and <img src="./bullet.png" alt="image"> and <input type="button" value="button"/></p> <table><td>Always expose editable tables as tables</td></table> diff --git a/content/test/data/accessibility/footer-expected-mac.txt b/content/test/data/accessibility/footer-expected-mac.txt index 09dece1..06aa3c3 100644 --- a/content/test/data/accessibility/footer-expected-mac.txt +++ b/content/test/data/accessibility/footer-expected-mac.txt @@ -1,3 +1,3 @@ -AXWebArea subrole=(null) title='' value='' +AXWebArea subrole=(null) roleDescription='HTML content' title='' value='' AXGroup subrole=AXLandmarkContentInfo roleDescription='footer' title='' value='' - AXStaticText subrole=(null) title='' value='Footer element' + AXStaticText subrole=(null) roleDescription='text' title='' value='Footer element' diff --git a/content/test/data/accessibility/footer-expected-win.txt b/content/test/data/accessibility/footer-expected-win.txt index 3cb58f9..76fc78a 100644 --- a/content/test/data/accessibility/footer-expected-win.txt +++ b/content/test/data/accessibility/footer-expected-win.txt @@ -1,3 +1,3 @@ -ROLE_SYSTEM_DOCUMENT name='' READONLY FOCUSABLE - IA2_ROLE_FOOTER name='' READONLY - ROLE_SYSTEM_TEXT name='Footer element' READONLY +ROLE_SYSTEM_DOCUMENT name='' state=FOCUSED,READONLY,FOCUSABLE + IA2_ROLE_FOOTER name='' state=READONLY + ROLE_SYSTEM_TEXT name='Footer element' state=READONLY diff --git a/content/test/data/accessibility/footer.html b/content/test/data/accessibility/footer.html index f33523e..ac430d2 100644 --- a/content/test/data/accessibility/footer.html +++ b/content/test/data/accessibility/footer.html @@ -1,6 +1,3 @@ -<!-- -@MAC-ALLOW:roleDescription='footer' ---> <html> <body> <footer>Footer element</footer> diff --git a/content/test/data/accessibility/list-markers-expected-mac.txt b/content/test/data/accessibility/list-markers-expected-mac.txt index 29e7252..758ce02 100644 --- a/content/test/data/accessibility/list-markers-expected-mac.txt +++ b/content/test/data/accessibility/list-markers-expected-mac.txt @@ -1,17 +1,17 @@ -AXWebArea subrole=(null) title='' value='' - AXList subrole=AXContentList title='' value='' - AXGroup subrole=(null) title='' value='' - AXListMarker subrole=(null) title='' value='•' - AXStaticText subrole=(null) title='' value='First item properly groups itself despite ' - AXStaticText subrole=(null) title='' value='bolded' - AXStaticText subrole=(null) title='' value=' text.' - AXGroup subrole=(null) title='' value='' - AXListMarker subrole=(null) title='' value='•' - AXStaticText subrole=(null) title='' value='This should also be ' - AXStaticText subrole=(null) title='' value='seen' - AXStaticText subrole=(null) title='' value=' as a group.' - AXGroup subrole=(null) title='' value='' - AXListMarker subrole=(null) title='' value='•' - AXStaticText subrole=(null) title='' value='Some ' - AXStaticText subrole=(null) title='' value='more' - AXStaticText subrole=(null) title='' value=' text.' +AXWebArea subrole=(null) roleDescription='HTML content' title='' value='' + AXList subrole=AXContentList roleDescription='list' title='' value='' + AXGroup subrole=(null) roleDescription='group' title='' value='' + AXListMarker subrole=(null) roleDescription='AXListMarker' title='' value='•' + AXStaticText subrole=(null) roleDescription='text' title='' value='First item properly groups itself despite ' + AXStaticText subrole=(null) roleDescription='text' title='' value='bolded' + AXStaticText subrole=(null) roleDescription='text' title='' value=' text.' + AXGroup subrole=(null) roleDescription='group' title='' value='' + AXListMarker subrole=(null) roleDescription='AXListMarker' title='' value='•' + AXStaticText subrole=(null) roleDescription='text' title='' value='This should also be ' + AXStaticText subrole=(null) roleDescription='text' title='' value='seen' + AXStaticText subrole=(null) roleDescription='text' title='' value=' as a group.' + AXGroup subrole=(null) roleDescription='group' title='' value='' + AXListMarker subrole=(null) roleDescription='AXListMarker' title='' value='•' + AXStaticText subrole=(null) roleDescription='text' title='' value='Some ' + AXStaticText subrole=(null) roleDescription='text' title='' value='more' + AXStaticText subrole=(null) roleDescription='text' title='' value=' text.' diff --git a/content/test/data/accessibility/ul-expected-mac.txt b/content/test/data/accessibility/ul-expected-mac.txt index ddda508..ee3d356 100644 --- a/content/test/data/accessibility/ul-expected-mac.txt +++ b/content/test/data/accessibility/ul-expected-mac.txt @@ -1,11 +1,11 @@ -AXWebArea subrole=(null) title='' value='' - AXList subrole=AXContentList title='' value='' - AXGroup subrole=(null) title='' value='' - AXListMarker subrole=(null) title='' value='•' - AXStaticText subrole=(null) title='' value='Item 1' - AXGroup subrole=(null) title='' value='' - AXListMarker subrole=(null) title='' value='•' - AXStaticText subrole=(null) title='' value='Item 2' - AXGroup subrole=(null) title='' value='' - AXListMarker subrole=(null) title='' value='•' - AXStaticText subrole=(null) title='' value='Item 3' +AXWebArea subrole=(null) roleDescription='HTML content' title='' value='' + AXList subrole=AXContentList roleDescription='list' title='' value='' + AXGroup subrole=(null) roleDescription='group' title='' value='' + AXListMarker subrole=(null) roleDescription='AXListMarker' title='' value='•' + AXStaticText subrole=(null) roleDescription='text' title='' value='Item 1' + AXGroup subrole=(null) roleDescription='group' title='' value='' + AXListMarker subrole=(null) roleDescription='AXListMarker' title='' value='•' + AXStaticText subrole=(null) roleDescription='text' title='' value='Item 2' + AXGroup subrole=(null) roleDescription='group' title='' value='' + AXListMarker subrole=(null) roleDescription='AXListMarker' title='' value='•' + AXStaticText subrole=(null) roleDescription='text' title='' value='Item 3' diff --git a/content/test/data/accessibility/ul-expected-win.txt b/content/test/data/accessibility/ul-expected-win.txt index 7c3ad1b..f46b02b 100644 --- a/content/test/data/accessibility/ul-expected-win.txt +++ b/content/test/data/accessibility/ul-expected-win.txt @@ -1,11 +1,11 @@ -ROLE_SYSTEM_DOCUMENT name='' READONLY FOCUSABLE - ROLE_SYSTEM_LIST name='' READONLY - ROLE_SYSTEM_LISTITEM name='' READONLY - ROLE_SYSTEM_TEXT name='•' READONLY - ROLE_SYSTEM_TEXT name='Item 1' READONLY - ROLE_SYSTEM_LISTITEM name='' READONLY - ROLE_SYSTEM_TEXT name='•' READONLY - ROLE_SYSTEM_TEXT name='Item 2' READONLY - ROLE_SYSTEM_LISTITEM name='' READONLY - ROLE_SYSTEM_TEXT name='•' READONLY - ROLE_SYSTEM_TEXT name='Item 3' READONLY +ROLE_SYSTEM_DOCUMENT name='' state=FOCUSED,READONLY,FOCUSABLE + ROLE_SYSTEM_LIST name='' state=READONLY + ROLE_SYSTEM_LISTITEM name='' state=READONLY + ROLE_SYSTEM_TEXT name='•' state=READONLY + ROLE_SYSTEM_TEXT name='Item 1' state=READONLY + ROLE_SYSTEM_LISTITEM name='' state=READONLY + ROLE_SYSTEM_TEXT name='•' state=READONLY + ROLE_SYSTEM_TEXT name='Item 2' state=READONLY + ROLE_SYSTEM_LISTITEM name='' state=READONLY + ROLE_SYSTEM_TEXT name='•' state=READONLY + ROLE_SYSTEM_TEXT name='Item 3' state=READONLY |