languages/dart-sdk
languages/dart-sdk
1
0
Fork 0
mirror of https://github.com/dart-lang/sdk synced 2024-09-16 01:10:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Replace newly added uses of assertErrorCodesInCode and deprecate it

Browse source 
Change-Id: I9937cf88ec57452a97d9b4110bd6d6da36bac159
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/110320
Reviewed-by: Konstantin Shcheglov <scheglov@google.com>
Commit-Queue: Brian Wilkerson <brianwilkerson@google.com>
This commit is contained in:
Brian Wilkerson 2019-07-24 16:09:18 +00:00 committed by commit-bot@chromium.org
parent eb057fe495
commit 088fbb8d42
9 changed files with 100 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
pkg/analyzer/test/src/dart/resolution/extension_method_test.dart
View file

@ -128,7 +128,7 @@ f() {
} }
test_method_noMatch() async { test_method_noMatch() async {
await assertErrorCodesInCode(r''' await assertErrorsInCode(r'''
class B { } class B { }
extension A on B { extension A on B {
@ -139,7 +139,9 @@ f() {
B b = B(); B b = B();
b.c(); b.c();
} }
''', [StaticTypeWarningCode.UNDEFINED_METHOD]); ''', [
error(StaticTypeWarningCode.UNDEFINED_METHOD, 73, 1),
]);
} }
test_method_noMostSpecificExtension() async { test_method_noMostSpecificExtension() async {
@ -189,14 +191,16 @@ extension _ on B {
void a() { } void a() { }
} }
'''); ''');
await assertErrorCodesInCode(r''' await assertErrorsInCode(r'''
import 'lib.dart'; import 'lib.dart';
f() { f() {
B b = B(); B b = B();
b.a(); b.a();
} }
''', [StaticTypeWarningCode.UNDEFINED_METHOD]); ''', [
error(StaticTypeWarningCode.UNDEFINED_METHOD, 43, 1),
]);
} }
test_method_resolvesToStatic() async { test_method_resolvesToStatic() async {
@ -306,14 +310,16 @@ extension on B {
void a() { } void a() { }
} }
'''); ''');
await assertErrorCodesInCode(r''' await assertErrorsInCode(r'''
import 'lib.dart'; import 'lib.dart';
f() { f() {
B b = B(); B b = B();
b.a(); b.a();
} }
''', [StaticTypeWarningCode.UNDEFINED_METHOD]); ''', [
error(StaticTypeWarningCode.UNDEFINED_METHOD, 43, 1),
]);
} }
test_multipleExtensions() async { test_multipleExtensions() async {

1
pkg/analyzer/test/src/dart/resolution/resolution.dart
View file

@ -148,6 +148,7 @@ mixin ResolutionTest implements ResourceProviderMixin {
expect(element.enclosingElement, expectedEnclosing); expect(element.enclosingElement, expectedEnclosing);
} }
@Deprecated('Use assertErrorsInCode')
Future<void> assertErrorCodesInCode( Future<void> assertErrorCodesInCode(
String code, List<ErrorCode> errors) async { String code, List<ErrorCode> errors) async {
addTestFile(code); addTestFile(code);

17
pkg/analyzer/test/src/diagnostics/invalid_use_of_null_value_test.dart
View file

@ -11,12 +11,12 @@ import '../dart/resolution/driver_resolution.dart';
main() { main() {
defineReflectiveSuite(() { defineReflectiveSuite(() {
defineReflectiveTests(InvalidUseOfNullValue); defineReflectiveTests(InvalidUseOfNullValueTest);
}); });
} }
@reflectiveTest @reflectiveTest
class InvalidUseOfNullValue extends DriverResolutionTest { class InvalidUseOfNullValueTest extends DriverResolutionTest {
@override @override
AnalysisOptionsImpl get analysisOptions => AnalysisOptionsImpl get analysisOptions =>
AnalysisOptionsImpl()..enabledExperiments = [EnableString.non_nullable]; AnalysisOptionsImpl()..enabledExperiments = [EnableString.non_nullable];
@ -40,12 +40,14 @@ m() async {
} }
test_cascade() async { test_cascade() async {
await assertErrorCodesInCode(r''' await assertErrorsInCode(r'''
m() { m() {
Null x; Null x;
x..toString; x..toString;
} }
''', [StaticWarningCode.INVALID_USE_OF_NULL_VALUE]); ''', [
error(StaticWarningCode.INVALID_USE_OF_NULL_VALUE, 18, 1),
]);
} }
test_eq() async { test_eq() async {
@ -58,12 +60,15 @@ m() {
} }
test_forLoop() async { test_forLoop() async {
await assertErrorCodesInCode(r''' await assertErrorsInCode(r'''
m() { m() {
Null x; Null x;
for (var y in x) {} for (var y in x) {}
} }
''', [StaticWarningCode.INVALID_USE_OF_NULL_VALUE]); ''', [
error(HintCode.UNUSED_LOCAL_VARIABLE, 27, 1),
error(StaticWarningCode.INVALID_USE_OF_NULL_VALUE, 32, 1),
]);
} }
test_is() async { test_is() async {

12
pkg/analyzer/test/src/diagnostics/non_bool_condition_test.dart
View file

@ -41,21 +41,25 @@ class NonBoolConditionTest_NNBD extends DriverResolutionTest {
AnalysisOptionsImpl get analysisOptions => AnalysisOptionsImpl get analysisOptions =>
AnalysisOptionsImpl()..enabledExperiments = [EnableString.non_nullable]; AnalysisOptionsImpl()..enabledExperiments = [EnableString.non_nullable];
test_if_null() async { test_if_null() async {
await assertErrorCodesInCode(r''' await assertErrorsInCode(r'''
m() { m() {
Null x; Null x;
if (x) {} if (x) {}
} }
''', [StaticTypeWarningCode.NON_BOOL_CONDITION]); ''', [
error(StaticTypeWarningCode.NON_BOOL_CONDITION, 22, 1),
]);
} }
test_ternary_condition_null() async { test_ternary_condition_null() async {
await assertErrorCodesInCode(r''' await assertErrorsInCode(r'''
m() { m() {
Null x; Null x;
x ? 0 : 1; x ? 0 : 1;
} }
''', [StaticTypeWarningCode.NON_BOOL_CONDITION]); ''', [
error(StaticTypeWarningCode.NON_BOOL_CONDITION, 18, 1),
]);
} }
} }

7
pkg/analyzer/test/src/diagnostics/non_bool_negation_expression_test.dart
View file

@ -22,11 +22,14 @@ class NonBoolNegationExpressionTest_NNBD extends DriverResolutionTest {
AnalysisOptionsImpl()..enabledExperiments = [EnableString.non_nullable]; AnalysisOptionsImpl()..enabledExperiments = [EnableString.non_nullable];
test_null() async { test_null() async {
await assertErrorCodesInCode(r''' await assertErrorsInCode(r'''
m() { m() {
Null x; Null x;
!x; !x;
} }
''', [StaticTypeWarningCode.NON_BOOL_NEGATION_EXPRESSION]); ''', [
error(HintCode.UNUSED_LOCAL_VARIABLE, 13, 1),
error(StaticTypeWarningCode.NON_BOOL_NEGATION_EXPRESSION, 19, 1),
]);
} }
} }

12
pkg/analyzer/test/src/diagnostics/non_bool_operand_test.dart
View file

@ -22,20 +22,24 @@ class NonBoolOperandTest_NNBD extends DriverResolutionTest {
AnalysisOptionsImpl()..enabledExperiments = [EnableString.non_nullable]; AnalysisOptionsImpl()..enabledExperiments = [EnableString.non_nullable];
test_and_null() async { test_and_null() async {
await assertErrorCodesInCode(r''' await assertErrorsInCode(r'''
m() { m() {
Null x; Null x;
if(x && true) {} if(x && true) {}
} }
''', [StaticTypeWarningCode.NON_BOOL_OPERAND]); ''', [
error(StaticTypeWarningCode.NON_BOOL_OPERAND, 21, 1),
]);
} }
test_or_null() async { test_or_null() async {
await assertErrorCodesInCode(r''' await assertErrorsInCode(r'''
m() { m() {
Null x; Null x;
if(x || false) {} if(x || false) {}
} }
''', [StaticTypeWarningCode.NON_BOOL_OPERAND]); ''', [
error(StaticTypeWarningCode.NON_BOOL_OPERAND, 21, 1),
]);
} }
} }

6
pkg/analyzer/test/src/diagnostics/unchecked_use_of_nullable_value_test.dart
View file

@ -623,12 +623,14 @@ m() {
} }
test_spread_nullable() async { test_spread_nullable() async {
await assertErrorCodesInCode(r''' await assertErrorsInCode(r'''
m() { m() {
List? list; List? list;
[...list]; [...list];
} }
''', [StaticWarningCode.UNCHECKED_USE_OF_NULLABLE_VALUE]); ''', [
error(StaticWarningCode.UNCHECKED_USE_OF_NULLABLE_VALUE, 26, 4),
]);
} }
test_spread_nullable_question() async { test_spread_nullable_question() async {

6
pkg/analyzer/test/src/diagnostics/undefined_getter_test.dart
View file

@ -92,12 +92,14 @@ f(Object x) {
} }
test_nullMember_undefined() async { test_nullMember_undefined() async {
await assertErrorCodesInCode(r''' await assertErrorsInCode(r'''
m() { m() {
Null _null; Null _null;
_null.foo; _null.foo;
} }
''', [StaticTypeWarningCode.UNDEFINED_GETTER]); ''', [
error(StaticTypeWarningCode.UNDEFINED_GETTER, 28, 3),
]);
} }
test_promotedTypeParameter_regress35305() async { test_promotedTypeParameter_regress35305() async {

67
pkg/analyzer/test/src/diagnostics/undefined_operator_test.dart
View file

@ -45,12 +45,14 @@ f(var a) {
} }
test_index_null() async { test_index_null() async {
await assertErrorCodesInCode(r''' await assertErrorsInCode(r'''
m() { m() {
Null x; Null x;
x[0]; x[0];
} }
''', [StaticTypeWarningCode.UNDEFINED_OPERATOR]); ''', [
error(StaticTypeWarningCode.UNDEFINED_OPERATOR, 19, 3),
]);
} }
test_indexBoth() async { test_indexBoth() async {
@ -143,48 +145,61 @@ f(var a) {
} }
test_minus_null() async { test_minus_null() async {
await assertErrorCodesInCode(r''' await assertErrorsInCode(r'''
m() { m() {
Null x; Null x;
x - 3; x - 3;
} }
''', [StaticTypeWarningCode.UNDEFINED_OPERATOR]); ''', [
error(StaticTypeWarningCode.UNDEFINED_OPERATOR, 20, 1),
]);
} }
test_minusEq_null() async { test_minusEq_null() async {
await assertErrorCodesInCode(r''' await assertErrorsInCode(r'''
m() { m() {
Null x; Null x;
x -= 1; x -= 1;
} }
''', [StaticTypeWarningCode.UNDEFINED_OPERATOR]); ''', [
error(HintCode.UNUSED_LOCAL_VARIABLE, 13, 1),
error(StaticTypeWarningCode.UNDEFINED_OPERATOR, 20, 2),
]);
} }
test_plus_null() async { test_plus_null() async {
await assertErrorCodesInCode(r''' await assertErrorsInCode(r'''
m() { m() {
Null x; Null x;
x + 3; x + 3;
} }
''', [StaticTypeWarningCode.UNDEFINED_OPERATOR]); ''', [
error(StaticTypeWarningCode.UNDEFINED_OPERATOR, 20, 1),
]);
} }
test_plusEq_null() async { test_plusEq_null() async {
await assertErrorCodesInCode(r''' await assertErrorsInCode(r'''
m() { m() {
Null x; Null x;
x += 1; x += 1;
} }
''', [StaticTypeWarningCode.UNDEFINED_OPERATOR]); ''', [
error(HintCode.UNUSED_LOCAL_VARIABLE, 13, 1),
error(StaticTypeWarningCode.UNDEFINED_OPERATOR, 20, 2),
]);
} }
test_postfixDec_null() async { test_postfixDec_null() async {
await assertErrorCodesInCode(r''' await assertErrorsInCode(r'''
m() { m() {
Null x; Null x;
x--; x--;
} }
''', [StaticTypeWarningCode.UNDEFINED_OPERATOR]); ''', [
error(HintCode.UNUSED_LOCAL_VARIABLE, 13, 1),
error(StaticTypeWarningCode.UNDEFINED_OPERATOR, 19, 2),
]);
} }
test_postfixExpression() async { test_postfixExpression() async {
@ -213,21 +228,27 @@ f(var a) {
} }
test_postfixInc_null() async { test_postfixInc_null() async {
await assertErrorCodesInCode(r''' await assertErrorsInCode(r'''
m() { m() {
Null x; Null x;
x++; x++;
} }
''', [StaticTypeWarningCode.UNDEFINED_OPERATOR]); ''', [
error(HintCode.UNUSED_LOCAL_VARIABLE, 13, 1),
error(StaticTypeWarningCode.UNDEFINED_OPERATOR, 19, 2),
]);
} }
test_prefixDec_null() async { test_prefixDec_null() async {
await assertErrorCodesInCode(r''' await assertErrorsInCode(r'''
m() { m() {
Null x; Null x;
--x; --x;
} }
''', [StaticTypeWarningCode.UNDEFINED_OPERATOR]); ''', [
error(HintCode.UNUSED_LOCAL_VARIABLE, 13, 1),
error(StaticTypeWarningCode.UNDEFINED_OPERATOR, 18, 2),
]);
} }
test_prefixExpression() async { test_prefixExpression() async {
@ -256,20 +277,26 @@ f(var a) {
} }
test_prefixInc_null() async { test_prefixInc_null() async {
await assertErrorCodesInCode(r''' await assertErrorsInCode(r'''
m() { m() {
Null x; Null x;
++x; ++x;
} }
''', [StaticTypeWarningCode.UNDEFINED_OPERATOR]); ''', [
error(HintCode.UNUSED_LOCAL_VARIABLE, 13, 1),
error(StaticTypeWarningCode.UNDEFINED_OPERATOR, 18, 2),
]);
} }
test_unaryMinus_null() async { test_unaryMinus_null() async {
await assertErrorCodesInCode(r''' await assertErrorsInCode(r'''
m() { m() {
Null x; Null x;
-x; -x;
} }
''', [StaticTypeWarningCode.UNDEFINED_OPERATOR]); ''', [
error(HintCode.UNUSED_LOCAL_VARIABLE, 13, 1),
error(StaticTypeWarningCode.UNDEFINED_OPERATOR, 18, 1),
]);
} }
} }