Chromium Code Reviews Chromium Code Reviews
Issue 1873093003:
Convert track tests from video-test.js to testharness.js based (Closed)
Base URL: https://chromium.googlesource.com/chromium/src.git@master| Index: third_party/WebKit/LayoutTests/media/track/track-add-track.html |
| diff --git a/third_party/WebKit/LayoutTests/media/track/track-add-track.html b/third_party/WebKit/LayoutTests/media/track/track-add-track.html |
| index 93d74d48ca23356ea1fba48d842afb396b6e61f2..508fbb243ca8117d1dd4370e664e4439b4303176 100644 |
| --- a/third_party/WebKit/LayoutTests/media/track/track-add-track.html |
| +++ b/third_party/WebKit/LayoutTests/media/track/track-add-track.html |
| @@ -1,58 +1,34 @@ |
| <!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> |
| - |
| - var tracks = []; |
| - var trackElement; |
| - function trackAdded() |
| - { |
| - consoleWrite("EVENT(" + event.type + ")"); |
| - |
| - testExpected("event.target", video.textTracks); |
| - testExpected("event instanceof window.TrackEvent", true); |
| - testExpected("event.track", tracks[video.textTracks.length - 1]); |
| - |
| - if (video.textTracks.length == 1) { |
| - consoleWrite("<br>** Test a TextTrack created with video.addTextTrack()."); |
| - run("tracks.push(video.addTextTrack('captions', 'Caption Track', 'en'))"); |
| - testExpected("video.textTracks.length", 2); |
| - } else { |
| - consoleWrite(""); |
| - endTest(); |
| - } |
| - } |
| - |
| - function start() |
| - { |
| - findMediaElement(); |
| - |
| - consoleWrite("** Test a TextTrack created for a <track> element."); |
| - run("trackElement = document.createElement('track')"); |
| - run("video.appendChild(trackElement)"); |
| - tracks.push(trackElement.track); |
| - |
| - // Register the 'addtrack' listener after creating the element to make sure the |
| - // event is dispatch asynchronously. |
| - video.textTracks.addEventListener("addtrack", trackAdded); |
| - |
| - run("trackElement.src = 'captions-webvtt/tc004-webvtt-file.vtt'"); |
| - run("trackElement.track.mode = 'hidden'"); |
| - testExpected("video.textTracks.length", 1); |
| - testExpected("trackElement.readyState", HTMLTrackElement.NONE); |
| - } |
| - |
| - </script> |
| - </head> |
| - <body onload="start()"> |
| - <p>Tests that the 'addtrack' event is fired when a TextTrack is created.</p> |
| - <video> |
| - </video> |
| - </body> |
| -</html> |
| +<title>Tests that the 'addtrack' event is fired when a TextTrack is created.</title> |
| +<script src="../../resources/testharness.js"></script> |
| +<script src="../../resources/testharnessreport.js"></script> |
| +<script> |
| +async_test(function(t) { |
| + var video = document.createElement('video'); |
| + |
| + var trackElement = document.createElement('track'); |
| + video.appendChild(trackElement); |
| + var tracks = []; |
| + tracks.push(trackElement.track); |
| + |
| + // Register the 'addtrack' listener after creating the element |
| + // to make sure the event is dispatched asynchronously. |
| + video.textTracks.onaddtrack = t.step_func(function() { |
|
Srirama
2016/04/11 11:20:05
Adding argument 't' here is causing the problem (t
philipj_slow
2016/04/11 12:34:00
I guess you mean this bit?
var test_this
Srirama
2016/04/11 13:34:24
Done.
|
| + assert_equals(event.target, video.textTracks); |
| + assert_true(event instanceof window.TrackEvent, 'instanceof'); |
|
philipj_slow
2016/04/11 12:34:00
You can drop the window. here, the test will fail
Srirama
2016/04/11 13:34:24
Done.
|
| + assert_equals(event.track, tracks[video.textTracks.length - 1]); |
| + |
| + if (video.textTracks.length == 1) { |
| + tracks.push(video.addTextTrack('captions', 'Caption Track', 'en')); |
| + assert_equals(video.textTracks.length, 2); |
| + } else { |
| + t.done(); |
| + } |
| + }); |
| + |
| + trackElement.src = 'captions-webvtt/tc004-webvtt-file.vtt'; |
| + trackElement.track.mode = 'hidden'; |
| + assert_equals(video.textTracks.length, 1); |
| + assert_equals(trackElement.readyState, HTMLTrackElement.NONE); |
| +}); |
| +</script> |
