Changeset 293742 in webkit

Timestamp:

May 3, 2022, 3:10:46 PM (4 years ago)

Author:

commit-queue@webkit.org

Message:

[macOS] Make a couple of grammar checking tests more robust to system spell checker changes
​https://bugs.webkit.org/show_bug.cgi?id=240034
rdar://92689657

Reviewed by Aditya Keerthi.

In some versions of macOS, feeding the following sentence to NSSpellChecker:

"the the adlj adaasj sdklj. there there"

...no longer yields grammar errors at "the the" and "there there", due to presence of duplicated "the" and
"there", which causes a couple of layout tests to time out.

This patch works around the system changes by swizzling out spell checking results, such that we don't need to
rely on the default NSSpellChecker always tagging "the the" and "there there" as grammar errors.

• editing/spelling/inline-spelling-markers-hidpi.html:
• editing/spelling/inline-spelling-markers.html:

Canonical link: ​https://commits.webkit.org/250230@main

Location:

trunk/LayoutTests

Files:

• ChangeLog (modified) (1 diff)
• editing/spelling/inline-spelling-markers-hidpi.html (modified) (2 diffs)
• editing/spelling/inline-spelling-markers.html (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2022-05-03  Wenson Hsieh  <wenson_hsieh@apple.com>
+
+        [macOS] Make a couple of grammar checking tests more robust to system spell checker changes
+        https://bugs.webkit.org/show_bug.cgi?id=240034
+        rdar://92689657
+
+        Reviewed by Aditya Keerthi.
+
+        In some versions of macOS, feeding the following sentence to NSSpellChecker:
+
+        > "the the adlj adaasj sdklj. there there"
+
+        ...no longer yields grammar errors at "the the" and "there there", due to presence of duplicated "the" and
+        "there", which causes a couple of layout tests to time out.
+
+        This patch works around the system changes by swizzling out spell checking results, such that we don't need to
+        rely on the default NSSpellChecker always tagging "the the" and "there there" as grammar errors.
+
+        * editing/spelling/inline-spelling-markers-hidpi.html:
+        * editing/spelling/inline-spelling-markers.html:
+
 2022-05-03  Truitt Savell  <tsavell@apple.com>
 

trunk/LayoutTests/editing/spelling/inline-spelling-markers-hidpi.html

@@ -22 +22 @@
 
 <body>
-<script src="../../resources/js-test-pre.js"></script>
+<script src="../../resources/ui-helper.js"></script>
+<script src="../../resources/js-test.js"></script>
 LTR
 <div id="testLTR" class="testDiv" contenteditable="true"></div>
@@ -102 +103 @@
 if (window.testRunner) {
     testRunner.dumpAsText(true);
-    testRunner.setBackingScaleFactor(2, function () {
-        done();
-    });
+    UIHelper.setSpellCheckerResults({
+        "the the adlj adaasj sdklj. there there\u00A0" : [
+            { type : "spelling", from : 8, to : 12 },
+            { type : "spelling", from : 13, to : 19 },
+            { type : "spelling", from : 20, to : 25 },
+            {
+                type : "grammar",
+                from : 4,
+                to : 7,
+                details : [{ from : 0, to : 3 }]
+            },
+            {
+                type : "grammar",
+                from : 33,
+                to : 38,
+                details : [{ from : 0, to : 5 }]
+            }
+        ]
+    }).then(() => testRunner.setBackingScaleFactor(2, done));
 }
 
 </script>
-<script src="../../resources/js-test-post.js"></script>
 </body>
 </html>

trunk/LayoutTests/editing/spelling/inline-spelling-markers.html

@@ -22 +22 @@
 
 <body>
-<script src="../../resources/js-test-pre.js"></script>
+<script src="../../resources/ui-helper.js"></script>
+<script src="../../resources/js-test.js"></script>
 LTR
 <div id="testLTR" class="testDiv" contenteditable="true"></div>
@@ -107 +108 @@
     finishJSTest();
 }
-done();
+
+UIHelper.setSpellCheckerResults({
+    "the the adlj adaasj sdklj. there there\u00A0" : [
+        { type : "spelling", from : 8, to : 12 },
+        { type : "spelling", from : 13, to : 19 },
+        { type : "spelling", from : 20, to : 25 },
+        {
+            type : "grammar",
+            from : 4,
+            to : 7,
+            details : [{ from : 0, to : 3 }]
+        },
+        {
+            type : "grammar",
+            from : 33,
+            to : 38,
+            details : [{ from : 0, to : 5 }]
+        }
+    ]
+}).then(done);
 </script>
-<script src="../../resources/js-test-post.js"></script>
 </body>
 </html>