Chromium Code Reviews| Index: third_party/WebKit/LayoutTests/media/track/track-mode.html |
| diff --git a/third_party/WebKit/LayoutTests/media/track/track-mode.html b/third_party/WebKit/LayoutTests/media/track/track-mode.html |
| index e9da0256fa690a0503af2fc77a50c9f8592e0a5a..c5b26bcb1d003b71aebe123b040009b7d6345d80 100644 |
| --- a/third_party/WebKit/LayoutTests/media/track/track-mode.html |
| +++ b/third_party/WebKit/LayoutTests/media/track/track-mode.html |
| @@ -1,93 +1,63 @@ |
| <!DOCTYPE html> |
| -<html> |
| - <head> |
| - |
| - <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 textTrack; |
| - var cueCount; |
| - |
| - function setMode(value) |
| - { |
| - run("textTrack.mode = '" + value + "'"); |
| - testExpected("textTrack.mode", value); |
| - testExpected("video.textTracks[0].mode", value); |
| - if (value == "disabled") |
| - testExpected("textTrack.cues", null); |
| - else |
| - testExpected("textTrack.cues.length", textTrack.cues.length); |
| - consoleWrite(""); |
| - } |
| - |
| - function start() |
| - { |
| - findMediaElement(); |
| - cueCount = 0; |
| - consoleWrite(""); |
| - |
| - textTrack = document.getElementById('track_1').track; |
| - |
| - consoleWrite("<b>++ Test default attribute value</b>"); |
| - testExpected("textTrack.mode", "showing"); |
| - testExpected("video.textTracks[0].mode", "showing"); |
| - consoleWrite(""); |
| - |
| - consoleWrite("<b>*** Set to bogus value, should return default</b>"); |
| - var value = "bogus"; |
| - run("textTrack.mode = '" + value + "'"); |
| - testExpected("textTrack.mode", "showing"); |
| - testExpected("video.textTracks[0].mode", "showing"); |
| - consoleWrite(""); |
| - |
| - consoleWrite("<b>*** Set to numeric value (no longer supported), should return default</b>"); |
| - run("textTrack.mode = 2"); |
| - testExpected("textTrack.mode", "showing"); |
| - testExpected("video.textTracks[0].mode", "showing"); |
| - consoleWrite(""); |
| - |
| - consoleWrite("<b>*** Set to known values</b>"); |
| - consoleWrite("<b>++ 'disabled'</b>"); |
| - setMode("disabled"); |
| - |
| - video.src = findMediaFile("video", "../content/test"); |
| - video.play(); |
| - // Wait for end of first cue (no events should fire while track is disabled). |
| - setTimeout(testHiddenAndShowing, 400); |
| - consoleWrite("++ 0 events expected while mode = disabled"); |
| - consoleWrite(""); |
| - } |
| - |
| - function testHiddenAndShowing() |
| - { |
| - consoleWrite("<b>++ 'hidden'</b>"); |
| - setMode("hidden"); |
| - |
| - consoleWrite("<b>++ 'showing'</b>"); |
| - setMode("showing"); |
| - |
| - consoleWrite("++ at least " + textTrack.cues.length + " events expected while mode = showing"); |
| - } |
| - |
| - waitForEvent('cuechange', |
| - function (event) |
| - { |
| - cueCount++; |
| - if (cueCount == textTrack.cues.length) |
| - endTest(); |
| - |
| - } |
| - ); |
| - |
| - </script> |
| - </head> |
| - <body> |
| - <p>Tests that the TextTrack mode attribute is appropriately set.</p> |
| - <video> |
| - <track id=track_1 src="captions-webvtt/captions-fast.vtt" onload="start()" default> |
| - </video> |
| - </body> |
| -</html> |
| +<title>Tests that the TextTrack mode attribute is appropriately set.</title> |
| +<script src="../media-file.js"></script> |
| +<script src="../../resources/testharness.js"></script> |
| +<script src="../../resources/testharnessreport.js"></script> |
| +<video> |
| + <track src="captions-webvtt/captions-fast.vtt" default> |
| +</video> |
| +<script> |
| +async_test(function(t) { |
| + var video = document.querySelector("video"); |
| + var track = document.querySelector("track"); |
| + track.onload = t.step_func(trackLoaded); |
| + |
| + var cueCount = 0; |
| + var textTrack; |
| + function trackLoaded() { |
| + textTrack = track.track; |
| + // Test default attribute value. |
| + assert_equals(textTrack.mode, "showing"); |
| + assert_equals(video.textTracks[0].mode, "showing"); |
| + // Set to bogus value, should return default. |
| + var value = "bogus"; |
| + textTrack.mode = value; |
| + assert_equals(textTrack.mode, "showing"); |
| + assert_equals(video.textTracks[0].mode, "showing"); |
| + |
| + // Set to numeric value (no longer supported), should return default. |
| + textTrack.mode = 2; |
| + assert_equals(textTrack.mode, "showing"); |
| + assert_equals(video.textTracks[0].mode, "showing"); |
| + |
| + // Set to known values. |
| + setMode("disabled"); |
| + |
| + video.src = findMediaFile("video", "../content/test"); |
| + video.play(); |
| + // Wait for end of first cue (no events should fire while track is disabled). |
| + setTimeout(testHiddenAndShowing, 400); |
| + } |
| + |
| + track.oncuechange = t.step_func(function(event) { |
| + cueCount++; |
| + if (cueCount == textTrack.cues.length) |
| + t.done(); |
| + }); |
| + |
| + function setMode(value) { |
|
mlamouri (slow - plz ping)
2016/05/04 13:55:24
can you call this function 'setModeAndCheck'. It's
|
| + textTrack.mode = value; |
| + assert_equals(textTrack.mode, value); |
| + assert_equals(video.textTracks[0].mode, value); |
| + if (value == "disabled") |
| + assert_equals(textTrack.cues, null); |
| + else |
| + assert_equals(textTrack.cues.length, textTrack.cues.length); |
| + } |
| + |
| + function testHiddenAndShowing() { |
| + setMode("hidden"); |
| + setMode("showing"); |
| + } |
| +}); |
| +</script> |