Fix analyzer hints and warnings in test/.

test/test_pub.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.
 
 /// Test infrastructure for testing pub.
 ///
 /// Unlike typical unit tests, most pub tests are integration tests that stage
 /// some stuff on the file system, run pub, and then validate the results. This
 /// library provides an API to build tests like that.
 library test_pub;
 
 import 'dart:async';
 import 'dart:convert';
 import 'dart:io';
 import 'dart:math';
 
-import 'package:crypto/crypto.dart';
 import 'package:http/testing.dart';
 import 'package:path/path.dart' as p;
 import 'package:pub/src/entrypoint.dart';
+import 'package:pub/src/exceptions.dart';
 import 'package:pub/src/exit_codes.dart' as exit_codes;
 // TODO(rnystrom): Using "gitlib" as the prefix here is ugly, but "git" collides
 // with the git descriptor method. Maybe we should try to clean up the top level
 // scope a bit?
 import 'package:pub/src/git.dart' as gitlib;
 import 'package:pub/src/http.dart';
 import 'package:pub/src/io.dart';
 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/source/hosted.dart';
-import 'package:pub/src/source/path.dart';
 import 'package:pub/src/source_registry.dart';
 import 'package:pub/src/system_cache.dart';
 import 'package:pub/src/utils.dart';
 import 'package:pub/src/validator.dart';
 import 'package:pub_semver/pub_semver.dart';
 import 'package:scheduled_test/scheduled_process.dart';
 import 'package:scheduled_test/scheduled_server.dart';
 import 'package:scheduled_test/scheduled_stream.dart';
 import 'package:scheduled_test/scheduled_test.dart' hide fail;
 import 'package:shelf/shelf.dart' as shelf;
 import 'package:shelf/shelf_io.dart' as shelf_io;
-import 'package:yaml/yaml.dart';
 
 import 'descriptor.dart' as d;
-import 'serve_packages.dart';
 
 export 'serve_packages.dart';
 
 /// The current [HttpServer] created using [serve].
 var _server;
 
 /// The list of paths that have been requested from the server since the last
 /// call to [getRequestedPaths].
 final _requestedPaths = <String>[];
 
@@ skipping 214 matching lines @@
   // infrastructure runs pub in verbose mode, which enables this.
   pub.stdout.expect(consumeWhile(startsWith("Loading")));
 
   return pub;
 }
 
 /// Defines an integration test.
 ///
 /// The [body] should schedule a series of operations which will be run
 /// asynchronously.
-void integration(String description, void body()) =>
-  _integration(description, body, test);
-
-/// Like [integration], but causes only this test to run.
-void solo_integration(String description, void body()) =>
-  _integration(description, body, solo_test);
-
-void _integration(String description, void body(), [Function testFn]) {
-  testFn(description, () {
+void integration(String description, void body()) {
+  test(description, () {
     _sandboxDir = createSystemTempDir();
     d.defaultRoot = sandboxDir;
     currentSchedule.onComplete.schedule(() {
       try {
         deleteEntry(_sandboxDir);
       } on ApplicationException catch (_) {
         // Silently swallow exceptions on Windows. If the test failed, there may
         // still be lingering processes that have files in the sandbox open,
         // which will cause this to fail on Windows.
         if (!Platform.isWindows) rethrow;
@@ skipping 249 matching lines @@
         return [entry.last];
       });
     }
 
     var pair = tee(_stderr);
     _stderr = pair.first;
     return pair.last;
   }
 }
 
-/// The path to the `packages` directory from which pub loads its dependencies.
-String get _packageRoot => p.absolute(Platform.packageRoot);
-
 /// Fails the current test if Git is not installed.
 ///
 /// We require machines running these tests to have git installed. This
 /// validation gives an easier-to-understand error when that requirement isn't
 /// met than just failing in the middle of a test when pub invokes git.
 ///
 /// This also increases the [Schedule] timeout to 30 seconds on Windows,
 /// where Git runs really slowly.
 void ensureGit() {
   if (!gitlib.isInstalled) {
@@ skipping 234 matching lines @@
   }
 }
 
 /// Validates that [actualText] is a string of JSON that matches [expected],
 /// which may be a literal JSON object, or any other [Matcher].
 void _validateOutputJson(List<String> failures, String pipe,
                          expected, String actualText) {
   var actual;
   try {
     actual = JSON.decode(actualText);
-  } on FormatException catch(error) {
+  } on FormatException {
     failures.add('Expected $pipe JSON:');
     failures.add(expected);
     failures.add('Got invalid JSON:');
     failures.add(actualText);
   }
 
   // Match against the expectation.
   expect(actual, expected);
 }
 
@@ skipping 35 matching lines @@
         _lastMatcher.matches(item.last, matchState);
   }
 
   Description describe(Description description) {
     return description.addAll("(", ", ", ")", [_firstMatcher, _lastMatcher]);
   }
 }
 
 /// A [StreamMatcher] that matches multiple lines of output.
 StreamMatcher emitsLines(String output) => inOrder(output.split("\n"));