Replace reset() arguments with resetWith() invocation.

pkg/analyzer/test/generated/resolver_test_case.dart

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..574d79bd1bc9c00386ed7618c8809195aa7aaaf6 100644
--- a/pkg/analyzer/test/generated/resolver_test_case.dart
+++ b/pkg/analyzer/test/generated/resolver_test_case.dart
@@ -24,6 +24,7 @@ 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';
@@ -645,13 +646,25 @@ class ResolverTestCase extends EngineTestCase {
   /**
    * Re-create the analysis context being used by the test case.
    */
-  void reset({List<List<String>> packages}) {
+  void reset() {
+    resetWith();
+  }
+
+  /**
+   * 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) {
-      PerformanceLog log = new PerformanceLog(_logBuffer);
-      AnalysisDriverScheduler scheduler = new AnalysisDriverScheduler(log);
+      options ??= new AnalysisOptionsImpl();
+      DartSdk sdk =
+          options.strongMode ? physical_sdk.strongSdk : physical_sdk.sdk;
 
       List<UriResolver> resolvers = <UriResolver>[
-        new DartUriResolver(physical_sdk.sdk),
+        new DartUriResolver(sdk),
         new ResourceUriResolver(resourceProvider)
       ];
       if (packages != null) {
@@ -668,14 +681,10 @@ class ResolverTestCase extends EngineTestCase {
       }
       SourceFactory sourceFactory = new SourceFactory(resolvers);
 
-      driver = new AnalysisDriver(
-          scheduler,
-          log,
-          resourceProvider,
-          new MemoryByteStore(),
-          _fileContentOverlay,
-          sourceFactory,
-          new AnalysisOptionsImpl());
+      PerformanceLog log = new PerformanceLog(_logBuffer);
+      AnalysisDriverScheduler scheduler = new AnalysisDriverScheduler(log);
+      driver = new AnalysisDriver(scheduler, log, resourceProvider,
+          new MemoryByteStore(), _fileContentOverlay, sourceFactory, options);
       scheduler.start();
     } else {
       if (packages != null) {
@@ -688,6 +697,10 @@ class ResolverTestCase extends EngineTestCase {
         analysisContext2 = AnalysisContextFactory.contextWithCoreAndPackages(
             packageMap,
             resourceProvider: resourceProvider);
+      } else if (options != null) {
+        analysisContext2 = AnalysisContextFactory.contextWithCoreAndOptions(
+            options,
+            resourceProvider: resourceProvider);
       } else {
         analysisContext2 = AnalysisContextFactory.contextWithCore(
             resourceProvider: resourceProvider);
@@ -696,32 +709,6 @@ class ResolverTestCase extends EngineTestCase {
   }
 
   /**
-   * Re-create the analysis context being used by the test case and set the
-   * [options] in the newly created context to the given [options].
-   */
-  void resetWithOptions(AnalysisOptions options) {
-    // TODO(scheglov) remove duplication
-    if (enableNewAnalysisDriver) {
-      PerformanceLog log = new PerformanceLog(_logBuffer);
-      AnalysisDriverScheduler scheduler = new AnalysisDriverScheduler(log);
-
-      List<UriResolver> resolvers = <UriResolver>[
-        new DartUriResolver(
-            options.strongMode ? physical_sdk.strongSdk : physical_sdk.sdk),
-        new ResourceUriResolver(resourceProvider)
-      ];
-      SourceFactory sourceFactory = new SourceFactory(resolvers);
-      driver = new AnalysisDriver(scheduler, log, resourceProvider,
-          new MemoryByteStore(), _fileContentOverlay, sourceFactory, options);
-      scheduler.start();
-    } else {
-      analysisContext2 = AnalysisContextFactory.contextWithCoreAndOptions(
-          options,
-          resourceProvider: resourceProvider);
-    }
-  }
-
-  /**
    * Given a library and all of its parts, resolve the contents of the library and the contents of
    * the parts. This assumes that the sources for the library and its parts have already been added
    * to the content provider using the method [addNamedSource].
@@ -773,7 +760,7 @@ class ResolverTestCase extends EngineTestCase {
     // Setup analysis context as non-experimental
     AnalysisOptionsImpl options = new AnalysisOptionsImpl();
 //    options.enableDeferredLoading = false;
-    resetWithOptions(options);
+    resetWith(options: options);
     // Analysis and assertions
     Source source = await resolveSources(strSources);
     await computeAnalysisResult(source);