| Index: pkg/analysis_server/test/services/refactoring/abstract_refactoring.dart
|
| diff --git a/pkg/analysis_server/test/services/refactoring/abstract_refactoring.dart b/pkg/analysis_server/test/services/refactoring/abstract_refactoring.dart
|
| index 8f11a334b246e104086eb3c70afa2058f0147f15..b748ea7c86e89029475198663c0fc5810e04f803 100644
|
| --- a/pkg/analysis_server/test/services/refactoring/abstract_refactoring.dart
|
| +++ b/pkg/analysis_server/test/services/refactoring/abstract_refactoring.dart
|
| @@ -74,22 +74,19 @@ abstract class RefactoringTest extends AbstractSingleUnitTest {
|
| /**
|
| * Asserts that [refactoring] initial/final conditions status is OK.
|
| */
|
| - Future assertRefactoringConditionsOK() {
|
| - return refactoring.checkInitialConditions().then((status) {
|
| - assertRefactoringStatusOK(status);
|
| - return refactoring.checkFinalConditions().then((status) {
|
| - assertRefactoringStatusOK(status);
|
| - });
|
| - });
|
| + Future assertRefactoringConditionsOK() async {
|
| + RefactoringStatus status = await refactoring.checkInitialConditions();
|
| + assertRefactoringStatusOK(status);
|
| + status = await refactoring.checkFinalConditions();
|
| + assertRefactoringStatusOK(status);
|
| }
|
|
|
| /**
|
| * Asserts that [refactoring] final conditions status is OK.
|
| */
|
| - Future assertRefactoringFinalConditionsOK() {
|
| - return refactoring.checkFinalConditions().then((status) {
|
| - assertRefactoringStatusOK(status);
|
| - });
|
| + Future assertRefactoringFinalConditionsOK() async {
|
| + RefactoringStatus status = await refactoring.checkFinalConditions();
|
| + assertRefactoringStatusOK(status);
|
| }
|
|
|
| /**
|
| @@ -129,13 +126,11 @@ abstract class RefactoringTest extends AbstractSingleUnitTest {
|
| * Checks that all conditions of [refactoring] are OK and the result of
|
| * applying the [Change] to [testUnit] is [expectedCode].
|
| */
|
| - Future assertSuccessfulRefactoring(String expectedCode) {
|
| - return assertRefactoringConditionsOK().then((_) {
|
| - return refactoring.createChange().then((SourceChange change) {
|
| - this.refactoringChange = change;
|
| - assertTestChangeResult(expectedCode);
|
| - });
|
| - });
|
| + Future assertSuccessfulRefactoring(String expectedCode) async {
|
| + await assertRefactoringConditionsOK();
|
| + SourceChange change = await refactoring.createChange();
|
| + this.refactoringChange = change;
|
| + assertTestChangeResult(expectedCode);
|
| }
|
|
|
| /**
|
|
|