fail CI on info level issues; fix directives sorting (#3036)
* fail CI on info level issues; fix directives sorting
* some whitespace changes
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index 847cb96..9c48813 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -35,7 +35,7 @@
run: dart format --output=none --set-exit-if-changed .
if: always() && steps.install.outcome == 'success'
- name: Analyze code
- run: dart analyze
+ run: dart analyze --fatal-infos
if: always() && steps.install.outcome == 'success'
# Run tests on a matrix consisting of three dimensions:
diff --git a/lib/src/rate_limited_scheduler.dart b/lib/src/rate_limited_scheduler.dart
index 6708fb4..6e62310 100644
--- a/lib/src/rate_limited_scheduler.dart
+++ b/lib/src/rate_limited_scheduler.dart
@@ -8,8 +8,8 @@
import 'dart:collection';
import 'package:meta/meta.dart';
-import 'package:pool/pool.dart';
import 'package:pedantic/pedantic.dart';
+import 'package:pool/pool.dart';
/// Handles rate-limited scheduling of tasks.
///
diff --git a/test/add/common/add_test.dart b/test/add/common/add_test.dart
index 5181084..51d5b71 100644
--- a/test/add/common/add_test.dart
+++ b/test/add/common/add_test.dart
@@ -3,12 +3,12 @@
// BSD-style license that can be found in the LICENSE file.
// @dart=2.10
+
import 'dart:io' show File;
import 'package:path/path.dart' as p;
-import 'package:test/test.dart';
-
import 'package:pub/src/exit_codes.dart' as exit_codes;
+import 'package:test/test.dart';
import '../../descriptor.dart' as d;
import '../../test_pub.dart';
diff --git a/test/cache/add/bad_version_test.dart b/test/cache/add/bad_version_test.dart
index b4e37b5..e0a57e0 100644
--- a/test/cache/add/bad_version_test.dart
+++ b/test/cache/add/bad_version_test.dart
@@ -4,9 +4,8 @@
// @dart=2.10
-import 'package:test/test.dart';
-
import 'package:pub/src/exit_codes.dart' as exit_codes;
+import 'package:test/test.dart';
import '../../test_pub.dart';
diff --git a/test/cache/add/missing_package_arg_test.dart b/test/cache/add/missing_package_arg_test.dart
index ca1a7db..2274992 100644
--- a/test/cache/add/missing_package_arg_test.dart
+++ b/test/cache/add/missing_package_arg_test.dart
@@ -4,9 +4,8 @@
// @dart=2.10
-import 'package:test/test.dart';
-
import 'package:pub/src/exit_codes.dart' as exit_codes;
+import 'package:test/test.dart';
import '../../test_pub.dart';
diff --git a/test/cache/add/package_not_found_test.dart b/test/cache/add/package_not_found_test.dart
index b68ef69..4179319 100644
--- a/test/cache/add/package_not_found_test.dart
+++ b/test/cache/add/package_not_found_test.dart
@@ -4,9 +4,8 @@
// @dart=2.10
-import 'package:test/test.dart';
-
import 'package:pub/src/exit_codes.dart' as exit_codes;
+import 'package:test/test.dart';
import '../../test_pub.dart';
diff --git a/test/cache/add/unexpected_arguments_test.dart b/test/cache/add/unexpected_arguments_test.dart
index b7cef41..66174db 100644
--- a/test/cache/add/unexpected_arguments_test.dart
+++ b/test/cache/add/unexpected_arguments_test.dart
@@ -4,9 +4,8 @@
// @dart=2.10
-import 'package:test/test.dart';
-
import 'package:pub/src/exit_codes.dart' as exit_codes;
+import 'package:test/test.dart';
import '../../test_pub.dart';
diff --git a/test/cache/clean_test.dart b/test/cache/clean_test.dart
index 401ad52..511b4e0 100644
--- a/test/cache/clean_test.dart
+++ b/test/cache/clean_test.dart
@@ -4,11 +4,10 @@
// @dart=2.10
+import 'package:path/path.dart' as path;
import 'package:pub/src/io.dart';
import 'package:test/test.dart';
-import 'package:path/path.dart' as path;
-
import '../descriptor.dart' as d;
import '../test_pub.dart';
diff --git a/test/cache/list_test.dart b/test/cache/list_test.dart
index 1d7106d..9d8b9f3 100644
--- a/test/cache/list_test.dart
+++ b/test/cache/list_test.dart
@@ -4,9 +4,8 @@
// @dart=2.10
-import 'package:test/test.dart';
-
import 'package:path/path.dart' as path;
+import 'package:test/test.dart';
import '../descriptor.dart' as d;
import '../test_pub.dart';
diff --git a/test/cache/repair/git_test.dart b/test/cache/repair/git_test.dart
index 9612690..abb0ab7 100644
--- a/test/cache/repair/git_test.dart
+++ b/test/cache/repair/git_test.dart
@@ -4,11 +4,10 @@
// @dart=2.10
-import 'package:test/test.dart';
-
import 'package:path/path.dart' as path;
import 'package:pub/src/exit_codes.dart' as exit_codes;
import 'package:pub/src/io.dart';
+import 'package:test/test.dart';
import '../../descriptor.dart' as d;
import '../../test_pub.dart';
diff --git a/test/cache/repair/handles_corrupted_global_lockfile_test.dart b/test/cache/repair/handles_corrupted_global_lockfile_test.dart
index 37bb4e3..3952871 100644
--- a/test/cache/repair/handles_corrupted_global_lockfile_test.dart
+++ b/test/cache/repair/handles_corrupted_global_lockfile_test.dart
@@ -4,9 +4,8 @@
// @dart=2.10
-import 'package:test/test.dart';
-
import 'package:pub/src/exit_codes.dart' as exit_codes;
+import 'package:test/test.dart';
import '../../descriptor.dart' as d;
import '../../test_pub.dart';
diff --git a/test/cache/repair/handles_failure_test.dart b/test/cache/repair/handles_failure_test.dart
index 230b6af..8016d30 100644
--- a/test/cache/repair/handles_failure_test.dart
+++ b/test/cache/repair/handles_failure_test.dart
@@ -4,9 +4,8 @@
// @dart=2.10
-import 'package:test/test.dart';
-
import 'package:pub/src/exit_codes.dart' as exit_codes;
+import 'package:test/test.dart';
import '../../descriptor.dart' as d;
import '../../test_pub.dart';
diff --git a/test/dependency_override_test.dart b/test/dependency_override_test.dart
index 1ee611e..3cac645 100644
--- a/test/dependency_override_test.dart
+++ b/test/dependency_override_test.dart
@@ -4,10 +4,10 @@
// @dart=2.10
-import 'package:test/test.dart';
-
import 'package:path/path.dart' as path;
+import 'package:test/test.dart';
+
import 'descriptor.dart' as d;
import 'test_pub.dart';
diff --git a/test/descriptor.dart b/test/descriptor.dart
index b4a30de..6c0e866 100644
--- a/test/descriptor.dart
+++ b/test/descriptor.dart
@@ -7,12 +7,12 @@
/// Pub-specific test descriptors.
import 'dart:convert';
+import 'package:meta/meta.dart';
import 'package:oauth2/oauth2.dart' as oauth2;
+import 'package:path/path.dart' as p;
import 'package:pub/src/language_version.dart';
import 'package:pub/src/package_config.dart';
import 'package:test_descriptor/test_descriptor.dart';
-import 'package:meta/meta.dart';
-import 'package:path/path.dart' as p;
import 'descriptor/git.dart';
import 'descriptor/packages.dart';
@@ -21,6 +21,7 @@
import 'test_pub.dart';
export 'package:test_descriptor/test_descriptor.dart';
+
export 'descriptor/git.dart';
export 'descriptor/packages.dart';
export 'descriptor/tar.dart';
diff --git a/test/descriptor/tar.dart b/test/descriptor/tar.dart
index a8b1efa..1c4f89f 100644
--- a/test/descriptor/tar.dart
+++ b/test/descriptor/tar.dart
@@ -8,8 +8,8 @@
import 'dart:io';
import 'package:path/path.dart' as path;
-import 'package:pub/src/log.dart' as log;
import 'package:pub/src/io.dart';
+import 'package:pub/src/log.dart' as log;
import 'package:test_descriptor/test_descriptor.dart';
/// Describes a tar file and its contents.
diff --git a/test/directory_option_test.dart b/test/directory_option_test.dart
index 4db04ff..0ef5ab6 100644
--- a/test/directory_option_test.dart
+++ b/test/directory_option_test.dart
@@ -7,8 +7,9 @@
import 'dart:convert';
import 'package:path/path.dart' as p;
-import 'package:test/test.dart';
import 'package:shelf/shelf.dart' as shelf;
+import 'package:test/test.dart';
+
import 'descriptor.dart';
import 'golden_file.dart';
import 'test_pub.dart';
diff --git a/test/downgrade/dry_run_does_not_apply_changes_test.dart b/test/downgrade/dry_run_does_not_apply_changes_test.dart
index 4c5b1d7..765cb35 100644
--- a/test/downgrade/dry_run_does_not_apply_changes_test.dart
+++ b/test/downgrade/dry_run_does_not_apply_changes_test.dart
@@ -5,9 +5,8 @@
// @dart=2.10
import 'package:path/path.dart' as path;
-import 'package:test/test.dart';
-
import 'package:pub/src/io.dart';
+import 'package:test/test.dart';
import '../descriptor.dart' as d;
import '../test_pub.dart';
diff --git a/test/embedding/get_executable_for_command_test.dart b/test/embedding/get_executable_for_command_test.dart
index 02f2f54..c095c4f 100644
--- a/test/embedding/get_executable_for_command_test.dart
+++ b/test/embedding/get_executable_for_command_test.dart
@@ -6,10 +6,10 @@
import 'dart:io';
-import 'package:test/test.dart';
-import 'package:pub/pub.dart';
import 'package:path/path.dart' show separator;
import 'package:path/path.dart' as p;
+import 'package:pub/pub.dart';
+import 'package:test/test.dart';
import '../descriptor.dart' as d;
import '../test_pub.dart';
diff --git a/test/get/flutter_constraint_upper_bound_ignored_test.dart b/test/get/flutter_constraint_upper_bound_ignored_test.dart
index 049d9b0..9fc833c 100644
--- a/test/get/flutter_constraint_upper_bound_ignored_test.dart
+++ b/test/get/flutter_constraint_upper_bound_ignored_test.dart
@@ -4,9 +4,8 @@
// @dart=2.10
-import 'package:test/test.dart';
-
import 'package:pub/src/exit_codes.dart' as exit_codes;
+import 'package:test/test.dart';
import '../descriptor.dart' as d;
import '../test_pub.dart';
diff --git a/test/get/git/check_out_test.dart b/test/get/git/check_out_test.dart
index cbd871b..194e980 100644
--- a/test/get/git/check_out_test.dart
+++ b/test/get/git/check_out_test.dart
@@ -6,11 +6,11 @@
import 'dart:io';
-import 'package:pub/src/io.dart';
-import 'package:test/test.dart';
import 'package:path/path.dart' as p;
+import 'package:pub/src/io.dart';
import 'package:shelf/shelf.dart' as shelf;
import 'package:shelf/shelf_io.dart' as shelf_io;
+import 'package:test/test.dart';
import '../../descriptor.dart' as d;
import '../../test_pub.dart';
diff --git a/test/get/git/check_out_transitive_test.dart b/test/get/git/check_out_transitive_test.dart
index c9204d0..b7e71fa 100644
--- a/test/get/git/check_out_transitive_test.dart
+++ b/test/get/git/check_out_transitive_test.dart
@@ -5,8 +5,8 @@
// @dart=2.10
import 'package:path/path.dart' as p;
-import 'package:test/test.dart';
import 'package:pub/src/exit_codes.dart' as exit_codes;
+import 'package:test/test.dart';
import '../../descriptor.dart' as d;
import '../../test_pub.dart';
diff --git a/test/get/git/check_out_unfetched_revision_of_cached_repo_test.dart b/test/get/git/check_out_unfetched_revision_of_cached_repo_test.dart
index 5018658..c5fc4aa 100644
--- a/test/get/git/check_out_unfetched_revision_of_cached_repo_test.dart
+++ b/test/get/git/check_out_unfetched_revision_of_cached_repo_test.dart
@@ -5,9 +5,8 @@
// @dart=2.10
import 'package:path/path.dart' as p;
-import 'package:test/test.dart';
-
import 'package:pub/src/io.dart';
+import 'package:test/test.dart';
import '../../descriptor.dart' as d;
import '../../test_pub.dart';
diff --git a/test/get/git/dependency_name_match_pubspec_test.dart b/test/get/git/dependency_name_match_pubspec_test.dart
index 5b9df21..2accd62 100644
--- a/test/get/git/dependency_name_match_pubspec_test.dart
+++ b/test/get/git/dependency_name_match_pubspec_test.dart
@@ -4,9 +4,8 @@
// @dart=2.10
-import 'package:test/test.dart';
-
import 'package:pub/src/exit_codes.dart' as exit_codes;
+import 'package:test/test.dart';
import '../../descriptor.dart' as d;
import '../../test_pub.dart';
diff --git a/test/get/git/doesnt_fetch_if_nothing_changes_test.dart b/test/get/git/doesnt_fetch_if_nothing_changes_test.dart
index 0094969..ec214d4 100644
--- a/test/get/git/doesnt_fetch_if_nothing_changes_test.dart
+++ b/test/get/git/doesnt_fetch_if_nothing_changes_test.dart
@@ -5,9 +5,8 @@
// @dart=2.10
import 'package:path/path.dart' as p;
-import 'package:test/test.dart';
-
import 'package:pub/src/io.dart';
+import 'package:test/test.dart';
import '../../descriptor.dart' as d;
import '../../test_pub.dart';
diff --git a/test/get/git/git_not_installed_test.dart b/test/get/git/git_not_installed_test.dart
index 67aef02..13a5601 100644
--- a/test/get/git/git_not_installed_test.dart
+++ b/test/get/git/git_not_installed_test.dart
@@ -4,13 +4,13 @@
// @dart=2.10
+@TestOn('linux')
import 'dart:io';
-@TestOn('linux')
-import 'package:test/test.dart';
-import 'package:test_descriptor/test_descriptor.dart' show sandbox;
import 'package:path/path.dart' as p;
import 'package:pub/src/io.dart' show runProcess;
+import 'package:test/test.dart';
+import 'package:test_descriptor/test_descriptor.dart' show sandbox;
import '../../descriptor.dart' as d;
import '../../test_pub.dart';
diff --git a/test/get/git/lock_version_test.dart b/test/get/git/lock_version_test.dart
index 176ffd7..1e51d12 100644
--- a/test/get/git/lock_version_test.dart
+++ b/test/get/git/lock_version_test.dart
@@ -5,9 +5,8 @@
// @dart=2.10
import 'package:path/path.dart' as path;
-import 'package:test/test.dart';
-
import 'package:pub/src/io.dart';
+import 'package:test/test.dart';
import '../../descriptor.dart' as d;
import '../../test_pub.dart';
diff --git a/test/get/git/locked_revision_without_repo_test.dart b/test/get/git/locked_revision_without_repo_test.dart
index 5855858..49c1a11 100644
--- a/test/get/git/locked_revision_without_repo_test.dart
+++ b/test/get/git/locked_revision_without_repo_test.dart
@@ -5,9 +5,8 @@
// @dart=2.10
import 'package:path/path.dart' as path;
-import 'package:test/test.dart';
-
import 'package:pub/src/io.dart';
+import 'package:test/test.dart';
import '../../descriptor.dart' as d;
import '../../test_pub.dart';
diff --git a/test/get/git/path_test.dart b/test/get/git/path_test.dart
index 2a11d57..4831bd2 100644
--- a/test/get/git/path_test.dart
+++ b/test/get/git/path_test.dart
@@ -5,9 +5,8 @@
// @dart=2.10
import 'package:path/path.dart' as p;
-import 'package:test/test.dart';
-
import 'package:pub/src/io.dart';
+import 'package:test/test.dart';
import '../../descriptor.dart' as d;
import '../../test_pub.dart';
diff --git a/test/get/git/require_pubspec_name_test.dart b/test/get/git/require_pubspec_name_test.dart
index f295d21..e0815b2 100644
--- a/test/get/git/require_pubspec_name_test.dart
+++ b/test/get/git/require_pubspec_name_test.dart
@@ -4,9 +4,8 @@
// @dart=2.10
-import 'package:test/test.dart';
-
import 'package:pub/src/exit_codes.dart' as exit_codes;
+import 'package:test/test.dart';
import '../../descriptor.dart' as d;
import '../../test_pub.dart';
diff --git a/test/get/hosted/get_test.dart b/test/get/hosted/get_test.dart
index 3222bf2..13f9ad8 100644
--- a/test/get/hosted/get_test.dart
+++ b/test/get/hosted/get_test.dart
@@ -5,11 +5,10 @@
// @dart=2.10
import 'package:path/path.dart' as p;
-import 'package:test/test.dart';
-import 'package:yaml/yaml.dart';
-
import 'package:pub/src/exit_codes.dart' as exit_codes;
import 'package:pub/src/io.dart';
+import 'package:test/test.dart';
+import 'package:yaml/yaml.dart';
import '../../descriptor.dart' as d;
import '../../test_pub.dart';
diff --git a/test/get/hosted/stay_locked_test.dart b/test/get/hosted/stay_locked_test.dart
index 9d7eda9..c5c11ff 100644
--- a/test/get/hosted/stay_locked_test.dart
+++ b/test/get/hosted/stay_locked_test.dart
@@ -5,9 +5,8 @@
// @dart=2.10
import 'package:path/path.dart' as path;
-import 'package:test/test.dart';
-
import 'package:pub/src/io.dart';
+import 'package:test/test.dart';
import '../../descriptor.dart' as d;
import '../../test_pub.dart';
diff --git a/test/get/hosted/unlock_if_version_doesnt_exist_test.dart b/test/get/hosted/unlock_if_version_doesnt_exist_test.dart
index 3e5d694..f42e12e 100644
--- a/test/get/hosted/unlock_if_version_doesnt_exist_test.dart
+++ b/test/get/hosted/unlock_if_version_doesnt_exist_test.dart
@@ -5,9 +5,8 @@
// @dart=2.10
import 'package:path/path.dart' as p;
-import 'package:test/test.dart';
-
import 'package:pub/src/io.dart';
+import 'package:test/test.dart';
import '../../descriptor.dart' as d;
import '../../test_pub.dart';
diff --git a/test/get/hosted/warn_about_discontinued_test.dart b/test/get/hosted/warn_about_discontinued_test.dart
index 0ffeed5..8849974 100644
--- a/test/get/hosted/warn_about_discontinued_test.dart
+++ b/test/get/hosted/warn_about_discontinued_test.dart
@@ -7,11 +7,10 @@
import 'dart:convert';
import 'package:path/path.dart' as p;
+import 'package:pub/src/io.dart';
import 'package:shelf/shelf.dart';
import 'package:test/test.dart';
-import 'package:pub/src/io.dart';
-
import '../../descriptor.dart' as d;
import '../../test_pub.dart';
diff --git a/test/get/package_name_test.dart b/test/get/package_name_test.dart
index b091f88..f385cfe 100644
--- a/test/get/package_name_test.dart
+++ b/test/get/package_name_test.dart
@@ -4,9 +4,8 @@
// @dart=2.10
-import 'package:test/test.dart';
-
import 'package:pub/src/exit_codes.dart' as exit_codes;
+import 'package:test/test.dart';
import '../descriptor.dart' as d;
import '../test_pub.dart';
diff --git a/test/get/path/absolute_path_test.dart b/test/get/path/absolute_path_test.dart
index 61658f4..7304f52 100644
--- a/test/get/path/absolute_path_test.dart
+++ b/test/get/path/absolute_path_test.dart
@@ -4,9 +4,8 @@
// @dart=2.10
-import 'package:test/test.dart';
-
import 'package:path/path.dart' as path;
+import 'package:test/test.dart';
import '../../descriptor.dart' as d;
import '../../test_pub.dart';
diff --git a/test/get/path/absolute_symlink_test.dart b/test/get/path/absolute_symlink_test.dart
index 8f345be..b0cd147 100644
--- a/test/get/path/absolute_symlink_test.dart
+++ b/test/get/path/absolute_symlink_test.dart
@@ -4,9 +4,8 @@
// @dart=2.10
-import 'package:test/test.dart';
-
import 'package:path/path.dart' as path;
+import 'package:test/test.dart';
import '../../descriptor.dart' as d;
import '../../test_pub.dart';
diff --git a/test/get/path/empty_pubspec_test.dart b/test/get/path/empty_pubspec_test.dart
index def656f..5b94d70 100644
--- a/test/get/path/empty_pubspec_test.dart
+++ b/test/get/path/empty_pubspec_test.dart
@@ -4,10 +4,9 @@
// @dart=2.10
-import 'package:test/test.dart';
-
import 'package:path/path.dart' as p;
import 'package:pub/src/exit_codes.dart' as exit_codes;
+import 'package:test/test.dart';
import '../../descriptor.dart' as d;
import '../../test_pub.dart';
diff --git a/test/get/path/no_pubspec_test.dart b/test/get/path/no_pubspec_test.dart
index e04b497..d12477d 100644
--- a/test/get/path/no_pubspec_test.dart
+++ b/test/get/path/no_pubspec_test.dart
@@ -4,10 +4,9 @@
// @dart=2.10
-import 'package:test/test.dart';
-
import 'package:path/path.dart' as path;
import 'package:pub/src/exit_codes.dart' as exit_codes;
+import 'package:test/test.dart';
import '../../descriptor.dart' as d;
import '../../test_pub.dart';
diff --git a/test/get/path/nonexistent_dir_test.dart b/test/get/path/nonexistent_dir_test.dart
index a0478b3..993590f 100644
--- a/test/get/path/nonexistent_dir_test.dart
+++ b/test/get/path/nonexistent_dir_test.dart
@@ -4,10 +4,9 @@
// @dart=2.10
-import 'package:test/test.dart';
-
import 'package:path/path.dart' as path;
import 'package:pub/src/exit_codes.dart' as exit_codes;
+import 'package:test/test.dart';
import '../../descriptor.dart' as d;
import '../../test_pub.dart';
diff --git a/test/get/path/path_is_file_test.dart b/test/get/path/path_is_file_test.dart
index 37da2da..119a794 100644
--- a/test/get/path/path_is_file_test.dart
+++ b/test/get/path/path_is_file_test.dart
@@ -4,9 +4,8 @@
// @dart=2.10
-import 'package:test/test.dart';
-
import 'package:path/path.dart' as path;
+import 'package:test/test.dart';
import '../../descriptor.dart' as d;
import '../../test_pub.dart';
diff --git a/test/get/path/relative_path_test.dart b/test/get/path/relative_path_test.dart
index 05effeb..a1d7437 100644
--- a/test/get/path/relative_path_test.dart
+++ b/test/get/path/relative_path_test.dart
@@ -5,10 +5,9 @@
// @dart=2.10
import 'package:path/path.dart' as path;
-import 'package:test/test.dart';
-
import 'package:pub/src/lock_file.dart';
import 'package:pub/src/source_registry.dart';
+import 'package:test/test.dart';
import '../../descriptor.dart' as d;
import '../../test_pub.dart';
diff --git a/test/get/path/relative_symlink_test.dart b/test/get/path/relative_symlink_test.dart
index b54e5be..e48ba41 100644
--- a/test/get/path/relative_symlink_test.dart
+++ b/test/get/path/relative_symlink_test.dart
@@ -9,9 +9,8 @@
// support relative paths. So this test, by design, will not pass on Windows.
// So just skip it.
@TestOn('!windows')
-import 'package:test/test.dart';
-
import 'package:path/path.dart' as path;
+import 'package:test/test.dart';
import '../../descriptor.dart' as d;
import '../../test_pub.dart';
diff --git a/test/get/path/shared_dependency_symlink_test.dart b/test/get/path/shared_dependency_symlink_test.dart
index fbbdab6..7d1369c 100644
--- a/test/get/path/shared_dependency_symlink_test.dart
+++ b/test/get/path/shared_dependency_symlink_test.dart
@@ -4,10 +4,10 @@
// @dart=2.10
-import 'package:test/test.dart';
-
import 'package:path/path.dart' as path;
+import 'package:test/test.dart';
+
import '../../descriptor.dart' as d;
import '../../test_pub.dart';
diff --git a/test/get/preserve_lock_file_line_endings_test.dart b/test/get/preserve_lock_file_line_endings_test.dart
index 0afbeb9..8f6dc26 100644
--- a/test/get/preserve_lock_file_line_endings_test.dart
+++ b/test/get/preserve_lock_file_line_endings_test.dart
@@ -4,9 +4,9 @@
// @dart=2.10
+import 'package:path/path.dart' as path;
import 'package:pub/src/entrypoint.dart';
import 'package:test/test.dart';
-import 'package:path/path.dart' as path;
import '../descriptor.dart' as d;
import '../test_pub.dart';
diff --git a/test/get/sdk_constraint_required_test.dart b/test/get/sdk_constraint_required_test.dart
index da4e963..3cb0f86 100644
--- a/test/get/sdk_constraint_required_test.dart
+++ b/test/get/sdk_constraint_required_test.dart
@@ -4,9 +4,8 @@
// @dart=2.10
-import 'package:test/test.dart';
-
import 'package:pub/src/exit_codes.dart' as exit_codes;
+import 'package:test/test.dart';
import '../descriptor.dart' as d;
import '../test_pub.dart';
diff --git a/test/global/activate/constraint_with_path_test.dart b/test/global/activate/constraint_with_path_test.dart
index e309490..1a5beb7 100644
--- a/test/global/activate/constraint_with_path_test.dart
+++ b/test/global/activate/constraint_with_path_test.dart
@@ -4,9 +4,8 @@
// @dart=2.10
-import 'package:test/test.dart';
-
import 'package:pub/src/exit_codes.dart' as exit_codes;
+import 'package:test/test.dart';
import '../../test_pub.dart';
diff --git a/test/global/activate/empty_constraint_test.dart b/test/global/activate/empty_constraint_test.dart
index d475381..9e0bde9 100644
--- a/test/global/activate/empty_constraint_test.dart
+++ b/test/global/activate/empty_constraint_test.dart
@@ -4,9 +4,8 @@
// @dart=2.10
-import 'package:test/test.dart';
-
import 'package:pub/src/exit_codes.dart' as exit_codes;
+import 'package:test/test.dart';
import '../../test_pub.dart';
diff --git a/test/global/activate/missing_git_repo_test.dart b/test/global/activate/missing_git_repo_test.dart
index 6b19723..bbb2345 100644
--- a/test/global/activate/missing_git_repo_test.dart
+++ b/test/global/activate/missing_git_repo_test.dart
@@ -4,9 +4,8 @@
// @dart=2.10
-import 'package:test/test.dart';
-
import 'package:pub/src/exit_codes.dart' as exit_codes;
+import 'package:test/test.dart';
import '../../test_pub.dart';
diff --git a/test/global/activate/missing_package_arg_test.dart b/test/global/activate/missing_package_arg_test.dart
index 985532b..5923bd9 100644
--- a/test/global/activate/missing_package_arg_test.dart
+++ b/test/global/activate/missing_package_arg_test.dart
@@ -4,9 +4,8 @@
// @dart=2.10
-import 'package:test/test.dart';
-
import 'package:pub/src/exit_codes.dart' as exit_codes;
+import 'package:test/test.dart';
import '../../test_pub.dart';
diff --git a/test/global/binstubs/explicit_and_no_executables_options_test.dart b/test/global/binstubs/explicit_and_no_executables_options_test.dart
index a383475..d493bd7 100644
--- a/test/global/binstubs/explicit_and_no_executables_options_test.dart
+++ b/test/global/binstubs/explicit_and_no_executables_options_test.dart
@@ -4,9 +4,8 @@
// @dart=2.10
-import 'package:test/test.dart';
-
import 'package:pub/src/exit_codes.dart' as exit_codes;
+import 'package:test/test.dart';
import '../../descriptor.dart' as d;
import '../../test_pub.dart';
diff --git a/test/global/binstubs/missing_script_test.dart b/test/global/binstubs/missing_script_test.dart
index 507091f..96b5e89 100644
--- a/test/global/binstubs/missing_script_test.dart
+++ b/test/global/binstubs/missing_script_test.dart
@@ -4,9 +4,8 @@
// @dart=2.10
-import 'package:test/test.dart';
-
import 'package:path/path.dart' as p;
+import 'package:test/test.dart';
import '../../descriptor.dart' as d;
import '../../test_pub.dart';
diff --git a/test/global/binstubs/outdated_binstub_runs_pub_global_test.dart b/test/global/binstubs/outdated_binstub_runs_pub_global_test.dart
index 52f8a6b..f4cd075 100644
--- a/test/global/binstubs/outdated_binstub_runs_pub_global_test.dart
+++ b/test/global/binstubs/outdated_binstub_runs_pub_global_test.dart
@@ -7,8 +7,8 @@
import 'dart:io';
import 'package:path/path.dart' as p;
-import 'package:test_process/test_process.dart';
import 'package:test/test.dart';
+import 'package:test_process/test_process.dart';
import '../../descriptor.dart' as d;
import '../../test_pub.dart';
diff --git a/test/global/binstubs/unknown_explicit_executable_test.dart b/test/global/binstubs/unknown_explicit_executable_test.dart
index e9dba39..0b27527 100644
--- a/test/global/binstubs/unknown_explicit_executable_test.dart
+++ b/test/global/binstubs/unknown_explicit_executable_test.dart
@@ -4,9 +4,8 @@
// @dart=2.10
-import 'package:test/test.dart';
-
import 'package:pub/src/exit_codes.dart' as exit_codes;
+import 'package:test/test.dart';
import '../../descriptor.dart' as d;
import '../../test_pub.dart';
diff --git a/test/global/deactivate/missing_package_arg_test.dart b/test/global/deactivate/missing_package_arg_test.dart
index 0dea4c7..7d41b82 100644
--- a/test/global/deactivate/missing_package_arg_test.dart
+++ b/test/global/deactivate/missing_package_arg_test.dart
@@ -4,9 +4,8 @@
// @dart=2.10
-import 'package:test/test.dart';
-
import 'package:pub/src/exit_codes.dart' as exit_codes;
+import 'package:test/test.dart';
import '../../test_pub.dart';
diff --git a/test/global/deactivate/path_package_test.dart b/test/global/deactivate/path_package_test.dart
index 6012449..f28d8d1 100644
--- a/test/global/deactivate/path_package_test.dart
+++ b/test/global/deactivate/path_package_test.dart
@@ -4,10 +4,9 @@
// @dart=2.10
-import 'package:test/test.dart';
-
import 'package:path/path.dart' as p;
import 'package:pub/src/io.dart';
+import 'package:test/test.dart';
import '../../descriptor.dart' as d;
import '../../test_pub.dart';
diff --git a/test/global/deactivate/unexpected_arguments_test.dart b/test/global/deactivate/unexpected_arguments_test.dart
index 7c7e45a..d5748f2 100644
--- a/test/global/deactivate/unexpected_arguments_test.dart
+++ b/test/global/deactivate/unexpected_arguments_test.dart
@@ -4,9 +4,8 @@
// @dart=2.10
-import 'package:test/test.dart';
-
import 'package:pub/src/exit_codes.dart' as exit_codes;
+import 'package:test/test.dart';
import '../../test_pub.dart';
diff --git a/test/global/deactivate/unknown_package_test.dart b/test/global/deactivate/unknown_package_test.dart
index 0f8f9f6..ad0973e 100644
--- a/test/global/deactivate/unknown_package_test.dart
+++ b/test/global/deactivate/unknown_package_test.dart
@@ -4,9 +4,8 @@
// @dart=2.10
-import 'package:test/test.dart';
-
import 'package:pub/src/exit_codes.dart' as exit_codes;
+import 'package:test/test.dart';
import '../../test_pub.dart';
diff --git a/test/global/list_test.dart b/test/global/list_test.dart
index 2d74c0f..8b7293a 100644
--- a/test/global/list_test.dart
+++ b/test/global/list_test.dart
@@ -4,11 +4,11 @@
// @dart=2.10
-import 'package:test/test.dart';
-
import 'package:path/path.dart' as p;
import 'package:pub/src/io.dart';
+import 'package:test/test.dart';
+
import '../descriptor.dart' as d;
import '../test_pub.dart';
diff --git a/test/global/run/errors_if_outside_bin_test.dart b/test/global/run/errors_if_outside_bin_test.dart
index a71e9ac..497f26a 100644
--- a/test/global/run/errors_if_outside_bin_test.dart
+++ b/test/global/run/errors_if_outside_bin_test.dart
@@ -4,9 +4,8 @@
// @dart=2.10
-import 'package:test/test.dart';
-
import 'package:pub/src/exit_codes.dart' as exit_codes;
+import 'package:test/test.dart';
import '../../descriptor.dart' as d;
import '../../test_pub.dart';
diff --git a/test/global/run/fails_if_sdk_constraint_is_unmet_test.dart b/test/global/run/fails_if_sdk_constraint_is_unmet_test.dart
index ae897ea..fc9b266 100644
--- a/test/global/run/fails_if_sdk_constraint_is_unmet_test.dart
+++ b/test/global/run/fails_if_sdk_constraint_is_unmet_test.dart
@@ -4,9 +4,8 @@
// @dart=2.10
-import 'package:test/test.dart';
-
import 'package:pub/src/exit_codes.dart' as exit_codes;
+import 'package:test/test.dart';
import '../../descriptor.dart' as d;
import '../../test_pub.dart';
diff --git a/test/global/run/missing_executable_arg_test.dart b/test/global/run/missing_executable_arg_test.dart
index 4f0ca87..2bb8ec8 100644
--- a/test/global/run/missing_executable_arg_test.dart
+++ b/test/global/run/missing_executable_arg_test.dart
@@ -4,9 +4,8 @@
// @dart=2.10
-import 'package:test/test.dart';
-
import 'package:pub/src/exit_codes.dart' as exit_codes;
+import 'package:test/test.dart';
import '../../test_pub.dart';
diff --git a/test/global/run/missing_path_package_test.dart b/test/global/run/missing_path_package_test.dart
index c104327..f15d976 100644
--- a/test/global/run/missing_path_package_test.dart
+++ b/test/global/run/missing_path_package_test.dart
@@ -5,10 +5,9 @@
// @dart=2.10
import 'package:path/path.dart' as p;
-import 'package:test/test.dart';
-
import 'package:pub/src/exit_codes.dart' as exit_codes;
import 'package:pub/src/io.dart';
+import 'package:test/test.dart';
import '../../descriptor.dart' as d;
import '../../test_pub.dart';
diff --git a/test/global/run/nonexistent_script_test.dart b/test/global/run/nonexistent_script_test.dart
index a9c80b8..dc0a738 100644
--- a/test/global/run/nonexistent_script_test.dart
+++ b/test/global/run/nonexistent_script_test.dart
@@ -4,10 +4,9 @@
// @dart=2.10
-import 'package:test/test.dart';
-
import 'package:path/path.dart' as p;
import 'package:pub/src/exit_codes.dart' as exit_codes;
+import 'package:test/test.dart';
import '../../test_pub.dart';
diff --git a/test/global/run/runs_script_without_packages_file_test.dart b/test/global/run/runs_script_without_packages_file_test.dart
index 479239f..bbb02b1 100644
--- a/test/global/run/runs_script_without_packages_file_test.dart
+++ b/test/global/run/runs_script_without_packages_file_test.dart
@@ -5,9 +5,8 @@
// @dart=2.10
import 'package:path/path.dart' as p;
-import 'package:test/test.dart';
-
import 'package:pub/src/io.dart';
+import 'package:test/test.dart';
import '../../descriptor.dart' as d;
import '../../test_pub.dart';
diff --git a/test/global/run/unknown_package_test.dart b/test/global/run/unknown_package_test.dart
index e1c1832..55a875a 100644
--- a/test/global/run/unknown_package_test.dart
+++ b/test/global/run/unknown_package_test.dart
@@ -4,9 +4,8 @@
// @dart=2.10
-import 'package:test/test.dart';
-
import 'package:pub/src/exit_codes.dart' as exit_codes;
+import 'package:test/test.dart';
import '../../test_pub.dart';
diff --git a/test/hosted/fail_gracefully_on_bad_version_listing_response_test.dart b/test/hosted/fail_gracefully_on_bad_version_listing_response_test.dart
index ec653d8..f5ad35c 100644
--- a/test/hosted/fail_gracefully_on_bad_version_listing_response_test.dart
+++ b/test/hosted/fail_gracefully_on_bad_version_listing_response_test.dart
@@ -6,11 +6,10 @@
import 'dart:convert';
+import 'package:pub/src/exit_codes.dart' as exit_codes;
import 'package:shelf/shelf.dart';
import 'package:test/test.dart';
-import 'package:pub/src/exit_codes.dart' as exit_codes;
-
import '../descriptor.dart' as d;
import '../test_pub.dart';
diff --git a/test/hosted/fail_gracefully_on_missing_package_test.dart b/test/hosted/fail_gracefully_on_missing_package_test.dart
index 8654d98..882d11c 100644
--- a/test/hosted/fail_gracefully_on_missing_package_test.dart
+++ b/test/hosted/fail_gracefully_on_missing_package_test.dart
@@ -4,9 +4,8 @@
// @dart=2.10
-import 'package:test/test.dart';
-
import 'package:pub/src/exit_codes.dart' as exit_codes;
+import 'package:test/test.dart';
import '../descriptor.dart' as d;
import '../test_pub.dart';
diff --git a/test/hosted/fail_gracefully_on_url_resolve_test.dart b/test/hosted/fail_gracefully_on_url_resolve_test.dart
index b4ad893..9e3abcd 100644
--- a/test/hosted/fail_gracefully_on_url_resolve_test.dart
+++ b/test/hosted/fail_gracefully_on_url_resolve_test.dart
@@ -4,9 +4,8 @@
// @dart=2.10
-import 'package:test/test.dart';
-
import 'package:pub/src/exit_codes.dart' as exit_codes;
+import 'package:test/test.dart';
import '../descriptor.dart' as d;
import '../test_pub.dart';
diff --git a/test/hosted/offline_test.dart b/test/hosted/offline_test.dart
index 3276387..ef738c8 100644
--- a/test/hosted/offline_test.dart
+++ b/test/hosted/offline_test.dart
@@ -4,9 +4,8 @@
// @dart=2.10
-import 'package:test/test.dart';
-
import 'package:pub/src/exit_codes.dart' as exit_codes;
+import 'package:test/test.dart';
import '../descriptor.dart' as d;
import '../test_pub.dart';
diff --git a/test/lish/archives_and_uploads_a_package_test.dart b/test/lish/archives_and_uploads_a_package_test.dart
index 5bcc935..2efeb4a 100644
--- a/test/lish/archives_and_uploads_a_package_test.dart
+++ b/test/lish/archives_and_uploads_a_package_test.dart
@@ -7,11 +7,10 @@
import 'dart:convert';
import 'package:path/path.dart' as p;
-import 'package:shelf/shelf.dart' as shelf;
-import 'package:test/test.dart';
-
import 'package:pub/src/exit_codes.dart' as exit_codes;
import 'package:pub/src/io.dart';
+import 'package:shelf/shelf.dart' as shelf;
+import 'package:test/test.dart';
import '../descriptor.dart' as d;
import '../test_pub.dart';
diff --git a/test/lish/does_not_include_dot_file.dart b/test/lish/does_not_include_dot_file.dart
index 2fbac9f..6dfa622 100644
--- a/test/lish/does_not_include_dot_file.dart
+++ b/test/lish/does_not_include_dot_file.dart
@@ -6,10 +6,9 @@
import 'dart:convert';
+import 'package:pub/src/exit_codes.dart' as exit_codes;
import 'package:shelf/shelf.dart' as shelf;
import 'package:test/test.dart';
-
-import 'package:pub/src/exit_codes.dart' as exit_codes;
import 'package:test_descriptor/test_descriptor.dart' as td;
import '../descriptor.dart' as d;
diff --git a/test/lish/does_not_publish_if_private_test.dart b/test/lish/does_not_publish_if_private_test.dart
index 227788a..9ab8712 100644
--- a/test/lish/does_not_publish_if_private_test.dart
+++ b/test/lish/does_not_publish_if_private_test.dart
@@ -4,9 +4,8 @@
// @dart=2.10
-import 'package:test/test.dart';
-
import 'package:pub/src/exit_codes.dart' as exit_codes;
+import 'package:test/test.dart';
import '../descriptor.dart' as d;
import '../test_pub.dart';
diff --git a/test/lish/does_not_publish_if_private_with_server_arg_test.dart b/test/lish/does_not_publish_if_private_with_server_arg_test.dart
index a4490bf..c33b1a3 100644
--- a/test/lish/does_not_publish_if_private_with_server_arg_test.dart
+++ b/test/lish/does_not_publish_if_private_with_server_arg_test.dart
@@ -4,9 +4,8 @@
// @dart=2.10
-import 'package:test/test.dart';
-
import 'package:pub/src/exit_codes.dart' as exit_codes;
+import 'package:test/test.dart';
import '../descriptor.dart' as d;
import '../test_pub.dart';
diff --git a/test/lish/force_does_not_publish_if_private_test.dart b/test/lish/force_does_not_publish_if_private_test.dart
index dcccbb6..9ca4bf6 100644
--- a/test/lish/force_does_not_publish_if_private_test.dart
+++ b/test/lish/force_does_not_publish_if_private_test.dart
@@ -4,9 +4,8 @@
// @dart=2.10
-import 'package:test/test.dart';
-
import 'package:pub/src/exit_codes.dart' as exit_codes;
+import 'package:test/test.dart';
import '../descriptor.dart' as d;
import '../test_pub.dart';
diff --git a/test/lish/force_does_not_publish_if_there_are_errors_test.dart b/test/lish/force_does_not_publish_if_there_are_errors_test.dart
index f0d700d..26978ad 100644
--- a/test/lish/force_does_not_publish_if_there_are_errors_test.dart
+++ b/test/lish/force_does_not_publish_if_there_are_errors_test.dart
@@ -4,9 +4,8 @@
// @dart=2.10
-import 'package:test/test.dart';
-
import 'package:pub/src/exit_codes.dart' as exit_codes;
+import 'package:test/test.dart';
import '../descriptor.dart' as d;
import '../test_pub.dart';
diff --git a/test/lish/force_publishes_if_tests_are_no_warnings_or_errors_test.dart b/test/lish/force_publishes_if_tests_are_no_warnings_or_errors_test.dart
index 634d84a..59c8233 100644
--- a/test/lish/force_publishes_if_tests_are_no_warnings_or_errors_test.dart
+++ b/test/lish/force_publishes_if_tests_are_no_warnings_or_errors_test.dart
@@ -6,11 +6,10 @@
import 'dart:convert';
+import 'package:pub/src/exit_codes.dart' as exit_codes;
import 'package:shelf/shelf.dart' as shelf;
import 'package:test/test.dart';
-import 'package:pub/src/exit_codes.dart' as exit_codes;
-
import '../descriptor.dart' as d;
import '../test_pub.dart';
import 'utils.dart';
diff --git a/test/lish/force_publishes_if_there_are_warnings_test.dart b/test/lish/force_publishes_if_there_are_warnings_test.dart
index 82cce05..c217b29 100644
--- a/test/lish/force_publishes_if_there_are_warnings_test.dart
+++ b/test/lish/force_publishes_if_there_are_warnings_test.dart
@@ -6,11 +6,10 @@
import 'dart:convert';
+import 'package:pub/src/exit_codes.dart' as exit_codes;
import 'package:shelf/shelf.dart' as shelf;
import 'package:test/test.dart';
-import 'package:pub/src/exit_codes.dart' as exit_codes;
-
import '../descriptor.dart' as d;
import '../test_pub.dart';
import 'utils.dart';
diff --git a/test/lish/many_files_test.dart b/test/lish/many_files_test.dart
index 47d08db..02db6b2 100644
--- a/test/lish/many_files_test.dart
+++ b/test/lish/many_files_test.dart
@@ -9,11 +9,10 @@
import 'dart:math' as math;
import 'package:path/path.dart' as p;
+import 'package:pub/src/exit_codes.dart' as exit_codes;
import 'package:shelf/shelf.dart' as shelf;
import 'package:test/test.dart';
-import 'package:pub/src/exit_codes.dart' as exit_codes;
-
import '../descriptor.dart' as d;
import '../test_pub.dart';
import 'utils.dart';
diff --git a/test/lish/package_validation_has_a_warning_and_continues_test.dart b/test/lish/package_validation_has_a_warning_and_continues_test.dart
index a14a0fe..ec55be9 100644
--- a/test/lish/package_validation_has_a_warning_and_continues_test.dart
+++ b/test/lish/package_validation_has_a_warning_and_continues_test.dart
@@ -6,11 +6,10 @@
import 'dart:convert';
+import 'package:pub/src/exit_codes.dart' as exit_codes;
import 'package:shelf/shelf.dart' as shelf;
import 'package:test/test.dart';
-import 'package:pub/src/exit_codes.dart' as exit_codes;
-
import '../descriptor.dart' as d;
import '../test_pub.dart';
import 'utils.dart';
diff --git a/test/lish/package_validation_has_a_warning_and_is_canceled_test.dart b/test/lish/package_validation_has_a_warning_and_is_canceled_test.dart
index b7bbec5..fbdacc4 100644
--- a/test/lish/package_validation_has_a_warning_and_is_canceled_test.dart
+++ b/test/lish/package_validation_has_a_warning_and_is_canceled_test.dart
@@ -4,9 +4,8 @@
// @dart=2.10
-import 'package:test/test.dart';
-
import 'package:pub/src/exit_codes.dart' as exit_codes;
+import 'package:test/test.dart';
import '../descriptor.dart' as d;
import '../test_pub.dart';
diff --git a/test/lish/package_validation_has_an_error_test.dart b/test/lish/package_validation_has_an_error_test.dart
index 05fe4ed..9fab3a5 100644
--- a/test/lish/package_validation_has_an_error_test.dart
+++ b/test/lish/package_validation_has_an_error_test.dart
@@ -4,9 +4,8 @@
// @dart=2.10
-import 'package:test/test.dart';
-
import 'package:pub/src/exit_codes.dart' as exit_codes;
+import 'package:test/test.dart';
import '../descriptor.dart' as d;
import '../test_pub.dart';
diff --git a/test/lish/preview_errors_if_private_test.dart b/test/lish/preview_errors_if_private_test.dart
index e6a13ac..c816c6e 100644
--- a/test/lish/preview_errors_if_private_test.dart
+++ b/test/lish/preview_errors_if_private_test.dart
@@ -4,10 +4,10 @@
// @dart=2.10
-import 'package:test/test.dart';
-
import 'package:pub/src/exit_codes.dart' as exit_codes;
+import 'package:test/test.dart';
+
import '../descriptor.dart' as d;
import '../test_pub.dart';
diff --git a/test/lish/preview_package_validation_has_a_warning_test.dart b/test/lish/preview_package_validation_has_a_warning_test.dart
index 2b8e3d6..c3aa01d 100644
--- a/test/lish/preview_package_validation_has_a_warning_test.dart
+++ b/test/lish/preview_package_validation_has_a_warning_test.dart
@@ -4,10 +4,10 @@
// @dart=2.10
-import 'package:test/test.dart';
-
import 'package:pub/src/exit_codes.dart' as exit_codes;
+import 'package:test/test.dart';
+
import '../descriptor.dart' as d;
import '../test_pub.dart';
diff --git a/test/lish/preview_package_validation_has_no_warnings_test.dart b/test/lish/preview_package_validation_has_no_warnings_test.dart
index 58325e6..586708c 100644
--- a/test/lish/preview_package_validation_has_no_warnings_test.dart
+++ b/test/lish/preview_package_validation_has_no_warnings_test.dart
@@ -4,10 +4,10 @@
// @dart=2.10
-import 'package:test/test.dart';
-
import 'package:pub/src/exit_codes.dart' as exit_codes;
+import 'package:test/test.dart';
+
import '../descriptor.dart' as d;
import '../test_pub.dart';
diff --git a/test/lish/server_arg_does_not_override_private_test.dart b/test/lish/server_arg_does_not_override_private_test.dart
index 4275d42..baba7d6 100644
--- a/test/lish/server_arg_does_not_override_private_test.dart
+++ b/test/lish/server_arg_does_not_override_private_test.dart
@@ -4,10 +4,10 @@
// @dart=2.10
-import 'package:test/test.dart';
-
import 'package:pub/src/exit_codes.dart' as exit_codes;
+import 'package:test/test.dart';
+
import '../descriptor.dart' as d;
import '../test_pub.dart';
diff --git a/test/lish/server_arg_overrides_publish_to_url_test.dart b/test/lish/server_arg_overrides_publish_to_url_test.dart
index e86e2ae..508c0b3 100644
--- a/test/lish/server_arg_overrides_publish_to_url_test.dart
+++ b/test/lish/server_arg_overrides_publish_to_url_test.dart
@@ -4,10 +4,10 @@
// @dart=2.10
-import 'package:test/test.dart';
-
import 'package:pub/src/exit_codes.dart' as exit_codes;
+import 'package:test/test.dart';
+
import '../descriptor.dart' as d;
import '../test_pub.dart';
diff --git a/test/lish/uses_publish_to_url_test.dart b/test/lish/uses_publish_to_url_test.dart
index bb3ba78..e7f9cf3 100644
--- a/test/lish/uses_publish_to_url_test.dart
+++ b/test/lish/uses_publish_to_url_test.dart
@@ -4,10 +4,10 @@
// @dart=2.10
-import 'package:test/test.dart';
-
import 'package:pub/src/exit_codes.dart' as exit_codes;
+import 'package:test/test.dart';
+
import '../descriptor.dart' as d;
import '../test_pub.dart';
diff --git a/test/list_package_dirs/ignores_updated_pubspec_test.dart b/test/list_package_dirs/ignores_updated_pubspec_test.dart
index 8ad64a9..edec570 100644
--- a/test/list_package_dirs/ignores_updated_pubspec_test.dart
+++ b/test/list_package_dirs/ignores_updated_pubspec_test.dart
@@ -4,11 +4,11 @@
// @dart=2.10
-import 'package:test/test.dart';
-
import 'package:path/path.dart' as path;
import 'package:pub/src/io.dart';
+import 'package:test/test.dart';
+
import '../descriptor.dart' as d;
import '../test_pub.dart';
diff --git a/test/list_package_dirs/includes_dev_dependencies_test.dart b/test/list_package_dirs/includes_dev_dependencies_test.dart
index 3bed4a8..10f4f56 100644
--- a/test/list_package_dirs/includes_dev_dependencies_test.dart
+++ b/test/list_package_dirs/includes_dev_dependencies_test.dart
@@ -4,11 +4,11 @@
// @dart=2.10
-import 'package:test/test.dart';
-
import 'package:path/path.dart' as path;
import 'package:pub/src/io.dart';
+import 'package:test/test.dart';
+
import '../descriptor.dart' as d;
import '../test_pub.dart';
diff --git a/test/list_package_dirs/lists_dependency_directories_test.dart b/test/list_package_dirs/lists_dependency_directories_test.dart
index 73e08b4..5d5b982 100644
--- a/test/list_package_dirs/lists_dependency_directories_test.dart
+++ b/test/list_package_dirs/lists_dependency_directories_test.dart
@@ -4,11 +4,11 @@
// @dart=2.10
-import 'package:test/test.dart';
-
import 'package:path/path.dart' as path;
import 'package:pub/src/io.dart';
+import 'package:test/test.dart';
+
import '../descriptor.dart' as d;
import '../test_pub.dart';
diff --git a/test/list_package_dirs/lockfile_error_test.dart b/test/list_package_dirs/lockfile_error_test.dart
index 35f234c..16860f4 100644
--- a/test/list_package_dirs/lockfile_error_test.dart
+++ b/test/list_package_dirs/lockfile_error_test.dart
@@ -5,10 +5,9 @@
// @dart=2.10
import 'package:path/path.dart' as path;
-import 'package:test/test.dart';
-
import 'package:pub/src/exit_codes.dart' as exit_codes;
import 'package:pub/src/io.dart';
+import 'package:test/test.dart';
import '../descriptor.dart' as d;
import '../test_pub.dart';
diff --git a/test/list_package_dirs/missing_pubspec_test.dart b/test/list_package_dirs/missing_pubspec_test.dart
index 1debffb..d3c61de 100644
--- a/test/list_package_dirs/missing_pubspec_test.dart
+++ b/test/list_package_dirs/missing_pubspec_test.dart
@@ -5,10 +5,9 @@
// @dart=2.10
import 'package:path/path.dart' as path;
-import 'package:test/test.dart';
-
import 'package:pub/src/exit_codes.dart' as exit_codes;
import 'package:pub/src/io.dart';
+import 'package:test/test.dart';
import '../descriptor.dart' as d;
import '../test_pub.dart';
diff --git a/test/list_package_dirs/no_lockfile_test.dart b/test/list_package_dirs/no_lockfile_test.dart
index 90e2880..d58ae4b 100644
--- a/test/list_package_dirs/no_lockfile_test.dart
+++ b/test/list_package_dirs/no_lockfile_test.dart
@@ -4,10 +4,10 @@
// @dart=2.10
-import 'package:test/test.dart';
-
import 'package:pub/src/exit_codes.dart' as exit_codes;
+import 'package:test/test.dart';
+
import '../descriptor.dart' as d;
import '../test_pub.dart';
diff --git a/test/list_package_dirs/pubspec_error_test.dart b/test/list_package_dirs/pubspec_error_test.dart
index 478cab7..321e555 100644
--- a/test/list_package_dirs/pubspec_error_test.dart
+++ b/test/list_package_dirs/pubspec_error_test.dart
@@ -5,10 +5,9 @@
// @dart=2.10
import 'package:path/path.dart' as path;
-import 'package:test/test.dart';
-
import 'package:pub/src/exit_codes.dart' as exit_codes;
import 'package:pub/src/io.dart';
+import 'package:test/test.dart';
import '../descriptor.dart' as d;
import '../test_pub.dart';
diff --git a/test/must_pub_get_test.dart b/test/must_pub_get_test.dart
index 2591788..daf26c7 100644
--- a/test/must_pub_get_test.dart
+++ b/test/must_pub_get_test.dart
@@ -9,10 +9,9 @@
import 'dart:io';
import 'package:path/path.dart' as p;
-import 'package:test/test.dart';
-
import 'package:pub/src/exit_codes.dart' as exit_codes;
import 'package:pub/src/io.dart';
+import 'package:test/test.dart';
import 'descriptor.dart' as d;
import 'test_pub.dart';
diff --git a/test/oauth2/utils.dart b/test/oauth2/utils.dart
index 3d1280f..b7d765e 100644
--- a/test/oauth2/utils.dart
+++ b/test/oauth2/utils.dart
@@ -8,12 +8,11 @@
import 'dart:convert';
import 'package:http/http.dart' as http;
+import 'package:pub/src/utils.dart';
import 'package:shelf/shelf.dart' as shelf;
import 'package:test/test.dart';
import 'package:test_process/test_process.dart';
-import 'package:pub/src/utils.dart';
-
import '../test_pub.dart';
Future authorizePub(TestProcess pub, PackageServer server,
diff --git a/test/package_config_file_test.dart b/test/package_config_file_test.dart
index b4c3bc2..8cb03f0 100644
--- a/test/package_config_file_test.dart
+++ b/test/package_config_file_test.dart
@@ -4,10 +4,10 @@
// @dart=2.10
-import 'package:test/test.dart';
-
import 'package:pub/src/exit_codes.dart' as exit_codes;
+import 'package:test/test.dart';
+
import 'descriptor.dart' as d;
import 'test_pub.dart';
diff --git a/test/package_list_files_test.dart b/test/package_list_files_test.dart
index fca4782..3d7600b 100644
--- a/test/package_list_files_test.dart
+++ b/test/package_list_files_test.dart
@@ -7,11 +7,10 @@
import 'dart:io';
import 'package:path/path.dart' as p;
-import 'package:pub/src/exceptions.dart';
-import 'package:test/test.dart';
-
import 'package:pub/src/entrypoint.dart';
+import 'package:pub/src/exceptions.dart';
import 'package:pub/src/system_cache.dart';
+import 'package:test/test.dart';
import 'descriptor.dart' as d;
import 'test_pub.dart';
diff --git a/test/packages_file_test.dart b/test/packages_file_test.dart
index 167d075..ce87d7c 100644
--- a/test/packages_file_test.dart
+++ b/test/packages_file_test.dart
@@ -4,10 +4,10 @@
// @dart=2.10
-import 'package:test/test.dart';
-
import 'package:pub/src/exit_codes.dart' as exit_codes;
+import 'package:test/test.dart';
+
import 'descriptor.dart' as d;
import 'test_pub.dart';
diff --git a/test/pub_get_and_upgrade_test.dart b/test/pub_get_and_upgrade_test.dart
index cb06121..b93d10f 100644
--- a/test/pub_get_and_upgrade_test.dart
+++ b/test/pub_get_and_upgrade_test.dart
@@ -4,10 +4,10 @@
// @dart=2.10
-import 'package:test/test.dart';
-
import 'package:pub/src/exit_codes.dart' as exit_codes;
+import 'package:test/test.dart';
+
import 'descriptor.dart' as d;
import 'test_pub.dart';
diff --git a/test/rate_limited_scheduler_test.dart b/test/rate_limited_scheduler_test.dart
index e5dd275..632efbf 100644
--- a/test/rate_limited_scheduler_test.dart
+++ b/test/rate_limited_scheduler_test.dart
@@ -6,9 +6,9 @@
import 'dart:async';
-import 'package:test/test.dart';
import 'package:pedantic/pedantic.dart';
import 'package:pub/src/rate_limited_scheduler.dart';
+import 'package:test/test.dart';
void main() {
Map<String, Completer> threeCompleters() =>
diff --git a/test/real_version_test.dart b/test/real_version_test.dart
index 8c4cf4b..484a7f6 100644
--- a/test/real_version_test.dart
+++ b/test/real_version_test.dart
@@ -7,11 +7,10 @@
import 'dart:io';
import 'package:path/path.dart' as path;
-import 'package:test/test.dart';
-import 'package:test_process/test_process.dart';
-
import 'package:pub/src/exit_codes.dart' as exit_codes;
import 'package:pub/src/sdk.dart';
+import 'package:test/test.dart';
+import 'package:test_process/test_process.dart';
void main() {
// This test is a bit funny.
diff --git a/test/run/dartdev/errors_if_only_transitive_dependency_test.dart b/test/run/dartdev/errors_if_only_transitive_dependency_test.dart
index f23a886..529eeb2 100644
--- a/test/run/dartdev/errors_if_only_transitive_dependency_test.dart
+++ b/test/run/dartdev/errors_if_only_transitive_dependency_test.dart
@@ -4,9 +4,8 @@
// @dart=2.10
-import 'package:test/test.dart';
-
import 'package:pub/src/exit_codes.dart' as exit_codes;
+import 'package:test/test.dart';
import '../../descriptor.dart' as d;
import '../../test_pub.dart';
diff --git a/test/run/dartdev/errors_if_path_in_dependency_test.dart b/test/run/dartdev/errors_if_path_in_dependency_test.dart
index 9c38400..ddf553a 100644
--- a/test/run/dartdev/errors_if_path_in_dependency_test.dart
+++ b/test/run/dartdev/errors_if_path_in_dependency_test.dart
@@ -4,9 +4,8 @@
// @dart=2.10
-import 'package:test/test.dart';
-
import 'package:pub/src/exit_codes.dart' as exit_codes;
+import 'package:test/test.dart';
import '../../descriptor.dart' as d;
import '../../test_pub.dart';
diff --git a/test/run/dartdev/nonexistent_dependency_test.dart b/test/run/dartdev/nonexistent_dependency_test.dart
index 2917299..695d147 100644
--- a/test/run/dartdev/nonexistent_dependency_test.dart
+++ b/test/run/dartdev/nonexistent_dependency_test.dart
@@ -4,9 +4,8 @@
// @dart=2.10
-import 'package:test/test.dart';
-
import 'package:pub/src/exit_codes.dart' as exit_codes;
+import 'package:test/test.dart';
import '../../descriptor.dart' as d;
import '../../test_pub.dart';
diff --git a/test/run/dartdev/nonexistent_script_in_dependency_test.dart b/test/run/dartdev/nonexistent_script_in_dependency_test.dart
index 011eede..5cf982f 100644
--- a/test/run/dartdev/nonexistent_script_in_dependency_test.dart
+++ b/test/run/dartdev/nonexistent_script_in_dependency_test.dart
@@ -4,10 +4,9 @@
// @dart=2.10
-import 'package:test/test.dart';
-
import 'package:path/path.dart' as p;
import 'package:pub/src/exit_codes.dart' as exit_codes;
+import 'package:test/test.dart';
import '../../descriptor.dart' as d;
import '../../test_pub.dart';
diff --git a/test/run/errors_if_no_executable_is_given_test.dart b/test/run/errors_if_no_executable_is_given_test.dart
index e04f158..2bec1a3 100644
--- a/test/run/errors_if_no_executable_is_given_test.dart
+++ b/test/run/errors_if_no_executable_is_given_test.dart
@@ -4,9 +4,8 @@
// @dart=2.10
-import 'package:test/test.dart';
-
import 'package:pub/src/exit_codes.dart' as exit_codes;
+import 'package:test/test.dart';
import '../descriptor.dart' as d;
import '../test_pub.dart';
diff --git a/test/run/errors_if_only_transitive_dependency_test.dart b/test/run/errors_if_only_transitive_dependency_test.dart
index eb860da..d5d1601 100644
--- a/test/run/errors_if_only_transitive_dependency_test.dart
+++ b/test/run/errors_if_only_transitive_dependency_test.dart
@@ -4,9 +4,8 @@
// @dart=2.10
-import 'package:test/test.dart';
-
import 'package:pub/src/exit_codes.dart' as exit_codes;
+import 'package:test/test.dart';
import '../descriptor.dart' as d;
import '../test_pub.dart';
diff --git a/test/run/errors_if_path_in_dependency_test.dart b/test/run/errors_if_path_in_dependency_test.dart
index 7505460..5625c4e 100644
--- a/test/run/errors_if_path_in_dependency_test.dart
+++ b/test/run/errors_if_path_in_dependency_test.dart
@@ -4,9 +4,8 @@
// @dart=2.10
-import 'package:test/test.dart';
-
import 'package:pub/src/exit_codes.dart' as exit_codes;
+import 'package:test/test.dart';
import '../descriptor.dart' as d;
import '../test_pub.dart';
diff --git a/test/run/forwards_signal_posix_test.dart b/test/run/forwards_signal_posix_test.dart
index 50caa50..2e211c9 100644
--- a/test/run/forwards_signal_posix_test.dart
+++ b/test/run/forwards_signal_posix_test.dart
@@ -5,11 +5,11 @@
// @dart=2.10
// Windows doesn't support sending signals.
-@TestOn('!windows')
// TODO(sigurdm): Test this when vm-args are provided.
// This test doesn't work when we subprocess instead of an isolate
// in `pub run`. Now signals only work as expected when sent to the process
// group. And this seems hard to emulate in a test.
+@TestOn('!windows')
import 'dart:io';
import 'package:test/test.dart';
diff --git a/test/run/includes_parent_directories_of_entrypoint_test.dart b/test/run/includes_parent_directories_of_entrypoint_test.dart
index 752a7c0..a9679f5 100644
--- a/test/run/includes_parent_directories_of_entrypoint_test.dart
+++ b/test/run/includes_parent_directories_of_entrypoint_test.dart
@@ -4,9 +4,8 @@
// @dart=2.10
-import 'package:test/test.dart';
-
import 'package:path/path.dart' as path;
+import 'package:test/test.dart';
import '../descriptor.dart' as d;
import '../test_pub.dart';
diff --git a/test/run/nonexistent_dependency_test.dart b/test/run/nonexistent_dependency_test.dart
index bec6f7b..5b0f941 100644
--- a/test/run/nonexistent_dependency_test.dart
+++ b/test/run/nonexistent_dependency_test.dart
@@ -4,9 +4,8 @@
// @dart=2.10
-import 'package:test/test.dart';
-
import 'package:pub/src/exit_codes.dart' as exit_codes;
+import 'package:test/test.dart';
import '../descriptor.dart' as d;
import '../test_pub.dart';
diff --git a/test/run/nonexistent_script_in_dependency_test.dart b/test/run/nonexistent_script_in_dependency_test.dart
index 0b361b2..5153c25 100644
--- a/test/run/nonexistent_script_in_dependency_test.dart
+++ b/test/run/nonexistent_script_in_dependency_test.dart
@@ -4,10 +4,9 @@
// @dart=2.10
-import 'package:test/test.dart';
-
import 'package:path/path.dart' as p;
import 'package:pub/src/exit_codes.dart' as exit_codes;
+import 'package:test/test.dart';
import '../descriptor.dart' as d;
import '../test_pub.dart';
diff --git a/test/run/nonexistent_script_test.dart b/test/run/nonexistent_script_test.dart
index 0dd3082..9930430 100644
--- a/test/run/nonexistent_script_test.dart
+++ b/test/run/nonexistent_script_test.dart
@@ -4,10 +4,9 @@
// @dart=2.10
-import 'package:test/test.dart';
-
import 'package:path/path.dart' as p;
import 'package:pub/src/exit_codes.dart' as exit_codes;
+import 'package:test/test.dart';
import '../descriptor.dart' as d;
import '../test_pub.dart';
diff --git a/test/run/runs_app_in_directory_in_entrypoint_test.dart b/test/run/runs_app_in_directory_in_entrypoint_test.dart
index 8cd19e0..8af684b 100644
--- a/test/run/runs_app_in_directory_in_entrypoint_test.dart
+++ b/test/run/runs_app_in_directory_in_entrypoint_test.dart
@@ -4,9 +4,8 @@
// @dart=2.10
-import 'package:test/test.dart';
-
import 'package:path/path.dart' as path;
+import 'package:test/test.dart';
import '../descriptor.dart' as d;
import '../test_pub.dart';
diff --git a/test/sdk_test.dart b/test/sdk_test.dart
index de1bb05..e1d311b 100644
--- a/test/sdk_test.dart
+++ b/test/sdk_test.dart
@@ -5,11 +5,9 @@
// @dart=2.10
import 'package:path/path.dart' as p;
-
-import 'package:test/test.dart';
-
import 'package:pub/src/exit_codes.dart' as exit_codes;
import 'package:pub/src/io.dart';
+import 'package:test/test.dart';
import 'descriptor.dart' as d;
import 'test_pub.dart';
diff --git a/test/upgrade/dry_run_does_not_apply_changes_test.dart b/test/upgrade/dry_run_does_not_apply_changes_test.dart
index 4eaee2f..e77d3b8 100644
--- a/test/upgrade/dry_run_does_not_apply_changes_test.dart
+++ b/test/upgrade/dry_run_does_not_apply_changes_test.dart
@@ -5,9 +5,8 @@
// @dart=2.10
import 'package:path/path.dart' as path;
-import 'package:test/test.dart';
-
import 'package:pub/src/io.dart';
+import 'package:test/test.dart';
import '../descriptor.dart' as d;
import '../test_pub.dart';
diff --git a/test/upgrade/git/do_not_upgrade_if_unneeded_test.dart b/test/upgrade/git/do_not_upgrade_if_unneeded_test.dart
index ef63ff8..dffb433 100644
--- a/test/upgrade/git/do_not_upgrade_if_unneeded_test.dart
+++ b/test/upgrade/git/do_not_upgrade_if_unneeded_test.dart
@@ -4,8 +4,8 @@
// @dart=2.10
-import 'package:test/test.dart';
import 'package:path/path.dart' as p;
+import 'package:test/test.dart';
import '../../descriptor.dart' as d;
import '../../test_pub.dart';
diff --git a/test/upgrade/git/upgrade_to_incompatible_pubspec_test.dart b/test/upgrade/git/upgrade_to_incompatible_pubspec_test.dart
index fca8b8f..33f584c 100644
--- a/test/upgrade/git/upgrade_to_incompatible_pubspec_test.dart
+++ b/test/upgrade/git/upgrade_to_incompatible_pubspec_test.dart
@@ -4,9 +4,8 @@
// @dart=2.10
-import 'package:test/test.dart';
-
import 'package:pub/src/exit_codes.dart' as exit_codes;
+import 'package:test/test.dart';
import '../../descriptor.dart' as d;
import '../../test_pub.dart';
diff --git a/test/validator/changelog_test.dart b/test/validator/changelog_test.dart
index 4291816..be166c3 100644
--- a/test/validator/changelog_test.dart
+++ b/test/validator/changelog_test.dart
@@ -4,11 +4,10 @@
// @dart=2.10
-import 'package:test/test.dart';
-
import 'package:pub/src/entrypoint.dart';
import 'package:pub/src/validator.dart';
import 'package:pub/src/validator/changelog.dart';
+import 'package:test/test.dart';
import '../descriptor.dart' as d;
import '../test_pub.dart';
diff --git a/test/validator/compiled_dartdoc_test.dart b/test/validator/compiled_dartdoc_test.dart
index 58bc03a..a656958 100644
--- a/test/validator/compiled_dartdoc_test.dart
+++ b/test/validator/compiled_dartdoc_test.dart
@@ -4,11 +4,10 @@
// @dart=2.10
-import 'package:test/test.dart';
-
import 'package:pub/src/entrypoint.dart';
import 'package:pub/src/validator.dart';
import 'package:pub/src/validator/compiled_dartdoc.dart';
+import 'package:test/test.dart';
import '../descriptor.dart' as d;
import '../test_pub.dart';
diff --git a/test/validator/dependency_override_test.dart b/test/validator/dependency_override_test.dart
index c697b73..f459119 100644
--- a/test/validator/dependency_override_test.dart
+++ b/test/validator/dependency_override_test.dart
@@ -4,11 +4,10 @@
// @dart=2.10
-import 'package:test/test.dart';
-
import 'package:pub/src/entrypoint.dart';
import 'package:pub/src/validator.dart';
import 'package:pub/src/validator/dependency_override.dart';
+import 'package:test/test.dart';
import '../descriptor.dart' as d;
import '../test_pub.dart';
diff --git a/test/validator/dependency_test.dart b/test/validator/dependency_test.dart
index 78ec918..00ab0c3 100644
--- a/test/validator/dependency_test.dart
+++ b/test/validator/dependency_test.dart
@@ -10,11 +10,10 @@
import 'package:http/http.dart' as http;
import 'package:http/testing.dart';
import 'package:path/path.dart' as path;
-import 'package:test/test.dart';
-
import 'package:pub/src/entrypoint.dart';
import 'package:pub/src/validator.dart';
import 'package:pub/src/validator/dependency.dart';
+import 'package:test/test.dart';
import '../descriptor.dart' as d;
import '../test_pub.dart';
diff --git a/test/validator/deprecated_fields_test.dart b/test/validator/deprecated_fields_test.dart
index 0fd8678..a13774b 100644
--- a/test/validator/deprecated_fields_test.dart
+++ b/test/validator/deprecated_fields_test.dart
@@ -4,11 +4,10 @@
// @dart=2.10
-import 'package:test/test.dart';
-
import 'package:pub/src/entrypoint.dart';
import 'package:pub/src/validator.dart';
import 'package:pub/src/validator/deprecated_fields.dart';
+import 'package:test/test.dart';
import '../descriptor.dart' as d;
import '../test_pub.dart';
diff --git a/test/validator/directory_test.dart b/test/validator/directory_test.dart
index fb2d743..5a5ec99 100644
--- a/test/validator/directory_test.dart
+++ b/test/validator/directory_test.dart
@@ -4,11 +4,10 @@
// @dart=2.10
-import 'package:test/test.dart';
-
import 'package:pub/src/entrypoint.dart';
import 'package:pub/src/validator.dart';
import 'package:pub/src/validator/directory.dart';
+import 'package:test/test.dart';
import '../descriptor.dart' as d;
import '../test_pub.dart';
diff --git a/test/validator/executable_test.dart b/test/validator/executable_test.dart
index 0f42ed6..555f768 100644
--- a/test/validator/executable_test.dart
+++ b/test/validator/executable_test.dart
@@ -4,11 +4,10 @@
// @dart=2.10
-import 'package:test/test.dart';
-
import 'package:pub/src/entrypoint.dart';
import 'package:pub/src/validator.dart';
import 'package:pub/src/validator/executable.dart';
+import 'package:test/test.dart';
import '../descriptor.dart' as d;
import '../test_pub.dart';
diff --git a/test/validator/flutter_plugin_format_test.dart b/test/validator/flutter_plugin_format_test.dart
index b11b566..cddeaf9 100644
--- a/test/validator/flutter_plugin_format_test.dart
+++ b/test/validator/flutter_plugin_format_test.dart
@@ -4,11 +4,10 @@
// @dart=2.10
-import 'package:test/test.dart';
-
import 'package:pub/src/entrypoint.dart';
import 'package:pub/src/validator.dart';
import 'package:pub/src/validator/flutter_plugin_format.dart';
+import 'package:test/test.dart';
import '../descriptor.dart' as d;
import '../test_pub.dart';
diff --git a/test/validator/language_version_test.dart b/test/validator/language_version_test.dart
index da9af0b..37431d4 100644
--- a/test/validator/language_version_test.dart
+++ b/test/validator/language_version_test.dart
@@ -4,11 +4,10 @@
// @dart=2.10
-import 'package:test/test.dart';
-
import 'package:pub/src/entrypoint.dart';
import 'package:pub/src/validator.dart';
import 'package:pub/src/validator/language_version.dart';
+import 'package:test/test.dart';
import '../descriptor.dart' as d;
import '../test_pub.dart';
diff --git a/test/validator/license_test.dart b/test/validator/license_test.dart
index 85beaf9..77225b5 100644
--- a/test/validator/license_test.dart
+++ b/test/validator/license_test.dart
@@ -5,12 +5,11 @@
// @dart=2.10
import 'package:path/path.dart' as path;
-import 'package:test/test.dart';
-
import 'package:pub/src/entrypoint.dart';
import 'package:pub/src/io.dart';
import 'package:pub/src/validator.dart';
import 'package:pub/src/validator/license.dart';
+import 'package:test/test.dart';
import '../descriptor.dart' as d;
import '../test_pub.dart';
diff --git a/test/validator/name_test.dart b/test/validator/name_test.dart
index ac7ec19..5639c09 100644
--- a/test/validator/name_test.dart
+++ b/test/validator/name_test.dart
@@ -5,12 +5,11 @@
// @dart=2.10
import 'package:path/path.dart' as path;
-import 'package:test/test.dart';
-
import 'package:pub/src/entrypoint.dart';
import 'package:pub/src/io.dart';
import 'package:pub/src/validator.dart';
import 'package:pub/src/validator/name.dart';
+import 'package:test/test.dart';
import '../descriptor.dart' as d;
import '../test_pub.dart';
diff --git a/test/validator/pubspec_field_test.dart b/test/validator/pubspec_field_test.dart
index dd54ac4..2a82e8f 100644
--- a/test/validator/pubspec_field_test.dart
+++ b/test/validator/pubspec_field_test.dart
@@ -4,11 +4,10 @@
// @dart=2.10
-import 'package:test/test.dart';
-
import 'package:pub/src/entrypoint.dart';
import 'package:pub/src/validator.dart';
import 'package:pub/src/validator/pubspec_field.dart';
+import 'package:test/test.dart';
import '../descriptor.dart' as d;
import '../test_pub.dart';
diff --git a/test/validator/pubspec_test.dart b/test/validator/pubspec_test.dart
index 880cef2..0d964ce 100644
--- a/test/validator/pubspec_test.dart
+++ b/test/validator/pubspec_test.dart
@@ -4,9 +4,8 @@
// @dart=2.10
-import 'package:test/test.dart';
-
import 'package:pub/src/validator/pubspec.dart';
+import 'package:test/test.dart';
import '../descriptor.dart' as d;
import '../test_pub.dart';
diff --git a/test/validator/pubspec_typo_test.dart b/test/validator/pubspec_typo_test.dart
index 40d85b0..efc731b 100644
--- a/test/validator/pubspec_typo_test.dart
+++ b/test/validator/pubspec_typo_test.dart
@@ -4,11 +4,10 @@
// @dart=2.10
-import 'package:test/test.dart';
-
import 'package:pub/src/entrypoint.dart';
import 'package:pub/src/validator.dart';
import 'package:pub/src/validator/pubspec_typo.dart';
+import 'package:test/test.dart';
import '../descriptor.dart' as d;
import '../test_pub.dart';
diff --git a/test/validator/readme_test.dart b/test/validator/readme_test.dart
index 886673b..132ff6c 100644
--- a/test/validator/readme_test.dart
+++ b/test/validator/readme_test.dart
@@ -4,13 +4,12 @@
// @dart=2.10
-import 'package:test/test.dart';
import 'package:path/path.dart' as p;
-
import 'package:pub/src/entrypoint.dart';
import 'package:pub/src/io.dart';
import 'package:pub/src/validator.dart';
import 'package:pub/src/validator/readme.dart';
+import 'package:test/test.dart';
import '../descriptor.dart' as d;
import '../test_pub.dart';
diff --git a/test/validator/relative_version_numbering_test.dart b/test/validator/relative_version_numbering_test.dart
index 1bd674f..e7bf261 100644
--- a/test/validator/relative_version_numbering_test.dart
+++ b/test/validator/relative_version_numbering_test.dart
@@ -4,11 +4,10 @@
// @dart=2.10
-import 'package:test/test.dart';
-
import 'package:pub/src/entrypoint.dart';
import 'package:pub/src/validator.dart';
import 'package:pub/src/validator/relative_version_numbering.dart';
+import 'package:test/test.dart';
import '../descriptor.dart' as d;
import '../test_pub.dart';
diff --git a/test/validator/sdk_constraint_test.dart b/test/validator/sdk_constraint_test.dart
index 1bfb0da..1310d17 100644
--- a/test/validator/sdk_constraint_test.dart
+++ b/test/validator/sdk_constraint_test.dart
@@ -4,11 +4,10 @@
// @dart=2.10
-import 'package:test/test.dart';
-
import 'package:pub/src/entrypoint.dart';
import 'package:pub/src/validator.dart';
import 'package:pub/src/validator/sdk_constraint.dart';
+import 'package:test/test.dart';
import '../descriptor.dart' as d;
import '../test_pub.dart';
diff --git a/test/validator/size_test.dart b/test/validator/size_test.dart
index 5347031..37a746d 100644
--- a/test/validator/size_test.dart
+++ b/test/validator/size_test.dart
@@ -7,9 +7,8 @@
import 'dart:async';
import 'dart:math' as math;
-import 'package:test/test.dart';
-
import 'package:pub/src/validator/size.dart';
+import 'package:test/test.dart';
import '../descriptor.dart' as d;
import '../test_pub.dart';
diff --git a/test/validator/strict_dependencies_test.dart b/test/validator/strict_dependencies_test.dart
index 1952b7b..58b99ab 100644
--- a/test/validator/strict_dependencies_test.dart
+++ b/test/validator/strict_dependencies_test.dart
@@ -5,11 +5,11 @@
// @dart=2.10
import 'package:path/path.dart' as path;
-import 'package:test/test.dart';
-
import 'package:pub/src/entrypoint.dart';
import 'package:pub/src/validator.dart';
import 'package:pub/src/validator/strict_dependencies.dart';
+import 'package:test/test.dart';
+
import '../descriptor.dart' as d;
import '../test_pub.dart';
import 'utils.dart';
diff --git a/test/version_solver_test.dart b/test/version_solver_test.dart
index 23ab090..8ae5a6e 100644
--- a/test/version_solver_test.dart
+++ b/test/version_solver_test.dart
@@ -8,12 +8,11 @@
import 'dart:io';
import 'package:path/path.dart' as p;
-import 'package:test/test.dart';
-
import 'package:pub/src/lock_file.dart';
import 'package:pub/src/pubspec.dart';
import 'package:pub/src/source/hosted.dart';
import 'package:pub/src/source_registry.dart';
+import 'package:test/test.dart';
import 'descriptor.dart' as d;
import 'test_pub.dart';
