1 files changed, 51 insertions, 60 deletions

diff --git a/chrome/renderer/resources/extensions/apitest.js b/chrome/renderer/resources/extensions/apitest.js
index 6f015ef..2f36dee 100644
--- a/chrome/renderer/resources/extensions/apitest.js
+++ b/chrome/renderer/resources/extensions/apitest.js
@@ -9,17 +9,11 @@
 
   chrome.test.tests = chrome.test.tests || [];
 
-  var completed = false;
   var currentTest = null;
   var lastTest = null;
-
-  function complete() {
-    completed = true;
-
-    // Try to get the script to stop running immediately.
-    // This isn't an error, just an attempt at saying "done".
-    throw "completed";
-  }
+  var testsFailed = 0;
+  var testCount = 1;
+  var failureException = 'chrome.test.failure';
 
   // Helper function to get around the fact that function names in javascript
   // are read-only, and you can't assign one to anonymous functions.
@@ -27,36 +21,23 @@
     return test ? (test.name || test.generatedName) : "(no test)";
   }
 
-  chrome.test.fail = function(message) {
-    if (completed) throw "completed";
-    chrome.test.log("(  FAILED  ) " + testName(currentTest));
-
-    var stack = "(no stack available)";
-    try {
-      crash.me += 0;  // An intentional exception to get the stack trace.
-    } catch (e) {
-      if (typeof(e.stack) != undefined) {
-        stack = e.stack.split("\n");
-        stack = stack.slice(2);  // Remove title and fail() lines.
-        stack = stack.join("\n");
-      }
-    }
+  function testDone() {
+    // Use setTimeout here to allow previous test contexts to be
+    // eligible for garbage collection.
+    setTimeout(chrome.test.runNextTest, 0);
+  }
 
-    if (!message) {
-      message = "FAIL (no message)";
+  function allTestsDone() {
+    if (testsFailed == 0) {
+      chrome.test.notifyPass();
+    } else {
+      chrome.test.notifyFail('Failed ' + testsFailed + ' of ' +
+                             testCount + ' tests');
     }
-    message += "\n" + stack;
-    console.log("[FAIL] " + testName(currentTest) + ": " + message);
-    chrome.test.notifyFail(message);
-    complete();
-  };
 
-  function allTestsSucceeded() {
-    console.log("All tests succeeded");
-    if (completed) throw "completed";
-
-    chrome.test.notifyPass();
-    complete();
+    // Try to get the script to stop running immediately.
+    // This isn't an error, just an attempt at saying "done".
+    throw "completed";
   }
 
   var pendingCallbacks = 0;
@@ -73,30 +54,49 @@
   };
 
   chrome.test.runNextTest = function() {
-    chrome.test.assertEq(0, pendingCallbacks);
+    // There may have been callbacks which were interrupted by failure
+    // exceptions.
+    pendingCallbacks = 0;
+
     lastTest = currentTest;
     currentTest = chrome.test.tests.shift();
+
     if (!currentTest) {
-      allTestsSucceeded();
+      allTestsDone();
       return;
     }
+
     try {
       chrome.test.log("( RUN      ) " + testName(currentTest));
       currentTest.call();
     } catch (e) {
-      var message = e.stack || "(no stack available)";
-      console.log("[FAIL] " + testName(currentTest) + ": " + message);
-      chrome.test.notifyFail(message);
-      complete();
+      if (e !== failureException)
+        chrome.test.fail('uncaught exception: ' + e);
     }
   };
 
+  chrome.test.fail = function(message) {
+    chrome.test.log("(  FAILED  ) " + testName(currentTest));
+
+    var stack = {};
+    Error.captureStackTrace(stack, chrome.test.fail);
+
+    if (!message)
+      message = "FAIL (no message)";
+
+    message += "\n" + stack.stack;
+    console.log("[FAIL] " + testName(currentTest) + ": " + message);
+    testsFailed++;
+    testDone();
+
+    // Interrupt the rest of the test.
+    throw failureException;
+  };
+
   chrome.test.succeed = function() {
     console.log("[SUCCESS] " + testName(currentTest));
     chrome.test.log("(  SUCCESS )");
-    // Use setTimeout here to allow previous test contexts to be
-    // eligible for garbage collection.
-    setTimeout(chrome.test.runNextTest, 0);
+    testDone();
   };
 
   chrome.test.assertTrue = function(test, message) {
@@ -110,11 +110,10 @@
   chrome.test.assertBool = function(test, expected, message) {
     if (test !== expected) {
       if (typeof(test) == "string") {
-        if (message) {
+        if (message)
           message = test + "\n" + message;
-        } else {
+        else
           message = test;
-        }
       }
       chrome.test.fail(message);
     }
@@ -192,20 +191,11 @@
 
   function safeFunctionApply(func, arguments) {
     try {
-      if (func) {
+      if (func)
         func.apply(null, arguments);
-      }
     } catch (e) {
-      var stack = "(no stack available)";
-      if (typeof(e.stack) != "undefined") {
-        stack = e.stack.toString();
-      }
-      var msg = "Exception during execution of callback in " +
-                testName(currentTest);
-      msg += "\n" + stack;
-      console.log("[FAIL] " + testName(currentTest) + ": " + msg);
-      chrome.test.notifyFail(msg);
-      complete();
+      var msg = "uncaught exception " + e;
+      chrome.test.fail(msg);
     }
   };
 
@@ -271,5 +261,6 @@
 
   chrome.test.runTests = function(tests) {
     chrome.test.tests = tests;
+    testCount = chrome.test.tests.length;
     chrome.test.runNextTest();
   };