Exit early and pass over the log string when a test fails.

Review URL: http://codereview.chromium.org/6603023

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

1 files changed, 12 insertions, 10 deletions

diff --git a/chrome/test/data/webui/test_api.js b/chrome/test/data/webui/test_api.js
index f8d43cd..541ee01 100644
--- a/chrome/test/data/webui/test_api.js
+++ b/chrome/test/data/webui/test_api.js
@@ -6,13 +6,13 @@
 
 (function() {
   // Indicates a pass to the C++ backend.
-  function pass(message) {
+  function pass() {
     chrome.send('Pass', []);
   }
 
   // Indicates a fail to the C++ backend.
   function fail(message) {
-    chrome.send('Fail', []);
+    chrome.send('Fail', [String(message)]);
   }
 
   // Asserts.
@@ -25,7 +25,7 @@
         message = test + '\n' + message;
       else
         message = test;
-      fail(message);
+      throw new Error(message);
     }
   }
 
@@ -39,18 +39,19 @@
 
   function assertEquals(expected, actual, message) {
     if (expected !== actual) {
-      fail('Test Error in ' + testName(currentTest) +
-           '\nActual: ' + actual + '\nExpected: ' + expected + '\n' + message);
+      throw new Error('Test Error in ' + testName(currentTest) +
+                      '\nActual: ' + actual + '\nExpected: ' + expected +
+                      '\n' + message);
     }
     if (typeof expected != typeof actual) {
-      fail('Test Error in ' + testName(currentTest) +
-           ' (type mismatch)\nActual Type: ' + typeof actual +
-           '\nExpected Type:' + typeof expected + '\n' + message);
+      throw new Error('Test Error in ' + testName(currentTest) +
+                      ' (type mismatch)\nActual Type: ' + typeof actual +
+                      '\nExpected Type:' + typeof expected + '\n' + message);
     }
   }
 
   function assertNotReached(message) {
-    fail(message);
+    throw new Error(message);
   }
 
   // Call this method within your test script file to begin tests.
@@ -67,7 +68,8 @@
         console.log(
             'Failed: ' + currentTest.name + '\nwith exception: ' + e.message);
 
-        fail();
+        fail(e.message);
+        return;
       }
     }