Diff
Modified: trunk/LayoutTests/ChangeLog (130822 => 130823)
--- trunk/LayoutTests/ChangeLog 2012-10-09 22:45:51 UTC (rev 130822)
+++ trunk/LayoutTests/ChangeLog 2012-10-09 23:15:21 UTC (rev 130823)
@@ -1,3 +1,31 @@
+2012-10-09 Dominic Mazzoni <dmazz...@google.com>
+
+ AX: 5 accessibility tests just need minor tweaks to pass on chromium
+ https://bugs.webkit.org/show_bug.cgi?id=98311
+
+ Reviewed by Chris Fleizach.
+
+ Modifies tests so that they log data that tends to vary between
+ platforms using debug(), rather than asserting a platform-specific
+ value. Gets rid of "forks" of tests in the gtk directory. Adds
+ expectations and unskips 5 tests on Chromium.
+
+ * accessibility/aria-list-and-listitem.html:
+ * accessibility/aria-option-role.html:
+ * accessibility/aria-tab-roles.html:
+ * platform/chromium/TestExpectations:
+ * platform/chromium/accessibility/aria-fallback-roles-expected.txt: Renamed from LayoutTests/platform/chromium-win/accessibility/aria-fallback-roles-expected.txt.
+ * platform/chromium/accessibility/aria-list-and-listitem-expected.txt: Copied from LayoutTests/platform/mac/accessibility/aria-list-and-listitem-expected.txt.
+ * platform/chromium/accessibility/aria-option-role-expected.txt: Copied from LayoutTests/platform/mac/accessibility/aria-option-role-expected.txt.
+ * platform/chromium/accessibility/aria-tab-roles-expected.txt: Copied from LayoutTests/platform/mac/accessibility/aria-tab-roles-expected.txt.
+ * platform/gtk/accessibility/aria-list-and-listitem-expected.txt:
+ * platform/gtk/accessibility/aria-list-and-listitem.html: Removed.
+ * platform/gtk/accessibility/aria-option-role-expected.txt:
+ * platform/gtk/accessibility/aria-option-role.html: Removed.
+ * platform/mac/accessibility/aria-list-and-listitem-expected.txt:
+ * platform/mac/accessibility/aria-option-role-expected.txt:
+ * platform/mac/accessibility/aria-tab-roles-expected.txt:
+
2012-10-09 Levi Weintraub <le...@chromium.org>
Rolling back unintended change to iframe-copy-on-scroll.html from previous commit.
Modified: trunk/LayoutTests/accessibility/aria-list-and-listitem.html (130822 => 130823)
--- trunk/LayoutTests/accessibility/aria-list-and-listitem.html 2012-10-09 22:45:51 UTC (rev 130822)
+++ trunk/LayoutTests/accessibility/aria-list-and-listitem.html 2012-10-09 23:15:21 UTC (rev 130823)
@@ -23,9 +23,9 @@
document.getElementById("body").focus();
var obj = accessibilityController.focusedElement;
- shouldBe("obj.childAtIndex(0).role", "'AXRole: AXList'");
- shouldBe("obj.childAtIndex(0).childAtIndex(0).role", "'AXRole: AXGroup'");
- shouldBe("obj.childAtIndex(0).childAtIndex(1).role", "'AXRole: AXGroup'");
+ debug("obj.childAtIndex(0).role = " + obj.childAtIndex(0).role);
+ debug("obj.childAtIndex(0).childAtIndex(0).role = " + obj.childAtIndex(0).childAtIndex(0).role);
+ debug("obj.childAtIndex(0).childAtIndex(1).role = " + obj.childAtIndex(0).childAtIndex(1).role);
}
</script>
Modified: trunk/LayoutTests/accessibility/aria-option-role.html (130822 => 130823)
--- trunk/LayoutTests/accessibility/aria-option-role.html 2012-10-09 22:45:51 UTC (rev 130822)
+++ trunk/LayoutTests/accessibility/aria-option-role.html 2012-10-09 23:15:21 UTC (rev 130823)
@@ -25,10 +25,10 @@
var listBox = accessibilityController.focusedElement.childAtIndex(0);
var firstChild = listBox.childAtIndex(0);
var secondChild = listBox.childAtIndex(1);
- shouldBe("firstChild.role", "'AXRole: AXStaticText'");
+ debug("firstChild.role is " + firstChild.role);
shouldBe("firstChild.title", "'AXTitle: option 1'");
- shouldBe("secondChild.role", "'AXRole: AXStaticText'");
+ debug("secondChild.role is " + secondChild.role);
shouldBe("secondChild.description", "'AXDescription: label 2'");
shouldBe("firstChild.childrenCount", "0");
Modified: trunk/LayoutTests/accessibility/aria-tab-roles.html (130822 => 130823)
--- trunk/LayoutTests/accessibility/aria-tab-roles.html 2012-10-09 22:45:51 UTC (rev 130822)
+++ trunk/LayoutTests/accessibility/aria-tab-roles.html 2012-10-09 23:15:21 UTC (rev 130823)
@@ -32,14 +32,14 @@
var tab2 = tabList.childAtIndex(1);
var tabPanel = accessibilityController.focusedElement.childAtIndex(1);
- shouldBe("tabList.role", "'AXRole: AXTabGroup'");
- shouldBe("tab1.role", "'AXRole: AXRadioButton'");
+ debug("tabList.role = " + tabList.role);
+ debug("tab1.role = " + tab1.role);
shouldBe("tab1.title", "'AXTitle: Crust'");
shouldBe("tab1.childrenCount", "0");
- shouldBe("tab2.role", "'AXRole: AXRadioButton'");
+ debug("tab2.role = " + tab2.role);
shouldBe("tab2.title", "'AXTitle: Veges'");
- shouldBe("tabPanel.role", "'AXRole: AXGroup'");
- shouldBe("tabPanel.subrole", "'AXSubrole: AXTabPanel'");
+ debug("tabPanel.role = " + tabPanel.role);
+ debug("tabPanel.subrole = " + tabPanel.subrole);
}
</script>
Modified: trunk/LayoutTests/platform/chromium/TestExpectations (130822 => 130823)
--- trunk/LayoutTests/platform/chromium/TestExpectations 2012-10-09 22:45:51 UTC (rev 130822)
+++ trunk/LayoutTests/platform/chromium/TestExpectations 2012-10-09 23:15:21 UTC (rev 130823)
@@ -1379,15 +1379,10 @@
crbug.com/10322 accessibility/aria-activedescendant-crash.html [ Skip ]
crbug.com/10322 accessibility/aria-combobox.html [ Skip ]
crbug.com/10322 accessibility/aria-controls-with-tabs.html [ Skip ]
-crbug.com/10322 accessibility/aria-fallback-roles.html [ Skip ]
-crbug.com/10322 accessibility/aria-hidden-update.html [ Skip ]
crbug.com/10322 accessibility/aria-invalid.html [ Skip ]
crbug.com/10322 accessibility/aria-labelledby-overrides-label.html [ Skip ]
crbug.com/10322 accessibility/aria-link-supports-press.html [ Skip ]
-crbug.com/10322 accessibility/aria-list-and-listitem.html [ Skip ]
crbug.com/10322 accessibility/aria-menubar-menuitems.html [ Skip ]
-crbug.com/10322 accessibility/aria-option-role.html [ Skip ]
-crbug.com/10322 accessibility/aria-tab-roles.html [ Skip ]
crbug.com/10322 accessibility/aria-tables.html [ Skip ]
crbug.com/10322 accessibility/aria-text-role.html [ Skip ]
crbug.com/10322 accessibility/aria-used-on-image-maps.html [ Skip ]
Copied: trunk/LayoutTests/platform/chromium/accessibility/aria-fallback-roles-expected.txt (from rev 130822, trunk/LayoutTests/platform/chromium-win/accessibility/aria-fallback-roles-expected.txt) (0 => 130823)
--- trunk/LayoutTests/platform/chromium/accessibility/aria-fallback-roles-expected.txt (rev 0)
+++ trunk/LayoutTests/platform/chromium/accessibility/aria-fallback-roles-expected.txt 2012-10-09 23:15:21 UTC (rev 130823)
@@ -0,0 +1,8 @@
+test
+This tests that aria fallback roles work correctly.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+Role should be: AXRole: AXCheckBox
+
Copied: trunk/LayoutTests/platform/chromium/accessibility/aria-list-and-listitem-expected.txt (from rev 130822, trunk/LayoutTests/platform/mac/accessibility/aria-list-and-listitem-expected.txt) (0 => 130823)
--- trunk/LayoutTests/platform/chromium/accessibility/aria-list-and-listitem-expected.txt (rev 0)
+++ trunk/LayoutTests/platform/chromium/accessibility/aria-list-and-listitem-expected.txt 2012-10-09 23:15:21 UTC (rev 130823)
@@ -0,0 +1,14 @@
+
+
+This tests that the ARIA roles of list and listitem map correctly to Mac accessibility roles.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+obj.childAtIndex(0).role = AXRole: AXList
+obj.childAtIndex(0).childAtIndex(0).role = AXRole: AXListItem
+obj.childAtIndex(0).childAtIndex(1).role = AXRole: AXListItem
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
Copied: trunk/LayoutTests/platform/chromium/accessibility/aria-option-role-expected.txt (from rev 130822, trunk/LayoutTests/platform/mac/accessibility/aria-option-role-expected.txt) (0 => 130823)
--- trunk/LayoutTests/platform/chromium/accessibility/aria-option-role-expected.txt (rev 0)
+++ trunk/LayoutTests/platform/chromium/accessibility/aria-option-role-expected.txt 2012-10-09 23:15:21 UTC (rev 130823)
@@ -0,0 +1,17 @@
+option 1
+option 2
+This tests that the aria 'option' role works as expected. That is, it becomes a static text element with no children.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+firstChild.role is AXRole: AXListBoxOption
+PASS firstChild.title is 'AXTitle: option 1'
+secondChild.role is AXRole: AXListBoxOption
+PASS secondChild.description is 'AXDescription: label 2'
+PASS firstChild.childrenCount is 0
+PASS secondChild.childrenCount is 0
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
Copied: trunk/LayoutTests/platform/chromium/accessibility/aria-tab-roles-expected.txt (from rev 130822, trunk/LayoutTests/platform/mac/accessibility/aria-tab-roles-expected.txt) (0 => 130823)
--- trunk/LayoutTests/platform/chromium/accessibility/aria-tab-roles-expected.txt (rev 0)
+++ trunk/LayoutTests/platform/chromium/accessibility/aria-tab-roles-expected.txt 2012-10-09 23:15:21 UTC (rev 130823)
@@ -0,0 +1,21 @@
+Crust
+Veges
+Select Crust
+
+This tests that the aria roles for tab, tabpanel and tablist work as expected correctly.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+tabList.role = AXRole: AXTabList
+tab1.role = AXRole: AXTab
+PASS tab1.title is 'AXTitle: Crust'
+PASS tab1.childrenCount is 0
+tab2.role = AXRole: AXTab
+PASS tab2.title is 'AXTitle: Veges'
+tabPanel.role = AXRole: AXTabPanel
+tabPanel.subrole = undefined
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
Deleted: trunk/LayoutTests/platform/chromium-win/accessibility/aria-fallback-roles-expected.txt (130822 => 130823)
--- trunk/LayoutTests/platform/chromium-win/accessibility/aria-fallback-roles-expected.txt 2012-10-09 22:45:51 UTC (rev 130822)
+++ trunk/LayoutTests/platform/chromium-win/accessibility/aria-fallback-roles-expected.txt 2012-10-09 23:15:21 UTC (rev 130823)
@@ -1,8 +0,0 @@
-test
-This tests that aria fallback roles work correctly.
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-Role should be: check box
-
Modified: trunk/LayoutTests/platform/gtk/accessibility/aria-list-and-listitem-expected.txt (130822 => 130823)
--- trunk/LayoutTests/platform/gtk/accessibility/aria-list-and-listitem-expected.txt 2012-10-09 22:45:51 UTC (rev 130822)
+++ trunk/LayoutTests/platform/gtk/accessibility/aria-list-and-listitem-expected.txt 2012-10-09 23:15:21 UTC (rev 130823)
@@ -5,9 +5,9 @@
On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-PASS obj.childAtIndex(0).role is 'AXRole: list'
-PASS obj.childAtIndex(0).childAtIndex(0).role is 'AXRole: list item'
-PASS obj.childAtIndex(0).childAtIndex(1).role is 'AXRole: list item'
+obj.childAtIndex(0).role = AXRole: list
+obj.childAtIndex(0).childAtIndex(0).role = AXRole: list item
+obj.childAtIndex(0).childAtIndex(1).role = AXRole: list item
PASS successfullyParsed is true
TEST COMPLETE
Deleted: trunk/LayoutTests/platform/gtk/accessibility/aria-list-and-listitem.html (130822 => 130823)
--- trunk/LayoutTests/platform/gtk/accessibility/aria-list-and-listitem.html 2012-10-09 22:45:51 UTC (rev 130822)
+++ trunk/LayoutTests/platform/gtk/accessibility/aria-list-and-listitem.html 2012-10-09 23:15:21 UTC (rev 130823)
@@ -1,35 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
-<html>
-<head>
-<script src=""
-</head>
-<body id="body">
-
-<div role="list">
-<div role="listitem" aria-label="item 1"><img src='' width=100 height=100></div>
-<div role="listitem" aria-label="item 2"><img src='' width=100 height=100></div>
-</div>
-
-<p id="description"></p>
-<div id="console"></div>
-
-<script>
-
- description("This tests that the ARIA roles of list and listitem map correctly to Mac accessibility roles.");
-
- if (window.accessibilityController) {
-
- // this text field should be required.
- document.getElementById("body").focus();
- var obj = accessibilityController.focusedElement;
-
- shouldBe("obj.childAtIndex(0).role", "'AXRole: list'");
- shouldBe("obj.childAtIndex(0).childAtIndex(0).role", "'AXRole: list item'");
- shouldBe("obj.childAtIndex(0).childAtIndex(1).role", "'AXRole: list item'");
- }
-
-</script>
-
-<script src=""
-</body>
-</html>
Modified: trunk/LayoutTests/platform/gtk/accessibility/aria-option-role-expected.txt (130822 => 130823)
--- trunk/LayoutTests/platform/gtk/accessibility/aria-option-role-expected.txt 2012-10-09 22:45:51 UTC (rev 130822)
+++ trunk/LayoutTests/platform/gtk/accessibility/aria-option-role-expected.txt 2012-10-09 23:15:21 UTC (rev 130823)
@@ -1,13 +1,13 @@
option 1
option 2
-This tests that the aria 'option' role works as expected.
+This tests that the aria 'option' role works as expected. That is, it becomes a static text element with no children.
On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-PASS firstChild.role is 'AXRole: list item'
+firstChild.role is AXRole: list item
PASS firstChild.title is 'AXTitle: option 1'
-PASS secondChild.role is 'AXRole: list item'
+secondChild.role is AXRole: list item
PASS secondChild.description is 'AXDescription: label 2'
PASS firstChild.childrenCount is 0
PASS secondChild.childrenCount is 0
Deleted: trunk/LayoutTests/platform/gtk/accessibility/aria-option-role.html (130822 => 130823)
--- trunk/LayoutTests/platform/gtk/accessibility/aria-option-role.html 2012-10-09 22:45:51 UTC (rev 130822)
+++ trunk/LayoutTests/platform/gtk/accessibility/aria-option-role.html 2012-10-09 23:15:21 UTC (rev 130823)
@@ -1,42 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
-<html>
-<head>
-<script src=""
-</head>
-<body id="body">
-
-<div role="listbox">
-<div role="option">option 1</div>
-<div role="option" aria-label="label 2">option 2</div>
-</div>
-
-<p id="description"></p>
-<div id="console"></div>
-
-<script>
-
- description("This tests that the aria 'option' role works as expected.");
-
- if (window.accessibilityController) {
-
- var body = document.getElementById("body");
- body.focus();
-
- var listBox = accessibilityController.focusedElement.childAtIndex(0);
- var firstChild = listBox.childAtIndex(0);
- var secondChild = listBox.childAtIndex(1);
- shouldBe("firstChild.role", "'AXRole: list item'");
- shouldBe("firstChild.title", "'AXTitle: option 1'");
-
- shouldBe("secondChild.role", "'AXRole: list item'");
- shouldBe("secondChild.description", "'AXDescription: label 2'");
-
- shouldBe("firstChild.childrenCount", "0");
- shouldBe("secondChild.childrenCount", "0");
- }
-
-</script>
-
-<script src=""
-</body>
-</html>
Modified: trunk/LayoutTests/platform/mac/accessibility/aria-list-and-listitem-expected.txt (130822 => 130823)
--- trunk/LayoutTests/platform/mac/accessibility/aria-list-and-listitem-expected.txt 2012-10-09 22:45:51 UTC (rev 130822)
+++ trunk/LayoutTests/platform/mac/accessibility/aria-list-and-listitem-expected.txt 2012-10-09 23:15:21 UTC (rev 130823)
@@ -5,9 +5,9 @@
On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-PASS obj.childAtIndex(0).role is 'AXRole: AXList'
-PASS obj.childAtIndex(0).childAtIndex(0).role is 'AXRole: AXGroup'
-PASS obj.childAtIndex(0).childAtIndex(1).role is 'AXRole: AXGroup'
+obj.childAtIndex(0).role = AXRole: AXList
+obj.childAtIndex(0).childAtIndex(0).role = AXRole: AXGroup
+obj.childAtIndex(0).childAtIndex(1).role = AXRole: AXGroup
PASS successfullyParsed is true
TEST COMPLETE
Modified: trunk/LayoutTests/platform/mac/accessibility/aria-option-role-expected.txt (130822 => 130823)
--- trunk/LayoutTests/platform/mac/accessibility/aria-option-role-expected.txt 2012-10-09 22:45:51 UTC (rev 130822)
+++ trunk/LayoutTests/platform/mac/accessibility/aria-option-role-expected.txt 2012-10-09 23:15:21 UTC (rev 130823)
@@ -5,9 +5,9 @@
On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-PASS firstChild.role is 'AXRole: AXStaticText'
+firstChild.role is AXRole: AXStaticText
PASS firstChild.title is 'AXTitle: option 1'
-PASS secondChild.role is 'AXRole: AXStaticText'
+secondChild.role is AXRole: AXStaticText
PASS secondChild.description is 'AXDescription: label 2'
PASS firstChild.childrenCount is 0
PASS secondChild.childrenCount is 0
Modified: trunk/LayoutTests/platform/mac/accessibility/aria-tab-roles-expected.txt (130822 => 130823)
--- trunk/LayoutTests/platform/mac/accessibility/aria-tab-roles-expected.txt 2012-10-09 22:45:51 UTC (rev 130822)
+++ trunk/LayoutTests/platform/mac/accessibility/aria-tab-roles-expected.txt 2012-10-09 23:15:21 UTC (rev 130823)
@@ -7,14 +7,14 @@
On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-PASS tabList.role is 'AXRole: AXTabGroup'
-PASS tab1.role is 'AXRole: AXRadioButton'
+tabList.role = AXRole: AXTabGroup
+tab1.role = AXRole: AXRadioButton
PASS tab1.title is 'AXTitle: Crust'
PASS tab1.childrenCount is 0
-PASS tab2.role is 'AXRole: AXRadioButton'
+tab2.role = AXRole: AXRadioButton
PASS tab2.title is 'AXTitle: Veges'
-PASS tabPanel.role is 'AXRole: AXGroup'
-PASS tabPanel.subrole is 'AXSubrole: AXTabPanel'
+tabPanel.role = AXRole: AXGroup
+tabPanel.subrole = AXSubrole: AXTabPanel
PASS successfullyParsed is true
TEST COMPLETE
Modified: trunk/Tools/ChangeLog (130822 => 130823)
--- trunk/Tools/ChangeLog 2012-10-09 22:45:51 UTC (rev 130822)
+++ trunk/Tools/ChangeLog 2012-10-09 23:15:21 UTC (rev 130823)
@@ -1,3 +1,16 @@
+2012-10-09 Dominic Mazzoni <dmazz...@google.com>
+
+ AX: 5 accessibility tests just need minor tweaks to pass on chromium
+ https://bugs.webkit.org/show_bug.cgi?id=98311
+
+ Reviewed by Chris Fleizach.
+
+ Update roleToString on Chromium to include all missing roles,
+ which enables some layout tests to pass.
+
+ * DumpRenderTree/chromium/TestRunner/AccessibilityUIElementChromium.cpp:
+ (roleToString):
+
2012-10-09 Dirk Pranke <dpra...@chromium.org>
webkit-patch rebaseline-expectations doesn't work w/o failures specified
Modified: trunk/Tools/DumpRenderTree/chromium/TestRunner/AccessibilityUIElementChromium.cpp (130822 => 130823)
--- trunk/Tools/DumpRenderTree/chromium/TestRunner/AccessibilityUIElementChromium.cpp 2012-10-09 22:45:51 UTC (rev 130822)
+++ trunk/Tools/DumpRenderTree/chromium/TestRunner/AccessibilityUIElementChromium.cpp 2012-10-09 23:15:21 UTC (rev 130823)
@@ -221,8 +221,47 @@
return result.append("HorizontalRule");
case WebAccessibilityRoleLegend:
return result.append("Legend");
- default:
- // Also matches WebAccessibilityRoleUnknown.
+ case WebAccessibilityRoleApplicationAlert:
+ return result.append("Alert");
+ case WebAccessibilityRoleApplicationAlertDialog:
+ return result.append("AlertDialog");
+ case WebAccessibilityRoleApplicationDialog:
+ return result.append("ApplicationDialog");
+ case WebAccessibilityRoleDirectory:
+ return result.append("Directory");
+ case WebAccessibilityRoleDocumentMath:
+ return result.append("Math");
+ case WebAccessibilityRoleEditableText:
+ return result.append("EditableText");
+ case WebAccessibilityRoleFooter:
+ return result.append("Footer");
+ case WebAccessibilityRoleIgnored:
+ return result.append("Ignored");
+ case WebAccessibilityRoleListItem:
+ return result.append("ListItem");
+ case WebAccessibilityRoleMenuListPopup:
+ return result.append("MenuListPopup");
+ case WebAccessibilityRoleMenuListOption:
+ return result.append("MenuListOption");
+ case WebAccessibilityRolePresentational:
+ return result.append("Presentational");
+ case WebAccessibilityRoleSpinButton:
+ return result.append("SpinButton");
+ case WebAccessibilityRoleSpinButtonPart:
+ return result.append("SpinButtonPart");
+ case WebAccessibilityRoleTabList:
+ return result.append("TabList");
+ case WebAccessibilityRoleTabPanel:
+ return result.append("TabPanel");
+ case WebAccessibilityRoleTab:
+ return result.append("Tab");
+ case WebAccessibilityRoleTreeRole:
+ return result.append("Tree");
+ case WebAccessibilityRoleTreeGrid:
+ return result.append("TreeGrid");
+ case WebAccessibilityRoleTreeItemRole:
+ return result.append("TreeItem");
+ case WebAccessibilityRoleUnknown:
return result.append("Unknown");
}
}