third_party/WebKit/LayoutTests/http/tests/media/progress-events-generated-correctly.html - Issue 2258863002: Convert http media tests to testharness.js

Unified Diff: third_party/WebKit/LayoutTests/http/tests/media/progress-events-generated-correctly.html

Issue 2258863002: Convert http media tests to testharness.js (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 4 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 | « no previous file | third_party/WebKit/LayoutTests/http/tests/media/progress-events-generated-correctly-expected.txt » ('j') | third_party/WebKit/LayoutTests/http/tests/media/reload-after-dialog.html » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/LayoutTests/http/tests/media/progress-events-generated-correctly.html

diff --git a/third_party/WebKit/LayoutTests/http/tests/media/progress-events-generated-correctly.html b/third_party/WebKit/LayoutTests/http/tests/media/progress-events-generated-correctly.html

index 0b7bfc2004959a7e6ff48fdbc9c05102bd33f804..48e9d7836d0c0028434a47fc3e4670aaa64ab306 100644

--- a/third_party/WebKit/LayoutTests/http/tests/media/progress-events-generated-correctly.html

+++ b/third_party/WebKit/LayoutTests/http/tests/media/progress-events-generated-correctly.html

@@ -1,45 +1,40 @@

-<video controls></video>

-<p>Test that progress events are generated during loading of media resource.</p>

-<!-- TODO(foolip): Convert test to testharness.js. crbug.com/588956

- (Please avoid writing new tests using video-test.js) -->

-<script src=../../media-resources/video-test.js></script>

-<script src=../../media-resources/media-file.js></script>

+<!DOCTYPE html>

+<title>Test that progress events are generated during loading of media resource.</title>

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

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

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

+<video></video>

- waitForEventAndFail('error');

+async_test(function(t) {

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

+ video.onerror = t.unreached_func();

// Given long enough duration, We should not reach ended playback state.

- waitForEventAndFail('ended');

+ video.onended = t.unreached_func();

// Tuned throttling should not induce player stall or suspended load.

- waitForEventAndFail('stalled');

- waitForEventAndFail('suspend');

- waitForEventAndFail('waiting');

+ video.onstalled = t.unreached_func();

+ video.onsuspend = t.unreached_func();

+ video.onwaiting = t.unreached_func();

var progressCount = 0;

var lastProgressEventTime = 0;

- function progressListener(event)

- {

- // Implementations can vary the frequency within tolerance, so we must protect against flaky logs.

- // Remain silent here unless failure detected.

- if (video.networkState != HTMLMediaElement.NETWORK_LOADING) {

- failTest('Unexpected networkState ' + video.networkState +

- ' when handling \'progress\' event. Is fetch completed or suspending?');

- return;

- }

+ video.onprogress = t.step_func(function() {

+ // Implementations can vary the frequency within tolerance,

+ // so we must protect against flaky logs.

+ // Remain silent here unless failure detected.

+ assert_equals(video.networkState, HTMLMediaElement.NETWORK_LOADING);

progressCount++;

lastProgressEventTime = window.performance.now();

- };

- video.addEventListener('progress', progressListener);

+ });

- function canplayListener(event)

- {

- // Begin video playback to mitigate flakiness due to implementations suspending loads

- // on limited buffer capacity.

+ video.oncanplay = t.step_func(function() {

+ video.oncanplay = null;

+ // Begin video playback to mitigate flakiness due to

+ // implementations suspending load on limited buffer capacity.

video.play();

- video.removeEventListener('canplay', canplayListener);

- }

- video.addEventListener('canplay', canplayListener);

+ });

var progressCountAtLastCheck = 0;

var checkCount = 0;

@@ -47,47 +42,30 @@

var maxProgressFiringIntervalInMS = 550;

// Multiple 'progress' events may fire within spec's tolerance window.

var maxProgressCountIncrease = 3;

- function checkProgressCount()

- {

- checkCount++;

+ function checkProgressCount() {

// Implementations can vary the frequency within tolerance, so we must protect against flakiness.

// Keep progressCount values involved in checks here out of report unless failure detected.

- consoleWrite('Interval ' + checkCount + ' has elapsed. Checking progress event count delta.');

var progressCountDelta = progressCount - progressCountAtLastCheck;

- if (progressCountDelta <= 0) {

- failTest('progressCount (' + progressCount + ') did not increase since the last check.');

- return;

- }

- var surplusProgress = progressCountDelta - maxProgressCountIncrease;

- if (surplusProgress > 0) {

- failTest('Received at least ' + surplusProgress + ' too many progress event(s) since the last check.');

- return;

- }

+ assert_greater_than(progressCountDelta, 0, 'Progress Event not fired');

fs 2016/08/18 14:04:05 'at least one progress event was fired' ? (Instead

Srirama 2016/08/19 04:57:34 Done. I have given these comments from the perspec

+ assert_less_than_equal(progressCountDelta, maxProgressCountIncrease, 'Too many progress events fired');

fs 2016/08/18 14:04:05 Ditto here. (This is asserting that too many event

Srirama 2016/08/19 04:57:34 Done.

- if (checkCount == 3) {

- endTest();

+ if (++checkCount == 3) {

+ t.done();

return;

}

progressCountAtLastCheck = progressCount;

var msSinceLastProgressEvent = window.performance.now() - lastProgressEventTime;

var msUntilNextCheck = maxProgressFiringIntervalInMS - msSinceLastProgressEvent;

+ assert_greater_than(msUntilNextCheck, 0, 'Progress Event delayed');

fs 2016/08/18 14:04:05 Maybe 'delayed' -> 'delay' or something like that.

Srirama 2016/08/19 04:57:34 Done.

- if (msUntilNextCheck <= 0) {

- failTest('ProgressCheck scheduling error: msUntilNextCheck is ' + msUntilNextCheck);

- return;

- }

- setTimeout(checkProgressCount, msUntilNextCheck);

+ setTimeout(t.step_func(checkProgressCount), msUntilNextCheck);

}

- waitForEvent('loadstart', function()

- {

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

// No 'progress' event should fire prior to 'loadstart'.

- testExpected('progressCount', 0, '==');

- setTimeout(checkProgressCount, maxProgressFiringIntervalInMS);

+ assert_equals(progressCount, 0, 'Progress Event fired before load event');

fs 2016/08/18 14:04:05 'No progress event fired...'

Srirama 2016/08/19 04:57:34 Done.

+ setTimeout(t.step_func(checkProgressCount), maxProgressFiringIntervalInMS);

});

var mediaFile = findMediaFile('video', 'resources/test');

@@ -99,4 +77,5 @@

var kBps = 45;

video.src = 'video-throttled-load.cgi' + '?name=' + mediaFile + '&throttle=' + kBps + '&type=' + mimeType;

-</script>

+});

+</script>