Chromium Code Reviews| Index: third_party/WebKit/LayoutTests/media/track/track-webvtt-tc004-magic-header.html |
| diff --git a/third_party/WebKit/LayoutTests/media/track/track-webvtt-tc004-magic-header.html b/third_party/WebKit/LayoutTests/media/track/track-webvtt-tc004-magic-header.html |
| index e7c39dcf18549e64b7958701101c91dc10c912a3..006814aaec009024cf592acc45cb5d572330f2c4 100644 |
| --- a/third_party/WebKit/LayoutTests/media/track/track-webvtt-tc004-magic-header.html |
| +++ b/third_party/WebKit/LayoutTests/media/track/track-webvtt-tc004-magic-header.html |
| @@ -1,78 +1,59 @@ |
| <!DOCTYPE html> |
| -<html> |
| - <head> |
| - <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> |
| +<title>Tests that the magic file header "WEBVTT" leads to the file properly recognized as a WebVTT file.</title> |
| +<script src="track-helpers.js"></script> |
| +<script src="../../resources/testharness.js"></script> |
| +<script src="../../resources/testharnessreport.js"></script> |
| +<video> |
| + <track src="captions-webvtt/tc004-webvtt-file.vtt"> |
| + <track src="captions-webvtt/tc004-webvtt-rubbish.vtt"> |
| + <track src="captions-webvtt/tc004-no-webvtt.vtt"> |
| +</video> |
| +<script> |
| +async_test(function(t) { |
| + var video = document.querySelector("video"); |
| + |
| + var trackElements = document.querySelectorAll("track"); |
| + trackElements[0].onload = t.step_func(trackLoaded); |
| + trackElements[1].onload = t.step_func(trackLoaded); |
| + trackElements[2].onerror = t.step_func(trackLoaded); |
| + |
| + enableAllTextTracks(video.textTracks); |
| - <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> |
| + var numberOfTracksLoaded = 0; |
| + function trackLoaded() { |
| + numberOfTracksLoaded++; |
| + if (numberOfTracksLoaded != 3) |
| + return; |
| - numberOfTrackTests = 3; |
| + testTrack(0); |
| + testTrack(1); |
| + testTrackError(2); |
| + t.done(); |
| + } |
| - function trackLoaded() |
| + function testTrack(index) { |
| + var expected = [ |
| { |
| - numberOfTracksLoaded++; |
| - if (numberOfTracksLoaded == numberOfTrackTests) { |
| - testTrack(0); |
| - testTrack(1); |
| - testTrackError(2); |
| - } |
| - } |
| - |
| - function testTrack(i) |
| + id : "1", |
| + startTime : 0, |
| + endTime : 30.5, |
| + text : "Bear is Coming!!!!!" |
| + }, |
| { |
| - findMediaElement(); |
| - var expected = |
| - { |
| - length : 2, |
| - tests: |
| - [ |
| - { |
| - property : "id", |
| - values : [1, 2], |
| - }, |
| - { |
| - property : "startTime", |
| - values : [0.0, 31.0], |
| - }, |
| - { |
| - property : "endTime", |
| - values : [30.5, 1200.5], |
| - }, |
| - { |
| - property : "text", |
| - values : ["Bear is Coming!!!!!", "I said Bear is coming!!!!"], |
| - }, |
| - ], |
| - }; |
| - testCues(i, expected); |
| - |
| - allTestsEnded(); |
| + id : "2", |
| + startTime : 31, |
| + endTime : 1200.5, |
| + text : "I said Bear is coming!!!!" |
| } |
| + ]; |
| - function testTrackError(i) |
| - { |
| - findMediaElement(); |
| - var expected = |
| - { |
| - length : 0, |
| - tests: |
| - [], |
| - }; |
| - testCues(i, expected); |
| + var cues = video.textTracks[index].cues; |
| + assert_equals(cues.length, 2); |
| + assert_cues_equal(cues, expected); |
| + } |
| - allTestsEnded(); |
| - } |
| - </script> |
| - </head> |
| - <body onload="enableAllTextTracks()"> |
| - <p>Tests that the magic file header "WEBVTT" leads to the file properly recognized as a WebVTT file.</p> |
| - <video> |
| - <track src="captions-webvtt/tc004-webvtt-file.vtt" onload="trackLoaded()"> |
| - <track src="captions-webvtt/tc004-webvtt-rubbish.vtt" onload="trackLoaded()"> |
| - <track src="captions-webvtt/tc004-no-webvtt.vtt" onerror="trackLoaded()"> |
| - </video> |
| - </body> |
| -</html> |
| + function testTrackError(index) { |
| + assert_equals(video.textTracks[index].cues.length, 0); |
|
mlamouri (slow - plz ping)
2016/05/20 12:42:42
That could probably be tested with:
```
assert_cue
Srirama
2016/05/20 13:32:38
Done.
|
| + } |
| +}); |
| +</script> |