Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(32)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: third_party/WebKit/LayoutTests/media/video-controls-mouse-events-captured.html

Issue 2114393002: Convert video-controls-[mouse, muted, no]* tests to testharness.js (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | third_party/WebKit/LayoutTests/media/video-controls-mouse-events-captured-expected.txt » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/LayoutTests/media/video-controls-mouse-events-captured.html
diff --git a/third_party/WebKit/LayoutTests/media/video-controls-mouse-events-captured.html b/third_party/WebKit/LayoutTests/media/video-controls-mouse-events-captured.html
index d85411a7b34f5ecace57db09ef582fc119c4587f..3ba4594ba7d4d0412269c8f0d2b40ae371bc2586 100644
--- a/third_party/WebKit/LayoutTests/media/video-controls-mouse-events-captured.html
+++ b/third_party/WebKit/LayoutTests/media/video-controls-mouse-events-captured.html
@@ -1,71 +1,64 @@
<!DOCTYPE html>
-<html>
-<head>
+<title>This tests that a mouse/keyboard event on the controls will not be seen by the video element.</title>
+<script src="../resources/testharness.js"></script>
+<script src="../resources/testharnessreport.js"></script>
+<script src="media-file.js"></script>
+<script src="media-controls.js"></script>
+<video controls></video>
+<script>
+async_test(function(t) {
+ var video = document.querySelector("video");
-</head>
-<body>
- <video controls></video>
- <p>This tests that a mouse events on the controls will not be seen by the video element.</p>
- <p>Also tests keyboard input.</p>
- <script src=media-file.js></script>
- <!-- TODO(foolip): Convert test to testharness.js. crbug.com/588956
- (Please avoid writing new tests using video-test.js) -->
- <script src=video-test.js></script>
- <script src=media-controls.js></script>
- <script>
- waitForEventAndFail("click");
- waitForEventAndFail("dblclick");
- waitForEventAndFail("mousedown");
- waitForEventAndFail("mouseup");
- waitForEventAndFail("keydown");
+ video.onclick = t.unreached_func();
+ video.ondblclick = t.unreached_func();
+ video.onmousedown = t.unreached_func();
+ video.onmouseup = t.unreached_func();
+ video.onkeydown = t.unreached_func();
- waitForEventAndEnd("loadeddata", function()
- {
- if (window.eventSender) {
- // click the play button
- var coords = mediaControlsButtonCoordinates(video, "play-button");
- eventSender.mouseMoveTo(coords[0], coords[1]);
+ video.onloadeddata = t.step_func_done(function() {
+ // click the play button.
+ var coords = mediaControlsButtonCoordinates(video, "play-button");
+ eventSender.mouseMoveTo(coords[0], coords[1]);
+ sendMouseAndKeyEvents();
- eventSender.mouseDown();
- eventSender.mouseUp();
- eventSender.keyDown('A');
+ // Click the current time display, which should not respond to events,
+ // but should still capture them.
+ coords = mediaControlsButtonCoordinates(video, "current-time-display");
+ eventSender.mouseMoveTo(coords[0], coords[1]);
+ sendMouseAndKeyEvents();
- // Click the current time display, which should not respond to events, but
- // should still capture them
- coords = mediaControlsButtonCoordinates(video, "current-time-display");
- eventSender.mouseMoveTo(coords[0], coords[1]);
+ // Click the timeline - this tests that multilevel shadow DOM elements work.
+ coords = mediaControlsButtonCoordinates(video, "timeline");
+ eventSender.mouseMoveTo(coords[0], coords[1]);
+ sendMouseAndKeyEvents();
- eventSender.mouseDown();
- eventSender.mouseUp();
- eventSender.keyDown('A');
-
- // Click the timeline - this tests that multilevel shadow DOM elements work
- coords = mediaControlsButtonCoordinates(video, "timeline");
- eventSender.mouseMoveTo(coords[0], coords[1]);
+ // If we're not dragging, then we should get a mousemove.
+ var mouseMoveEventCount = 0;
+ video.onmousemove = t.step_func(function() {
+ mouseMoveEventCount++;
+ });
- eventSender.mouseDown();
- eventSender.mouseUp();
- eventSender.keyDown('A');
+ eventSender.mouseMoveTo(coords[0] + 10, coords[1] + 10);
+ // Expect another as we move back to the slider.
+ eventSender.mouseMoveTo(coords[0], coords[1]);
- // If we're not dragging, then we should get a mousemove.
- waitForEventOnce("mousemove");
- eventSender.mouseMoveTo(coords[0]+10, coords[1]+10);
- // Expect another as we move back to the slider.
- waitForEventOnce("mousemove");
- eventSender.mouseMoveTo(coords[0], coords[1]);
+ // The above, positioned the slider under the mouse.
+ // Click to begin a drag.
+ eventSender.mouseDown();
+ video.onmousemove = t.unreached_func();
- // The above positioned the slider under the mouse. Click
- // to begin a drag.
- eventSender.mouseDown();
+ // Check that the timeline also captures mousemove if the
+ // slider is being dragged.
+ eventSender.mouseMoveTo(coords[0] + 10, coords[1] + 10)
+ assert_equals(mouseMoveEventCount, 2);
+ });
- waitForEventAndFail("mousemove")
+ function sendMouseAndKeyEvents() {
+ eventSender.mouseDown();
+ eventSender.mouseUp();
+ eventSender.keyDown('A');
+ }
- // Check that the timeline also captures mousemove if the
- // slider is being dragged.
- eventSender.mouseMoveTo(coords[0]+10, coords[1]+10)
- }
- });
- video.src = findMediaFile("video", "content/test");
- </script>
-</body>
-</html>
+ video.src = findMediaFile("video", "content/test");
+});
+</script>
« no previous file with comments | « no previous file | third_party/WebKit/LayoutTests/media/video-controls-mouse-events-captured-expected.txt » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698