Simplify Command classes.

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,
  *   and creating [TestCase]s for those files that meet the relevant criteria.
  * - Preparing tests, including copying files and frameworks to temporary
  *   directories, and computing the command line and arguments to be run.
  */
 import 'dart:async';
 import 'dart:io';
 
 import 'browser_test.dart';
+import 'command.dart';
 import 'compiler_configuration.dart';
 import 'configuration.dart';
 import 'drt_updater.dart';
 import 'expectation.dart';
 import 'expectation_set.dart';
 import 'html_test.dart' as html_test;
 import 'http_server.dart';
 import 'multitest.dart';
 import 'path.dart';
 import 'summary_report.dart';
@@ skipping 439 matching lines @@
 
     var args = configuration.standardOptions.toList();
     if (configuration.compilerConfiguration.useDfe) {
       args.add('--use-dart-frontend');
       // '--dfe' has to be the first argument for run_vm_test to pick it up.
       args.insert(0, '--dfe=$buildDir/gen/kernel-service.dart.snapshot');
     }
 
     args.add(testName);
 
-    var command = CommandBuilder.instance.getProcessCommand(
+    var command = Command.process(
         'run_vm_unittest', targetRunnerPath, args, environmentOverrides);
     enqueueNewTestCase(
         new TestCase(constructedName, [command], configuration, expectations));
   }
 
   Future<Null> forEachTest(Function onTest, Map testCache,
       [VoidFunction onDone]) async {
     doTest = onTest;
     var statusFiles =
         statusFilePaths.map((statusFile) => "$dartDir/$statusFile").toList();
@@ skipping 398 matching lines @@
       for (var name in otherResources) {
         var namePath = new Path(name);
         var fromPath = info.filePath.directoryPath.join(namePath);
         new File('$tempDir/$name').parent.createSync(recursive: true);
         new File(fromPath.toNativePath()).copySync('$tempDir/$name');
       }
     }
 
     CommandArtifact compilationArtifact =
         compilerConfiguration.computeCompilationArtifact(
-            buildDir,
-            tempDir,
-            CommandBuilder.instance,
-            compileTimeArguments,
-            environmentOverrides);
+            buildDir, tempDir, compileTimeArguments, environmentOverrides);
     if (!configuration.skipCompilation) {
       commands.addAll(compilationArtifact.commands);
     }
 
     if (expectCompileError(info) && compilerConfiguration.hasCompiler) {
       // Do not attempt to run the compiled result. A compilation
       // error should be reported by the compilation command.
       return commands;
     }
 
     List<String> runtimeArguments =
         compilerConfiguration.computeRuntimeArguments(
             configuration.runtimeConfiguration,
             buildDir,
             info,
             vmOptions,
             sharedOptions,
             args,
             compilationArtifact);
 
     return commands
       ..addAll(configuration.runtimeConfiguration.computeRuntimeCommands(
-          this,
-          CommandBuilder.instance,
-          compilationArtifact,
-          runtimeArguments,
-          environmentOverrides));
+          this, compilationArtifact, runtimeArguments, environmentOverrides));
   }
 
   CreateTest makeTestCaseCreator(Map<String, dynamic> optionsFromFile) {
     return (Path filePath, Path originTestPath, bool hasCompileError,
         bool hasRuntimeError,
         {bool isNegativeIfChecked: false,
         bool hasCompileErrorIfChecked: false,
         bool hasStaticWarning: false,
         String multitestKey}) {
       // Cache the test information for each test case.
@@ skipping 262 matching lines @@
 
         if (configuration.compiler == Compiler.none) {
           dartFlags.add('--ignore-unrecognized-flags');
           if (configuration.isChecked) {
             dartFlags.add('--enable_asserts');
             dartFlags.add("--enable_type_checks");
           }
           dartFlags.addAll(vmOptions);
         }
 
-        commandSet.add(CommandBuilder.instance.getContentShellCommand(
-            contentShellFilename,
-            fullHtmlPath,
-            contentShellOptions,
-            dartFlags,
-            environmentOverrides));
+        commandSet.add(Command.contentShell(contentShellFilename, fullHtmlPath,
+            contentShellOptions, dartFlags, environmentOverrides));
       } else {
-        commandSet.add(CommandBuilder.instance.getBrowserTestCommand(
-            fullHtmlPath, configuration, !isNegative(info)));
+        commandSet.add(Command.browserTest(fullHtmlPath, configuration,
+            retry: !isNegative(info)));
       }
 
       // Create BrowserTestCase and queue it.
       var fullTestName = multitest ? '$testName/$subtestName' : testName;
       var expectation = (multitest ? expectations[fullTestName] : expectations)
           as Set<Expectation>;
       var testCase = new BrowserTestCase('$suiteName/$fullTestName', commandSet,
           configuration, expectation, info, isNegative(info), fullHtmlPath);
 
       enqueueNewTestCase(testCase);
@@ skipping 58 matching lines @@
               script.toFilePath(), destination, tempDir, info.optionsFromFile));
         }
       }
     }
 
     var htmlFile = tempUri.resolve(filePath.filename);
     new File.fromUri(htmlFile).writeAsStringSync(contents);
 
     var htmlPath = _createUrlPathFromFile(new Path(htmlFile.toFilePath()));
     var fullHtmlPath = _getUriForBrowserTest(htmlPath, null).toString();
