tools: removed unused members, tiny cleanup

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 344 matching lines @@
     var sdk = configuration['use_sdk'] ? '-sdk' : '';
     var packages = configuration['use_public_packages']
         ? '-public_packages' : '';
     var dirName = "${configuration['compiler']}"
                   "$checked$minified$csp$packages$sdk";
     return createGeneratedTestDirectoryHelper(
         "compilations", dirName, testPath, "");
   }
 
   String createPubspecCheckoutDirectory(Path directoryOfPubspecYaml) {
-    var relativeDir = directoryOfPubspecYaml.relativeTo(TestUtils.dartDir);
     var sdk = configuration['use_sdk'] ? '-sdk' : '';
     var pkg = configuration['use_public_packages']
         ? 'public_packages' : 'repo_packages';
     return createGeneratedTestDirectoryHelper(
         "pubspec_checkouts", '$pkg$sdk', directoryOfPubspecYaml, "");
   }
 
   String createPubPackageBuildsDirectory(Path directoryOfPubspecYaml) {
-    var relativeDir = directoryOfPubspecYaml.relativeTo(TestUtils.dartDir);
     var pkg = configuration['use_public_packages']
         ? 'public_packages' : 'repo_packages';
     return createGeneratedTestDirectoryHelper(
         "pub_package_builds", pkg, directoryOfPubspecYaml, "");
   }
 
   /**
    * Helper function for discovering the packages in the dart repository.
    */
   Future<List> listDir(Path path, Function isValid) {
@@ skipping 384 matching lines @@
         return new Future.value(null);
       } else {
         var group = new FutureGroup();
         enqueueDirectory(dir, group);
         return group.future;
       }
     });
   }
 
   void enqueueDirectory(Directory dir, FutureGroup group) {
-    var listCompleter = new Completer();
-    group.add(listCompleter.future);
-
     var lister = dir.list(recursive: listRecursively)
-        .listen((FileSystemEntity fse) {
+        .forEach((FileSystemEntity fse) {

[ricow1, 2014/12/04 13:14:04]

.where((fse) => fse is File)
.forEach((fse) => enqueueFile(fse, group));

           if (fse is File) enqueueFile(fse.path, group);
-        },
-        onDone: listCompleter.complete);
+        });
+    group.add(lister);
   }
 
   void enqueueFile(String filename, FutureGroup group) {
     if (isHtmlTestFile(filename)) {
       var info = htmlTest.getInformation(filename);
       if (info == null) {
         DebugLogger.error(
             "HtmlTest $filename does not contain required annotations");
         return;
       }
@@ skipping 323 matching lines @@
                    port: serverPort,
                    path: pathComponent,
                    queryParameters: parameters);
   }
 
   void _createWrapperFile(String dartWrapperFilename,
                           Path localDartLibraryFilename) {
     File file = new File(dartWrapperFilename);
     RandomAccessFile dartWrapper = file.openSync(mode: FileMode.WRITE);
 
-    var usePackageImport = localDartLibraryFilename.segments().contains("pkg");
     var libraryPathComponent = _createUrlPathFromFile(localDartLibraryFilename);
     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
@@ skipping 52 matching lines @@
     final String compilationTempDir =
         createCompilationOutputDirectory(info.filePath);
 
     String dartWrapperFilename = '$tempDir/test.dart';
     String compiledDartWrapperFilename = '$compilationTempDir/test.js';
 
     String content = null;
     Path dir = filePath.directoryPath;
     String nameNoExt = filePath.filenameWithoutExtension;
 
-    Path pngPath = dir.append('$nameNoExt.png');
-    Path txtPath = dir.append('$nameNoExt.txt');
     String customHtmlPath = dir.append('$nameNoExt.html').toNativePath();
     File customHtml = new File(customHtmlPath);
 
     // 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 = []..addAll(baseCommands);
 
     // Use existing HTML document if available.
     String htmlPath;
     if (customHtml.existsSync()) {
@@ skipping 101 matching lines @@
     List<String> subtestNames =
         multitest ? info.optionsFromFile['subtestNames'] : [null];
     for (String subtestName in subtestNames) {
     // Construct the command that executes the browser test
       List<Command> commandSet = new List<Command>.from(commands);
 
       var htmlPath_subtest = _createUrlPathFromFile(new Path(htmlPath));
       var fullHtmlPath =
           _getUriForBrowserTest(htmlPath_subtest, subtestName).toString();
 
-      List<String> args = <String>[];
-
       if (runtime == "drt") {
         var dartFlags = [];
         var contentShellOptions = [];
 
         contentShellOptions.add('--no-timeout');
         contentShellOptions.add('--dump-render-tree');
 
         if (compiler == 'none' || compiler == 'dart2dart') {
           dartFlags.add('--ignore-unrecognized-flags');
           if (configuration["checked"]) {
@@ skipping 111 matching lines @@
         isNegative(info),
         fullHtmlPath);
     enqueueNewTestCase(testCase);
     return;
   }
 
   /** Helper to create a compilation command for a single input file. */
   Command _compileCommand(String inputFile, String outputFile,
       String compiler, String dir, optionsFromFile) {
     assert (['dart2js', 'dart2dart'].contains(compiler));
-    String executable;
     List<String> args;
     if (compilerPath.endsWith('.dart')) {
       // Run the compiler script via the Dart VM.
-      executable = dartVmBinaryFileName;
       args = [compilerPath];
     } else {
-      executable = compilerPath;
       args = [];
     }
     args.addAll(TestUtils.standardOptions(configuration));
     String packageRoot =
       packageRootArgument(optionsFromFile['packageRoot']);
     if (packageRoot != null) args.add(packageRoot);
     args.add('--out=$outputFile');
     if (configuration['csp']) args.add('--csp');
     args.add(inputFile);
     List<String> options = optionsFromFile['sharedOptions'];
@@ skipping 428 matching lines @@
               ['tests/lib/analyzer/analyze_library.status']);
 
   List<String> additionalOptions(Path filePath, {bool showSdkWarnings}) {
     var options = super.additionalOptions(filePath);
     // NOTE: This flag has been deprecated.
     options.add('--show-sdk-warnings');
     return options;
   }
 
   bool isTestFile(String filename) {
-    var sep = Platform.pathSeparator;
     // NOTE: We exclude tests and patch files for now.
     return filename.endsWith(".dart") &&
         !filename.endsWith("_test.dart") &&
         !filename.contains("_internal/compiler/js_lib");
   }
 
   bool get listRecursively => true;
 }
 
 
@@ skipping 83 matching lines @@
 
       localPackageDirectories.forEach(enqueueTestCase);
       localSampleDirectories.forEach(enqueueTestCase);
 
       doTest = null;
       // Notify we're done
       if (onDone != null) onDone();
     }
 
     doTest = onTest;
-    Map<String, String> _localPackageDirectories;
-    Map<String, String> _localSampleDirectories;
     List<String> statusFiles = [
         TestUtils.dartDir.join(new Path(statusFilePath)).toNativePath()];
     ReadTestExpectations(statusFiles, configuration).then((expectations) {
       Future.wait([discoverPackagesInRepository(),
                    discoverSamplesInRepository()]).then((List results) {
         Map packageDirectories = results[0];
         Map sampleDirectories = results[1];
         enqueueTestCases(packageDirectories, sampleDirectories, expectations);
       });
     });
@@ skipping 453 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);
   }
 }