diff --git a/testing/mochitest/chrome/Makefile.in b/testing/mochitest/chrome/Makefile.in
index 886de1575b6..029fd045a4b 100644
--- a/testing/mochitest/chrome/Makefile.in
+++ b/testing/mochitest/chrome/Makefile.in
@@ -45,8 +45,7 @@ include $(DEPTH)/config/autoconf.mk
include $(topsrcdir)/config/rules.mk
_STATIC_FILES = test_sample.xul \
- test_synthesizeDragStart.xul \
- test_synthesizeDrop.xul \
+ test_sanityChromeUtils.xul \
# Disabled until bug 652494 is resolved.
# test_sanityException.xul \
# test_sanityException2.xul \
diff --git a/testing/mochitest/chrome/test_sanityChromeUtils.xul b/testing/mochitest/chrome/test_sanityChromeUtils.xul
new file mode 100644
index 00000000000..c214741c239
--- /dev/null
+++ b/testing/mochitest/chrome/test_sanityChromeUtils.xul
@@ -0,0 +1,223 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Need some space here
+
+
+
+
+ Need some depth and height to drag here
+
+ Need more space
+ Sure why not here too
+
+
diff --git a/testing/mochitest/chrome/test_synthesizeDragStart.xul b/testing/mochitest/chrome/test_synthesizeDragStart.xul
deleted file mode 100644
index f17eaafe8e4..00000000000
--- a/testing/mochitest/chrome/test_synthesizeDragStart.xul
+++ /dev/null
@@ -1,160 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
- Need some space here
- Need more space
- Sure why not here too
-
-
diff --git a/testing/mochitest/chrome/test_synthesizeDrop.xul b/testing/mochitest/chrome/test_synthesizeDrop.xul
deleted file mode 100644
index 06b7a63fe16..00000000000
--- a/testing/mochitest/chrome/test_synthesizeDrop.xul
+++ /dev/null
@@ -1,122 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
- Need some depth and height to drag here
-
-
-
diff --git a/testing/mochitest/tests/Makefile.in b/testing/mochitest/tests/Makefile.in
index 3aa1171cdfd..1fe966a24e5 100644
--- a/testing/mochitest/tests/Makefile.in
+++ b/testing/mochitest/tests/Makefile.in
@@ -54,8 +54,12 @@ include $(topsrcdir)/config/rules.mk
_TEST_FILES = \
test_sanity.html \
+ test_sanityEventUtils.html \
test_sanityException.html \
test_sanityException2.html \
+ test_sanityPluginUtils.html \
+ test_sanitySimpletest.html \
+ test_sanityWindowSnapshot.html \
test_SpecialPowersExtension.html \
test_SpecialPowersExtension2.html \
file_SpecialPowersFrame1.html \
diff --git a/testing/mochitest/tests/SimpleTest/EventUtils.js b/testing/mochitest/tests/SimpleTest/EventUtils.js
index 14656255fc2..094315677a1 100644
--- a/testing/mochitest/tests/SimpleTest/EventUtils.js
+++ b/testing/mochitest/tests/SimpleTest/EventUtils.js
@@ -5,6 +5,14 @@
* sendChar
* sendString
* sendKey
+ * synthesizeMouse
+ * synthesizeMouseAtCenter
+ * synthesizeMouseScroll
+ * synthesizeKey
+ * synthesizeMouseExpectEvent
+ * synthesizeKeyExpectEvent
+ *
+ * When adding methods to this file, please add a performance test for it.
*/
/**
@@ -541,11 +549,6 @@ function _getDOMWindowUtils(aWindow)
getInterface(Components.interfaces.nsIDOMWindowUtils);
}
-/*
- * synthesizeComposition, synthesizeText and synthesizeQuerySelectedText
- * are only used by layout/base/tests/test_reftests_with_caret.html.
- */
-
/**
* Synthesize a composition event.
*
diff --git a/testing/mochitest/tests/test_SpecialPowersExtension.html b/testing/mochitest/tests/test_SpecialPowersExtension.html
index af00a2550fa..ea7d80527ca 100644
--- a/testing/mochitest/tests/test_SpecialPowersExtension.html
+++ b/testing/mochitest/tests/test_SpecialPowersExtension.html
@@ -3,7 +3,6 @@
Test for SpecialPowers extension
-
@@ -31,8 +30,10 @@ function dispatchTestEvent() {
dump("\nSPECIALPTEST:::Test script loaded " + (new Date).getTime() + "\n");
SimpleTest.waitForExplicitFinish();
+var startTime = new Date();
function starttest(){
dump("\nSPECIALPTEST:::Test script running after load " + (new Date).getTime() + "\n");
+
/** Test for SpecialPowers extension **/
is(SpecialPowers.sanityCheck(), "foo", "check to see whether the Special Powers extension is installed.");
@@ -75,9 +76,17 @@ function starttest(){
is(SpecialPowers.DOMWindowUtils.getClassName(window), "Proxy");
is(SpecialPowers.DOMWindowUtils.docCharsetIsForced, false);
+ //Run the createSystemXHR method
+ var xhr = SpecialPowers.createSystemXHR();
+ ok(xhr, "createSystemXHR should not return null");
+ is(xhr.readyState, XMLHttpRequest.UNSENT, "createSystemXHR should create an unsent XMLHttpRequest object");
+
+ //try to run garbage collection
+ SpecialPowers.gc();
+
+ SimpleTest.info("\nProfile::SpecialPowersRunTime: " + (new Date() - startTime) + "\n");
SimpleTest.finish();
}
-//starttest();
diff --git a/testing/mochitest/tests/test_SpecialPowersExtension2.html b/testing/mochitest/tests/test_SpecialPowersExtension2.html
index 4a07a3d14ba..ac2a7682149 100644
--- a/testing/mochitest/tests/test_SpecialPowersExtension2.html
+++ b/testing/mochitest/tests/test_SpecialPowersExtension2.html
@@ -3,7 +3,6 @@
Test for SpecialPowers extension
-
diff --git a/testing/mochitest/tests/test_sanityEventUtils.html b/testing/mochitest/tests/test_sanityEventUtils.html
new file mode 100644
index 00000000000..421759074b9
--- /dev/null
+++ b/testing/mochitest/tests/test_sanityEventUtils.html
@@ -0,0 +1,167 @@
+
+
+
+ Profiling test suite for EventUtils
+
+
+
+
+
+
+
+Radio Target 1
+
+
+
+
+
+
+
+
+
diff --git a/testing/mochitest/tests/test_sanityPluginUtils.html b/testing/mochitest/tests/test_sanityPluginUtils.html
new file mode 100644
index 00000000000..f23f70a3e5d
--- /dev/null
+++ b/testing/mochitest/tests/test_sanityPluginUtils.html
@@ -0,0 +1,39 @@
+
+
+
+ Profiling test suite for PluginUtils
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/testing/mochitest/tests/test_sanitySimpletest.html b/testing/mochitest/tests/test_sanitySimpletest.html
new file mode 100644
index 00000000000..8e907c4192e
--- /dev/null
+++ b/testing/mochitest/tests/test_sanitySimpletest.html
@@ -0,0 +1,97 @@
+
+
+
+
+ Profiling test suite for SimpleTest
+
+
+
+
+
+
+
+
+
+
diff --git a/testing/mochitest/tests/test_sanityWindowSnapshot.html b/testing/mochitest/tests/test_sanityWindowSnapshot.html
new file mode 100644
index 00000000000..0981c7c179f
--- /dev/null
+++ b/testing/mochitest/tests/test_sanityWindowSnapshot.html
@@ -0,0 +1,35 @@
+
+
+
+ Profiling test suite for WindowSnapshot
+
+
+
+
+
+
+
+
+
+