Format and sort analyzer and analysis_server packages.

pkg/analyzer/test/source/package_map_resolver_test.dart

Index: pkg/analyzer/test/source/package_map_resolver_test.dart
diff --git a/pkg/analyzer/test/source/package_map_resolver_test.dart b/pkg/analyzer/test/source/package_map_resolver_test.dart
index 7f86830a033d16f03e8d7f7de0f21aee55b8d95d..b7a644a7ce8ee93fb30fc4d597b9b0ed311ba813 100644
--- a/pkg/analyzer/test/source/package_map_resolver_test.dart
+++ b/pkg/analyzer/test/source/package_map_resolver_test.dart
@@ -4,8 +4,6 @@
 
 library test.source.package_map_resolver;
 
-import 'dart:collection';
-
 import 'package:analyzer/file_system/file_system.dart';
 import 'package:analyzer/file_system/memory_file_system.dart';
 import 'package:analyzer/source/package_map_resolver.dart';
@@ -76,18 +74,19 @@ class _PackageMapUriResolverTest {
     expect(PackageMapUriResolver.isPackageUri(uri), isFalse);
   }
 
-  void test_resolve_OK() {
-    const pkgFileA = '/pkgA/lib/libA.dart';
-    const pkgFileB = '/pkgB/lib/libB.dart';
-    provider.newFile(pkgFileA, 'library lib_a;');
-    provider.newFile(pkgFileB, 'library lib_b;');
+  void test_resolve_multiple_folders() {
+    const pkgFileA = '/part1/lib/libA.dart';
+    const pkgFileB = '/part2/lib/libB.dart';
+    provider.newFile(pkgFileA, 'library lib_a');
+    provider.newFile(pkgFileB, 'library lib_b');
     PackageMapUriResolver resolver =
         new PackageMapUriResolver(provider, <String, List<Folder>>{
-      'pkgA': [provider.getResource('/pkgA/lib/')],
-      'pkgB': [provider.getResource('/pkgB/lib/')]
+      'pkg': [
+          provider.getResource('/part1/lib/'),
+          provider.getResource('/part2/lib/')]
     });
     {
-      Uri uri = Uri.parse('package:pkgA/libA.dart');
+      Uri uri = Uri.parse('package:pkg/libA.dart');
       Source result = resolver.resolveAbsolute(uri);
       expect(result, isNotNull);
       expect(result.exists(), isTrue);
@@ -95,7 +94,7 @@ class _PackageMapUriResolverTest {
       expect(result.fullName, pkgFileA);
     }
     {
-      Uri uri = Uri.parse('package:pkgB/libB.dart');
+      Uri uri = Uri.parse('package:pkg/libB.dart');
       Source result = resolver.resolveAbsolute(uri);
       expect(result, isNotNull);
       expect(result.exists(), isTrue);
@@ -104,19 +103,25 @@ class _PackageMapUriResolverTest {
     }
   }
 
-  void test_resolve_multiple_folders() {
-    const pkgFileA = '/part1/lib/libA.dart';
-    const pkgFileB = '/part2/lib/libB.dart';
-    provider.newFile(pkgFileA, 'library lib_a');
-    provider.newFile(pkgFileB, 'library lib_b');
+  void test_resolve_nonPackage() {
+    UriResolver resolver = new PackageMapUriResolver(provider, EMPTY_MAP);
+    Uri uri = Uri.parse('dart:core');
+    Source result = resolver.resolveAbsolute(uri);
+    expect(result, isNull);
+  }
+
+  void test_resolve_OK() {
+    const pkgFileA = '/pkgA/lib/libA.dart';
+    const pkgFileB = '/pkgB/lib/libB.dart';
+    provider.newFile(pkgFileA, 'library lib_a;');
+    provider.newFile(pkgFileB, 'library lib_b;');
     PackageMapUriResolver resolver =
         new PackageMapUriResolver(provider, <String, List<Folder>>{
-      'pkg': [
-          provider.getResource('/part1/lib/'),
-          provider.getResource('/part2/lib/')]
+      'pkgA': [provider.getResource('/pkgA/lib/')],
+      'pkgB': [provider.getResource('/pkgB/lib/')]
     });
     {
-      Uri uri = Uri.parse('package:pkg/libA.dart');
+      Uri uri = Uri.parse('package:pkgA/libA.dart');
       Source result = resolver.resolveAbsolute(uri);
       expect(result, isNotNull);
       expect(result.exists(), isTrue);
@@ -124,7 +129,7 @@ class _PackageMapUriResolverTest {
       expect(result.fullName, pkgFileA);
     }
     {
-      Uri uri = Uri.parse('package:pkg/libB.dart');
+      Uri uri = Uri.parse('package:pkgB/libB.dart');
       Source result = resolver.resolveAbsolute(uri);
       expect(result, isNotNull);
       expect(result.exists(), isTrue);
@@ -133,13 +138,6 @@ class _PackageMapUriResolverTest {
     }
   }
 
-  void test_resolve_nonPackage() {
-    UriResolver resolver = new PackageMapUriResolver(provider, EMPTY_MAP);
-    Uri uri = Uri.parse('dart:core');
-    Source result = resolver.resolveAbsolute(uri);
-    expect(result, isNull);
-  }
-
   void test_resolve_package_invalid_leadingSlash() {
     UriResolver resolver = new PackageMapUriResolver(provider, EMPTY_MAP);
     Uri uri = Uri.parse('package:/foo');