remove unittest as a test status, instead record this at test build time

pkg/dev_compiler/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.
 
 define(['dart_sdk', 'async_helper', 'expect', 'unittest', 'is', 'require'],
       function(dart_sdk, async_helper, expect, unittest, is, require) {
   'use strict';
 
   async_helper = async_helper.async_helper;
   let minitest = expect.minitest;
   let mochaOnError = window.onerror;
   dart_sdk.dart.trapRuntimeErrors(false);
   dart_sdk.dart.ignoreWhitelistedErrors(false);
   dart_sdk.dart.failForWeakModeIsChecks(false);
   dart_sdk._isolate_helper.startRootIsolate(function() {}, []);
   // Make it easier to debug test failures and required for formatter test that
   // assumes custom formatters are enabled.
   dart_sdk._debugger.registerDevtoolsFormatter();
 
   let html_config = unittest.html_config;
   // Test attributes are a list of strings, or a string for a single
   // attribute. Valid attributes are:
   //
   //   'pass' - test passes (default)
   //   '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.
   //   'whitelist' - run with whitelisted type errors allowed
   //
   // Common combinations:
   const pass = 'pass';
   const fail = 'fail';
   const skip_timeout = ['skip', 'timeout'];
 
   // Browsers
   const firefox_fail = is.firefox() ? fail : pass;
   const chrome_fail = is.chrome() ? fail : pass;
 
   // These are typically tests with asynchronous exceptions that our
   // test framework doesn't always catch.
   const flaky = 'skip';
   const whitelist = 'whitelist';
 
   // Tests marked with this are still using the deprecated unittest package
   // because they rely on its support for futures and asynchronous tests, which
   // expect and minitest do not handle.
   // TODO(rnystrom): Move all of these away from using the async test API so
   // they can stop using unittest.
-  const async_unittest = ['unittest', 'skip', 'fail'];
+  const async_unittest = ['skip', 'fail'];
 
   // The number of expected unittest errors should be zero but unfortunately
   // there are a lot of broken html unittests.
   let num_expected_unittest_fails = 4;
   let num_expected_unittest_errors = 0;
 
   // TODO(jmesserly): separate StrongModeError from other errors.
   let all_status = {
     'language': {
-      'async_await_test_none_multi': 'unittest',
-      'async_await_test_02_multi': 'unittest',
-
       // Flaky on travis (https://github.com/dart-lang/sdk/issues/27224)
       'async_await_test_03_multi': async_unittest,
 
       'async_star_pause_test': fail,
       'async_star_await_pauses_test': skip_timeout,
 
       // TODO(jmesserly): figure out why this test is hanging.
       'async_star_cancel_and_throw_in_finally_test': skip_timeout,
 
       'async_star_cancel_while_paused_test': fail,
@@ skipping 128 matching lines @@
       'external_test_21_multi': fail,
       'external_test_24_multi': fail,
       'multiline_newline_test_04_multi': fail,
       'multiline_newline_test_05_multi': fail,
       'multiline_newline_test_06_multi': fail,
       'multiline_newline_test_none_multi': fail,
 
       // https://github.com/dart-lang/sdk/issues/26124
       'prefix10_negative_test': fail,
 
-      'library_prefixes_test1': 'helper',
-      'library_prefixes_test2': 'helper',
-      'top_level_prefixed_library_test': 'helper',
+      'library_prefixes_test1': 'skip', // not a test
+      'library_prefixes_test2': 'skip', // not a test
+      'top_level_prefixed_library_test': 'skip', // not a test
 
     },
 
     'language/covariant_override': {},
 
     'codegen': {},
 
     'corelib': {
       'apply2_test': fail,
       'apply3_test': fail,
@@ skipping 162 matching lines @@
       'utf8_test': whitelist,
     },
 
     'lib/html': {
       'async_spawnuri_test': async_unittest,
       'async_test': async_unittest,
 
        // was https://github.com/dart-lang/sdk/issues/27578, needs triage
       'audiocontext_test': is.chrome('<=54') ? fail : pass,
 
-      'canvas_test': ['unittest'],
-      'canvasrenderingcontext2d_test': ['unittest'],
       'cross_domain_iframe_test': async_unittest,
       'cssstyledeclaration_test': async_unittest,
       'css_test': async_unittest,
 
       // This is failing with a range error, I'm guessing because it's looking
       // for a stylesheet and the page has none.
       'css_rule_list_test': 'fail',
 
       'custom_element_method_clash_test': async_unittest,
       'custom_element_name_clash_test': async_unittest,
       'custom_elements_23127_test': async_unittest,
       'custom_elements_test': async_unittest,
 
       // Please do not mark this test as fail. If your change breaks this test,
       // please look at the test for instructions on how to generate a new
       // golden file.
       'debugger_test': firefox_fail,
-      'element_animate_test': 'unittest',
 
       // https://github.com/dart-lang/sdk/issues/27579.
       'element_classes_test': 'fail',
       'element_classes_svg_test': 'fail',
 
       // Failure: 'Expected 56 to be in the inclusive range [111, 160].'.
       'element_offset_test': 'fail',
 
       'element_test': async_unittest,
       // This may no longer be a valid test?
@@ skipping 262 matching lines @@
     }
     if (match != null) {
       let status = all_status[status_group];
       if (status == null) throw "No status for '" + status_group + "'";
 
       let expectation = status[name];
       if (expectation == null) expectation = [];
       if (typeof expectation == 'string') expectation = [expectation];
       let has = (tag) => expectation.indexOf(tag) >= 0;
 
-      if (has('helper')) {
-        // These are not top-level tests.  They are used by other tests.
-        continue;
-      }
-
       if (has('skip')) {
         let why = 'for unknown reason';
         if (has('timeout')) why = 'known timeout';
         if (has('fail')) why = 'known failure';
         console.debug('Skipping ' + why + ': ' + name);
         continue;
       }
 
       // A few tests are special because they use package:unittest.
       // We run them below.
-      if (has('unittest')) {
+      let mainLibrary = require(module)[libraryName(name)];
+      if (mainLibrary._usesUnittestPackage) {
         unittest_tests.push(() => {
           console.log('Running unittest test ' + testFile);
-          require(module)[libraryName(name)].main();
+          mainLibrary.main();
         });
         continue;
       }
 
-      let protect = (f) => {  // Returns the exception, or `null`.
-        try {
-          return f();
-        } catch (e) {
-          return e;
-        }
-      };
-
       var fullName = status_group + '/' + name;
       test(fullName, function(done) { // 'function' to allow `this.timeout`.
         console.debug('Running test:  ' + fullName);
 
         // Many tests are async.  Currently, tests can indicate this in
         // two different ways.  First, `main` can call (in Dart)
         // `async_helper.asyncStart`.  We can check if this happened by
         // querying `async_helper.asyncTestStarted` afterward and waiting for
         // the callback if so.  Second, `main` can return a `Future`.  If so,
         // we wait for that to complete.  If neither is true, we assume the
@@ skipping 22 matching lines @@
         // 4. Via `async_helper` without an error.  In this case, the
         //    `async_helper` library triggers `finish` via its callback.
         // 5. Asynchronously with an error.  In this case, `window.onerror`
         //    triggers `finish` with the error.
         // 6. Hangs.  In this case, we rely on the underlying mocha framework
         //    timeout.
         //
         // TODO(vsm): This currently doesn't handle tests that trigger multiple
         // asynchronous exceptions.
 
-        let mainLibrary = require(module)[libraryName(name)];
         let negative = /negative_test/.test(name) ||
             mainLibrary._expectRuntimeError;
         let fail = has('fail');
 
         let whitelist = has('whitelist');
         dart_sdk.dart.ignoreWhitelistedErrors(whitelist);
 
         function finish(error) {
           // If the test left any lingering detritus in the DOM, blow it away
           // so it doesn't interfere with later tests.
@@ skipping 122 matching lines @@
 
     for (let action of unittest_tests) {
       try {
         action();
       } catch (e) {
         console.error("Caught error tying to setup test:", e);
       }
     }
   });
 });