third_party/WebKit/LayoutTests/media/video-controls-visible-exiting-fullscreen.html - Issue 2118453002: Convert video-controls-visibility* tests to testharness.js

Unified Diff: third_party/WebKit/LayoutTests/media/video-controls-visible-exiting-fullscreen.html

Issue 2118453002: Convert video-controls-visibility* 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-visibility-multimodal-touch-after-mouse-expected.txt ('k') | third_party/WebKit/LayoutTests/media/video-controls-visible-exiting-fullscreen-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-visible-exiting-fullscreen.html

diff --git a/third_party/WebKit/LayoutTests/media/video-controls-visible-exiting-fullscreen.html b/third_party/WebKit/LayoutTests/media/video-controls-visible-exiting-fullscreen.html

index 33ff8d71ac2fc0bbf79d482ed001d5ed8af9290c..7d4f1e233d329c0a15bfea17204662f8137e551f 100644

--- a/third_party/WebKit/LayoutTests/media/video-controls-visible-exiting-fullscreen.html

+++ b/third_party/WebKit/LayoutTests/media/video-controls-visible-exiting-fullscreen.html

@@ -1,82 +1,45 @@

-<html>

-<head>

- <title>Test rendering of video control after exiting fullscreen</title>

- <script src=media-file.js></script>

- <script src=media-controls.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=../fullscreen/full-screen-test.js></script>

- <script>

- var panel;

- var playButtonCoordinates;

- var count = 0;

- function init()

- {

- findMediaElement();

- waitForEvent(video, 'canplaythrough', oncanplaythrough);

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

- }

- function oncanplaythrough()

- {

- waitForEvent(video, 'webkitfullscreenchange', onfullscreenchange);

- panel = mediaControlsButton(video, "panel");

- if (window.eventSender) {

- try {

- playButtonCoordinates = mediaControlsButtonCoordinates(video, "play-button");

- } catch (exception) {

- testRunner.notifyDone();

- return;

- }

- var x = playButtonCoordinates[0];

- var y = playButtonCoordinates[1];

- consoleWrite("** Move mouse to the play button and start playing the video **");

- eventSender.mouseMoveTo(x, y);

- eventSender.mouseDown();

- eventSender.mouseUp();

- consoleWrite("");

- }

- consoleWrite("** Test that controls are shown when controls attribute is present **");

- var opacity = getComputedStyle(panel).opacity;

- if (opacity < 1)

- failTest("Media control is not opaque.");

- else

- runWithKeyDown(function(){ video.webkitRequestFullscreen(); });

- }

- function onfullscreenchange()

- {

+<!DOCTYPE html>

+<title>Tests that video controls are shown after exiting fullscreen.</title>

+<script src="../fullscreen/full-screen-test.js"></script>

+<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 count = 0;

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

+ video.oncanplaythrough = t.step_func(function() {

+ video.onwebkitfullscreenchange = t.step_func(function() {

switch (count) {

- case 0:

- runAfterHideMediaControlsTimerFired(continueTest, video);

- break;

- case 1:

- consoleWrite("");

- consoleWrite("** The controls should be shown after exiting the fullscreen");

- var opacity = getComputedStyle(panel).opacity;

- if (opacity < 1)

- failTest("Media control is not opaque.");

- else

- endTest();

+ case 0:

+ runAfterHideMediaControlsTimerFired(function() {

+ document.webkitExitFullscreen();

+ }, video);

+ break;

+ case 1:

+ // The controls should be shown after exiting the fullscreen.

fs 2016/06/30 13:43:58 Nit: drop "the" before "fullscreen".

Srirama 2016/06/30 13:58:04 Done.

+ assert_equals(getComputedStyle(panel).opacity, "1");

+ t.done();

}

count++;

- }

- function continueTest()

- {

- consoleWrite("");

- run("document.webkitExitFullscreen()");

- }

- </script>

-</head>

-<body onload="init()">

- Tests that video controls are shwon after exiting fullscreen<br>

- <video controls></video>

-</body>

-</html>

+ });

+ var panel = mediaControlsButton(video, "panel");

foolip 2016/06/30 13:53:15 Maybe hoist this to the top since it's used above?

Srirama 2016/06/30 13:58:04 Done.

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

+ // Move mouse to the play button and start playing the video.

+ eventSender.mouseMoveTo(playButtonCoordinates[0], playButtonCoordinates[1]);

+ eventSender.mouseDown();

+ eventSender.mouseUp();

+ // Test that controls are shown when controls attribute is present.

+ assert_equals(getComputedStyle(panel).opacity, "1");

+ runWithKeyDown(function() { video.webkitRequestFullscreen(); });

+ });

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

+});

+</script>