Chromium Code Reviews| 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..dd4ef2a0f1277103eb30906e94b0188fe34ec83e 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> |
| <script> |
| +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 () { |
|
fs
2016/06/26 15:10:43
Nit: space before ()
Srirama
2016/06/26 18:14:03
Done.
|
| + var url = video.currentSrc; |
| + assert_equals(url.substr(url.lastIndexOf("/media/")+7), mediaFile); |
| + }); |
| + |
| + document.querySelector("source").src = "content/error.mpeg"; |
| + video.src = mediaFile; |
| +}); |
| +</script> |