third_party/WebKit/LayoutTests/media/video-controls-touch-events-captured.html - Issue 2116013002: Convert video-controls* tests to testharness.js

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

Issue 2116013002: Convert video-controls* tests to testharness.js (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 6 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 | « third_party/WebKit/LayoutTests/media/video-controls-toggling-expected.txt ('k') | third_party/WebKit/LayoutTests/media/video-controls-touch-events-captured-expected.txt » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/LayoutTests/media/video-controls-touch-events-captured.html

diff --git a/third_party/WebKit/LayoutTests/media/video-controls-touch-events-captured.html b/third_party/WebKit/LayoutTests/media/video-controls-touch-events-captured.html

index 46b3169e965d7e82d546356a5d8de1c273eadcd6..f30967f8d69e8d2e50aa229933b5a6d2efe6ede8 100644

--- a/third_party/WebKit/LayoutTests/media/video-controls-touch-events-captured.html

+++ b/third_party/WebKit/LayoutTests/media/video-controls-touch-events-captured.html

@@ -1,62 +1,47 @@

<!DOCTYPE html>

-<html>

-<head>

-</head>

-<body>

- <video controls></video>

- <p>This tests that touch events on the controls will not be seen by the video element.</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("touchstart");

- waitForEventAndFail("touchend");

- waitForEventAndFail("touchmove");

- waitForEventAndEnd("loadeddata", function()

- {

- if (window.eventSender) {

- // click the play button

- var coords = mediaControlsButtonCoordinates(video, "play-button");

- eventSender.addTouchPoint(coords[0], coords[1]);

- eventSender.touchStart();

- eventSender.leapForward(100);

- eventSender.touchEnd();

- eventSender.cancelTouchPoint(0);

- // Click the current time display, which should not respond to events, but

- // should still capture them

- coords = mediaControlsButtonCoordinates(video, "current-time-display");

- eventSender.addTouchPoint(coords[0], coords[1]);

- eventSender.touchStart();

- eventSender.leapForward(100);

- eventSender.touchEnd();

- eventSender.cancelTouchPoint(0);

- // Click the timeline - this tests that multilevel shadow DOM elements work

- coords = mediaControlsButtonCoordinates(video, "timeline");

- eventSender.addTouchPoint(coords[0], coords[1]);

- eventSender.touchStart();

- eventSender.leapForward(100);

- eventSender.touchEnd();

- // Check that the timeline also captures moves

- eventSender.updateTouchPoint(0, coords[0]+10, coords[1]+10)

- eventSender.touchMove();

- eventSender.cancelTouchPoint(0);

- }

- });

- video.src = findMediaFile("video", "content/test");

- </script>

-</body>

-</html>

+<title>Test that touch events 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 coords;

+ var video = document.querySelector("video");

+ video.onclick = t.unreached_func();

+ video.ondblclick = t.unreached_func();

+ video.ontouchstart = t.unreached_func();

+ video.ontouchend = t.unreached_func();

+ video.ontouchmove = t.unreached_func();

+ video.onloadeddata = t.step_func_done(function() {

+ // click the play button.

+ touchMediaControl("play-button");

+ // Click the current time display, which should not respond to events,

+ // but should still capture them.

+ touchMediaControl("current-time-display");

+ // Click the timeline - this tests that multilevel shadow DOM elements work.

+ touchMediaControl("timeline");

fs 2016/07/01 19:17:28 This part did not cancel the touch previously. The

Srirama 2016/07/02 03:48:36 Done. :)

+ // Check that the timeline also captures moves.

+ eventSender.updateTouchPoint(0, coords[0] + 10, coords[1] + 10)

+ eventSender.touchMove();

+ eventSender.cancelTouchPoint(0);

+ });

+ function touchMediaControl(controlId) {

+ coords = mediaControlsButtonCoordinates(video, controlId);

+ eventSender.addTouchPoint(coords[0], coords[1]);

+ eventSender.touchStart();

+ eventSender.leapForward(100);

+ eventSender.touchEnd();

+ eventSender.cancelTouchPoint(0);

+ }

+ video.src = findMediaFile("video", "content/test");

+});

+</script>