Skip to content

Commit 28ca02d

Browse files
srawlinsCommit Queue
srawlins
authored and
Commit Queue
committed
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 <[email protected]> Commit-Queue: Samuel Rawlins <[email protected]>
1 parent 3d40816 commit 28ca02d

File tree

6 files changed

+64
-233
lines changed

6 files changed

+64
-233
lines changed

‎pkg/analysis_server/test/lsp/code_actions_refactor_test.dart

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@ void main() {
1919
defineReflectiveSuite(() {
2020
defineReflectiveTests(ExtractMethodRefactorCodeActionsTest);
2121
defineReflectiveTests(ExtractWidgetRefactorCodeActionsTest);
22-
defineReflectiveTests(
23-
ExtractWidgetRefactorCodeActionsWithoutNullSafetyTest);
2422
defineReflectiveTests(ExtractVariableRefactorCodeActionsTest);
2523
defineReflectiveTests(InlineLocalVariableRefactorCodeActionsTest);
2624
defineReflectiveTests(InlineMethodRefactorCodeActionsTest);
@@ -906,20 +904,6 @@ void f() {}
906904
}
907905
}
908906

909-
@reflectiveTest
910-
class ExtractWidgetRefactorCodeActionsWithoutNullSafetyTest
911-
extends ExtractWidgetRefactorCodeActionsTest {
912-
@override
913-
String get expectedNewWidgetConstructorDeclaration => '''
914-
const NewWidget({
915-
Key key,
916-
}) : super(key: key);
917-
''';
918-
919-
@override
920-
String get testPackageLanguageVersion => '2.9';
921-
}
922-
923907
@reflectiveTest
924908
class InlineLocalVariableRefactorCodeActionsTest
925909
extends RefactorCodeActionsTest {

‎pkg/analysis_server/test/lsp/completion_dart_test.dart

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ void main() {
4545
defineReflectiveTests(CompletionDocumentationResolutionTest);
4646
defineReflectiveTests(DartSnippetCompletionTest);
4747
defineReflectiveTests(FlutterSnippetCompletionTest);
48-
defineReflectiveTests(FlutterSnippetCompletionWithoutNullSafetyTest);
4948
});
5049
}
5150

@@ -4623,20 +4622,6 @@ stle^
46234622
}
46244623
}
46254624

4626-
@reflectiveTest
4627-
class FlutterSnippetCompletionWithoutNullSafetyTest
4628-
extends FlutterSnippetCompletionTest {
4629-
@override
4630-
String get expectedImports => '''
4631-
import 'package:flutter/widgets.dart';''';
4632-
4633-
@override
4634-
String get expectedWidgetConstructorParams => '({Key key}) : super(key: key)';
4635-
4636-
@override
4637-
String get testPackageLanguageVersion => '2.9';
4638-
}
4639-
46404625
abstract class SnippetCompletionTest extends AbstractLspAnalysisServerTest
46414626
with CompletionTestMixin {
46424627
/// Expect that there is a snippet for [prefix] at [position] with the label

‎pkg/analysis_server/test/src/services/correction/fix/create_constructor_for_final_fields_test.dart

Lines changed: 0 additions & 89 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ void main() {
1515
defineReflectiveTests(
1616
CreateConstructorForFinalFieldsRequiredPositionalTest);
1717
defineReflectiveTests(CreateConstructorForFinalFieldsRequiredNamedTest);
18-
defineReflectiveTests(CreateConstructorForFinalFieldsWithoutNullSafetyTest);
1918
defineReflectiveTests(
2019
CreateConstructorForFinalFieldsWithoutSuperParametersTest);
2120
});
@@ -419,94 +418,6 @@ final int v;
419418
}
420419
}
421420

