Remove WithoutNullSafety tests in DAS and analyzer_plugin tests
Change-Id: I3ea9e767ff49b16a8dcdec5540a6b2d68f414930
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/337844
Reviewed-by: Konstantin Shcheglov <scheglov@google.com>
Commit-Queue: Samuel Rawlins <srawlins@google.com>
diff --git a/pkg/analysis_server/test/lsp/code_actions_refactor_test.dart b/pkg/analysis_server/test/lsp/code_actions_refactor_test.dart
index 39add86..6355df7 100644
--- a/pkg/analysis_server/test/lsp/code_actions_refactor_test.dart
+++ b/pkg/analysis_server/test/lsp/code_actions_refactor_test.dart
@@ -19,8 +19,6 @@
defineReflectiveSuite(() {
defineReflectiveTests(ExtractMethodRefactorCodeActionsTest);
defineReflectiveTests(ExtractWidgetRefactorCodeActionsTest);
- defineReflectiveTests(
- ExtractWidgetRefactorCodeActionsWithoutNullSafetyTest);
defineReflectiveTests(ExtractVariableRefactorCodeActionsTest);
defineReflectiveTests(InlineLocalVariableRefactorCodeActionsTest);
defineReflectiveTests(InlineMethodRefactorCodeActionsTest);
@@ -907,20 +905,6 @@
}
@reflectiveTest
-class ExtractWidgetRefactorCodeActionsWithoutNullSafetyTest
- extends ExtractWidgetRefactorCodeActionsTest {
- @override
- String get expectedNewWidgetConstructorDeclaration => '''
-const NewWidget({
- Key key,
- }) : super(key: key);
-''';
-
- @override
- String get testPackageLanguageVersion => '2.9';
-}
-
-@reflectiveTest
class InlineLocalVariableRefactorCodeActionsTest
extends RefactorCodeActionsTest {
final inlineVariableTitle = 'Inline Local Variable';
diff --git a/pkg/analysis_server/test/lsp/completion_dart_test.dart b/pkg/analysis_server/test/lsp/completion_dart_test.dart
index 36b754b..aa31c20 100644
--- a/pkg/analysis_server/test/lsp/completion_dart_test.dart
+++ b/pkg/analysis_server/test/lsp/completion_dart_test.dart
@@ -45,7 +45,6 @@
defineReflectiveTests(CompletionDocumentationResolutionTest);
defineReflectiveTests(DartSnippetCompletionTest);
defineReflectiveTests(FlutterSnippetCompletionTest);
- defineReflectiveTests(FlutterSnippetCompletionWithoutNullSafetyTest);
});
}
@@ -4623,20 +4622,6 @@
}
}
-@reflectiveTest
-class FlutterSnippetCompletionWithoutNullSafetyTest
- extends FlutterSnippetCompletionTest {
- @override
- String get expectedImports => '''
-import 'package:flutter/widgets.dart';''';
-
- @override
- String get expectedWidgetConstructorParams => '({Key key}) : super(key: key)';
-
- @override
- String get testPackageLanguageVersion => '2.9';
-}
-
abstract class SnippetCompletionTest extends AbstractLspAnalysisServerTest
with CompletionTestMixin {
/// Expect that there is a snippet for [prefix] at [position] with the label
diff --git a/pkg/analysis_server/test/src/services/correction/fix/create_constructor_for_final_fields_test.dart b/pkg/analysis_server/test/src/services/correction/fix/create_constructor_for_final_fields_test.dart
index fc2469c..8aa6194 100644
--- a/pkg/analysis_server/test/src/services/correction/fix/create_constructor_for_final_fields_test.dart
+++ b/pkg/analysis_server/test/src/services/correction/fix/create_constructor_for_final_fields_test.dart
@@ -15,7 +15,6 @@
defineReflectiveTests(
CreateConstructorForFinalFieldsRequiredPositionalTest);
defineReflectiveTests(CreateConstructorForFinalFieldsRequiredNamedTest);
- defineReflectiveTests(CreateConstructorForFinalFieldsWithoutNullSafetyTest);
defineReflectiveTests(
CreateConstructorForFinalFieldsWithoutSuperParametersTest);
});
@@ -420,94 +419,6 @@
}
@reflectiveTest
-class CreateConstructorForFinalFieldsWithoutNullSafetyTest
- extends FixProcessorTest {
- @override
- FixKind get kind => DartFixKind.CREATE_CONSTRUCTOR_FOR_FINAL_FIELDS;
-
- @override
- String get testPackageLanguageVersion => '2.9';
-
- Future<void> test_class_flutter() async {
- writeTestPackageConfig(flutter: true);
- await resolveTestCode('''
-import 'package:flutter/widgets.dart';
-
-class MyWidget extends StatelessWidget {
- final int a;
- final int b = 2;
- final int c;
-}
-''');
- await assertHasFix('''
-import 'package:flutter/widgets.dart';
-
-class MyWidget extends StatelessWidget {
- final int a;
- final int b = 2;
- final int c;
-
- const MyWidget({Key key, this.a, this.c}) : super(key: key);
-}
-''', errorFilter: (error) {
- return error.message.contains("'a'");
- });
- }
-
- Future<void> test_class_flutter_childLast() async {
- writeTestPackageConfig(flutter: true);
- await resolveTestCode('''
-import 'package:flutter/widgets.dart';
-
-class MyWidget extends StatelessWidget {
- final int a;
- final Widget child;
- final int b;
-}
-''');
- await assertHasFix('''
-import 'package:flutter/widgets.dart';
-
-class MyWidget extends StatelessWidget {
- final int a;
- final Widget child;
- final int b;
-
- const MyWidget({Key key, this.a, this.b, this.child}) : super(key: key);
-}
-''', errorFilter: (error) {
- return error.message.contains("'a'");
- });
- }
-
- Future<void> test_class_flutter_childrenLast() async {
- writeTestPackageConfig(flutter: true);
- await resolveTestCode('''
-import 'package:flutter/widgets.dart';
-
-class MyWidget extends StatelessWidget {
- final int a;
- final List<Widget> children;
- final int b;
-}
-''');
- await assertHasFix('''
-import 'package:flutter/widgets.dart';
-
-class MyWidget extends StatelessWidget {
- final int a;
- final List<Widget> children;
- final int b;
-
- const MyWidget({Key key, this.a, this.b, this.children}) : super(key: key);
-}
-''', errorFilter: (error) {
- return error.message.contains("'a'");
- });
- }
-}
-
-@reflectiveTest
class CreateConstructorForFinalFieldsWithoutSuperParametersTest
extends FixProcessorTest {
@override
diff --git a/pkg/analyzer_plugin/test/src/utilities/change_builder/change_builder_dart_test.dart b/pkg/analyzer_plugin/test/src/utilities/change_builder/change_builder_dart_test.dart
index 430bc1a..7cb5e8c 100644
--- a/pkg/analyzer_plugin/test/src/utilities/change_builder/change_builder_dart_test.dart
+++ b/pkg/analyzer_plugin/test/src/utilities/change_builder/change_builder_dart_test.dart
@@ -27,8 +27,7 @@
void main() {
defineReflectiveSuite(() {
- defineReflectiveTests(DartEditBuilderImpl_WithNullSafetyTest);
- defineReflectiveTests(DartEditBuilderImpl_WithoutNullSafetyTest);
+ defineReflectiveTests(DartEditBuilderImpl);
defineReflectiveTests(DartFileEditBuilderImplTest);
defineReflectiveTests(DartLinkedEditBuilderImplTest);
defineReflectiveTests(ImportLibraryTest);
@@ -37,7 +36,59 @@
}
@reflectiveTest
-class DartEditBuilderImpl_WithNullSafetyTest extends DartEditBuilderImplTest {
+class DartEditBuilderImpl extends DartEditBuilderImplTest {
+ Future<void> test_writeParameter_covariantAndRequired() async {
+ var path = convertPath('$testPackageRootPath/lib/test.dart');
+ var content = 'class A {}';
+ addSource(path, content);
+
+ var builder = await newBuilder();
+ await builder.addDartFileEdit(path, (builder) {
+ builder.addInsertion(content.length - 1, (builder) {
+ builder.writeParameter('a', isCovariant: true, isRequiredNamed: true);
+ });
+ });
+ var edits = getEdits(builder);
+ expect(edits, hasLength(1));
+ expect(
+ edits[0].replacement, equalsIgnoringWhitespace('covariant required a'));
+ }
+
+ Future<void> test_writeParameter_required_addImport() async {
+ var path = convertPath('$testPackageRootPath/lib/test.dart');
+ var content = 'class A {}';
+ addSource(path, content);
+
+ var builder = await newBuilder();
+ await builder.addDartFileEdit(path, (builder) {
+ builder.addInsertion(content.length - 1, (builder) {
+ builder.writeParameter('a', isRequiredNamed: true);
+ });
+ });
+ var edits = getEdits(builder);
+ expect(edits, hasLength(1));
+ expect(edits[0].replacement, equalsIgnoringWhitespace('required a'));
+ }
+
+ Future<void> test_writeParameter_required_existingImport() async {
+ var path = convertPath('$testPackageRootPath/lib/test.dart');
+ var content = '''
+import 'package:meta/meta.dart';
+
+class A {}
+''';
+ addSource(path, content);
+
+ var builder = await newBuilder();
+ await builder.addDartFileEdit(path, (builder) {
+ builder.addInsertion(content.length - 1, (builder) {
+ builder.writeParameter('a', isRequiredNamed: true);
+ });
+ });
+ var edit = getEdit(builder);
+ expect(edit.replacement, equalsIgnoringWhitespace('required a'));
+ }
+
Future<void> test_writeParameter_required_keyword() async {
var path = convertPath('$testPackageRootPath/lib/test.dart');
var content = 'class A {}';
@@ -82,66 +133,6 @@
}
}
-@reflectiveTest
-class DartEditBuilderImpl_WithoutNullSafetyTest extends DartEditBuilderImplTest
- with WithoutNullSafetyMixin {
- Future<void> test_writeParameter_covariantAndRequired() async {
- var path = convertPath('$testPackageRootPath/lib/test.dart');
- var content = 'class A {}';
- addSource(path, content);
-
- var builder = await newBuilder();
- await builder.addDartFileEdit(path, (builder) {
- builder.addInsertion(content.length - 1, (builder) {
- builder.writeParameter('a', isCovariant: true, isRequiredNamed: true);
- });
- });
- var edits = getEdits(builder);
- expect(edits, hasLength(2));
- expect(edits[0].replacement,
- equalsIgnoringWhitespace('covariant @required a'));
- expect(edits[1].replacement,
- equalsIgnoringWhitespace("import 'package:meta/meta.dart';"));
- }
-
- Future<void> test_writeParameter_required_addImport() async {
- var path = convertPath('$testPackageRootPath/lib/test.dart');
- var content = 'class A {}';
- addSource(path, content);
-
- var builder = await newBuilder();
- await builder.addDartFileEdit(path, (builder) {
- builder.addInsertion(content.length - 1, (builder) {
- builder.writeParameter('a', isRequiredNamed: true);
- });
- });
- var edits = getEdits(builder);
- expect(edits, hasLength(2));
- expect(edits[0].replacement, equalsIgnoringWhitespace('@required a'));
- expect(edits[1].replacement,
- equalsIgnoringWhitespace("import 'package:meta/meta.dart';"));
- }
-
- Future<void> test_writeParameter_required_existingImport() async {
- var path = convertPath('$testPackageRootPath/lib/test.dart');
- var content = '''
-import 'package:meta/meta.dart';
-
-class A {}
-''';
- addSource(path, content);
-
- var builder = await newBuilder();
- await builder.addDartFileEdit(path, (builder) {
- builder.addInsertion(content.length - 1, (builder) {
- builder.writeParameter('a', isRequiredNamed: true);
- });
- });
- var edit = getEdit(builder);
- expect(edit.replacement, equalsIgnoringWhitespace('@required a'));
- }
-}
-
class DartEditBuilderImplTest extends AbstractContextTest
with DartChangeBuilderMixin {
@override
@@ -1219,10 +1210,8 @@
});
});
var edit = getEdit(builder);
- var expectedReplacement = this is WithoutNullSafetyMixin
- ? 'String s, {int index}'
- : 'String s, {required int index}';
- expect(edit.replacement, equalsIgnoringWhitespace(expectedReplacement));
+ expect(edit.replacement,
+ equalsIgnoringWhitespace('String s, {required int index}'));
}
Future<void> test_writeParametersMatchingArguments_required() async {
diff --git a/pkg/analyzer_plugin/test/support/abstract_context.dart b/pkg/analyzer_plugin/test/support/abstract_context.dart
index 80b64b3..efb7e5d 100644
--- a/pkg/analyzer_plugin/test/support/abstract_context.dart
+++ b/pkg/analyzer_plugin/test/support/abstract_context.dart
@@ -190,11 +190,6 @@
}
}
-mixin WithoutNullSafetyMixin on AbstractContextTest {
- @override
- String? get testPackageLanguageVersion => '2.9';
-}
-
/// Wraps the given [_ElementVisitorFunction] into an instance of
/// [engine.GeneralizingElementVisitor].
class _ElementVisitorFunctionWrapper extends GeneralizingElementVisitor {
diff --git a/pkg/analyzer_plugin/test/utilities/analyzer_converter_test.dart b/pkg/analyzer_plugin/test/utilities/analyzer_converter_test.dart
index 1ea944d..6e5e980 100644
--- a/pkg/analyzer_plugin/test/utilities/analyzer_converter_test.dart
+++ b/pkg/analyzer_plugin/test/utilities/analyzer_converter_test.dart
@@ -16,16 +16,17 @@
import 'package:test/test.dart';
import 'package:test_reflective_loader/test_reflective_loader.dart';
-import '../support/abstract_context.dart';
import '../support/abstract_single_unit.dart';
void main() {
defineReflectiveTests(AnalyzerConverterTest);
- defineReflectiveTests(AnalyzerConverterWithoutNullSafetyTest);
}
@reflectiveTest
-class AnalyzerConverterTest extends _AnalyzerConverterTest {
+class AnalyzerConverterTest extends AbstractSingleUnitTest {
+ AnalyzerConverter converter = AnalyzerConverter();
+ late analyzer.Source source;
+
/// Assert that the given [pluginError] matches the given [analyzerError].
void assertError(
plugin.AnalysisError pluginError, analyzer.AnalysisError analyzerError,
@@ -68,6 +69,13 @@
);
}
+ @override
+ void setUp() {
+ super.setUp();
+ source = newFile('/foo/bar.dart', '').createSource();
+ testFile = convertPath('$testPackageRootPath/lib/test.dart');
+ }
+
void test_convertAnalysisError_contextMessages() {
var analyzerError = createError(13, contextMessage: 'here');
var lineInfo = analyzer.LineInfo([0, 10, 20]);
@@ -617,44 +625,3 @@
}
}
}
-
-@reflectiveTest
-class AnalyzerConverterWithoutNullSafetyTest extends _AnalyzerConverterTest
- with WithoutNullSafetyMixin {
- Future<void> test_convertElement_method() async {
- await resolveTestCode('''
-class A {
- static List<String> myMethod(int a, {String b, int c}) {
- return [];
- }
-}''');
- var engineElement = findElement.method('myMethod');
- // create notification Element
- var element = converter.convertElement(engineElement);
- expect(element.kind, plugin.ElementKind.METHOD);
- expect(element.name, 'myMethod');
- {
- var location = element.location!;
- expect(location.file, testFile);
- expect(location.offset, 32);
- expect(location.length, 'myGetter'.length);
- expect(location.startLine, 2);
- expect(location.startColumn, 23);
- }
- expect(element.parameters, '(int a, {String b, int c})');
- expect(element.returnType, 'List<String>');
- expect(element.flags, plugin.Element.FLAG_STATIC);
- }
-}
-
-class _AnalyzerConverterTest extends AbstractSingleUnitTest {
- AnalyzerConverter converter = AnalyzerConverter();
- late analyzer.Source source;
-
- @override
- void setUp() {
- super.setUp();
- source = newFile('/foo/bar.dart', '').createSource();
- testFile = convertPath('$testPackageRootPath/lib/test.dart');
- }
-}
