Refactor the barback tests somewhat.

pkg/barback/test/package_graph/transform_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.
 
 library barback.test.package_graph.transform_test;
 
 import 'dart:async';
 
 import 'package:barback/barback.dart';
+import 'package:barback/src/utils.dart';
 import 'package:scheduled_test/scheduled_test.dart';
 
 import '../utils.dart';
 
 main() {
   initConfig();
   test("gets a transformed asset with a different path", () {
     initGraph(["app|foo.blub"], {"app": [
       [new RewriteTransformer("blub", "blab")]
     ]});
@@ skipping 77 matching lines @@
     schedule(() {
       expect(transformer.numRuns, equals(1));
     });
   });
 
   test("runs transforms in the same phase in parallel", () {
     var transformerA = new RewriteTransformer("txt", "a");
     var transformerB = new RewriteTransformer("txt", "b");
     initGraph(["app|foo.txt"], {"app": [[transformerA, transformerB]]});
 
-    transformerA.wait();
-    transformerB.wait();
+    transformerA.pauseApply();
+    transformerB.pauseApply();
 
     schedule(() {
       updateSources(["app|foo.txt"]);
 
       // Wait for them both to start.
       return Future.wait([transformerA.started, transformerB.started]);
     });
 
     schedule(() {
       // They should both still be running.
       expect(transformerA.isRunning, isTrue);
       expect(transformerB.isRunning, isTrue);
 
-      transformerA.complete();
-      transformerB.complete();
+      transformerA.resumeApply();
+      transformerB.resumeApply();
     });
 
     expectAsset("app|foo.a", "foo.a");
     expectAsset("app|foo.b", "foo.b");
     buildShouldSucceed();
   });
 
   test("does not reapply transform when inputs are not modified", () {
     var transformer = new RewriteTransformer("blub", "blab");
     initGraph(["app|foo.blub"], {"app": [[transformer]]});
@@ skipping 45 matching lines @@
       "app|a.inc": "a",
       "app|b.inc": "b"
     }, {"app": [[transformer]]});
 
     updateSources(["app|a.txt", "app|a.inc", "app|b.inc"]);
 
     expectAsset("app|a.out", "ab");
     buildShouldSucceed();
 
     // Remove the dependency on the non-primary input.
-    schedule(() {
-      modifyAsset("app|a.txt", "a.inc");
-      updateSources(["app|a.txt"]);
-    });
+    modifyAsset("app|a.txt", "a.inc");
+    schedule(() => updateSources(["app|a.txt"]));
 
     // Process it again.
     expectAsset("app|a.out", "a");
     buildShouldSucceed();
 
     // Now touch the removed input. It should not trigger another build.
     schedule(() {
       updateSources(["app|b.inc"]);
     });
 
@@ skipping 60 matching lines @@
 
     schedule(() {
       removeSources(["app|foo.txt"]);
     });
 
     expectNoAsset("app|foo.out");
     buildShouldSucceed();
   });
 
   test("reapplies a transform when a non-primary input changes", () {
-   initGraph({
+    initGraph({
       "app|a.txt": "a.inc",
       "app|a.inc": "a"
     }, {"app": [[new ManyToOneTransformer("txt")]]});
 
     updateSources(["app|a.txt", "app|a.inc"]);
     expectAsset("app|a.out", "a");
     buildShouldSucceed();
 
-    schedule(() {
-      modifyAsset("app|a.inc", "after");
-      updateSources(["app|a.inc"]);
-    });
+    modifyAsset("app|a.inc", "after");
+    schedule(() => updateSources(["app|a.inc"]));
 
     expectAsset("app|a.out", "after");
     buildShouldSucceed();
   });
 
   test("restarts processing if a change occurs during processing", () {
     var transformer = new RewriteTransformer("txt", "out");
     initGraph(["app|foo.txt"], {"app": [[transformer]]});
 
-    transformer.wait();
+    transformer.pauseApply();
 
     schedule(() {
       updateSources(["app|foo.txt"]);
 
       // Wait for the transform to start.
       return transformer.started;
     });
 
     schedule(() {
       // Now update the graph during it.
       updateSources(["app|foo.txt"]);
-    });
-
-    schedule(() {
-      transformer.complete();
+      transformer.resumeApply();
     });
 
     expectAsset("app|foo.out", "foo.out");
     buildShouldSucceed();
 
     schedule(() {
       expect(transformer.numRuns, equals(2));
     });
   });
 
   test("handles an output moving from one transformer to another", () {
     // In the first run, "shared.out" is created by the "a.a" transformer.
     initGraph({
       "app|a.a": "a.out,shared.out",
       "app|b.b": "b.out"
     }, {"app": [
       [new OneToManyTransformer("a"), new OneToManyTransformer("b")]
     ]});
 
     updateSources(["app|a.a", "app|b.b"]);
 
     expectAsset("app|a.out", "spread a");
     expectAsset("app|b.out", "spread b");
     expectAsset("app|shared.out", "spread a");
     buildShouldSucceed();
 
     // Now switch their contents so that "shared.out" will be output by "b.b"'s
     // transformer.
-    schedule(() {
-      modifyAsset("app|a.a", "a.out");
-      modifyAsset("app|b.b", "b.out,shared.out");
-      updateSources(["app|a.a", "app|b.b"]);
-    });
+    modifyAsset("app|a.a", "a.out");
+    modifyAsset("app|b.b", "b.out,shared.out");
+    schedule(() => updateSources(["app|a.a", "app|b.b"]));
 
     expectAsset("app|a.out", "spread a");
     expectAsset("app|b.out", "spread b");
     expectAsset("app|shared.out", "spread b");
     buildShouldSucceed();
   });
 
   test("restarts before finishing later phases when a change occurs", () {
     var txtToInt = new RewriteTransformer("txt", "int");
     var intToOut = new RewriteTransformer("int", "out");
     initGraph(["app|foo.txt", "app|bar.txt"],
         {"app": [[txtToInt], [intToOut]]});
 
-    txtToInt.wait();
+    txtToInt.pauseApply();
 
     schedule(() {
       updateSources(["app|foo.txt"]);
 
       // Wait for the first transform to start.
       return txtToInt.started;
     });
 
     schedule(() {
       // Now update the graph during it.
       updateSources(["app|bar.txt"]);
     });
 
     schedule(() {
-      txtToInt.complete();
+      txtToInt.resumeApply();
     });
 
     expectAsset("app|foo.out", "foo.int.out");
     expectAsset("app|bar.out", "bar.int.out");
     buildShouldSucceed();
 
     schedule(() {
       // Should only have run each transform once for each primary.
       expect(txtToInt.numRuns, equals(2));
       expect(intToOut.numRuns, equals(2));
@@ skipping 44 matching lines @@
     schedule(() => updateSources(["pkg2|foo.txt"]));
     expectAsset("pkg1|foo.out", "foo.out");
     buildShouldNotBeDone();
 
     // Now that the provider is unpaused, pkg2's transforms finish and the
     // overall build succeeds.
     resumeProvider();
     buildShouldSucceed();
   });
 }