Changeset 48539 in webkit


Ignore:
Timestamp:
Sep 18, 2009 3:20:01 PM (15 years ago)
Author:
eric@webkit.org
Message:

2009-09-18 Alpha Lam <​hclam@chromium.org>

Reviewed by Eric Carlson.

Media layout tests should have a way to provide test files in different formats
​https://bugs.webkit.org/show_bug.cgi?id=28327

Updating 25 media layout tests to use media files based on supported codecs.

  • media/progress-event-at-least-one.html: Use findMediaFile() to locate a supported media file.
  • media/video-pause-empty-events.html: ditto.
  • media/video-play-empty-events.html: ditto.
  • media/video-play-pause-events.html: ditto.
  • media/video-played-collapse.html: ditto.
  • media/video-played-ranges-1.html: ditto.
  • media/video-played-reset.html: ditto.
  • media/video-played.js: ditto. (videoPlayedMain):
  • media/video-seek-past-end-paused.html: ditto.
  • media/video-seek-past-end-playing.html: ditto.
  • media/video-seekable.html: ditto.
  • media/video-seeking.html: ditto.
  • media/video-size.html: ditto.
  • media/video-source-error.html: ditto.
  • media/video-source-type-params.html: ditto.
  • media/video-source-type.html: ditto.
  • media/video-source.html: ditto.
  • media/video-src-change.html: ditto.
  • media/video-src-invalid-remove.html: ditto.
  • media/video-src-remove.html: ditto. Use counting.mp4 instead of silence.mpg.
  • media/video-src-remove-expected.txt: Updated results.
  • media/video-src-set.html: ditto.
  • media/video-src-source.html: ditto.
  • media/video-src.html: ditto.
  • media/video-timeupdate-during-playback.html: ditto.
  • media/video-volume.html: ditto.
  • media/video-zoom.html: ditto.
