move matchers to common test file

Author: jakemac53

test/asset/file_based_test.dart

@@ -2,20 +2,17 @@
 // 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.
 @TestOn('vm')
-import 'dart:async';
 import 'dart:io';
 
 import 'package:test/test.dart';
 
 import 'package:build/build.dart';
+
 import '../common/common.dart';
 
+final packageGraph = new PackageGraph.forPath('test/fixtures/basic_pkg');
+
 main() async {
-  final packageGraph = new PackageGraph.forPath('test/fixtures/basic_pkg');
-  final assetNotFoundException = new isInstanceOf<AssetNotFoundException>();
-  final invalidInputException = new isInstanceOf<InvalidInputException>();
-  final invalidOutputException = new isInstanceOf<InvalidOutputException>();
-  final packageNotFoundException = new isInstanceOf<PackageNotFoundException>();
 
   group('FileBasedAssetReader', () {
     final reader = new FileBasedAssetReader(packageGraph);

test/common/assets.dart

@@ -0,0 +1,35 @@
+// Copyright (c) 2016, 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.
+import 'package:build/build.dart';
+
+import 'in_memory_writer.dart';
+
+int _nextId = 0;
+AssetId makeAssetId([String assetIdString]) {
+  if (assetIdString == null) {
+    assetIdString = 'a|web/asset_$_nextId.txt';
+    _nextId++;
+  }
+  return new AssetId.parse(assetIdString);
+}
+
+Asset makeAsset([String assetIdString, String contents]) {
+  var id = makeAssetId(assetIdString);
+  return new Asset(id, contents ?? '$id');
+}
+
+Map<AssetId, Asset> makeAssets(Map<String, String> assetsMap) {
+  var assets = <AssetId, Asset>{};
+  assetsMap.forEach((idString, content) {
+    var asset = makeAsset(idString, content);
+    assets[asset.id] = asset;
+  });
+  return assets;
+}
+
+void addAssets(Iterable<Asset> assets, InMemoryAssetWriter writer) {
+  for (var asset in assets) {
+    writer.assets[asset.id] = asset.stringContents;
+  }
+}

test/common/common.dart

@@ -1,43 +1,12 @@
 // Copyright (c) 2016, 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.
-import 'package:build/build.dart';
-
-import 'in_memory_writer.dart';
-
+export 'assets.dart';
 export 'copy_builder.dart';
 export 'file_combiner_builder.dart';
 export 'in_memory_reader.dart';
 export 'in_memory_writer.dart';
 export 'generic_builder_transformer.dart';
+export 'matchers.dart';
 export 'stub_reader.dart';
 export 'stub_writer.dart';
-
-int _nextId = 0;
-AssetId makeAssetId([String assetIdString]) {
-  if (assetIdString == null) {
-    assetIdString = 'a|web/asset_$_nextId.txt';
-    _nextId++;
-  }
-  return new AssetId.parse(assetIdString);
-}
-
-Asset makeAsset([String assetIdString, String contents]) {
-  var id = makeAssetId(assetIdString);
-  return new Asset(id, contents ?? '$id');
-}
-
-Map<AssetId, Asset> makeAssets(Map<String, String> assetsMap) {
-  var assets = <AssetId, Asset>{};
-  assetsMap.forEach((idString, content) {
-    var asset = makeAsset(idString, content);
-    assets[asset.id] = asset;
-  });
-  return assets;
-}
-
-void addAssets(Iterable<Asset> assets, InMemoryAssetWriter writer) {
-  for (var asset in assets) {
-    writer.assets[asset.id] = asset.stringContents;
-  }
-}

test/common/matchers.dart

@@ -0,0 +1,11 @@
+// Copyright (c) 2016, 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.
+import 'package:test/test.dart';
+
+import 'package:build/build.dart';
+
+final assetNotFoundException = new isInstanceOf<AssetNotFoundException>();
+final invalidInputException = new isInstanceOf<InvalidInputException>();
+final invalidOutputException = new isInstanceOf<InvalidOutputException>();
+final packageNotFoundException = new isInstanceOf<PackageNotFoundException>();