Fix bug when packages file changes in new driver

pkg/analysis_server/test/context_manager_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.context.directory.manager;
 
 import 'dart:collection';
 
 import 'package:analysis_server/src/context_manager.dart';
 import 'package:analysis_server/src/utilities/null_string_sink.dart';
@@ skipping 1795 matching lines @@
 
   UriResolver providePackageResolver(Folder folder) => packageResolver;
 
   void setUp() {
     processRequiredPlugins();
     resourceProvider = new MemoryResourceProvider();
     resourceProvider.newFolder(projPath);
     packageMapProvider = new MockPackageMapProvider();
     // Create an SDK in the mock file system.
     new MockSdk(generateSummaryFiles: true, resourceProvider: resourceProvider);
-    DartSdkManager sdkManager = new DartSdkManager('/', false);
+    DartSdkManager sdkManager = new DartSdkManager('/', true);
     manager = new ContextManagerImpl(
         resourceProvider,
         sdkManager,
         providePackageResolver,
         packageMapProvider,
         analysisFilesGlobs,
         InstrumentationService.NULL_SERVICE,
         new AnalysisOptionsImpl(),
         enableAnalysisDriver);
     PerformanceLog logger = new PerformanceLog(new NullStringSink());
     AnalysisDriverScheduler scheduler = new AnalysisDriverScheduler(logger);
-    callbacks =
-        new TestContextManagerCallbacks(resourceProvider, logger, scheduler);
+    callbacks = new TestContextManagerCallbacks(
+        resourceProvider, sdkManager, logger, scheduler);
     manager.callbacks = callbacks;
   }
 
   /**
    * Verify that package URI's for source files in [path] will be resolved
    * using a package root matching [expectation].
    */
   void _checkPackageRoot(String path, expectation) {
     // TODO(brianwilkerson) Figure out how to test this. Possibly by comparing
     // the contents of the package map (although that approach doesn't work at
@@ skipping 14 matching lines @@
 class ContextManagerWithNewOptionsTest extends ContextManagerWithOptionsTest {
   String get optionsFileName => AnalysisEngine.ANALYSIS_OPTIONS_YAML_FILE;
 }
 
 @reflectiveTest
 class ContextManagerWithNewOptionsTest_Driver
     extends ContextManagerWithNewOptionsTest {
   bool get enableAnalysisDriver => true;
 
   @failingTest
-  test_analysis_options_file_delete() async {
-    // It appears that this fails because we are not correctly updating the
-    // analysis options in the driver when the file is removed.
-    return super.test_analysis_options_file_delete();
-  }
-
-  @failingTest
   test_analysis_options_file_delete_with_embedder() async {
     // This fails because the ContextBuilder doesn't pick up the strongMode
     // flag from the embedder.yaml file.
     return super.test_analysis_options_file_delete_with_embedder();
   }
 
   @failingTest
   test_embedder_options() async {
     // This fails because the ContextBuilder doesn't pick up the strongMode
     // flag from the embedder.yaml file.
@@ skipping 21 matching lines @@
 class ContextManagerWithOldOptionsTest extends ContextManagerWithOptionsTest {
   String get optionsFileName => AnalysisEngine.ANALYSIS_OPTIONS_FILE;
 }
 
 @reflectiveTest
 class ContextManagerWithOldOptionsTest_Driver
     extends ContextManagerWithOldOptionsTest {
   bool get enableAnalysisDriver => true;
 
   @failingTest
-  test_analysis_options_file_delete() async {
-    // It appears that this fails because we are not correctly updating the
-    // analysis options in the driver when the file is removed.
-    return super.test_analysis_options_file_delete();
-  }
-
-  @failingTest
   test_analysis_options_file_delete_with_embedder() async {
     // This fails because the ContextBuilder doesn't pick up the strongMode
     // flag from the embedder.yaml file.
     return super.test_analysis_options_file_delete_with_embedder();
   }
 
   @failingTest
   test_embedder_options() async {
     // This fails because the ContextBuilder doesn't pick up the strongMode
     // flag from the embedder.yaml file.
@@ skipping 392 matching lines @@
       expect(sdkContext.analysisOptions.strongMode, isTrue);
       // The code is strong-mode clean.
       // Verify that TypeSystem was reset.
       expect(result.errors, isEmpty);
     } else {
       AnalysisContext context = manager.getContextFor(projPath);
       Source testSource = context.getSourcesWithFullName(file.path).single;
       AnalysisContext sdkContext = sourceFactory.dartSdk.context;
       expect(analysisOptions.strongMode, isTrue);
       expect(sdkContext.analysisOptions.strongMode, isTrue);
-      // The code is strong-mode clean.
+      // The code is strong-mode clean, but we're using a Mock SDK that isn't
+      // configured correctly for strong mode so we get an error.
       // Verify that TypeSystem was reset.
-      expect(context.computeErrors(testSource), isEmpty);
+      expect(context.computeErrors(testSource), hasLength(1));
     }
   }
 
   test_path_filter_analysis_option() async {
     // Create files.
     String libPath = newFolder([projPath, ContextManagerTest.LIB_NAME]);
     newFile([libPath, 'main.dart']);
     newFile([libPath, 'nope.dart']);
     String sdkExtPath = newFolder([projPath, 'sdk_ext']);
     newFile([sdkExtPath, 'entry.dart']);
@@ skipping 286 matching lines @@
    */
   final Map<String, Set<Source>> currentContextSources =
       <String, Set<Source>>{};
 
   /**
    * Resource provider used for this test.
    */
   final ResourceProvider resourceProvider;
 
   /**
+   * The manager managing the SDKs.
+   */
+  final DartSdkManager sdkManager;
+
+  /**
    * The logger used by the scheduler and the driver.
    */
   final PerformanceLog logger;
 
   /**
    * The scheduler used by the driver.
    */
   final AnalysisDriverScheduler scheduler;
 
   /**
    * The list of `flushedFiles` in the last [removeContext] invocation.
    */
   List<String> lastFlushedFiles;
 
   TestContextManagerCallbacks(
-      this.resourceProvider, this.logger, this.scheduler);
+      this.resourceProvider, this.sdkManager, this.logger, this.scheduler);
 
   /**
    * Return the current set of analysis options.
    */
   AnalysisOptions get analysisOptions => currentDriver == null
       ? currentContext.analysisOptions
       : currentDriver.analysisOptions;
 
   /**
    * Iterable of the paths to contexts that currently exist.
@@ skipping 99 matching lines @@
   }
 
   @override
   void computingPackageMap(bool computing) {
     // Do nothing.
   }
 
   @override
   ContextBuilder createContextBuilder(Folder folder, AnalysisOptions options,
       {bool useSummaries = false}) {
-    DartSdkManager sdkManager = new DartSdkManager('/', useSummaries);
     ContextBuilderOptions builderOptions = new ContextBuilderOptions();
     builderOptions.defaultOptions = options;
     ContextBuilder builder = new ContextBuilder(
         resourceProvider, sdkManager, new ContentCache(),
         options: builderOptions);
     return builder;
   }
 
   @override
   void moveContext(Folder from, Folder to) {
@@ skipping 39 matching lines @@
 class TestUriResolver extends UriResolver {
   Map<Uri, Source> uriMap;
 
   TestUriResolver(this.uriMap);
 
   @override
   Source resolveAbsolute(Uri uri, [Uri actualUri]) {
     return uriMap[uri];
   }
 }