Remove the non-driver versions of several tests
R=scheglov@google.com
Review-Url: https://codereview.chromium.org/2863593004 .
diff --git a/pkg/analysis_server/test/analysis/get_navigation_test.dart b/pkg/analysis_server/test/analysis/get_navigation_test.dart
index 992d1e3..67904a7 100644
--- a/pkg/analysis_server/test/analysis/get_navigation_test.dart
+++ b/pkg/analysis_server/test/analysis/get_navigation_test.dart
@@ -2,8 +2,6 @@
// 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.analysis.get_navigation;
-
import 'package:analysis_server/protocol/protocol.dart';
import 'package:analysis_server/protocol/protocol_generated.dart';
import 'package:analysis_server/src/domain_analysis.dart';
@@ -16,7 +14,6 @@
main() {
defineReflectiveSuite(() {
defineReflectiveTests(GetNavigationTest);
- defineReflectiveTests(GetNavigationTest_Driver);
});
}
@@ -26,6 +23,8 @@
@override
void setUp() {
+ enableNewAnalysisDriver = true;
+ generateSummaryFiles = true;
super.setUp();
server.handlers = [
new AnalysisDomainHandler(server),
@@ -50,6 +49,19 @@
return _checkInvalid(file, -1, -1);
}
+ test_fileOutsideOfRoot() async {
+ testFile = '/outside.dart';
+ addTestFile('''
+main() {
+ var test = 0;
+ print(test);
+}
+''');
+ await _getNavigation(testFile, testCode.indexOf('test);'), 0);
+ assertHasRegion('test);');
+ assertHasTarget('test = 0');
+ }
+
test_importDirective() async {
addTestFile('''
import 'dart:math';
@@ -238,26 +250,3 @@
regions = result.regions;
}
}
-
-@reflectiveTest
-class GetNavigationTest_Driver extends GetNavigationTest {
- @override
- void setUp() {
- enableNewAnalysisDriver = true;
- generateSummaryFiles = true;
- super.setUp();
- }
-
- test_fileOutsideOfRoot() async {
- testFile = '/outside.dart';
- addTestFile('''
-main() {
- var test = 0;
- print(test);
-}
-''');
- await _getNavigation(testFile, testCode.indexOf('test);'), 0);
- assertHasRegion('test);');
- assertHasTarget('test = 0');
- }
-}
diff --git a/pkg/analysis_server/test/analysis/notification_analysis_options_test.dart b/pkg/analysis_server/test/analysis/notification_analysis_options_test.dart
index 97e7094..5a57e2b 100644
--- a/pkg/analysis_server/test/analysis/notification_analysis_options_test.dart
+++ b/pkg/analysis_server/test/analysis/notification_analysis_options_test.dart
@@ -2,8 +2,6 @@
// 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.analysis.notification_analysis_options_test;
-
import 'package:analysis_server/protocol/protocol.dart';
import 'package:analysis_server/protocol/protocol_generated.dart'
hide AnalysisOptions;
@@ -21,8 +19,6 @@
defineReflectiveSuite(() {
defineReflectiveTests(NewAnalysisOptionsFileNotificationTest);
defineReflectiveTests(OldAnalysisOptionsFileNotificationTest);
- defineReflectiveTests(NewAnalysisOptionsFileNotificationTest_Driver);
- defineReflectiveTests(OldAnalysisOptionsFileNotificationTest_Driver);
});
}
@@ -76,6 +72,8 @@
@override
void setUp() {
+ enableNewAnalysisDriver = true;
+ generateSummaryFiles = true;
registerLintRules();
super.setUp();
server.handlers = [new AnalysisDomainHandler(server)];
@@ -340,30 +338,8 @@
}
@reflectiveTest
-class NewAnalysisOptionsFileNotificationTest_Driver
- extends NewAnalysisOptionsFileNotificationTest {
- @override
- void setUp() {
- enableNewAnalysisDriver = true;
- generateSummaryFiles = true;
- super.setUp();
- }
-}
-
-@reflectiveTest
class OldAnalysisOptionsFileNotificationTest
extends AnalysisOptionsFileNotificationTest {
@override
String get optionsFilePath => '$projectPath/.analysis_options';
}
-
-@reflectiveTest
-class OldAnalysisOptionsFileNotificationTest_Driver
- extends OldAnalysisOptionsFileNotificationTest {
- @override
- void setUp() {
- enableNewAnalysisDriver = true;
- generateSummaryFiles = true;
- super.setUp();
- }
-}
diff --git a/pkg/analysis_server/test/analysis/notification_analyzedFiles_test.dart b/pkg/analysis_server/test/analysis/notification_analyzedFiles_test.dart
index 3cbddc5..5427869 100644
--- a/pkg/analysis_server/test/analysis/notification_analyzedFiles_test.dart
+++ b/pkg/analysis_server/test/analysis/notification_analyzedFiles_test.dart
@@ -2,8 +2,6 @@
// 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.analysis.notification.analyzedDirectories;
-
import 'dart:async';
import 'package:analysis_server/protocol/protocol.dart';
@@ -18,7 +16,6 @@
main() {
defineReflectiveSuite(() {
defineReflectiveTests(AnalysisNotificationAnalyzedFilesTest);
- defineReflectiveTests(AnalysisNotificationAnalyzedFilesTest_Driver);
});
}
@@ -47,6 +44,8 @@
}
void setUp() {
+ enableNewAnalysisDriver = true;
+ generateSummaryFiles = true;
super.setUp();
createProject();
}
@@ -114,14 +113,3 @@
removeGeneralAnalysisSubscription(GeneralAnalysisService.ANALYZED_FILES);
}
}
-
-@reflectiveTest
-class AnalysisNotificationAnalyzedFilesTest_Driver
- extends AnalysisNotificationAnalyzedFilesTest {
- @override
- void setUp() {
- enableNewAnalysisDriver = true;
- generateSummaryFiles = true;
- super.setUp();
- }
-}
diff --git a/pkg/analysis_server/test/analysis/notification_errors_test.dart b/pkg/analysis_server/test/analysis/notification_errors_test.dart
index f3fbcae..7f14140 100644
--- a/pkg/analysis_server/test/analysis/notification_errors_test.dart
+++ b/pkg/analysis_server/test/analysis/notification_errors_test.dart
@@ -2,8 +2,6 @@
// 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.analysis.notification_errors;
-
import 'package:analysis_server/protocol/protocol.dart';
import 'package:analysis_server/protocol/protocol_generated.dart';
import 'package:analysis_server/src/constants.dart';
@@ -23,12 +21,11 @@
main() {
defineReflectiveSuite(() {
defineReflectiveTests(NotificationErrorsTest);
- defineReflectiveTests(NotificationErrorsTest_Driver);
});
}
@reflectiveTest
-class AbstractNotificationErrorsTest extends AbstractAnalysisTest {
+class NotificationErrorsTest extends AbstractAnalysisTest {
Map<String, List<AnalysisError>> filesErrors = {};
void processNotification(Notification notification) {
@@ -40,6 +37,8 @@
@override
void setUp() {
+ enableNewAnalysisDriver = true;
+ generateSummaryFiles = true;
registerLintRules();
super.setUp();
server.handlers = [
@@ -153,16 +152,3 @@
expect(error.type, AnalysisErrorType.STATIC_WARNING);
}
}
-
-@reflectiveTest
-class NotificationErrorsTest extends AbstractNotificationErrorsTest {}
-
-@reflectiveTest
-class NotificationErrorsTest_Driver extends AbstractNotificationErrorsTest {
- @override
- void setUp() {
- enableNewAnalysisDriver = true;
- generateSummaryFiles = true;
- super.setUp();
- }
-}
diff --git a/pkg/analysis_server/test/context_manager_driver_test.dart b/pkg/analysis_server/test/context_manager_driver_test.dart
deleted file mode 100644
index 44f37a0..0000000
--- a/pkg/analysis_server/test/context_manager_driver_test.dart
+++ /dev/null
@@ -1,106 +0,0 @@
-// Copyright (c) 2017, 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.
-
-import 'package:test/test.dart';
-import 'package:test_reflective_loader/test_reflective_loader.dart';
-
-import 'context_manager_test.dart';
-
-main() {
- defineReflectiveSuite(() {
- defineReflectiveTests(AbstractContextManagerTest_Driver);
- defineReflectiveTests(ContextManagerWithNewOptionsTest_Driver);
- defineReflectiveTests(ContextManagerWithOldOptionsTest_Driver);
- });
-}
-
-@reflectiveTest
-class AbstractContextManagerTest_Driver extends AbstractContextManagerTest {
- bool get enableAnalysisDriver => true;
-
- @failingTest
- test_embedder_added() {
- // NoSuchMethodError: The getter 'apiSignature' was called on null.
- // Receiver: null
- // Tried calling: apiSignature
- // dart:core Object.noSuchMethod
- // package:analyzer/src/dart/analysis/driver.dart 460:20 AnalysisDriver.configure
- // package:analysis_server/src/context_manager.dart 1043:16 ContextManagerImpl._checkForPackagespecUpdate
- // package:analysis_server/src/context_manager.dart 1553:5 ContextManagerImpl._handleWatchEvent
- //return super.test_embedder_added();
- fail('NoSuchMethodError');
- }
-}
-
-@reflectiveTest
-class ContextManagerWithNewOptionsTest_Driver
- extends ContextManagerWithNewOptionsTest {
- bool get enableAnalysisDriver => true;
-
- @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.
- return super.test_embedder_options();
- }
-
- @failingTest
- test_optionsFile_update_strongMode() async {
- // It appears that this fails because we are not correctly updating the
- // analysis options in the driver when the file is modified.
- //return super.test_optionsFile_update_strongMode();
- // After a few other changes, the test now times out on my machine, so I'm
- // disabling it in order to prevent it from being flaky.
- fail('Test times out');
- }
-
- @failingTest
- test_path_filter_analysis_option() async {
- // This fails because we're not analyzing the analysis options file.
- return super.test_path_filter_analysis_option();
- }
-}
-
-@reflectiveTest
-class ContextManagerWithOldOptionsTest_Driver
- extends ContextManagerWithOldOptionsTest {
- bool get enableAnalysisDriver => true;
-
- @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.
- return super.test_embedder_options();
- }
-
- @failingTest
- test_optionsFile_update_strongMode() async {
- // It appears that this fails because we are not correctly updating the
- // analysis options in the driver when the file is modified.
- //return super.test_optionsFile_update_strongMode();
- // After a few other changes, the test now times out on my machine, so I'm
- // disabling it in order to prevent it from being flaky.
- fail('Test times out');
- }
-
- @failingTest
- test_path_filter_analysis_option() async {
- // This fails because we're not analyzing the analysis options file.
- return super.test_path_filter_analysis_option();
- }
-}
diff --git a/pkg/analysis_server/test/context_manager_test.dart b/pkg/analysis_server/test/context_manager_test.dart
index 96db4e2..e7370be 100644
--- a/pkg/analysis_server/test/context_manager_test.dart
+++ b/pkg/analysis_server/test/context_manager_test.dart
@@ -49,6 +49,8 @@
@reflectiveTest
class AbstractContextManagerTest extends ContextManagerTest {
+ bool get enableAnalysisDriver => true;
+
void test_contextsInAnalysisRoot_nestedContext() {
String subProjPath = path.posix.join(projPath, 'subproj');
Folder subProjFolder = resourceProvider.newFolder(subProjPath);
@@ -87,7 +89,17 @@
}
}
+ @failingTest
test_embedder_added() async {
+ // NoSuchMethodError: The getter 'apiSignature' was called on null.
+ // Receiver: null
+ // Tried calling: apiSignature
+ // dart:core Object.noSuchMethod
+ // package:analyzer/src/dart/analysis/driver.dart 460:20 AnalysisDriver.configure
+ // package:analysis_server/src/context_manager.dart 1043:16 ContextManagerImpl._checkForPackagespecUpdate
+ // package:analysis_server/src/context_manager.dart 1553:5 ContextManagerImpl._handleWatchEvent
+ //return super.test_embedder_added();
+ fail('NoSuchMethodError');
// Create files.
String libPath = newFolder([projPath, ContextManagerTest.LIB_NAME]);
newFile([libPath, 'main.dart']);
@@ -1890,11 +1902,15 @@
@reflectiveTest
class ContextManagerWithNewOptionsTest extends ContextManagerWithOptionsTest {
+ bool get enableAnalysisDriver => true;
+
String get optionsFileName => AnalysisEngine.ANALYSIS_OPTIONS_YAML_FILE;
}
@reflectiveTest
class ContextManagerWithOldOptionsTest extends ContextManagerWithOptionsTest {
+ bool get enableAnalysisDriver => true;
+
String get optionsFileName => AnalysisEngine.ANALYSIS_OPTIONS_FILE;
}
@@ -1937,7 +1953,10 @@
expect(analysisOptions.enableStrictCallChecks, isFalse);
}
+ @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.
// Setup _embedder.yaml.
String libPath = newFolder([projPath, ContextManagerTest.LIB_NAME]);
newFile(
@@ -2103,7 +2122,10 @@
await pumpEventQueue();
}
+ @failingTest
test_embedder_options() async {
+ // This fails because the ContextBuilder doesn't pick up the strongMode
+ // flag from the embedder.yaml file.
// Create files.
String libPath = newFolder([projPath, ContextManagerTest.LIB_NAME]);
String sdkExtPath = newFolder([projPath, 'sdk_ext']);
@@ -2266,7 +2288,14 @@
expect(errorProcessors, isEmpty);
}
+ @failingTest
test_optionsFile_update_strongMode() async {
+ // It appears that this fails because we are not correctly updating the
+ // analysis options in the driver when the file is modified.
+ //return super.test_optionsFile_update_strongMode();
+ // After a few other changes, the test now times out on my machine, so I'm
+ // disabling it in order to prevent it from being flaky.
+ fail('Test times out');
var file = resourceProvider.newFile(
'$projPath/bin/test.dart',
r'''
@@ -2339,7 +2368,9 @@
}
}
+ @failingTest
test_path_filter_analysis_option() async {
+ // This fails because we're not analyzing the analysis options file.
// Create files.
String libPath = newFolder([projPath, ContextManagerTest.LIB_NAME]);
newFile([libPath, 'main.dart']);
diff --git a/pkg/analysis_server/test/domain_diagnostic_test.dart b/pkg/analysis_server/test/domain_diagnostic_test.dart
index b4b2cf4..8cb7e8b 100644
--- a/pkg/analysis_server/test/domain_diagnostic_test.dart
+++ b/pkg/analysis_server/test/domain_diagnostic_test.dart
@@ -12,7 +12,6 @@
main() {
defineReflectiveSuite(() {
defineReflectiveTests(DiagnosticDomainTest);
- defineReflectiveTests(DiagnosticDomainTest_Driver);
});
}
@@ -20,6 +19,8 @@
class DiagnosticDomainTest extends AbstractAnalysisTest {
@override
void setUp() {
+ enableNewAnalysisDriver = true;
+ generateSummaryFiles = true;
super.setUp();
handler = new DiagnosticDomainHandler(server);
server.handlers = [handler];
@@ -56,13 +57,3 @@
expect(result.contexts, isEmpty);
}
}
-
-@reflectiveTest
-class DiagnosticDomainTest_Driver extends DiagnosticDomainTest {
- @override
- void setUp() {
- enableNewAnalysisDriver = true;
- generateSummaryFiles = true;
- super.setUp();
- }
-}
diff --git a/pkg/analysis_server/test/search/member_references_test.dart b/pkg/analysis_server/test/search/member_references_test.dart
index 42642ab..0d6f3d4 100644
--- a/pkg/analysis_server/test/search/member_references_test.dart
+++ b/pkg/analysis_server/test/search/member_references_test.dart
@@ -14,7 +14,6 @@
main() {
defineReflectiveSuite(() {
defineReflectiveTests(MemberReferencesTest);
- defineReflectiveTests(MemberReferencesTest_Driver);
});
}
@@ -33,6 +32,12 @@
return waitForSearchResults();
}
+ @override
+ void setUp() {
+ enableNewAnalysisDriver = true;
+ super.setUp();
+ }
+
test_fields_explicit() async {
addTestFile('''
class A {
@@ -113,12 +118,3 @@
assertHasRef(SearchResultKind.INVOCATION, 'foo(20)', true);
}
}
-
-@reflectiveTest
-class MemberReferencesTest_Driver extends MemberReferencesTest {
- @override
- void setUp() {
- enableNewAnalysisDriver = true;
- super.setUp();
- }
-}
diff --git a/pkg/analysis_server/test/services/completion/dart/arglist_contributor_test.dart b/pkg/analysis_server/test/services/completion/dart/arglist_contributor_test.dart
index 2e94124..ef9dd92 100644
--- a/pkg/analysis_server/test/services/completion/dart/arglist_contributor_test.dart
+++ b/pkg/analysis_server/test/services/completion/dart/arglist_contributor_test.dart
@@ -14,12 +14,14 @@
main() {
defineReflectiveSuite(() {
defineReflectiveTests(ArgListContributorTest);
- defineReflectiveTests(ArgListContributorTest_Driver);
});
}
@reflectiveTest
class ArgListContributorTest extends DartCompletionContributorTest {
+ @override
+ bool get enableNewAnalysisDriver => true;
+
void assertNoOtherSuggestions(Iterable<CompletionSuggestion> expected) {
for (CompletionSuggestion suggestion in suggestions) {
if (!expected.contains(suggestion)) {
@@ -247,6 +249,173 @@
assertNoSuggestions();
}
+ test_ArgumentList_Flutter_InstanceCreationExpression_0() async {
+ configureFlutterPkg({
+ 'src/widgets/framework.dart': flutter_framework_code,
+ });
+
+ addTestSource('''
+import 'package:flutter/src/widgets/framework.dart';
+
+build() => new Row(
+ ^
+ );
+''');
+
+ await computeSuggestions();
+
+ assertSuggest('children: <Widget>[],',
+ csKind: CompletionSuggestionKind.NAMED_ARGUMENT,
+ relevance: DART_RELEVANCE_NAMED_PARAMETER,
+ defaultArgListString: null,
+ selectionOffset: 19,
+ defaultArgumentListTextRanges: null);
+ }
+
+ test_ArgumentList_Flutter_InstanceCreationExpression_01() async {
+ configureFlutterPkg({
+ 'src/widgets/framework.dart': flutter_framework_code,
+ });
+
+ addTestSource('''
+import 'package:flutter/src/widgets/framework.dart';
+
+ build() => new Scaffold(
+ appBar: new AppBar(
+ ^
+ ),
+ );
+''');
+
+ await computeSuggestions();
+
+ assertSuggest('color: ,',
+ csKind: CompletionSuggestionKind.NAMED_ARGUMENT,
+ relevance: DART_RELEVANCE_NAMED_PARAMETER,
+ defaultArgListString: null, // No default values.
+ selectionOffset: 7);
+ }
+
+ test_ArgumentList_Flutter_InstanceCreationExpression_1() async {
+ configureFlutterPkg({
+ 'src/widgets/framework.dart': flutter_framework_code,
+ });
+
+ addTestSource('''
+import 'package:flutter/src/widgets/framework.dart';
+
+build() => new Row(
+ key: null,
+ ^
+ );
+''');
+
+ await computeSuggestions();
+
+ assertSuggest('children: <Widget>[],',
+ csKind: CompletionSuggestionKind.NAMED_ARGUMENT,
+ relevance: DART_RELEVANCE_NAMED_PARAMETER,
+ defaultArgListString: null,
+ selectionOffset: 19,
+ defaultArgumentListTextRanges: null);
+ }
+
+ test_ArgumentList_Flutter_InstanceCreationExpression_2() async {
+ configureFlutterPkg({
+ 'src/widgets/framework.dart': flutter_framework_code,
+ });
+
+ addTestSource('''
+import 'package:flutter/src/widgets/framework.dart';
+
+build() => new Row(
+ ^
+ key: null,
+ );
+''');
+
+ await computeSuggestions();
+
+ assertSuggest('children: <Widget>[],',
+ csKind: CompletionSuggestionKind.NAMED_ARGUMENT,
+ relevance: DART_RELEVANCE_NAMED_PARAMETER,
+ defaultArgListString: null,
+ selectionOffset: 19,
+ defaultArgumentListTextRanges: null);
+ }
+
+ test_ArgumentList_Flutter_InstanceCreationExpression_children_dynamic() async {
+ // Ensure we don't generate unneeded <dynamic> param if a future API doesn't
+ // type it's children.
+ configureFlutterPkg({
+ 'src/widgets/framework.dart': flutter_framework_code +
+ '\nclass DynamicRow extends Widget { DynamicRow({List children: null}){}}'
+ });
+
+ addTestSource('''
+import 'package:flutter/src/widgets/framework.dart';
+
+build() => new Container(
+ child: new DynamicRow(^);
+ );
+''');
+
+ await computeSuggestions();
+
+ assertSuggest('children: [],',
+ csKind: CompletionSuggestionKind.NAMED_ARGUMENT,
+ relevance: DART_RELEVANCE_NAMED_PARAMETER,
+ defaultArgListString: null,
+ selectionOffset: 11,
+ defaultArgumentListTextRanges: null);
+ }
+
+ test_ArgumentList_Flutter_InstanceCreationExpression_children_Map() async {
+ // Ensure we don't generate Map params for a future API
+ configureFlutterPkg({
+ 'src/widgets/framework.dart': flutter_framework_code +
+ '\nclass MapRow extends Widget { MapRow({Map<Object,Object> children: null}){}}'
+ });
+
+ addTestSource('''
+import 'package:flutter/src/widgets/framework.dart';
+
+build() => new Container(
+ child: new MapRow(^);
+ );
+''');
+
+ await computeSuggestions();
+
+ assertSuggest('children: ,',
+ csKind: CompletionSuggestionKind.NAMED_ARGUMENT,
+ relevance: DART_RELEVANCE_NAMED_PARAMETER,
+ selectionOffset: 10,
+ defaultArgListString: null);
+ }
+
+ test_ArgumentList_Flutter_MethodExpression_children() async {
+ // Ensure we don't generate params for a method call
+ configureFlutterPkg({
+ 'src/widgets/framework.dart':
+ flutter_framework_code + '\nfoo({String children})'
+ });
+
+ addTestSource('''
+import 'package:flutter/src/widgets/framework.dart';
+
+main() {
+foo(^);
+''');
+
+ await computeSuggestions();
+
+ assertSuggest('children: ',
+ csKind: CompletionSuggestionKind.NAMED_ARGUMENT,
+ relevance: DART_RELEVANCE_NAMED_PARAMETER,
+ defaultArgListString: null);
+ }
+
test_ArgumentList_getter() async {
addTestSource('class A {int get foo => 7; main() {foo(^)}');
await computeSuggestions();
@@ -856,176 +1025,3 @@
assertSuggestArgumentList(['arg', 'blat'], ['dynamic', 'int']);
}
}
-
-@reflectiveTest
-class ArgListContributorTest_Driver extends ArgListContributorTest {
- @override
- bool get enableNewAnalysisDriver => true;
-
- test_ArgumentList_Flutter_InstanceCreationExpression_01() async {
- configureFlutterPkg({
- 'src/widgets/framework.dart': flutter_framework_code,
- });
-
- addTestSource('''
-import 'package:flutter/src/widgets/framework.dart';
-
- build() => new Scaffold(
- appBar: new AppBar(
- ^
- ),
- );
-''');
-
- await computeSuggestions();
-
- assertSuggest('color: ,',
- csKind: CompletionSuggestionKind.NAMED_ARGUMENT,
- relevance: DART_RELEVANCE_NAMED_PARAMETER,
- defaultArgListString: null, // No default values.
- selectionOffset: 7);
- }
-
- test_ArgumentList_Flutter_InstanceCreationExpression_0() async {
- configureFlutterPkg({
- 'src/widgets/framework.dart': flutter_framework_code,
- });
-
- addTestSource('''
-import 'package:flutter/src/widgets/framework.dart';
-
-build() => new Row(
- ^
- );
-''');
-
- await computeSuggestions();
-
- assertSuggest('children: <Widget>[],',
- csKind: CompletionSuggestionKind.NAMED_ARGUMENT,
- relevance: DART_RELEVANCE_NAMED_PARAMETER,
- defaultArgListString: null,
- selectionOffset: 19,
- defaultArgumentListTextRanges: null);
- }
-
- test_ArgumentList_Flutter_InstanceCreationExpression_1() async {
- configureFlutterPkg({
- 'src/widgets/framework.dart': flutter_framework_code,
- });
-
- addTestSource('''
-import 'package:flutter/src/widgets/framework.dart';
-
-build() => new Row(
- key: null,
- ^
- );
-''');
-
- await computeSuggestions();
-
- assertSuggest('children: <Widget>[],',
- csKind: CompletionSuggestionKind.NAMED_ARGUMENT,
- relevance: DART_RELEVANCE_NAMED_PARAMETER,
- defaultArgListString: null,
- selectionOffset: 19,
- defaultArgumentListTextRanges: null);
- }
-
- test_ArgumentList_Flutter_InstanceCreationExpression_2() async {
- configureFlutterPkg({
- 'src/widgets/framework.dart': flutter_framework_code,
- });
-
- addTestSource('''
-import 'package:flutter/src/widgets/framework.dart';
-
-build() => new Row(
- ^
- key: null,
- );
-''');
-
- await computeSuggestions();
-
- assertSuggest('children: <Widget>[],',
- csKind: CompletionSuggestionKind.NAMED_ARGUMENT,
- relevance: DART_RELEVANCE_NAMED_PARAMETER,
- defaultArgListString: null,
- selectionOffset: 19,
- defaultArgumentListTextRanges: null);
- }
-
- test_ArgumentList_Flutter_InstanceCreationExpression_children_dynamic() async {
- // Ensure we don't generate unneeded <dynamic> param if a future API doesn't
- // type it's children.
- configureFlutterPkg({
- 'src/widgets/framework.dart': flutter_framework_code +
- '\nclass DynamicRow extends Widget { DynamicRow({List children: null}){}}'
- });
-
- addTestSource('''
-import 'package:flutter/src/widgets/framework.dart';
-
-build() => new Container(
- child: new DynamicRow(^);
- );
-''');
-
- await computeSuggestions();
-
- assertSuggest('children: [],',
- csKind: CompletionSuggestionKind.NAMED_ARGUMENT,
- relevance: DART_RELEVANCE_NAMED_PARAMETER,
- defaultArgListString: null,
- selectionOffset: 11,
- defaultArgumentListTextRanges: null);
- }
-
- test_ArgumentList_Flutter_InstanceCreationExpression_children_Map() async {
- // Ensure we don't generate Map params for a future API
- configureFlutterPkg({
- 'src/widgets/framework.dart': flutter_framework_code +
- '\nclass MapRow extends Widget { MapRow({Map<Object,Object> children: null}){}}'
- });
-
- addTestSource('''
-import 'package:flutter/src/widgets/framework.dart';
-
-build() => new Container(
- child: new MapRow(^);
- );
-''');
-
- await computeSuggestions();
-
- assertSuggest('children: ,',
- csKind: CompletionSuggestionKind.NAMED_ARGUMENT,
- relevance: DART_RELEVANCE_NAMED_PARAMETER,
- selectionOffset: 10,
- defaultArgListString: null);
- }
-
- test_ArgumentList_Flutter_MethodExpression_children() async {
- // Ensure we don't generate params for a method call
- configureFlutterPkg({
- 'src/widgets/framework.dart':
- flutter_framework_code + '\nfoo({String children})'
- });
-
- addTestSource('''
-import 'package:flutter/src/widgets/framework.dart';
-
-main() {
-foo(^);
-''');
-
- await computeSuggestions();
-
- assertSuggest('children: ',
- csKind: CompletionSuggestionKind.NAMED_ARGUMENT,
- relevance: DART_RELEVANCE_NAMED_PARAMETER,
- defaultArgListString: null);
- }
-}
diff --git a/pkg/analysis_server/test/services/completion/dart/combinator_contributor_test.dart b/pkg/analysis_server/test/services/completion/dart/combinator_contributor_test.dart
index a0d113f..9801a31 100644
--- a/pkg/analysis_server/test/services/completion/dart/combinator_contributor_test.dart
+++ b/pkg/analysis_server/test/services/completion/dart/combinator_contributor_test.dart
@@ -13,13 +13,15 @@
main() {
defineReflectiveSuite(() {
defineReflectiveTests(CombinatorContributorTest);
- defineReflectiveTests(CombinatorContributorTest_Driver);
});
}
@reflectiveTest
class CombinatorContributorTest extends DartCompletionContributorTest {
@override
+ bool get enableNewAnalysisDriver => true;
+
+ @override
DartCompletionContributor createContributor() {
return new CombinatorContributor();
}
@@ -154,9 +156,3 @@
kind: CompletionSuggestionKind.IDENTIFIER);
}
}
-
-@reflectiveTest
-class CombinatorContributorTest_Driver extends CombinatorContributorTest {
- @override
- bool get enableNewAnalysisDriver => true;
-}
diff --git a/pkg/analysis_server/test/services/completion/dart/completion_manager_test.dart b/pkg/analysis_server/test/services/completion/dart/completion_manager_test.dart
index c791de8..75c5ac5 100644
--- a/pkg/analysis_server/test/services/completion/dart/completion_manager_test.dart
+++ b/pkg/analysis_server/test/services/completion/dart/completion_manager_test.dart
@@ -22,13 +22,15 @@
main() {
defineReflectiveSuite(() {
defineReflectiveTests(CompletionManagerTest);
- defineReflectiveTests(CompletionManagerTest_Driver);
});
}
@reflectiveTest
class CompletionManagerTest extends DartCompletionContributorTest {
@override
+ bool get enableNewAnalysisDriver => true;
+
+ @override
DartCompletionContributor createContributor() {
return new ImportedReferenceContributor();
}
@@ -111,9 +113,3 @@
assertImportedLib('/libA.dart');
}
}
-
-@reflectiveTest
-class CompletionManagerTest_Driver extends CompletionManagerTest {
- @override
- bool get enableNewAnalysisDriver => true;
-}
diff --git a/pkg/analysis_server/test/services/completion/dart/field_formal_contributor_test.dart b/pkg/analysis_server/test/services/completion/dart/field_formal_contributor_test.dart
index 9583d5f..f20a585 100644
--- a/pkg/analysis_server/test/services/completion/dart/field_formal_contributor_test.dart
+++ b/pkg/analysis_server/test/services/completion/dart/field_formal_contributor_test.dart
@@ -14,13 +14,15 @@
main() {
defineReflectiveSuite(() {
defineReflectiveTests(FieldFormalContributorTest);
- defineReflectiveTests(FieldFormalContributorTest_Driver);
});
}
@reflectiveTest
class FieldFormalContributorTest extends DartCompletionContributorTest {
@override
+ bool get enableNewAnalysisDriver => true;
+
+ @override
DartCompletionContributor createContributor() {
return new FieldFormalContributor();
}
@@ -198,9 +200,3 @@
assertNotSuggested('x');
}
}
-
-@reflectiveTest
-class FieldFormalContributorTest_Driver extends FieldFormalContributorTest {
- @override
- bool get enableNewAnalysisDriver => true;
-}
diff --git a/pkg/analysis_server/test/services/completion/dart/imported_reference_contributor_test.dart b/pkg/analysis_server/test/services/completion/dart/imported_reference_contributor_test.dart
index 6960b2c..7bb9811 100644
--- a/pkg/analysis_server/test/services/completion/dart/imported_reference_contributor_test.dart
+++ b/pkg/analysis_server/test/services/completion/dart/imported_reference_contributor_test.dart
@@ -20,12 +20,17 @@
main() {
defineReflectiveSuite(() {
defineReflectiveTests(ImportedReferenceContributorTest);
- defineReflectiveTests(ImportedReferenceContributorTest_Driver);
});
}
@reflectiveTest
class ImportedReferenceContributorTest extends DartCompletionContributorTest {
+ final IdeOptions generateChildrenBoilerPlate = new IdeOptionsImpl()
+ ..generateFlutterWidgetChildrenBoilerPlate = true;
+
+ @override
+ bool get enableNewAnalysisDriver => true;
+
@override
bool get isNullExpectedReturnTypeConsideredDynamic => false;
@@ -34,6 +39,51 @@
return new ImportedReferenceContributor();
}
+ test_ArgDefaults_Flutter_cons_with_children() async {
+ addMetaPackageSource();
+
+ configureFlutterPkg({
+ 'src/widgets/framework.dart': flutter_framework_code,
+ });
+
+ addTestSource('''
+import 'package:flutter/src/widgets/framework.dart';
+
+build() => new Container(
+ child: new Row^
+ );
+''');
+
+ await computeSuggestions(options: generateChildrenBoilerPlate);
+
+ assertSuggestConstructor("Row",
+ defaultArgListString: "children: <Widget>[]",
+ defaultArgumentListTextRanges: [10, 10]);
+ }
+
+ /// Sanity check. Permutations tested in local_ref_contributor.
+ test_ArgDefaults_function_with_required_named() async {
+ addMetaPackageSource();
+
+ resolveSource(
+ '/testB.dart',
+ '''
+lib B;
+import 'package:meta/meta.dart';
+
+bool foo(int bar, {bool boo, @required int baz}) => false;
+''');
+
+ addTestSource('''
+import "/testB.dart";
+
+void main() {f^}''');
+ await computeSuggestions();
+
+ assertSuggestFunction('foo', 'bool',
+ defaultArgListString: 'bar, baz: null');
+ }
+
test_ArgumentList() async {
// ArgumentList MethodInvocation ExpressionStatement Block
resolveSource(
@@ -1957,7 +2007,6 @@
assertNotSuggested('two');
}
- @failingTest
test_enum_deprecated() async {
addSource('/libA.dart', 'library A; @deprecated enum E { one, two }');
addTestSource('import "/libA.dart"; main() {^}');
@@ -4510,63 +4559,3 @@
assertNotSuggested('e');
}
}
-
-@reflectiveTest
-class ImportedReferenceContributorTest_Driver
- extends ImportedReferenceContributorTest {
- final IdeOptions generateChildrenBoilerPlate = new IdeOptionsImpl()
- ..generateFlutterWidgetChildrenBoilerPlate = true;
-
- @override
- bool get enableNewAnalysisDriver => true;
-
- test_ArgDefaults_Flutter_cons_with_children() async {
- addMetaPackageSource();
-
- configureFlutterPkg({
- 'src/widgets/framework.dart': flutter_framework_code,
- });
-
- addTestSource('''
-import 'package:flutter/src/widgets/framework.dart';
-
-build() => new Container(
- child: new Row^
- );
-''');
-
- await computeSuggestions(options: generateChildrenBoilerPlate);
-
- assertSuggestConstructor("Row",
- defaultArgListString: "children: <Widget>[]",
- defaultArgumentListTextRanges: [10, 10]);
- }
-
- /// Sanity check. Permutations tested in local_ref_contributor.
- test_ArgDefaults_function_with_required_named() async {
- addMetaPackageSource();
-
- resolveSource(
- '/testB.dart',
- '''
-lib B;
-import 'package:meta/meta.dart';
-
-bool foo(int bar, {bool boo, @required int baz}) => false;
-''');
-
- addTestSource('''
-import "/testB.dart";
-
-void main() {f^}''');
- await computeSuggestions();
-
- assertSuggestFunction('foo', 'bool',
- defaultArgListString: 'bar, baz: null');
- }
-
- @override
- test_enum_deprecated() {
- // TODO(scheglov) remove it?
- }
-}
diff --git a/pkg/analysis_server/test/services/completion/dart/inherited_reference_contributor_test.dart b/pkg/analysis_server/test/services/completion/dart/inherited_reference_contributor_test.dart
index 834cda6..59a949e 100644
--- a/pkg/analysis_server/test/services/completion/dart/inherited_reference_contributor_test.dart
+++ b/pkg/analysis_server/test/services/completion/dart/inherited_reference_contributor_test.dart
@@ -15,13 +15,15 @@
main() {
defineReflectiveSuite(() {
defineReflectiveTests(InheritedContributorTest);
- defineReflectiveTests(InheritedContributorTest_Driver);
});
}
@reflectiveTest
class InheritedContributorTest extends DartCompletionContributorTest {
@override
+ bool get enableNewAnalysisDriver => true;
+
+ @override
bool get isNullExpectedReturnTypeConsideredDynamic => false;
@override
@@ -29,6 +31,30 @@
return new InheritedReferenceContributor();
}
+ /// Sanity check. Permutations tested in local_ref_contributor.
+ test_ArgDefaults_inherited_method_with_required_named() async {
+ addMetaPackageSource();
+ resolveSource(
+ '/testB.dart',
+ '''
+import 'package:meta/meta.dart';
+
+lib libB;
+class A {
+ bool foo(int bar, {bool boo, @required int baz}) => false;
+}''');
+ addTestSource('''
+import "/testB.dart";
+class B extends A {
+ b() => f^
+}
+''');
+ await computeSuggestions();
+
+ assertSuggestMethod('foo', 'A', 'bool',
+ defaultArgListString: 'bar, baz: null');
+ }
+
test_AwaitExpression_inherited() async {
// SimpleIdentifier AwaitExpression ExpressionStatement
resolveSource(
@@ -618,33 +644,3 @@
assertNotSuggested('y2');
}
}
-
-@reflectiveTest
-class InheritedContributorTest_Driver extends InheritedContributorTest {
- @override
- bool get enableNewAnalysisDriver => true;
-
- /// Sanity check. Permutations tested in local_ref_contributor.
- test_ArgDefaults_inherited_method_with_required_named() async {
- addMetaPackageSource();
- resolveSource(
- '/testB.dart',
- '''
-import 'package:meta/meta.dart';
-
-lib libB;
-class A {
- bool foo(int bar, {bool boo, @required int baz}) => false;
-}''');
- addTestSource('''
-import "/testB.dart";
-class B extends A {
- b() => f^
-}
-''');
- await computeSuggestions();
-
- assertSuggestMethod('foo', 'A', 'bool',
- defaultArgListString: 'bar, baz: null');
- }
-}
diff --git a/pkg/analysis_server/test/services/completion/dart/keyword_contributor_test.dart b/pkg/analysis_server/test/services/completion/dart/keyword_contributor_test.dart
index 48ee2b4..7940276 100644
--- a/pkg/analysis_server/test/services/completion/dart/keyword_contributor_test.dart
+++ b/pkg/analysis_server/test/services/completion/dart/keyword_contributor_test.dart
@@ -14,7 +14,6 @@
main() {
defineReflectiveSuite(() {
defineReflectiveTests(KeywordContributorTest);
- defineReflectiveTests(KeywordContributorTest_Driver);
});
}
@@ -212,6 +211,9 @@
Keyword.TRUE,
];
+ @override
+ bool get enableNewAnalysisDriver => true;
+
void assertSuggestKeywords(Iterable<Keyword> expectedKeywords,
{List<String> pseudoKeywords: NO_PSEUDO_KEYWORDS,
int relevance: DART_RELEVANCE_KEYWORD}) {
@@ -1775,9 +1777,3 @@
return true;
}
}
-
-@reflectiveTest
-class KeywordContributorTest_Driver extends KeywordContributorTest {
- @override
- bool get enableNewAnalysisDriver => true;
-}
diff --git a/pkg/analysis_server/test/services/completion/dart/label_contributor_test.dart b/pkg/analysis_server/test/services/completion/dart/label_contributor_test.dart
index ea65d56..c38c96f 100644
--- a/pkg/analysis_server/test/services/completion/dart/label_contributor_test.dart
+++ b/pkg/analysis_server/test/services/completion/dart/label_contributor_test.dart
@@ -14,12 +14,14 @@
main() {
defineReflectiveSuite(() {
defineReflectiveTests(LabelContributorTest);
- defineReflectiveTests(LabelContributorTest_Driver);
});
}
@reflectiveTest
class LabelContributorTest extends DartCompletionContributorTest {
+ @override
+ bool get enableNewAnalysisDriver => true;
+
CompletionSuggestion assertSuggestLabel(String name,
{int relevance: DART_RELEVANCE_DEFAULT,
CompletionSuggestionKind kind: CompletionSuggestionKind.IDENTIFIER}) {
@@ -320,9 +322,3 @@
assertSuggestLabel('foo');
}
}
-
-@reflectiveTest
-class LabelContributorTest_Driver extends LabelContributorTest {
- @override
- bool get enableNewAnalysisDriver => true;
-}
diff --git a/pkg/analysis_server/test/services/completion/dart/library_member_contributor_test.dart b/pkg/analysis_server/test/services/completion/dart/library_member_contributor_test.dart
index fe1e24b..b1f507e 100644
--- a/pkg/analysis_server/test/services/completion/dart/library_member_contributor_test.dart
+++ b/pkg/analysis_server/test/services/completion/dart/library_member_contributor_test.dart
@@ -14,13 +14,15 @@
main() {
defineReflectiveSuite(() {
defineReflectiveTests(LibraryMemberContributorTest);
- defineReflectiveTests(LibraryMemberContributorTest_Driver);
});
}
@reflectiveTest
class LibraryMemberContributorTest extends DartCompletionContributorTest {
@override
+ bool get enableNewAnalysisDriver => true;
+
+ @override
DartCompletionContributor createContributor() {
return new LibraryMemberContributor();
}
@@ -270,9 +272,3 @@
assertNoSuggestions();
}
}
-
-@reflectiveTest
-class LibraryMemberContributorTest_Driver extends LibraryMemberContributorTest {
- @override
- bool get enableNewAnalysisDriver => true;
-}
diff --git a/pkg/analysis_server/test/services/completion/dart/library_prefix_contributor_test.dart b/pkg/analysis_server/test/services/completion/dart/library_prefix_contributor_test.dart
index 78bd338..7010cb5 100644
--- a/pkg/analysis_server/test/services/completion/dart/library_prefix_contributor_test.dart
+++ b/pkg/analysis_server/test/services/completion/dart/library_prefix_contributor_test.dart
@@ -15,12 +15,14 @@
main() {
defineReflectiveSuite(() {
defineReflectiveTests(LibraryPrefixContributorTest);
- defineReflectiveTests(LibraryPrefixContributorTest_Driver);
});
}
@reflectiveTest
class LibraryPrefixContributorTest extends DartCompletionContributorTest {
+ @override
+ bool get enableNewAnalysisDriver => true;
+
void assertSuggestLibraryPrefixes(List<String> expectedPrefixes) {
for (String prefix in expectedPrefixes) {
CompletionSuggestion cs = assertSuggest(prefix,
@@ -376,9 +378,3 @@
assertNoSuggestions();
}
}
-
-@reflectiveTest
-class LibraryPrefixContributorTest_Driver extends LibraryPrefixContributorTest {
- @override
- bool get enableNewAnalysisDriver => true;
-}
diff --git a/pkg/analysis_server/test/services/completion/dart/local_constructor_contributor_test.dart b/pkg/analysis_server/test/services/completion/dart/local_constructor_contributor_test.dart
index 04fe5d5..6a71b69 100644
--- a/pkg/analysis_server/test/services/completion/dart/local_constructor_contributor_test.dart
+++ b/pkg/analysis_server/test/services/completion/dart/local_constructor_contributor_test.dart
@@ -14,12 +14,14 @@
main() {
defineReflectiveSuite(() {
defineReflectiveTests(LocalConstructorContributorTest);
- defineReflectiveTests(LocalConstructorContributorTest_Driver);
});
}
@reflectiveTest
class LocalConstructorContributorTest extends DartCompletionContributorTest {
+ @override
+ bool get enableNewAnalysisDriver => true;
+
CompletionSuggestion assertSuggestLocalVariable(
String name, String returnType,
{int relevance: DART_RELEVANCE_LOCAL_VARIABLE}) {
@@ -57,6 +59,23 @@
return new LocalConstructorContributor();
}
+ /// Sanity check. Permutations tested in local_ref_contributor.
+ test_ArgDefaults_cons_with_required_named() async {
+ addMetaPackageSource();
+ addTestSource('''
+import 'package:meta/meta.dart';
+
+class A {
+ A(int bar, {bool boo, @required int baz});
+ baz() {
+ new A^
+ }
+}''');
+ await computeSuggestions();
+
+ assertSuggestConstructor('A', defaultArgListString: 'bar, baz: null');
+ }
+
test_ArgumentList() async {
// ArgumentList MethodInvocation ExpressionStatement Block
addSource(
@@ -4142,27 +4161,3 @@
assertNotSuggested('e');
}
}
-
-@reflectiveTest
-class LocalConstructorContributorTest_Driver
- extends LocalConstructorContributorTest {
- @override
- bool get enableNewAnalysisDriver => true;
-
- /// Sanity check. Permutations tested in local_ref_contributor.
- test_ArgDefaults_cons_with_required_named() async {
- addMetaPackageSource();
- addTestSource('''
-import 'package:meta/meta.dart';
-
-class A {
- A(int bar, {bool boo, @required int baz});
- baz() {
- new A^
- }
-}''');
- await computeSuggestions();
-
- assertSuggestConstructor('A', defaultArgListString: 'bar, baz: null');
- }
-}
diff --git a/pkg/analysis_server/test/services/completion/dart/local_library_contributor_test.dart b/pkg/analysis_server/test/services/completion/dart/local_library_contributor_test.dart
index 6a49e95..308585b 100644
--- a/pkg/analysis_server/test/services/completion/dart/local_library_contributor_test.dart
+++ b/pkg/analysis_server/test/services/completion/dart/local_library_contributor_test.dart
@@ -14,13 +14,15 @@
main() {
defineReflectiveSuite(() {
defineReflectiveTests(LocalLibraryContributorTest);
- defineReflectiveTests(LocalLibraryContributorTest_Driver);
});
}
@reflectiveTest
class LocalLibraryContributorTest extends DartCompletionContributorTest {
@override
+ bool get enableNewAnalysisDriver => true;
+
+ @override
DartCompletionContributor createContributor() {
return new LocalLibraryContributor();
}
@@ -307,9 +309,3 @@
assertNotSuggested('m');
}
}
-
-@reflectiveTest
-class LocalLibraryContributorTest_Driver extends LocalLibraryContributorTest {
- @override
- bool get enableNewAnalysisDriver => true;
-}
diff --git a/pkg/analysis_server/test/services/completion/dart/local_reference_contributor_test.dart b/pkg/analysis_server/test/services/completion/dart/local_reference_contributor_test.dart
index 2509c41..00a5a71 100644
--- a/pkg/analysis_server/test/services/completion/dart/local_reference_contributor_test.dart
+++ b/pkg/analysis_server/test/services/completion/dart/local_reference_contributor_test.dart
@@ -14,12 +14,14 @@
main() {
defineReflectiveSuite(() {
defineReflectiveTests(LocalReferenceContributorTest);
- defineReflectiveTests(LocalReferenceContributorTest_Driver);
});
}
@reflectiveTest
class LocalReferenceContributorTest extends DartCompletionContributorTest {
+ @override
+ bool get enableNewAnalysisDriver => true;
+
CompletionSuggestion assertSuggestLocalVariable(
String name, String returnType,
{int relevance: DART_RELEVANCE_LOCAL_VARIABLE}) {
@@ -57,6 +59,79 @@
return new LocalReferenceContributor();
}
+ test_ArgDefaults_function() async {
+ addTestSource('''
+bool hasLength(int a, bool b) => false;
+void main() {h^}''');
+ await computeSuggestions();
+
+ assertSuggestFunction('hasLength', 'bool',
+ relevance: DART_RELEVANCE_LOCAL_FUNCTION,
+ defaultArgListString: 'a, b',
+ defaultArgumentListTextRanges: [0, 1, 3, 1]);
+ }
+
+ test_ArgDefaults_function_none() async {
+ addTestSource('''
+bool hasLength() => false;
+void main() {h^}''');
+ await computeSuggestions();
+
+ assertSuggestFunction('hasLength', 'bool',
+ relevance: DART_RELEVANCE_LOCAL_FUNCTION,
+ defaultArgListString: null,
+ defaultArgumentListTextRanges: null);
+ }
+
+ test_ArgDefaults_function_with_optional_positional() async {
+ addMetaPackageSource();
+ addTestSource('''
+import 'package:meta/meta.dart';
+
+bool foo(int bar, [bool boo, int baz]) => false;
+void main() {h^}''');
+ await computeSuggestions();
+
+ assertSuggestFunction('foo', 'bool',
+ relevance: DART_RELEVANCE_LOCAL_FUNCTION,
+ defaultArgListString: 'bar',
+ defaultArgumentListTextRanges: [0, 3]);
+ }
+
+ test_ArgDefaults_function_with_required_named() async {
+ addMetaPackageSource();
+ addTestSource('''
+import 'package:meta/meta.dart';
+
+bool foo(int bar, {bool boo, @required int baz}) => false;
+void main() {h^}''');
+ await computeSuggestions();
+
+ assertSuggestFunction('foo', 'bool',
+ relevance: DART_RELEVANCE_LOCAL_FUNCTION,
+ defaultArgListString: 'bar, baz: null',
+ defaultArgumentListTextRanges: [0, 3, 10, 4]);
+ }
+
+ test_ArgDefaults_method_with_required_named() async {
+ addMetaPackageSource();
+ addTestSource('''
+import 'package:meta/meta.dart';
+
+class A {
+ bool foo(int bar, {bool boo, @required int baz}) => false;
+ baz() {
+ f^
+ }
+}''');
+ await computeSuggestions();
+
+ assertSuggestMethod('foo', 'A', 'bool',
+ relevance: DART_RELEVANCE_LOCAL_METHOD,
+ defaultArgListString: 'bar, baz: null',
+ defaultArgumentListTextRanges: [0, 3, 10, 4]);
+ }
+
test_ArgumentList() async {
// ArgumentList MethodInvocation ExpressionStatement Block
addSource(
@@ -4586,83 +4661,3 @@
assertNotSuggested('e');
}
}
-
-@reflectiveTest
-class LocalReferenceContributorTest_Driver
- extends LocalReferenceContributorTest {
- @override
- bool get enableNewAnalysisDriver => true;
-
- test_ArgDefaults_function() async {
- addTestSource('''
-bool hasLength(int a, bool b) => false;
-void main() {h^}''');
- await computeSuggestions();
-
- assertSuggestFunction('hasLength', 'bool',
- relevance: DART_RELEVANCE_LOCAL_FUNCTION,
- defaultArgListString: 'a, b',
- defaultArgumentListTextRanges: [0, 1, 3, 1]);
- }
-
- test_ArgDefaults_function_none() async {
- addTestSource('''
-bool hasLength() => false;
-void main() {h^}''');
- await computeSuggestions();
-
- assertSuggestFunction('hasLength', 'bool',
- relevance: DART_RELEVANCE_LOCAL_FUNCTION,
- defaultArgListString: null,
- defaultArgumentListTextRanges: null);
- }
-
- test_ArgDefaults_function_with_optional_positional() async {
- addMetaPackageSource();
- addTestSource('''
-import 'package:meta/meta.dart';
-
-bool foo(int bar, [bool boo, int baz]) => false;
-void main() {h^}''');
- await computeSuggestions();
-
- assertSuggestFunction('foo', 'bool',
- relevance: DART_RELEVANCE_LOCAL_FUNCTION,
- defaultArgListString: 'bar',
- defaultArgumentListTextRanges: [0, 3]);
- }
-
- test_ArgDefaults_function_with_required_named() async {
- addMetaPackageSource();
- addTestSource('''
-import 'package:meta/meta.dart';
-
-bool foo(int bar, {bool boo, @required int baz}) => false;
-void main() {h^}''');
- await computeSuggestions();
-
- assertSuggestFunction('foo', 'bool',
- relevance: DART_RELEVANCE_LOCAL_FUNCTION,
- defaultArgListString: 'bar, baz: null',
- defaultArgumentListTextRanges: [0, 3, 10, 4]);
- }
-
- test_ArgDefaults_method_with_required_named() async {
- addMetaPackageSource();
- addTestSource('''
-import 'package:meta/meta.dart';
-
-class A {
- bool foo(int bar, {bool boo, @required int baz}) => false;
- baz() {
- f^
- }
-}''');
- await computeSuggestions();
-
- assertSuggestMethod('foo', 'A', 'bool',
- relevance: DART_RELEVANCE_LOCAL_METHOD,
- defaultArgListString: 'bar, baz: null',
- defaultArgumentListTextRanges: [0, 3, 10, 4]);
- }
-}
diff --git a/pkg/analysis_server/test/services/completion/dart/named_constructor_contributor_test.dart b/pkg/analysis_server/test/services/completion/dart/named_constructor_contributor_test.dart
index 5e6dff6..9b6f9c2 100644
--- a/pkg/analysis_server/test/services/completion/dart/named_constructor_contributor_test.dart
+++ b/pkg/analysis_server/test/services/completion/dart/named_constructor_contributor_test.dart
@@ -14,12 +14,14 @@
main() {
defineReflectiveSuite(() {
defineReflectiveTests(NamedConstructorContributorTest);
- defineReflectiveTests(NamedConstructorContributorTest_Driver);
});
}
@reflectiveTest
class NamedConstructorContributorTest extends DartCompletionContributorTest {
+ @override
+ bool get enableNewAnalysisDriver => true;
+
CompletionSuggestion assertSuggestNamedConstructor(
String name, String returnType,
[int relevance = DART_RELEVANCE_DEFAULT,
@@ -183,10 +185,3 @@
assertNotSuggested('m');
}
}
-
-@reflectiveTest
-class NamedConstructorContributorTest_Driver
- extends NamedConstructorContributorTest {
- @override
- bool get enableNewAnalysisDriver => true;
-}
diff --git a/pkg/analysis_server/test/services/completion/dart/static_member_contributor_test.dart b/pkg/analysis_server/test/services/completion/dart/static_member_contributor_test.dart
index fa7529f..45ff7c6 100644
--- a/pkg/analysis_server/test/services/completion/dart/static_member_contributor_test.dart
+++ b/pkg/analysis_server/test/services/completion/dart/static_member_contributor_test.dart
@@ -14,13 +14,15 @@
main() {
defineReflectiveSuite(() {
defineReflectiveTests(StaticMemberContributorTest);
- defineReflectiveTests(StaticMemberContributorTest_Driver);
});
}
@reflectiveTest
class StaticMemberContributorTest extends DartCompletionContributorTest {
@override
+ bool get enableNewAnalysisDriver => true;
+
+ @override
DartCompletionContributor createContributor() {
return new StaticMemberContributor();
}
@@ -288,9 +290,3 @@
assertNotSuggested('==');
}
}
-
-@reflectiveTest
-class StaticMemberContributorTest_Driver extends StaticMemberContributorTest {
- @override
- bool get enableNewAnalysisDriver => true;
-}
diff --git a/pkg/analysis_server/test/services/completion/dart/type_member_contributor_test.dart b/pkg/analysis_server/test/services/completion/dart/type_member_contributor_test.dart
index 1f24c5a..22e648d 100644
--- a/pkg/analysis_server/test/services/completion/dart/type_member_contributor_test.dart
+++ b/pkg/analysis_server/test/services/completion/dart/type_member_contributor_test.dart
@@ -15,12 +15,14 @@
main() {
defineReflectiveSuite(() {
defineReflectiveTests(TypeMemberContributorTest);
- defineReflectiveTests(TypeMemberContributorTest_Driver);
});
}
@reflectiveTest
class TypeMemberContributorTest extends DartCompletionContributorTest {
+ @override
+ bool get enableNewAnalysisDriver => true;
+
/**
* Check whether a declaration of the form [shadower] in a derived class
* shadows a declaration of the form [shadowee] in a base class, for the
@@ -64,6 +66,61 @@
assertSuggestGetter('length', 'int');
}
+ test_ArgDefaults_method() async {
+ addTestSource('''
+class A {
+ bool a(int b, bool c) => false;
+}
+
+void main() {new A().a^}''');
+ await computeSuggestions();
+
+ assertSuggestMethod('a', 'A', 'bool', defaultArgListString: 'b, c');
+ }
+
+ test_ArgDefaults_method_none() async {
+ addTestSource('''
+class A {
+ bool a() => false;
+}
+
+void main() {new A().a^}''');
+ await computeSuggestions();
+
+ assertSuggestMethod('a', 'A', 'bool', defaultArgListString: null);
+ }
+
+ test_ArgDefaults_method_with_optional_positional() async {
+ addMetaPackageSource();
+ addTestSource('''
+import 'package:meta/meta.dart';
+
+class A {
+ bool foo(int bar, [bool boo, int baz]) => false;
+}
+
+void main() {new A().f^}''');
+ await computeSuggestions();
+
+ assertSuggestMethod('foo', 'A', 'bool', defaultArgListString: 'bar');
+ }
+
+ test_ArgDefaults_method_with_required_named() async {
+ addMetaPackageSource();
+ addTestSource('''
+import 'package:meta/meta.dart';
+
+class A {
+ bool foo(int bar, {bool boo, @required int baz}) => false;
+}
+
+void main() {new A().f^}''');
+ await computeSuggestions();
+
+ assertSuggestMethod('foo', 'A', 'bool',
+ defaultArgListString: 'bar, baz: null');
+ }
+
test_ArgumentList() async {
// ArgumentList MethodInvocation ExpressionStatement Block
addSource(
@@ -4156,64 +4213,3 @@
assertNotSuggested('e');
}
}
-
-@reflectiveTest
-class TypeMemberContributorTest_Driver extends TypeMemberContributorTest {
- @override
- bool get enableNewAnalysisDriver => true;
-
- test_ArgDefaults_method() async {
- addTestSource('''
-class A {
- bool a(int b, bool c) => false;
-}
-
-void main() {new A().a^}''');
- await computeSuggestions();
-
- assertSuggestMethod('a', 'A', 'bool', defaultArgListString: 'b, c');
- }
-
- test_ArgDefaults_method_none() async {
- addTestSource('''
-class A {
- bool a() => false;
-}
-
-void main() {new A().a^}''');
- await computeSuggestions();
-
- assertSuggestMethod('a', 'A', 'bool', defaultArgListString: null);
- }
-
- test_ArgDefaults_method_with_optional_positional() async {
- addMetaPackageSource();
- addTestSource('''
-import 'package:meta/meta.dart';
-
-class A {
- bool foo(int bar, [bool boo, int baz]) => false;
-}
-
-void main() {new A().f^}''');
- await computeSuggestions();
-
- assertSuggestMethod('foo', 'A', 'bool', defaultArgListString: 'bar');
- }
-
- test_ArgDefaults_method_with_required_named() async {
- addMetaPackageSource();
- addTestSource('''
-import 'package:meta/meta.dart';
-
-class A {
- bool foo(int bar, {bool boo, @required int baz}) => false;
-}
-
-void main() {new A().f^}''');
- await computeSuggestions();
-
- assertSuggestMethod('foo', 'A', 'bool',
- defaultArgListString: 'bar, baz: null');
- }
-}
diff --git a/pkg/analysis_server/test/services/completion/dart/uri_contributor_test.dart b/pkg/analysis_server/test/services/completion/dart/uri_contributor_test.dart
index c476fea..cfed83c 100644
--- a/pkg/analysis_server/test/services/completion/dart/uri_contributor_test.dart
+++ b/pkg/analysis_server/test/services/completion/dart/uri_contributor_test.dart
@@ -16,14 +16,15 @@
defineReflectiveSuite(() {
defineReflectiveTests(UriContributorTest);
defineReflectiveTests(UriContributorWindowsTest);
- defineReflectiveTests(UriContributorTest_Driver);
- defineReflectiveTests(UriContributorWindowsTest_Driver);
});
}
@reflectiveTest
class UriContributorTest extends DartCompletionContributorTest {
@override
+ bool get enableNewAnalysisDriver => true;
+
+ @override
DartCompletionContributor createContributor() {
return new UriContributor();
}
@@ -463,13 +464,10 @@
}
@reflectiveTest
-class UriContributorTest_Driver extends UriContributorTest {
+class UriContributorWindowsTest extends DartCompletionContributorTest {
@override
bool get enableNewAnalysisDriver => true;
-}
-@reflectiveTest
-class UriContributorWindowsTest extends DartCompletionContributorTest {
@override
DartCompletionContributor createContributor() {
return new UriContributor();
@@ -634,12 +632,6 @@
}
}
-@reflectiveTest
-class UriContributorWindowsTest_Driver extends UriContributorWindowsTest {
- @override
- bool get enableNewAnalysisDriver => true;
-}
-
class _TestWinResourceProvider extends MemoryResourceProvider {
@override
Context get pathContext => windows;
diff --git a/pkg/analysis_server/test/services/completion/dart/variable_name_contributor_test.dart b/pkg/analysis_server/test/services/completion/dart/variable_name_contributor_test.dart
index 316e1d8..6a59156 100644
--- a/pkg/analysis_server/test/services/completion/dart/variable_name_contributor_test.dart
+++ b/pkg/analysis_server/test/services/completion/dart/variable_name_contributor_test.dart
@@ -14,13 +14,15 @@
main() {
defineReflectiveSuite(() {
defineReflectiveTests(VariableNameContributorTest);
- defineReflectiveTests(VariableNameContributorTest_Driver);
});
}
@reflectiveTest
class VariableNameContributorTest extends DartCompletionContributorTest {
@override
+ bool get enableNewAnalysisDriver => true;
+
+ @override
DartCompletionContributor createContributor() {
return new VariableNameContributor();
}
@@ -245,9 +247,3 @@
assertSuggestName('a');
}
}
-
-@reflectiveTest
-class VariableNameContributorTest_Driver extends VariableNameContributorTest {
- @override
- bool get enableNewAnalysisDriver => true;
-}
diff --git a/pkg/analysis_server/test/services/correction/assist_test.dart b/pkg/analysis_server/test/services/correction/assist_test.dart
index b1b4c38..2a3bac6 100644
--- a/pkg/analysis_server/test/services/correction/assist_test.dart
+++ b/pkg/analysis_server/test/services/correction/assist_test.dart
@@ -31,7 +31,6 @@
main() {
defineReflectiveSuite(() {
defineReflectiveTests(AssistProcessorTest);
- defineReflectiveTests(AssistProcessorTest_Driver);
});
}
@@ -46,6 +45,9 @@
String resultCode;
LinkedEditGroup linkedPositionGroup;
+ @override
+ bool get enableNewAnalysisDriver => true;
+
/**
* Asserts that there is an [Assist] of the given [kind] at [offset] which
* produces the [expected] code when applied to [testCode].
@@ -4718,12 +4720,6 @@
}
}
-@reflectiveTest
-class AssistProcessorTest_Driver extends AssistProcessorTest {
- @override
- bool get enableNewAnalysisDriver => true;
-}
-
class _DartAssistContextForValues implements DartAssistContext {
@override
final Source source;
diff --git a/pkg/analysis_server/test/services/correction/fix_test.dart b/pkg/analysis_server/test/services/correction/fix_test.dart
index 559eed9..e7e837b 100644
--- a/pkg/analysis_server/test/services/correction/fix_test.dart
+++ b/pkg/analysis_server/test/services/correction/fix_test.dart
@@ -31,8 +31,6 @@
defineReflectiveSuite(() {
defineReflectiveTests(FixProcessorTest);
defineReflectiveTests(LintFixTest);
- defineReflectiveTests(FixProcessorTest_Driver);
- defineReflectiveTests(LintFixTest_Driver);
});
}
@@ -230,6 +228,9 @@
@reflectiveTest
class FixProcessorTest extends BaseFixProcessorTest {
+ @override
+ bool get enableNewAnalysisDriver => true;
+
test_addFieldFormalParameters_hasRequiredParameter() async {
await resolveTestUnit('''
class Test {
@@ -5886,15 +5887,12 @@
}
@reflectiveTest
-class FixProcessorTest_Driver extends FixProcessorTest {
- @override
- bool get enableNewAnalysisDriver => true;
-}
-
-@reflectiveTest
class LintFixTest extends BaseFixProcessorTest {
AnalysisError error;
+ @override
+ bool get enableNewAnalysisDriver => true;
+
Future applyFix(FixKind kind) async {
fix = await _assertHasFix(kind, error);
change = fix.change;
@@ -6868,12 +6866,6 @@
}
}
-@reflectiveTest
-class LintFixTest_Driver extends LintFixTest {
- @override
- bool get enableNewAnalysisDriver => true;
-}
-
class _DartFixContextImpl implements DartFixContext {
@override
final ResourceProvider resourceProvider;
diff --git a/pkg/analysis_server/test/services/refactoring/convert_getter_to_method_test.dart b/pkg/analysis_server/test/services/refactoring/convert_getter_to_method_test.dart
index c15568b..6d228a9 100644
--- a/pkg/analysis_server/test/services/refactoring/convert_getter_to_method_test.dart
+++ b/pkg/analysis_server/test/services/refactoring/convert_getter_to_method_test.dart
@@ -16,7 +16,6 @@
main() {
defineReflectiveSuite(() {
defineReflectiveTests(ConvertGetterToMethodTest);
- defineReflectiveTests(ConvertGetterToMethodTest_Driver);
});
}
@@ -24,6 +23,9 @@
class ConvertGetterToMethodTest extends RefactoringTest {
ConvertGetterToMethodRefactoring refactoring;
+ @override
+ bool get enableNewAnalysisDriver => true;
+
test_change_function() async {
await indexTestUnit('''
int get test => 42;
@@ -165,9 +167,3 @@
_createRefactoringForElement(element);
}
}
-
-@reflectiveTest
-class ConvertGetterToMethodTest_Driver extends ConvertGetterToMethodTest {
- @override
- bool get enableNewAnalysisDriver => true;
-}
diff --git a/pkg/analysis_server/test/services/refactoring/convert_method_to_getter_test.dart b/pkg/analysis_server/test/services/refactoring/convert_method_to_getter_test.dart
index fdec34b..460150a 100644
--- a/pkg/analysis_server/test/services/refactoring/convert_method_to_getter_test.dart
+++ b/pkg/analysis_server/test/services/refactoring/convert_method_to_getter_test.dart
@@ -16,7 +16,6 @@
main() {
defineReflectiveSuite(() {
defineReflectiveTests(ConvertMethodToGetterTest);
- defineReflectiveTests(ConvertMethodToGetterTest_Driver);
});
}
@@ -24,6 +23,9 @@
class ConvertMethodToGetterTest extends RefactoringTest {
ConvertMethodToGetterRefactoring refactoring;
+ @override
+ bool get enableNewAnalysisDriver => true;
+
test_change_function() async {
await indexTestUnit('''
int test() => 42;
@@ -214,9 +216,3 @@
_createRefactoringForElement(element);
}
}
-
-@reflectiveTest
-class ConvertMethodToGetterTest_Driver extends ConvertMethodToGetterTest {
- @override
- bool get enableNewAnalysisDriver => true;
-}
diff --git a/pkg/analysis_server/test/services/refactoring/extract_local_test.dart b/pkg/analysis_server/test/services/refactoring/extract_local_test.dart
index 862022f..66792a9 100644
--- a/pkg/analysis_server/test/services/refactoring/extract_local_test.dart
+++ b/pkg/analysis_server/test/services/refactoring/extract_local_test.dart
@@ -17,7 +17,6 @@
main() {
defineReflectiveSuite(() {
defineReflectiveTests(ExtractLocalTest);
- defineReflectiveTests(ExtractLocalTest_Driver);
});
}
@@ -25,6 +24,9 @@
class ExtractLocalTest extends RefactoringTest {
ExtractLocalRefactoringImpl refactoring;
+ @override
+ bool get enableNewAnalysisDriver => true;
+
test_checkFinalConditions_sameVariable_after() async {
await indexTestUnit('''
main() {
@@ -1345,9 +1347,3 @@
return subExpressions;
}
}
-
-@reflectiveTest
-class ExtractLocalTest_Driver extends ExtractLocalTest {
- @override
- bool get enableNewAnalysisDriver => true;
-}
diff --git a/pkg/analysis_server/test/services/refactoring/extract_method_test.dart b/pkg/analysis_server/test/services/refactoring/extract_method_test.dart
index b8adda4..1622dc6 100644
--- a/pkg/analysis_server/test/services/refactoring/extract_method_test.dart
+++ b/pkg/analysis_server/test/services/refactoring/extract_method_test.dart
@@ -16,7 +16,6 @@
main() {
defineReflectiveSuite(() {
defineReflectiveTests(ExtractMethodTest);
- defineReflectiveTests(ExtractMethodTest_Driver);
});
}
@@ -24,6 +23,9 @@
class ExtractMethodTest extends RefactoringTest {
ExtractMethodRefactoringImpl refactoring;
+ @override
+ bool get enableNewAnalysisDriver => true;
+
test_bad_assignmentLeftHandSide() async {
await indexTestUnit('''
main() {
@@ -2841,9 +2843,3 @@
}).toList();
}
}
-
-@reflectiveTest
-class ExtractMethodTest_Driver extends ExtractMethodTest {
- @override
- bool get enableNewAnalysisDriver => true;
-}
diff --git a/pkg/analysis_server/test/services/refactoring/inline_local_test.dart b/pkg/analysis_server/test/services/refactoring/inline_local_test.dart
index fd045fe..6b572da 100644
--- a/pkg/analysis_server/test/services/refactoring/inline_local_test.dart
+++ b/pkg/analysis_server/test/services/refactoring/inline_local_test.dart
@@ -14,7 +14,6 @@
main() {
defineReflectiveSuite(() {
defineReflectiveTests(InlineLocalTest);
- defineReflectiveTests(InlineLocalTest_Driver);
});
}
@@ -22,6 +21,9 @@
class InlineLocalTest extends RefactoringTest {
InlineLocalRefactoringImpl refactoring;
+ @override
+ bool get enableNewAnalysisDriver => true;
+
test_access() async {
await indexTestUnit('''
main() {
@@ -638,9 +640,3 @@
new InlineLocalRefactoring(searchEngine, astProvider, testUnit, offset);
}
}
-
-@reflectiveTest
-class InlineLocalTest_Driver extends InlineLocalTest {
- @override
- bool get enableNewAnalysisDriver => true;
-}
diff --git a/pkg/analysis_server/test/services/refactoring/inline_method_test.dart b/pkg/analysis_server/test/services/refactoring/inline_method_test.dart
index 0a1a247..6df0829 100644
--- a/pkg/analysis_server/test/services/refactoring/inline_method_test.dart
+++ b/pkg/analysis_server/test/services/refactoring/inline_method_test.dart
@@ -17,7 +17,6 @@
main() {
defineReflectiveSuite(() {
defineReflectiveTests(InlineMethodTest);
- defineReflectiveTests(InlineMethodTest_Driver);
});
}
@@ -27,6 +26,9 @@
bool deleteSource;
bool inlineAll;
+ @override
+ bool get enableNewAnalysisDriver => true;
+
test_access_FunctionElement() async {
await indexTestUnit(r'''
test(a, b) {
@@ -1715,9 +1717,3 @@
searchEngine, astProvider, testUnit, offset);
}
}
-
-@reflectiveTest
-class InlineMethodTest_Driver extends InlineMethodTest {
- @override
- bool get enableNewAnalysisDriver => true;
-}
diff --git a/pkg/analysis_server/test/services/refactoring/rename_class_member_test.dart b/pkg/analysis_server/test/services/refactoring/rename_class_member_test.dart
index 0b4acb9..43cd1a4 100644
--- a/pkg/analysis_server/test/services/refactoring/rename_class_member_test.dart
+++ b/pkg/analysis_server/test/services/refactoring/rename_class_member_test.dart
@@ -13,12 +13,14 @@
main() {
defineReflectiveSuite(() {
defineReflectiveTests(RenameClassMemberTest);
- defineReflectiveTests(RenameClassMemberTest_Driver);
});
}
@reflectiveTest
class RenameClassMemberTest extends RenameRefactoringTest {
+ @override
+ bool get enableNewAnalysisDriver => true;
+
test_checkFinalConditions_classNameConflict_sameClass() async {
await indexTestUnit('''
class NewName {
@@ -151,6 +153,7 @@
expectedMessage: "Renamed method will be invisible in 'my.lib'.");
}
+ @failingTest
test_checkFinalConditions_shadowed_byLocalFunction_inSameClass() async {
await indexTestUnit('''
class A {
@@ -171,6 +174,7 @@
expectedContextSearch: 'test(); // marker');
}
+ @failingTest
test_checkFinalConditions_shadowed_byLocalVariable_inSameClass() async {
await indexTestUnit('''
class A {
@@ -191,6 +195,7 @@
expectedContextSearch: 'test(); // marker');
}
+ @failingTest
test_checkFinalConditions_shadowed_byLocalVariable_inSubClass() async {
await indexTestUnit('''
class A {
@@ -899,30 +904,3 @@
''');
}
}
-
-@reflectiveTest
-class RenameClassMemberTest_Driver extends RenameClassMemberTest {
- @override
- bool get enableNewAnalysisDriver => true;
-
- @failingTest
- @override
- test_checkFinalConditions_shadowed_byLocalFunction_inSameClass() {
- return super
- .test_checkFinalConditions_shadowed_byLocalFunction_inSameClass();
- }
-
- @failingTest
- @override
- test_checkFinalConditions_shadowed_byLocalVariable_inSameClass() {
- return super
- .test_checkFinalConditions_shadowed_byLocalVariable_inSameClass();
- }
-
- @failingTest
- @override
- test_checkFinalConditions_shadowed_byLocalVariable_inSubClass() {
- return super
- .test_checkFinalConditions_shadowed_byLocalVariable_inSubClass();
- }
-}
diff --git a/pkg/analysis_server/test/services/refactoring/rename_constructor_test.dart b/pkg/analysis_server/test/services/refactoring/rename_constructor_test.dart
index e364ccd..ef19b6d 100644
--- a/pkg/analysis_server/test/services/refactoring/rename_constructor_test.dart
+++ b/pkg/analysis_server/test/services/refactoring/rename_constructor_test.dart
@@ -15,12 +15,14 @@
main() {
defineReflectiveSuite(() {
defineReflectiveTests(RenameConstructorTest);
- defineReflectiveTests(RenameConstructorTest_Driver);
});
}
@reflectiveTest
class RenameConstructorTest extends RenameRefactoringTest {
+ @override
+ bool get enableNewAnalysisDriver => true;
+
test_checkInitialConditions_inSDK() async {
await indexTestUnit('''
main() {
@@ -250,9 +252,3 @@
createRenameRefactoringForElement(element);
}
}
-
-@reflectiveTest
-class RenameConstructorTest_Driver extends RenameConstructorTest {
- @override
- bool get enableNewAnalysisDriver => true;
-}
diff --git a/pkg/analysis_server/test/services/refactoring/rename_import_test.dart b/pkg/analysis_server/test/services/refactoring/rename_import_test.dart
index c413707..0bc587c 100644
--- a/pkg/analysis_server/test/services/refactoring/rename_import_test.dart
+++ b/pkg/analysis_server/test/services/refactoring/rename_import_test.dart
@@ -12,12 +12,14 @@
main() {
defineReflectiveSuite(() {
defineReflectiveTests(RenameImportTest);
- defineReflectiveTests(RenameImportTest_Driver);
});
}
@reflectiveTest
class RenameImportTest extends RenameRefactoringTest {
+ @override
+ bool get enableNewAnalysisDriver => true;
+
test_checkNewName() async {
await indexTestUnit("import 'dart:async' as test;");
_createRefactoring("import 'dart:");
@@ -229,9 +231,3 @@
createRenameRefactoringForElement(directive.element);
}
}
-
-@reflectiveTest
-class RenameImportTest_Driver extends RenameImportTest {
- @override
- bool get enableNewAnalysisDriver => true;
-}
diff --git a/pkg/analysis_server/test/services/refactoring/rename_label_test.dart b/pkg/analysis_server/test/services/refactoring/rename_label_test.dart
index 83d03bc..42242c1 100644
--- a/pkg/analysis_server/test/services/refactoring/rename_label_test.dart
+++ b/pkg/analysis_server/test/services/refactoring/rename_label_test.dart
@@ -11,12 +11,14 @@
main() {
defineReflectiveSuite(() {
defineReflectiveTests(RenameLabelTest);
- defineReflectiveTests(RenameLabelTest_Driver);
});
}
@reflectiveTest
class RenameLabelTest extends RenameRefactoringTest {
+ @override
+ bool get enableNewAnalysisDriver => true;
+
test_checkNewName_LocalVariableElement() async {
await indexTestUnit('''
main() {
@@ -82,9 +84,3 @@
expect(refactoring.oldName, 'test');
}
}
-
-@reflectiveTest
-class RenameLabelTest_Driver extends RenameLabelTest {
- @override
- bool get enableNewAnalysisDriver => true;
-}
diff --git a/pkg/analysis_server/test/services/refactoring/rename_library_test.dart b/pkg/analysis_server/test/services/refactoring/rename_library_test.dart
index b324632..debb683 100644
--- a/pkg/analysis_server/test/services/refactoring/rename_library_test.dart
+++ b/pkg/analysis_server/test/services/refactoring/rename_library_test.dart
@@ -12,12 +12,14 @@
main() {
defineReflectiveSuite(() {
defineReflectiveTests(RenameLibraryTest);
- defineReflectiveTests(RenameLibraryTest_Driver);
});
}
@reflectiveTest
class RenameLibraryTest extends RenameRefactoringTest {
+ @override
+ bool get enableNewAnalysisDriver => true;
+
test_checkNewName() async {
await indexTestUnit('''
library my.app;
@@ -105,9 +107,3 @@
createRenameRefactoringForElement(testUnitElement.library);
}
}
-
-@reflectiveTest
-class RenameLibraryTest_Driver extends RenameLibraryTest {
- @override
- bool get enableNewAnalysisDriver => true;
-}
diff --git a/pkg/analysis_server/test/services/refactoring/rename_local_test.dart b/pkg/analysis_server/test/services/refactoring/rename_local_test.dart
index 4275267..e6ac0b4 100644
--- a/pkg/analysis_server/test/services/refactoring/rename_local_test.dart
+++ b/pkg/analysis_server/test/services/refactoring/rename_local_test.dart
@@ -12,12 +12,14 @@
main() {
defineReflectiveSuite(() {
defineReflectiveTests(RenameLocalTest);
- defineReflectiveTests(RenameLocalTest_Driver);
});
}
@reflectiveTest
class RenameLocalTest extends RenameRefactoringTest {
+ @override
+ bool get enableNewAnalysisDriver => true;
+
test_checkFinalConditions_hasLocalFunction_after() async {
await indexTestUnit('''
main() {
@@ -552,9 +554,3 @@
expect(refactoring.oldName, 'test');
}
}
-
-@reflectiveTest
-class RenameLocalTest_Driver extends RenameLocalTest {
- @override
- bool get enableNewAnalysisDriver => true;
-}
diff --git a/pkg/analysis_server/test/services/refactoring/rename_unit_member_test.dart b/pkg/analysis_server/test/services/refactoring/rename_unit_member_test.dart
index 5d466e9..84d8e78 100644
--- a/pkg/analysis_server/test/services/refactoring/rename_unit_member_test.dart
+++ b/pkg/analysis_server/test/services/refactoring/rename_unit_member_test.dart
@@ -12,12 +12,14 @@
main() {
defineReflectiveSuite(() {
defineReflectiveTests(RenameUnitMemberTest);
- defineReflectiveTests(RenameUnitMemberTest_Driver);
});
}
@reflectiveTest
class RenameUnitMemberTest extends RenameRefactoringTest {
+ @override
+ bool get enableNewAnalysisDriver => true;
+
test_checkFinalConditions_hasTopLevel_ClassElement() async {
await indexTestUnit('''
class Test {}
@@ -622,9 +624,3 @@
''');
}
}
-
-@reflectiveTest
-class RenameUnitMemberTest_Driver extends RenameUnitMemberTest {
- @override
- bool get enableNewAnalysisDriver => true;
-}
diff --git a/pkg/analysis_server/test/services/search/hierarchy_test.dart b/pkg/analysis_server/test/services/search/hierarchy_test.dart
index 9f23cf7..26a1c7d 100644
--- a/pkg/analysis_server/test/services/search/hierarchy_test.dart
+++ b/pkg/analysis_server/test/services/search/hierarchy_test.dart
@@ -6,13 +6,9 @@
import 'dart:async';
-import 'package:analysis_server/src/services/index/index.dart';
import 'package:analysis_server/src/services/search/hierarchy.dart';
-import 'package:analysis_server/src/services/search/search_engine.dart';
-import 'package:analysis_server/src/services/search/search_engine_internal.dart';
import 'package:analysis_server/src/services/search/search_engine_internal2.dart';
import 'package:analyzer/dart/element/element.dart';
-import 'package:analyzer/src/dart/analysis/ast_provider_context.dart';
import 'package:test/test.dart';
import 'package:test_reflective_loader/test_reflective_loader.dart';
@@ -21,13 +17,20 @@
main() {
defineReflectiveSuite(() {
defineReflectiveTests(HierarchyTest);
- defineReflectiveTests(HierarchyTest_Driver);
});
}
@reflectiveTest
-abstract class AbstractHierarchyTest extends AbstractSingleUnitTest {
- SearchEngine get searchEngine;
+class HierarchyTest extends AbstractSingleUnitTest {
+ SearchEngineImpl2 searchEngine;
+
+ @override
+ bool get enableNewAnalysisDriver => true;
+
+ void setUp() {
+ super.setUp();
+ searchEngine = new SearchEngineImpl2([driver]);
+ }
test_getClassMembers() async {
await _indexTestUnit('''
@@ -358,40 +361,6 @@
}
}
- Future<Null> _indexTestUnit(String code);
-}
-
-@reflectiveTest
-class HierarchyTest extends AbstractHierarchyTest {
- Index index;
- SearchEngineImpl searchEngine;
-
- void setUp() {
- super.setUp();
- index = createMemoryIndex();
- searchEngine =
- new SearchEngineImpl(index, (_) => new AstProviderForContext(context));
- }
-
- Future<Null> _indexTestUnit(String code) async {
- await resolveTestUnit(code);
- index.indexUnit(testUnit);
- }
-}
-
-@reflectiveTest
-class HierarchyTest_Driver extends AbstractHierarchyTest {
- SearchEngineImpl2 searchEngine;
-
- @override
- bool get enableNewAnalysisDriver => true;
-
- void setUp() {
- super.setUp();
- searchEngine = new SearchEngineImpl2([driver]);
- }
-
- @override
Future<Null> _indexTestUnit(String code) async {
await resolveTestUnit(code);
}
diff --git a/pkg/analysis_server/test/test_all.dart b/pkg/analysis_server/test/test_all.dart
index 1d814bd..9edc74f 100644
--- a/pkg/analysis_server/test/test_all.dart
+++ b/pkg/analysis_server/test/test_all.dart
@@ -8,7 +8,6 @@
import 'analysis_server_test.dart' as analysis_server_test;
import 'channel/test_all.dart' as channel_test;
import 'completion_test.dart' as completion_test;
-import 'context_manager_driver_test.dart' as context_manager_driver_test;
import 'context_manager_test.dart' as context_manager_test;
import 'domain_analysis_test.dart' as domain_analysis_test;
import 'domain_completion_test.dart' as domain_completion_test;
@@ -36,7 +35,6 @@
analysis_server_test.main();
channel_test.main();
completion_test.main();
- context_manager_driver_test.main();
context_manager_test.main();
domain_analysis_test.main();
domain_completion_test.main();
