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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: third_party/WebKit/LayoutTests/media/track/track-css-cue-lifetime.html

Issue 1875923002: Convert track tests from video-test.js to testharness.js based (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 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
« third_party/WebKit/LayoutTests/media/track/track-css-all-cues.html ('K') | « third_party/WebKit/LayoutTests/media/track/track-css-all-cues-expected.txt ('k') | third_party/WebKit/LayoutTests/media/track/track-css-cue-lifetime-expected.txt » ('j') | third_party/WebKit/LayoutTests/media/track/track-css-matching.html » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/LayoutTests/media/track/track-css-cue-lifetime.html
diff --git a/third_party/WebKit/LayoutTests/media/track/track-css-cue-lifetime.html b/third_party/WebKit/LayoutTests/media/track/track-css-cue-lifetime.html
index 453e2320c1b8c6a51f87fd1c308d00d6773df10c..df81168cdbb7e6e5b09d08e4d900ce73983b0d6c 100644
--- a/third_party/WebKit/LayoutTests/media/track/track-css-cue-lifetime.html
+++ b/third_party/WebKit/LayoutTests/media/track/track-css-cue-lifetime.html
@@ -1,62 +1,44 @@
<!DOCTYPE html>
-<html>
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-
- <script src=../media-file.js></script>
- <!-- TODO(philipj): 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>
-
- <style>
- video::cue(.red, .red2) { color:red }
- video::cue(.green) { color:green }
- </style>
-
- <script>
-
- var cueNode;
- var seekedCount = 0;
- var step = 0.4;
- var initialTime = 0.6;
- var endTime = 3.0
-
- function seeked()
- {
- if (testEnded)
- return;
-
- cueNode = textTrackDisplayElement(video, 'cue').firstElementChild;
- testExpected("getComputedStyle(cueNode).color", "rgb(255, 0, 0)");
- cueNode = cueNode.nextElementSibling;
- testExpected("getComputedStyle(cueNode).color", "rgb(0, 128, 0)");
- cueNode = cueNode.nextElementSibling;
- testExpected("getComputedStyle(cueNode).color", "rgb(255, 0, 0)");
-
- if (++seekedCount * step + initialTime > endTime)
- endTest();
- else {
- consoleWrite("" + seekedCount);
- run("video.currentTime = " + Math.round(initialTime + seekedCount * step * 10) / 10);
- }
- }
-
- function loaded()
- {
- consoleWrite("Test that the cue is styled properly throughout its lifetime.");
- findMediaElement();
- video.src = findMediaFile('video', '../content/test');
- video.id = "testvideo";
- waitForEvent('seeked', seeked);
- waitForEventOnce('canplaythrough', function() { video.currentTime = initialTime; });
- }
-
- </script>
- </head>
- <body onload="loaded()">
- <video controls >
- <track src="captions-webvtt/styling-lifetime.vtt" kind="captions" default>
- </video>
- </body>
-</html>
+<title>Test that the cue is styled properly throughout its lifetime.</title>
+<script src="../media-file.js"></script>
+<script src="../media-controls.js"></script>
+<script src="../../resources/testharness.js"></script>
+<script src="../../resources/testharnessreport.js"></script>
+<style>
+video::cue(.red, .red2) { color:red }
+video::cue(.green) { color:green }
+</style>
+<video controls></video>
+<script>
+async_test(function(t) {
+ var seekTimeIndex = 0;
+ var step = 0.4;
+ var initialTime = 0.6;
+ var endTime = 3.0
+
+ var video = document.querySelector('video');
+ video.src = findMediaFile('video', '../content/test');
+
+ var track = document.createElement('track');
+ track.src = 'captions-webvtt/styling-lifetime.vtt';
+ track.kind = 'captions';
+ track.default = true;
+ video.appendChild(track);
+
+ video.onseeked = t.step_func(function() {
+ var cueNode = textTrackDisplayElement(video, 'cue').firstElementChild;
+ assert_equals(getComputedStyle(cueNode).color, 'rgb(255, 0, 0)');
+ cueNode = cueNode.nextElementSibling;
+ assert_equals(getComputedStyle(cueNode).color, 'rgb(0, 128, 0)');
+ cueNode = cueNode.nextElementSibling;
+ assert_equals(getComputedStyle(cueNode).color, 'rgb(255, 0, 0)');
+
+ if (++seekTimeIndex * step + initialTime > endTime)
philipj_slow 2016/04/12 08:39:28 Can you let var seekTime = ++seekTimeIndex * step
Srirama 2016/04/12 11:20:05 Done.
+ t.done();
+ else
+ video.currentTime = Math.round(initialTime + seekTimeIndex * step * 10) / 10;
+ });
+
+ video.currentTime = initialTime;
+});
+</script>
« third_party/WebKit/LayoutTests/media/track/track-css-all-cues.html ('K') | « third_party/WebKit/LayoutTests/media/track/track-css-all-cues-expected.txt ('k') | third_party/WebKit/LayoutTests/media/track/track-css-cue-lifetime-expected.txt » ('j') | third_party/WebKit/LayoutTests/media/track/track-css-matching.html » ('J')

Powered by Google App Engine
This is Rietveld 408576698