Bug 367393 - Add a packed MochiKit that contains only SimpleTest dependencies- update tests. r=jmaher, a=test-only

browser/components/places/tests/browser/browser_library_batch_delete.js

@@ -80,7 +80,7 @@ gTests.push({
     PlacesUtils.bookmarks.insertBookmark(PlacesUtils.unfiledBookmarksFolderId,
                                          makeURI(TEST_URL),
                                          PlacesUtils.bookmarks.DEFAULT_INDEX,
-                                         "bm" + i);
+                                         "bm");
     is(PO._content.result.root.childCount, 2,
        "Right pane was correctly updated");
     nextTest();

browser/devtools/webconsole/test/browser/browser_webconsole_bug_601667_filter_buttons.js

@@ -92,7 +92,7 @@ function testMenuFilterButton(aCategory) {
        aCategory + " is checked after clicking the button");
     ok(HUDService.filterPrefs[hudId][prefKey], prefKey + " messages are " +
        "on after clicking the button");
-    menuItem = menuItem.nextSibling; i++;
+    menuItem = menuItem.nextSibling; 
   }
 
   // Turn all the filters off by clicking the main part of the button.

content/canvas/test/test_2d.composite.canvas.destination-atop.html

@@ -20,7 +20,7 @@ function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
 }
 
 SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
