Implement testing support for "--compiler=none --runtime=dartium"

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 694 matching lines @@
         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);
         }
@@ skipping 185 matching lines @@
 
     var local_ip = configuration['local_ip'];
     var url= 'http://$local_ip:$serverPort$pathComponent'
         '?crossOriginPort=$crossOriginPort';
     if (info.optionsFromFile['isMultiHtmlTest'] && subtestNames.length > 0) {
       url= '${url}&group=${subtestNames[subtestIndex]}';
     }
     return url;
   }
 
-  void _createWrapperFile(String dartWrapperFilename, dartLibraryFilename) {
+  void _createWrapperFile(String dartWrapperFilename,
+                          Path dartLibraryFilename,
+                          {bool useUnittestWrapper: false}) {
     File file = new File(dartWrapperFilename);
     RandomAccessFile dartWrapper = file.openSync(mode: FileMode.WRITE);
 
     var usePackageImport = dartLibraryFilename.segments().contains("pkg");
     var libraryPathComponent = _createUrlPathFromFile(dartLibraryFilename);
-    dartWrapper.writeStringSync(dartTestWrapper(usePackageImport,
-                                                libraryPathComponent));
+    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);
+    }
+
+    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
@@ skipping 42 matching lines @@
       File customHtml = new File(customHtmlPath);
       Path expectedOutput = null;
 
       // Construct the command(s) that compile all the inputs needed by the
       // browser test. For running Dart in DRT, this will be noop commands.
       List<Command> commands = [];
 
       // Use existing HTML document if available.
       String htmlPath;
       if (customHtml.existsSync()) {
-
         // If necessary, run the Polymer deploy steps.
         // TODO(jmesserly): this should be generalized for any tests that
         // require Pub deploy, not just polymer.
         if (customHtml.readAsStringSync().contains('polymer/boot.js')) {
           if (compiler != 'none') {
             commands.add(_polymerDeployCommand(
                 customHtmlPath, tempDir, optionsFromFile));
 
             htmlPath = '$tempDir/test/$nameNoExt.html';
             dartWrapperFilename = '${htmlPath}_bootstrap.dart';
@@ skipping 20 matching lines @@
             }
             htmlContents = htmlContents.replaceAll('%TEST_SCRIPTS%',
               '<script src="$jsFile"></script>');
           }
           new File(htmlPath).writeAsStringSync(htmlContents);
         }
       } else {
         htmlPath = '$tempDir/test.html';
         if (isWrappingRequired && !isWebTest) {
           // test.dart will import the dart test.
-          _createWrapperFile(dartWrapperFilename, filePath);
+          if (configuration['use_browser_controller'] &&
+              configuration['runtime'] == 'dartium') {
+            _createWrapperFile(dartWrapperFilename, filePath);
+          } else {
+            _createWrapperFile(

[ricow1, 2013/10/02 18:17:47]

is this basically drt now?

[kustermann, 2013/10/03 11:06:02]

Yes it is -- or rather content_shell.

I'll remove this unittest-based wrapping here as well (if the print forwarding
works on content_shell as well)

+                dartWrapperFilename, filePath, useUnittestWrapper: true);
+          }
         } 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 1011 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);
    }
 }