third_party/WebKit/LayoutTests/media/track/track-css-user-settings-override-internal-settings.html - Issue 1882583002: Convert track tests from video-test.js to testharness.js based

Unified Diff: third_party/WebKit/LayoutTests/media/track/track-css-user-settings-override-internal-settings.html

Issue 1882583002: 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-user-settings-override-author-settings.html ('K') | « third_party/WebKit/LayoutTests/media/track/track-css-user-settings-override-author-settings-expected.txt ('k') | third_party/WebKit/LayoutTests/media/track/track-css-user-settings-override-internal-settings-expected.txt » ('j') | third_party/WebKit/LayoutTests/media/track/track-cue-empty-crash.html » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/LayoutTests/media/track/track-css-user-settings-override-internal-settings.html

diff --git a/third_party/WebKit/LayoutTests/media/track/track-css-user-settings-override-internal-settings.html b/third_party/WebKit/LayoutTests/media/track/track-css-user-settings-override-internal-settings.html

index 19b4f7ff3146b1a782e650cbd76956215cba4c55..b9d59e6fdf48a2c12efa67c1cdfc0bc0a17ae8bf 100644

--- a/third_party/WebKit/LayoutTests/media/track/track-css-user-settings-override-internal-settings.html

+++ b/third_party/WebKit/LayoutTests/media/track/track-css-user-settings-override-internal-settings.html

@@ -1,52 +1,41 @@

<!DOCTYPE html>

-<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>

+<title>Test that WebVTT objects are being styled correctly based on user settings that should override default settings.</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>

+<video>

+ <track src="captions-webvtt/styling.vtt" kind="captions" default>

+</video>

+async_test(function(t) {

+ var video = document.querySelector("video");

+ video.src = findMediaFile("video", "../content/test");

mlamouri (slow - plz ping) 2016/04/13 12:58:30 ditto

- function applyUserOverrideSettings() {

- if (window.internals) {

+ video.oncanplaythrough = t.step_func_done(function() {

+ var cue = textTrackDisplayElement(video, "cue");

+ var cueStyle = getComputedStyle(cue);

+ // These are the expected default cue settings per spec

+ // http://dev.w3.org/html5/webvtt/#applying-css-properties-to-webvtt-node-objects

+ assert_equals(cueStyle.color, "rgb(255, 255, 255)");

+ assert_equals(cueStyle.backgroundColor, "rgba(0, 0, 0, 0.8)");

+ assert_equals(cueStyle.fontFamily, "sans-serif");

+ // Apply user settings for color and font-size and verify that the other internal settings are retained.

+ if (internals) {

internals.settings.setTextTrackTextColor("purple");

internals.settings.setTextTrackTextSize("14px");

}

- }

- function verifyDefaultSettings() {

- consoleWrite("");

- cue = textTrackDisplayElement(video, 'cue');

- // These are the expected default cue settings per spec

- // http://dev.w3.org/html5/webvtt/#applying-css-properties-to-webvtt-node-objects

- testExpected("getComputedStyle(cue).color", "rgb(255, 255, 255)");

- testExpected("getComputedStyle(cue).backgroundColor", "rgba(0, 0, 0, 0.8)");

- testExpected("getComputedStyle(cue).fontFamily", "sans-serif");

- // Apply user settings for color and font-size and verify that the other internal settings are retained.

- applyUserOverrideSettings();

- run("video.currentTime = 0.3");

- checkExpected();

- }

+ video.currentTime = 0.3;

- function checkExpected() {

- consoleWrite("");

- cue = textTrackDisplayElement(video, 'cue');

- testExpected("getComputedStyle(cue).color", "rgb(128, 0, 128)");

- testExpected("getComputedStyle(cue).fontSize", "14px");

+ cue = textTrackDisplayElement(video, "cue");

+ cueStyle = getComputedStyle(cue);

+ assert_equals(cueStyle.color, "rgb(128, 0, 128)");

+ assert_equals(cueStyle.fontSize, "14px");

// When there is no user setting specified for background-color and font-family, the internal settings are applied.

- testExpected("getComputedStyle(cue).backgroundColor", "rgba(0, 0, 0, 0.8)");

- testExpected("getComputedStyle(cue).fontFamily", "sans-serif");

- endTest();

- }

- window.onload = function() {

- consoleWrite("Test that WebVTT objects are being styled correctly based on user settings that should override default settings.");

- findMediaElement();

- video.src = findMediaFile('video', '../content/test');

- video.currentTime = 0.1;

- waitForEvent('canplaythrough', verifyDefaultSettings);

- }

-</script>

-<video>

- <track src="captions-webvtt/styling.vtt" kind="captions" default>

-</video>

+ assert_equals(cueStyle.backgroundColor, "rgba(0, 0, 0, 0.8)");

+ assert_equals(cueStyle.fontFamily, "sans-serif");

+ });

+});

+</script>