+addLoadEvent(function () {
 
 var canvas = document.getElementById('c');
 var ctx = canvas.getContext('2d');

content/canvas/test/test_2d.composite.canvas.destination-in.html

@@ -20,7 +20,7 @@ function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
 }
 
 SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
+addLoadEvent(function () {
 
 var canvas = document.getElementById('c');
 var ctx = canvas.getContext('2d');

content/canvas/test/test_2d.composite.canvas.lighter.html

@@ -20,7 +20,7 @@ function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
 }
 
 SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
+addLoadEvent(function () {
 
 var canvas = document.getElementById('c');
 var ctx = canvas.getContext('2d');

content/canvas/test/test_2d.composite.canvas.source-in.html

@@ -20,7 +20,7 @@ function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
 }
 
 SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
+addLoadEvent(function () {
 
 var canvas = document.getElementById('c');
 var ctx = canvas.getContext('2d');

content/canvas/test/test_2d.composite.canvas.source-out.html

@@ -20,7 +20,7 @@ function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
 }
 
 SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
+addLoadEvent(function () {
 
 var canvas = document.getElementById('c');
 var ctx = canvas.getContext('2d');

content/canvas/test/test_2d.composite.canvas.xor.html

@@ -20,7 +20,7 @@ function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
 }
 
 SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
+addLoadEvent(function () {
 
 var canvas = document.getElementById('c');
 var ctx = canvas.getContext('2d');

content/canvas/test/test_2d.composite.clip.lighter.html

@@ -21,7 +21,7 @@ function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
 }
 
 SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
+addLoadEvent(function () {
 
 var canvas = document.getElementById('c');
 var ctx = canvas.getContext('2d');

content/canvas/test/test_2d.composite.clip.xor.html

@@ -21,7 +21,7 @@ function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
 }
 
 SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
+addLoadEvent(function () {
 
 var canvas = document.getElementById('c');
 var ctx = canvas.getContext('2d');

content/canvas/test/test_2d.composite.image.destination-atop.html

@@ -20,7 +20,7 @@ function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
 }
 
 SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
+addLoadEvent(function () {
 
 var canvas = document.getElementById('c');
 var ctx = canvas.getContext('2d');

content/canvas/test/test_2d.composite.image.destination-in.html

@@ -20,7 +20,7 @@ function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
 }
 
 SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
+addLoadEvent(function () {
 
 var canvas = document.getElementById('c');
 var ctx = canvas.getContext('2d');

content/canvas/test/test_2d.composite.image.lighter.html

@@ -20,7 +20,7 @@ function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
 }
 
 SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
+addLoadEvent(function () {
 
 var canvas = document.getElementById('c');
 var ctx = canvas.getContext('2d');

content/canvas/test/test_2d.composite.image.source-in.html

@@ -20,7 +20,7 @@ function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
 }
 
 SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
+addLoadEvent(function () {
 
 var canvas = document.getElementById('c');
 var ctx = canvas.getContext('2d');

content/canvas/test/test_2d.composite.image.source-out.html

@@ -20,7 +20,7 @@ function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
 }
 
 SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
+addLoadEvent(function () {
 
 var canvas = document.getElementById('c');
 var ctx = canvas.getContext('2d');

content/canvas/test/test_2d.composite.image.xor.html

@@ -20,7 +20,7 @@ function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
 }
 
 SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
+addLoadEvent(function () {
 
 var canvas = document.getElementById('c');
 var ctx = canvas.getContext('2d');

content/canvas/test/test_2d.composite.solid.lighter.html

@@ -20,7 +20,7 @@ function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
 }
 
 SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
+addLoadEvent(function () {
 
 var canvas = document.getElementById('c');
 var ctx = canvas.getContext('2d');

content/canvas/test/test_2d.composite.solid.xor.html

@@ -20,7 +20,7 @@ function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
 }
 
 SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
+addLoadEvent(function () {
 
 var canvas = document.getElementById('c');
 var ctx = canvas.getContext('2d');

content/canvas/test/test_2d.composite.transparent.lighter.html

@@ -20,7 +20,7 @@ function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
 }
 
 SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
+addLoadEvent(function () {
 
 var canvas = document.getElementById('c');
 var ctx = canvas.getContext('2d');

content/canvas/test/test_2d.composite.transparent.xor.html

@@ -20,7 +20,7 @@ function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
 }
 
 SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
+addLoadEvent(function () {
 
 var canvas = document.getElementById('c');
 var ctx = canvas.getContext('2d');

content/canvas/test/test_2d.composite.uncovered.fill.destination-atop.html

@@ -33,7 +33,7 @@ function todo_isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
 }
 
 SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
+addLoadEvent(function () {
 
 var canvas = document.getElementById('c');
 var ctx = canvas.getContext('2d');

content/canvas/test/test_2d.composite.uncovered.fill.destination-in.html

@@ -33,7 +33,7 @@ function todo_isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
 }
 
 SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
+addLoadEvent(function () {
 
 var canvas = document.getElementById('c');
 var ctx = canvas.getContext('2d');

content/canvas/test/test_2d.composite.uncovered.fill.source-in.html

@@ -33,7 +33,7 @@ function todo_isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
 }
 
 SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
+addLoadEvent(function () {
 
 var canvas = document.getElementById('c');
 var ctx = canvas.getContext('2d');

content/canvas/test/test_2d.composite.uncovered.fill.source-out.html

@@ -33,7 +33,7 @@ function todo_isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
 }
 
 SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
+addLoadEvent(function () {
 
 var canvas = document.getElementById('c');
 var ctx = canvas.getContext('2d');

content/canvas/test/test_2d.composite.uncovered.image.destination-atop.html

@@ -33,7 +33,7 @@ function todo_isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
 }
 
 SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
+addLoadEvent(function () {
 
 var canvas = document.getElementById('c');
 var ctx = canvas.getContext('2d');

content/canvas/test/test_2d.composite.uncovered.image.destination-in.html

@@ -33,7 +33,7 @@ function todo_isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
 }
 
 SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
+addLoadEvent(function () {
 
 var canvas = document.getElementById('c');
 var ctx = canvas.getContext('2d');

content/canvas/test/test_2d.composite.uncovered.image.source-in.html

@@ -33,7 +33,7 @@ function todo_isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
 }
 
 SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
+addLoadEvent(function () {
 
 var canvas = document.getElementById('c');
 var ctx = canvas.getContext('2d');

content/canvas/test/test_2d.composite.uncovered.image.source-out.html

@@ -33,7 +33,7 @@ function todo_isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
 }
 
 SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
+addLoadEvent(function () {
 
 var canvas = document.getElementById('c');
 var ctx = canvas.getContext('2d');

content/canvas/test/test_2d.composite.uncovered.pattern.destination-atop.html

@@ -33,7 +33,7 @@ function todo_isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
 }
 
 SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
+addLoadEvent(function () {
 
 var canvas = document.getElementById('c');
 var ctx = canvas.getContext('2d');

content/canvas/test/test_2d.composite.uncovered.pattern.destination-in.html

@@ -33,7 +33,7 @@ function todo_isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
 }
 
 SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
+addLoadEvent(function () {
 
 var canvas = document.getElementById('c');
 var ctx = canvas.getContext('2d');

content/canvas/test/test_2d.composite.uncovered.pattern.source-in.html

@@ -33,7 +33,7 @@ function todo_isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
 }
 
 SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
+addLoadEvent(function () {
 
 var canvas = document.getElementById('c');
 var ctx = canvas.getContext('2d');

content/canvas/test/test_2d.composite.uncovered.pattern.source-out.html

@@ -33,7 +33,7 @@ function todo_isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
 }
 
 SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
+addLoadEvent(function () {
 
 var canvas = document.getElementById('c');
 var ctx = canvas.getContext('2d');

content/canvas/test/test_2d.drawImage.zerocanvas.html

@@ -20,7 +20,7 @@ function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
 }
 
 SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
+addLoadEvent(function () {
 
 var canvas = document.getElementById('c');
 var ctx = canvas.getContext('2d');

content/canvas/test/test_2d.gradient.radial.cone.behind.html

@@ -32,7 +32,7 @@ function todo_isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
 }
 
 SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
+addLoadEvent(function () {
 
 var canvas = document.getElementById('c');
 var ctx = canvas.getContext('2d');

content/canvas/test/test_2d.gradient.radial.cone.beside.html

@@ -32,7 +32,7 @@ function todo_isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
 }
 
 SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
+addLoadEvent(function () {
 
 var canvas = document.getElementById('c');
 var ctx = canvas.getContext('2d');

content/canvas/test/test_2d.gradient.radial.cone.front.html

@@ -20,7 +20,7 @@ function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
 }
 
 SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
+addLoadEvent(function () {
 
 var canvas = document.getElementById('c');
 var ctx = canvas.getContext('2d');

content/canvas/test/test_2d.gradient.radial.cone.shape2.html

@@ -32,7 +32,7 @@ function todo_isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
 }
 
 SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
+addLoadEvent(function () {
 
 var canvas = document.getElementById('c');
 var ctx = canvas.getContext('2d');

content/canvas/test/test_2d.gradient.radial.cone.top.html

@@ -34,7 +34,7 @@ function todo_isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
 }
 
 SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
+addLoadEvent(function () {
 
 var canvas = document.getElementById('c');
 var ctx = canvas.getContext('2d');

content/canvas/test/test_2d.gradient.radial.equal.html

@@ -32,7 +32,7 @@ function todo_isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
 }
 
 SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
+addLoadEvent(function () {
 
 var canvas = document.getElementById('c');
 var ctx = canvas.getContext('2d');

content/canvas/test/test_2d.gradient.radial.inside2.html

@@ -20,7 +20,7 @@ function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
 }
 
 SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
+addLoadEvent(function () {
 
 var canvas = document.getElementById('c');
 var ctx = canvas.getContext('2d');

content/canvas/test/test_2d.gradient.radial.inside3.html

@@ -20,7 +20,7 @@ function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
 }
 
 SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
+addLoadEvent(function () {
 
 var canvas = document.getElementById('c');
 var ctx = canvas.getContext('2d');

content/canvas/test/test_2d.gradient.radial.outside1.html

@@ -20,7 +20,7 @@ function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
 }
 
 SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
+addLoadEvent(function () {
 
 var canvas = document.getElementById('c');
 var ctx = canvas.getContext('2d');

content/canvas/test/test_2d.gradient.radial.outside2.html

@@ -32,7 +32,7 @@ function todo_isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
 }
 
 SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
+addLoadEvent(function () {
 
 var canvas = document.getElementById('c');
 var ctx = canvas.getContext('2d');

content/canvas/test/test_2d.gradient.radial.outside3.html

@@ -32,7 +32,7 @@ function todo_isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
 }
 
 SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
+addLoadEvent(function () {
 
 var canvas = document.getElementById('c');
 var ctx = canvas.getContext('2d');

content/canvas/test/test_2d.gradient.radial.touch1.html

@@ -32,7 +32,7 @@ function todo_isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
 }
 
 SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
+addLoadEvent(function () {
 
 var canvas = document.getElementById('c');
 var ctx = canvas.getContext('2d');

content/canvas/test/test_2d.gradient.radial.touch2.html

@@ -32,7 +32,7 @@ function todo_isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
 }
 
 SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
+addLoadEvent(function () {
 
 var canvas = document.getElementById('c');
 var ctx = canvas.getContext('2d');

content/canvas/test/test_2d.gradient.radial.touch3.html

@@ -32,7 +32,7 @@ function todo_isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
 }
 
 SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
+addLoadEvent(function () {
 
 var canvas = document.getElementById('c');
 var ctx = canvas.getContext('2d');

content/canvas/test/test_2d.line.cap.closed.html

@@ -21,7 +21,7 @@ function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
 }
 
 SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
+addLoadEvent(function () {
 
 var canvas = document.getElementById('c');
 var ctx = canvas.getContext('2d');

content/canvas/test/test_2d.line.join.parallel.html

@@ -21,7 +21,7 @@ function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
 }
 
 SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
+addLoadEvent(function () {
 
 var canvas = document.getElementById('c');
 var ctx = canvas.getContext('2d');

content/canvas/test/test_2d.path.arc.shape.3.html

@@ -33,7 +33,7 @@ function todo_isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
 }
 
 SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
+addLoadEvent(function () {
 
 var canvas = document.getElementById('c');
 var ctx = canvas.getContext('2d');

content/canvas/test/test_2d.path.rect.selfintersect.html

@@ -32,7 +32,7 @@ function todo_isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
 }
 
 SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
+addLoadEvent(function () {
 
 var canvas = document.getElementById('c');
 var ctx = canvas.getContext('2d');

content/canvas/test/test_2d.path.rect.zero.6.html

@@ -32,7 +32,7 @@ function todo_isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
 }
 
 SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
+addLoadEvent(function () {
 
 var canvas = document.getElementById('c');
 var ctx = canvas.getContext('2d');

content/canvas/test/test_2d.strokeRect.zero.5.html

@@ -20,7 +20,7 @@ function isPixel(ctx, x,y, r,g,b,a, pos, colour, d) {
 }
 
 SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
+addLoadEvent(function () {
 
 var canvas = document.getElementById('c');
 var ctx = canvas.getContext('2d');

content/canvas/test/test_canvas.html

@@ -24696,6 +24696,6 @@ function runTests() {
  setTimeout(asyncTestsDone, 500);
 }
 
-MochiKit.DOM.addLoadEvent(runTests);
+addLoadEvent(runTests);
 
 </script>

content/canvas/test/test_mozGetAsFile.html

@@ -22,7 +22,7 @@ function compareAsync(file, canvas, type)
 }
 
 SimpleTest.waitForExplicitFinish();
-MochiKit.DOM.addLoadEvent(function () {
+addLoadEvent(function () {
 
 var canvas = document.getElementById('c');
 var ctx = canvas.getContext('2d');

content/html/content/test/test_bug100533.html

@@ -6,6 +6,10 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=100533
 <head>
   <title>Test for Bug 100533</title>
   <script type="text/javascript" src="/MochiKit/packed.js"></script>
+  <script type="text/javascript" src="/MochiKit/Base.js"></script>
+  <script type="text/javascript" src="/MochiKit/DOM.js"></script>
+  <script type="text/javascript" src="/MochiKit/Style.js"></script>
+  <script type="text/javascript" src="/MochiKit/Signal.js"></script>
   <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>        
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
 </head>

content/media/test/test_contentDuration1.html

@@ -2,7 +2,10 @@
 <html>
 <head>
   <title>Media test: seek test 1</title>
-  <script type="text/javascript" src="/MochiKit/packed.js"></script>
+  <script type="text/javascript" src="/MochiKit/Base.js"></script>
+  <script type="text/javascript" src="/MochiKit/DOM.js"></script>
+  <script type="text/javascript" src="/MochiKit/Style.js"></script>
+  <script type="text/javascript" src="/MochiKit/Signal.js"></script>
   <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
 </head>

content/media/test/test_contentDuration2.html

@@ -2,7 +2,10 @@
 <html>
 <head>
   <title>Media test: seek test 1</title>
-  <script type="text/javascript" src="/MochiKit/packed.js"></script>
+  <script type="text/javascript" src="/MochiKit/Base.js"></script>
+  <script type="text/javascript" src="/MochiKit/DOM.js"></script>
+  <script type="text/javascript" src="/MochiKit/Style.js"></script>
+  <script type="text/javascript" src="/MochiKit/Signal.js"></script>
   <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
 </head>

content/media/test/test_contentDuration3.html

@@ -2,7 +2,10 @@
 <html>
 <head>
   <title>Media test: seek test 1</title>
-  <script type="text/javascript" src="/MochiKit/packed.js"></script>
+  <script type="text/javascript" src="/MochiKit/Base.js"></script>
+  <script type="text/javascript" src="/MochiKit/DOM.js"></script>
+  <script type="text/javascript" src="/MochiKit/Style.js"></script>
+  <script type="text/javascript" src="/MochiKit/Signal.js"></script>
   <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
 </head>

content/media/test/test_contentDuration4.html

@@ -2,7 +2,10 @@
 <html>
 <head>
   <title>Media test: seek test 1</title>
-  <script type="text/javascript" src="/MochiKit/packed.js"></script>
+  <script type="text/javascript" src="/MochiKit/Base.js"></script>
+  <script type="text/javascript" src="/MochiKit/DOM.js"></script>
+  <script type="text/javascript" src="/MochiKit/Style.js"></script>
+  <script type="text/javascript" src="/MochiKit/Signal.js"></script>
   <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
 </head>

content/media/test/test_contentDuration5.html

@@ -2,7 +2,10 @@
 <html>
 <head>
   <title>Media test: seek test 1</title>
-  <script type="text/javascript" src="/MochiKit/packed.js"></script>
+  <script type="text/javascript" src="/MochiKit/Base.js"></script>
+  <script type="text/javascript" src="/MochiKit/DOM.js"></script>
+  <script type="text/javascript" src="/MochiKit/Style.js"></script>
+  <script type="text/javascript" src="/MochiKit/Signal.js"></script>
   <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
 </head>

content/media/test/test_contentDuration6.html

@@ -2,7 +2,10 @@
 <html>
 <head>
   <title>Media test: seek test 1</title>
-  <script type="text/javascript" src="/MochiKit/packed.js"></script>
+  <script type="text/javascript" src="/MochiKit/Base.js"></script>
+  <script type="text/javascript" src="/MochiKit/DOM.js"></script>
+  <script type="text/javascript" src="/MochiKit/Style.js"></script>
+  <script type="text/javascript" src="/MochiKit/Signal.js"></script>
   <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
 </head>

content/media/test/test_contentDuration7.html

@@ -2,7 +2,10 @@
 <html>
 <head>
   <title>Media test: X-Content-Duration</title>
-  <script type="text/javascript" src="/MochiKit/packed.js"></script>
+  <script type="text/javascript" src="/MochiKit/Base.js"></script>
+  <script type="text/javascript" src="/MochiKit/DOM.js"></script>
+  <script type="text/javascript" src="/MochiKit/Style.js"></script>
+  <script type="text/javascript" src="/MochiKit/Signal.js"></script>
   <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
   <script type="text/javascript" src="manifest.js"></script>

content/media/test/test_delay_load.html

@@ -102,7 +102,7 @@ v.load(); // load started while in this document, this doc's load will block unt
 // Opening a new window to do this is a bit annoying, but if we use an iframe here,
 // delaying of the iframe's load event might interfere with the firing of our load event
 // in some confusing way. So it's simpler just to open another window.
-var w = window.open("", "testWindow"+i, "width=400,height=400");
+var w = window.open("", "testWindow", "width=400,height=400");
 w.document.body.appendChild(v);
 testWindows.push(w);
 

content/media/test/test_networkState.html

@@ -2,7 +2,10 @@
 <html>
 <head>
   <title>Media test: networkState</title>
-  <script type="text/javascript" src="/MochiKit/packed.js"></script>
+  <script type="text/javascript" src="/MochiKit/Base.js"></script>
+  <script type="text/javascript" src="/MochiKit/DOM.js"></script>
+  <script type="text/javascript" src="/MochiKit/Style.js"></script>
+  <script type="text/javascript" src="/MochiKit/Signal.js"></script>
   <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
   <script type="text/javascript" src="manifest.js"></script>

content/media/test/test_seekLies.html

@@ -2,7 +2,10 @@
 <html>
 <head>
   <title>Media test: server lies about range requests</title>
-  <script type="text/javascript" src="/MochiKit/packed.js"></script>
+  <script type="text/javascript" src="/MochiKit/Base.js"></script>
+  <script type="text/javascript" src="/MochiKit/DOM.js"></script>
+  <script type="text/javascript" src="/MochiKit/Style.js"></script>
+  <script type="text/javascript" src="/MochiKit/Signal.js"></script>
   <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
 </head>

content/smil/test/test_smilAccessKey.xhtml

@@ -173,7 +173,7 @@ function test(spec, charCode, keyCode, offset, modifiers)
     gotStartTimeOk = false;
   }
 
-  removeElement(anim);
+  anim.parentNode.removeChild(anim);
 
   return gotStartTimeOk;
 }
@@ -236,7 +236,7 @@ function testOpenEnd()
               "open-ended interval");
   }
 
-  removeElement(anim);
+  anim.parentNode.removeChild(anim);
 }
 
 function testPreventDefault()
@@ -262,7 +262,7 @@ function testPreventDefault()
   }
 
   circle.removeEventListener('keypress', func, false);
-  removeElement(anim);
+  anim.parentNode.removeChild(anim);
 }
 
 function testDispatchToWindow()
@@ -282,7 +282,7 @@ function testDispatchToWindow()
               "accesskey handling");
   }
 
-  removeElement(anim);
+  anim.parentNode.removeChild(anim);
 }
 
 function testAdoptNode()
@@ -326,7 +326,7 @@ function testAdoptNode()
     ok(false, "Adopted node failed to catch accesskey event");
   }
 
-  removeElement(anim);
+  anim.parentNode.removeChild(anim);
 }
 
 function testFauxEvent()
@@ -349,7 +349,7 @@ function testFauxEvent()
     // All is well
   }
 
-  removeElement(anim);
+  anim.parentNode.removeChild(anim);
 }
 
 window.addEventListener("load", main, false);

content/smil/test/test_smilBackwardsSeeking.xhtml

@@ -148,8 +148,8 @@ function main()
     }
 
     // Tidy up
-    removeElement(animA);
-    removeElement(animB);
+    animA.parentNode.removeChild(animA);
+    animB.parentNode.removeChild(animB);
   }
 
   SimpleTest.finish();

content/smil/test/test_smilChangeAfterFrozen.xhtml

@@ -130,7 +130,7 @@ function testBaseValueChange()
   is(gCircle.cx.animVal.value, 70,
      "Checking animated cx after anim ends & after changing base val");
 
-  removeElement(anim); // clean up
+  anim.parentNode.removeChild(anim); // clean up
   runNextTest();
 }
 
@@ -154,7 +154,7 @@ function testCurrentColorChange_final()
 
   // Clean up
   gCircle.removeAttribute("color");
-  removeElement(gCircle.firstChild);
+  gCircle.firstChild.parentNode.removeChild(gCircle.firstChild);
 
   // Kick off next test
   runNextTest();
@@ -182,7 +182,7 @@ function testCurrentColorChangeUsingStyle_final()
 
   // Clean up
   gCircle.removeAttribute("style");
-  removeElement(gCircle.firstChild);
+  gCircle.firstChild.parentNode.removeChild(gCircle.firstChild);
   runNextTest();
 }
 
@@ -205,7 +205,7 @@ function testInheritChange_final() {
      "Checking animated fill=inherit after anim ends and parent val changes");
 
   gCircleParent.removeAttribute("fill");
-  removeElement(gCircle.firstChild);
+  gCircle.firstChild.parentNode.removeChild(gCircle.firstChild);
   runNextTest();
 }
 
@@ -229,7 +229,7 @@ function testInheritChangeUsingStyle_final() {
      + "(using style attr)");
 
   gCircleParent.removeAttribute("style");
-  removeElement(gCircle.firstChild);
+  gCircle.firstChild.parentNode.removeChild(gCircle.firstChild);
   runNextTest();
 }
 

content/smil/test/test_smilContainerBinding.xhtml

@@ -42,7 +42,7 @@ function main() {
 
   // Unbind from tree -- the syncbase instance time(s) should become unresolved
   // but the offset time should remain
-  removeElement(anim);
+  anim.parentNode.removeChild(anim);
   is(anim.getStartTime(), 6);
 
   // Rebind and check everything is re-resolved
@@ -56,7 +56,7 @@ function main() {
   is(anim.getStartTime(), 2);
 
   // Unbind
-  removeElement(anim);
+  anim.parentNode.removeChild(anim);
   is(anim.getStartTime(), 6);
 
   // Rebind

content/smil/test/test_smilCrossContainer.xhtml

@@ -77,7 +77,7 @@ function main() {
   // Remove animation so that it belongs to no container and check that
   // advancing the second container to the next milestone doesn't cause a crash
   // (when the animation controller goes to run the next milestone sample).
-  removeElement(anim);
+  anim.parentNode.removeChild(anim);
   svgb.setCurrentTime(3);
 
   // Do likewise with syncbase relationships

content/smil/test/test_smilFillMode.xhtml

@@ -46,7 +46,7 @@ function main() {
     var anim = createAnim();
     svg.setCurrentTime(0);
     tests[i](anim);
-    removeElement(anim);
+    anim.parentNode.removeChild(anim);
   }
   SimpleTest.finish();
 }

content/smil/test/test_smilKeySplines.xhtml

@@ -59,7 +59,7 @@ function main() {
     var anim = createAnim();
     svg.setCurrentTime(0);
     tests[i](anim);
-    removeElement(anim);
+    anim.parentNode.removeChild(anim);
   }
   SimpleTest.finish();
 }
@@ -249,7 +249,7 @@ function testOkSyntax(anim) {
     testAnim.setAttribute('calcMode', 'spline');
     testAnim.setAttribute('keySplines', okStrs[i]);
     checkSample(4, 20);
-    removeElement(testAnim);
+    testAnim.parentNode.removeChild(testAnim);
   }
 }
 
@@ -275,7 +275,7 @@ function testBadSyntaxA(anim) {
     testAnim.setAttribute('calcMode', 'spline');
     testAnim.setAttribute('keySplines', badStrs[i]);
     checkSample(4, -100);
-    removeElement(testAnim);
+    testAnim.parentNode.removeChild(testAnim);
   }
 }
 

content/smil/test/test_smilKeyTimes.xhtml

@@ -298,7 +298,7 @@ function main()
       checkSample(anim, times[1], times[0], i);
     }
 
-    removeElement(anim);
+    anim.parentNode.removeChild(anim);
   }
 
   // fallback to discrete for non-additive animation
@@ -320,7 +320,7 @@ function main()
     checkLineCapSample(anim, sample[1], sample[0],
       "[non-interpolatable fallback]");
   }
-  removeElement(anim);
+  anim.parentNode.removeChild(anim);
 
   SimpleTest.finish();
 }

content/smil/test/test_smilKeyTimesPacedMode.xhtml

@@ -61,7 +61,7 @@ function testByAnimation() {
     is(gCircle.cx.animVal.value, 100,
        "Checking animVal with 'by' and keyTimes='" + curKeyTimes + "'");
 
-    removeElement(anim); // clean up
+    anim.parentNode.removeChild(anim); // clean up
   }
 }
 
@@ -77,7 +77,7 @@ function testToAnimation() {
     is(gCircle.cx.animVal.value, 100,
        "Checking animVal with 'to' and keyTimes='" + curKeyTimes + "'");
 
-    removeElement(anim); // clean up
+    anim.parentNode.removeChild(anim); // clean up
   }
 }
 
@@ -93,7 +93,7 @@ function testValuesAnimation() {
     is(gCircle.cx.animVal.value, 150,
        "Checking animVal with 'values' and keyTimes='" + curKeyTimes + "'");
 
-    removeElement(anim); // clean up
+    anim.parentNode.removeChild(anim); // clean up
   }
 }
 

content/smil/test/test_smilSyncbaseTarget.xhtml

@@ -96,7 +96,7 @@ function testSpecs() {
     }
   }
 
-  removeElement(anim);
+  anim.parentNode.removeChild(anim);
 }
 
 function testChangeId() {
@@ -113,7 +113,7 @@ function testChangeId() {
   is(anim.getStartTime(), 2,
      "Unexpected start time after resetting target ID.");
 
-  removeElement(anim);
+  anim.parentNode.removeChild(anim);
 }
 
 function testRemoveTimebase() {
@@ -127,7 +127,7 @@ function testRemoveTimebase() {
   is(a, circle.firstElementChild, "Unexpected document structure");
 
   // Remove timebase
-  removeElement(a);
+  a.parentNode.removeChild(a);
   ok(noStart(anim), "Unexpected start time after removing timebase.");
 
   // Reinsert timebase
@@ -135,7 +135,7 @@ function testRemoveTimebase() {
   ok(!noStart(anim), "Unexpected start time after re-inserting timebase.");
 
   // Remove dependent element
-  removeElement(anim);
+  anim.parentNode.removeChild(anim);
   ok(noStart(anim), "Unexpected start time after removing dependent.");
 
   // Create a new dependent

content/svg/content/test/test_SVGxxxList.xhtml

@@ -91,6 +91,14 @@ To have the battery of generic tests run for a new list attribute, add an elemen
     property is omitted, it is assumed that we can just compare
     "item.value" (which is the case for most list types).
 */
+//helper method
+function keys(obj) {
+    var rval = [];
+    for (var prop in obj) {
+        rval.push(prop);
+    }    
+    return rval;
+};
 
 var tests = [
   {

docshell/test/bug94514-postpage.html

@@ -18,7 +18,7 @@ Specifically, this is a test page that actually submits a form.
 netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
 if (!window.location.href.match("posted=1")) {
   // Here we just submit the form
-  var form = $("testForm");
+  var form = document.getElementById("testForm");
   form.action = window.location.href + "?posted=1";
   form.submit();
 } else {

dom/plugins/test/mochitest/test_npruntime_npnevaluate.html

@@ -1,8 +1,6 @@
 <html>
 <head>
   <title>NPN_Evaluate Tests</title>
-  <script type="text/javascript" 
-          src="/MochiKit/packed.js"></script>
   <script type="text/javascript" 
           src="/tests/SimpleTest/SimpleTest.js"></script>
   <link rel="stylesheet" type="text/css" 
@@ -73,13 +71,14 @@
           "npnEvaluateTest return value was of unexpected type");
       var success = (json_result == json_expected && 
           typeof(result) == typeof(expected));
-      appendChildNodes($("verbose"),
-          SPAN((success ? "pass" : "fail") + ": eval(" + test[0] + ")"));
-      appendChildNodes($("verbose"),
-          SPAN(" == " + json_result + "(" + 
+      $("verbose").appendChild(
+          createEl('span',null, (success ? "pass" : "fail") + ": eval(" + test[0] + ")"));
+      $("verbose").appendChild(
+          createEl('span', null," == " + json_result + "(" + 
           typeof(result) + "), expected " + json_expected + "(" + 
-          typeof(expected) + ")"),
-          BR()
+          typeof(expected) + ")"));
+      $("verbose").appendChild(
+          createEl('br')
           );
     }
     

dom/plugins/test/mochitest/test_npruntime_npninvoke.html

@@ -144,11 +144,11 @@
           is(false, "bad number of test arguments");
       }
       is(result, test[1], "npnInvokeTestFailed: " + plugin.getError());
-      appendChildNodes($("verbose"), 
-          SPAN((result == test[1] ? "pass" : "fail") + ": " + test[0]));
+      $("verbose").appendChild(
+          createEl('span', null, ((result == test[1] ? "pass" : "fail") + ": " + test[0])));
       if (result != test[1])
-        appendChildNodes($("verbose"), SPAN(" " + plugin.getError()));
-      appendChildNodes($("verbose"), BR());
+        $("verbose").appendChild(createEl("span", null, (" " + plugin.getError())));
+      $("verbose").appendChild(createEl('br'));
     }
             
     SimpleTest.finish();

dom/plugins/test/mochitest/test_npruntime_npninvokedefault.html

@@ -120,18 +120,17 @@
           "npnInvokeDefaultTest return value was of unexpected type");
       var success = (json_result == json_expected && 
           typeof(result) == typeof(expected));
-      appendChildNodes($("verbose"),
-          SPAN((success ? "pass" : "fail") + ": " + test[0] + "("));
+      $("verbose").appendChild(
+          createEl('span', null, ((success ? "pass" : "fail") + ": " + test[0] + "(")));
       for (var i = 1; i < test.length - 1; i++) {
-        appendChildNodes($("verbose"),
-            SPAN(JSON.stringify(test[i]) + (i < test.length - 2 ? "," : "")));
+        $("verbose").appendChild(
+            createEl('span', null, (JSON.stringify(test[i]) + (i < test.length - 2 ? "," : ""))));
       }
-      appendChildNodes($("verbose"),
-          SPAN(") == " + json_result + "(" + 
+      $("verbose").appendChild(
+          createEl('span', null, (") == " + json_result + "(" + 
           typeof(result) + "), expected " + json_expected + "(" + 
-          typeof(expected) + ")"),
-          BR()
-          );
+          typeof(expected) + ")")));
+      $("verbose").appendChild(createEl('br'));
     }
     
     // Test calling the invokedefault method of plugin-defined object

dom/tests/mochitest/ajax/jquery/test_jQuery.html

@@ -2,7 +2,8 @@
 <html>
 <head>
   <title>Test for jQuery</title>
-  <script src="/MochiKit/packed.js"></script>
+  <script src="/MochiKit/Base.js"></script>
+  <script src="/MochiKit/Async.js"></script>
   <script src="/tests/SimpleTest/SimpleTest.js"></script>
   <script type="text/javascript" src="../lib/AJAX_setup.js"></script>         
   <link rel="stylesheet" type="text/css" href="../lib/test.css" />

dom/tests/mochitest/ajax/mochikit/test_Mochikit.html

@@ -2,7 +2,8 @@
 <html>
 <head>
   <title>Test for Mochikit</title>
-  <script src="/MochiKit/packed.js"></script>
+  <script src="/MochiKit/Base.js"></script>
+  <script src="/MochiKit/Async.js"></script>
   <script src="/tests/SimpleTest/SimpleTest.js"></script>
   <script type="text/javascript" src="../lib/AJAX_setup.js"></script>         
   <link rel="stylesheet" type="text/css" href="../lib/test.css" />

dom/tests/mochitest/ajax/prototype/test_Prototype.html

@@ -2,7 +2,8 @@
 <html>
 <head>
   <title>Test for Prototype</title>
-  <script src="/MochiKit/packed.js"></script>
+  <script src="/MochiKit/Base.js"></script>
+  <script src="/MochiKit/Async.js"></script>
   <script src="/tests/SimpleTest/SimpleTest.js"></script>
   <script type="text/javascript" src="../lib/AJAX_setup.js"></script>         
   <link rel="stylesheet" type="text/css" href="../lib/test.css" />

dom/tests/mochitest/ajax/scriptaculous/test_Scriptaculous.html

@@ -2,7 +2,8 @@
 <html>
 <head>
   <title>Test for Scriptaculous</title>
-  <script src="/MochiKit/packed.js"></script>
+  <script src="/MochiKit/Base.js"></script>
+  <script src="/MochiKit/Async.js"></script>
   <script src="/tests/SimpleTest/SimpleTest.js"></script>
   <script type="text/javascript" src="../lib/AJAX_setup.js"></script>         
   <link rel="stylesheet" type="text/css" href="../lib/test.css" />

dom/tests/mochitest/bugs/test_bug342448.html

@@ -5,7 +5,8 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=342448
 -->
 <head>
   <title>Test for Bug 342448</title>
-  <script type="text/javascript" src="/MochiKit/packed.js"></script>
+  <script type="text/javascript" src="/MochiKit/Base.js"></script>
+  <script type="text/javascript" src="/MochiKit/Async.js"></script>
   <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>        
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
 </head>

dom/tests/mochitest/dom-level1-core/exclusions.js

@@ -77,7 +77,7 @@ var indexErrTests = ["characterdataindexsizeerrdeletedatacountnegative", "charac
 var attributeModTests = ["hc_attrappendchild1", "hc_attrappendchild3", "hc_attrappendchild5",
                          "hc_attrappendchild6", "hc_attrchildnodes2", "hc_attrclonenode1", "hc_attrinsertbefore1",
                          "hc_attrinsertbefore2", "hc_attrinsertbefore3", "hc_attrinsertbefore4", "hc_attrinsertbefore6",
-                         "hc_attrnormalize", "hc_attrremovechild2", "hc_attrreplacechild1", "hc_attrreplacechild2",
+                         "hc_attrnormalize", "hc_attrreplacechild1", "hc_attrreplacechild2",
                          "hc_attrsetvalue2", "hc_elementnormalize2", "hc_elementnotfounderr", "hc_elementremoveattribute", "hc_elementnormalize2",
                          "hc_elementnotfounderr", "hc_elementremoveattribute", ];
 var modTests = ["hc_elementwrongdocumenterr", "hc_namednodemapwrongdocumenterr", "hc_nodeappendchildnewchilddiffdocument", "hc_nodeinsertbeforenewchilddiffdocument",

dom/tests/mochitest/dom-level1-core/test_PIsetdatanomodificationallowederrEE.html

@@ -73,34 +73,6 @@ var docName = 'processinginstructionsetdatanomodificationallowederrEE';
 window.doc = window;  
 SimpleTest.waitForExplicitFinish();
 addLoadEvent(setUpPage);
-function testFails (test) {
-  if (!test.result) {
-    test.todo = true;
-    return true;
-  }
-  return false;
-}
-function markTodos() {
-  if (todoTests[docName]) {
-    // mark the failures as todos
-    var failures = filter(testFails, SimpleTest._tests);
-    // shouldn't be 0 failures
-    todo(SimpleTest._tests != 0 && failures == 0, "test marked todo should fail somewhere");
-  }
-}
-
-function runJSUnitTests() {
-  builder = createConfiguredBuilder();
-  try {
-   forEach(exposeTestFunctionNames(), 
-     function (testName) { 
-       window[testName](); 
-     }
-   );
-  } catch (ex) {
-    ok(false, "Test threw exception: " + ex);
-  }
-}
 
 
 /**

dom/tests/mochitest/dom-level1-core/test_attrcreatedocumentfragment.html

@@ -73,34 +73,6 @@ var docName = 'attrcreatedocumentfragment';
 window.doc = window;  
 SimpleTest.waitForExplicitFinish();
 addLoadEvent(setUpPage);
-function testFails (test) {
-  if (!test.result) {
-    test.todo = true;
-    return true;
-  }
-  return false;
-}
-function markTodos() {
-  if (todoTests[docName]) {
-    // mark the failures as todos
-    var failures = filter(testFails, SimpleTest._tests);
-    // shouldn't be 0 failures
-    todo(SimpleTest._tests != 0 && failures == 0, "test marked todo should fail somewhere");
-  }
-}
-
-function runJSUnitTests() {
-  builder = createConfiguredBuilder();
-  try {
-   forEach(exposeTestFunctionNames(), 
-     function (testName) { 
-       window[testName](); 
-     }
-   );
-  } catch (ex) {
-    ok(false, "Test threw exception: " + ex);
-  }
-}
 
 
 /**

dom/tests/mochitest/dom-level1-core/test_attrcreatetextnode.html

@@ -73,34 +73,6 @@ var docName = 'attrcreatetextnode';
 window.doc = window;  
 SimpleTest.waitForExplicitFinish();
 addLoadEvent(setUpPage);
-function testFails (test) {
-  if (!test.result) {
-    test.todo = true;
-    return true;
-  }
-  return false;
-}
-function markTodos() {
-  if (todoTests[docName]) {
-    // mark the failures as todos
-    var failures = filter(testFails, SimpleTest._tests);
-    // shouldn't be 0 failures
-    todo(SimpleTest._tests != 0 && failures == 0, "test marked todo should fail somewhere");
-  }
-}
-
-function runJSUnitTests() {
-  builder = createConfiguredBuilder();
-  try {
-   forEach(exposeTestFunctionNames(), 
-     function (testName) { 
-       window[testName](); 
-     }
-   );
-  } catch (ex) {
-    ok(false, "Test threw exception: " + ex);
-  }
-}
 
 
 /**

dom/tests/mochitest/dom-level1-core/test_attrcreatetextnode2.html

@@ -73,34 +73,6 @@ var docName = 'attrcreatetextnode2';
 window.doc = window;  
 SimpleTest.waitForExplicitFinish();
 addLoadEvent(setUpPage);
-function testFails (test) {
-  if (!test.result) {
-    test.todo = true;
-    return true;
-  }
-  return false;
-}
-function markTodos() {
-  if (todoTests[docName]) {
-    // mark the failures as todos
-    var failures = filter(testFails, SimpleTest._tests);
-    // shouldn't be 0 failures
-    todo(SimpleTest._tests != 0 && failures == 0, "test marked todo should fail somewhere");
-  }
-}
-
-function runJSUnitTests() {
-  builder = createConfiguredBuilder();
-  try {
-   forEach(exposeTestFunctionNames(), 
-     function (testName) { 
-       window[testName](); 
-     }
-   );
-  } catch (ex) {
-    ok(false, "Test threw exception: " + ex);
-  }
-}
 
 
 /**

dom/tests/mochitest/dom-level1-core/test_attrdefaultvalue.html

@@ -74,34 +74,6 @@ var docName = 'attrdefaultvalue';
 window.doc = window;  
 SimpleTest.waitForExplicitFinish();
 addLoadEvent(setUpPage);
-function testFails (test) {
-  if (!test.result) {
-    test.todo = true;
-    return true;
-  }
-  return false;
-}
-function markTodos() {
-  if (todoTests[docName]) {
-    // mark the failures as todos
-    var failures = filter(testFails, SimpleTest._tests);
-    // shouldn't be 0 failures
-    todo(SimpleTest._tests != 0 && failures == 0, "test marked todo should fail somewhere");
-  }
-}
-
-function runJSUnitTests() {
-  builder = createConfiguredBuilder();
-  try {
-   forEach(exposeTestFunctionNames(), 
-     function (testName) { 
-       window[testName](); 
-     }
-   );
-  } catch (ex) {
-    ok(false, "Test threw exception: " + ex);
-  }
-}
 
 
 /**

dom/tests/mochitest/dom-level1-core/test_attreffectivevalue.html

@@ -73,34 +73,6 @@ var docName = 'attreffectivevalue';
 window.doc = window;  
 SimpleTest.waitForExplicitFinish();
 addLoadEvent(setUpPage);
-function testFails (test) {
-  if (!test.result) {
-    test.todo = true;
-    return true;
-  }
-  return false;
-}
-function markTodos() {
-  if (todoTests[docName]) {
-    // mark the failures as todos
-    var failures = filter(testFails, SimpleTest._tests);
-    // shouldn't be 0 failures
-    todo(SimpleTest._tests != 0 && failures == 0, "test marked todo should fail somewhere");
-  }
-}
-
-function runJSUnitTests() {
-  builder = createConfiguredBuilder();
-  try {
-   forEach(exposeTestFunctionNames(), 
-     function (testName) { 
-       window[testName](); 
-     }
-   );
-  } catch (ex) {
-    ok(false, "Test threw exception: " + ex);
-  }
-}
 
 
 /**

dom/tests/mochitest/dom-level1-core/test_attrentityreplacement.html

@@ -73,34 +73,6 @@ var docName = 'attrentityreplacement';
 window.doc = window;  
 SimpleTest.waitForExplicitFinish();
 addLoadEvent(setUpPage);
-function testFails (test) {
-  if (!test.result) {
-    test.todo = true;
-    return true;
-  }
-  return false;
-}
-function markTodos() {
-  if (todoTests[docName]) {
-    // mark the failures as todos
-    var failures = filter(testFails, SimpleTest._tests);
-    // shouldn't be 0 failures
-    todo(SimpleTest._tests != 0 && failures == 0, "test marked todo should fail somewhere");
-  }
-}
-
-function runJSUnitTests() {
-  builder = createConfiguredBuilder();
-  try {
-   forEach(exposeTestFunctionNames(), 
-     function (testName) { 
-       window[testName](); 
-     }
-   );
-  } catch (ex) {
-    ok(false, "Test threw exception: " + ex);
-  }
-}
 
 
 /**

dom/tests/mochitest/dom-level1-core/test_attrname.html

@@ -73,34 +73,6 @@ var docName = 'attrname';
 window.doc = window;  
 SimpleTest.waitForExplicitFinish();
 addLoadEvent(setUpPage);
-function testFails (test) {
-  if (!test.result) {
-    test.todo = true;
-    return true;
-  }
-  return false;
-}
-function markTodos() {
-  if (todoTests[docName]) {
-    // mark the failures as todos
-    var failures = filter(testFails, SimpleTest._tests);
-    // shouldn't be 0 failures
-    todo(SimpleTest._tests != 0 && failures == 0, "test marked todo should fail somewhere");
-  }
-}
-
-function runJSUnitTests() {
-  builder = createConfiguredBuilder();
-  try {
-   forEach(exposeTestFunctionNames(), 
-     function (testName) { 
-       window[testName](); 
-     }
-   );
-  } catch (ex) {
-    ok(false, "Test threw exception: " + ex);
-  }
-}
 
 
 /**

dom/tests/mochitest/dom-level1-core/test_attrnextsiblingnull.html

@@ -73,34 +73,6 @@ var docName = 'attrnextsiblingnull';
 window.doc = window;  
 SimpleTest.waitForExplicitFinish();
 addLoadEvent(setUpPage);
-function testFails (test) {
-  if (!test.result) {
-    test.todo = true;
-    return true;
-  }
-  return false;
-}
-function markTodos() {
-  if (todoTests[docName]) {
-    // mark the failures as todos
-    var failures = filter(testFails, SimpleTest._tests);
-    // shouldn't be 0 failures
-    todo(SimpleTest._tests != 0 && failures == 0, "test marked todo should fail somewhere");
-  }
-}
-
-function runJSUnitTests() {
-  builder = createConfiguredBuilder();
-  try {
-   forEach(exposeTestFunctionNames(), 
-     function (testName) { 
-       window[testName](); 
-     }
-   );
-  } catch (ex) {
-    ok(false, "Test threw exception: " + ex);
-  }
-}
 
 
 /**

dom/tests/mochitest/dom-level1-core/test_attrnotspecifiedvalue.html

@@ -74,34 +74,6 @@ var docName = 'attrnotspecifiedvalue';
 window.doc = window;  
 SimpleTest.waitForExplicitFinish();
 addLoadEvent(setUpPage);
-function testFails (test) {
-  if (!test.result) {
-    test.todo = true;
-    return true;
-  }
-  return false;
-}
-function markTodos() {
-  if (todoTests[docName]) {
-    // mark the failures as todos
-    var failures = filter(testFails, SimpleTest._tests);
-    // shouldn't be 0 failures
-    todo(SimpleTest._tests != 0 && failures == 0, "test marked todo should fail somewhere");
-  }
-}
-
-function runJSUnitTests() {
-  builder = createConfiguredBuilder();
-  try {
-   forEach(exposeTestFunctionNames(), 
-     function (testName) { 
-       window[testName](); 
-     }
-   );
-  } catch (ex) {
-    ok(false, "Test threw exception: " + ex);
-  }
-}
 
 
 /**

dom/tests/mochitest/dom-level1-core/test_attrparentnodenull.html

@@ -73,34 +73,6 @@ var docName = 'attrparentnodenull';
 window.doc = window;  
 SimpleTest.waitForExplicitFinish();
 addLoadEvent(setUpPage);
-function testFails (test) {
-  if (!test.result) {
-    test.todo = true;
-    return true;
-  }
-  return false;
-}
-function markTodos() {
-  if (todoTests[docName]) {
-    // mark the failures as todos
-    var failures = filter(testFails, SimpleTest._tests);
-    // shouldn't be 0 failures
-    todo(SimpleTest._tests != 0 && failures == 0, "test marked todo should fail somewhere");
-  }
-}
-
-function runJSUnitTests() {
-  builder = createConfiguredBuilder();
-  try {
-   forEach(exposeTestFunctionNames(), 
-     function (testName) { 
-       window[testName](); 
-     }
-   );
-  } catch (ex) {
-    ok(false, "Test threw exception: " + ex);
-  }
-}
 
 
 /**

dom/tests/mochitest/dom-level1-core/test_attrprevioussiblingnull.html

@@ -73,34 +73,6 @@ var docName = 'attrprevioussiblingnull';
 window.doc = window;  
 SimpleTest.waitForExplicitFinish();
 addLoadEvent(setUpPage);
-function testFails (test) {
-  if (!test.result) {
-    test.todo = true;
-    return true;
-  }
-  return false;
-}
-function markTodos() {
-  if (todoTests[docName]) {
-    // mark the failures as todos
-    var failures = filter(testFails, SimpleTest._tests);
-    // shouldn't be 0 failures
-    todo(SimpleTest._tests != 0 && failures == 0, "test marked todo should fail somewhere");
-  }
-}
-
-function runJSUnitTests() {
-  builder = createConfiguredBuilder();
-  try {
-   forEach(exposeTestFunctionNames(), 
-     function (testName) { 
-       window[testName](); 
-     }
-   );
-  } catch (ex) {
-    ok(false, "Test threw exception: " + ex);
-  }
-}
 
 
 /**

dom/tests/mochitest/dom-level1-core/test_attrremovechild1.html

@@ -73,34 +73,6 @@ var docName = 'attrremovechild1';
 window.doc = window;  
 SimpleTest.waitForExplicitFinish();
 addLoadEvent(setUpPage);
-function testFails (test) {
-  if (!test.result) {
-    test.todo = true;
-    return true;
-  }
-  return false;
-}
-function markTodos() {
-  if (todoTests[docName]) {
-    // mark the failures as todos
-    var failures = filter(testFails, SimpleTest._tests);
-    // shouldn't be 0 failures
-    todo(SimpleTest._tests != 0 && failures == 0, "test marked todo should fail somewhere");
-  }
-}
-
-function runJSUnitTests() {
-  builder = createConfiguredBuilder();
-  try {
-   forEach(exposeTestFunctionNames(), 
-     function (testName) { 
-       window[testName](); 
-     }
-   );
-  } catch (ex) {
-    ok(false, "Test threw exception: " + ex);
-  }
-}
 
 
 /**