Fix tests that reference the flutter package

Change-Id: Idd1949db259d747abb063328901f42be29ba57b2
Reviewed-on: https://dart-review.googlesource.com/68581
Reviewed-by: Konstantin Shcheglov <scheglov@google.com>
Commit-Queue: Brian Wilkerson <brianwilkerson@google.com>

pkg/analysis_server/test/abstract_context.dart

@@ -69,6 +69,7 @@ class AbstractContextTest extends Object with ResourceProviderMixin {
     addMetaPackageSource();
     Folder libFolder = configureFlutterPackage(resourceProvider);
     packageMap['flutter'] = [libFolder];
+    configureDriver();
   }
 
   Source addMetaPackageSource() => addPackageSource('meta', 'meta.dart', r'''
@@ -98,6 +99,7 @@ class _IsTestGroup {
     packageMap[packageName] = [newFolder('/pubcache/$packageName/lib')];
     File file =
         newFile('/pubcache/$packageName/lib/$filePath', content: content);
+    configureDriver();
     return file.createSource();
   }
 
@@ -110,6 +112,14 @@ class _IsTestGroup {
     return source;
   }
 
+  /**
+   * Re-configure the driver. This is necessary, for example, after defining a
+   * new package that test code will reference.
+   */
+  void configureDriver() {
+    driver.configure();
+  }
+
   void configurePreviewDart2() {
     driver.configure(
         analysisOptions: new AnalysisOptionsImpl.from(driver.analysisOptions)

pkg/analysis_server/test/services/correction/assist_test.dart

@@ -6315,10 +6315,6 @@ class AssistProcessorTest_UseCFE extends AssistProcessorTest {
   @override
   bool get useCFE => true;
 
-  // Many of these tests are failing because the CFE is not able to find the
-  // flutter package. It seems likely that there is a problem with the way the
-  // tests (or some underlying layer) is passing package resolution to the CFE.
-
   @failingTest
   @override
   test_addTypeAnnotation_parameter_BAD_hasExplicitType() =>

pkg/analysis_server/test/services/correction/fix_test.dart

@@ -4551,6 +4551,7 @@ main() {
     testFile = '/project/lib/test.dart';
     packageMap['project'] = [newFolder('/project/lib')];
     addSource('/project/lib/src/lib.dart', 'class Test {}');
+    configureDriver();
     await resolveTestUnit('''
 main() {
   Test t;

pkg/analysis_server/test/src/computer/outline_computer_test.dart

@@ -48,8 +48,7 @@ class FlutterOutlineComputerTest extends AbstractOutlineComputerTest {
   @override
   void setUp() {
     super.setUp();
-    Folder libFolder = configureFlutterPackage(resourceProvider);
-    packageMap['flutter'] = [libFolder];
+    addFlutterPackage();
   }
 
   test_columnWithChildren() async {

pkg/analysis_server/test/src/flutter/flutter_correction_test.dart

@@ -31,7 +31,7 @@ class FlutterCorrectionTest extends AbstractSingleUnitTest {
   @override
   void setUp() {
     super.setUp();
-    packageMap['flutter'] = [configureFlutterPackage(resourceProvider)];
+    addFlutterPackage();
   }
 
   test_addForDesignTimeConstructor_BAD_notClass() async {

pkg/analysis_server/test/src/flutter/flutter_outline_computer_test.dart

@@ -31,8 +31,7 @@ class FlutterOutlineComputerTest extends AbstractContextTest {
   void setUp() {
     super.setUp();
     testPath = resourceProvider.convertPath('/test.dart');
-    Folder libFolder = configureFlutterPackage(resourceProvider);
-    packageMap['flutter'] = [libFolder];
+    addFlutterPackage();
   }
 
   test_attribute_namedExpression() async {
@@ -473,6 +472,7 @@ class MyWidget extends StatelessWidget {
 
     testPath = resourceProvider.convertPath('/home/user/test/lib/test.dart');
     newFile('/home/user/test/lib/my_lib.dart', content: '');
+    configureDriver();
 
     await _computeOutline('''
 import 'package:flutter/widgets.dart';

pkg/analysis_server/test/src/utilities/flutter_test.dart

@@ -22,8 +22,7 @@ class FlutterTest extends AbstractSingleUnitTest {
   @override
   void setUp() {
     super.setUp();
-    Folder libFolder = configureFlutterPackage(resourceProvider);
-    packageMap['flutter'] = [libFolder];
+    addFlutterPackage();
   }
 
   test_getWidgetPresentationText_icon() async {