-    commands.add(CommandBuilder.instance.getBrowserHtmlTestCommand(
-        fullHtmlPath, configuration, info.expectedMessages, !isNegative(info)));
+    commands.add(Command.browserHtmlTest(
+        fullHtmlPath, configuration, info.expectedMessages,
+        retry: !isNegative(info)));
     var testDisplayName = '$suiteName/$testName';
     var testCase = new BrowserTestCase(testDisplayName, commands, configuration,
         expectations, info, isNegative(info), fullHtmlPath);
     enqueueNewTestCase(testCase);
   }
 
   /** Helper to create a compilation command for a single input file. */
   Command _compileCommand(String inputFile, String outputFile, String dir,
       Map<String, dynamic> optionsFromFile) {
     var args = <String>[];
 
     if (compilerPath.endsWith('.dart')) {
       // Run the compiler script via the Dart VM.
       args.add(compilerPath);
     }
 
     args.addAll(configuration.standardOptions);
 
     var packages = packagesArgument(optionsFromFile['packageRoot'] as String,
         optionsFromFile['packages'] as String);
     if (packages != null) args.add(packages);
 
     args.add('--out=$outputFile');
     args.add(inputFile);
 
     var options = optionsFromFile['sharedOptions'] as List<String>;
     if (options != null) args.addAll(options);
 
-    return CommandBuilder.instance.getCompilationCommand(
-        Compiler.dart2js.name,
-        outputFile,
-        !useSdk,
-        dart2JsBootstrapDependencies,
-        compilerPath,
-        args,
-        environmentOverrides);
+    return Command.compilation(Compiler.dart2js.name, outputFile, !useSdk,
+        dart2JsBootstrapDependencies, compilerPath, args, environmentOverrides);
   }
 
   /** Helper to create a Polymer deploy command for a single HTML file. */
   Command _polymerDeployCommand(String inputFile, String outputDir,
       Map<String, dynamic> optionsFromFile) {
     var args = <String>[];
     var packages = packagesArgument(optionsFromFile['packageRoot'] as String,
         optionsFromFile['packages'] as String);
     if (packages != null) args.add(packages);
     args
       ..add('package:polymer/deploy.dart')
       ..add('--test')
       ..add(inputFile)
       ..add('--out')
       ..add(outputDir)
       ..add('--file-filter')
       ..add('.svn');
     if (configuration.isCsp) args.add('--csp');
 
-    return CommandBuilder.instance.getProcessCommand(
+    return Command.process(
         'polymer_deploy', dartVmBinaryFileName, args, environmentOverrides);
   }
 
   String get scriptType {
     switch (configuration.compiler) {
       case Compiler.none:
         return 'application/dart';
       case Compiler.dart2js:
       case Compiler.dart2analyzer:
         return 'text/javascript';
@@ skipping 363 matching lines @@
     var customHtmlPath = dir.append('$nameNoExt.html');
     var customHtml = new File(customHtmlPath.toNativePath());
     if (!customHtml.existsSync()) {
       super.enqueueBrowserTest(
           packageRoot, packages, info, testName, expectations);
     } else {
       var relativeHtml = customHtmlPath.relativeTo(TestUtils.dartDir);
       var fullPath = _createUrlPathFromFile(customHtmlPath);
 
       var commands = [
-        CommandBuilder.instance
-            .getBrowserTestCommand(fullPath, configuration, !isNegative(info))
+        Command.browserTest(fullPath, configuration, retry: !isNegative(info))
       ];
       var testDisplayName = '$suiteName/$testName';
       enqueueNewTestCase(new BrowserTestCase(
           testDisplayName,
           commands,
           configuration,
           expectations as Set<Expectation>,
           info,
           isNegative(info),
           relativeHtml.toNativePath()));
@@ skipping 50 matching lines @@
 
   bool isTestFile(String filename) {
     // NOTE: We exclude tests and patch files for now.
     return filename.endsWith(".dart") &&
         !filename.endsWith("_test.dart") &&
         !filename.contains("_internal/js_runtime/lib");
   }
 
   bool get listRecursively => true;
 }