Changeset 177682 in webkit

Timestamp:

Dec 23, 2014 12:26:49 AM (9 years ago)

Author:

g.czajkowski@samsung.com

Message:

shouldBecomeEqual() behaves as shouldBe() if the testing expression returns the expected value
​https://bugs.webkit.org/show_bug.cgi?id=133939

Reviewed by Darin Adler.

First call of eval(expression) inside shouldBecomeEqual was always
made synchronously. If the testing expression returns the same value
as expected one then shouldBecomeEqual() will immediately report PASS,
for example,

shouldBecomeEqual(internals.hasSpellingMarker("wellcome"), false);

in consequence, assuming asynchronous path of spellchecking, spelling markers
may appear after a while.

The bug was caused by checking a condition at the beginning of shouldBecomeEqual(),
before calling a timer. As a result, queued asynchronous events doesn't effect
this checking.

• TestExpectations:

This fix reveals new bugs in execDeleteCommand() behaviour, two tests need
to marked as failure now.

• resources/js-test-pre.js:

(.condition):
(shouldBecomeEqual):
(shouldBecomeDifferent):

• resources/js-test.js:

(.condition):
(shouldBecomeEqual):
(shouldBecomeDifferent):
Always check a condition on timer.

Location:

trunk/LayoutTests

Files:

• ChangeLog (modified) (1 diff)
• TestExpectations (modified) (1 diff)
• resources/js-test-pre.js (modified) (4 diffs)
• resources/js-test.js (modified) (4 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2014-12-23  Grzegorz Czajkowski  <g.czajkowski@samsung.com>
+
+        shouldBecomeEqual() behaves as shouldBe() if the testing expression returns the expected value
+        https://bugs.webkit.org/show_bug.cgi?id=133939
+
+        Reviewed by Darin Adler.
+
+        First call of eval(expression) inside shouldBecomeEqual was always
+        made synchronously. If the testing expression returns the same value
+        as expected one then shouldBecomeEqual() will immediately report PASS,
+        for example,
+
+        shouldBecomeEqual(internals.hasSpellingMarker("wellcome"), false);
+
+        in consequence, assuming asynchronous path of spellchecking, spelling markers
+        may appear after a while.
+
+        The bug was caused by checking a condition at the beginning of shouldBecomeEqual(),
+        before calling a timer. As a result, queued asynchronous events doesn't effect
+        this checking.
+
+        * TestExpectations:
+        This fix reveals new bugs in execDeleteCommand() behaviour, two tests need
+        to marked as failure now.
+
+        * resources/js-test-pre.js:
+        (.condition):
+        (shouldBecomeEqual):
+        (shouldBecomeDifferent):
+        * resources/js-test.js:
+        (.condition):
+        (shouldBecomeEqual):
+        (shouldBecomeDifferent):
+        Always check a condition on timer.
+
 2014-12-22  Alexey Proskuryakov  <ap@apple.com>
 

trunk/LayoutTests/TestExpectations

@@ -10 +10 @@
 
 webkit.org/b/116473 editing/selection/user-drag-element-and-user-select-none.html [ Failure ]
+
+webkit.org/b/139862 editing/spelling/editing-multiple-words-with-markers.html [ Timeout ]
+webkit.org/b/139862 editing/spelling/grammar-edit-word.html [ Timeout ]
 
 # media/W3C/video/networkState/networkState_during_progress.html is flaky

trunk/LayoutTests/resources/js-test-pre.js

@@ -290 +290 @@
     debug("WARN: shouldBecomeEqual() expects string arguments");
 
-  var condition = function() {
+  function condition() {
     var exception;
     var _av;
@@ -306 +306 @@
     }
     return false;
-  };
-  _waitForCondition(condition, completionHandler);
+  }
+  setTimeout(_waitForCondition, 0, condition, completionHandler);
 }
 
@@ -402 +402 @@
     debug("WARN: shouldBecomeDifferent() expects string arguments");
 
-  var condition = function() {
+  function condition() {
     var exception;
     var _av;
@@ -418 +418 @@
     }
     return false;
-  };
-  _waitForCondition(condition, completionHandler);
+  }
+  setTimeout(_waitForCondition, 0, condition, completionHandler);
 }
 

trunk/LayoutTests/resources/js-test.js

@@ -257 +257 @@
     debug("WARN: shouldBecomeEqual() expects string arguments");
 
-  var condition = function() {
+  function condition() {
     var exception;
     var _av;
@@ -273 +273 @@
     }
     return false;
-  };
-  _waitForCondition(condition, completionHandler);
+  }
+  setTimeout(_waitForCondition, 0, condition, completionHandler);
 }
 
@@ -369 +369 @@
     debug("WARN: shouldBecomeDifferent() expects string arguments");
 
-  var condition = function() {
+  function condition() {
     var exception;
     var _av;
@@ -385 +385 @@
     }
     return false;
-  };
-  _waitForCondition(condition, completionHandler);
+  }
+  setTimeout(_waitForCondition, 0, condition, completionHandler);
 }