Changeset 48494 in webkit
- Timestamp:
- Sep 17, 2009 3:48:32 PM (15 years ago)
- Location:
- trunk/LayoutTests
- Files:
-
- 21 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r48489 r48494 1 2009-09-17 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 19 media layout tests to use media files based on supported codecs. 9 10 * media/media-file.js: Prefer .wav over other formats as this is used the most in tests for mac port. 11 Most of audio tests use media/content/test.wav as test file for mac, so this change would make sure 12 findMediaFile() will return test.wav but not test.mp3 or other formats. 13 (setSrcById): Fixing bug in code. 14 * media/video-canvas-source.html: Use findMediaFile() to locate a media file based on supported types. 15 * media/video-click-dblckick-standalone.html: ditto. 16 * media/video-controls-transformed.html: ditto. 17 * media/video-controls-visible-audio-only.html: ditto. 18 * media/video-controls-zoomed.html: ditto. 19 * media/video-controls.html: ditto. 20 * media/video-currentTime-set.html: ditto. 21 * media/video-currentTime-set2.html: ditto. 22 * media/video-currentTime.html: ditto. 23 * media/video-display-none-crash.html: ditto. 24 * media/video-display-toggle.html: ditto. 25 * media/video-dom-autoplay.html: ditto. 26 * media/video-dom-src.html: ditto. 27 * media/video-error-abort.html: ditto. 28 * media/video-load-networkState.html: ditto. 29 * media/video-load-readyState.html: ditto. 30 * media/video-loop.html: ditto. 31 * media/video-muted.html: ditto. 32 * media/video-no-autoplay.html: ditto. 33 1 34 2009-09-17 Simon Fraser <simon.fraser@apple.com> 2 35 -
trunk/LayoutTests/media/media-file.js
r48237 r48494 1 1 var audioCodecs = [ 2 ["audio/wav", "wav"], 2 3 ["audio/aac", "m4a"], 3 4 ["audio/mpeg", "mp3"], 4 ["audio/wav", "wav"], 5 ["audio/ogg", "ogg"] 5 ["audio/ogg", "oga"] 6 6 ]; 7 7 … … 10 10 ["video/mpeg", "mpg"], 11 11 ["video/quicktime", "mov"], 12 ["video/ogg", "og g"]12 ["video/ogg", "ogv"] 13 13 ]; 14 14 … … 20 20 codecs = videoCodecs; 21 21 22 var element; 23 try { 24 element = document.getElementsByTagName(tagName)[0]; 25 } catch (ex) { 22 var element = document.getElementsByTagName(tagName)[0]; 23 if (!element) 26 24 element = document.createElement(tagName); 27 }28 25 29 26 for (var i = 0; i < codecs.length; ++i) { … … 46 43 var element = document.getElementById(id); 47 44 if (element) 48 id.src = src;45 element.src = src; 49 46 } -
trunk/LayoutTests/media/video-canvas-source.html
r45311 r48494 3 3 <title>Drawing to canvas using video with source element does not taint canvas</title> 4 4 <link rel="stylesheet" href="../fast/js/resources/js-test-style.css"> 5 <script src=media-file.js></script> 5 6 <script src=video-test.js></script> 6 7 <script src="../fast/js/resources/js-test-pre.js"></script> … … 28 29 canvas = document.getElementsByTagName('canvas')[0]; 29 30 waitForEvent('load', videoLoaded); 30 run("var source = document.createElement('source'); source.src = 'content/counting.mp4'; video.appendChild(source)"); 31 var mediaFile = findMediaFile("video", "content/counting"); 32 run("var source = document.createElement('source'); source.src = '" + mediaFile + "'; video.appendChild(source)"); 31 33 } 32 34 </script> -
trunk/LayoutTests/media/video-click-dblckick-standalone.html
r37009 r48494 1 1 <html> 2 2 <head> 3 <script src=media-file.js></script> 3 4 <script> 5 if (window.layoutTestController) { 6 layoutTestController.dumpAsText(); 7 layoutTestController.waitUntilDone(); 8 } 9 4 10 var video; 5 11 function log(msg) … … 10 16 function test() 11 17 { 12 if (window.layoutTestController) {13 layoutTestController.dumpAsText();14 layoutTestController.waitUntilDone();15 }16 18 video = document.getElementById('fr').contentDocument.getElementsByTagName('video')[0]; 17 19 video.addEventListener('canplaythrough', test2); … … 39 41 </script> 40 42 </head> 41 <body onload="test()"> 42 <iframe src="content/test.mp4" id="fr"></iframe> 43 <body> 44 <iframe id="fr"></iframe> 45 <script> 46 var frame = document.getElementById("fr"); 47 frame.src = findMediaFile("video", "content/test"); 48 frame.addEventListener("load", test); 49 </script> 43 50 <p>This tests that clicking on a standalone video will pause and double-clicking will play.</p> 44 51 <pre id="console"></pre> -
trunk/LayoutTests/media/video-controls-transformed.html
r41413 r48494 13 13 <p>Test controls on transformed video.</p> 14 14 <p>This test only runs in DRT!</p> 15 <script src=media-file.js></script> 15 16 <script src=video-test.js></script> 16 17 <script> … … 26 27 endTest(); 27 28 } ); 28 video.src = 'content/test.mp4';29 video.src = findMediaFile("video", "content/test"); 29 30 </script> 30 31 </body> 31 32 </html> 32 33 -
trunk/LayoutTests/media/video-controls-visible-audio-only.html
r47763 r48494 5 5 #mouse-parking:hover { padding:8; background-color: blue; } 6 6 </style> 7 <script src=media-file.js></script> 7 8 <script> 9 if (window.layoutTestController) { 10 layoutTestController.dumpAsText(); 11 layoutTestController.waitUntilDone(); 12 } 8 13 9 14 var video; … … 48 53 49 54 if (window.layoutTestController) { 50 layoutTestController.dumpAsText();51 layoutTestController.waitUntilDone();52 55 setTimeout(function() { 53 56 document.body.appendChild(document.createTextNode('FAIL')); … … 66 69 <p><span id="mouse-parking">mouse parks here, am I blue?</span></p> 67 70 68 <video id="no-video-media" controls loop src="content/test.wav"onload="start()"></video>71 <video id="no-video-media" controls loop onload="start()"></video> 69 72 <br><br><div id="console"></div> 73 <script> 74 setSrcById("no-video-media", findMediaFile("audio", "content/test")); 75 </script> 70 76 </body> 71 77 </html> -
trunk/LayoutTests/media/video-controls-zoomed.html
r41918 r48494 7 7 } 8 8 </style> 9 <script src=media-file.js></script> 9 10 <script type="text/javascript" charset="utf-8"> 10 11 function runTest() … … 34 35 runTest(); 35 36 } ); 36 video.src = 'content/test.mp4';37 video.src = findMediaFile("video", "content/test"); 37 38 </script> 38 39 </body> -
trunk/LayoutTests/media/video-controls.html
r41413 r48494 1 1 <video controls></video> 2 2 <p>Test 'controls' attribute<p> 3 <script src=media-file.js></script> 3 4 <script src=video-test.js></script> 4 5 <script> … … 21 22 endTest(); 22 23 } ); 23 video.src = 'content/test.mp4';24 video.src = findMediaFile("video", "content/test"); 24 25 </script> -
trunk/LayoutTests/media/video-currentTime-set.html
r41907 r48494 6 6 <p>Test that setting currentTime changes the time, and that 'ended' event is fired in a reasonable amount of time</p> 7 7 8 <script src=media-file.js></script> 8 9 <script src=video-test.js></script> 9 10 <script> … … 21 22 setTimeout(function () { logResult("No 'ended' event in " + timeout/1000 + "seconds", false); }, timeout); 22 23 }); 23 video.src = "content/test.mp4";24 video.src = findMediaFile("video", "content/test"); 24 25 </script> 25 26 -
trunk/LayoutTests/media/video-currentTime-set2.html
r41413 r48494 1 1 <video controls></video> 2 <script src=media-file.js></script> 2 3 <script src=video-test.js></script> 3 4 <script> … … 11 12 endTest(); 12 13 }); 13 video.src = "content/test.mp4";14 video.src = findMediaFile("video", "content/test"); 14 15 </script> -
trunk/LayoutTests/media/video-currentTime.html
r41413 r48494 1 1 <video controls></video> 2 <script src=media-file.js></script> 2 3 <script src=video-test.js></script> 3 4 <script> … … 11 12 endTest(); 12 13 } 13 video.src = "content/test.mp4";14 video.src = findMediaFile("video", "content/test"); 14 15 </script> -
trunk/LayoutTests/media/video-display-none-crash.html
r41972 r48494 1 1 <video controls></video> 2 2 <p>Test that pause() after changing display to "none" doesn't cause a crash.</p> 3 <script src="media-file.js"></script> 3 4 <script src="video-test.js"></script> 4 5 <script> 5 video.src = "content/test.mp4";6 video.src = findMediaFile("video", "content/test"); 6 7 video.play(); 7 8 video.style.display = "none"; -
trunk/LayoutTests/media/video-display-toggle.html
r38879 r48494 1 1 <html> 2 2 <head> 3 <script src=media-file.js></script> 3 4 <script> 4 5 function toggleDisplay() … … 15 16 if (window.layoutTestController) 16 17 layoutTestController.waitUntilDone(); 18 setSrcById('vid', findMediaFile('video', 'content/test')); 17 19 document.getElementById('vid').addEventListener("canplaythrough", test2); 18 20 } … … 29 31 <body onload="test()"> 30 32 This tests that toggling the display property won't make the controls disappear.<br> 31 <video id="vid" controls src="content/test.mp4"></video>33 <video id="vid" controls></video> 32 34 </body> 33 35 </html> -
trunk/LayoutTests/media/video-dom-autoplay.html
r41413 r48494 1 1 <video controls></video> 2 <script src=media-file.js></script> 2 3 <script src=video-test.js></script> 3 4 <script> … … 11 12 } ); 12 13 13 video.src = "content/test.mp4";14 video.src = findMediaFile("video", "content/test"); 14 15 </script> -
trunk/LayoutTests/media/video-dom-src.html
r41413 r48494 1 1 <video controls></video> 2 <script src=media-file.js></script> 2 3 <script src=video-test.js></script> 3 4 <script> 4 5 testExpected("video.currentSrc", ""); 5 video.src = "content/test.mp4"; 6 var mediaFile = findMediaFile("video", "content/test"); 7 video.src = mediaFile; 6 8 testExpected("video.currentSrc", ""); 7 9 8 10 waitForEvent('load', function () { 9 testExpected("relativeURL(video.currentSrc)", "content/test.mp4");11 testExpected("relativeURL(video.currentSrc)", mediaFile); 10 12 endTest(); 11 13 } ); -
trunk/LayoutTests/media/video-error-abort.html
r41413 r48494 1 1 <video controls></video> 2 <script src=media-file.js></script> 2 3 <script src=video-test.js></script> 3 4 <script> … … 14 15 } ); 15 16 16 video.src = "content/test.mp4";17 video.src = findMediaFile("video", "content/test"); 17 18 </script> -
trunk/LayoutTests/media/video-load-networkState.html
r41907 r48494 9 9 </p> 10 10 11 <script src=media-file.js></script> 11 12 <script src=video-test.js></script> 12 13 <script> … … 32 33 33 34 // now set a valid url 34 run("video.src = 'content/test.mp4'"); 35 var mediaFile = findMediaFile("video", "content/test"); 36 run("video.src = '" + mediaFile + "'"); 35 37 } 36 38 -
trunk/LayoutTests/media/video-load-readyState.html
r41907 r48494 1 1 <video controls></video> 2 <script src=media-file.js></script> 2 3 <script src=video-test.js></script> 3 4 <script> … … 18 19 waitForEvent("canplaythrough", function () { testReadyState(HTMLMediaElement.HAVE_ENOUGH_DATA, true ); } ); 19 20 20 video.src = "content/test.mp4";21 video.src = findMediaFile("video", "content/test"); 21 22 </script> -
trunk/LayoutTests/media/video-loop.html
r46857 r48494 3 3 <video controls autoplay ></video> 4 4 5 <script src=media-file.js></script> 5 6 <script src=video-test.js></script> 6 7 … … 56 57 consoleWrite(""); 57 58 run("video.loop = true"); 58 run("video.src = 'content/test.mp4'"); 59 var mediaFile = findMediaFile("video", "content/test"); 60 run("video.src = '" + mediaFile + "'"); 59 61 consoleWrite(""); 60 62 </script> -
trunk/LayoutTests/media/video-muted.html
r41413 r48494 1 1 <video controls></video> 2 2 <p>Test 'muted' attribute<p> 3 <script src=media-file.js></script> 3 4 <script src=video-test.js></script> 4 5 <script> … … 6 7 run("video.muted = true"); 7 8 testExpected("video.muted", true); 8 video.src = "content/test.mp4";9 video.src = findMediaFile("video", "content/test"); 9 10 run("video.load()"); 10 11 waitForEvent("load", function () { -
trunk/LayoutTests/media/video-no-autoplay.html
r41413 r48494 1 1 <video controls></video> 2 2 <p>Test that play event does not fire when "src" set with no autoplay attribute.</p> 3 <script src=media-file.js></script> 3 4 <script src=video-test.js></script> 4 5 <script> … … 17 18 waitForEvent('load', function () { setTimeout(testPaused, 500);} ); 18 19 19 video.src = "content/test.mp4";20 video.src = findMediaFile("video", "content/test"); 20 21 </script>
Note: See TracChangeset
for help on using the changeset viewer.