remove timeouts + some test refactoring

web-platform-tests · Jan 15, 2014 · 94ade8d · 94ade8d
1 parent f31e3c2
commit 94ade8d
Show file tree

Hide file tree

Showing 12 changed files with 54 additions and 247 deletions.
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_011.htm b/html/semantics/embedded-content-0/the-video-element/video_011.htm
diff --git a/html/semantics/embedded-content-0/the-video-element/video_012-ref.htm b/html/semantics/embedded-content-0/the-video-element/video_012-ref.htm
diff --git a/html/semantics/embedded-content-0/the-video-element/video_012.htm b/html/semantics/embedded-content-0/the-video-element/video_012.htm
diff --git a/html/semantics/embedded-content-0/the-video-element/video_013-ref.htm b/html/semantics/embedded-content-0/the-video-element/video_013-ref.htm
diff --git a/html/semantics/embedded-content-0/the-video-element/video_013.htm b/html/semantics/embedded-content-0/the-video-element/video_013.htm
diff --git a/html/semantics/embedded-content-0/the-video-element/video_015.htm b/html/semantics/embedded-content-0/the-video-element/video_015.htm
@@ -11,7 +11,7 @@
 
     <script type="text/javascript" src="../../../../common/media.js"></script>
     <script type="text/javascript">
-      var test = async_test("'error' attribute returns 'null' when no error has occurred.", {timeout:3000})
+      var test = async_test("'error' attribute returns 'null' when no error has occurred.")
       function do_loadstart(event) {
         test.step(function() { assert_equals(document.getElementById("video0").error, null)} );
         test.done();

diff --git a/html/semantics/embedded-content-0/the-video-element/video_017.htm b/html/semantics/embedded-content-0/the-video-element/video_017.htm
@@ -14,12 +14,9 @@
       Your browser does not support media elements.
     </video>
     <script type="text/javascript">
-      var t = async_test("'ratechange' event fires when 'playbackRate' changes.", {timeout:3000});
+      var t = async_test("'ratechange' event fires when 'playbackRate' changes.");
 
       document.getElementById("video0").addEventListener('ratechange', function() {
-        t.step(function () {
-          assert_true(true);
-        });
         t.done();
       }, false);
 

diff --git a/html/semantics/embedded-content-0/the-video-element/video_019.htm b/html/semantics/embedded-content-0/the-video-element/video_019.htm
@@ -10,17 +10,19 @@
     <script src="/resources/testharnessreport.js"></script>
     <script type="text/javascript" src="../../../../common/media.js"></script>
     <script type="text/javascript">
-    var test = async_test("removing the 'src' attribute does not invoke the media element load algorithm.");
+      var test = async_test("removing the 'src' attribute does not invoke the media element load algorithm.", {timeout:5000});
 
     function do_play(event) {
-      var vid = document.getElementById("video0");
-      vid.removeAttribute("src");
-      vid.addEventListener("loadstart", do_loadstart, false);
-      vid.load();
+      test.step(function() {
+        var vid = document.getElementById("video0");
+        vid.addEventListener("loadstart", do_loadstart, false);
+        vid.removeAttribute("src");
+        vid.load();
+      });
     }
 
     function do_loadstart(){
-      test.step(function() {assert_unreached("removing src attribute does not invodethe media element load algorithm")});
+      test.step(function() {assert_unreached("removing src attribute does not invoke the media element load algorithm")});
       test.done();
     }
 

diff --git a/html/semantics/embedded-content-0/the-video-element/video_content-ref.htm b/html/semantics/embedded-content-0/the-video-element/video_content-ref.htm
@@ -0,0 +1,12 @@
+<!DOCTYPE HTML>
+<html>
+  <head>
+    <title>HTML5 Media Elements: Content inside the 'video' element is not shown to the user.</title>
+    <meta content="text/html; charset=UTF-8" http-equiv="Content-Type">
+    <link rel="author" title="Microsoft" href="http://www.microsoft.com/" />
+  </head>
+  <body>
+  <div id='testcontent'>
+  </div>
+</body>
+</html>
diff --git a/html/semantics/embedded-content-0/the-video-element/video_content_image.htm b/html/semantics/embedded-content-0/the-video-element/video_content_image.htm
@@ -0,0 +1,16 @@
+<!DOCTYPE HTML>
+<html>
+  <head>
+    <title>HTML5 Media Elements: Content inside the 'video' element is not shown to the user.</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#video" />
+    <link rel="match" href="video_content-ref.htm" />
+    <meta name="assert" content="Content inside the 'video' element is not shown to the user (image)." />
+  </head>
+  <body>
+  <div id='testcontent'>
+    <video><img src="../../../../images/fail.gif" /></video>
+  </div>
+</body>
+</html>
diff --git a/html/semantics/embedded-content-0/the-video-element/video_content_text.htm b/html/semantics/embedded-content-0/the-video-element/video_content_text.htm
@@ -0,0 +1,16 @@
+<!DOCTYPE HTML>
+<html>
+  <head>
+    <title>HTML5 Media Elements: Content inside the 'video' element is not shown to the user.</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#video" />
+    <link rel="match" href="video_content-ref.htm" />
+    <meta name="assert" content="Content inside the 'video' element is not shown to the user." />
+  </head>
+  <body>
+  <div id='testcontent'>
+    <video><p style="color: red;">FAIL</p></video>
+  </div>
+</body>
+</html>