Location:
trunk/LayoutTests
Files:
28 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r48537 r48539  
     12009-09-18  Alpha Lam  <hclam@chromium.org>
     2
     3        Reviewed by Eric Carlson.
     4
     5        Media layout tests should have a way to provide test files in different formats
     6        https://bugs.webkit.org/show_bug.cgi?id=28327
     7
     8        Updating 25 media layout tests to use media files based on supported codecs.
     9
     10        * media/progress-event-at-least-one.html: Use findMediaFile() to locate a supported media file.
     11        * media/video-pause-empty-events.html: ditto.
     12        * media/video-play-empty-events.html: ditto.
     13        * media/video-play-pause-events.html: ditto.
     14        * media/video-played-collapse.html: ditto.
     15        * media/video-played-ranges-1.html: ditto.
     16        * media/video-played-reset.html: ditto.
     17        * media/video-played.js: ditto.
     18        (videoPlayedMain):
     19        * media/video-seek-past-end-paused.html: ditto.
     20        * media/video-seek-past-end-playing.html: ditto.
     21        * media/video-seekable.html: ditto.
     22        * media/video-seeking.html: ditto.
     23        * media/video-size.html: ditto.
     24        * media/video-source-error.html: ditto.
     25        * media/video-source-type-params.html: ditto.
     26        * media/video-source-type.html: ditto.
     27        * media/video-source.html: ditto.
     28        * media/video-src-change.html: ditto.
     29        * media/video-src-invalid-remove.html: ditto.
     30        * media/video-src-remove.html: ditto. Use counting.mp4 instead of silence.mpg.
     31        * media/video-src-remove-expected.txt: Updated results.
     32        * media/video-src-set.html: ditto.
     33        * media/video-src-source.html: ditto.
     34        * media/video-src.html: ditto.
     35        * media/video-timeupdate-during-playback.html: ditto.
     36        * media/video-volume.html: ditto.
     37        * media/video-zoom.html: ditto.
     38
    1392009-09-18  Anders Carlsson  <andersca@apple.com>
    240

  • trunk/LayoutTests/media/progress-event-at-least-one.html

    r47579 r48539  
    11<html>
    22    <head>
     3        <script src=media-file.js></script>
    34        <script src=video-test.js></script>
    45
    … …  
    4546                waitForEvent('loadeddata');
    4647
    47                 run("mediaElement.src = 'content/test.wav'");
     48                var mediaFile = findMediaFile("audio", "content/test");
     49                run("mediaElement.src = '" + mediaFile + "'");
    4850                run("mediaElement.load()");
    4951

  • trunk/LayoutTests/media/video-pause-empty-events.html

    r41907 r48539  
    11<video controls></video>
    22<p>Test that pause() from EMPTY network state triggers load()</p>
     3<script src=media-file.js></script>
    34<script src=video-test.js></script>
    45<script>
    5     video.src = "content/test.mp4";
     6    video.src = findMediaFile("video", "content/test");
    67    testExpected("video.networkState", HTMLMediaElement.NETWORK_EMPTY);
    78

  • trunk/LayoutTests/media/video-play-empty-events.html

    r41907 r48539  
    44    <video controls></video>
    55    <p>Test that play() from EMPTY network state triggers load() and async play event.</p>
     6    <script src=media-file.js></script>
    67    <script src=video-test.js></script>
    78    <script>
    … …  
    2122        waitForEvent('playing', function () { testExpected("video.paused", false); endTest(); } );
    2223   
    23         video.src = "content/test.mp4";
     24        video.src = findMediaFile("video", "content/test");
    2425        run("video.play()");
    2526        consoleWrite("SCRIPT DONE");

  • trunk/LayoutTests/media/video-play-pause-events.html

    r41907 r48539  
    11<video controls></video>
    22<p>Test that calling play() and pause() triggers async play, timeupdate and pause events.</p>
     3<script src=media-file.js></script>
    34<script src=video-test.js></script>
    45<script>
    5     video.src = "content/test.mp4";
     6    video.src = findMediaFile("video", "content/test.mp4");
    67
    78    waitForEvent("loadstart");

  • trunk/LayoutTests/media/video-played-collapse.html

    r47287 r48539  
    22    <head>
    33        <title>Test of 'played' attribute</title>
     4        <script src=media-file.js></script>
    45        <script src=video-test.js></script>
    56        <script src=video-played.js></script>

  • trunk/LayoutTests/media/video-played-ranges-1.html

    r47287 r48539  
    22    <head>
    33        <title>Test of 'played' attribute</title>
     4        <script src=media-file.js></script>
    45        <script src=video-test.js></script>
    56        <script src=video-played.js></script>

  • trunk/LayoutTests/media/video-played-reset.html

    r47287 r48539  
    22    <head>
    33        <title>Test of 'played' attribute</title>
     4        <script src=media-file.js></script>
    45        <script src=video-test.js></script>
    56        <script src=video-played.js></script>
    … …  
    4142                willExtendAnExistingRange = false;
    4243
    43                 run("video.src = \"content/test.mp4\"");
     44                var mediaFile = findMediaFile("video", "content/test");
     45                run("video.src = \"" + mediaFile + "\"");
    4446                run("video.load()"); // Triggers canplay()
    4547            }

  • trunk/LayoutTests/media/video-played.js

    r47287 r48539  
    143143    findMediaElement();
    144144   
    145     video.src = 'content/test.mp4';
     145    video.src = findMediaFile("video", "content/test");
    146146   
    147147    waitForEvent("error");

  • trunk/LayoutTests/media/video-seek-past-end-paused.html

    r46857 r48539  
    22<video controls></video>
    33<p>Test that seeking paused video past it's duration time sets currentTime to duration and leaves video paused.</p>
     4<script src=media-file.js></script>
    45<script src=video-test.js></script>
    56<script>
    … …  
    3637    }
    3738
    38     run("video.src = 'content/test.mp4'");
     39    var mediaFile = findMediaFile("video", "content/test");
     40    run("video.src = '" + mediaFile + "'");
    3941    run("video.load()");
    4042    consoleWrite("");

  • trunk/LayoutTests/media/video-seek-past-end-playing.html

    r46857 r48539  
    11<video loop controls></video>
    22<p>Test that seeking video with 'loop' past it's end rewinds to the beginning and continues playback.</p>
     3<script src=media-file.js></script>
    34<script src=video-test.js></script>
    45<script>
    … …  
    3031    }
    3132
    32     run("video.src = 'content/test.mp4'");
     33    var mediaFile = findMediaFile("video", "content/test");
     34    run("video.src = '" + mediaFile + "'");
    3335    consoleWrite("");
    3436</script>

  • trunk/LayoutTests/media/video-seekable.html

    r41413 r48539  
    11<video controls></video>
     2<script src=media-file.js></script>
    23<script src=video-test.js></script>
    34<script>
    … …  
    2021        }
    2122    );
    22     video.src = "content/test.mp4";
     23    video.src = findMediaFile("video", "content/test");
    2324</script>

  • trunk/LayoutTests/media/video-seeking.html

    r41907 r48539  
    44 is fired for each seek
    55 </p>
     6<script src=media-file.js></script>
    67<script src=video-test.js></script>
    78<script>
    … …  
    4849    waitForEvent('load', loaded);
    4950
    50     video.src = "content/test.mp4";
     51    video.src = findMediaFile("video", "content/test");
    5152</script>

  • trunk/LayoutTests/media/video-size.html

    r41413 r48539  
    11<video controls></video>
     2<script src=media-file.js></script>
    23<script src=video-test.js></script>
    34<script>
    … …  
    1112    } );
    1213
    13     video.src = "content/test.mp4";
     14    video.src = findMediaFile("video", "content/test");
    1415</script>

  • trunk/LayoutTests/media/video-source-error.html

    r44991 r48539  
    33        <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
    44        <title>&lt;video&gt; and &lt;source&gt; error test</title>
     5        <script src=media-file.js></script>
    56        <script src=video-test.js></script>
    67
    … …  
    1213            {
    1314                consoleWrite("");
    14                 testExpected("relativeURL(video.currentSrc)", "content/test.mp4");
     15                testExpected("relativeURL(video.currentSrc)", findMediaFile("video", "content/test"));
    1516                testExpected("video.error", null);
    1617                consoleWrite("");
    … …  
    6364            <source id=missing-file src=content/error2.mpeg type=video/mpeg>
    6465            <source id=format-error src="content/unsupported_track.mov">
    65             <source id=supported-format src=content/test.mp4 type="video/mpeg; codecs=&quot;avc1.4D400C&quot;">
     66            <source id=supported-format-mp4 src=content/test.mp4 type="video/mpeg; codecs=&quot;avc1.4D400C&quot;">
     67            <source id=supported-format-ogv src=content/test.ogv type="video/ogg">
    6668        </video>
    6769       

  • trunk/LayoutTests/media/video-source-type-params.html

    r46857 r48539  
    11<body>
     2<script src=media-file.js></script>
    23<script src=video-test.js></script>
    34<video controls>
    45    <source src=content/bogus.mpeg type="video/blahblah">
    56    <source src=content/test.mp4 type="video/mpeg; codecs=&quot;avc1.4D400C&quot;">
     7    <source src=content/test.ogv type="video/ogg; codecs=&quot;theora,vorbis&quot;">
    68    <source src=content/error2.mpeg type=video/mpeg>
    79</video>
    … …  
    911    video = mediaElement = document.getElementsByTagName('video')[0];
    1012    waitForEvent('loadstart', function () {
    11         testExpected("relativeURL(video.currentSrc)", "content/test.mp4");
     13        testExpected("relativeURL(video.currentSrc)", findMediaFile("video", "content/test"));
    1214        endTest();
    1315    } );

  • trunk/LayoutTests/media/video-source-type.html

    r46857 r48539  
    11<body>
     2<script src=media-file.js></script>
    23<script src=video-test.js></script>
    34<video controls>
    45    <source src=content/error.mpeg type=video/blahblah>
    56    <source src=content/test.mp4 type=video/mpeg>
     7    <source src=content/test.ogv type=video/ogg>
    68    <source src=content/error2.mpeg type=video/mpeg>
    79</video>
    … …  
    1012
    1113    waitForEvent("loadstart", function () {
    12         testExpected("relativeURL(video.currentSrc) ", "content/test.mp4");
     14        testExpected("relativeURL(video.currentSrc) ", findMediaFile("video", "content/test"));
    1315        endTest();
    1416    });

  • trunk/LayoutTests/media/video-source.html

    r46857 r48539  
    11<body>
     2<script src=media-file.js></script>
    23<script src=video-test.js></script>
    3 <video controls>
    4     <source src=content/test.mp4>
    5 </video>
    6 
     4<div id=panel></div>
     5<script>
     6    var panel = document.getElementById("panel");
     7    var mediaFile = findMediaFile("video", "content/test");
     8    panel.innerHTML = "<video controls><source src='" + mediaFile + "'></video>";
     9</script>
    710<script>
    811    video = mediaElement = document.getElementsByTagName('video')[0];
    912    waitForEvent("loadstart", function () {
    10         testExpected("relativeURL(video.currentSrc) ", "content/test.mp4");
     13        testExpected("relativeURL(video.currentSrc) ", mediaFile);
    1114        endTest();
    1215    });

  • trunk/LayoutTests/media/video-src-change.html

    r43403 r48539  
    99    3. Test that changing src does not trigger load once a file is loaded.
    1010    </p
     11    <script src=media-file.js></script>
    1112    <script src=video-test.js></script>
    1213    <script>
    13    
     14        var mediaFile = findMediaFile("video", "content/test");
     15
    1416        function errorEvent()
    1517        {
    … …  
    1820            testExpected("video.error.code", MediaError.MEDIA_ERR_SRC_NOT_SUPPORTED);
    1921            consoleWrite("");
    20             run("video.setAttribute('src', 'content/test.mp4')");
     22            run("video.setAttribute('src', '" + mediaFile + "')");
    2123            consoleWrite("");
    2224        }
    … …  
    2426        function loadedmetadata()
    2527        {
    26             testExpected("relativeURL(video.currentSrc)", "content/test.mp4");
     28            testExpected("relativeURL(video.currentSrc)", mediaFile);
    2729            testExpected("isNaN(video.duration)", false);
    2830            consoleWrite("");

  • trunk/LayoutTests/media/video-src-invalid-remove.html

    r46857 r48539  
    11<html>
    22<body>
     3    <script src=media-file.js></script>
    34    <script src=video-test.js></script>
    45
    5     <video src=bogus.mov controls>
    6         <source src=content/test.mp4>
    7     </video>
     6    <div id=panel></div>
     7    <script>
     8        var panel = document.getElementById("panel");
     9        var mediaFile = findMediaFile("video", "content/test");
     10        panel.innerHTML = "<video src=bogus.mov controls><source src=" + mediaFile + "></video>";
     11    </script>
    812
    913    <p>Test that removing invalid 'src' attribute triggers load of &lt;source&gt; elements</p>
    … …  
    2024                testExpected("relativeURL(video.currentSrc)", "bogus.mov");
    2125            else if (loadCount == 2)
    22                 testExpected("relativeURL(video.currentSrc)", "content/test.mp4");
     26                testExpected("relativeURL(video.currentSrc)", mediaFile);
    2327            else
    2428                failTest("'loadCount' fired " + loadCount + "times" );
    … …  
    2832        function loadedmetadata()
    2933        {
    30             testExpected("relativeURL(video.currentSrc)", "content/test.mp4");
     34            testExpected("relativeURL(video.currentSrc)", mediaFile);
    3135            testExpected("isNaN(video.duration)", false);
    3236            consoleWrite("");

  • trunk/LayoutTests/media/video-src-remove-expected.txt

    r41907 r48539  
    11
    22EVENT(loadedmetadata)
    3 EXPECTED (relativeURL(video.currentSrc) == 'content/silence.mpg') OK
     3EXPECTED (relativeURL(video.currentSrc) == 'content/test.mp4') OK
    44EXPECTED (isNaN(video.duration) == 'false') OK
    55
    66RUN(video.removeAttribute('src'))
    77
    8 EXPECTED (relativeURL(video.currentSrc) == 'content/silence.mpg') OK
     8EXPECTED (relativeURL(video.currentSrc) == 'content/test.mp4') OK
    99EXPECTED (isNaN(video.duration) == 'false') OK
    1010

  • trunk/LayoutTests/media/video-src-remove.html

    r47801 r48539  
    11<html>
    22<body>
     3    <script src=media-file.js></script>
    34    <script src=video-test.js></script>
    4 
    5     <video src=content/silence.mpg controls onloadedmetadata="loadedmetadata()" >
    6         <source src=content/test.mp4>
    7     </video>
     5    <div id=panel></div>
     6    <script>
     7        var panel = document.getElementById("panel");
     8        var mediaFile = findMediaFile("video", "content/test");
     9        panel.innerHTML = "<video src=" + mediaFile + " controls onloadedmetadata='loadedmetadata()'><source src=content/counting.mp4></video>";
     10    </script>
    811
    912    <p>Test that removing valid 'src' attribute DOES NOT trigger load of &lt;source&gt; elements</p>
    … …  
    1619        function testSrc()
    1720        {
    18             testExpected("relativeURL(video.currentSrc)", "content/silence.mpg");
     21            testExpected("relativeURL(video.currentSrc)", mediaFile);
    1922            testExpected("isNaN(video.duration)", false);
    2023            consoleWrite("");

  • trunk/LayoutTests/media/video-src-set.html

    r41413 r48539  
    11<video controls></video>
    22<div>Test that setting src attribute triggers load</div>
     3<script src=media-file.js></script>
    34<script src=video-test.js></script>
    45<script>
    5     video.setAttribute('src', 'content/test.mp4')
     6    var mediaFile = findMediaFile("video", "content/test");
     7    video.setAttribute('src', mediaFile);
    68
    79    waitForEvent('loadstart', function () {
    8         testExpected("relativeURL(video.currentSrc)", "content/test.mp4");
     10        testExpected("relativeURL(video.currentSrc)", mediaFile);
    911        endTest();
    1012    } );
    1113
    12     video.setAttribute('src', 'content/test.mp4')
     14    video.setAttribute('src', mediaFile);
    1315</script>

  • trunk/LayoutTests/media/video-src-source.html

    r46857 r48539  
    11<body>
     2<script src=media-file.js></script>
    23<script src=video-test.js></script>
    3 <video src=content/test.mp4 controls>
    4     <source src=content/error.mpeg>
    5 </video>
     4<div id=panel></div>
     5<script>
     6    var panel = document.getElementById("panel");
     7    var mediaFile = findMediaFile("video", "content/test");
     8    panel.innerHTML = "<video src=" + mediaFile + " controls><source src=content/error.mpeg></video>";
     9</script>
    610<script>
    711
    … …  
    913
    1014    waitForEvent('loadstart', function () {
    11         testExpected("relativeURL(video.currentSrc)", "content/test.mp4");
     15        testExpected("relativeURL(video.currentSrc)", mediaFile);
    1216        endTest();
    1317    } );

  • trunk/LayoutTests/media/video-src.html

    r46857 r48539  
    11<body>
     2<script src=media-file.js></script>
    23<script src=video-test.js></script>
    34<video controls></video>
    … …  
    56<script>
    67    video = mediaElement = document.getElementsByTagName('video')[0];
     8    var mediaFile = findMediaFile("video", "content/test");
    79
    810    waitForEvent("loadstart", function () {
    9         testExpected("relativeURL(video.currentSrc) ", "content/test.mp4");
     11        testExpected("relativeURL(video.currentSrc) ", mediaFile);
    1012        endTest();
    1113    });
    1214
    13     video.src = "content/test.mp4";
     15    video.src = mediaFile;
    1416</script>

  • trunk/LayoutTests/media/video-timeupdate-during-playback.html

    r46857 r48539  
    22<body>
    33   
    4     <video src=content/test.mp4 controls></video>
     4    <video controls></video>
    55
    66    <p>
    77    Test 'timeupdate' events are posted while playing but not while paused.
    88    </p
     9    <script src=media-file.js></script>
    910    <script src=video-test.js></script>
    1011    <script>
     12        setSrcByTagName("video", findMediaFile("video", "content/test"));
    1113   
    1214        var timeupdateEventCount = 0;

  • trunk/LayoutTests/media/video-volume.html

    r41413 r48539  
    11<video controls></video>
    22<p>Test 'volume' attribute<p>
     3<script src=media-file.js></script>
    34<script src=video-test.js></script>
    45<script>
    … …  
    1011    testException("video.volume = 1.5", "DOMException.INDEX_SIZE_ERR");
    1112    testException("video.volume = -0.5", "DOMException.INDEX_SIZE_ERR");
    12     video.src = "content/test.mp4";
     13    video.src = findMediaFile("video", "content/test");
    1314    run("video.load()");
    1415    waitForEvent("load", function () {

  • trunk/LayoutTests/media/video-zoom.html

    r39562 r48539  
    22<head>
    33    <style> video { zoom: 150%; border: 3px solid red; } </style>
     4    <script src=media-file.js></script>
    45    <script>
    56        function init()
    67        {
     8            setSrcByTagName("video", findMediaFile("video", "content/test"));
     9
    710            var totalCount = document.getElementsByTagName('video').length;
    811            var count = totalCount;
    … …  
    2629
    2730</head>
    28 <body onload="init()">
     31<body onload="init();">
    2932    <p>150% zoom, with width and height attributes </p>
    30     &nbsp;<video src="content/test.mp4" width=320 height=240></video><br>
     33    &nbsp;<video width=320 height=240></video><br>
    3134    <p>150% zoom, without width and height attributes </p>
    32     &nbsp;<video src="content/test.mp4" ></video><br>
     35    &nbsp;<video></video><br>
    3336</body>
    3437</html>
Note: See TracChangeset for help on using the changeset viewer.