Bug 735805 part 1 - Fix DOM and layout mochitests that run no tests; r=bz

2012-03-16 16:07:09 -04:00 · 2012-03-16 16:07:09 -04:00 · decf56c213
--- a/content/base/test/chrome/test_bug357450.xul
+++ b/content/base/test/chrome/test_bug357450.xul
@ -13,7 +13,8 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=357450
  <title>Test for Bug 357450</title>
  <script type="application/javascript" 
 	  src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>      
-  <script type="text/javascript" src="test_bug357450.js"></script>     
+  <!-- This file is shared with non-chrome tests -->
+  <script type="text/javascript" src="../test_bug357450.js"></script>

 <body  xmlns="http://www.w3.org/1999/xhtml">

--- a/content/base/test/test_reentrant_flush.html
+++ b/content/base/test/test_reentrant_flush.html
@ -22,6 +22,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=709256
 <script type="application/javascript">

 /** Test for Bug 709256 **/
+SimpleTest.waitForExplicitFinish();
 addLoadEvent(function() {
  var ifr = $("test");
  var bod = ifr.contentDocument.body;
@ -51,6 +52,8 @@ addLoadEvent(function() {
  is(resizeHandlerRan, true, "Resize handler should have run");

  win.removeEventListener("resize", handleResize, false);
+
+  SimpleTest.finish();
 });
 </script>
 </pre>
--- a/content/canvas/test/crossorigin/test_webgl_crossorigin_textures.html
+++ b/content/canvas/test/crossorigin/test_webgl_crossorigin_textures.html
@ -79,6 +79,7 @@
    try {
      gl = canvas.getContext("experimental-webgl");
    } catch (e) {
+      todo(false, "Canvas WebGL not supported");
      SimpleTest.finish();
      return;
    }
--- a/content/canvas/test/webgl/test_webgl_conformance_test_suite.html
+++ b/content/canvas/test/webgl/test_webgl_conformance_test_suite.html
@ -88,7 +88,7 @@ function start() {
    // is the Darwin version.
    is106orHigher = (kDarwinVersion >= 10.0);
    if (!is106orHigher) {
-      dump("WebGL mochitest disabled on Mac OSX versions older than 10.6\n");
+      todo(false, "WebGL mochitest disabled on Mac OSX versions older than 10.6.");
      SimpleTest.finish();
      return;
    }
--- a/dom/tests/mochitest/bugs/test_bug622361.html
+++ b/dom/tests/mochitest/bugs/test_bug622361.html
@ -38,6 +38,7 @@ function boom(event)
    return;
  case 4:
    w.close();
+    ok(true, "Test complete");
    SimpleTest.finish();
  }
 }
--- a/dom/tests/mochitest/chrome/focus_frameset.html
+++ b/dom/tests/mochitest/chrome/focus_frameset.html
@ -5,6 +5,9 @@
 <script>
 if (opener)
  SimpleTest.waitForFocus(function () opener.framesetWindowLoaded(window));
+// Don't try to call finish() in this frame, since it will get upset that we
+// ran no tests.
+SimpleTest.waitForExplicitFinish();
 </script>

 <frameset rows="30%, 70%">
--- a/dom/tests/mochitest/whatwg/test_postMessage_hash.html
+++ b/dom/tests/mochitest/whatwg/test_postMessage_hash.html
@ -13,7 +13,7 @@
 <div id="content" style="display: none"></div>

 <iframe src="http://mochi.test:8888/tests/dom/tests/mochitest/whatwg/postMessage_hash.html#hash"
-        name="kid"</iframe>
+        name="kid"></iframe>

 <pre id="test">
 <script class="testbody" type="application/javascript">
--- a/layout/generic/test/test_bug632379.xul
+++ b/layout/generic/test/test_bug632379.xul
@ -196,6 +196,7 @@ function openSubmenu()
    synthesizeKey("5", {});
 }

+SimpleTest.waitForExplicitFinish();
 SimpleTest.waitForFocus(doTest);

 ]]></script>