cleanup to tools/testing/dart

tests/standalone/io/skipping_dart2js_compilations_test.dart

Index: tests/standalone/io/skipping_dart2js_compilations_test.dart
diff --git a/tests/standalone/io/skipping_dart2js_compilations_test.dart b/tests/standalone/io/skipping_dart2js_compilations_test.dart
index 0c907baef58214a5dbe257424d45f7239e019455..801854e0e45053e1ecae9852bcbb2b42f538691f 100644
--- a/tests/standalone/io/skipping_dart2js_compilations_test.dart
+++ b/tests/standalone/io/skipping_dart2js_compilations_test.dart
@@ -14,16 +14,17 @@
  * output (+deps file), dart application)
  */
 
-import 'package:expect/expect.dart';
-import 'package:path/path.dart';
 import 'dart:async';
 import 'dart:io';
-import '../../../tools/testing/dart/path.dart';
-import '../../../tools/testing/dart/test_suite.dart' as suite;
+
+import 'package:expect/expect.dart';
+import 'package:path/path.dart';
+
+import '../../../tools/testing/dart/lib/path.dart';
+import '../../../tools/testing/dart/lib/test_utils.dart';
+import '../../../tools/testing/dart/lib/command.dart' as command;
 import '../../../tools/testing/dart/test_runner.dart' as runner;
 import '../../../tools/testing/dart/test_options.dart' as options;
-import '../../../tools/testing/dart/status_file_parser.dart' as status;
-import '../../../tools/testing/dart/utils.dart';
 
 /**
  * This class is reponsible for setting up the files necessary for this test
@@ -56,7 +57,7 @@ class FileUtils {
     }
     if (createJsDeps) {
       testJsDeps = _createFile(testJsDepsFilePath);
-      var path = suite.TestUtils.absolutePath(new Path(tempDir.path))
+      var path = TestUtils.absolutePath(new Path(tempDir.path))
           .append("test.dart");
       _writeToFile(testJsDeps, "file://$path");
     }
@@ -78,27 +79,27 @@ class FileUtils {
   }
 
   Path get scriptOutputPath {
-    return suite.TestUtils.absolutePath(new Path(tempDir.path)
+    return TestUtils.absolutePath(new Path(tempDir.path)
         .append('created_if_command_did_run.txt'));
   }
 
   Path get testDartFilePath {
-    return suite.TestUtils.absolutePath(new Path(tempDir.path)
+    return TestUtils.absolutePath(new Path(tempDir.path)
         .append('test.dart'));
   }
 
   Path get testJsFilePath {
-    return suite.TestUtils.absolutePath(new Path(tempDir.path)
+    return TestUtils.absolutePath(new Path(tempDir.path)
         .append('test.js'));
   }
 
   Path get testJsDepsFilePath {
-    return suite.TestUtils.absolutePath(new Path(tempDir.path)
+    return TestUtils.absolutePath(new Path(tempDir.path)
         .append('test.js.deps'));
   }
 
   Path get testSnapshotFilePath {
-    return suite.TestUtils.absolutePath(new Path(tempDir.path)
+    return TestUtils.absolutePath(new Path(tempDir.path)
         .append('test_dart2js.snapshot'));
   }
 
@@ -133,7 +134,7 @@ class CommandCompletedHandler {
 
   CommandCompletedHandler(FileUtils this.fileUtils, bool this._shouldHaveRun);
 
-  void processCompletedTest(runner.CommandOutput output) {
+  void processCompletedTest(command.CommandOutput output) {
     Expect.isTrue(output.exitCode == 0);
     Expect.isTrue(output.stderr.length == 0);
     if (_shouldHaveRun) {
@@ -147,7 +148,7 @@ class CommandCompletedHandler {
   }
 }
 
-runner.Command makeCompilationCommand(String testName, FileUtils fileUtils) {
+command.Command makeCompilationCommand(String testName, FileUtils fileUtils) {
   var config = new options.TestOptionsParser().parse(['--timeout', '2'])[0];
   var createFileScript = Platform.script
       .resolve('skipping_dart2js_compilations_helper.dart').toFilePath();
@@ -155,7 +156,7 @@ runner.Command makeCompilationCommand(String testName, FileUtils fileUtils) {
   var arguments = [createFileScript, fileUtils.scriptOutputPath.toNativePath()];
   var bootstrapDeps = [
       Uri.parse("file://${fileUtils.testSnapshotFilePath}")];
-  return runner.CommandBuilder.instance.getCompilationCommand(
+  return command.CommandBuilder.instance.getCompilationCommand(
       'dart2js',
       fileUtils.testJsFilePath.toNativePath(),
       false,