Use futures uniformly rather than a mix of futures and CPS in tests.

pkg/analysis_server/test/analysis_notification_overrides_test.dart

Index: pkg/analysis_server/test/analysis_notification_overrides_test.dart
diff --git a/pkg/analysis_server/test/analysis_notification_overrides_test.dart b/pkg/analysis_server/test/analysis_notification_overrides_test.dart
index 34ca127cd8a3decdfecfafb3f2c13b30b7a49056..6a6599c0ea09a149150c8d6e97ecbe4cebdc4829 100644
--- a/pkg/analysis_server/test/analysis_notification_overrides_test.dart
+++ b/pkg/analysis_server/test/analysis_notification_overrides_test.dart
@@ -40,8 +40,9 @@ class AnalysisNotificationOverridesTest extends AbstractAnalysisTest {
         return;
       }
     }
-    fail('Expect to find an overridden interface elements at $offset in '
-        '${override.interfaceElements.join('\n')}');
+    fail(
+        'Expect to find an overridden interface elements at $offset in '
+            '${override.interfaceElements.join('\n')}');
   }
 
   /**
@@ -94,24 +95,24 @@ class AnalysisNotificationOverridesTest extends AbstractAnalysisTest {
     for (Override override in overridesList) {
       if (override.offset == offset && override.length == length) {
         if (exists == false) {
-          fail('Not expected to find (offset=$offset; length=$length) in\n'
-              '${overridesList.join('\n')}');
+          fail(
+              'Not expected to find (offset=$offset; length=$length) in\n'
+                  '${overridesList.join('\n')}');
         }
         this.override = override;
         return;
       }
     }
     if (exists == true) {
-      fail('Expected to find (offset=$offset; length=$length) in\n'
-          '${overridesList.join('\n')}');
+      fail(
+          'Expected to find (offset=$offset; length=$length) in\n'
+              '${overridesList.join('\n')}');
     }
   }
 
-  Future prepareOverrides(then()) {
+  Future prepareOverrides() {
     addAnalysisSubscription(AnalysisService.OVERRIDES, testFile);
-    return waitForTasksFinished().then((_) {
-      then();
-    });
+    return waitForTasksFinished();
   }
 
   void processNotification(Notification notification) {
@@ -119,8 +120,8 @@ class AnalysisNotificationOverridesTest extends AbstractAnalysisTest {
       String file = notification.getParameter(FILE);
       if (file == testFile) {
         overridesList = <Override>[];
-        List<Map<String, Object>> jsonList = notification.getParameter(
-            OVERRIDES);
+        List<Map<String, Object>> jsonList =
+            notification.getParameter(OVERRIDES);
         for (Map<String, Object> json in jsonList) {
           overridesList.add(new Override.fromJson(json));
         }
@@ -143,7 +144,7 @@ class B implements A {
 }
 ''');
     return waitForTasksFinished().then((_) {
-      return prepareOverrides(() {
+      return prepareOverrides().then((_) {
         assertHasOverride('m() {} // in B');
         assertNoSuperElement();
         assertHasInterfaceElement('m() {} // in A');
@@ -163,7 +164,7 @@ class A implements IA, IB {
   m() {} // in A
 }
 ''');
-    return prepareOverrides(() {
+    return prepareOverrides().then((_) {
       assertHasOverride('m() {} // in A');
       assertNoSuperElement();
       assertHasInterfaceElement('m() {} // in IA');
@@ -180,7 +181,7 @@ class B implements A {
   m() {} // in B
 }
 ''');
-    return prepareOverrides(() {
+    return prepareOverrides().then((_) {
       assertHasOverride('m() {} // in B');
       assertNoSuperElement();
       assertHasInterfaceElement('m() {} // in A');
@@ -198,7 +199,7 @@ class C implements B {
   m() {} // in C
 }
 ''');
-    return prepareOverrides(() {
+    return prepareOverrides().then((_) {
       assertHasOverride('m() {} // in C');
       assertNoSuperElement();
       assertHasInterfaceElement('m() {} // in A');
@@ -214,7 +215,7 @@ class B extends A {
   int fff; // in B
 }
 ''');
-    return prepareOverrides(() {
+    return prepareOverrides().then((_) {
       assertHasOverride('fff; // in B');
       assertHasSuperElement('fff; // in A');
       assertNoInterfaceElements();
@@ -230,7 +231,7 @@ class B extends A {
   get fff => 0; // in B
 }
 ''');
-    return prepareOverrides(() {
+    return prepareOverrides().then((_) {
       assertHasOverride('fff => 0; // in B');
       assertHasSuperElement('fff; // in A');
       assertNoInterfaceElements();
@@ -246,7 +247,7 @@ class B extends A {
   fff() {} // in B
 }
 ''');
-    return prepareOverrides(() {
+    return prepareOverrides().then((_) {
       assertHasOverride('fff() {} // in B');
       assertHasSuperElement('fff; // in A');
       assertNoInterfaceElements();
@@ -262,7 +263,7 @@ class B extends A {
   set fff(x) {} // in B
 }
 ''');
-    return prepareOverrides(() {
+    return prepareOverrides().then((_) {
       assertHasOverride('fff(x) {} // in B');
       assertHasSuperElement('fff; // in A');
       assertNoInterfaceElements();
@@ -279,7 +280,7 @@ class B extends A {
   int fff; // in B
 }
 ''');
-    return prepareOverrides(() {
+    return prepareOverrides().then((_) {
       assertHasOverride('fff; // in B');
       assertHasSuperElement('fff => 0; // in A');
       assertNoInterfaceElements();
@@ -295,7 +296,7 @@ class B extends A {
   get fff => 0; // in B
 }
 ''');
-    return prepareOverrides(() {
+    return prepareOverrides().then((_) {
       assertHasOverride('fff => 0; // in B');
       assertHasSuperElement('fff => 0; // in A');
       assertNoInterfaceElements();
@@ -311,7 +312,7 @@ class B extends A {
   m() {} // in B
 }
 ''');
-    return prepareOverrides(() {
+    return prepareOverrides().then((_) {
       assertHasOverride('m() {} // in B');
       assertHasSuperElement('m() {} // in A');
       assertNoInterfaceElements();
@@ -329,7 +330,7 @@ class C extends B {
   m() {} // in C
 }
 ''');
-    return prepareOverrides(() {
+    return prepareOverrides().then((_) {
       assertHasOverride('m() {} // in C');
       assertHasSuperElement('m() {} // in A');
       assertNoInterfaceElements();
@@ -345,7 +346,7 @@ class B extends A {
   set fff(x) {} // in B
 }
 ''');
-    return prepareOverrides(() {
+    return prepareOverrides().then((_) {
       assertHasOverride('fff(x) {} // in B');
       assertHasSuperElement('fff(x) {} // in A');
       assertNoInterfaceElements();