Make Assets know their ID.

pkg/barback/test/utils.dart

Index: pkg/barback/test/utils.dart
diff --git a/pkg/barback/test/utils.dart b/pkg/barback/test/utils.dart
index 6542eccfdd6f8c8de9c19ac6a5705f6bd174fe30..15c999e688cdfe715d4774f2e9d62e78dc9b7634 100644
--- a/pkg/barback/test/utils.dart
+++ b/pkg/barback/test/utils.dart
@@ -131,7 +131,7 @@ void waitForBuild() {
     return _graph.results.first.then((result) {
       expect(result.succeeded, isTrue);
     });
-  });
+  }, "wait for build");
 }
 
 /// Schedules an expectation that the graph will deliver an asset matching
@@ -150,8 +150,7 @@ void expectAsset(String name, [String contents]) {
     return _graph.getAssetById(id).then((asset) {
       // TODO(rnystrom): Make an actual Matcher class for this.
       expect(asset, new isInstanceOf<MockAsset>());
-      expect(asset._id.package, equals(id.package));
-      expect(asset._id.path, equals(id.path));
+      expect(asset.id, equals(id));
       expect(asset._contents, equals(contents));
     });
   }, "get asset $name");
@@ -242,7 +241,7 @@ class MockProvider implements AssetProvider {
 
   void _modifyAsset(String name, String contents) {
     var id = new AssetId.parse(name);
-    var asset = _packages[id.package].firstWhere((a) => a._id == id);
+    var asset = _packages[id.package].firstWhere((a) => a.id == id);
     asset._contents = contents;
   }
 
@@ -266,7 +265,7 @@ class MockProvider implements AssetProvider {
       var package = _packages[id.package];
       if (package == null) throw new AssetNotFoundException(id);
 
-      return package.firstWhere((asset) => asset._id == id,
+      return package.firstWhere((asset) => asset.id == id,
           orElse: () => throw new AssetNotFoundException(id));
     });
   }
@@ -318,8 +317,8 @@ class RewriteTransformer extends Transformer {
     _wait = null;
   }
 
-  Future<bool> isPrimary(AssetId asset) {
-    return new Future.value(asset.extension == ".$from");
+  Future<bool> isPrimary(Asset asset) {
+    return new Future.value(asset.id.extension == ".$from");
   }
 
   Future apply(Transform transform) {
@@ -330,8 +329,7 @@ class RewriteTransformer extends Transformer {
       for (var extension in to.split(" ")) {
         var id = transform.primaryId.changeExtension(".$extension");
         var content = input.readAsString() + ".$extension";
-        transform.addOutput(id, new MockAsset(id, content));
-
+        transform.addOutput(new MockAsset(id, content));
       }
 
       if (_wait != null) return _wait.future;
@@ -357,8 +355,8 @@ class OneToManyTransformer extends Transformer {
   /// files at each of those paths.
   OneToManyTransformer(this.extension);
 
-  Future<bool> isPrimary(AssetId asset) {
-    return new Future.value(asset.extension == ".$extension");
+  Future<bool> isPrimary(Asset asset) {
+    return new Future.value(asset.id.extension == ".$extension");
   }
 
   Future apply(Transform transform) {
@@ -366,7 +364,7 @@ class OneToManyTransformer extends Transformer {
     return transform.primaryInput.then((input) {
       for (var line in input.readAsString().split(",")) {
         var id = new AssetId(transform.primaryId.package, line);
-        transform.addOutput(id, new MockAsset(id, "spread $extension"));
+        transform.addOutput(new MockAsset(id, "spread $extension"));
       }
     });
   }
@@ -390,8 +388,8 @@ class ManyToOneTransformer extends Transformer {
   /// files at each of those paths.
   ManyToOneTransformer(this.extension);
 
-  Future<bool> isPrimary(AssetId asset) {
-    return new Future.value(asset.extension == ".$extension");
+  Future<bool> isPrimary(Asset asset) {
+    return new Future.value(asset.id.extension == ".$extension");
   }
 
   Future apply(Transform transform) {
@@ -407,7 +405,7 @@ class ManyToOneTransformer extends Transformer {
       return Future.wait(inputs).then((inputs) {
         var id = transform.primaryId.changeExtension(".out");
         var contents = inputs.map((input) => input.readAsString()).join();
-        transform.addOutput(id, new MockAsset(id, contents));
+        transform.addOutput(new MockAsset(id, contents));
       });
     });
   }
@@ -426,13 +424,13 @@ class BadTransformer extends Transformer {
 
   BadTransformer(this.outputs);
 
-  Future<bool> isPrimary(AssetId asset) => new Future.value(true);
+  Future<bool> isPrimary(Asset asset) => new Future.value(true);
   Future apply(Transform transform) {
     return new Future(() {
       // Create the outputs first.
       for (var output in outputs) {
         var id = new AssetId.parse(output);
-        transform.addOutput(id, new MockAsset(id, output));
+        transform.addOutput(new MockAsset(id, output));
       }
 
       // Then fail.
@@ -443,15 +441,15 @@ class BadTransformer extends Transformer {
 
 /// An implementation of [Asset] that never hits the file system.
 class MockAsset implements Asset {
-  final AssetId _id;
+  final AssetId id;
   String _contents;
 
-  MockAsset(this._id, this._contents);
+  MockAsset(this.id, this._contents);
 
   String readAsString() => _contents;
   Stream<List<int>> read() => throw new UnimplementedError();
 
   serialize() => throw new UnimplementedError();
 
-  String toString() => "MockAsset $_id $_contents";
+  String toString() => "MockAsset $id $_contents";
 }