422-
@reflectiveTest
423-
class CreateConstructorForFinalFieldsWithoutNullSafetyTest
424-
extends FixProcessorTest {
425-
@override
426-
FixKind get kind => DartFixKind.CREATE_CONSTRUCTOR_FOR_FINAL_FIELDS;
427-
428-
@override
429-
String get testPackageLanguageVersion => '2.9';
430-
431-
Future<void> test_class_flutter() async {
432-
writeTestPackageConfig(flutter: true);
433-
await resolveTestCode('''
434-
import 'package:flutter/widgets.dart';
435-
436-
class MyWidget extends StatelessWidget {
437-
final int a;
438-
final int b = 2;
439-
final int c;
440-
}
441-
''');
442-
await assertHasFix('''
443-
import 'package:flutter/widgets.dart';
444-
445-
class MyWidget extends StatelessWidget {
446-
final int a;
447-
final int b = 2;
448-
final int c;
449-
450-
const MyWidget({Key key, this.a, this.c}) : super(key: key);
451-
}
452-
''', errorFilter: (error) {
453-
return error.message.contains("'a'");
454-
});
455-
}
456-
457-
Future<void> test_class_flutter_childLast() async {
458-
writeTestPackageConfig(flutter: true);
459-
await resolveTestCode('''
460-
import 'package:flutter/widgets.dart';
461-
462-
class MyWidget extends StatelessWidget {
463-
final int a;
464-
final Widget child;
465-
final int b;
466-
}
467-
''');
468-
await assertHasFix('''
469-
import 'package:flutter/widgets.dart';
470-
471-
class MyWidget extends StatelessWidget {
472-
final int a;
473-
final Widget child;
474-
final int b;
475-
476-
const MyWidget({Key key, this.a, this.b, this.child}) : super(key: key);
477-
}
478-
''', errorFilter: (error) {
479-
return error.message.contains("'a'");
480-
});
481-
}
482-
483-
Future<void> test_class_flutter_childrenLast() async {
484-
writeTestPackageConfig(flutter: true);
485-
await resolveTestCode('''
486-
import 'package:flutter/widgets.dart';
487-
488-
class MyWidget extends StatelessWidget {
489-
final int a;
490-
final List<Widget> children;
491-
final int b;
492-
}
493-
''');
494-
await assertHasFix('''
495-
import 'package:flutter/widgets.dart';
496-
497-
class MyWidget extends StatelessWidget {
498-
final int a;
499-
final List<Widget> children;
500-
final int b;
501-
502-
const MyWidget({Key key, this.a, this.b, this.children}) : super(key: key);
503-
}
504-
''', errorFilter: (error) {
505-
return error.message.contains("'a'");
506-
});
507-
}
508-
}
509-
510421
@reflectiveTest
511422
class CreateConstructorForFinalFieldsWithoutSuperParametersTest
512423
extends FixProcessorTest {

‎pkg/analyzer_plugin/test/src/utilities/change_builder/change_builder_dart_test.dart

Lines changed: 53 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,7 @@ import 'mocks.dart';
2727

2828
void main() {
2929
defineReflectiveSuite(() {
30-
defineReflectiveTests(DartEditBuilderImpl_WithNullSafetyTest);
31-
defineReflectiveTests(DartEditBuilderImpl_WithoutNullSafetyTest);
30+
defineReflectiveTests(DartEditBuilderImpl);
3231
defineReflectiveTests(DartFileEditBuilderImplTest);
3332
defineReflectiveTests(DartLinkedEditBuilderImplTest);
3433
defineReflectiveTests(ImportLibraryTest);
@@ -37,54 +36,7 @@ void main() {
3736
}
3837

3938
@reflectiveTest
40-
class DartEditBuilderImpl_WithNullSafetyTest extends DartEditBuilderImplTest {
41-
Future<void> test_writeParameter_required_keyword() async {
42-
var path = convertPath('$testPackageRootPath/lib/test.dart');
43-
var content = 'class A {}';
44-
addSource(path, content);
45-
46-
var builder = await newBuilder();
47-
await builder.addDartFileEdit(path, (builder) {
48-
builder.addInsertion(content.length - 1, (builder) {
49-
builder.writeParameter('a', isRequiredNamed: true);
50-
});
51-
});
52-
var edit = getEdit(builder);
53-
expect(edit.replacement, equalsIgnoringWhitespace('required a'));
54-
}
55-
56-
Future<void> test_writeType_function_nullable() async {
57-
await _assertWriteType('int Function(double a, String b)?');
58-
}
59-
60-
Future<void> test_writeType_Never_none() async {
61-
await _assertWriteType('Never');
62-
}
63-
64-
Future<void> test_writeType_Never_question() async {
65-
await _assertWriteType('Never?');
66-
}
67-
68-
Future<void> test_writeType_recordType_mixed() async {
69-
await _assertWriteType('(int, {int y})');
70-
}
71-
72-
Future<void> test_writeType_recordType_named() async {
73-
await _assertWriteType('({int x, int y})');
74-
}
75-
76-
Future<void> test_writeType_recordType_nullable() async {
77-
await _assertWriteType('(int, {int y})?');
78-
}
79-
80-
Future<void> test_writeType_recordType_positional() async {
81-
await _assertWriteType('(int, int)');
82-
}
83-
}
84-
85-
@reflectiveTest
86-
class DartEditBuilderImpl_WithoutNullSafetyTest extends DartEditBuilderImplTest
87-
with WithoutNullSafetyMixin {
39+
class DartEditBuilderImpl extends DartEditBuilderImplTest {
8840
Future<void> test_writeParameter_covariantAndRequired() async {
8941
var path = convertPath('$testPackageRootPath/lib/test.dart');
9042
var content = 'class A {}';
@@ -97,11 +49,9 @@ class DartEditBuilderImpl_WithoutNullSafetyTest extends DartEditBuilderImplTest
9749
});
9850
});
9951
var edits = getEdits(builder);
100-
expect(edits, hasLength(2));
101-
expect(edits[0].replacement,
102-
equalsIgnoringWhitespace('covariant @required a'));
103-
expect(edits[1].replacement,
104-
equalsIgnoringWhitespace("import 'package:meta/meta.dart';"));
52+
expect(edits, hasLength(1));
53+
expect(
54+
edits[0].replacement, equalsIgnoringWhitespace('covariant required a'));
10555
}
10656

10757
Future<void> test_writeParameter_required_addImport() async {
@@ -116,10 +66,8 @@ class DartEditBuilderImpl_WithoutNullSafetyTest extends DartEditBuilderImplTest
11666
});
11767
});
11868
var edits = getEdits(builder);
119-
expect(edits, hasLength(2));
120-
expect(edits[0].replacement, equalsIgnoringWhitespace('@required a'));
121-
expect(edits[1].replacement,
122-
equalsIgnoringWhitespace("import 'package:meta/meta.dart';"));
69+
expect(edits, hasLength(1));
70+
expect(edits[0].replacement, equalsIgnoringWhitespace('required a'));
12371
}
12472

