Chromium Code Reviews Chromium Code Reviews
Issue 2024533002:
Convert csp-*, event-* and invalid-* tests to testharness.js (Closed)
Base URL: https://chromium.googlesource.com/chromium/src.git@master| Index: third_party/WebKit/LayoutTests/media/invalid-media-url-crash.html |
| diff --git a/third_party/WebKit/LayoutTests/media/invalid-media-url-crash.html b/third_party/WebKit/LayoutTests/media/invalid-media-url-crash.html |
| index 7931f70091d9284e196303cb4e384ccca1c4abfb..74eebdb1d27c9c8efcb68e35d93ccecc22dfb0ad 100644 |
| --- a/third_party/WebKit/LayoutTests/media/invalid-media-url-crash.html |
| +++ b/third_party/WebKit/LayoutTests/media/invalid-media-url-crash.html |
| @@ -1,34 +1,29 @@ |
| -<html> |
| - <body> |
| - <p>Tests that invalid media src url does not result in crash.</p> |
| - <!-- 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> |
| - <script> |
| - var invalid_url = "!:/" + String.fromCharCode(0) + "%aa#aa"; |
| - var error_count = 0; |
| +<!DOCTYPE html> |
| +<title>Tests that invalid media src url does not result in crash.</title> |
| +<script src="../resources/testharness.js"></script> |
| +<script src="../resources/testharnessreport.js"></script> |
| +<script> |
| +async_test(function(t) { |
| + var invalid_url = "!:/" + String.fromCharCode(0) + "%aa#aa"; |
| + var eventCount = 0; |
| - function errorEvent() |
| - { |
| - error_count++; |
| - if (error_count == 2) |
| - { |
| - testExpected("audio.error.code", MediaError.MEDIA_ERR_SRC_NOT_SUPPORTED); |
| - testExpected("video.error.code", MediaError.MEDIA_ERR_SRC_NOT_SUPPORTED); |
| - testExpected("audio.networkState", HTMLMediaElement.NETWORK_NO_SOURCE); |
| - testExpected("video.networkState", HTMLMediaElement.NETWORK_NO_SOURCE); |
| - endTest(); |
| - } |
| - } |
| + var audio = document.createElement("audio"); |
|
fs
2016/05/30 09:11:39
Could we turn this into two tests - one per tag-ty
Srirama
2016/05/31 07:04:23
Done.
|
| + var video = document.createElement("video"); |
| + audio.src = invalid_url; |
| + video.src = invalid_url; |
| + audio.onerror = t.step_func(errorEvent); |
| + video.onerror = t.step_func(errorEvent); |
| - var audio = document.createElement('audio'); |
| - var video = document.createElement('video'); |
| - audio.src = invalid_url; |
| - video.src = invalid_url; |
| - audio.onerror = errorEvent; |
| - video.onerror = errorEvent; |
| - document.body.appendChild(audio); |
|
fs
2016/05/30 09:11:39
It doesn't look like these have an useful purpose,
|
| - document.body.appendChild(video); |
| - </script> |
| - </body> |
| -</html> |
| + function errorEvent() { |
| + eventCount++; |
| + if (eventCount != 2) |
| + return; |
| + |
| + assert_equals(audio.error.code, MediaError.MEDIA_ERR_SRC_NOT_SUPPORTED); |
| + assert_equals(video.error.code, MediaError.MEDIA_ERR_SRC_NOT_SUPPORTED); |
| + assert_equals(audio.networkState, HTMLMediaElement.NETWORK_NO_SOURCE); |
| + assert_equals(video.networkState, HTMLMediaElement.NETWORK_NO_SOURCE); |
| + t.done(); |
| + } |
| +}); |
| +</script> |
