[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-10851-g50815da
cfleizach at apple.com
cfleizach at apple.com
Wed Dec 22 18:33:00 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 04bb0ab79d35ee13b79ff6e9510a82aeb1e52d70
Author: cfleizach at apple.com <cfleizach at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Dec 13 22:15:50 2010 +0000
2010-12-13 Chris Fleizach <cfleizach at apple.com>
Reviewed by Beth Dakin.
Fix legend.htm accessibility test so it doesn't dump all attributes
https://bugs.webkit.org/show_bug.cgi?id=50957
* accessibility/legend.html:
* platform/mac/accessibility/legend-expected.txt:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@73961 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 55f2bbf..ae5dabc 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,13 @@
+2010-12-13 Chris Fleizach <cfleizach at apple.com>
+
+ Reviewed by Beth Dakin.
+
+ Fix legend.htm accessibility test so it doesn't dump all attributes
+ https://bugs.webkit.org/show_bug.cgi?id=50957
+
+ * accessibility/legend.html:
+ * platform/mac/accessibility/legend-expected.txt:
+
2010-12-13 Sheriff Bot <webkit.review.bot at gmail.com>
Unreviewed, rolling out r73922.
diff --git a/LayoutTests/accessibility/legend.html b/LayoutTests/accessibility/legend.html
index e554138..b85e52e 100644
--- a/LayoutTests/accessibility/legend.html
+++ b/LayoutTests/accessibility/legend.html
@@ -1,35 +1,42 @@
+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
<html>
+<head>
+<link rel="stylesheet" href="../fast/js/resources/js-test-style.css">
<script>
- if (window.layoutTestController)
- layoutTestController.dumpAsText();
+var successfullyParsed = false;
</script>
+<script src="../fast/js/resources/js-test-pre.js"></script>
+</head>
<body id="body">
-
- <!-- this test should output the attributes of the fieldset which should be a group
- and it's title ui element's children, which should be the <legend> tag's static text -->
- <fieldset>
- <legend>Choose a shipping method:</legend>
- <input id="overnight" type="radio" name="shipping" value="overnight" />Overnight
- </fieldset>
+<fieldset>
+ <legend>Choose a shipping method:</legend>
+ <input id="overnight" type="radio" name="shipping" value="overnight" />Overnight
+</fieldset>
-
- <div id="result"></div>
+<p id="description"></p>
+<div id="console"></div>
+
+<script>
+
+ description("This tests that a fieldset's title ui element is the legend's static text.");
+ if (window.accessibilityController) {
-
- <script>
if (window.accessibilityController) {
- var result = document.getElementById("result");
var body = document.getElementById("body");
body.focus();
+
var fieldset = accessibilityController.focusedElement.childAtIndex(0);
var titleUIElement = fieldset.titleUIElement();
-
- result.innerText += fieldset.allAttributes() + "\n\n";
- result.innerText += "-----------------------------\n\n";
- result.innerText += titleUIElement.attributesOfChildren() + "\n\n";
+ shouldBe("titleUIElement.role", "'AXRole: AXGroup'");
+ shouldBe("titleUIElement.childAtIndex(0).role", "'AXRole: AXStaticText'");
+ shouldBe("titleUIElement.childAtIndex(0).stringValue", "'AXValue: Choose a shipping method:'");
}
- </script>
+ }
+ successfullyParsed = true;
+</script>
+
+<script src="../../../fast/js/resources/js-test-post.js"></script>
</body>
</html>
diff --git a/LayoutTests/platform/mac/accessibility/legend-expected.txt b/LayoutTests/platform/mac/accessibility/legend-expected.txt
index 6404e43..91f9d42 100644
--- a/LayoutTests/platform/mac/accessibility/legend-expected.txt
+++ b/LayoutTests/platform/mac/accessibility/legend-expected.txt
@@ -1,56 +1,11 @@
Choose a shipping method:
Overnight
-AXRole: AXGroup
-AXSubrole: (null)
-AXRoleDescription: group
-AXChildren: <array of size 2>
-AXHelp:
-AXParent: <AXGroup>
-AXSize: NSSize: {780, 54}
-AXTitle:
-AXDescription:
-AXValue:
-AXFocused: 0
-AXEnabled: 1
-AXWindow: <AXGroup>
-AXSelectedTextMarkerRange: (null)
-AXStartTextMarker: <AXGroup>
-AXEndTextMarker: <AXGroup>
-AXVisited: 0
-AXLinkedUIElements: (null)
-AXSelected: 0
-AXBlockQuoteLevel: 0
-AXTopLevelUIElement: <AXGroup>
-AXTitleUIElement: <AXGroup>
-AXAccessKey: (null)
-AXRequired: 0
+This tests that a fieldset's title ui element is the legend's static text.
-
------------------------------
-
-AXRole: AXStaticText
-AXSubrole: (null)
-AXRoleDescription: text
-AXChildren: <array of size 0>
-AXHelp:
-AXParent: <AXStaticText>
-AXSize: NSSize: {172, 18}
-AXTitle:
-AXDescription:
-AXValue: Choose a shipping method:
-AXFocused: 0
-AXEnabled: 1
-AXWindow: <AXStaticText>
-AXSelectedTextMarkerRange: (null)
-AXStartTextMarker: <AXStaticText>
-AXEndTextMarker: <AXStaticText>
-AXVisited: 0
-AXLinkedUIElements: (null)
-AXSelected: 0
-AXBlockQuoteLevel: 0
-AXTopLevelUIElement: <AXStaticText>
-
-------------
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+PASS titleUIElement.role is 'AXRole: AXGroup'
+PASS titleUIElement.childAtIndex(0).role is 'AXRole: AXStaticText'
+PASS titleUIElement.childAtIndex(0).stringValue is 'AXValue: Choose a shipping method:'
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list