third_party/WebKit/LayoutTests/media/video-src-source.html - Issue 2098213002: Convert video-src-[plus-source, remove, set, source].html tests to testharness.js

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/WebKit/LayoutTests/media/video-src-source.html

Issue 2098213002: Convert video-src-[plus-source, remove, set, source].html tests to testharness.js (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: address nits Created 4 years, 6 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

« no previous file with comments | « third_party/WebKit/LayoutTests/media/video-src-set-expected.txt ('k') | third_party/WebKit/LayoutTests/media/video-src-source-expected.txt » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/LayoutTests/media/video-src-source.html

diff --git a/third_party/WebKit/LayoutTests/media/video-src-source.html b/third_party/WebKit/LayoutTests/media/video-src-source.html

index 3df59b5338dccf99b6f2054e20f6e555fafb2558..be84df7c1551ab3fc5bcb3bf9cf7855a9b81c8df 100644

--- a/third_party/WebKit/LayoutTests/media/video-src-source.html

+++ b/third_party/WebKit/LayoutTests/media/video-src-source.html

@@ -1,15 +1,22 @@

-<body>

-<video><source></source></video>

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

+<!DOCTYPE html>

+<title>Test that a "source" element is not used when "src" attribute is set.</title>

+<script src="../resources/testharness.js"></script>

+<script src="../resources/testharnessreport.js"></script>

+<script src="media-file.js"></script>

+<video>

+ <source></source>

+</video>

+async_test(function(t) {

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

var mediaFile = findMediaFile("video", "content/test");

- waitForEvent('loadstart', function () {

- testExpected("stripExtension(relativeURL(video.currentSrc))", stripExtension(mediaFile));

- endTest();

- } );

- document.getElementsByTagName('source')[0].src = "content/error.mpeg";

- mediaElement.src = mediaFile;

-</script>

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

+ var url = video.currentSrc;

+ assert_equals(url.substr(url.lastIndexOf("/media/")+7), mediaFile);

+ });

+ document.querySelector("source").src = "content/error.mpeg";

+ video.src = mediaFile;

+});

+</script>