12573
Future<void> test_writeParameter_required_existingImport() async {
@@ -138,7 +86,50 @@ class A {}
13886
});
13987
});
14088
var edit = getEdit(builder);
141-
expect(edit.replacement, equalsIgnoringWhitespace('@required a'));
89+
expect(edit.replacement, equalsIgnoringWhitespace('required a'));
90+
}
91+
92+
Future<void> test_writeParameter_required_keyword() async {
93+
var path = convertPath('$testPackageRootPath/lib/test.dart');
94+
var content = 'class A {}';
95+
addSource(path, content);
96+
97+
var builder = await newBuilder();
98+
await builder.addDartFileEdit(path, (builder) {
99+
builder.addInsertion(content.length - 1, (builder) {
100+
builder.writeParameter('a', isRequiredNamed: true);
101+
});
102+
});
103+
var edit = getEdit(builder);
104+
expect(edit.replacement, equalsIgnoringWhitespace('required a'));
105+
}
106+
107+
Future<void> test_writeType_function_nullable() async {
108+
await _assertWriteType('int Function(double a, String b)?');
109+
}
110+
111+
Future<void> test_writeType_Never_none() async {
112+
await _assertWriteType('Never');
113+
}
114+
115+
Future<void> test_writeType_Never_question() async {
116+
await _assertWriteType('Never?');
117+
}
118+
119+
Future<void> test_writeType_recordType_mixed() async {
120+
await _assertWriteType('(int, {int y})');
121+
}
122+
123+
Future<void> test_writeType_recordType_named() async {
124+
await _assertWriteType('({int x, int y})');
125+
}
126+
127+
Future<void> test_writeType_recordType_nullable() async {
128+
await _assertWriteType('(int, {int y})?');
129+
}
130+
131+
Future<void> test_writeType_recordType_positional() async {
132+
await _assertWriteType('(int, int)');
142133
}
143134
}
144135

@@ -1219,10 +1210,8 @@ f(int i, String s) {
12191210
});
12201211
});
12211212
var edit = getEdit(builder);
1222-
var expectedReplacement = this is WithoutNullSafetyMixin
1223-
? 'String s, {int index}'
1224-
: 'String s, {required int index}';
1225-
expect(edit.replacement, equalsIgnoringWhitespace(expectedReplacement));
1213+
expect(edit.replacement,
1214+
equalsIgnoringWhitespace('String s, {required int index}'));
12261215
}
12271216

12281217
Future<void> test_writeParametersMatchingArguments_required() async {

‎pkg/analyzer_plugin/test/support/abstract_context.dart

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -190,11 +190,6 @@ class AbstractContextTest with ResourceProviderMixin {
190190
}
191191
}
192192

193-
mixin WithoutNullSafetyMixin on AbstractContextTest {
194-
@override
195-
String? get testPackageLanguageVersion => '2.9';
196-
}
197-
198193
/// Wraps the given [_ElementVisitorFunction] into an instance of
199194
/// [engine.GeneralizingElementVisitor].
200195
class _ElementVisitorFunctionWrapper extends GeneralizingElementVisitor {

0 commit comments

Comments
 (0)