Work around is check issue causing zone error handlers to never fire. Update test expectations to r…

test/browser/language_tests.js

 // Copyright (c) 2015, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 (function() {
   'use strict';
 
   let dart_sdk = dart_library.import('dart_sdk');
   dart_sdk._isolate_helper.startRootIsolate(function() {}, []);
   let async_helper = dart_library.import('async_helper').async_helper;
   let unittest = dart_library.import('unittest');
   let html_config = unittest.html_config;
   // Test attributes are a list of strings, or a string for a single
   // attribute. Valid attribues are:
   //
   //   'skip' - don't run the test
   //   'fail' - test fails
   //   'timeout' - test times out
   //   'slow' - use 5s timeout instead of default 2s.
   //   'helper'  - not a test, used by other tests.
   //   'unittest' - run separately as a unittest test.
   //
   // Common combinations:
   const fail = 'fail';
   const skip_fail = ['skip', 'fail'];
   const skip_timeout = ['skip', 'timeout'];
 
   // The number of expected unittest errors should be zero but unfortunately
   // there are a lot of broken html unittests.
-  let num_expected_unittest_errors = 5;
+  let num_expected_unittest_fails = 3;
+  let num_expected_unittest_errors = 2;
 
   // TODO(jmesserly): separate StrongModeError from other errors.
   let all_status = {
     'language': {
       'arithmetic2_test': fail,
       'assert_with_type_test_or_cast_test': skip_fail,
       'assertion_test': skip_fail,
       'async_await_test_none_multi': 'unittest',
       'async_star_await_pauses_test': skip_fail,
 
@@ skipping 425 matching lines @@
       // you increase the time by a large amount, but it's pretty gratuitous.
       // I'm not sure why they are so slow. One guess is that they are spewing
       // a ton of warnings, that slow down the test.
       'chunked_conversion_utf84_test': skip_timeout,
       'chunked_conversion_utf88_test': skip_timeout,
       'chunked_conversion_utf8_test': skip_timeout,
 
       // TODO(rnystrom): Strong mode cast failures.
       'codec1_test': skip_fail,
       'encoding_test': skip_fail,
+      'html_escape_test': fail,
 
       // TODO(rnystrom): If this test is enabled, karma gets confused and
       // disconnects randomly.
       'json_lib_test': skip_fail,
 
       'json_utf8_chunk_test': skip_timeout,
 
       // TODO(rnystrom): Strong mode cast failure.
       'line_splitter_test': skip_fail,
 
@@ skipping 179 matching lines @@
       // TODO(vsm): List.toString is different in DDC
       // https://github.com/dart-lang/dev_compiler/issues/445
       'setRange_1_test': skip_fail,
       'setRange_2_test': skip_fail,
       'setRange_3_test': skip_fail,
       'setRange_4_test': skip_fail,
       'setRange_5_test': skip_fail,
     },
   };
 
+  function countMatches(text, regex) {
+    let matches = text.match(regex);
+    return matches ? matches.length : 0;
+  }
+
   let unittest_tests = [];
 
   let languageTestPattern = new RegExp('(.*)/([^/]*_test[^/]*)');
   html_config.useHtmlConfiguration();
   // We need to let Dart unittest control when tests are run not mocha.
   // mocha.allowUncaught(true);
   let dartUnittestsLeft = 0;
   for (let testFile of dart_library.libraries()) {
     let match = languageTestPattern.exec(testFile);
     if (match != null) {
@@ skipping 75 matching lines @@
       });
     }
   }
 
   let mochaOnError;
   // We run these tests in a mocha test wrapper to avoid the confusing failure
   // case of dart unittests being interleaved with mocha tests.
   // In practice we are really just suppressing all mocha test behavior while
   // Dart unittests run and then re-enabling it when the dart tests complete.
   test('run all dart unittests', function(done) { // 'function' to allow `this.timeout`
+    this.timeout(100000000);
     this.enableTimeouts(false);
     // Suppress mocha on-error handling because it will mess up unittests.
     mochaOnError = window.onerror;
     window.onerror = function(err, url, line) {
       console.error(err, url, line);
     };
     window.addEventListener('message', (event) => {
       if (event.data == 'unittest-suite-done') {
         window.console.log("Done running unittests");
         let output = document.body.textContent;
         // Restore the Mocha onerror handler in case future tests need to run.
         window.onerror = mochaOnError;
         this.enableTimeouts(true);
 
-        var matches = output.match(/ERROR/g);
-        let numErrors = matches ? matches.length : 0;
-        if (numErrors != num_expected_unittest_errors) {
-          output = "Expected " + num_expected_unittest_errors +
-              " failing unittests, got " + numErrors + ".\n" + output;
+        let numErrors = countMatches(output, /\d\s+ERROR/g);
+        let numFails = countMatches(output, /\d\s+FAIL/g);
+        if (numErrors != num_expected_unittest_errors ||
+            numFails != num_expected_unittest_fails) {
+          output = "Expected " + num_expected_unittest_fails +
+              " fail and " + num_expected_unittest_errors +
+              " error unittests, got " + numFails + " fail and " +
+              numErrors + "error tests.\n" + output;
           console.error(output);
           done(new Error(output));
         } else {
           console.log(output);
           done();
         }
       }
     });
 
     for (let action of unittest_tests) {
       try {
         action();
       } catch (e) {
         console.error("Caught error tying to setup test:", e);
       }
     }
   });
 })();