Merge pull request #86 from smikes/pr/83

browser runner: check negative regex

test/harness/ed.js

@@ -6,9 +6,20 @@
 
 //Error Detector
 if (this.window!==undefined) {  //for console support
-    this.window.onerror = function(errorMsg, url, lineNumber) {
+    this.window.onerror = function(errorMsg, url, lineNumber, colNumber, error) {
-        this.window.iframeError = errorMsg;
+        var cookedError;
-        if(typeof $DONE === 'function') $DONE();
+
+        if (error) {
+            cookedError = error.toString();
+        } else {
+            if (/Error:/.test(errorMsg)) {
+                cookedError = errorMsg;
+            } else {
+                cookedError = "UnknownError: " + errorMsg;
+            }
+        }
+
+        $DONE(cookedError);
     };
 }
 

test/harness/gs.js

@@ -5,67 +5,65 @@
 /// copyright and this notice and otherwise comply with the Use Terms.
 
 //Global Scope Test Case Validator
-function $DONE() {
+var doneCalled;
+function $DONE(argError) {
+
+    var testError;
+    var result, resultError;
+
+    if (argError) {
+        testError = argError.toString();
+    }
+
+    if (doneCalled) {
+        // ? log called twice
+        return;
+    }
+    doneCalled = true;
 
     //An exception is expected
     if (testDescrip.negative !== undefined) {
         //TODO - come up with a generic way of catching the error type
         //from this.onerror
-        testDescrip.negative = testDescrip.negative === "NotEarlyError" ?
+
-                testDescrip.negative :
+        var negRegexp = new RegExp(testDescrip.negative, "i"),
-            (testDescrip.negative === "^((?!NotEarlyError).)*$" ?
+            unkRegexp = /^UnknownError:/;
-                testDescrip.negative : ".");
+        
-        if (this.iframeError === undefined) { //no exception was thrown
+
-            testRun(testDescrip.id,
+        if (!testError) { //no exception was thrown
-                    testDescrip.path,
+            result = 'fail';
-                    testDescrip.description,
+            resultError = Error('No exception was thrown; expected an error "message"' +
-                    testDescrip.code,
+                                ' property matching the regular expression "' +
-                    'fail',
+                                testDescrip.negative + '".');
-                    Error('No exception was thrown; expected an error "message"' +
+        } else if (!negRegexp.test(testError) && 
-                          ' property matching the regular expression "' +
+                   !unkRegexp.test(testError)) {
-                          testDescrip.negative + '".'));
-        } else if (!(new RegExp(testDescrip.negative,
-                                "i").test(this.iframeError))) {
             //wrong type of exception thrown
-            testRun(testDescrip.id,
+            result = 'fail';
-                    testDescrip.path,
+            resultError = Error('Expected an exception with a "message"' +
-                    testDescrip.description,
+                                ' property matching the regular expression "' +
-                    testDescrip.code,
+                                testDescrip.negative +
-                    'fail',
+                                '" to be thrown; actual was "' +
-                    Error('Expected an exception with a "message"' +
+                                testError + '".');
-                          ' property matching the regular expression "' +
+
-                          testDescrip.negative +
-                          '" to be thrown; actual was "' +
-                          this.iframeError + '".'));
         } else {
-            testRun(testDescrip.id,
+            result = 'pass';
-                    testDescrip.path,
+            resultError = 'undefined';
-                    testDescrip.description,
-                    testDescrip.code,
-                    'pass',
-                    undefined);
         }
+    } else if (testError) {
+        //Exception was not expected to be thrown
+        result = 'fail';
+        resultError = Error('Unexpected exception, "' + testError + '" was thrown.');
+    } else {
+        result = 'pass';
+        resultError = undefined;
     }
 
-    //Exception was not expected to be thrown
+    testRun(testDescrip.id,
-    else if (this.iframeError !== undefined) {
+            testDescrip.path,
-        testRun(testDescrip.id,
+            testDescrip.description,
-                testDescrip.path,
+            testDescrip.code,
-                testDescrip.description,
+            result,
-                testDescrip.code,
+            resultError);
-                'fail',
-                Error('Unexpected exception, "' +
-                      this.iframeError + '" was thrown.'));
-    } 
-
-    else {
-        testRun(testDescrip.id,
-                testDescrip.path,
-                testDescrip.description,
-                testDescrip.code,
-                'pass',
-                undefined);
-    }
 
     //teardown
     testFinished();

test/harness/sth.js

@@ -129,7 +129,7 @@ function BrowserRunner() {
 
             //TODO - 500ms *should* be a sufficient delay
             setTimeout(function() {
-                instance.supportsWindowOnerror = iwinPrereqs.failCount === 2;
+                instance.supportsWindowOnerror = (iwinPrereqs.failCount === 2);
                 //alert(iwinPrereqs.failCount);
                 document.body.removeChild(iframePrereqs);
                 instance.run(test, code);

test/suite/ch08/8.7/S8.7.1_A2.js

@@ -14,8 +14,9 @@ var y = 1;
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
-if(delete y){
+var result = delete y;
-  $ERROR('#1: y = 1; (delete y) === false. Actual: ' + ((delete y)));
+if(result){
+  $ERROR('#1: y = 1; (delete y) === false. Actual: ' + result);
 };
 //
 //////////////////////////////////////////////////////////////////////////////