cleanup: simplify creation of AnalysisContext

lib/src/testing.dart

 // Copyright (c) 2015, 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 dev_compiler.src.testing;
 
 import 'package:analyzer/file_system/file_system.dart';
 import 'package:analyzer/file_system/memory_file_system.dart';
 import 'package:analyzer/src/generated/ast.dart';
-import 'package:analyzer/src/generated/element.dart';
 import 'package:analyzer/src/generated/engine.dart' show AnalysisContext;
 import 'package:logging/logging.dart';
 import 'package:source_span/source_span.dart';
 import 'package:unittest/unittest.dart';
 
-import 'package:dev_compiler/src/checker/dart_sdk.dart'
-    show mockSdkSources, dartSdkDirectory;
-import 'package:dev_compiler/src/checker/resolver.dart' show TypeResolver;
-import 'package:dev_compiler/src/utils.dart';
-import 'package:dev_compiler/src/info.dart';
-import 'package:dev_compiler/src/options.dart';
-import 'package:dev_compiler/src/report.dart';
 import 'package:dev_compiler/config.dart';
 import 'package:dev_compiler/devc.dart' show Compiler;
 
+import 'analysis_context.dart';
 import 'dependency_graph.dart' show runtimeFilesForServerMode;
+import 'info.dart';
+import 'options.dart';
+import 'report.dart';
+import 'utils.dart';
 
 /// Run the checker on a program with files contents as indicated in
 /// [testFiles].
 ///
 /// This function makes several assumptions to make it easier to describe error
 /// expectations:
 ///
 ///   * a file named `/main.dart` exists in [testFiles].
 ///   * all expected failures are listed in the source code using comments
 ///   immediately in front of the AST node that should contain the error.
@@ skipping 33 matching lines @@
       relaxedCasts: relaxedCasts,
       inferDownwards: inferDownwards,
       inferFromOverrides: inferFromOverrides,
       inferTransitively: inferTransitively,
       nonnullableTypes: nonnullableTypes,
       wrapClosures: wrapClosures,
       useMockSdk: sdkDir == null,
       dartSdkPath: sdkDir,
       runtimeDir: '/dev_compiler_runtime/',
       entryPointFile: '/main.dart');
-  var resolver = sdkDir == null
-      ? new TypeResolver.fromMock(mockSdkSources, options,
-          otherResolvers: [uriResolver])
-      : new TypeResolver.fromDir(sdkDir, options,
-          otherResolvers: [uriResolver]);
-  var context = resolver.context;
+
+  var context = createAnalysisContext(options, fileResolvers: [uriResolver]);
 
   // Run the checker on /main.dart.
   var mainFile = new Uri.file('/main.dart');
   TestReporter testReporter;
   CheckerReporter reporter;
   if (createReporter == null) {
     reporter = testReporter = new TestReporter(context);
   } else {
     reporter = createReporter(context);
   }
   var results =
-      new Compiler(options, resolver: resolver, reporter: reporter).run();
+      new Compiler(options, context: context, reporter: reporter).run();
 
   // Extract expectations from the comments in the test files.
   var expectedErrors = <AstNode, List<_ErrorExpectation>>{};
   var visitor = new _ErrorMarkerVisitor(expectedErrors);
   var initialLibrary =
-      resolver.context.getLibraryElement(uriResolver.resolveAbsolute(mainFile));
+      context.getLibraryElement(uriResolver.resolveAbsolute(mainFile));
   for (var lib in reachableLibraries(initialLibrary)) {
     for (var unit in lib.units) {
       unit.unit.accept(visitor);
     }
   }
 
   if (testReporter == null) return results;
 
   var total = expectedErrors.values.fold(0, (p, l) => p + l.length);
   // Check that all errors we emit are included in the expected map.
@@ skipping 193 matching lines @@
     expect(tokens[1], "should", reason: 'invalid error descriptor');
     expect(tokens[2], "be", reason: 'invalid error descriptor');
     if (tokens[0] == "pass") return null;
     // TODO(leafp) For now, we just use whatever the current expectation is,
     // eventually we could do more automated reporting here.
     return _parse(tokens[0]);
   }
 
   String toString() => '$level $type';
 }