cleanup: simplify creation of AnalysisContext

test/dependency_graph_test.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.test.dependency_graph_test;
 
 import 'package:analyzer/file_system/file_system.dart';
 import 'package:analyzer/file_system/memory_file_system.dart';
 import 'package:analyzer/src/generated/source.dart';
 import 'package:unittest/unittest.dart';
 
-import 'package:dev_compiler/src/checker/dart_sdk.dart'
-    show mockSdkSources, dartSdkDirectory;
+import 'package:dev_compiler/src/analysis_context.dart';
 import 'package:dev_compiler/src/options.dart';
-import 'package:dev_compiler/src/checker/resolver.dart';
 import 'package:dev_compiler/src/dependency_graph.dart';
 import 'package:dev_compiler/src/report.dart';
 import 'package:dev_compiler/src/testing.dart';
 import 'package:path/path.dart' as path;
 
 import 'test_util.dart';
 
 void main() {
   configureTest();
 
-  var options = new CompilerOptions(runtimeDir: '/dev_compiler_runtime/');
+  var options = new CompilerOptions(
+      runtimeDir: '/dev_compiler_runtime/', useMockSdk: true);
   MemoryResourceProvider testResourceProvider;
   ResourceUriResolver testUriResolver;
   var context;
   var graph;
 
   /// Initial values for test files
   var testFiles = {
     '/index1.html': '''
         <script src="foo.js"></script>
         ''',
@@ skipping 23 matching lines @@
     '/a10.dart': 'library a10;',
   };
 
   nodeOf(String filepath) => graph.nodeFromUri(new Uri.file(filepath));
 
   setUp(() {
     /// We completely reset the TestUriResolver to avoid interference between
     /// tests (since some tests modify the state of the files).
     testResourceProvider = createTestResourceProvider(testFiles);
     testUriResolver = new ResourceUriResolver(testResourceProvider);
-    context = new TypeResolver.fromMock(mockSdkSources, options,
-        otherResolvers: [testUriResolver]).context;
+    context = createAnalysisContext(options, fileResolvers: [testUriResolver]);
     graph = new SourceGraph(context, new LogReporter(context), options);
   });
 
   updateFile(Source source, [String newContents]) {
     var path = testResourceProvider.pathContext.fromUri(source.uri);
     if (newContents == null) newContents = source.contents.data;
     testResourceProvider.updateFile(path, newContents);
   }
 
   group('HTML deps', () {
@@ skipping 557 matching lines @@
           |    |    |    |-- a8.dart...
           |    |-- a6.dart (part)
           $_RUNTIME_GRAPH
           ''');
     });
   });
 
   group('server-mode', () {
     setUp(() {
       var options2 = new CompilerOptions(
-          runtimeDir: '/dev_compiler_runtime/', serverMode: true);
-      context = new TypeResolver.fromMock(mockSdkSources, options2,
-          otherResolvers: [testUriResolver]).context;
+          runtimeDir: '/dev_compiler_runtime/',
+          useMockSdk: true,
+          serverMode: true);
+      context =
+          createAnalysisContext(options2, fileResolvers: [testUriResolver]);
       graph = new SourceGraph(context, new LogReporter(context), options2);
     });
 
     test('messages widget is automatically included', () {
       var node = nodeOf('/index3.html');
       expectGraph(node, '''
           index3.html
           $_RUNTIME_GRAPH
           |-- messages_widget.js
           |-- messages.css
@@ skipping 421 matching lines @@
         var source = nodeOf('/bar.dart').source;
         updateFile(source, "hi");
         results = [];
         rebuild(node, buildWithTransitiveChange);
         expect(results, ['bar.dart', 'foo.dart']);
       });
     });
 
     group('null for non-existing files', () {
       setUp(() {
-        context = new TypeResolver.fromMock(mockSdkSources, options,
-            otherResolvers: [testUriResolver]).context;
+        context =
+            createAnalysisContext(options, fileResolvers: [testUriResolver]);
         graph = new SourceGraph(context, new LogReporter(context), options);
       });
 
       test('recognize locally change between existing and not-existing', () {
         var n = nodeOf('/foo.dart');
         expect(n.source.exists(), isFalse);
         var source =
             testResourceProvider.newFile('/foo.dart', 'hi').createSource();
         expect(
             testUriResolver.resolveAbsolute(new Uri.file('/foo.dart')), source);
@@ skipping 64 matching lines @@
   helper(node);
   return sb.toString();
 }
 
 final runtimeFilesWithoutPath = defaultRuntimeFiles
     .map((f) => f.replaceAll('dart/', ''))
     .toList(growable: false);
 final _RUNTIME_GRAPH = runtimeFilesWithoutPath.map((s) => '|--  $s').join('\n');
 final _RUNTIME_GRAPH_REBUILD =
     runtimeFilesWithoutPath.map((s) => '|--  $s [needs-rebuild]').join('\n');