From 0e8ed043cbf6c498408fb6c6fbbb040cac8a099f Mon Sep 17 00:00:00 2001 From: Mounir Lamouri Date: Thu, 30 Sep 2010 00:14:30 -0700 Subject: [PATCH] Bug 580128. Make tests that now need to be chrome tests be chrome tests. r=jst@mozilla.org --HG-- rename : js/src/xpconnect/tests/mochitest/test_bug484459.html => js/src/xpconnect/tests/chrome/test_bug484459.xul rename : js/src/xpconnect/tests/mochitest/test_cows.html => js/src/xpconnect/tests/chrome/test_cows.xul rename : js/src/xpconnect/tests/mochitest/test_wrappers.html => js/src/xpconnect/tests/chrome/test_wrappers-2.xul --- js/src/xpconnect/tests/chrome/Makefile.in | 4 + .../tests/chrome/file_wrappers-2.html | 13 ++ .../xpconnect/tests/chrome/test_bug484459.xul | 37 +++++ .../test_cows.html => chrome/test_cows.xul} | 56 ++++--- .../test_wrappers-2.xul} | 137 ++++++++++-------- js/src/xpconnect/tests/mochitest/Makefile.in | 3 - .../tests/mochitest/test_bug484459.html | 36 ----- .../tests/mochitest/test_bug505915.html | 5 - 8 files changed, 165 insertions(+), 126 deletions(-) create mode 100644 js/src/xpconnect/tests/chrome/file_wrappers-2.html create mode 100644 js/src/xpconnect/tests/chrome/test_bug484459.xul rename js/src/xpconnect/tests/{mochitest/test_cows.html => chrome/test_cows.xul} (83%) rename js/src/xpconnect/tests/{mochitest/test_wrappers.html => chrome/test_wrappers-2.xul} (54%) delete mode 100644 js/src/xpconnect/tests/mochitest/test_bug484459.html diff --git a/js/src/xpconnect/tests/chrome/Makefile.in b/js/src/xpconnect/tests/chrome/Makefile.in index 823466b6bf3a..5f4ee1a4b15b 100644 --- a/js/src/xpconnect/tests/chrome/Makefile.in +++ b/js/src/xpconnect/tests/chrome/Makefile.in @@ -52,6 +52,10 @@ _CHROME_FILES = \ test_evalInSandbox.xul \ test_sandboxImport.xul \ test_wrappers.xul \ + test_wrappers-2.xul \ + test_bug484459.xul \ + file_wrappers-2.html \ + test_cows.xul \ $(NULL) libs:: $(_CHROME_FILES) diff --git a/js/src/xpconnect/tests/chrome/file_wrappers-2.html b/js/src/xpconnect/tests/chrome/file_wrappers-2.html new file mode 100644 index 000000000000..e27b07ed6a89 --- /dev/null +++ b/js/src/xpconnect/tests/chrome/file_wrappers-2.html @@ -0,0 +1,13 @@ + + + + + + diff --git a/js/src/xpconnect/tests/chrome/test_bug484459.xul b/js/src/xpconnect/tests/chrome/test_bug484459.xul new file mode 100644 index 000000000000..deaa260868a0 --- /dev/null +++ b/js/src/xpconnect/tests/chrome/test_bug484459.xul @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + + + diff --git a/js/src/xpconnect/tests/mochitest/test_cows.html b/js/src/xpconnect/tests/chrome/test_cows.xul similarity index 83% rename from js/src/xpconnect/tests/mochitest/test_cows.html rename to js/src/xpconnect/tests/chrome/test_cows.xul index 71f2ca92c64d..6f9a442d7c4d 100644 --- a/js/src/xpconnect/tests/mochitest/test_cows.html +++ b/js/src/xpconnect/tests/chrome/test_cows.xul @@ -1,20 +1,25 @@ - - - - Test for ChromeObjectWrappers - - - - - -

- -
-
+  
 
+  
+  
+  Mozilla Bug 522764 
+  
+
+  
+  
-
- - + ]]> + diff --git a/js/src/xpconnect/tests/mochitest/test_wrappers.html b/js/src/xpconnect/tests/chrome/test_wrappers-2.xul similarity index 54% rename from js/src/xpconnect/tests/mochitest/test_wrappers.html rename to js/src/xpconnect/tests/chrome/test_wrappers-2.xul index a97bfbfd5ed5..3a802f7d19cc 100644 --- a/js/src/xpconnect/tests/mochitest/test_wrappers.html +++ b/js/src/xpconnect/tests/chrome/test_wrappers-2.xul @@ -1,12 +1,34 @@ - - - Tests XPConnect Wrappers - - - - - - + + + + + Mozilla Bug 403005 + Mozilla Bug 409298 + + + + - - + + SimpleTest.finish(); + } + ]]> + + diff --git a/js/src/xpconnect/tests/mochitest/Makefile.in b/js/src/xpconnect/tests/mochitest/Makefile.in index 75e99a6d611b..589ffa694258 100644 --- a/js/src/xpconnect/tests/mochitest/Makefile.in +++ b/js/src/xpconnect/tests/mochitest/Makefile.in @@ -57,11 +57,9 @@ _TEST_FILES = bug500931_helper.html \ test_bug393269.html \ test_bug396851.html \ test_bug428021.html \ - test_wrappers.html \ test_bug446584.html \ test_bug462428.html \ test_bug478438.html \ - test_bug484459.html \ test_bug500691.html \ test_bug502959.html \ test_bug503926.html \ @@ -71,7 +69,6 @@ _TEST_FILES = bug500931_helper.html \ test_bug553407.html \ test_bug560351.html \ test_bug564330.html \ - test_cows.html \ test_frameWrapping.html \ test_bug589028.html \ bug589028_helper.html \ diff --git a/js/src/xpconnect/tests/mochitest/test_bug484459.html b/js/src/xpconnect/tests/mochitest/test_bug484459.html deleted file mode 100644 index 492af0dc9492..000000000000 --- a/js/src/xpconnect/tests/mochitest/test_bug484459.html +++ /dev/null @@ -1,36 +0,0 @@ - - - - - Test for Bug 484459 - - - - - -Mozilla Bug 484459 -

- -
-
-
- - diff --git a/js/src/xpconnect/tests/mochitest/test_bug505915.html b/js/src/xpconnect/tests/mochitest/test_bug505915.html index b510ffde060a..5ad9b947a7b2 100644 --- a/js/src/xpconnect/tests/mochitest/test_bug505915.html +++ b/js/src/xpconnect/tests/mochitest/test_bug505915.html @@ -39,11 +39,6 @@ function go() { } var xhr = new XMLHttpRequest(); -/* XXX - var orsc = new XPCSafeJSObjectWrapper(function(){}); - xhr.onreadystatechange = orsc; - // we only can test that the above didn't throw (which it shouldn't). -*/ try { xhr.onreadystatechange = ifr.contentWindow;