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

pkg/analysis_server/test/analysis_notification_outline_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.domain.analysis.notification.outline;
 
 import 'dart:async';
 
 import 'package:analysis_server/src/analysis_server.dart';
 import 'package:analysis_server/src/computer/computer_outline.dart';
@@ skipping 10 matching lines @@
   group('notification.outline', () {
     runReflectiveTests(_AnalysisNotificationOutlineTest);
   });
 }
 
 
 @ReflectiveTestCase()
 class _AnalysisNotificationOutlineTest extends AbstractAnalysisTest {
   Outline outline;
 
-  Future prepareOutline(then()) {
+  Future prepareOutline() {
     addAnalysisSubscription(AnalysisService.OUTLINE, testFile);
-    return waitForTasksFinished().then((_) {
-      then();
-    });
+    return waitForTasksFinished();
   }
 
   void processNotification(Notification notification) {
     if (notification.event == ANALYSIS_OUTLINE) {
       String file = notification.getParameter(FILE);
       if (file == testFile) {
         Map<String, Object> json = notification.getParameter(OUTLINE);
         outline = new Outline.fromJson(json);
       }
     }
   }
 
   @override
   void setUp() {
     super.setUp();
     createProject();
   }
 
   test_afterAnalysis() {
     addTestFile('''
 class AAA {
 }
 class BBB {
 }
 ''');
     return waitForTasksFinished().then((_) {
       expect(outline, isNull);
-      return prepareOutline(() {
+      return prepareOutline().then((_) {
         Outline unitOutline = outline;
         List<Outline> outlines = unitOutline.children;
         expect(outlines, hasLength(2));
       });
     });
   }
 
   test_class() {
     addTestFile('''
 class A {
   int fa, fb;
   String fc;
   A(int i, String s);
   A.name(num p);
   A._privateName(num p);
   static String ma(int pa) => null;
   _mb(int pb);
   String get propA => null;
   set propB(int v) {}
 }
 class B {
   B(int p);
 }");
 ''');
-    return prepareOutline(() {
+    return prepareOutline().then((_) {
       Outline unitOutline = outline;
       List<Outline> topOutlines = unitOutline.children;
       expect(topOutlines, hasLength(2));
       // A
       {
         Outline outline_A = topOutlines[0];
         Element element_A = outline_A.element;
         expect(element_A.kind, ElementKind.CLASS);
         expect(element_A.name, "A");
         {
@@ skipping 175 matching lines @@
     local_m() {}
   }
 }
 f() {
   local_f1(int i) {}
   local_f2(String s) {
     local_f21(int p) {}
   }
 }
 ''');
-    return prepareOutline(() {
+    return prepareOutline().then((_) {
       Outline unitOutline = outline;
       List<Outline> topOutlines = unitOutline.children;
       expect(topOutlines, hasLength(2));
       // A
       {
         Outline outline_A = topOutlines[0];
         Element element_A = outline_A.element;
         expect(element_A.kind, ElementKind.CLASS);
         expect(element_A.name, "A");
         {
@@ skipping 127 matching lines @@
     });
   }
 
   test_sourceRange_inClass() {
     addTestFile('''
 class A { // leftA
   int methodA() {} // endA
   int methodB() {} // endB
 }
 ''');
-    return prepareOutline(() {
+    return prepareOutline().then((_) {
       Outline unitOutline = outline;
       List<Outline> outlines = unitOutline.children[0].children;
       expect(outlines, hasLength(2));
       // methodA
       {
         Outline outline = outlines[0];
         Element element = outline.element;
         expect(element.kind, ElementKind.METHOD);
         expect(element.name, "methodA");
         {
@@ skipping 19 matching lines @@
     });
   }
 
   test_sourceRange_inClass_inVariableList() {
     addTestFile('''
 class A { // leftA
   int fieldA, fieldB, fieldC; // marker
   int fieldD; // marker2
 }
 ''');
-    return prepareOutline(() {
+    return prepareOutline().then((_) {
       Outline unitOutline = outline;
       List<Outline> outlines = unitOutline.children[0].children;
       expect(outlines, hasLength(4));
       // fieldA
       {
         Outline outline = outlines[0];
         Element element = outline.element;
         expect(element.kind, ElementKind.FIELD);
         expect(element.name, "fieldA");
         {
@@ skipping 45 matching lines @@
     });
   }
 
   test_sourceRange_inUnit() {
     addTestFile('''
 class A {
 } // endA
 class B {
 } // endB
 ''');
-    return prepareOutline(() {
+    return prepareOutline().then((_) {
       Outline unitOutline = outline;
       List<Outline> topOutlines = unitOutline.children;
       expect(topOutlines, hasLength(2));
       // A
       {
         Outline outline = topOutlines[0];
         Element element = outline.element;
         expect(element.kind, ElementKind.CLASS);
         expect(element.name, "A");
         {
@@ skipping 17 matching lines @@
         }
       }
     });
   }
 
   test_sourceRange_inUnit_inVariableList() {
     addTestFile('''
 int fieldA, fieldB, fieldC; // marker
 int fieldD; // marker2
 ''');
-    return prepareOutline(() {
+    return prepareOutline().then((_) {
       Outline unitOutline = outline;
       List<Outline> outlines = unitOutline.children;
       expect(outlines, hasLength(4));
       // fieldA
       {
         Outline outline = outlines[0];
         Element element = outline.element;
         expect(element.kind, ElementKind.TOP_LEVEL_VARIABLE);
         expect(element.name, "fieldA");
         {
@@ skipping 50 matching lines @@
 typedef String FTA(int i, String s);
 typedef FTB(int p);
 class A {}
 class B {}
 class CTA = A with B;
 String fA(int i, String s) => null;
 fB(int p) => null;
 String get propA => null;
 set propB(int v) {}
 ''');
-    return prepareOutline(() {
+    return prepareOutline().then((_) {
       Outline unitOutline = outline;
       List<Outline> topOutlines = unitOutline.children;
       expect(topOutlines, hasLength(9));
       // FTA
       {
         Outline outline = topOutlines[0];
         Element element = outline.element;
         expect(element.kind, ElementKind.FUNCTION_TYPE_ALIAS);
         expect(element.name, "FTA");
         {
@@ skipping 84 matching lines @@
           Location location = element.location;
           expect(location.offset, testCode.indexOf("propB(int v) {}"));
           expect(location.length, "propB".length);
         }
         expect(element.parameters, "(int v)");
         expect(element.returnType, "");
       }
     });
   }
 }