Changeset 50926 in webkit

Timestamp:

Nov 12, 2009 8:59:25 PM (14 years ago)

Author:

eric@webkit.org

Message:

2009-11-12 Kinuko Yasuda <​kinuko@google.com>

Reviewed by Adam Barth.

Makes the output of fast/events/mouse-click-events.html independent
of the window size.
​https://bugs.webkit.org/show_bug.cgi?id=31405

• fast/events/mouse-click-events-expected.txt:
• fast/events/script-tests/mouse-click-events.js:

Location:

trunk/LayoutTests

Files:

• ChangeLog (modified) (1 diff)
• fast/events/mouse-click-events-expected.txt (modified) (1 diff)
• fast/events/script-tests/mouse-click-events.js (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2009-11-12  Kinuko Yasuda  <kinuko@google.com>
+
+        Reviewed by Adam Barth.
+
+        Makes the output of fast/events/mouse-click-events.html independent
+        of the window size.
+        https://bugs.webkit.org/show_bug.cgi?id=31405
+
+        * fast/events/mouse-click-events-expected.txt:
+        * fast/events/script-tests/mouse-click-events.js:
+
 2009-11-12  Simon Fraser  <simon.fraser@apple.com>
 

trunk/LayoutTests/fast/events/mouse-click-events-expected.txt

@@ -5 +5 @@
 
 Left Mouse Button
-mousedown(0)
-mouseup(0)
-click(0)
-mousedown(0)
-mouseup(0)
-click(0)
-dblclick(0)
+PASS eventLog is "mousedown(0) mouseup(0) click(0) mousedown(0) mouseup(0) click(0) dblclick(0) "
 Middle Mouse Button
-mousedown(1)
-mouseup(1)
-click(1)
-mousedown(1)
-mouseup(1)
-click(1)
-dblclick(1)
+PASS eventLog is "mousedown(1) mouseup(1) click(1) mousedown(1) mouseup(1) click(1) dblclick(1) "
 Right Mouse Button
-mousedown(2)
-mouseup(2)
-mousedown(2)
-mouseup(2)
+PASS eventLog is "mousedown(2) mouseup(2) mousedown(2) mouseup(2) "
 4th Mouse Button
-mousedown(1)
-mouseup(1)
-click(1)
-mousedown(1)
-mouseup(1)
-click(1)
-dblclick(1)
+PASS eventLog is "mousedown(1) mouseup(1) click(1) mousedown(1) mouseup(1) click(1) dblclick(1) "
 PASS successfullyParsed is true
 

trunk/LayoutTests/fast/events/script-tests/mouse-click-events.js

@@ -6 +6 @@
 div.style.backgroundColor = "blue";
 
-function logEvent() {
-    debug(event.type + "(" + event.button + ")");
+var eventLog = "";
+
+function appendEventLog() {
+    if (window.eventSender) {
+        eventLog += event.type + "(" + event.button + ") ";
+    } else {
+        debug(event.type + "(" + event.button + ")");
+    }
 }
 
-div.addEventListener("click", logEvent, false);
-div.addEventListener("dblclick", logEvent, false);
-div.addEventListener("mousedown", logEvent, false);
-div.addEventListener("mouseup", logEvent, false);
+function clearEventLog() {
+    eventLog = "";
+}
+
+div.addEventListener("click", appendEventLog, false);
+div.addEventListener("dblclick", appendEventLog, false);
+div.addEventListener("mousedown", appendEventLog, false);
+div.addEventListener("mouseup", appendEventLog, false);
 document.body.insertBefore(div, document.body.firstChild);
 
@@ -31 +41 @@
 }
 
-debug("Left Mouse Button");
-sendEvents(0);
+function testEvents(description, button, expectedString) {
+    debug(description);
+    sendEvents(button);
+    shouldBeEqualToString("eventLog", expectedString);
+    clearEventLog();
+}
 
-debug("Middle Mouse Button");
-sendEvents(1);
-
-debug("Right Mouse Button");
-sendEvents(2);
-
-debug("4th Mouse Button");
-sendEvents(3);
+if (window.eventSender) {
+    testEvents("Left Mouse Button", 0, "mousedown(0) mouseup(0) click(0) mousedown(0) mouseup(0) click(0) dblclick(0) ");
+    testEvents("Middle Mouse Button", 1, "mousedown(1) mouseup(1) click(1) mousedown(1) mouseup(1) click(1) dblclick(1) ");
+    testEvents("Right Mouse Button", 2, "mousedown(2) mouseup(2) mousedown(2) mouseup(2) ");
+    testEvents("4th Mouse Button", 3, "mousedown(1) mouseup(1) click(1) mousedown(1) mouseup(1) click(1) dblclick(1) ");
+}
 
 var successfullyParsed = true;