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

Unified Diff: third_party/WebKit/LayoutTests/media/video-controls-hide-after-touch-on-control.html

Issue 2120793002: Convert video-controls-hide* and video-controls-in* 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-hide-after-touch-on-control-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-hide-after-touch-on-control.html
diff --git a/third_party/WebKit/LayoutTests/media/video-controls-hide-after-touch-on-control.html b/third_party/WebKit/LayoutTests/media/video-controls-hide-after-touch-on-control.html
index 60397f9fb1917ac16de2f784e5a94ecd4d53eefb..37c5aeaadf6cd123fce81d684a7ac7f62f0130bb 100644
--- a/third_party/WebKit/LayoutTests/media/video-controls-hide-after-touch-on-control.html
+++ b/third_party/WebKit/LayoutTests/media/video-controls-hide-after-touch-on-control.html
@@ -1,52 +1,30 @@
<!DOCTYPE html>
-<html>
-<style>
-#no-video-media {
- width: 320px;
- height: 240px;
-}
-</style>
-<!-- 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-file.js></script>
-<script src=media-controls.js></script>
+<title>Test video controls visibility on touch. After a delay the controls must be hidden.</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 loop></video>
<script>
-var controls;
+async_test(function(t) {
+ var video = document.querySelector("video");
-function runTest()
-{
- video = document.getElementById("no-video-media");
+ video.oncanplaythrough = t.step_func(function() {
+ assert_true(video.paused);
- testExpected("video.paused", true);
- if (!window.testRunner)
- return;
+ // Tap the play button
+ var coords = mediaControlsButtonCoordinates(video, "play-button");
+ eventSender.gestureTapDown(coords[0], coords[1]);
+ eventSender.gestureShowPress(coords[0], coords[1]);
+ eventSender.gestureTap(coords[0], coords[1]);
+ assert_false(video.paused);
- // Tap the play button
- var coords = mediaControlsButtonCoordinates(video, "play-button");
- eventSender.gestureTapDown(coords[0], coords[1]);
- eventSender.gestureShowPress(coords[0], coords[1]);
- eventSender.gestureTap(coords[0], coords[1]);
- testExpected("video.paused", false);
+ runAfterHideMediaControlsTimerFired(t.step_func_done(function() {
+ var controls = mediaControlsButton(video, "panel");
+ assert_equals(getComputedStyle(controls).opacity, "0");
+ }), video);
+ });
- runAfterHideMediaControlsTimerFired(function()
- {
- controls = mediaControlsButton(video, "panel");
- testExpected("getComputedStyle(controls).opacity", 0);
-
- consoleWrite("");
- endTest();
- }, video);
-}
-</script>
-<body>
- <p>Test video element control visibility after touch on control. After a delay the
- controls must be hidden.</p>
- <p>This test only runs in DRT!</p>
-
- <video id="no-video-media" controls loop oncanplaythrough="runTest()"></video>
- <script>
- setSrcById("no-video-media", 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-hide-after-touch-on-control-expected.txt » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698