Changeset 100402 in webkit


Ignore:
Timestamp:
Nov 15, 2011 9:33:23 PM (13 years ago)
Author:
annacc@chromium.org
Message:

Make sure both the video and the track are ready to be tested before testing.
​https://bugs.webkit.org/show_bug.cgi?id=72269

Reviewed by Eric Carlson.

  • media/track/track-cues-cuechange.html:
  • media/track/track-cues-enter-exit.html:
  • platform/chromium/test_expectations.txt:
Location:
trunk/LayoutTests
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r100396 r100402  
     12011-11-15  Anna Cavender  <annacc@chromium.org>
     2
     3        Make sure both the video and the track are ready to be tested before testing.
     4        https://bugs.webkit.org/show_bug.cgi?id=72269
     5
     6        Reviewed by Eric Carlson.
     7
     8        * media/track/track-cues-cuechange.html:
     9        * media/track/track-cues-enter-exit.html:
     10        * platform/chromium/test_expectations.txt:
     11
    1122011-11-15  Tony Chang  <tony@chromium.org>
    213

  • trunk/LayoutTests/media/track/track-cues-cuechange.html

    r100296 r100402  
    1010        <p>Tests that TextTrack's cues are indexed and updated in order during video playback. Test uses the cuechange event.</p>
    1111        <video controls>
    12             <track id="testTrack" src="captions-webvtt/cues-chrono-order.vtt" kind="captions">
     12            <track id="testTrack" src="captions-webvtt/cues-chrono-order.vtt" kind="captions" onload="loaded()">
    1313        </video>
    1414        <script>           
    … …  
    1717        var currentCue;
    1818        var testTrack;
     19
     20        var trackLoaded = false;
     21        var videoCanPlayThrough = false;
     22
     23        function attemptTests()
     24        {
     25            if (!trackLoaded || !videoCanPlayThrough)
     26                return;
     27
     28            testTrack = document.getElementById("testTrack");
     29            testExpected("testTrack.track.cues.length", 3);
     30            testTrack.addEventListener('cuechange', cueChangedFromTrackElement);
     31            testTrack.track.addEventListener('cuechange', cueChangedFromTextTrack);
     32            run("video.play()");
     33            consoleWrite("");
     34        }
    1935
    2036        function cueChangedFromTrackElement()
    … …  
    5470            function ()
    5571            {
    56                 testTrack = document.getElementById("testTrack");
    57                 testExpected("testTrack.track.cues.length", 3);
    58                 testTrack.addEventListener('cuechange', cueChangedFromTrackElement);
    59                 testTrack.track.addEventListener('cuechange', cueChangedFromTextTrack);
    60                 run("video.play()");
    61                 consoleWrite("");
     72                videoCanPlayThrough = true;
     73                attemptTests();
    6274            }
    6375        );
     76       
     77        function loaded()
     78        {
     79            trackLoaded = true;
     80            attemptTests();
     81        }
    6482
    6583        findMediaElement();

  • trunk/LayoutTests/media/track/track-cues-enter-exit.html

    r100296 r100402  
    1010        <p>Tests that TextTrack's cues are indexed and updated in order during video playback. Test uses the enter and exits events on TextTrackCue.</p>
    1111        <video controls>
    12             <track id="testTrack" src="captions-webvtt/cues-chrono-order.vtt" kind="captions">
     12            <track id="testTrack" src="captions-webvtt/cues-chrono-order.vtt" kind="captions" onload="loaded()">
    1313        </video>
    1414        <script>           
    … …  
    1717        var currentCue;
    1818        var testTrack;
     19
     20        var trackLoaded = false;
     21        var videoCanPlayThrough = false;
     22
     23        function attemptTests()
     24        {
     25            if (!trackLoaded || !videoCanPlayThrough)
     26                return;
     27
     28            testTrack = document.getElementById("testTrack");
     29            testExpected("testTrack.track.cues.length", 3);
     30            for (var i = 0; i < testTrack.track.cues.length; i++) {
     31                testTrack.track.cues[i].addEventListener('enter', cueEntered);
     32                testTrack.track.cues[i].addEventListener('exit', cueExited);
     33            }
     34            run("video.play()");
     35            consoleWrite("");
     36        }
    1937
    2038        function cueEntered()
    … …  
    4361            function ()
    4462            {
    45                 testTrack = document.getElementById("testTrack");
    46                 testExpected("testTrack.track.cues.length", 3);
    47                 for (var i = 0; i < testTrack.track.cues.length; i++) {
    48                     testTrack.track.cues[i].addEventListener('enter', cueEntered);
    49                     testTrack.track.cues[i].addEventListener('exit', cueExited);
    50                 }
    51                 run("video.play()");
    52                 consoleWrite("");
     63                videoCanPlayThrough = true;
     64                attemptTests();
    5365            }
    5466        );
     67       
     68        function loaded()
     69        {
     70            trackLoaded = true;
     71            attemptTests();
     72        }
    5573
    5674        findMediaElement();

  • trunk/LayoutTests/platform/chromium/test_expectations.txt

    r100396 r100402  
    39353935BUGWK72434 : inspector/styles/svg-style.xhtml = TEXT PASS
    39363936
    3937 BUGWK72269 : media/track/track-cues-cuechange.html = TEXT PASS
    3938 
    39393937BUGWK72447 : inspector/extensions/extensions-events.html = TEXT PASS
Note: See TracChangeset for help on using the changeset viewer.