Format and sort analyzer and analysis_server packages.

pkg/analysis_server/test/services/refactoring/rename_unit_member_test.dart

Index: pkg/analysis_server/test/services/refactoring/rename_unit_member_test.dart
diff --git a/pkg/analysis_server/test/services/refactoring/rename_unit_member_test.dart b/pkg/analysis_server/test/services/refactoring/rename_unit_member_test.dart
index f78c21ae57686d20d49c1bd127c5d87117cbc6b9..4356a89b1131e11ccce27a8ea8f0c0cffe9ca4a2 100644
--- a/pkg/analysis_server/test/services/refactoring/rename_unit_member_test.dart
+++ b/pkg/analysis_server/test/services/refactoring/rename_unit_member_test.dart
@@ -5,9 +5,9 @@
 library test.services.refactoring.rename_unit_member;
 
 import 'package:analysis_server/src/protocol.dart';
-import '../../reflective_tests.dart';
 import 'package:unittest/unittest.dart';
 
+import '../../reflective_tests.dart';
 import 'abstract_rename.dart';
 
 
@@ -19,26 +19,6 @@ main() {
 
 @ReflectiveTestCase()
 class RenameUnitMemberTest extends RenameRefactoringTest {
-  test_checkFinalConditions_OK_qualifiedSuper_MethodElement() {
-    indexTestUnit('''
-class Test {}
-class A {
-  NewName() {}
-}
-class B extends A {
-  main() {
-    super.NewName(); // super-ref
-  }
-}
-''');
-    createRenameRefactoringAtString('Test {}');
-    // check status
-    refactoring.newName = 'NewName';
-    return refactoring.checkFinalConditions().then((status) {
-      assertRefactoringStatusOK(status);
-    });
-  }
-
   test_checkFinalConditions_hasTopLevel_ClassElement() {
     indexTestUnit('''
 class Test {}
@@ -74,13 +54,15 @@ typedef NewName(); // existing
     });
   }
 
-  test_checkFinalConditions_shadowedBy_MethodElement() {
+  test_checkFinalConditions_OK_qualifiedSuper_MethodElement() {
     indexTestUnit('''
 class Test {}
 class A {
-  void NewName() {}
+  NewName() {}
+}
+class B extends A {
   main() {
-    new Test();
+    super.NewName(); // super-ref
   }
 }
 ''');
@@ -88,24 +70,17 @@ class A {
     // check status
     refactoring.newName = 'NewName';
     return refactoring.checkFinalConditions().then((status) {
-      assertRefactoringStatus(
-          status,
-          RefactoringProblemSeverity.ERROR,
-          expectedMessage:
-              "Reference to renamed class will be shadowed by method 'A.NewName'.",
-          expectedContextSearch: 'NewName() {}');
+      assertRefactoringStatusOK(status);
     });
   }
 
-  test_checkFinalConditions_shadowsInSubClass_MethodElement() {
+  test_checkFinalConditions_shadowedBy_MethodElement() {
     indexTestUnit('''
 class Test {}
 class A {
-  NewName() {}
-}
-class B extends A {
+  void NewName() {}
   main() {
-    NewName(); // super-ref
+    new Test();
   }
 }
 ''');
@@ -116,8 +91,9 @@ class B extends A {
       assertRefactoringStatus(
           status,
           RefactoringProblemSeverity.ERROR,
-          expectedMessage: "Renamed class will shadow method 'A.NewName'.",
-          expectedContextSearch: 'NewName(); // super-ref');
+          expectedMessage:
+              "Reference to renamed class will be shadowed by method 'A.NewName'.",
+          expectedContextSearch: 'NewName() {}');
     });
   }
 
@@ -172,6 +148,30 @@ class B extends A {
     });
   }
 
+  test_checkFinalConditions_shadowsInSubClass_MethodElement() {
+    indexTestUnit('''
+class Test {}
+class A {
+  NewName() {}
+}
+class B extends A {
+  main() {
+    NewName(); // super-ref
+  }
+}
+''');
+    createRenameRefactoringAtString('Test {}');
+    // check status
+    refactoring.newName = 'NewName';
+    return refactoring.checkFinalConditions().then((status) {
+      assertRefactoringStatus(
+          status,
+          RefactoringProblemSeverity.ERROR,
+          expectedMessage: "Renamed class will shadow method 'A.NewName'.",
+          expectedContextSearch: 'NewName(); // super-ref');
+    });
+  }
+
   test_checkFinalConditions_shadowsInSubClass_notImportedLib() {
     indexUnit('/lib.dart', '''
 library my.lib;