Consistently schedule operations in the barback tests.

pkg/barback/test/package_graph/source_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.source_test;
 
 import 'dart:async';
 
 import 'package:barback/barback.dart';
 import 'package:barback/src/utils.dart';
@@ skipping 43 matching lines @@
     buildShouldSucceed();
   });
 
   test("doesn't get a removed source", () {
     initGraph(["app|foo.txt"]);
 
     updateSources(["app|foo.txt"]);
     expectAsset("app|foo.txt");
     buildShouldSucceed();
 
-    schedule(() {
-      removeSources(["app|foo.txt"]);
-    });
-
+    removeSources(["app|foo.txt"]);
     expectNoAsset("app|foo.txt");
     buildShouldSucceed();
   });
 
   test("collapses redundant updates", () {
     var transformer = new RewriteTransformer("blub", "blab");
     initGraph(["app|foo.blub"], {"app": [[transformer]]});
 
     schedule(() {
       // Make a bunch of synchronous update calls.
-      updateSources(["app|foo.blub"]);
-      updateSources(["app|foo.blub"]);
-      updateSources(["app|foo.blub"]);
-      updateSources(["app|foo.blub"]);
+      updateSourcesSync(["app|foo.blub"]);
+      updateSourcesSync(["app|foo.blub"]);
+      updateSourcesSync(["app|foo.blub"]);
+      updateSourcesSync(["app|foo.blub"]);
     });
 
     expectAsset("app|foo.blab", "foo.blab");
     buildShouldSucceed();
 
-    schedule(() {
-      expect(transformer.numRuns, equals(1));
-    });
+    expect(transformer.numRuns, completion(equals(1)));
   });
 
   test("a removal cancels out an update", () {
     initGraph(["app|foo.txt"]);
 
     schedule(() {
-      updateSources(["app|foo.txt"]);
-      removeSources(["app|foo.txt"]);
+      updateSourcesSync(["app|foo.txt"]);
+      removeSourcesSync(["app|foo.txt"]);
     });
 
     expectNoAsset("app|foo.txt");
     buildShouldSucceed();
   });
 
   test("an update cancels out a removal", () {
     initGraph(["app|foo.txt"]);
 
     schedule(() {
-      removeSources(["app|foo.txt"]);
-      updateSources(["app|foo.txt"]);
+      removeSourcesSync(["app|foo.txt"]);
+      updateSourcesSync(["app|foo.txt"]);
     });
 
     expectAsset("app|foo.txt");
     buildShouldSucceed();
   });
 
   test("reloads an asset that's updated while loading", () {
     initGraph({"app|foo.txt": "foo"});
 
     pauseProvider();
-    schedule(() {
-      // The mock provider synchronously loads the value of the assets, so this
-      // will kick off two loads with different values. The second one should
-      // win.
-      updateSources(["app|foo.txt"]);
-      modifyAsset("app|foo.txt", "bar");
-      updateSources(["app|foo.txt"]);
-    });
+    // The mock provider synchronously loads the value of the assets, so this
+    // will kick off two loads with different values. The second one should
+    // win.
+    updateSources(["app|foo.txt"]);
+    modifyAsset("app|foo.txt", "bar");
+    updateSources(["app|foo.txt"]);
 
     resumeProvider();
     expectAsset("app|foo.txt", "bar");
     buildShouldSucceed();
   });
 
   test("restarts a build if a source is updated while sources are loading", () {
     var transformer = new RewriteTransformer("txt", "out");
     initGraph(["app|foo.txt", "app|other.bar"], {"app": [[transformer]]});
 
     // Run the whole graph so all nodes are clean.
     updateSources(["app|foo.txt", "app|other.bar"]);
     expectAsset("app|foo.out", "foo.out");
     expectAsset("app|other.bar");
 
     buildShouldSucceed();
 
     // Make the provider slow to load a source.
     pauseProvider();
 
-    schedule(() {
-      // Update an asset that doesn't trigger any transformers.
-      updateSources(["app|other.bar"]);
-    });
+    // Update an asset that doesn't trigger any transformers.
+    updateSources(["app|other.bar"]);
 
-    schedule(() {
-      // Now update an asset that does trigger a transformer.
-      updateSources(["app|foo.txt"]);
-    });
+    // Now update an asset that does trigger a transformer.
+    updateSources(["app|foo.txt"]);
 
     resumeProvider();
 
     buildShouldSucceed();
-    waitForBuild();
 
-    schedule(() {
-      expect(transformer.numRuns, equals(2));
-    });
+    expect(transformer.numRuns, completion(equals(2)));
   });
 }