Fix analyzer hints and warnings in test/.

test/version_solver_test.dart

 // Copyright (c) 2012, 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 pub_upgrade_test;
 
 import 'dart:async';
 
 import 'package:pub/src/lock_file.dart';
 import 'package:pub/src/log.dart' as log;
 import 'package:pub/src/package.dart';
 import 'package:pub/src/pubspec.dart';
 import 'package:pub/src/sdk.dart' as sdk;
 import 'package:pub/src/solver/version_solver.dart';
 import 'package:pub/src/source/cached.dart';
 import 'package:pub/src/system_cache.dart';
 import 'package:pub/src/utils.dart';
 import 'package:pub_semver/pub_semver.dart';
 import 'package:test/test.dart';
 
-import 'test_pub.dart';
-
 MockSource source1;
 MockSource source2;
 
 main() {
   // Uncomment this to debug failing tests.
   // log.verbosity = log.Verbosity.SOLVER;
 
   // Since this test isn't run from the SDK, it can't find the "version" file
   // to load. Instead, just manually inject a version.
   sdk.version = new Version(1, 2, 3);
@@ skipping 1070 matching lines @@
     'a 2.0.0-dev.3': {}
   }, result: {
     'myapp from root': '0.0.0',
     'a': '2.0.0-dev.1'
   }, downgrade: true);
 }
 
 testResolve(String description, Map packages, {
     Map lockfile, Map overrides, Map result, FailMatcherBuilder error,
     int maxTries, bool downgrade: false}) {
-  _testResolve(test, description, packages, lockfile: lockfile,
-      overrides: overrides, result: result, error: error, maxTries: maxTries,
-      downgrade: downgrade);
-}
-
-solo_testResolve(String description, Map packages, {
-    Map lockfile, Map overrides, Map result, FailMatcherBuilder error,
-    int maxTries, bool downgrade: false}) {
-  log.verbosity = log.Verbosity.SOLVER;
-  _testResolve(solo_test, description, packages, lockfile: lockfile,
-      overrides: overrides, result: result, error: error, maxTries: maxTries,
-      downgrade: downgrade);
-}
-
-_testResolve(void testFn(String description, Function body),
-    String description, Map packages, {
-    Map lockfile, Map overrides, Map result, FailMatcherBuilder error,
-    int maxTries, bool downgrade: false}) {
   if (maxTries == null) maxTries = 1;
 
-  testFn(description, () {
+  test(description, () {
     var cache = new SystemCache('.');
     source1 = new MockSource('mock1');
     source2 = new MockSource('mock2');
     cache.register(source1);
     cache.register(source2);
     cache.sources.setDefault(source1.name);
 
     // Build the test package graph.
     var root;
     packages.forEach((description, dependencies) {
@@ skipping 288 matching lines @@
       return _packages[id.description][id.version].pubspec;
     });
   }
 
   Future<Package> downloadToSystemCache(PackageId id) =>
       throw new UnsupportedError('Cannot download mock packages');
 
   List<Package> getCachedPackages() =>
       throw new UnsupportedError('Cannot get mock packages');
 
-  Future<Pair<List<Package>, List<Package>>> repairCachedPackages() =>
+  Future<Pair<List<PackageId>, List<PackageId>>> repairCachedPackages() =>
       throw new UnsupportedError('Cannot repair mock packages');
 
   void addPackage(String description, Package package) {
     _packages.putIfAbsent(description, () => new Map<Version, Package>());
     _packages[description][package.version] = package;
   }
 }
 
 Package mockPackage(PackageId id, Map dependencyStrings, Map overrides) {
   var sdkConstraint = null;
@@ skipping 81 matching lines @@
   }
 
   var source = "mock1";
   if (match[7] != null) {
     source = match[7];
     if (source == "root") source = null;
   }
 
   return new PackageId(name, source, parsedVersion, description);
 }