Bug 599583 - Make MochiKit tests use the Mozilla version of SimpleTest.js properly. r=jgriffin, a=blocking2.0-beta7.

2010-09-28 10:32:31 +03:00 · 2010-09-28 10:32:31 +03:00 · c699e0cf68
--- a/testing/mochitest/tests/MochiKit-1.4.2/tests/SimpleTest/Makefile.in
+++ b/testing/mochitest/tests/MochiKit-1.4.2/tests/SimpleTest/Makefile.in
@ -50,7 +50,6 @@ include $(DEPTH)/config/autoconf.mk
 include $(topsrcdir)/config/rules.mk

 _STUBS_FILES = \
-	SimpleTest.js \
 	test.css \
 	$(NULL)

--- a/testing/mochitest/tests/MochiKit-1.4.2/tests/SimpleTest/SimpleTest.js
+++ b/testing/mochitest/tests/MochiKit-1.4.2/tests/SimpleTest/SimpleTest.js
@ -1,47 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is SimpleTest.js stub for MochiKit v1.4.2 tests.
- *
- * The Initial Developer of the Original Code is
- * Serge Gautherie <sgautherie.bz@free.fr>.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-// NB: This code was adapted from
-//     http://www.nczonline.net/blog/2009/07/28/the-best-way-to-load-external-javascript/.
-
-
-var script = document.createElement('script');
-script.type = 'text/javascript';
-script.src = '../../SimpleTest/SimpleTest.js';
-
-var headFC = document.getElementsByTagName('head')[0];
-// Use insertBefore() instead of appendChild(), to avoid http://support.microsoft.com/kb/927917.
-headFC.parentNode.insertBefore(script, headFC);
--- a/testing/mochitest/tests/MochiKit-1.4.2/tests/test_MochiKit-Async.html
+++ b/testing/mochitest/tests/MochiKit-1.4.2/tests/test_MochiKit-Async.html
@ -5,7 +5,7 @@
    <script type="text/javascript" src="../MochiKit/Iter.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="SimpleTest/SimpleTest.js"></script>        
+    <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>        
    <link rel="stylesheet" type="text/css" href="SimpleTest/test.css">
 </head>
 <body>
--- a/testing/mochitest/tests/MochiKit-1.4.2/tests/test_MochiKit-Base.html
+++ b/testing/mochitest/tests/MochiKit-1.4.2/tests/test_MochiKit-Base.html
@ -4,7 +4,7 @@
    <script type="text/javascript" src="../MochiKit/Iter.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="SimpleTest/SimpleTest.js"></script>
+    <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
    <link rel="stylesheet" type="text/css" href="SimpleTest/test.css">
 </head>
 <body>
--- a/testing/mochitest/tests/MochiKit-1.4.2/tests/test_MochiKit-Color.html
+++ b/testing/mochitest/tests/MochiKit-1.4.2/tests/test_MochiKit-Color.html
@ -6,7 +6,7 @@
    <script type="text/javascript" src="../MochiKit/Style.js"></script>
    <script type="text/javascript" src="../MochiKit/Logging.js"></script>
    <script type="text/javascript" src="../MochiKit/Color.js"></script>
-    <script type="text/javascript" src="SimpleTest/SimpleTest.js"></script>        
+    <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>        
    <link rel="stylesheet" type="text/css" href="SimpleTest/test.css">
    <style type="text/css">.redtext {color: red}</style>
 </head>
--- a/testing/mochitest/tests/MochiKit-1.4.2/tests/test_MochiKit-DOM-Safari.html
+++ b/testing/mochitest/tests/MochiKit-1.4.2/tests/test_MochiKit-DOM-Safari.html
@ -5,7 +5,7 @@
    <script type="text/javascript" src="../MochiKit/Iter.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="SimpleTest/SimpleTest.js"></script>        
+    <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>        
    <link rel="stylesheet" type="text/css" href="SimpleTest/test.css">
 </head>
 <body>
--- a/testing/mochitest/tests/MochiKit-1.4.2/tests/test_MochiKit-DOM.html
+++ b/testing/mochitest/tests/MochiKit-1.4.2/tests/test_MochiKit-DOM.html
@ -5,7 +5,7 @@
    <script type="text/javascript" src="../MochiKit/Iter.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="SimpleTest/SimpleTest.js"></script>        
+    <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>        
    <link rel="stylesheet" type="text/css" href="SimpleTest/test.css">
 </head>
 <body>
--- a/testing/mochitest/tests/MochiKit-1.4.2/tests/test_MochiKit-DateTime.html
+++ b/testing/mochitest/tests/MochiKit-1.4.2/tests/test_MochiKit-DateTime.html
@ -5,7 +5,7 @@
    <script type="text/javascript" src="../MochiKit/Iter.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="SimpleTest/SimpleTest.js"></script>        
+    <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>        
    <link rel="stylesheet" type="text/css" href="SimpleTest/test.css">
 </head>
 <body>
--- a/testing/mochitest/tests/MochiKit-1.4.2/tests/test_MochiKit-DragAndDrop.html
+++ b/testing/mochitest/tests/MochiKit-1.4.2/tests/test_MochiKit-DragAndDrop.html
@ -14,7 +14,7 @@
    <script type="text/javascript" src="../MochiKit/Position.js"></script>
    <script type="text/javascript" src="../MochiKit/Visual.js"></script>    
    <script type="text/javascript" src="../MochiKit/DragAndDrop.js"></script>    
