Improve extension api tests: run all tests, even if one fails

Currently, if a single file has multiple tests, a single failure will abort running the rest of the tests.

There's still no way to expect rather than assert, but I plan to add that next.

BUG=none
TEST=the tests all continue to pass, but if you edit one to make it fail, runAllTests will continue running later tests.

Review URL: https://chromiumcodereview.appspot.com/10534054

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@141681 0039d316-1c4b-4281-b951-d872f2087c98

10 files changed, 21 insertions, 17 deletions

diff --git a/chrome/test/data/extensions/api_test/content_security_policy/test.js b/chrome/test/data/extensions/api_test/content_security_policy/test.js
index be250bd..a3cd41c 100644
--- a/chrome/test/data/extensions/api_test/content_security_policy/test.js
+++ b/chrome/test/data/extensions/api_test/content_security_policy/test.js
@@ -8,14 +8,14 @@ chrome.test.getConfig(function(config) {
 
   function inlineScriptDoesNotRun() {
     chrome.test.assertEq(window.inlineCanary, undefined);
-    chrome.test.runNextTest();
+    chrome.test.succeed();
   }
 
   function externalScriptDoesRun() {
     // This test is somewhat zen in the sense that if external scripts are
     // blocked, we don't be able to even execute the test harness...
     chrome.test.assertEq(window.externalCanary, "Alive");
-    chrome.test.runNextTest();
+    chrome.test.succeed();
   }
 
   chrome.test.runTests([
diff --git a/chrome/test/data/extensions/api_test/cross_origin_xhr/background_page/test.js b/chrome/test/data/extensions/api_test/cross_origin_xhr/background_page/test.js
index 9031fb6..77288c2 100644
--- a/chrome/test/data/extensions/api_test/cross_origin_xhr/background_page/test.js
+++ b/chrome/test/data/extensions/api_test/cross_origin_xhr/background_page/test.js
@@ -17,7 +17,7 @@ chrome.test.getConfig(function(config) {
       req.onload = function() {
         chrome.test.assertEq(200, req.status);
         chrome.test.assertEq("Hello!", req.responseText);
-        chrome.test.runNextTest();
+        chrome.test.succeed();
       }
       req.onerror = function() {
         chrome.test.log("status: " + req.status);
@@ -30,7 +30,7 @@ chrome.test.getConfig(function(config) {
       }
       req.onerror = function() {
         chrome.test.assertEq(0, req.status);
-        chrome.test.runNextTest();
+        chrome.test.succeed();
       }
     }
 
diff --git a/chrome/test/data/extensions/api_test/cross_origin_xhr/content_script/test.js b/chrome/test/data/extensions/api_test/cross_origin_xhr/content_script/test.js
index 118b6bf..b3f12ed 100644
--- a/chrome/test/data/extensions/api_test/cross_origin_xhr/content_script/test.js
+++ b/chrome/test/data/extensions/api_test/cross_origin_xhr/content_script/test.js
@@ -23,7 +23,7 @@ chrome.test.getConfig(function(config) {
         chrome.test.assertEq(0, response.status);
       }
 
-      chrome.test.runNextTest();
+      chrome.test.succeed();
     });
   }
 
diff --git a/chrome/test/data/extensions/api_test/cross_origin_xhr/file_access/test.js b/chrome/test/data/extensions/api_test/cross_origin_xhr/file_access/test.js
index 20e5c87..8258b72 100644
--- a/chrome/test/data/extensions/api_test/cross_origin_xhr/file_access/test.js
+++ b/chrome/test/data/extensions/api_test/cross_origin_xhr/file_access/test.js
@@ -13,7 +13,7 @@ chrome.test.getConfig(function(config) {
 
       req.onload = function() {
         chrome.test.assertEq("Hello!", req.responseText);
-        chrome.test.runNextTest();
+        chrome.test.succeed();
       }
       req.onerror = function() {
         chrome.test.log("status: " + req.status);
diff --git a/chrome/test/data/extensions/api_test/cross_origin_xhr/no_file_access/test.js b/chrome/test/data/extensions/api_test/cross_origin_xhr/no_file_access/test.js
index 02ccaab..a4c3c8e 100644
--- a/chrome/test/data/extensions/api_test/cross_origin_xhr/no_file_access/test.js
+++ b/chrome/test/data/extensions/api_test/cross_origin_xhr/no_file_access/test.js
@@ -16,10 +16,14 @@ chrome.test.getConfig(function(config) {
       }
       req.onerror = function() {
         chrome.test.assertEq(0, req.status);
-        chrome.test.runNextTest();
+        chrome.test.succeed();
       }
 
-      req.send(null);
+      try {
+        req.send(null);
+        chrome.test.fail('expected an error to be thrown');
+      } catch (e) {
+      };
     }
   ]);
 });
diff --git a/chrome/test/data/extensions/api_test/default_content_security_policy/test.js b/chrome/test/data/extensions/api_test/default_content_security_policy/test.js
index be250bd..a3cd41c 100644
--- a/chrome/test/data/extensions/api_test/default_content_security_policy/test.js
+++ b/chrome/test/data/extensions/api_test/default_content_security_policy/test.js
@@ -8,14 +8,14 @@ chrome.test.getConfig(function(config) {
 
   function inlineScriptDoesNotRun() {
     chrome.test.assertEq(window.inlineCanary, undefined);
-    chrome.test.runNextTest();
+    chrome.test.succeed();
   }
 
   function externalScriptDoesRun() {
     // This test is somewhat zen in the sense that if external scripts are
     // blocked, we don't be able to even execute the test harness...
     chrome.test.assertEq(window.externalCanary, "Alive");
-    chrome.test.runNextTest();
+    chrome.test.succeed();
   }
 
   chrome.test.runTests([
diff --git a/chrome/test/data/extensions/api_test/executescript/permissions/test.js b/chrome/test/data/extensions/api_test/executescript/permissions/test.js
index c83494e..451bbcc 100644
--- a/chrome/test/data/extensions/api_test/executescript/permissions/test.js
+++ b/chrome/test/data/extensions/api_test/executescript/permissions/test.js
@@ -42,7 +42,7 @@ chrome.test.getConfig(function(config) {
         chrome.tabs.executeScript(tab.id, {file: 'script.js'});
         window.setTimeout(function() {
           assertEq(0, numReceivedRequests);
-          chrome.test.runNextTest();
+          chrome.test.succeed();
         }, 4000);
       };
     },
@@ -60,7 +60,7 @@ chrome.test.getConfig(function(config) {
                                   {file: 'script.js', allFrames: true});
         window.setTimeout(function() {
           chrome.test.assertEq(3, numReceivedRequests);
-          chrome.test.runNextTest();
+          chrome.test.succeed();
         }, 4000);
       };
     }
diff --git a/chrome/test/data/extensions/api_test/permissions/favicon/test.js b/chrome/test/data/extensions/api_test/permissions/favicon/test.js
index 305c861..a19647a 100644
--- a/chrome/test/data/extensions/api_test/permissions/favicon/test.js
+++ b/chrome/test/data/extensions/api_test/permissions/favicon/test.js
@@ -10,14 +10,14 @@ window.onload = function() {
       var img = document.getElementById('favicon');
       chrome.test.assertEq(16, img.naturalWidth);
       chrome.test.assertEq(16, img.naturalHeight);
-      chrome.test.runNextTest();
+      chrome.test.succeed();
     },
 
     function theme() {
       var img = document.getElementById('theme');
       chrome.test.assertEq(0, img.naturalWidth);
       chrome.test.assertEq(0, img.naturalHeight);
-      chrome.test.runNextTest();
+      chrome.test.succeed();
     }
   ]);
 
diff --git a/chrome/test/data/extensions/api_test/tabs/get_current/test.js b/chrome/test/data/extensions/api_test/tabs/get_current/test.js
index db78d99..eb7031b 100644
--- a/chrome/test/data/extensions/api_test/tabs/get_current/test.js
+++ b/chrome/test/data/extensions/api_test/tabs/get_current/test.js
@@ -7,7 +7,7 @@ function pageUrl(letter) {
 function onCompleteGetCurrentTab(tab) {
   assertEq(tab.url, pageUrl("a"));
   chrome.tabs.remove(tab.id, function() {
-    chrome.test.runNextTest();
+    chrome.test.succeed();
   });
 }
 
@@ -16,7 +16,7 @@ chrome.test.runTests([
     chrome.tabs.getCurrent(function(tab) {
       // There should be no tab.
       assertEq(tab, undefined);
-      chrome.test.runNextTest();
+      chrome.test.succeed();
     });
   },
 
diff --git a/chrome/test/data/extensions/platform_apps/restrictions/test.js b/chrome/test/data/extensions/platform_apps/restrictions/test.js
index 94fcfd1..c179adb 100644
--- a/chrome/test/data/extensions/platform_apps/restrictions/test.js
+++ b/chrome/test/data/extensions/platform_apps/restrictions/test.js
@@ -13,7 +13,7 @@ function assertThrowsError(method, opt_expectedError) {
     method();
     fail("error not thrown");
   } catch (e) {
-    assertEq(e.message || e, opt_expectedError || DEFAULT_EXPECTED_ERROR);
+    assertEq(opt_expectedError || DEFAULT_EXPECTED_ERROR, e.message || e);
   }
 }