Skip to content

Commit c2d28d1

Browse files
scheglovscheglov
committed
Rename Null Safety tests.
[email protected] Change-Id: I9276244cab52cb5c0f2687052f2a3df9a9fd48b2 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/155720 Reviewed-by: Brian Wilkerson <[email protected]>
1 parent 4d3ec06 commit c2d28d1

File tree

69 files changed

+188
-171
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

69 files changed

+188
-171
lines changed

‎pkg/analysis_server/test/analysis/notification_highlights2_test.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ void main() {
1717
defineReflectiveSuite(() {
1818
defineReflectiveTests(AnalysisNotificationHighlightsTest);
1919
defineReflectiveTests(HighlightsWithControlFlowCollectionsTest);
20-
defineReflectiveTests(HighlightsWithNnbdTest);
20+
defineReflectiveTests(HighlightsWithNullSafetyTest);
2121
defineReflectiveTests(HighlightTypeTest);
2222
});
2323
}
@@ -1297,7 +1297,7 @@ f(a, b) {
12971297
}
12981298

12991299
@reflectiveTest
1300-
class HighlightsWithNnbdTest extends HighlightsTestSupport {
1300+
class HighlightsWithNullSafetyTest extends HighlightsTestSupport {
13011301
@override
13021302
void createProject({Map<String, String> packageRoots}) {
13031303
addAnalysisOptionsFile('''

‎pkg/analysis_server/test/analysis/notification_highlights_test.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ void main() {
1717
defineReflectiveSuite(() {
1818
defineReflectiveTests(AnalysisNotificationHighlightsTest);
1919
defineReflectiveTests(HighlightsWithControlFlowCollectionsTest);
20-
defineReflectiveTests(HighlightsWithNnbdTest);
20+
defineReflectiveTests(HighlightsWithNullSafetyTest);
2121
defineReflectiveTests(HighlightTypeTest);
2222
});
2323
}
@@ -1145,7 +1145,7 @@ f(a, b) {
11451145
}
11461146

11471147
@reflectiveTest
1148-
class HighlightsWithNnbdTest extends HighlightsTestSupport {
1148+
class HighlightsWithNullSafetyTest extends HighlightsTestSupport {
11491149
@override
11501150
void createProject({Map<String, String> packageRoots}) {
11511151
addAnalysisOptionsFile('''

‎pkg/analysis_server/test/services/completion/dart/keyword_contributor_test.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import 'completion_contributor_util.dart';
1616
void main() {
1717
defineReflectiveSuite(() {
1818
defineReflectiveTests(KeywordContributorTest);
19-
defineReflectiveTests(KeywordContributorWithNnbdTest);
19+
defineReflectiveTests(KeywordContributorWithNullSafetyTest);
2020
});
2121
}
2222

@@ -2348,7 +2348,7 @@ f() => [...^];
23482348
}
23492349

23502350
@reflectiveTest
2351-
class KeywordContributorWithNnbdTest extends KeywordContributorTest {
2351+
class KeywordContributorWithNullSafetyTest extends KeywordContributorTest {
23522352
@override
23532353
void setupResourceProvider() {
23542354
super.setupResourceProvider();

‎pkg/analysis_server/test/services/completion/dart/relevance/named_argument_relevance_test.dart

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import 'completion_relevance.dart';
1111
void main() {
1212
defineReflectiveSuite(() {
1313
defineReflectiveTests(NamedArgumentRelevanceTest);
14-
defineReflectiveTests(NamedArgumentRelevanceWithNnbdTest);
14+
defineReflectiveTests(NamedArgumentRelevanceWithNullSafetyTest);
1515
});
1616
}
1717

@@ -47,7 +47,8 @@ void g() => f(^);
4747
}
4848

4949
@reflectiveTest
50-
class NamedArgumentRelevanceWithNnbdTest extends NamedArgumentRelevanceTest {
50+
class NamedArgumentRelevanceWithNullSafetyTest
51+
extends NamedArgumentRelevanceTest {
5152
@override
5253
List<String> get enabledExperiments => ['non-nullable'];
5354

‎pkg/analysis_server/test/src/services/correction/assist/shadow_field_test.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import 'assist_processor.dart';
1212
void main() {
1313
defineReflectiveSuite(() {
1414
defineReflectiveTests(ShadowFieldTest);
15-
defineReflectiveTests(ShadowFieldWithNNBDTest);
15+
defineReflectiveTests(ShadowFieldWithNullSafetyTest);
1616
});
1717
}
1818

@@ -108,7 +108,7 @@ class C {
108108
}
109109

110110
@reflectiveTest
111-
class ShadowFieldWithNNBDTest extends ShadowFieldTest {
111+
class ShadowFieldWithNullSafetyTest extends ShadowFieldTest {
112112
@override
113113
void setUp() {
114114
super.setUp();

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import 'fix_processor.dart';
1313
void main() {
1414
defineReflectiveSuite(() {
1515
defineReflectiveTests(AddRequiredTest);
16-
defineReflectiveTests(AddRequiredWithNNBDTest);
16+
defineReflectiveTests(AddRequiredWithNullSafetyTest);
1717
});
1818
}
1919

@@ -40,7 +40,7 @@ void function({@required String param}) {
4040
}
4141

4242
@reflectiveTest
43-
class AddRequiredWithNNBDTest extends FixProcessorTest {
43+
class AddRequiredWithNullSafetyTest extends FixProcessorTest {
4444
@override
4545
List<String> get experiments => [EnableString.non_nullable];
4646

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import 'fix_processor.dart';
1313
void main() {
1414
defineReflectiveSuite(() {
1515
defineReflectiveTests(InlineTypedefTest);
16-
defineReflectiveTests(InlineTypedefWithNNBDTest);
16+
defineReflectiveTests(InlineTypedefWithNullSafetyTest);
1717
});
1818
}
1919

@@ -137,7 +137,7 @@ void g(Function<T>(T) f) {}
137137
}
138138

139139
@reflectiveTest
140-
class InlineTypedefWithNNBDTest extends InlineTypedefTest {
140+
class InlineTypedefWithNullSafetyTest extends InlineTypedefTest {
141141
@override
142142
List<String> get experiments => [EnableString.non_nullable];
143143

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ void main() {
1414
defineReflectiveSuite(() {
1515
defineReflectiveTests(PreferFinalInForEachTest);
1616
defineReflectiveTests(PreferFinalFieldsTest);
17-
defineReflectiveTests(PreferFinalFieldsWithNNBDTest);
17+
defineReflectiveTests(PreferFinalFieldsWithNullSafetyTest);
1818
});
1919
}
2020

@@ -58,7 +58,7 @@ class C {
5858
}
5959

6060
@reflectiveTest
61-
class PreferFinalFieldsWithNNBDTest extends FixProcessorLintTest {
61+
class PreferFinalFieldsWithNullSafetyTest extends FixProcessorLintTest {
6262
@override
6363
List<String> get experiments => [EnableString.non_nullable];
6464

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import 'fix_processor.dart';
1313
void main() {
1414
defineReflectiveSuite(() {
1515
defineReflectiveTests(ReplaceCascadeWithDotTest);
16-
defineReflectiveTests(ReplaceCascadeWithDotWithNNBDTest);
16+
defineReflectiveTests(ReplaceCascadeWithDotWithNullSafetyTest);
1717
});
1818
}
1919

@@ -99,7 +99,8 @@ void f(String s) {
9999
}
100100

101101
@reflectiveTest
102-
class ReplaceCascadeWithDotWithNNBDTest extends ReplaceCascadeWithDotTest {
102+
class ReplaceCascadeWithDotWithNullSafetyTest
103+
extends ReplaceCascadeWithDotTest {
103104
@override
104105
List<String> get experiments => [EnableString.non_nullable];
105106

‎pkg/analyzer/test/src/dart/analysis/search_test.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import 'base.dart';
2121
main() {
2222
defineReflectiveSuite(() {
2323
defineReflectiveTests(SearchTest);
24-
defineReflectiveTests(SearchWithNnbdTest);
24+
defineReflectiveTests(SearchWithNullSafetyTest);
2525
});
2626
}
2727

@@ -1817,7 +1817,7 @@ class NoMatchABCDEF {}
18171817
}
18181818

18191819
@reflectiveTest
1820-
class SearchWithNnbdTest extends SearchTest {
1820+
class SearchWithNullSafetyTest extends SearchTest {
18211821
@override
18221822
AnalysisOptionsImpl createAnalysisOptions() => AnalysisOptionsImpl()
18231823
..contextFeatures = FeatureSet.forTesting(

‎pkg/analyzer/test/src/dart/element/inheritance_manager3_test.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import '../resolution/with_null_safety_mixin.dart';
1515
main() {
1616
defineReflectiveSuite(() {
1717
defineReflectiveTests(InheritanceManager3Test);
18-
defineReflectiveTests(InheritanceManager3WithNnbdTest);
18+
defineReflectiveTests(InheritanceManager3WithNullSafetyTest);
1919
});
2020
}
2121

@@ -1042,7 +1042,7 @@ class B extends A {
10421042
}
10431043

10441044
@reflectiveTest
1045-
class InheritanceManager3WithNnbdTest extends _InheritanceManager3Base
1045+
class InheritanceManager3WithNullSafetyTest extends _InheritanceManager3Base
10461046
with WithNullSafetyMixin {
10471047
test_getInheritedMap_topMerge_method() async {
10481048
newFile('/test/lib/a.dart', content: r'''

‎pkg/analyzer/test/src/dart/resolution/binary_expression_test.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import 'with_null_safety_mixin.dart';
1111
main() {
1212
defineReflectiveSuite(() {
1313
defineReflectiveTests(BinaryExpressionResolutionTest);
14-
defineReflectiveTests(BinaryExpressionResolutionWithNnbdTest);
14+
defineReflectiveTests(BinaryExpressionResolutionWithNullSafetyTest);
1515
});
1616
}
1717

@@ -230,7 +230,7 @@ f(int a, int b) {
230230
}
231231

232232
@reflectiveTest
233-
class BinaryExpressionResolutionWithNnbdTest extends DriverResolutionTest
233+
class BinaryExpressionResolutionWithNullSafetyTest extends DriverResolutionTest
234234
with WithNullSafetyMixin {
235235
test_ifNull_left_nullableContext() async {
236236
await assertNoErrorsInCode(r'''

‎pkg/analyzer/test/src/dart/resolution/constant_test.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import 'with_null_safety_mixin.dart';
1717
main() {
1818
defineReflectiveSuite(() {
1919
defineReflectiveTests(ConstantResolutionTest);
20-
defineReflectiveTests(ConstantResolutionWithNnbdTest);
20+
defineReflectiveTests(ConstantResolutionWithNullSafetyTest);
2121
});
2222
}
2323

@@ -236,7 +236,7 @@ extension E on int {
236236
}
237237

238238
@reflectiveTest
239-
class ConstantResolutionWithNnbdTest extends DriverResolutionTest
239+
class ConstantResolutionWithNullSafetyTest extends DriverResolutionTest
240240
with WithNullSafetyMixin {
241241
test_context_eliminateTypeVariables() async {
242242
await assertNoErrorsInCode(r'''

‎pkg/analyzer/test/src/dart/resolution/extension_method_test.dart

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@ import 'with_null_safety_mixin.dart';
1515
main() {
1616
defineReflectiveSuite(() {
1717
defineReflectiveTests(ExtensionMethodsDeclarationTest);
18-
defineReflectiveTests(ExtensionMethodsDeclarationWithNnbdTest);
18+
defineReflectiveTests(ExtensionMethodsDeclarationWithNullSafetyTest);
1919
defineReflectiveTests(ExtensionMethodsExtendedTypeTest);
20-
defineReflectiveTests(ExtensionMethodsExtendedTypeWithNnbdTest);
20+
defineReflectiveTests(ExtensionMethodsExtendedTypeWithNullSafetyTest);
2121
defineReflectiveTests(ExtensionMethodsExternalReferenceTest);
22-
defineReflectiveTests(ExtensionMethodsExternalReferenceWithNnbdTest);
22+
defineReflectiveTests(ExtensionMethodsExternalReferenceWithNullSafetyTest);
2323
defineReflectiveTests(ExtensionMethodsInternalReferenceTest);
24-
defineReflectiveTests(ExtensionMethodsInternalReferenceWithNnbdTest);
24+
defineReflectiveTests(ExtensionMethodsInternalReferenceWithNullSafetyTest);
2525
});
2626
}
2727

@@ -315,7 +315,7 @@ f(p.C c) {
315315
/// Tests that show that extension declarations and the members inside them are
316316
/// resolved correctly.
317317
@reflectiveTest
318-
class ExtensionMethodsDeclarationWithNnbdTest extends DriverResolutionTest
318+
class ExtensionMethodsDeclarationWithNullSafetyTest extends DriverResolutionTest
319319
with WithNullSafetyMixin {
320320
test_this_type_interface() async {
321321
await assertNoErrorsInCode('''
@@ -475,7 +475,7 @@ extension on M {}
475475
}
476476

477477
@reflectiveTest
478-
class ExtensionMethodsExtendedTypeWithNnbdTest
478+
class ExtensionMethodsExtendedTypeWithNullSafetyTest
479479
extends ExtensionMethodsExtendedTypeTest with WithNullSafetyMixin {}
480480

481481
/// Tests that extension members can be correctly resolved when referenced
@@ -1420,7 +1420,7 @@ extension E on Function {
14201420
}
14211421

14221422
@reflectiveTest
1423-
class ExtensionMethodsExternalReferenceWithNnbdTest
1423+
class ExtensionMethodsExternalReferenceWithNullSafetyTest
14241424
extends ExtensionMethodsExternalReferenceTest with WithNullSafetyMixin {
14251425
test_instance_getter_fromInstance_Never() async {
14261426
await assertNoErrorsInCode('''
@@ -2218,5 +2218,5 @@ extension E on C {
22182218
}
22192219

22202220
@reflectiveTest
2221-
class ExtensionMethodsInternalReferenceWithNnbdTest
2221+
class ExtensionMethodsInternalReferenceWithNullSafetyTest
22222222
extends ExtensionMethodsInternalReferenceTest with WithNullSafetyMixin {}

‎pkg/analyzer/test/src/dart/resolution/for_element_test.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import 'with_null_safety_mixin.dart';
1010
main() {
1111
defineReflectiveSuite(() {
1212
defineReflectiveTests(ForEachElementTest);
13-
defineReflectiveTests(ForEachElementWithNnbdTest);
13+
defineReflectiveTests(ForEachElementWithNullSafetyTest);
1414
defineReflectiveTests(ForLoopElementTest);
1515
});
1616
}
@@ -50,7 +50,7 @@ main() {
5050
}
5151

5252
@reflectiveTest
53-
class ForEachElementWithNnbdTest extends ForEachElementTest
53+
class ForEachElementWithNullSafetyTest extends ForEachElementTest
5454
with WithNullSafetyMixin {
5555
test_optIn_fromOptOut() async {
5656
newFile('/test/lib/a.dart', content: r'''

‎pkg/analyzer/test/src/dart/resolution/function_expression_invocation_test.dart

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import 'with_null_safety_mixin.dart';
1111
main() {
1212
defineReflectiveSuite(() {
1313
defineReflectiveTests(FunctionExpressionInvocationTest);
14-
defineReflectiveTests(FunctionExpressionInvocationWithNnbdTest);
14+
defineReflectiveTests(FunctionExpressionInvocationWithNullSafetyTest);
1515
});
1616
}
1717

@@ -51,8 +51,8 @@ main() {
5151
}
5252

5353
@reflectiveTest
54-
class FunctionExpressionInvocationWithNnbdTest extends DriverResolutionTest
55-
with WithNullSafetyMixin {
54+
class FunctionExpressionInvocationWithNullSafetyTest
55+
extends DriverResolutionTest with WithNullSafetyMixin {
5656
test_call_infer_fromArguments() async {
5757
await assertNoErrorsInCode(r'''
5858
class A {

‎pkg/analyzer/test/src/dart/resolution/if_element_test.dart

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import 'with_null_safety_mixin.dart';
1010
main() {
1111
defineReflectiveSuite(() {
1212
defineReflectiveTests(IfElementTest);
13-
defineReflectiveTests(IfElementWithNnbdTest);
13+
defineReflectiveTests(IfElementWithNullSafetyTest);
1414
});
1515
}
1616

@@ -34,4 +34,5 @@ main(bool Function() b) {
3434
}
3535

3636
@reflectiveTest
37-
class IfElementWithNnbdTest extends IfElementTest with WithNullSafetyMixin {}
37+
class IfElementWithNullSafetyTest extends IfElementTest
38+
with WithNullSafetyMixin {}

‎pkg/analyzer/test/src/dart/resolution/index_expression_test.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import 'with_null_safety_mixin.dart';
1111
main() {
1212
defineReflectiveSuite(() {
1313
defineReflectiveTests(IndexExpressionTest);
14-
defineReflectiveTests(IndexExpressionWithNnbdTest);
14+
defineReflectiveTests(IndexExpressionWithNullSafetyTest);
1515
});
1616
}
1717

@@ -237,7 +237,7 @@ main(A<double> a) {
237237
}
238238

239239
@reflectiveTest
240-
class IndexExpressionWithNnbdTest extends IndexExpressionTest
240+
class IndexExpressionWithNullSafetyTest extends IndexExpressionTest
241241
with WithNullSafetyMixin {
242242
test_read_cascade_nullShorting() async {
243243
await assertNoErrorsInCode(r'''

‎pkg/analyzer/test/src/dart/resolution/metadata_test.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import 'with_null_safety_mixin.dart';
1717
main() {
1818
defineReflectiveSuite(() {
1919
defineReflectiveTests(MetadataResolutionTest);
20-
defineReflectiveTests(MetadataResolutionWithNnbdTest);
20+
defineReflectiveTests(MetadataResolutionWithNullSafetyTest);
2121
});
2222
}
2323

@@ -182,7 +182,7 @@ class B {}
182182
}
183183

184184
@reflectiveTest
185-
class MetadataResolutionWithNnbdTest extends DriverResolutionTest
185+
class MetadataResolutionWithNullSafetyTest extends DriverResolutionTest
186186
with WithNullSafetyMixin {
187187
ImportFindElement get import_a {
188188
return findElement.importFind('package:test/a.dart');

‎pkg/analyzer/test/src/dart/resolution/method_invocation_test.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import 'with_null_safety_mixin.dart';
1414
main() {
1515
defineReflectiveSuite(() {
1616
defineReflectiveTests(MethodInvocationResolutionTest);
17-
defineReflectiveTests(MethodInvocationResolutionWithNnbdTest);
17+
defineReflectiveTests(MethodInvocationResolutionWithNullSafetyTest);
1818
});
1919
}
2020

@@ -1719,7 +1719,7 @@ main() {
17191719
}
17201720

17211721
@reflectiveTest
1722-
class MethodInvocationResolutionWithNnbdTest extends DriverResolutionTest
1722+
class MethodInvocationResolutionWithNullSafetyTest extends DriverResolutionTest
17231723
with WithNullSafetyMixin {
17241724
test_hasReceiver_deferredImportPrefix_loadLibrary_optIn_fromOptOut() async {
17251725
newFile('/test/lib/a.dart', content: r'''

0 commit comments

Comments
 (0)