<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[186264] trunk/LayoutTests</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/186264">186264</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2015-07-03 13:50:49 -0700 (Fri, 03 Jul 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Unreviewed, tentative fix for flaky layout test introduced in <a href="http://trac.webkit.org/projects/webkit/changeset/186256">r186256</a>.
* platform/mac/accessibility/selection-notification-focus-change-expected.txt:
* platform/mac/accessibility/selection-notification-focus-change.html:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsplatformmacaccessibilityselectionnotificationfocuschangeexpectedtxt">trunk/LayoutTests/platform/mac/accessibility/selection-notification-focus-change-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacaccessibilityselectionnotificationfocuschangehtml">trunk/LayoutTests/platform/mac/accessibility/selection-notification-focus-change.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (186263 => 186264)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog        2015-07-03 20:39:08 UTC (rev 186263)
+++ trunk/LayoutTests/ChangeLog        2015-07-03 20:50:49 UTC (rev 186264)
</span><span class="lines">@@ -1,3 +1,10 @@
</span><ins>+2015-07-03 Chris Dumez <cdumez@apple.com>
+
+ Unreviewed, tentative fix for flaky layout test introduced in r186256.
+
+ * platform/mac/accessibility/selection-notification-focus-change-expected.txt:
+ * platform/mac/accessibility/selection-notification-focus-change.html:
+
</ins><span class="cx"> 2015-07-02 Doug Russell <d_russell@apple.com>
</span><span class="cx">
</span><span class="cx"> AX: Selection change as a result of focusing an element should include that
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacaccessibilityselectionnotificationfocuschangeexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/accessibility/selection-notification-focus-change-expected.txt (186263 => 186264)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/accessibility/selection-notification-focus-change-expected.txt        2015-07-03 20:39:08 UTC (rev 186263)
+++ trunk/LayoutTests/platform/mac/accessibility/selection-notification-focus-change-expected.txt        2015-07-03 20:50:49 UTC (rev 186264)
</span><span class="lines">@@ -1,6 +1,3 @@
</span><del>-
- 1
- 2
</del><span class="cx"> This tests that selection changes as a result of advancing focus include AXTextSelectionChangedFocus flag.
</span><span class="cx">
</span><span class="cx"> On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
</span><span class="lines">@@ -10,9 +7,11 @@
</span><span class="cx"> PASS axTextFocusChangeOne is true
</span><span class="cx"> PASS axTextFocusChangeTwo is true
</span><span class="cx"> PASS accessibilityController.accessibleElementById("1").isFocusable is true
</span><ins>+PASS axTextFocusChangeThree is true
+PASS axTextFocusChangeFour is true
</ins><span class="cx"> PASS successfullyParsed is true
</span><span class="cx">
</span><span class="cx"> TEST COMPLETE
</span><del>-PASS axTextFocusChangeThree is true
-PASS axTextFocusChangeFour is true
</del><span class="cx">
</span><ins>+ 1
+ 2
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformmacaccessibilityselectionnotificationfocuschangehtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/accessibility/selection-notification-focus-change.html (186263 => 186264)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/accessibility/selection-notification-focus-change.html        2015-07-03 20:39:08 UTC (rev 186263)
+++ trunk/LayoutTests/platform/mac/accessibility/selection-notification-focus-change.html        2015-07-03 20:50:49 UTC (rev 186264)
</span><span class="lines">@@ -1,9 +1,9 @@
</span><del>-<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
</del><ins>+<!DOCTYPE html>
</ins><span class="cx"> <html>
</span><span class="cx"> <head>
</span><span class="cx"> <script src="../../../resources/js-test-pre.js"></script>
</span><span class="cx"> </head>
</span><del>- <body id="body">
</del><ins>+ <body id="body" onload="runTest()">
</ins><span class="cx"> <fieldset>
</span><span class="cx"> <div>
</span><span class="cx"> <input id="1">
</span><span class="lines">@@ -14,11 +14,9 @@
</span><span class="cx"> <label for="2">2</label>
</span><span class="cx"> </div>
</span><span class="cx"> </fieldset>
</span><del>- <p id="description"></p>
- <div id="console"></div>
- <div id="notifications"></div>
</del><span class="cx"> <script>
</span><span class="cx"> description("This tests that selection changes as a result of advancing focus include AXTextSelectionChangedFocus flag.");
</span><ins>+ jsTestIsAsync = true;
</ins><span class="cx">
</span><span class="cx"> var webArea = 0;
</span><span class="cx"> var axTextFocusChangeOne = 0;
</span><span class="lines">@@ -37,44 +35,44 @@
</span><span class="cx"> selectCount++;
</span><span class="cx"> if (selectCount == 1) {
</span><span class="cx"> axTextFocusChangeOne = userInfo["AXTextSelectionChangedFocus"];
</span><del>- shouldBe("axTextFocusChangeOne", "true");
</del><ins>+ shouldBeTrue("axTextFocusChangeOne");
</ins><span class="cx"> } else if (selectCount == 2) {
</span><span class="cx"> axTextFocusChangeTwo = userInfo["AXTextSelectionChangedFocus"];
</span><del>- shouldBe("axTextFocusChangeTwo", "true");
</del><ins>+ shouldBeTrue("axTextFocusChangeTwo");
</ins><span class="cx">
</span><del>- shouldBe("accessibilityController.accessibleElementById(\"1\").isFocusable", "true");
</del><ins>+ shouldBeTrue("accessibilityController.accessibleElementById(\"1\").isFocusable");
</ins><span class="cx"> accessibilityController.accessibleElementById("1").takeFocus();
</span><span class="cx"> } else if (selectCount == 3) {
</span><span class="cx"> axTextFocusChangeThree = userInfo["AXTextSelectionChangedFocus"];
</span><del>- shouldBe("axTextFocusChangeThree", "true");
</del><ins>+ shouldBeTrue("axTextFocusChangeThree");
</ins><span class="cx"> } else if (selectCount == 4) {
</span><span class="cx"> axTextFocusChangeFour = userInfo["AXTextSelectionChangedFocus"];
</span><del>- shouldBe("axTextFocusChangeFour", "true");
</del><ins>+ shouldBeTrue("axTextFocusChangeFour");
</ins><span class="cx"> }
</span><span class="cx"> } else if (notification == "AXFocusChanged") {
</span><span class="cx"> focusCount++;
</span><del>- if (focusCount == 2) {
</del><ins>+ if (focusCount == 2)
</ins><span class="cx"> eventSender.scheduleAsynchronousKeyDown("\t");
</span><del>- }
</del><span class="cx"> }
</span><span class="cx"> if (selectCount == 4 && focusCount == 3) {
</span><span class="cx"> webArea.removeNotificationListener();
</span><del>- testRunner.notifyDone();
</del><ins>+ finishJSTest();
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (window.accessibilityController) {
- testRunner.waitUntilDone();
- testRunner.overridePreference("WebKitTabToLinksPreferenceKey", 1);
</del><ins>+ function runTest() {
+ if (window.accessibilityController) {
+ testRunner.overridePreference("WebKitTabToLinksPreferenceKey", 1);
</ins><span class="cx">
</span><del>- accessibilityController.enableEnhancedAccessibility(true);
- webArea = accessibilityController.rootElement.childAtIndex(0);
- webArea.setBoolAttributeValue("AXCaretBrowsingEnabled", true)
</del><ins>+ accessibilityController.enableEnhancedAccessibility(true);
+ webArea = accessibilityController.rootElement.childAtIndex(0);
+ webArea.setBoolAttributeValue("AXCaretBrowsingEnabled", true)
</ins><span class="cx">
</span><del>- var addedNotification = webArea.addNotificationListener(notificationCallback);
- shouldBe("addedNotification", "true");
</del><ins>+ addedNotification = webArea.addNotificationListener(notificationCallback);
+ shouldBeTrue("addedNotification");
</ins><span class="cx">
</span><del>- eventSender.keyDown("\t");
</del><ins>+ eventSender.keyDown("\t");
+ }
</ins><span class="cx"> }
</span><span class="cx"> </script>
</span><span class="cx"> <script src="../../../resources/js-test-post.js"></script>
</span></span></pre>
</div>
</div>
</body>
</html>