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>
diff --git a/pkg/analysis_server/test/abstract_context.dart b/pkg/analysis_server/test/abstract_context.dart
index d57fbdb..6c656c7 100644
--- a/pkg/analysis_server/test/abstract_context.dart
+++ b/pkg/analysis_server/test/abstract_context.dart
@@ -69,6 +69,7 @@
addMetaPackageSource();
Folder libFolder = configureFlutterPackage(resourceProvider);
packageMap['flutter'] = [libFolder];
+ configureDriver();
}
Source addMetaPackageSource() => addPackageSource('meta', 'meta.dart', r'''
@@ -98,6 +99,7 @@
packageMap[packageName] = [newFolder('/pubcache/$packageName/lib')];
File file =
newFile('/pubcache/$packageName/lib/$filePath', content: content);
+ configureDriver();
return file.createSource();
}
@@ -110,6 +112,14 @@
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)
diff --git a/pkg/analysis_server/test/services/correction/assist_test.dart b/pkg/analysis_server/test/services/correction/assist_test.dart
index 1fe73ee..fac75c7 100644
--- a/pkg/analysis_server/test/services/correction/assist_test.dart
+++ b/pkg/analysis_server/test/services/correction/assist_test.dart
@@ -6315,10 +6315,6 @@
@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() =>
diff --git a/pkg/analysis_server/test/services/correction/fix_test.dart b/pkg/analysis_server/test/services/correction/fix_test.dart
index da017ea..999a4da 100644
--- a/pkg/analysis_server/test/services/correction/fix_test.dart
+++ b/pkg/analysis_server/test/services/correction/fix_test.dart
@@ -4551,6 +4551,7 @@
testFile = '/project/lib/test.dart';
packageMap['project'] = [newFolder('/project/lib')];
addSource('/project/lib/src/lib.dart', 'class Test {}');
+ configureDriver();
await resolveTestUnit('''
main() {
Test t;
diff --git a/pkg/analysis_server/test/src/computer/outline_computer_test.dart b/pkg/analysis_server/test/src/computer/outline_computer_test.dart
index 23079a7..1ae9d67 100644
--- a/pkg/analysis_server/test/src/computer/outline_computer_test.dart
+++ b/pkg/analysis_server/test/src/computer/outline_computer_test.dart
@@ -48,8 +48,7 @@
@override
void setUp() {
super.setUp();
- Folder libFolder = configureFlutterPackage(resourceProvider);
- packageMap['flutter'] = [libFolder];
+ addFlutterPackage();
}
test_columnWithChildren() async {
diff --git a/pkg/analysis_server/test/src/flutter/flutter_correction_test.dart b/pkg/analysis_server/test/src/flutter/flutter_correction_test.dart
index 2e79d3f..7e4d5d0 100644
--- a/pkg/analysis_server/test/src/flutter/flutter_correction_test.dart
+++ b/pkg/analysis_server/test/src/flutter/flutter_correction_test.dart
@@ -31,7 +31,7 @@
@override
void setUp() {
super.setUp();
- packageMap['flutter'] = [configureFlutterPackage(resourceProvider)];
+ addFlutterPackage();
}
test_addForDesignTimeConstructor_BAD_notClass() async {
diff --git a/pkg/analysis_server/test/src/flutter/flutter_outline_computer_test.dart b/pkg/analysis_server/test/src/flutter/flutter_outline_computer_test.dart
index 94d9cc0..529b001 100644
--- a/pkg/analysis_server/test/src/flutter/flutter_outline_computer_test.dart
+++ b/pkg/analysis_server/test/src/flutter/flutter_outline_computer_test.dart
@@ -31,8 +31,7 @@
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 @@
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';
diff --git a/pkg/analysis_server/test/src/utilities/flutter_test.dart b/pkg/analysis_server/test/src/utilities/flutter_test.dart
index 7ec839b..d9a7bcf 100644
--- a/pkg/analysis_server/test/src/utilities/flutter_test.dart
+++ b/pkg/analysis_server/test/src/utilities/flutter_test.dart
@@ -22,8 +22,7 @@
@override
void setUp() {
super.setUp();
- Folder libFolder = configureFlutterPackage(resourceProvider);
- packageMap['flutter'] = [libFolder];
+ addFlutterPackage();
}
test_getWidgetPresentationText_icon() async {