Title: [90226] trunk/LayoutTests
Revision
90226
Author
[email protected]
Date
2011-07-01 07:18:41 -0700 (Fri, 01 Jul 2011)

Log Message

2011-07-01  Alice Boxhall  <[email protected]>

        Reviewed by Adam Roben.

        accessibility/aria-labelledby-overrides-aria-label.html failing on Windows since it was added
        https://bugs.webkit.org/show_bug.cgi?id=63191

        * accessibility/aria-labelledby-overrides-aria-label-expected.txt: Removed.
        * accessibility/aria-labelledby-overrides-aria-label.html:
        * platform/mac/accessibility/aria-labelledby-overrides-aria-label-expected.txt: Added.
        * platform/win/accessibility/aria-labelledby-overrides-aria-label-expected.txt:

Modified Paths

Added Paths

Removed Paths

Diff

Modified: trunk/LayoutTests/ChangeLog (90225 => 90226)


--- trunk/LayoutTests/ChangeLog	2011-07-01 13:58:18 UTC (rev 90225)
+++ trunk/LayoutTests/ChangeLog	2011-07-01 14:18:41 UTC (rev 90226)
@@ -1,3 +1,15 @@
+2011-07-01  Alice Boxhall  <[email protected]>
+
+        Reviewed by Adam Roben.
+
+        accessibility/aria-labelledby-overrides-aria-label.html failing on Windows since it was added
+        https://bugs.webkit.org/show_bug.cgi?id=63191
+
+        * accessibility/aria-labelledby-overrides-aria-label-expected.txt: Removed.
+        * accessibility/aria-labelledby-overrides-aria-label.html:
+        * platform/mac/accessibility/aria-labelledby-overrides-aria-label-expected.txt: Added.
+        * platform/win/accessibility/aria-labelledby-overrides-aria-label-expected.txt:
+
 2011-07-01  Kentaro Hara  <[email protected]>
 
         Reviewed by Kent Tamura.

Deleted: trunk/LayoutTests/accessibility/aria-labelledby-overrides-aria-label-expected.txt (90225 => 90226)


--- trunk/LayoutTests/accessibility/aria-labelledby-overrides-aria-label-expected.txt	2011-07-01 13:58:18 UTC (rev 90225)
+++ trunk/LayoutTests/accessibility/aria-labelledby-overrides-aria-label-expected.txt	2011-07-01 14:18:41 UTC (rev 90226)
@@ -1,18 +0,0 @@
-Alpha Beta Delta Eta Epsilon Theta
-This tests that if aria-labelledby is used, then aria-label attributes are not used.
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-PASS usingNone.title is "AXTitle: Alpha"
-PASS usingNone.description is "AXDescription: "
-PASS usingLabel.title is "AXTitle: Beta"
-PASS usingLabel.description is "AXDescription: Gamma"
-PASS usingLabelledby.title is "AXTitle: Delta"
-PASS usingLabelledby.description is "AXDescription: Epsilon"
-PASS usingLabeledby.title is "AXTitle: Eta"
-PASS usingLabeledby.description is "AXDescription: Theta"
-PASS successfullyParsed is true
-
-TEST COMPLETE
-

Modified: trunk/LayoutTests/accessibility/aria-labelledby-overrides-aria-label.html (90225 => 90226)


--- trunk/LayoutTests/accessibility/aria-labelledby-overrides-aria-label.html	2011-07-01 13:58:18 UTC (rev 90225)
+++ trunk/LayoutTests/accessibility/aria-labelledby-overrides-aria-label.html	2011-07-01 14:18:41 UTC (rev 90226)
@@ -1,13 +1,9 @@
 <!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
 <html>
 <head>
-<link rel="stylesheet" href=""
-<script>
-var successfullyParsed = false;
-</script>
-<script src=""
 </head>
 <body id="body">
+<p id="description">This tests that if aria-labelledby is used, then aria-label attributes are not used.</p>
 
 <button id="using-none">Alpha</button>
 <button id="using-label" aria-label="Gamma">Beta</button>
@@ -16,53 +12,46 @@
 <span id="epsilon">Epsilon</span>
 <span id="theta">Theta</span>
 
-<p id="description"></p>
-<ul id="console"></ul>
+<ul id="results"></ul>
+<div id="console"></div>
 
 <script>
-    description("This tests that if aria-labelledby is used, then aria-label attributes are not used.");
-
-    function log(str) {
-        var console = document.getElementById("console");
-        var li = document.createElement("li");
-        li.appendChild(document.createTextNode(str));
-        console.appendChild(li);
-    }
-
-    function logAXObject(obj) {
-        log("for " + obj.allAttributes());
-        log("children:\n" + obj.attributesOfChildren());
-        log("obj.title is " + obj.title);
-        log("obj.description is " + obj.description);
-    }
-
     function getAccessibilityObject(id) {
         var element = document.getElementById(id);
         element.focus();
         return accessibilityController.focusedElement;
     }
 
