Merge pull request #355 from anba/regexp-unicode

B.1.4 and Unicode RegExps

1 files changed, 13 insertions, 7 deletions

diff --git a/harness/assert.js b/harness/assert.js
index 35abaf8f6..9abf3e13c 100644
--- a/harness/assert.js
+++ b/harness/assert.js
@@ -51,24 +51,30 @@ assert.notSameValue = function (actual, unexpected, message) {
     $ERROR(message);
 };
 
-assert.throws = function (expectedErrorConstructor, func) {
+assert.throws = function (expectedErrorConstructor, func, message) {
     if (func === undefined) {
         $ERROR('assert.throws requires two arguments: the error constructor and a function to run');
         return;
     }
+    if (message === undefined) {
+        message = '';
+    } else {
+        message += ' ';
+    }
 
     try {
         func();
     } catch (thrown) {
         if (typeof thrown !== 'object' || thrown === null) {
-            $ERROR('Thrown value was not an object!');
-            return;
-        }
-        if (thrown.constructor !== expectedErrorConstructor) {
-            $ERROR('Expected a ' + expectedErrorConstructor.name + ' but got a ' + thrown.constructor.name);
+            message += 'Thrown value was not an object!';
+            $ERROR(message);
+        } else if (thrown.constructor !== expectedErrorConstructor) {
+            message += 'Expected a ' + expectedErrorConstructor.name + ' but got a ' + thrown.constructor.name;
+            $ERROR(message);
         }
         return;
     }
 
-    $ERROR('Expected a ' + expectedErrorConstructor.name + ' to be thrown but no exception was thrown at all');
+    message += 'Expected a ' + expectedErrorConstructor.name + ' to be thrown but no exception was thrown at all';
+    $ERROR(message);
 };