| Index: pkg/analyzer/test/generated/resolver_test_case.dart
|
| diff --git a/pkg/analyzer/test/generated/resolver_test_case.dart b/pkg/analyzer/test/generated/resolver_test_case.dart
|
| index f6397f86a4a7cbaa0c8548189b3ef29b6b733abc..28f03cf18a6d37d84163a0cd560eb2602bdfd7df 100644
|
| --- a/pkg/analyzer/test/generated/resolver_test_case.dart
|
| +++ b/pkg/analyzer/test/generated/resolver_test_case.dart
|
| @@ -517,10 +517,11 @@ class ResolverTestCase extends EngineTestCase {
|
| analysisContext2.applyChanges(changeSet);
|
| }
|
|
|
| - Future<Null> computeAnalysisResult(Source source) async {
|
| + Future<TestAnalysisResult> computeAnalysisResult(Source source) async {
|
| + TestAnalysisResult analysisResult;
|
| if (enableNewAnalysisDriver) {
|
| AnalysisResult result = await driver.getResult(source.fullName);
|
| - analysisResults[source] =
|
| + analysisResult =
|
| new TestAnalysisResult(source, result.unit, result.errors);
|
| } else {
|
| analysisContext2.computeKindOf(source);
|
| @@ -529,9 +530,11 @@ class ResolverTestCase extends EngineTestCase {
|
| CompilationUnit unit =
|
| analysisContext.resolveCompilationUnit2(source, libraries.first);
|
| List<AnalysisError> errors = analysisContext.computeErrors(source);
|
| - analysisResults[source] = new TestAnalysisResult(source, unit, errors);
|
| + analysisResult = new TestAnalysisResult(source, unit, errors);
|
| }
|
| }
|
| + analysisResults[source] = analysisResult;
|
| + return analysisResult;
|
| }
|
|
|
| /**
|
| @@ -916,11 +919,10 @@ class StaticTypeAnalyzer2TestShared extends ResolverTestCase {
|
| Future<Null> resolveTestUnit(String code) async {
|
| testCode = code;
|
| testSource = addSource(testCode);
|
| - LibraryElement library = resolve2(testSource);
|
| - await computeAnalysisResult(testSource);
|
| + TestAnalysisResult analysisResult = await computeAnalysisResult(testSource);
|
| assertNoErrors(testSource);
|
| verify([testSource]);
|
| - testUnit = resolveCompilationUnit(testSource, library);
|
| + testUnit = analysisResult.unit;
|
| }
|
|
|
| /**
|
|
|