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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: third_party/WebKit/LayoutTests/media/video-controls-overlay-play-button.html

Issue 2121613002: Convert video-controls-[captions, overlay, track]* tests to testharness.js (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: address nit 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 | « third_party/WebKit/LayoutTests/media/video-controls-captions-on-off-expected.txt ('k') | third_party/WebKit/LayoutTests/media/video-controls-overlay-play-button-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-overlay-play-button.html
diff --git a/third_party/WebKit/LayoutTests/media/video-controls-overlay-play-button.html b/third_party/WebKit/LayoutTests/media/video-controls-overlay-play-button.html
index 63f3378bf605e34266fb91c698dd345807a9977b..e9e8f32988410ce08e83850ffd014c7fa3992529 100644
--- a/third_party/WebKit/LayoutTests/media/video-controls-overlay-play-button.html
+++ b/third_party/WebKit/LayoutTests/media/video-controls-overlay-play-button.html
@@ -1,82 +1,47 @@
-<!doctype html>
-<html>
- <head>
- <title>Test that the overlay play button respects the controls attribute</title>
- <script src="media-controls.js"></script>
- <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>
- function start()
- {
- window.internals.settings.setMediaControlsOverlayPlayButtonEnabled(true);
-
- // Add element dynamically, since otherwise the controls are created, but
- // hidden, before the setting is set, causing the setting to be ignored.
- addVideoElement();
-
- findMediaElement();
-
- video.controls = true;
-
- button = mediaControlsButton(video, 'overlay-play-button')
- testExpected('getComputedStyle(button).display', 'flex');
-
- waitForEventOnce('loadeddata', loadeddata);
- video.src = findMediaFile('video', 'content/test');
- }
-
- function addVideoElement() {
- element = document.createElement('video');
- document.body.appendChild(element);
- }
-
- function loadeddata()
- {
- waitForEventOnce('play', play1);
- run('video.play()');
- }
-
- function play1()
- {
- testExpected('getComputedStyle(button).display', 'none');
-
- waitForEventOnce('pause', pause1);
- run('video.pause()');
- }
-
- function pause1()
- {
- testExpected('getComputedStyle(button).display', 'flex');
-
- video.controls = false;
- testExpected('getComputedStyle(button).display', 'none');
-
- waitForEventOnce('play', play2);
- run('video.play()');
- }
-
- function play2()
- {
- testExpected('getComputedStyle(button).display', 'none');
-
- waitForEventOnce('pause', pause2);
- run('video.pause()');
- }
-
- function pause2()
- {
- testExpected('getComputedStyle(button).display', 'none');
-
- video.controls = true;
- testExpected('getComputedStyle(button).display', 'flex');
-
- endTest();
- }
- </script>
- </head>
- <body onload="start()">
- <p>Test that the overlay play button respects the controls attribute</p>
- </body>
-</html>
+<!DOCTYPE html>
+<title>Test that the overlay play button respects the controls attribute.</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>
+<body>
+<script>
+async_test(function(t) {
+ internals.settings.setMediaControlsOverlayPlayButtonEnabled(true);
+
+ // Add video dynamically, since otherwise the controls are created, but
+ // hidden, before the setting is set, causing the setting to be ignored.
+ var video = document.createElement("video");
+ document.body.appendChild(video);
+
+ video.controls = true;
+ var button = mediaControlsButton(video, "overlay-play-button")
+ assert_equals(getComputedStyle(button).display, "flex");
+
+ var watcher = new EventWatcher(t, video, ["loadeddata", "play", "pause"]);
+ watcher.wait_for("loadeddata").then(t.step_func(function() {
+ video.play();
+ return watcher.wait_for("play");
+ })).then(t.step_func(function() {
+ assert_equals(getComputedStyle(button).display, "none");
+ video.pause();
+ return watcher.wait_for("pause");
+ })).then(t.step_func(function() {
+ assert_equals(getComputedStyle(button).display, "flex");
+ video.controls = false;
+ assert_equals(getComputedStyle(button).display, "none");
+ video.play();
+ return watcher.wait_for("play");
+ })).then(t.step_func(function() {
+ assert_equals(getComputedStyle(button).display, "none");
+ video.pause();
+ return watcher.wait_for("pause");
+ })).then(t.step_func_done(function() {
+ assert_equals(getComputedStyle(button).display, "none");
+ video.controls = true;
+ assert_equals(getComputedStyle(button).display, "flex");
+ }));
+
+ video.src = findMediaFile("video", "content/test");
+});
+</script>
« no previous file with comments | « third_party/WebKit/LayoutTests/media/video-controls-captions-on-off-expected.txt ('k') | third_party/WebKit/LayoutTests/media/video-controls-overlay-play-button-expected.txt » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698