| Index: third_party/WebKit/LayoutTests/media/track/track-webvtt-tc015-positioning.html
|
| diff --git a/third_party/WebKit/LayoutTests/media/track/track-webvtt-tc015-positioning.html b/third_party/WebKit/LayoutTests/media/track/track-webvtt-tc015-positioning.html
|
| index 12f1bd4ea5a01728aca8bc6e810c14a5cf461f99..389729bf6a519d4dc2850a12b3cdef62568338f0 100644
|
| --- a/third_party/WebKit/LayoutTests/media/track/track-webvtt-tc015-positioning.html
|
| +++ b/third_party/WebKit/LayoutTests/media/track/track-webvtt-tc015-positioning.html
|
| @@ -1,71 +1,35 @@
|
| <!DOCTYPE html>
|
| -<html>
|
| - <head>
|
| - <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
|
| +<title>Tests cue text position from settings.</title>
|
| +<script src="track-helpers.js"></script>
|
| +<script src="../../resources/testharness.js"></script>
|
| +<script src="../../resources/testharnessreport.js"></script>
|
| +<script>
|
| +check_cues_from_track("captions-webvtt/tc015-positioning.vtt", testTrack);
|
| +check_cues_from_track("captions-webvtt/tc015-positioning-ltr.vtt", testTrack);
|
|
|
| - <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>
|
| +check_cues_from_track("captions-webvtt/tc015-positioning-bad.vtt", function(track) {
|
| + var expected = [
|
| + { position: "auto" },
|
| + { position: "auto" },
|
| + { position: "auto" },
|
| + { position: "auto" },
|
| + { position: "auto" },
|
| + { position: "auto" },
|
| + { position: "auto" },
|
| + { position: "auto" }
|
| + ];
|
|
|
| - var numberOfTrackTests = 3;
|
| + assert_cues_match(track.cues, expected);
|
| +});
|
|
|
| - function trackLoaded()
|
| - {
|
| - numberOfTracksLoaded++;
|
| - if (numberOfTracksLoaded == numberOfTrackTests) {
|
| - testTrack(0);
|
| - testTrack(1);
|
| - testTrackError(2);
|
| - }
|
| - }
|
| +function testTrack(track) {
|
| + var expected = [
|
| + { position: 0 },
|
| + { position: 50 },
|
| + { position: "auto" },
|
| + { position: 100 }
|
| + ];
|
|
|
| - function testTrack(i)
|
| - {
|
| - findMediaElement();
|
| - var expected =
|
| - {
|
| - length : 4,
|
| - tests:
|
| - [
|
| - {
|
| - property : "position",
|
| - values : [0, 50, "auto", 100],
|
| - },
|
| - ],
|
| - };
|
| - testCues(i, expected);
|
| -
|
| - allTestsEnded();
|
| - }
|
| -
|
| - function testTrackError(i)
|
| - {
|
| - findMediaElement();
|
| - var expected =
|
| - {
|
| - length : 8,
|
| - tests:
|
| - [
|
| - {
|
| - property : "position",
|
| - values : ["auto", "auto", "auto", "auto", "auto", "auto", "auto", "auto"],
|
| - },
|
| - ],
|
| - };
|
| - testCues(i, expected);
|
| -
|
| - allTestsEnded();
|
| - }
|
| - </script>
|
| - </head>
|
| - <body onload="enableAllTextTracks()">
|
| - <p>Tests cue text position from settings.</p>
|
| - <video>
|
| - <track src="captions-webvtt/tc015-positioning.vtt" onload="trackLoaded()">
|
| - <track src="captions-webvtt/tc015-positioning-ltr.vtt" onload="trackLoaded()">
|
| - <track src="captions-webvtt/tc015-positioning-bad.vtt" onload="trackLoaded()">
|
| - </video>
|
| - </body>
|
| -</html>
|
| + assert_cues_match(track.cues, expected);
|
| +}
|
| +</script>
|
|
|
Chromium Code Reviews
Issue 2043513002:
Convert track-webvtt-tc[013-015] tests to testharness.js (Closed)
Base URL: https://chromium.googlesource.com/chromium/src.git@master