Remove unittest-based wrapping from our testing scripts

tools/testing/dart/test_suite.dart

 // Copyright (c) 2012, 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.
 
 /**
  * Classes and methods for enumerating and preparing tests.
  *
  * This library includes:
  *
  * - Creating tests by listing all the Dart files in certain directories,
@@ skipping 693 matching lines @@
     String testName = buildTestCaseDisplayName(suiteDir, info.originTestPath,
         multitestName: optionsFromFile['isMultitest'] ? info.multitestKey : "");
 
     Set<Expectation> expectations = testExpectations.expectations(testName);
     if (configuration['compiler'] != 'none' && info.hasCompileError) {
       // If a compile-time error is expected, and we're testing a
       // compiler, we never need to attempt to run the program (in a
       // browser or otherwise).
       enqueueStandardTest(info, testName, expectations);
     } else if (TestUtils.isBrowserRuntime(configuration['runtime'])) {
-      bool isWrappingRequired = configuration['compiler'] != 'dart2js';
-
       if (info.optionsFromFile['isMultiHtmlTest']) {
         // A browser multi-test has multiple expectations for one test file.
         // Find all the different sub-test expecations for one entire test file.
         List<String> subtestNames = info.optionsFromFile['subtestNames'];
         Map<String, Set<Expectation>> multiHtmlTestExpectations = {};
         for (String name in subtestNames) {
           String fullTestName = '$testName/$name';
           multiHtmlTestExpectations[fullTestName] =
               testExpectations.expectations(fullTestName);
         }
-        enqueueBrowserTest(info, testName, multiHtmlTestExpectations,
-            isWrappingRequired);
+        enqueueBrowserTest(info, testName, multiHtmlTestExpectations);
       } else {
-        enqueueBrowserTest(info, testName, expectations, isWrappingRequired);
+        enqueueBrowserTest(info, testName, expectations);
       }
     } else {
       enqueueStandardTest(info, testName, expectations);
     }
   }
 
   void enqueueStandardTest(TestInformation info,
                            String testName,
                            Set<Expectation> expectations) {
     var commonArguments = commonArgumentsFromFile(info.filePath,
@@ skipping 172 matching lines @@
     var localIp = configuration['local_ip'];
     var url= 'http://$localIp:$serverPort$pathComponent'
         '?crossOriginPort=$crossOriginPort';
     if (info.optionsFromFile['isMultiHtmlTest'] && subtestNames.length > 0) {
       url= '${url}&group=${subtestNames[subtestIndex]}';
     }
     return url;
   }
 
   void _createWrapperFile(String dartWrapperFilename,
-                          Path dartLibraryFilename,
-                          {bool useUnittestWrapper: false}) {
+                          Path dartLibraryFilename) {
     File file = new File(dartWrapperFilename);
     RandomAccessFile dartWrapper = file.openSync(mode: FileMode.WRITE);
 
     var usePackageImport = dartLibraryFilename.segments().contains("pkg");
     var libraryPathComponent = _createUrlPathFromFile(dartLibraryFilename);
-    var generatedSource;
-    if (useUnittestWrapper) {
-      // FIXME(kustermann): This is broken, we can't do unittest-based wrapping
-      // of tests (e.g. async operations are not wrapped in expectAsync()).
-      generatedSource = dartUnittestWrapper(usePackageImport,
-                                            libraryPathComponent);
-    } else {
-      generatedSource = dartTestWrapper(libraryPathComponent);
-    }
-
+    var generatedSource = dartTestWrapper(libraryPathComponent);
     dartWrapper.writeStringSync(generatedSource);
     dartWrapper.closeSync();
   }
 
   /**
    * The [StandardTestSuite] has support for tests that
    * compile a test from Dart to JavaScript, and then run the resulting
    * JavaScript.  This function creates a working directory to hold the
    * JavaScript version of the test, and copies the appropriate framework
    * files to that directory.  It creates a [BrowserTestCase], which has
    * two sequential steps to be run by the [ProcessQueue] when the test is
    * executed: a compilation step and an execution step, both with the
    * appropriate executable and arguments. The [expectations] object can be
    * either a Set<String> if the test is a regular test, or a Map<String
    * subTestName, Set<String>> if we are running a browser multi-test (one
    * compilation and many browser runs).
    */
   void enqueueBrowserTest(TestInformation info,
                           String testName,
-                          expectations,
-                          bool isWrappingRequired) {
+                          expectations) {
     // TODO(kustermann/ricow): This method should be refactored.
     Map optionsFromFile = info.optionsFromFile;
     Path filePath = info.filePath;
     String filename = filePath.toString();
-    bool isWebTest = optionsFromFile['containsDomImport'];
 
     final String compiler = configuration['compiler'];
     final String runtime = configuration['runtime'];
 
     for (var vmOptions in getVmOptions(optionsFromFile)) {
       // Create a unique temporary directory for each set of vmOptions.
       // TODO(dart:429): Replace separate replaceAlls with a RegExp when
       // replaceAll(RegExp, String) is implemented.
       String optionsName = '';
       if (getVmOptions(optionsFromFile).length > 1) {
@@ skipping 55 matching lines @@
             if (configuration['csp']) {
               jsFile = '$nameNoExt.precompiled.js';
             }
             htmlContents = htmlContents.replaceAll('%TEST_SCRIPTS%',
               '<script src="$jsFile"></script>');
           }
           new File(htmlPath).writeAsStringSync(htmlContents);
         }
       } else {
         htmlPath = '$tempDir/test.html';
-        if (isWrappingRequired && !isWebTest) {
+        if (configuration['compiler'] != 'dart2js') {
           // test.dart will import the dart test.
-          if (configuration['use_browser_controller'] &&
-              configuration['runtime'] == 'dartium') {
-            _createWrapperFile(dartWrapperFilename, filePath);
-          } else {
-            _createWrapperFile(
-                dartWrapperFilename, filePath, useUnittestWrapper: true);
-          }
+          _createWrapperFile(dartWrapperFilename, filePath);
         } else {
           dartWrapperFilename = filename;
         }
 
         // Create the HTML file for the test.
         RandomAccessFile htmlTest =
             new File(htmlPath).openSync(mode: FileMode.WRITE);
 
         String scriptPath = dartWrapperFilename;
         if (compiler != 'none') {
@@ skipping 1001 matching lines @@
  * $pass tests are expected to pass
  * $failOk tests are expected to fail that we won't fix
  * $fail tests are expected to fail that we should fix
  * $crash tests are expected to crash that we should fix
  * $timeout tests are allowed to timeout
  * $compileErrorSkip tests are skipped on browsers due to compile-time error
 """;
     print(report);
    }
 }