cleanup to tools/testing/dart

tests/standalone/io/skipping_dart2js_compilations_test.dart

 // Copyright (c) 2013, 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.
 
 /*
  * This test makes sure that the "skipping Dart2Js compilations if the output is
  * already up to date" feature does work as it should.
  * Therefore this test ensures that compilations are only skipped if the last
  * modified date of the output of a dart2js compilation is newer than
  *   - the the dart application to compile (including it's dependencies)
  *   - the dart2js snapshot
  * Furtheremore it ensure that a compilations is not skipped if any of the
  * necessary files could not be found (dart2js snapshots, previous dart2js
  * output (+deps file), dart application)
  */
 
+import 'dart:async';
+import 'dart:io';
+
 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 '../../../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
  * as well as touching a file.
  */
 class FileUtils {
   Directory tempDir;
   File testJs;
   File testJsDeps;
   File testDart;
@@ skipping 12 matching lines @@
     if (createSnapshot) {
       testSnapshot = _createFile(testSnapshotFilePath);
       _writeToFile(testSnapshot, "dart2js snapshot");
     }
     if (createDart) {
       testDart = _createFile(testDartFilePath);
       _writeToFile(testDart, "dart code");
     }
     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");
     }
   }
 
   void cleanup() {
     if (testJs != null) testJs.deleteSync();
     if (testJsDeps != null) testJsDeps.deleteSync();
     if (testDart != null) testDart.deleteSync();
     if (testSnapshot != null) testSnapshot.deleteSync();
 
     // if the script did run, it created this file, so we need to delete it
     File file = new File(scriptOutputPath.toNativePath());
     if (file.existsSync()) {
       file.deleteSync();
     }
 
     tempDir.deleteSync();
   }
 
   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'));
   }
 
   void touchFile(File file) {
     _writeToFile(file, _readFile(file));
   }
 
   void _writeToFile(File file, String content) {
     if (content != null) {
       var fd = new File(file.resolveSymbolicLinksSync())
@@ skipping 14 matching lines @@
   }
 }
 
 class CommandCompletedHandler {
   FileUtils fileUtils;
   DateTime _expectedTimestamp;
   bool _shouldHaveRun;
 
   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) {
       Expect.isTrue(output.stdout.length == 0);
       Expect.isTrue(new File(fileUtils.scriptOutputPath.toNativePath())
           .existsSync());
     } else {
       Expect.isFalse(new File(fileUtils.scriptOutputPath.toNativePath())
           .existsSync());
     }
   }
 }
 
-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();
   var executable = Platform.executable;
   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,
       bootstrapDeps,
       executable,
       arguments, {});
 }
 
 void main() {
   var fs_noTestJs = new FileUtils(createJs: false,
@@ skipping 68 matching lines @@
       cleanup();
       throw error;
     }).then((_) {
       cleanup();
     });
   }
   // We need to wait some time to make sure that the files we 'touch' get a
   // bigger timestamp than the old ones
   new Timer(new Duration(seconds: 1), touchFilesAndRunTests);
 }