Fix tests for resolving documentation with the new analysis driver.

pkg/analyzer/test/generated/non_error_resolver_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 analyzer.test.generated.non_error_resolver_test;
 
 import 'dart:async';
 
 import 'package:analyzer/dart/ast/ast.dart';
 import 'package:analyzer/dart/ast/standard_resolution_map.dart';
@@ skipping 1001 matching lines @@
 
   test_class_type_alias_documentationComment() async {
     Source source = addSource('''
 /**
  * Documentation
  */
 class C = D with E;
 
 class D {}
 class E {}''');
-    await computeAnalysisResult(source);
+    TestAnalysisResult analysisResult = await computeAnalysisResult(source);
     assertNoErrors(source);
     verify([source]);
-    CompilationUnit unit = await _getResolvedLibraryUnit(source);
+    CompilationUnit unit = analysisResult.unit;
     ClassElement classC =
         resolutionMap.elementDeclaredByCompilationUnit(unit).getType('C');
     expect(classC.documentationComment, isNotNull);
   }
 
   test_commentReference_beforeConstructor() async {
     String code = r'''
 abstract class A {
   /// [p]
   A(int p) {}
 }''';
     Source source = addSource(code);
-    await computeAnalysisResult(source);
+    TestAnalysisResult analysisResult = await computeAnalysisResult(source);
     assertNoErrors(source);
     verify([source]);
-    CompilationUnit unit = await _getResolvedLibraryUnit(source);
+    CompilationUnit unit = analysisResult.unit;
     {
       SimpleIdentifier ref =
           EngineTestCase.findSimpleIdentifier(unit, code, "p]");
       expect(ref.staticElement, new isInstanceOf<ParameterElement>());
     }
   }
 
   test_commentReference_beforeEnum() async {
     String code = r'''
 /// This is the [Samurai] kind.
 enum Samurai {
   /// Use [int].
   WITH_SWORD,
   /// Like [WITH_SWORD], but only without one.
   WITHOUT_SWORD
 }''';
     Source source = addSource(code);
-    await computeAnalysisResult(source);
+    TestAnalysisResult analysisResult = await computeAnalysisResult(source);
     assertNoErrors(source);
     verify([source]);
-    CompilationUnit unit = await _getResolvedLibraryUnit(source);
+    CompilationUnit unit = analysisResult.unit;
     {
       SimpleIdentifier ref =
           EngineTestCase.findSimpleIdentifier(unit, code, 'Samurai]');
       ClassElement refElement = ref.staticElement;
       expect(refElement, isNotNull);
       expect(refElement.name, 'Samurai');
     }
     {
       SimpleIdentifier ref =
           EngineTestCase.findSimpleIdentifier(unit, code, 'int]');
       ClassElement refElement = ref.staticElement;
       expect(refElement, isNotNull);
       expect(refElement.name, 'int');
     }
     {
       SimpleIdentifier ref =
           EngineTestCase.findSimpleIdentifier(unit, code, 'WITH_SWORD]');
       PropertyAccessorElement refElement = ref.staticElement;
       expect(refElement, isNotNull);
       expect(refElement.name, 'WITH_SWORD');
     }
   }
 
   test_commentReference_beforeFunction_blockBody() async {
     String code = r'''
 /// [p]
 foo(int p) {
 }''';
     Source source = addSource(code);
-    await computeAnalysisResult(source);
+    TestAnalysisResult analysisResult = await computeAnalysisResult(source);
     assertNoErrors(source);
     verify([source]);
-    CompilationUnit unit = await _getResolvedLibraryUnit(source);
+    CompilationUnit unit = analysisResult.unit;
     SimpleIdentifier ref =
         EngineTestCase.findSimpleIdentifier(unit, code, 'p]');
     expect(ref.staticElement, new isInstanceOf<ParameterElement>());
   }
 
   test_commentReference_beforeFunction_expressionBody() async {
     String code = r'''
 /// [p]
 foo(int p) => null;''';
     Source source = addSource(code);
-    await computeAnalysisResult(source);
+    TestAnalysisResult analysisResult = await computeAnalysisResult(source);
     assertNoErrors(source);
     verify([source]);
-    CompilationUnit unit = await _getResolvedLibraryUnit(source);
+    CompilationUnit unit = analysisResult.unit;
     SimpleIdentifier ref =
         EngineTestCase.findSimpleIdentifier(unit, code, 'p]');
     expect(ref.staticElement, new isInstanceOf<ParameterElement>());
   }
 
   test_commentReference_beforeFunctionTypeAlias() async {
     String code = r'''
 /// [p]
 typedef Foo(int p);
 ''';
     Source source = addSource(code);
-    await computeAnalysisResult(source);
+    TestAnalysisResult analysisResult = await computeAnalysisResult(source);
     assertNoErrors(source);
     verify([source]);
-    CompilationUnit unit = await _getResolvedLibraryUnit(source);
+    CompilationUnit unit = analysisResult.unit;
     SimpleIdentifier ref =
         EngineTestCase.findSimpleIdentifier(unit, code, 'p]');
     expect(ref.staticElement, new isInstanceOf<ParameterElement>());
   }
 
   test_commentReference_beforeGetter() async {
     String code = r'''
 abstract class A {
   /// [int]
   get g => null;
 }''';
     Source source = addSource(code);
-    await computeAnalysisResult(source);
+    TestAnalysisResult analysisResult = await computeAnalysisResult(source);
     assertNoErrors(source);
     verify([source]);
-    CompilationUnit unit = await _getResolvedLibraryUnit(source);
+    CompilationUnit unit = analysisResult.unit;
     {
       SimpleIdentifier ref =
           EngineTestCase.findSimpleIdentifier(unit, code, 'int]');
       expect(ref.staticElement, isNotNull);
     }
   }
 
   test_commentReference_beforeMethod() async {
     String code = r'''
 abstract class A {
   /// [p1]
   ma(int p1) {}
   /// [p2]
   mb(int p2);
   /// [p3] and [p4]
   mc(int p3, p4());
   /// [p5]
   md(int p5, {int p6});
 }''';
     Source source = addSource(code);
-    await computeAnalysisResult(source);
+    TestAnalysisResult analysisResult = await computeAnalysisResult(source);
     assertNoErrors(source);
     verify([source]);
-    CompilationUnit unit = await _getResolvedLibraryUnit(source);
+    CompilationUnit unit = analysisResult.unit;
     assertIsParameter(String search) {
       SimpleIdentifier ref =
           EngineTestCase.findSimpleIdentifier(unit, code, search);
       expect(ref.staticElement, new isInstanceOf<ParameterElement>());
     }
 
     assertIsParameter('p1');
     assertIsParameter('p2');
     assertIsParameter('p3');
     assertIsParameter('p4');
     assertIsParameter('p5');
     assertIsParameter('p6');
   }
 
   test_commentReference_class() async {
     String code = r'''
 /// [foo]
 class A {
   foo() {}
 }''';
     Source source = addSource(code);
-    await computeAnalysisResult(source);
+    TestAnalysisResult analysisResult = await computeAnalysisResult(source);
     assertNoErrors(source);
     verify([source]);
-    CompilationUnit unit = await _getResolvedLibraryUnit(source);
+    CompilationUnit unit = analysisResult.unit;
     SimpleIdentifier ref =
         EngineTestCase.findSimpleIdentifier(unit, code, 'foo]');
     expect(ref.staticElement, new isInstanceOf<MethodElement>());
   }
 
   test_commentReference_setter() async {
     String code = r'''
 class A {
   /// [x] in A
   mA() {}
   set x(value) {}
 }
 class B extends A {
   /// [x] in B
   mB() {}
 }
 ''';
     Source source = addSource(code);
-    await computeAnalysisResult(source);
+    TestAnalysisResult analysisResult = await computeAnalysisResult(source);
     assertNoErrors(source);
     verify([source]);
-    CompilationUnit unit = await _getResolvedLibraryUnit(source);
+    CompilationUnit unit = analysisResult.unit;
     {
       SimpleIdentifier ref =
           EngineTestCase.findSimpleIdentifier(unit, code, "x] in A");
       expect(ref.staticElement, new isInstanceOf<PropertyAccessorElement>());
     }
     {
       SimpleIdentifier ref =
           EngineTestCase.findSimpleIdentifier(unit, code, 'x] in B');
       expect(ref.staticElement, new isInstanceOf<PropertyAccessorElement>());
     }
@@ skipping 5040 matching lines @@
   }
 
   Future<Null> _check_wrongNumberOfParametersForOperator1(String name) async {
     await _check_wrongNumberOfParametersForOperator(name, "a");
   }
 
   Future<CompilationUnit> _getResolvedLibraryUnit(Source source) async {
     return analysisContext.getResolvedCompilationUnit2(source, source);
   }
 }