Bug 668710 - Move mockObjects.js in with the rest of SimpleTest; r=dao

--HG-- rename : toolkit/content/tests/browser/common/mockObjects.js => testing/mochitest/tests/SimpleTest/MockObjects.js
2011-08-05 23:55:49 +12:00 · 2011-08-05 23:55:49 +12:00 · d2686ad289
--- a/dom/tests/mochitest/bugs/test_bug61098.html
+++ b/dom/tests/mochitest/bugs/test_bug61098.html
@ -8,7 +8,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=61098
  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
  <script type="text/javascript" src="/mozprefs.js"></script>
  <script type="application/javascript" src="/tests/SimpleTest/EventUtils.js"></script>
-  <script type="application/javascript" src="/tests/SimpleTest/mockObjects.js"></script>
+  <script type="application/javascript" src="/tests/SimpleTest/MockObjects.js"></script>
  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
 </head>
 <body onload="runtests();">
--- a/testing/mochitest/jar.mn
+++ b/testing/mochitest/jar.mn
@ -23,8 +23,8 @@ mochikit.jar:
  content/tests/SimpleTest/test.css (tests/SimpleTest/test.css)
  content/tests/SimpleTest/TestRunner.js (tests/SimpleTest/TestRunner.js)
  content/tests/SimpleTest/WindowSnapshot.js (tests/SimpleTest/WindowSnapshot.js)
-  content/tests/SimpleTest/mockObjects.js (../../toolkit/content/tests/browser/common/mockObjects.js)
-  content/tests/SimpleTest/docshell_helpers.js (../..//docshell/test/chrome/docshell_helpers.js)
+  content/tests/SimpleTest/MockObjects.js (tests/SimpleTest/MockObjects.js)
+  content/tests/SimpleTest/docshell_helpers.js (../../docshell/test/chrome/docshell_helpers.js)

 % resource mochikit %modules/
  modules/MockFilePicker.jsm (MockFilePicker.jsm)
--- a/testing/mochitest/tests/SimpleTest/Makefile.in
+++ b/testing/mochitest/tests/SimpleTest/Makefile.in
@ -53,8 +53,8 @@ _SIMPLETEST_FILES =	MozillaLogger.js \
 			WindowSnapshot.js \
 			specialpowersAPI.js \
 			SpecialPowersObserverAPI.js \
-			$(DEPTH)/toolkit/content/tests/browser/common/mockObjects.js \
-                        $(DEPTH)/docshell/test/chrome/docshell_helpers.js \
+			MockObjects.js \
+			$(DEPTH)/docshell/test/chrome/docshell_helpers.js \
 			$(NULL)

 libs:: $(_SIMPLETEST_FILES)
--- a/toolkit/content/tests/browser/common/mockObjects.js
+++ b/toolkit/content/tests/browser/common/mockObjects.js
--- a/toolkit/content/tests/browser/common/Makefile.in
+++ b/toolkit/content/tests/browser/common/Makefile.in
@ -45,7 +45,6 @@ include $(DEPTH)/config/autoconf.mk
 include $(topsrcdir)/config/rules.mk

 _COMMON_FILES = \
-  mockObjects.js \
  mockTransfer.js \
  $(NULL)

--- a/toolkit/content/tests/browser/common/mockTransfer.js
+++ b/toolkit/content/tests/browser/common/mockTransfer.js
@ -36,8 +36,7 @@

 Cc["@mozilla.org/moz/jssubscript-loader;1"]
  .getService(Ci.mozIJSSubScriptLoader)
-  .loadSubScript("chrome://mochitests/content/browser/toolkit/content/tests/browser/common/mockObjects.js",
-                 this);
+  .loadSubScript("chrome://mochikit/content/tests/SimpleTest/MockObjects.js", this);

 var mockTransferCallback;