+    function output(str) {
+        var results = document.getElementById("results");
+        var li = document.createElement("li");
+        li.appendChild(document.createTextNode(str));
+        results.appendChild(li);
+    }
+
+    if (window.layoutTestController)
+        layoutTestController.dumpAsText();
+
     if (window.accessibilityController) {
         var usingNone = getAccessibilityObject("using-none");
-        shouldBe("usingNone.title", '"AXTitle: Alpha"');
-        shouldBe("usingNone.description", '"AXDescription: "');
+        output("usingNone.title: [" + usingNone.title + "]");
+        output("usingNone.description:  [" + usingNone.description + "]");
 
         var usingLabel = getAccessibilityObject("using-label");
-        shouldBe("usingLabel.title", '"AXTitle: Beta"');
-        shouldBe("usingLabel.description", '"AXDescription: Gamma"');
+        output("usingLabel.title: [" + usingLabel.title + "]");
+        output("usingLabel.description:  [" + usingLabel.description + "]");
 
         var usingLabelledby = getAccessibilityObject("using-labelledby");
-        shouldBe("usingLabelledby.title", '"AXTitle: Delta"');
-        shouldBe("usingLabelledby.description", '"AXDescription: Epsilon"');
+        output("usingLabelledby.title: [" + usingLabelledby.title + "]");
+        output("usingLabelledby.description:  [" + usingLabelledby.description + "]");
 
         var usingLabeledby = getAccessibilityObject("using-labeledby");
-        shouldBe("usingLabeledby.title", '"AXTitle: Eta"');
-        shouldBe("usingLabeledby.description", '"AXDescription: Theta"');
+        output("usingLabeledby.title: [" + usingLabeledby.title + "]");
+        output("usingLabeledby.description:  [" + usingLabeledby.description + "]");
     }
 
     successfullyParsed = true;
 </script>
 
-<script src=""
 </body>
 </html>

Added: trunk/LayoutTests/platform/mac/accessibility/aria-labelledby-overrides-aria-label-expected.txt (0 => 90226)


--- trunk/LayoutTests/platform/mac/accessibility/aria-labelledby-overrides-aria-label-expected.txt	                        (rev 0)
+++ trunk/LayoutTests/platform/mac/accessibility/aria-labelledby-overrides-aria-label-expected.txt	2011-07-01 14:18:41 UTC (rev 90226)
@@ -0,0 +1,12 @@
+This tests that if aria-labelledby is used, then aria-label attributes are not used.
+
+Alpha Beta Delta Eta Epsilon Theta
+usingNone.title: [AXTitle: Alpha]
+usingNone.description: [AXDescription: ]
+usingLabel.title: [AXTitle: Beta]
+usingLabel.description: [AXDescription: Gamma]
+usingLabelledby.title: [AXTitle: Delta]
+usingLabelledby.description: [AXDescription: Epsilon]
+usingLabeledby.title: [AXTitle: Eta]
+usingLabeledby.description: [AXDescription: Theta]
+

Modified: trunk/LayoutTests/platform/win/accessibility/aria-labelledby-overrides-aria-label-expected.txt (90225 => 90226)


--- trunk/LayoutTests/platform/win/accessibility/aria-labelledby-overrides-aria-label-expected.txt	2011-07-01 13:58:18 UTC (rev 90225)
+++ trunk/LayoutTests/platform/win/accessibility/aria-labelledby-overrides-aria-label-expected.txt	2011-07-01 14:18:41 UTC (rev 90226)
@@ -1,18 +1,12 @@
-Alpha Beta Delta Eta Epsilon Theta
 This tests that if aria-labelledby is used, then aria-label attributes are not used.
 
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+Alpha Beta Delta Eta Epsilon Theta
+usingNone.title: [Alpha]
+usingNone.description: []
+usingLabel.title: [Beta]
+usingLabel.description: [Description: Gamma]
+usingLabelledby.title: [Epsilon]
+usingLabelledby.description: [Description: Epsilon]
+usingLabeledby.title: [Theta]
+usingLabeledby.description: [Description: Theta]
 
-
-FAIL usingNone.title should be AXTitle: Alpha. Was Alpha.
-FAIL usingNone.description should be AXDescription: . Was .
-FAIL usingLabel.title should be AXTitle: Beta. Was Beta.
-FAIL usingLabel.description should be AXDescription: Gamma. Was Description: Gamma.
-FAIL usingLabelledby.title should be AXTitle: Delta. Was Delta.
-FAIL usingLabelledby.description should be AXDescription: Epsilon. Was Description: Epsilon.
-FAIL usingLabeledby.title should be AXTitle: Eta. Was Eta.
-FAIL usingLabeledby.description should be AXDescription: Theta. Was Description: Theta.
-PASS successfullyParsed is true
-
-TEST COMPLETE
-
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to