-    <script type="text/javascript" src="SimpleTest/SimpleTest.js"></script>        
+    <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>        
    <link rel="stylesheet" type="text/css" href="SimpleTest/test.css">
    <style type="text/css">
    .drop-hover {
--- a/testing/mochitest/tests/MochiKit-1.4.2/tests/test_MochiKit-Format.html
+++ b/testing/mochitest/tests/MochiKit-1.4.2/tests/test_MochiKit-Format.html
@ -5,7 +5,7 @@
    <script type="text/javascript" src="../MochiKit/Iter.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="SimpleTest/SimpleTest.js"></script>        
+    <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>        
    <link rel="stylesheet" type="text/css" href="SimpleTest/test.css">
 </head>
 <body>
--- a/testing/mochitest/tests/MochiKit-1.4.2/tests/test_MochiKit-Iter.html
+++ b/testing/mochitest/tests/MochiKit-1.4.2/tests/test_MochiKit-Iter.html
@ -4,7 +4,7 @@
    <script type="text/javascript" src="../MochiKit/Iter.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="SimpleTest/SimpleTest.js"></script>        
+    <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>        
    <link rel="stylesheet" type="text/css" href="SimpleTest/test.css">
 </head>
 <body>
--- a/testing/mochitest/tests/MochiKit-1.4.2/tests/test_MochiKit-Logging.html
+++ b/testing/mochitest/tests/MochiKit-1.4.2/tests/test_MochiKit-Logging.html
@ -5,7 +5,7 @@
    <script type="text/javascript" src="../MochiKit/Iter.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="SimpleTest/SimpleTest.js"></script>        
+    <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>        
    <link rel="stylesheet" type="text/css" href="SimpleTest/test.css">

 </head>
--- a/testing/mochitest/tests/MochiKit-1.4.2/tests/test_MochiKit-MochiKit.html
+++ b/testing/mochitest/tests/MochiKit-1.4.2/tests/test_MochiKit-MochiKit.html
@ -1,7 +1,7 @@
 <html>
 <head>
    <script type="text/javascript" src="../MochiKit/MochiKit.js"></script>
-    <script type="text/javascript" src="SimpleTest/SimpleTest.js"></script>        
+    <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>        
    <link rel="stylesheet" type="text/css" href="SimpleTest/test.css">
 </head>
 <body>
--- a/testing/mochitest/tests/MochiKit-1.4.2/tests/test_MochiKit-Selector.html
+++ b/testing/mochitest/tests/MochiKit-1.4.2/tests/test_MochiKit-Selector.html
@ -6,7 +6,7 @@
    <script type="text/javascript" src="../MochiKit/DOM.js"></script>
    <script type="text/javascript" src="../MochiKit/Style.js"></script>    
    <script type="text/javascript" src="../MochiKit/Selector.js"></script>    
-    <script type="text/javascript" src="SimpleTest/SimpleTest.js"></script>        
+    <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>        
    <link rel="stylesheet" type="text/css" href="SimpleTest/test.css">
    <style type="text/css">
        p, #sequence {
--- a/testing/mochitest/tests/MochiKit-1.4.2/tests/test_MochiKit-Signal.html
+++ b/testing/mochitest/tests/MochiKit-1.4.2/tests/test_MochiKit-Signal.html
@ -6,7 +6,7 @@
    <script type="text/javascript" src="../MochiKit/Style.js"></script>
    <script type="text/javascript" src="../MochiKit/Signal.js"></script>    
    <script type="text/javascript" src="../MochiKit/Logging.js"></script>    
-    <script type="text/javascript" src="SimpleTest/SimpleTest.js"></script>        
+    <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>        
    <link rel="stylesheet" type="text/css" href="SimpleTest/test.css">

 </head>
--- a/testing/mochitest/tests/MochiKit-1.4.2/tests/test_MochiKit-Style.html
+++ b/testing/mochitest/tests/MochiKit-1.4.2/tests/test_MochiKit-Style.html
@ -8,7 +8,7 @@
    <script type="text/javascript" src="../MochiKit/Style.js"></script>
    <script type="text/javascript" src="../MochiKit/Color.js"></script>
    <script type="text/javascript" src="../MochiKit/Logging.js"></script>
-    <script type="text/javascript" src="SimpleTest/SimpleTest.js"></script>
+    <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
    <link rel="stylesheet" type="text/css" href="SimpleTest/test.css">
    <style type="text/css">
        #hideTest {
--- a/testing/mochitest/tests/MochiKit-1.4.2/tests/test_MochiKit-Visual.html
+++ b/testing/mochitest/tests/MochiKit-1.4.2/tests/test_MochiKit-Visual.html
@ -9,7 +9,7 @@
    <script type="text/javascript" src="../MochiKit/Signal.js"></script>
    <script type="text/javascript" src="../MochiKit/Position.js"></script>
    <script type="text/javascript" src="../MochiKit/Visual.js"></script>
-    <script type="text/javascript" src="SimpleTest/SimpleTest.js"></script>     
+    <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>     

    <link rel="stylesheet" type="text/css" href="SimpleTest/test.css">
    <style type="text/css">