Clean up test_runner Command subclass hash/equality.

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 104 matching lines @@
  * object for each test to be run, and passes the test cases to a callback.
  *
  * Most TestSuites represent a directory or directory tree containing tests,
  * and a status file containing the expected results when these tests are run.
  */
 abstract class TestSuite {
   final Map configuration;
   final String suiteName;
   // This function is set by subclasses before enqueueing starts.
   Function doTest;
+  Map<String, String> _environmentOverrides;
 
-
-  TestSuite(this.configuration, this.suiteName);
-
-  Map<String, String> get environmentOverrides {
-    return {
-      'DART_CONFIGURATION' : TestUtils.configurationDir(configuration),
+  TestSuite(this.configuration, this.suiteName) {
+    _environmentOverrides = {
+        'DART_CONFIGURATION' : TestUtils.configurationDir(configuration)
     };
   }
 
+  Map<String, String> get environmentOverrides => _environmentOverrides;
+
   /**
    * Whether or not binaries should be found in the root build directory or
    * in the built SDK.
    */
   bool get useSdk {
     // The pub suite always uses the SDK.
     // TODO(rnystrom): Eventually, all test suites should run out of the SDK
     // and this check should go away.
     // TODO(ahe): This check is broken for several reasons:
     // First, it is not true that all tests should be running out of the
@@ skipping 444 matching lines @@
  */
 class StandardTestSuite extends TestSuite {
   final Path suiteDir;
   final List<String> statusFilePaths;
   TestExpectations testExpectations;
   List<TestInformation> cachedTests;
   final Path dartDir;
   Predicate<String> isTestFilePredicate;
   final bool listRecursively;
   final extraVmOptions;
+  List<Uri> _dart2JsBootstrapDependencies;
 
   StandardTestSuite(Map configuration,
                     String suiteName,
                     Path suiteDirectory,
                     this.statusFilePaths,
                     {this.isTestFilePredicate,
                     bool recursive: false})
-  : super(configuration, suiteName),
-    dartDir = TestUtils.dartDir,
-    listRecursively = recursive,
-    suiteDir = TestUtils.dartDir.join(suiteDirectory),
-    extraVmOptions = TestUtils.getExtraVmOptions(configuration);
+      : super(configuration, suiteName),
+        dartDir = TestUtils.dartDir,
+        listRecursively = recursive,
+        suiteDir = TestUtils.dartDir.join(suiteDirectory),
+        extraVmOptions = TestUtils.getExtraVmOptions(configuration) {
+    if (!useSdk) {
+      _dart2JsBootstrapDependencies = [];
+    } else {
+      var snapshotPath = TestUtils.absolutePath(new Path(buildDir).join(
+          new Path('dart-sdk/bin/snapshots/'
+                   'utils_wrapper.dart.snapshot'))).toString();
+      _dart2JsBootstrapDependencies =
+          [new Uri(scheme: 'file', path: snapshotPath)];
+    }
+  }
 
   /**
    * Creates a test suite whose file organization matches an expected structure.
    * To use this, your suite should look like:
    *
    *     dart/
    *       path/
    *         to/
    *           mytestsuite/
    *             mytestsuite.status
@@ skipping 23 matching lines @@
                         '$directory/${name}_analyzer.status',
                         '$directory/${name}_analyzer2.status'];
 
     return new StandardTestSuite(configuration,
         name, directory,
         status_paths,
         isTestFilePredicate: (filename) => filename.endsWith('_test.dart'),
         recursive: true);
   }
 
-  List<Uri> get dart2JsBootstrapDependencies {
-    if (!useSdk) return [];
-
-    var snapshotPath = TestUtils.absolutePath(new Path(buildDir).join(
-        new Path('dart-sdk/bin/snapshots/'
-                 'utils_wrapper.dart.snapshot'))).toString();
-    return [new Uri(scheme: 'file', path: snapshotPath)];
-  }
+  List<Uri> get dart2JsBootstrapDependencies => _dart2JsBootstrapDependencies;
 
   /**
    * The default implementation assumes a file is a test if
    * it ends in "Test.dart".
    */
   bool isTestFile(String filename) {
     // Use the specified predicate, if provided.
     if (isTestFilePredicate != null) return isTestFilePredicate(filename);
 
     return filename.endsWith("Test.dart");
@@ skipping 1661 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);
   }
 }