| Index: pkg/analyzer/test/generated/non_error_resolver_test.dart
|
| diff --git a/pkg/analyzer/test/generated/non_error_resolver_test.dart b/pkg/analyzer/test/generated/non_error_resolver_test.dart
|
| index 1c459a495d27500e7875a2f6acb893152ccf30df..db438de5a52544f5d5a5645d70e52a0db5358fff 100644
|
| --- a/pkg/analyzer/test/generated/non_error_resolver_test.dart
|
| +++ b/pkg/analyzer/test/generated/non_error_resolver_test.dart
|
| @@ -15,7 +15,6 @@ import '../reflective_tests.dart';
|
| import 'resolver_test.dart';
|
| import 'test_support.dart';
|
|
|
| -
|
| main() {
|
| _ut.groupSep = ' | ';
|
| runReflectiveTests(NonErrorResolverTest);
|
| @@ -763,12 +762,10 @@ abstract class A {
|
| verify([source]);
|
| CompilationUnit unit = analysisContext.parseCompilationUnit(source);
|
| {
|
| - SimpleIdentifier ref =
|
| - EngineTestCase.findNode(unit, code, "p]", (node) => node is SimpleIdentifier);
|
| - EngineTestCase.assertInstanceOf(
|
| - (obj) => obj is ParameterElement,
|
| - ParameterElement,
|
| - ref.staticElement);
|
| + SimpleIdentifier ref = EngineTestCase.findNode(
|
| + unit, code, "p]", (node) => node is SimpleIdentifier);
|
| + EngineTestCase.assertInstanceOf((obj) => obj is ParameterElement,
|
| + ParameterElement, ref.staticElement);
|
| }
|
| }
|
|
|
| @@ -782,12 +779,10 @@ foo(int p) {
|
| assertNoErrors(source);
|
| verify([source]);
|
| CompilationUnit unit = analysisContext.parseCompilationUnit(source);
|
| - SimpleIdentifier ref =
|
| - EngineTestCase.findNode(unit, code, "p]", (node) => node is SimpleIdentifier);
|
| + SimpleIdentifier ref = EngineTestCase.findNode(
|
| + unit, code, "p]", (node) => node is SimpleIdentifier);
|
| EngineTestCase.assertInstanceOf(
|
| - (obj) => obj is ParameterElement,
|
| - ParameterElement,
|
| - ref.staticElement);
|
| + (obj) => obj is ParameterElement, ParameterElement, ref.staticElement);
|
| }
|
|
|
| void test_commentReference_beforeFunction_expressionBody() {
|
| @@ -799,12 +794,10 @@ foo(int p) => null;''';
|
| assertNoErrors(source);
|
| verify([source]);
|
| CompilationUnit unit = analysisContext.parseCompilationUnit(source);
|
| - SimpleIdentifier ref =
|
| - EngineTestCase.findNode(unit, code, "p]", (node) => node is SimpleIdentifier);
|
| + SimpleIdentifier ref = EngineTestCase.findNode(
|
| + unit, code, "p]", (node) => node is SimpleIdentifier);
|
| EngineTestCase.assertInstanceOf(
|
| - (obj) => obj is ParameterElement,
|
| - ParameterElement,
|
| - ref.staticElement);
|
| + (obj) => obj is ParameterElement, ParameterElement, ref.staticElement);
|
| }
|
|
|
| void test_commentReference_beforeMethod() {
|
| @@ -821,20 +814,16 @@ abstract class A {
|
| verify([source]);
|
| CompilationUnit unit = analysisContext.parseCompilationUnit(source);
|
| {
|
| - SimpleIdentifier ref =
|
| - EngineTestCase.findNode(unit, code, "p1]", (node) => node is SimpleIdentifier);
|
| - EngineTestCase.assertInstanceOf(
|
| - (obj) => obj is ParameterElement,
|
| - ParameterElement,
|
| - ref.staticElement);
|
| + SimpleIdentifier ref = EngineTestCase.findNode(
|
| + unit, code, "p1]", (node) => node is SimpleIdentifier);
|
| + EngineTestCase.assertInstanceOf((obj) => obj is ParameterElement,
|
| + ParameterElement, ref.staticElement);
|
| }
|
| {
|
| - SimpleIdentifier ref =
|
| - EngineTestCase.findNode(unit, code, "p2]", (node) => node is SimpleIdentifier);
|
| - EngineTestCase.assertInstanceOf(
|
| - (obj) => obj is ParameterElement,
|
| - ParameterElement,
|
| - ref.staticElement);
|
| + SimpleIdentifier ref = EngineTestCase.findNode(
|
| + unit, code, "p2]", (node) => node is SimpleIdentifier);
|
| + EngineTestCase.assertInstanceOf((obj) => obj is ParameterElement,
|
| + ParameterElement, ref.staticElement);
|
| }
|
| }
|
|
|
| @@ -850,14 +839,9 @@ class A {
|
| verify([source]);
|
| CompilationUnit unit = analysisContext.parseCompilationUnit(source);
|
| SimpleIdentifier ref = EngineTestCase.findNode(
|
| - unit,
|
| - code,
|
| - "foo]",
|
| - (node) => node is SimpleIdentifier);
|
| + unit, code, "foo]", (node) => node is SimpleIdentifier);
|
| EngineTestCase.assertInstanceOf(
|
| - (obj) => obj is MethodElement,
|
| - MethodElement,
|
| - ref.staticElement);
|
| + (obj) => obj is MethodElement, MethodElement, ref.staticElement);
|
| }
|
|
|
| void test_commentReference_setter() {
|
| @@ -879,25 +863,15 @@ class B extends A {
|
| CompilationUnit unit = analysisContext.parseCompilationUnit(source);
|
| {
|
| SimpleIdentifier ref = EngineTestCase.findNode(
|
| - unit,
|
| - code,
|
| - "x] in A",
|
| - (node) => node is SimpleIdentifier);
|
| - EngineTestCase.assertInstanceOf(
|
| - (obj) => obj is PropertyAccessorElement,
|
| - PropertyAccessorElement,
|
| - ref.staticElement);
|
| + unit, code, "x] in A", (node) => node is SimpleIdentifier);
|
| + EngineTestCase.assertInstanceOf((obj) => obj is PropertyAccessorElement,
|
| + PropertyAccessorElement, ref.staticElement);
|
| }
|
| {
|
| SimpleIdentifier ref = EngineTestCase.findNode(
|
| - unit,
|
| - code,
|
| - "x] in B",
|
| - (node) => node is SimpleIdentifier);
|
| - EngineTestCase.assertInstanceOf(
|
| - (obj) => obj is PropertyAccessorElement,
|
| - PropertyAccessorElement,
|
| - ref.staticElement);
|
| + unit, code, "x] in B", (node) => node is SimpleIdentifier);
|
| + EngineTestCase.assertInstanceOf((obj) => obj is PropertyAccessorElement,
|
| + PropertyAccessorElement, ref.staticElement);
|
| }
|
| }
|
|
|
| @@ -997,9 +971,9 @@ class B extends A {
|
| const B(): super();
|
| }''');
|
| resolve(source);
|
| - assertErrors(
|
| - source,
|
| - [CompileTimeErrorCode.UNDEFINED_CONSTRUCTOR_IN_INITIALIZER_DEFAULT]);
|
| + assertErrors(source, [
|
| + CompileTimeErrorCode.UNDEFINED_CONSTRUCTOR_IN_INITIALIZER_DEFAULT
|
| + ]);
|
| verify([source]);
|
| }
|
|
|
| @@ -1051,16 +1025,19 @@ class A {
|
| }
|
|
|
| void test_constDeferredClass_new() {
|
| - resolveWithErrors(<String>[r'''
|
| + resolveWithErrors(<String>[
|
| + r'''
|
| library lib1;
|
| class A {
|
| const A.b();
|
| -}''', r'''
|
| +}''',
|
| + r'''
|
| library root;
|
| import 'lib1.dart' deferred as a;
|
| main() {
|
| new a.A.b();
|
| -}'''], <ErrorCode>[]);
|
| +}'''
|
| + ], <ErrorCode>[]);
|
| }
|
|
|
| void test_constEval_functionTypeLiteral() {
|
| @@ -1884,9 +1861,11 @@ import 'lib.dart';
|
| import 'lib.dart';''');
|
| addNamedSource("/lib.dart", "library lib;");
|
| resolve(source);
|
| - assertErrors(
|
| - source,
|
| - [HintCode.UNUSED_IMPORT, HintCode.UNUSED_IMPORT, HintCode.DUPLICATE_IMPORT]);
|
| + assertErrors(source, [
|
| + HintCode.UNUSED_IMPORT,
|
| + HintCode.UNUSED_IMPORT,
|
| + HintCode.DUPLICATE_IMPORT
|
| + ]);
|
| verify([source]);
|
| }
|
|
|
| @@ -2821,13 +2800,16 @@ var v2 = const <int> [42];''');
|
| }
|
|
|
| void test_loadLibraryDefined() {
|
| - resolveWithErrors(<String>[r'''
|
| + resolveWithErrors(<String>[
|
| + r'''
|
| library lib1;
|
| -foo() => 22;''', r'''
|
| +foo() => 22;''',
|
| + r'''
|
| import 'lib1.dart' deferred as other;
|
| main() {
|
| other.loadLibrary().then((_) => other.foo());
|
| -}'''], <ErrorCode>[]);
|
| +}'''
|
| + ], <ErrorCode>[]);
|
| }
|
|
|
| void test_local_generator_async() {
|
| @@ -3143,8 +3125,7 @@ f() {
|
| verify([source]);
|
| }
|
|
|
| - void
|
| - test_nonAbstractClassInheritsAbstractMemberOne_abstractsDontOverrideConcretes_getter() {
|
| + void test_nonAbstractClassInheritsAbstractMemberOne_abstractsDontOverrideConcretes_getter() {
|
| Source source = addSource(r'''
|
| class A {
|
| int get g => 0;
|
| @@ -3158,8 +3139,7 @@ class C extends B {}''');
|
| verify([source]);
|
| }
|
|
|
| - void
|
| - test_nonAbstractClassInheritsAbstractMemberOne_abstractsDontOverrideConcretes_method() {
|
| + void test_nonAbstractClassInheritsAbstractMemberOne_abstractsDontOverrideConcretes_method() {
|
| Source source = addSource(r'''
|
| class A {
|
| m(p) {}
|
| @@ -3173,8 +3153,7 @@ class C extends B {}''');
|
| verify([source]);
|
| }
|
|
|
| - void
|
| - test_nonAbstractClassInheritsAbstractMemberOne_abstractsDontOverrideConcretes_setter() {
|
| + void test_nonAbstractClassInheritsAbstractMemberOne_abstractsDontOverrideConcretes_setter() {
|
| Source source = addSource(r'''
|
| class A {
|
| set s(v) {}
|
| @@ -3188,8 +3167,7 @@ class C extends B {}''');
|
| verify([source]);
|
| }
|
|
|
| - void
|
| - test_nonAbstractClassInheritsAbstractMemberOne_classTypeAlias_interface() {
|
| + void test_nonAbstractClassInheritsAbstractMemberOne_classTypeAlias_interface() {
|
| // 15979
|
| Source source = addSource(r'''
|
| abstract class M {}
|
| @@ -3216,8 +3194,7 @@ abstract class B = A with M;''');
|
| verify([source]);
|
| }
|
|
|
| - void
|
| - test_nonAbstractClassInheritsAbstractMemberOne_classTypeAlias_superclass() {
|
| + void test_nonAbstractClassInheritsAbstractMemberOne_classTypeAlias_superclass() {
|
| // 15979
|
| Source source = addSource(r'''
|
| class M {}
|
| @@ -4334,18 +4311,23 @@ class _InvertedCodec<T2, S2> extends Codec<T2, S2> {
|
| }
|
|
|
| void test_sharedDeferredPrefix() {
|
| - resolveWithErrors(<String>[r'''
|
| + resolveWithErrors(<String>[
|
| + r'''
|
| library lib1;
|
| -f1() {}''', r'''
|
| +f1() {}''',
|
| + r'''
|
| library lib2;
|
| -f2() {}''', r'''
|
| +f2() {}''',
|
| + r'''
|
| library lib3;
|
| -f3() {}''', r'''
|
| +f3() {}''',
|
| + r'''
|
| library root;
|
| import 'lib1.dart' deferred as lib1;
|
| import 'lib2.dart' as lib;
|
| import 'lib3.dart' as lib;
|
| -main() { lib1.f1(); lib.f2(); lib.f3(); }'''], <ErrorCode>[]);
|
| +main() { lib1.f1(); lib.f2(); lib.f3(); }'''
|
| + ], <ErrorCode>[]);
|
| }
|
|
|
| void test_staticAccessToInstanceMember_annotation() {
|
| @@ -4489,8 +4471,7 @@ main(Object p) {
|
| verify([source]);
|
| }
|
|
|
| - void
|
| - test_typePromotion_booleanAnd_useInRight_accessedInClosureRight_noAssignment() {
|
| + void test_typePromotion_booleanAnd_useInRight_accessedInClosureRight_noAssignment() {
|
| Source source = addSource(r'''
|
| callMe(f()) { f(); }
|
| main(Object p) {
|
| @@ -4527,8 +4508,7 @@ main(Object p) {
|
| verify([source]);
|
| }
|
|
|
| - void
|
| - test_typePromotion_conditional_useInThen_accessedInClosure_noAssignment() {
|
| + void test_typePromotion_conditional_useInThen_accessedInClosure_noAssignment() {
|
| Source source = addSource(r'''
|
| callMe(f()) { f(); }
|
| main(Object p) {
|
| @@ -5373,8 +5353,8 @@ f() sync* {
|
| verify([source]);
|
| }
|
|
|
| - void _check_wrongNumberOfParametersForOperator(String name,
|
| - String parameters) {
|
| + void _check_wrongNumberOfParametersForOperator(
|
| + String name, String parameters) {
|
| Source source = addSource("""
|
| class A {
|
| operator $name($parameters) {}
|
|
|