| Index: sdk/lib/_internal/pub_generated/test/dependency_computer/utils.dart
 | 
| diff --git a/sdk/lib/_internal/pub_generated/test/dependency_computer/utils.dart b/sdk/lib/_internal/pub_generated/test/dependency_computer/utils.dart
 | 
| deleted file mode 100644
 | 
| index 33b1bf76431903a5d513c7ee192d423520a6a622..0000000000000000000000000000000000000000
 | 
| --- a/sdk/lib/_internal/pub_generated/test/dependency_computer/utils.dart
 | 
| +++ /dev/null
 | 
| @@ -1,129 +0,0 @@
 | 
| -// Copyright (c) 2014, the Dart project authors.  Please see the AUTHORS d.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 pub_tests;
 | 
| -
 | 
| -import 'package:barback/barback.dart';
 | 
| -import 'package:path/path.dart' as p;
 | 
| -import 'package:scheduled_test/scheduled_test.dart';
 | 
| -
 | 
| -import '../../lib/src/barback/cycle_exception.dart';
 | 
| -import '../../lib/src/barback/dependency_computer.dart';
 | 
| -import '../../lib/src/entrypoint.dart';
 | 
| -import '../../lib/src/io.dart';
 | 
| -import '../../lib/src/package.dart';
 | 
| -import '../../lib/src/package_graph.dart';
 | 
| -import '../../lib/src/source/path.dart';
 | 
| -import '../../lib/src/system_cache.dart';
 | 
| -import '../../lib/src/utils.dart';
 | 
| -import '../test_pub.dart';
 | 
| -
 | 
| -/// Expects that [DependencyComputer.transformersNeededByTransformers] will
 | 
| -/// return a graph matching [expected] when run on the package graph defined by
 | 
| -/// packages in the sandbox.
 | 
| -void expectDependencies(Map<String, Iterable<String>> expected) {
 | 
| -  expected = mapMap(expected, value: (_, ids) => ids.toSet());
 | 
| -
 | 
| -  schedule(() {
 | 
| -    var computer = new DependencyComputer(_loadPackageGraph());
 | 
| -    var result = mapMap(
 | 
| -        computer.transformersNeededByTransformers(),
 | 
| -        key: (id, _) => id.toString(),
 | 
| -        value: (_, ids) => ids.map((id) => id.toString()).toSet());
 | 
| -    expect(result, equals(expected));
 | 
| -  }, "expect dependencies to match $expected");
 | 
| -}
 | 
| -
 | 
| -/// Expects that [computeTransformersNeededByTransformers] will throw an
 | 
| -/// exception matching [matcher] when run on the package graph defiend by
 | 
| -/// packages in the sandbox.
 | 
| -void expectException(matcher) {
 | 
| -  schedule(() {
 | 
| -    expect(() {
 | 
| -      var computer = new DependencyComputer(_loadPackageGraph());
 | 
| -      computer.transformersNeededByTransformers();
 | 
| -    }, throwsA(matcher));
 | 
| -  }, "expect an exception: $matcher");
 | 
| -}
 | 
| -
 | 
| -/// Expects that [computeTransformersNeededByTransformers] will throw a
 | 
| -/// [CycleException] with the given [steps] when run on the package graph
 | 
| -/// defiend by packages in the sandbox.
 | 
| -void expectCycleException(Iterable<String> steps) {
 | 
| -  expectException(predicate((error) {
 | 
| -    expect(error, new isInstanceOf<CycleException>());
 | 
| -    expect(error.steps, equals(steps));
 | 
| -    return true;
 | 
| -  }, "cycle exception:\n${steps.map((step) => "  $step").join("\n")}"));
 | 
| -}
 | 
| -
 | 
| -/// Expects that [DependencyComputer.transformersNeededByLibrary] will return
 | 
| -/// transformer ids matching [expected] when run on the library identified by
 | 
| -/// [id].
 | 
| -void expectLibraryDependencies(String id, Iterable<String> expected) {
 | 
| -  expected = expected.toSet();
 | 
| -
 | 
| -  schedule(() {
 | 
| -    var computer = new DependencyComputer(_loadPackageGraph());
 | 
| -    var result = computer.transformersNeededByLibrary(
 | 
| -        new AssetId.parse(id)).map((id) => id.toString()).toSet();
 | 
| -    expect(result, equals(expected));
 | 
| -  }, "expect dependencies to match $expected");
 | 
| -}
 | 
| -
 | 
| -/// Loads a [PackageGraph] from the packages in the sandbox.
 | 
| -///
 | 
| -/// This graph will also include barback and its transitive dependencies from
 | 
| -/// the repo.
 | 
| -PackageGraph _loadPackageGraph() {
 | 
| -  // Load the sandbox packages.
 | 
| -  var packages = {};
 | 
| -
 | 
| -  var systemCache = new SystemCache(p.join(sandboxDir, cachePath));
 | 
| -  systemCache.sources
 | 
| -      ..register(new PathSource())
 | 
| -      ..setDefault('path');
 | 
| -  var entrypoint = new Entrypoint(p.join(sandboxDir, appPath), systemCache);
 | 
| -
 | 
| -  for (var package in listDir(sandboxDir)) {
 | 
| -    if (!fileExists(p.join(package, 'pubspec.yaml'))) continue;
 | 
| -    var packageName = p.basename(package);
 | 
| -    packages[packageName] =
 | 
| -        new Package.load(packageName, package, systemCache.sources);
 | 
| -  }
 | 
| -
 | 
| -  loadPackage(packageName) {
 | 
| -    if (packages.containsKey(packageName)) return;
 | 
| -    packages[packageName] =
 | 
| -        new Package.load(packageName, packagePath(packageName), systemCache.sources);
 | 
| -    for (var dep in packages[packageName].dependencies) {
 | 
| -      loadPackage(dep.name);
 | 
| -    }
 | 
| -  }
 | 
| -
 | 
| -  loadPackage('barback');
 | 
| -
 | 
| -  return new PackageGraph(entrypoint, null, packages);
 | 
| -}
 | 
| -
 | 
| -/// Returns the contents of a no-op transformer that imports each URL in
 | 
| -/// [imports].
 | 
| -String transformer([Iterable<String> imports]) {
 | 
| -  if (imports == null) imports = [];
 | 
| -
 | 
| -  var buffer =
 | 
| -      new StringBuffer()..writeln('import "package:barback/barback.dart";');
 | 
| -  for (var import in imports) {
 | 
| -    buffer.writeln('import "$import";');
 | 
| -  }
 | 
| -
 | 
| -  buffer.writeln("""
 | 
| -NoOpTransformer extends Transformer {
 | 
| -  bool isPrimary(AssetId id) => true;
 | 
| -  void apply(Transform transform) {}
 | 
| -}
 | 
| -""");
 | 
| -
 | 
| -  return buffer.toString();
 | 
| -}
 | 
| 
 |