<!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>[163615] 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/163615">163615</a></dd>
<dt>Author</dt> <dd>g.czajkowski@samsung.com</dd>
<dt>Date</dt> <dd>2014-02-07 01:20:03 -0800 (Fri, 07 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Verify misspellings after lines merge/split asynchronously
https://bugs.webkit.org/show_bug.cgi?id=128305
Reviewed by Ryosuke Niwa.
Adapt two spelling tests to use asynchronous spellchecking.
* editing/spelling/script-tests/spelling-backspace-between-lines.js:
(testTwoLinesMisspellings):
(testMisspellingsAfterLineMergeUsingDelete):
(testMisspellingsAfterLineMergeUsingForwardDelete):
Group test cases into separated methods.
Use shouldBeEqualToString to compare strings.
Add newly created div elements instead of overriding
the previous one in order that non DumpRenderTree users
can see what has been tested.
* editing/spelling/spelling-backspace-between-lines-expected.txt:
* editing/spelling/spelling-linebreak-expected.txt:
* editing/spelling/spelling-linebreak.html:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestseditingspellingscripttestsspellingbackspacebetweenlinesjs">trunk/LayoutTests/editing/spelling/script-tests/spelling-backspace-between-lines.js</a></li>
<li><a href="#trunkLayoutTestseditingspellingspellingbackspacebetweenlinesexpectedtxt">trunk/LayoutTests/editing/spelling/spelling-backspace-between-lines-expected.txt</a></li>
<li><a href="#trunkLayoutTestseditingspellingspellinglinebreakexpectedtxt">trunk/LayoutTests/editing/spelling/spelling-linebreak-expected.txt</a></li>
<li><a href="#trunkLayoutTestseditingspellingspellinglinebreakhtml">trunk/LayoutTests/editing/spelling/spelling-linebreak.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (163614 => 163615)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-02-07 08:32:30 UTC (rev 163614)
+++ trunk/LayoutTests/ChangeLog 2014-02-07 09:20:03 UTC (rev 163615)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+2014-02-07 Grzegorz Czajkowski <g.czajkowski@samsung.com>
+
+ Verify misspellings after lines merge/split asynchronously
+ https://bugs.webkit.org/show_bug.cgi?id=128305
+
+ Reviewed by Ryosuke Niwa.
+
+ Adapt two spelling tests to use asynchronous spellchecking.
+
+ * editing/spelling/script-tests/spelling-backspace-between-lines.js:
+ (testTwoLinesMisspellings):
+ (testMisspellingsAfterLineMergeUsingDelete):
+ (testMisspellingsAfterLineMergeUsingForwardDelete):
+ Group test cases into separated methods.
+ Use shouldBeEqualToString to compare strings.
+ Add newly created div elements instead of overriding
+ the previous one in order that non DumpRenderTree users
+ can see what has been tested.
+
+ * editing/spelling/spelling-backspace-between-lines-expected.txt:
+ * editing/spelling/spelling-linebreak-expected.txt:
+ * editing/spelling/spelling-linebreak.html:
+
</ins><span class="cx"> 2014-02-06 Gyuyoung Kim <gyuyoung.kim@samsung.com>
</span><span class="cx">
</span><span class="cx"> Add a test case for navigator.isProtocolHandlerRegistered
</span></span></pre></div>
<a id="trunkLayoutTestseditingspellingscripttestsspellingbackspacebetweenlinesjs"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/editing/spelling/script-tests/spelling-backspace-between-lines.js (163614 => 163615)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/editing/spelling/script-tests/spelling-backspace-between-lines.js 2014-02-07 08:32:30 UTC (rev 163614)
+++ trunk/LayoutTests/editing/spelling/script-tests/spelling-backspace-between-lines.js 2014-02-07 09:20:03 UTC (rev 163615)
</span><span class="lines">@@ -1,65 +1,97 @@
</span><ins>+description('Spelling markers should remain while merging two lines.');
</ins><span class="cx">
</span><del>-description('For Bug 41423: Spelling marker should remain after hitting a backspace key.');
</del><ins>+jsTestIsAsync = true;
</ins><span class="cx">
</span><ins>+if (window.internals) {
+ internals.settings.setUnifiedTextCheckerEnabled(true);
+ internals.settings.setAsynchronousSpellCheckingEnabled(true);
+}
+
</ins><span class="cx"> var testRoot = document.createElement("div");
</span><span class="cx"> document.body.insertBefore(testRoot, document.body.firstChild);
</span><span class="cx">
</span><span class="cx"> function setup(targetName)
</span><span class="cx"> {
</span><del>- testRoot.innerHTML = "<div id='" + targetName + "' contentEditable><div>OK</div><div>OK zz OK</div></div>";
- document.getElementById(targetName).focus();
</del><ins>+ var div = document.createElement("div");
+ div.id = targetName;
+ div.contentEditable = true;
+ div.innerHTML = "<div>OK</div><div>OK zz OK</div>";
+ testRoot.appendChild(div);
+
+ div.focus();
</ins><span class="cx"> return document.getSelection();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-function firstLineText()
</del><ins>+function firstLineText(targetName)
</ins><span class="cx"> {
</span><del>- return testRoot.firstChild.firstChild.innerText.trim();
</del><ins>+ var div = document.getElementById(targetName);
+ return div.firstChild.innerText.trim();
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-function testWithDelete()
</del><ins>+function testTwoLinesMisspellings()
</ins><span class="cx"> {
</span><del>- window.sel = setup("target1");
</del><ins>+ window.sel = setup("target1"); // ^OK
</ins><span class="cx">
</span><del>- sel.modify("move", "forward", "line");
- for (var i = 0; i < 3; i++) // 3 for ["OK, "zz", "OK"].length
</del><ins>+ sel.modify("move", "forward", "line"); // ^OK zz OK
+ for (var i = 0; i < 3; i++)
</ins><span class="cx"> sel.modify("move", "forward", "word");
</span><span class="cx">
</span><del>- shouldBe("firstLineText()", "'OK'");
- shouldBe("sel.anchorNode.data", "'OK zz OK'");
- shouldBeTrue("internals.hasSpellingMarker(3, 2)");
</del><ins>+ shouldBeEqualToString("firstLineText('target1')", "OK");
+ shouldBeEqualToString("sel.anchorNode.data", "OK zz OK");
+ if (window.internals)
+ shouldBecomeEqual("internals.hasSpellingMarker(3, 2)", "true", done);
+ else
+ done();
+}
</ins><span class="cx">
</span><del>- sel.modify("move", "left", "lineboundary");
- document.execCommand("Delete", false);
- sel.modify("move", "right", "line"); // Moves to the line ending to focus the "OK zz OK" text.
</del><ins>+function testMisspellingsAfterLineMergeUsingDelete()
+{
+ window.sel = setup("target2"); // ^OK
</ins><span class="cx">
</span><del>- shouldBe("sel.anchorNode.data", "'OKOK zz OK'");
- shouldBe("firstLineText()", "'OKOK zz OK'");
- shouldBeTrue("internals.hasSpellingMarker(5, 2)");
</del><ins>+ sel.modify("move", "forward", "line"); // ^OK zz OK
+ document.execCommand("Delete", false); // OK^OK zz OK
+ sel.modify("move", "right", "line"); // OKOK zz OK^
+
+ shouldBeEqualToString("firstLineText('target2')", "OKOK zz OK");
+ shouldBeEqualToString("sel.anchorNode.data", "OKOK zz OK");
+ if (window.internals)
+ shouldBecomeEqual("internals.hasSpellingMarker(5, 2)", "true", done);
+ else
+ done();
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-function testWithForwardDelete()
</del><ins>+function testMisspellingsAfterLineMergeUsingForwardDelete()
</ins><span class="cx"> {
</span><del>- window.sel = setup("target1");
</del><ins>+ window.sel = setup("target3"); // ^OK
</ins><span class="cx">
</span><del>- sel.modify("move", "forward", "line");
- for (var i = 0; i < 3; i++) // 3 for ["OK, "zz", "OK"].length
- sel.modify("move", "forward", "word");
</del><ins>+ sel.modify("move", "forward", "word"); // OK^
+ document.execCommand("ForwardDelete", false); // OK^OK zz OK
+ sel.modify("move", "right", "line"); // OKOK zz OK^
</ins><span class="cx">
</span><del>- shouldBe("firstLineText()", "'OK'");
- shouldBe("sel.anchorNode.data", "'OK zz OK'");
- shouldBeTrue("internals.hasSpellingMarker(3, 2)");
</del><ins>+ shouldBeEqualToString("firstLineText('target3')", "OKOK zz OK");
+ shouldBeEqualToString("sel.anchorNode.data", "OKOK zz OK");
+ if (window.internals)
+ shouldBecomeEqual("internals.hasSpellingMarker(5, 2)", "true", done);
+ else
+ done();
+}
</ins><span class="cx">
</span><del>- sel.modify("move", "left", "line");
- document.execCommand("ForwardDelete", false);
- sel.modify("move", "right", "line"); // Moves to the line ending to focus the "OK zz OK" text.
</del><ins>+var tests = [ function() { testTwoLinesMisspellings(); },
+ function() { testMisspellingsAfterLineMergeUsingDelete(); },
+ function() { testMisspellingsAfterLineMergeUsingForwardDelete(); }
+];
</ins><span class="cx">
</span><del>- shouldBe("firstLineText()", "'OKOK zz OK'");
- shouldBe("sel.anchorNode.data", "'OKOK zz OK'");
- shouldBeTrue("internals.hasSpellingMarker(5, 2)");
</del><ins>+function done()
+{
+ var next = tests.shift();
+ if (next)
+ return window.setTimeout(next, 0);
+
+ if (window.internals)
+ testRoot.style.display = "none";
+
+ finishJSTest();
</ins><span class="cx"> }
</span><ins>+done();
</ins><span class="cx">
</span><del>-testWithDelete();
-testWithForwardDelete();
-testRoot.style.display = "none";
-
</del><span class="cx"> var successfullyParsed = true;
</span></span></pre></div>
<a id="trunkLayoutTestseditingspellingspellingbackspacebetweenlinesexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/editing/spelling/spelling-backspace-between-lines-expected.txt (163614 => 163615)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/editing/spelling/spelling-backspace-between-lines-expected.txt 2014-02-07 08:32:30 UTC (rev 163614)
+++ trunk/LayoutTests/editing/spelling/spelling-backspace-between-lines-expected.txt 2014-02-07 09:20:03 UTC (rev 163615)
</span><span class="lines">@@ -1,20 +1,17 @@
</span><del>-For Bug 41423: Spelling marker should remain after hitting a backspace key.
</del><ins>+Spelling markers should remain while merging two lines.
</ins><span class="cx">
</span><span class="cx"> On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
</span><span class="cx">
</span><span class="cx">
</span><del>-PASS firstLineText() is 'OK'
-PASS sel.anchorNode.data is 'OK zz OK'
-PASS internals.hasSpellingMarker(3, 2) is true
-PASS sel.anchorNode.data is 'OKOK zz OK'
-PASS firstLineText() is 'OKOK zz OK'
-PASS internals.hasSpellingMarker(5, 2) is true
-PASS firstLineText() is 'OK'
-PASS sel.anchorNode.data is 'OK zz OK'
-PASS internals.hasSpellingMarker(3, 2) is true
-PASS firstLineText() is 'OKOK zz OK'
-PASS sel.anchorNode.data is 'OKOK zz OK'
-PASS internals.hasSpellingMarker(5, 2) is true
</del><ins>+PASS firstLineText('target1') is "OK"
+PASS sel.anchorNode.data is "OK zz OK"
+PASS internals.hasSpellingMarker(3, 2) became true
+PASS firstLineText('target2') is "OKOK zz OK"
+PASS sel.anchorNode.data is "OKOK zz OK"
+PASS internals.hasSpellingMarker(5, 2) became true
+PASS firstLineText('target3') is "OKOK zz OK"
+PASS sel.anchorNode.data is "OKOK zz OK"
+PASS internals.hasSpellingMarker(5, 2) became true
</ins><span class="cx"> PASS successfullyParsed is true
</span><span class="cx">
</span><span class="cx"> TEST COMPLETE
</span></span></pre></div>
<a id="trunkLayoutTestseditingspellingspellinglinebreakexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/editing/spelling/spelling-linebreak-expected.txt (163614 => 163615)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/editing/spelling/spelling-linebreak-expected.txt 2014-02-07 08:32:30 UTC (rev 163614)
+++ trunk/LayoutTests/editing/spelling/spelling-linebreak-expected.txt 2014-02-07 09:20:03 UTC (rev 163615)
</span><span class="lines">@@ -1,3 +1,10 @@
</span><del>-You should see 'zz a' on the first line below, and 'a' on the second line. 'zz' (and only 'zz') should be marked as misspelled.
-PASS
</del><ins>+Misspellings should be preserved when a line-break command splits a text node. You should see 'Hello,zz a' on the first line below, and 'a' on the second line. This test succeeds when 'zz' (and only 'zz') is marked as misspelled.
</ins><span class="cx">
</span><ins>+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS internals.hasSpellingMarker(6, 2) became true
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestseditingspellingspellinglinebreakhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/editing/spelling/spelling-linebreak.html (163614 => 163615)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/editing/spelling/spelling-linebreak.html 2014-02-07 08:32:30 UTC (rev 163614)
+++ trunk/LayoutTests/editing/spelling/spelling-linebreak.html 2014-02-07 09:20:03 UTC (rev 163615)
</span><span class="lines">@@ -8,17 +8,20 @@
</span><span class="cx"> font-size: 24px;
</span><span class="cx"> }
</span><span class="cx"> </style>
</span><ins>+<script src="../../resources/js-test-pre.js"></script>
</ins><span class="cx"> <script src=../editing.js language="JavaScript" type="text/JavaScript" ></script>
</span><span class="cx">
</span><span class="cx"> <script>
</span><del>-function log(msg) {
- document.getElementById("console").innerHTML += (msg + "\n");
</del><ins>+
+jsTestIsAsync = true;
+
+if (window.internals) {
+ internals.settings.setUnifiedTextCheckerEnabled(true);
+ internals.settings.setAsynchronousSpellCheckingEnabled(true);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function editingTest() {
</span><span class="cx">
</span><del>- if (window.testRunner)
- testRunner.dumpAsText();
</del><span class="cx"> var elem = document.getElementById("test");
</span><span class="cx"> var selection = window.getSelection();
</span><span class="cx"> selection.setPosition(elem, 6);
</span><span class="lines">@@ -34,11 +37,10 @@
</span><span class="cx">
</span><span class="cx"> if (window.testRunner) {
</span><span class="cx"> selection.setPosition(elem, 0);
</span><del>- if (internals.hasSpellingMarker(6, 2))
- log("PASS");
- else
- log("FAIL");
- document.getElementById("root").style.display = "none";
</del><ins>+ shouldBecomeEqual("internals.hasSpellingMarker(6, 2)", "true", function() {
+ document.getElementById("root").style.display = "none";
+ finishJSTest();
+ });
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> }
</span><span class="lines">@@ -48,15 +50,19 @@
</span><span class="cx"> <title>Editing Test</title>
</span><span class="cx"> </head>
</span><span class="cx"> <body>
</span><del>-<div>You should see 'zz a' on the first line below, and 'a' on the second line. 'zz' (and only 'zz') should be marked as misspelled.</div>
</del><ins>+<script>
+description("Misspellings should be preserved when a line-break command "
+ + "splits a text node. You should see 'Hello,zz a' on the first line below, "
+ + "and 'a' on the second line. "
+ + "This test succeeds when 'zz' (and only 'zz') is marked as misspelled.");
+</script>
</ins><span class="cx"> <div contenteditable id="root" class="editing">
</span><span class="cx"> <!-- wee need leading "Hello," to preserve the marker even after setPosition() -->
</span><span class="cx"> <span id="test">Hello,</span>
</span><span class="cx"> </div>
</span><del>-<pre id="console"></pre>
</del><span class="cx"> <script>
</span><span class="cx"> editingTest();
</span><span class="cx"> </script>
</span><del>-
</del><ins>+<script src="../../resources/js-test-post.js"></script>
</ins><span class="cx"> </body>
</span><span class="cx"> </html>
</span></span></pre>
</div>
</div>
</body>
</html>