Convert video-played* tests to testharness.js

third_party/WebKit/LayoutTests/media/video-played.js

Index: third_party/WebKit/LayoutTests/media/video-played.js
diff --git a/third_party/WebKit/LayoutTests/media/video-played.js b/third_party/WebKit/LayoutTests/media/video-played.js
index 367f7330a240017ebb78097a50a1fb45c06c415f..e6c472efb606849f32a9d4d33f269a49b719ef48 100644
--- a/third_party/WebKit/LayoutTests/media/video-played.js
+++ b/third_party/WebKit/LayoutTests/media/video-played.js
@@ -1,175 +1,80 @@
-
-var expectedStartTimes = new Array();
-var expectedEndTimes = new Array();
 var timeRangeCount = 0;
 var currentTimeRange = 0;
-var currentTest = 0;
-var willPauseInExistingRange = false;
-var willExtendAnExistingRange = false;
-
-var testStartTime = 0;
-var logTestTiming = false;
+var playDuration = 0;
+var startTimeOfPlay = 0;
+var startTime = 0;
 
-//@@@@@ Uncomment the following line to log the time each "video-played" sub-test takes in test output
-//@@@@@ logTestTiming = true;
+function testRanges(expectedStartTimes, expectedEndTimes) {
+    assert_equals(video.played.length, timeRangeCount);
 
-function logRanges()
-{
-    consoleWrite("");
     for (i = 0; i < timeRangeCount; i++) {
-        consoleWrite("****  range " + i + " ( " + video.played.start(i).toFixed(2) + ".." + video.played.end(i).toFixed(2) + ")");
-    }
-}
-
-function testRanges()
-{
-    if (testStartTime) {
-        logRanges();
-
-        var duration = (window.performance.now() - testStartTime) / 1000;
-        consoleWrite("**** Test " + currentTest + " took " + duration.toFixed(2) + " seconds");
+        assert_equals(video.played.start(i).toFixed(2), expectedStartTimes[i]);
+        assert_equals(video.played.end(i).toFixed(2), expectedEndTimes[i]);
     }
-
-    testExpected("video.played.length", timeRangeCount);
-
-    for (i = 0; i < timeRangeCount; i++) {
-        testExpected("video.played.start(" + (i) + ").toFixed(2)", expectedStartTimes[i]);
-        testExpected("video.played.end("   + (i) + ").toFixed(2)", expectedEndTimes[i]);
-    }
-}
-
-function nextTest()
-{
-    if (logTestTiming)
-        testStartTime = window.performance.now();
-
-    if (currentTest >= testFunctions.length)
-        endTest();
-    else
-        (testFunctions[currentTest])();
-    currentTest++;
-}
-
-function pause(evt)
-{
-    currentTime = video.currentTime.toFixed(2);
-
-    if (!willExtendAnExistingRange)
-        expectedEndTimes.splice(currentTimeRange, 0, currentTime)
-        else if(expectedEndTimes[currentTimeRange] < currentTime || expectedEndTimes[currentTimeRange] == undefined)
-            expectedEndTimes[currentTimeRange] = currentTime;
-
-    testRanges();
-    nextTest();
 }
 
-function canplay(event)
-{
-    testRanges();
-    nextTest();
+function waitForPauseAndContinue(t, nextFunc, extendsRange, expectedStartTimes, expectedEndTimes) {
+    video.onpause = t.step_func(function() {
+        var currentTime = video.currentTime.toFixed(2);
+        if (extendsRange) {
+            if(expectedEndTimes[currentTimeRange] < currentTime
+                || expectedEndTimes[currentTimeRange] == undefined) {
+                expectedEndTimes[currentTimeRange] = currentTime;
+            }
+        } else {
+            expectedEndTimes.splice(currentTimeRange, 0, currentTime);
+        }
+        testRanges(expectedStartTimes, expectedEndTimes);
+        if (nextFunc)
+            nextFunc();
+        else
+            t.done();
+    });
 }
 
-function willCreateNewRange()
-{
+function willCreateNewRange(expectedStartTimes) {
     expectedStartTimes.splice(currentTimeRange, 0, video.currentTime.toFixed(2))
     ++timeRangeCount;
 }
 
-function startPlayingInNewRange()
-{
-    willCreateNewRange();
-    startPlaying();
-}
-
-function startPlaying()
-{
-    playForMillisecs(100); // Triggers pause()
-}
-
-function secToMilli(seconds)
-{
-    return seconds * 1000.;
-}
-
-function milliToSecs(milliseconds)
-{
-    return milliseconds / 1000;
-}
-
-function nowInSecs()
-{
-    return milliToSecs(window.performance.now());
-}
-
-function playForMillisecs(milliseconds)
-{
-    var playDuration = milliToSecs(milliseconds);
-    if (playDuration > video.duration) {
-        failTest("WARNING: playForMillisecs() does not support range (" + playDuration + ") bigger than video duration (" + video.duration + ") (yet)");
-        return;
-    }
-
-    // A 2 second timeout was sometimes insufficient to play 1.25 seconds of movie, though more
-    // than 1 second of movie typically had played prior to those failures. Use a larger value
-    // than 2 here.
-    var timeoutThreshold = 3.;
-
-    if (video.duration < timeoutThreshold) {
-        failTest("WARNING: playForMillisecs() does not support video duration(" + video.duration + ") smaller than timeout threshold (" + timeoutThreshold + ")");
-        return;
-    }
-
-    if (playDuration > timeoutThreshold - 1.5) {
-        failTest("WARNING: playForMillisecs() does not support range (" + playDuration + ") within 1.5 seconds of timeout threshold (" + timeoutThreshold + ")");
-        return;
+function callPauseIfTimeIsReached() {
+    var playedTime = video.currentTime - startTimeOfPlay;
+    if (playedTime < 0) {
+        // Deal with "loop" attribute. This allows only one loop, hence the first warning
+        // at the begining of platForDuration().
+        playedTime = video.duration - startTimeOfPlay + video.currentTime;
     }
 
-    run("video.play()");
-
-    var startTime = nowInSecs();
-    var playedFromTime = video.currentTime;
-    var callPauseIfTimeIsReached = function ()
-    {
-        var playedTime = video.currentTime - playedFromTime;
-
-        if (playedTime < 0) {
-            // Deal with 'loop' attribute. This allows only one loop, hence the first warning
-            // at the begining of playForMillisecs().
-            playedTime = video.duration - playedFromTime + video.currentTime;
-        }
-
-        var elapsed = nowInSecs() - startTime;
-        if (elapsed > timeoutThreshold) {
-            // Just in case something goes wrong.
-            failTest("ERROR: test stalled, waited " + elapsed + " seconds for movie to play " + playedTime + " seconds");
-            return;
-        }
-
-        if (playedTime >= playDuration || video.currentTime == video.duration)
-            run("video.pause()");
-        else {
-            var delta = milliseconds - playedTime  * 1000;
-            setTimeout(callPauseIfTimeIsReached, delta);
-        }
+    var elapsed = (performance.now() / 1000) - startTime;
+    assert_less_than_equal(elapsed, 3.0);
+    if (playedTime >= playDuration || video.currentTime == video.duration)
+        video.pause();
+    else {
+        var delta = (playDuration - playedTime)  * 1000;
+        setTimeout(this.step_func(callPauseIfTimeIsReached), delta);
     }
-
-    // Add a small amount to the timer because it will take a non-zero amount of time for the 
-    // video to start playing.
-    setTimeout(callPauseIfTimeIsReached, milliseconds + 100);
 }
 
-function videoPlayedMain()
-{
-    findMediaElement();
-
-    video.src = findMediaFile("video", "content/test");
-
-    waitForEvent("error");
-    waitForEvent("loadstart");
-    waitForEvent("ratechange");
-    waitForEvent("loadedmetadata");
-    waitForEventOnce("canplay", canplay); // Will trigger nextTest() which launches the tests.
-    waitForEvent("pause", pause);
+function playForDuration(duration, t) {
+    playDuration = duration;
+    assert_less_than_equal(duration, video.duration);
+
+    // A 2 second timeout was sometimes insufficient to play 1.25 seconds of movie,
+    // though more than 1 second of movie typically had played prior to those failures.
+    // Use a larger value than 2 here.
+    var timeoutThreshold = 3.0;
+    assert_greater_than_equal(video.duration, timeoutThreshold);
+    assert_less_than_equal(duration, timeoutThreshold - 1.5);
+    video.play();
+    startTime = performance.now() / 1000;
+    startTimeOfPlay = video.currentTime;
+
+    // Add a small amount to the timer because it will take a non-zero
+    // amount of time for the video to start playing.
+    setTimeout(t.step_func(callPauseIfTimeIsReached), (duration * 1000) + 100);
+}
 
-    video.load();
+function startPlayingInNewRange(t, expectedStartTimes) {
+    willCreateNewRange(expectedStartTimes);
+    playForDuration(0.1, t);
 }