Update MockSdk to be more consistent with the actual SDK, switch x_Driver tests to it.

pkg/analyzer/test/generated/resolver_test_case.dart

 // Copyright (c) 2016, 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.resolver_test_case;
 
 import 'dart:async';
 
 import 'package:analyzer/dart/ast/ast.dart';
 import 'package:analyzer/dart/ast/standard_resolution_map.dart';
@@ skipping 12 matching lines @@
 import 'package:analyzer/src/error/codes.dart';
 import 'package:analyzer/src/generated/engine.dart' hide AnalysisResult;
 import 'package:analyzer/src/generated/java_engine.dart';
 import 'package:analyzer/src/generated/resolver.dart';
 import 'package:analyzer/src/generated/sdk.dart';
 import 'package:analyzer/src/generated/source_io.dart';
 import 'package:analyzer/src/generated/testing/ast_test_factory.dart';
 import 'package:analyzer/src/generated/testing/element_factory.dart';
 import 'package:test/test.dart';
 
-import '../src/dart/analysis/physical_sdk.dart' as physical_sdk;
+import '../src/context/mock_sdk.dart';
 import 'analysis_context_factory.dart';
 import 'test_support.dart';
 
 /**
  * An AST visitor used to verify that all of the nodes in an AST structure that
  * should have been resolved were resolved.
  */
 class ResolutionVerifier extends RecursiveAstVisitor<Object> {
   /**
    * A set containing nodes that are known to not be resolvable and should
@@ skipping 604 matching lines @@
   /**
    * Re-create the analysis context being used by the test with the either given
    * [options] or [packages].
    */
   void resetWith({AnalysisOptions options, List<List<String>> packages}) {
     if (options != null && packages != null) {
       fail('Only packages or options can be specified.');
     }
     if (enableNewAnalysisDriver) {
       options ??= new AnalysisOptionsImpl();
-      DartSdk sdk =
-          options.strongMode ? physical_sdk.strongSdk : physical_sdk.sdk;
+      DartSdk sdk = new MockSdk(resourceProvider: resourceProvider)
+        ..context.analysisOptions = options;
 
       List<UriResolver> resolvers = <UriResolver>[
         new DartUriResolver(sdk),
         new ResourceUriResolver(resourceProvider)
       ];
       if (packages != null) {
         var packageMap = <String, List<Folder>>{};
         packages.forEach((args) {
           String name = args[0];
           String path =
@@ skipping 118 matching lines @@
   @override
   void setUp() {
     ElementFactory.flushStaticState();
     super.setUp();
     reset();
   }
 
   @override
   void tearDown() {
     analysisContext2 = null;
+    AnalysisEngine.instance.clearCaches();
     super.tearDown();
   }
 
   /**
    * Verify that all of the identifiers in the compilation units associated with
    * the given [sources] have been resolved.
    */
   void verify(List<Source> sources) {
     ResolutionVerifier verifier = new ResolutionVerifier();
     for (Source source in sources) {
@@ skipping 120 matching lines @@
     }
   }
 }
 
 class TestAnalysisResult {
   final Source source;
   final CompilationUnit unit;
   final List<AnalysisError> errors;
   TestAnalysisResult(this.source, this.unit, this.errors);
 }