Convert refactoring tests to use 'await'.

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

 // Copyright (c) 2014, 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 test.services.refactoring.rename_class_member;
 
 import 'package:analysis_server/src/protocol.dart';
+import 'package:analysis_server/src/services/correction/status.dart';
 import 'package:unittest/unittest.dart';
 
 import '../../reflective_tests.dart';
 import 'abstract_rename.dart';
 
 
 main() {
   groupSep = ' | ';
   runReflectiveTests(RenameClassMemberTest);
 }
 
 
 @reflectiveTest
 class RenameClassMemberTest extends RenameRefactoringTest {
-  test_checkFinalConditions_hasMember_MethodElement() {
+  test_checkFinalConditions_hasMember_MethodElement() async {
     indexTestUnit('''
 class A {
   test() {}
   newName() {} // existing
 }
 ''');
     createRenameRefactoringAtString('test() {}');
     // check status
     refactoring.newName = 'newName';
-    return refactoring.checkFinalConditions().then((status) {
-      assertRefactoringStatus(
-          status,
-          RefactoringProblemSeverity.ERROR,
-          expectedMessage: "Class 'A' already declares method with name 'newName'.",
-          expectedContextSearch: 'newName() {} // existing');
-    });
+    RefactoringStatus status = await refactoring.checkFinalConditions();
+    assertRefactoringStatus(
+        status,
+        RefactoringProblemSeverity.ERROR,
+        expectedMessage: "Class 'A' already declares method with name 'newName'.",
+        expectedContextSearch: 'newName() {} // existing');
   }
 
-  test_checkFinalConditions_OK_noShadow() {
+  test_checkFinalConditions_OK_noShadow() async {
     indexTestUnit('''
 class A {
   int newName;
 }
 class B {
   test() {}
 }
 class C extends A {
   main() {
     print(newName);
   }
 }
 ''');
     createRenameRefactoringAtString('test() {}');
     // check status
     refactoring.newName = 'newName';
-    return refactoring.checkFinalConditions().then((status) {
-      assertRefactoringStatusOK(status);
-    });
+    RefactoringStatus status = await refactoring.checkFinalConditions();
+    assertRefactoringStatusOK(status);
   }
 
-  test_checkFinalConditions_shadowed_byLocal_inSameClass() {
+  test_checkFinalConditions_shadowed_byLocal_inSameClass() async {
     indexTestUnit('''
 class A {
   test() {}
   main() {
     var newName;
     test(); // marker
   }
 }
 ''');
     createRenameRefactoringAtString('test() {}');
     // check status
     refactoring.newName = 'newName';
-    return refactoring.checkFinalConditions().then((status) {
-      assertRefactoringStatus(
-          status,
-          RefactoringProblemSeverity.ERROR,
-          expectedMessage:
-              "Usage of renamed method will be shadowed by local variable 'newName'.",
-          expectedContextSearch: 'test(); // marker');
-    });
+    RefactoringStatus status = await refactoring.checkFinalConditions();
+    assertRefactoringStatus(
+        status,
+        RefactoringProblemSeverity.ERROR,
+        expectedMessage:
+            "Usage of renamed method will be shadowed by local variable 'newName'.",
+        expectedContextSearch: 'test(); // marker');
   }
 
-  test_checkFinalConditions_shadowed_byLocal_inSubClass() {
+  test_checkFinalConditions_shadowed_byLocal_inSubClass() async {
     indexTestUnit('''
 class A {
   test() {}
 }
 class B extends A {
   main() {
     var newName;
     test(); // marker
   }
 }
 ''');
     createRenameRefactoringAtString('test() {}');
     // check status
     refactoring.newName = 'newName';
-    return refactoring.checkFinalConditions().then((status) {
-      assertRefactoringStatus(
-          status,
-          RefactoringProblemSeverity.ERROR,
-          expectedMessage:
-              "Usage of renamed method will be shadowed by local variable 'newName'.",
-          expectedContextSearch: 'test(); // marker');
-    });
+    RefactoringStatus status = await refactoring.checkFinalConditions();
+    assertRefactoringStatus(
+        status,
+        RefactoringProblemSeverity.ERROR,
+        expectedMessage:
+            "Usage of renamed method will be shadowed by local variable 'newName'.",
+        expectedContextSearch: 'test(); // marker');
   }
 
-  test_checkFinalConditions_shadowed_byLocal_OK_qualifiedReference() {
+  test_checkFinalConditions_shadowed_byLocal_OK_qualifiedReference() async {
     indexTestUnit('''
 class A {
   test() {}
   main() {
     var newName;
     this.test(); // marker
   }
 }
 ''');
     createRenameRefactoringAtString('test() {}');
     // check status
     refactoring.newName = 'newName';
-    return refactoring.checkFinalConditions().then((status) {
-      assertRefactoringStatusOK(status);
-    });
+    RefactoringStatus status = await refactoring.checkFinalConditions();
+    assertRefactoringStatusOK(status);
   }
 
-  test_checkFinalConditions_shadowed_byLocal_OK_renamedNotUsed() {
+  test_checkFinalConditions_shadowed_byLocal_OK_renamedNotUsed() async {
     indexTestUnit('''
 class A {
   test() {}
   main() {
     var newName;
   }
 }
 ''');
     createRenameRefactoringAtString('test() {}');
     // check status
     refactoring.newName = 'newName';
-    return refactoring.checkFinalConditions().then((status) {
-      assertRefactoringStatusOK(status);
-    });
+    RefactoringStatus status = await refactoring.checkFinalConditions();
+    assertRefactoringStatusOK(status);
   }
 
-  test_checkFinalConditions_shadowed_byParameter_inSameClass() {
+  test_checkFinalConditions_shadowed_byParameter_inSameClass() async {
     indexTestUnit('''
 class A {
   test() {}
   main(newName) {
     test(); // marker
   }
 }
 ''');
     createRenameRefactoringAtString('test() {}');
     // check status
     refactoring.newName = 'newName';
-    return refactoring.checkFinalConditions().then((status) {
-      assertRefactoringStatus(
-          status,
-          RefactoringProblemSeverity.ERROR,
-          expectedMessage:
-              "Usage of renamed method will be shadowed by parameter 'newName'.",
-          expectedContextSearch: 'test(); // marker');
-    });
+    RefactoringStatus status = await refactoring.checkFinalConditions();
+    assertRefactoringStatus(
+        status,
+        RefactoringProblemSeverity.ERROR,
+        expectedMessage:
+            "Usage of renamed method will be shadowed by parameter 'newName'.",
+        expectedContextSearch: 'test(); // marker');
   }
 
-  test_checkFinalConditions_shadowed_inSubClass() {
+  test_checkFinalConditions_shadowed_inSubClass() async {
     indexTestUnit('''
 class A {
   newName() {} // marker
 }
 class B extends A {
   test() {}
   main() {
     newName();
   }
 }
 ''');
     createRenameRefactoringAtString('test() {}');
     // check status
     refactoring.newName = 'newName';
-    return refactoring.checkFinalConditions().then((status) {
-      assertRefactoringStatus(
-          status,
-          RefactoringProblemSeverity.ERROR,
-          expectedMessage: "Renamed method will shadow method 'A.newName'.",
-          expectedContextSearch: 'newName() {} // marker');
-    });
+    RefactoringStatus status = await refactoring.checkFinalConditions();
+    assertRefactoringStatus(
+        status,
+        RefactoringProblemSeverity.ERROR,
+        expectedMessage: "Renamed method will shadow method 'A.newName'.",
+        expectedContextSearch: 'newName() {} // marker');
   }
 
-  test_checkFinalConditions_shadowsSuper_inSubClass_FieldElement() {
+  test_checkFinalConditions_shadowsSuper_inSubClass_FieldElement() async {
     indexTestUnit('''
 class A {
   int newName; // marker
 }
 class B extends A {
   test() {}
 }
 class C extends B {
   main() {
     print(newName);
   }
 }
 ''');
     createRenameRefactoringAtString('test() {}');
     // check status
     refactoring.newName = 'newName';
-    return refactoring.checkFinalConditions().then((status) {
-      assertRefactoringStatus(
-          status,
-          RefactoringProblemSeverity.ERROR,
-          expectedMessage: "Renamed method will shadow field 'A.newName'.",
-          expectedContextSearch: 'newName; // marker');
-    });
+    RefactoringStatus status = await refactoring.checkFinalConditions();
+    assertRefactoringStatus(
+        status,
+        RefactoringProblemSeverity.ERROR,
+        expectedMessage: "Renamed method will shadow field 'A.newName'.",
+        expectedContextSearch: 'newName; // marker');
   }
 
-  test_checkFinalConditions_shadowsSuper_MethodElement() {
+  test_checkFinalConditions_shadowsSuper_MethodElement() async {
     indexTestUnit('''
 class A {
   test() {}
 }
 class B extends A {
   newName() {} // marker
   main() {
     test();
   }
 }
 ''');
     createRenameRefactoringAtString('test() {}');
     // check status
     refactoring.newName = 'newName';
-    return refactoring.checkFinalConditions().then((status) {
-      assertRefactoringStatus(
-          status,
-          RefactoringProblemSeverity.ERROR,
-          expectedMessage: "Renamed method will be shadowed by method 'B.newName'.",
-          expectedContextSearch: 'newName() {} // marker');
-    });
+    RefactoringStatus status = await refactoring.checkFinalConditions();
+    assertRefactoringStatus(
+        status,
+        RefactoringProblemSeverity.ERROR,
+        expectedMessage: "Renamed method will be shadowed by method 'B.newName'.",
+        expectedContextSearch: 'newName() {} // marker');
   }
 
-  test_checkInitialConditions_operator() {
+  test_checkInitialConditions_operator() async {
     indexTestUnit('''
 class A {
   operator -(other) => this;
 }
 ''');
     createRenameRefactoringAtString('-(other)');
     // check status
     refactoring.newName = 'newName';
-    return refactoring.checkInitialConditions().then((status) {
-      assertRefactoringStatus(status, RefactoringProblemSeverity.FATAL);
-    });
+    RefactoringStatus status = await refactoring.checkInitialConditions();
+    assertRefactoringStatus(status, RefactoringProblemSeverity.FATAL);
   }
 
   test_checkNewName_FieldElement() {
     indexTestUnit('''
 class A {
   int test;
 }
 ''');
     createRenameRefactoringAtString('test;');
     // null
@@ skipping 268 matching lines @@
   E e = new E();
   a.newName();
   b.newName();
   c.newName();
   d.newName();
   e.test();
 }
 ''');
   }
 
-  test_createChange_MethodElement_potential() {
+  test_createChange_MethodElement_potential() async {
     indexTestUnit('''
 class A {
   test() {}
 }
 main(var a) {
   a.test(); // 1
   new A().test();
   a.test(); // 2
 }
 ''');
     // configure refactoring
     createRenameRefactoringAtString('test() {}');
     expect(refactoring.refactoringName, 'Rename Method');
     expect(refactoring.oldName, 'test');
     refactoring.newName = 'newName';
     // validate change
-    return assertSuccessfulRefactoring('''
+    await assertSuccessfulRefactoring('''
 class A {
   newName() {}
 }
 main(var a) {
   a.newName(); // 1
   new A().newName();
   a.newName(); // 2
 }
-''').then((_) {
-      assertPotentialEdits(['test(); // 1', 'test(); // 2']);
-    });
+''');
+    assertPotentialEdits(['test(); // 1', 'test(); // 2']);
   }
 
-  test_createChange_MethodElement_potential_private_otherLibrary() {
+  test_createChange_MethodElement_potential_private_otherLibrary() async {
     indexUnit('/lib.dart', '''
 library lib;
 main(p) {
   p._test();
 }
 ''');
     indexTestUnit('''
 class A {
   _test() {}
 }
 main(var a) {
   a._test();
   new A()._test();
 }
 ''');
     // configure refactoring
     createRenameRefactoringAtString('_test() {}');
     expect(refactoring.refactoringName, 'Rename Method');
     expect(refactoring.oldName, '_test');
     refactoring.newName = 'newName';
     // validate change
-    return assertSuccessfulRefactoring('''
+    await assertSuccessfulRefactoring('''
 class A {
   newName() {}
 }
 main(var a) {
   a.newName();
   new A().newName();
 }
-''').then((_) {
-      assertNoFileChange('/lib.dart');
-    });
+''');
+    assertNoFileChange('/lib.dart');
   }
 
   test_createChange_PropertyAccessorElement_getter() {
     indexTestUnit('''
 class A {
   get test {} // marker
   set test(x) {}
   main() {
     print(test);
     test = 1;
@@ skipping 116 matching lines @@
     // validate change
     return assertSuccessfulRefactoring('''
 class A<NewName> {
   NewName field;
   List<NewName> items;
   NewName method(NewName p) => null;
 }
 ''');
   }
 }