Merge pull request #497 from w3c/deniak/ms-video

Update and cleanup Microsoft's video tests.
web-platform-tests · Jan 15, 2014 · 260ccf5 · 260ccf5
2 parents dcf579a + 10f7d31
commit 260ccf5
Show file tree

Hide file tree

Showing 45 changed files with 330 additions and 1,523 deletions.
diff --git a/html/semantics/embedded-content-0/the-video-element/video_001.htm b/html/semantics/embedded-content-0/the-video-element/video_001.htm
@@ -1,37 +1,26 @@
 <!DOCTYPE HTML>
 <html>
-<head>
-  <title>HTML5 Media Elements: Media plays automatically when 'autoplay' is true.</title>
-  <meta content="text/html; charset=UTF-8" http-equiv="Content-Type">
-  <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-  <link rel="help" href="http://www.w3.org/TR/html5/video.html#attr-media-autoplay" />
-  <meta name="assert" content="Media plays automatically when 'autoplay' is true." />
-  <script type="text/javascript" src="../../../../common/media.js"></script>
-  <script type="text/javascript">
-
-setFailTimeout(30000);
-
-function do_playing(event)
-{
-    passTest();
-}
-
-</script>
-</head>
-<body>
+  <head>
+    <title>HTML5 Media Elements: Media plays automatically when 'autoplay' is true.</title>
+    <meta content="text/html; charset=UTF-8" http-equiv="Content-Type">
+    <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
+    <link rel="help" href="http://www.w3.org/TR/html5/video.html#attr-media-autoplay" />
+    <meta name="assert" content="Media plays automatically when 'autoplay' is true." />
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script type="text/javascript" src="../../../../common/media.js"></script>
+    <script type="text/javascript">
+      var videotest = async_test("Media plays automatically when 'autoplay' is true.");
+      function do_playing(event) {
+        videotest.done();
+      }
+
+    </script>
+  </head>
+  <body>
 <pre>
 Media plays automatically when 'autoplay' is true.
 </pre>
-<table id='testtable' border='1'>
-  <tr>
-    <td>Test Result</td>
-    <td>Test Assertion</td>
-  </tr>
-  <tr>
-    <td id='test_0_result'>Waiting ...</td>
-    <td id='test_0_assertion'>Test passes if the text 'PASS' appears to the left and the text 'Your browser does not support media elements.' does not appear anywhere on this page.</td>
-  </tr>
-</table>
 <pre>
 
 http://www.w3.org/TR/html5/video.html#attr-media-autoplay
@@ -42,20 +31,16 @@
 so without stopping. 
 
 </pre>
-<div id='testcontent'>
+<div id='log'></div>
 
 <script type="text/javascript">
 
-document.write(
-    "<video id='video0' src='" + getVideoURI("/media/movie_5") + "'" + 
-    " onplaying='do_playing(event);' autoplay>"
-    );
+  document.write(
+    "<video id='video0' src='" + getVideoURI("/media/movie_5") + "'" +
+    " onplaying='do_playing(event);' autoplay>Your browser does not support media elements.</video>"
+  );
 
 </script>
-Your browser does not support media elements.
-</video>
-
 
-</div>
 </body>
 </html>
diff --git a/html/semantics/embedded-content-0/the-video-element/video_002.htm b/html/semantics/embedded-content-0/the-video-element/video_002.htm
diff --git a/html/semantics/embedded-content-0/the-video-element/video_004.htm b/html/semantics/embedded-content-0/the-video-element/video_004.htm
@@ -1,28 +1,19 @@
 <!DOCTYPE HTML>
 <html>
-<head>
-  <title>HTML5 Media Elements: 'currentTime' is initially zero.</title>
-  <meta content="text/html; charset=UTF-8" http-equiv="Content-Type">
-  <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
-  <link rel="help" href="http://www.w3.org/TR/html5/video.html#current-playback-position" />
-  <meta name="assert" content="'currentTime' is initially zero." />
-  <script type="text/javascript" src="../../../../common/media.js"></script>
-
-</head>
-<body>
+  <head>
+    <title>HTML5 Media Elements: 'currentTime' is initially zero.</title>
+    <meta content="text/html; charset=UTF-8" http-equiv="Content-Type">
+    <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
+    <link rel="help" href="http://www.w3.org/TR/html5/video.html#current-playback-position" />
+    <meta name="assert" content="'currentTime' is initially zero." />
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script type="text/javascript" src="../../../../common/media.js"></script>
+  </head>
+  <body>
 <pre>
 'currentTime' is initially zero.
 </pre>
-<table id='testtable' border='1'>
-  <tr>
-    <td>Test Result</td>
-    <td>Test Assertion</td>
-  </tr>
-  <tr>
-    <td id='test_0_result'>FAIL</td>
-    <td id='test_0_assertion'>Test passes if the text 'PASS' appears to the left and the text 'Your browser does not support media elements.' does not appear anywhere on this page.</td>
-  </tr>
-</table>
 <pre>
 
 http://www.w3.org/TR/html5/video.html#current-playback-position
@@ -34,24 +25,14 @@
 position, expressed in seconds. 
 
 </pre>
-<div id='testcontent'>
+<div id='log'></div>
 
 <video id="video0">Your browser does not support media elements.</video>
-<script type="text/javascript">    
-        try
-        {
-if (document.getElementById("video0").currentTime == 0)
-{
-    passTest();
-}
-        }
-        catch(ex)
-        {
-
-        }
-    </script>
-
-
+<script type="text/javascript">
+  test(function() {
+         assert_equals(document.getElementById("video0").currentTime, 0);
+       }, "'currentTime' is initially zero.");
+</script>
 </div>
 </body>
 </html>
diff --git a/html/semantics/embedded-content-0/the-video-element/video_005.htm b/html/semantics/embedded-content-0/the-video-element/video_005.htm
diff --git a/html/semantics/embedded-content-0/the-video-element/video_006.htm b/html/semantics/embedded-content-0/the-video-element/video_006.htm