| 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 64da2289159ca36af8e5db0c758b5087a2e624b6..f4eea16a240f4ce2cc47e75f462ea6b125c46119 100644
|
| --- a/pkg/analyzer/test/generated/non_error_resolver_test.dart
|
| +++ b/pkg/analyzer/test/generated/non_error_resolver_test.dart
|
| @@ -10,14 +10,14 @@ import 'package:analyzer/src/generated/engine.dart';
|
| import 'package:analyzer/src/generated/error.dart';
|
| import 'package:analyzer/src/generated/parser.dart' show ParserErrorCode;
|
| import 'package:analyzer/src/generated/source_io.dart';
|
| -import 'package:unittest/unittest.dart' as _ut;
|
|
|
| import '../reflective_tests.dart';
|
| +import '../utils.dart';
|
| import 'resolver_test.dart';
|
| import 'test_support.dart';
|
|
|
| main() {
|
| - _ut.groupSep = ' | ';
|
| + initializeTestEnvironment();
|
| runReflectiveTests(NonErrorResolverTest);
|
| }
|
|
|
| @@ -39,10 +39,14 @@ E e() {
|
| library L;
|
| export 'lib1.dart';
|
| export 'lib2.dart';''');
|
| - addNamedSource("/lib1.dart", r'''
|
| + addNamedSource(
|
| + "/lib1.dart",
|
| + r'''
|
| library lib1;
|
| class M {}''');
|
| - addNamedSource("/lib2.dart", r'''
|
| + addNamedSource(
|
| + "/lib2.dart",
|
| + r'''
|
| library lib2;
|
| class N {}''');
|
| computeLibrarySourceErrors(source);
|
| @@ -55,11 +59,15 @@ class N {}''');
|
| library L;
|
| export 'lib1.dart';
|
| export 'lib2.dart' hide B;''');
|
| - addNamedSource("/lib1.dart", r'''
|
| + addNamedSource(
|
| + "/lib1.dart",
|
| + r'''
|
| library L1;
|
| class A {}
|
| class B {}''');
|
| - addNamedSource("/lib2.dart", r'''
|
| + addNamedSource(
|
| + "/lib2.dart",
|
| + r'''
|
| library L2;
|
| class B {}
|
| class C {}''');
|
| @@ -73,11 +81,15 @@ class C {}''');
|
| library L;
|
| export 'lib1.dart';
|
| export 'lib2.dart' show C;''');
|
| - addNamedSource("/lib1.dart", r'''
|
| + addNamedSource(
|
| + "/lib1.dart",
|
| + r'''
|
| library L1;
|
| class A {}
|
| class B {}''');
|
| - addNamedSource("/lib2.dart", r'''
|
| + addNamedSource(
|
| + "/lib2.dart",
|
| + r'''
|
| library L2;
|
| class B {}
|
| class C {}''');
|
| @@ -91,7 +103,9 @@ class C {}''');
|
| library L;
|
| export 'lib.dart';
|
| export 'lib.dart';''');
|
| - addNamedSource("/lib.dart", r'''
|
| + addNamedSource(
|
| + "/lib.dart",
|
| + r'''
|
| library lib;
|
| class N {}''');
|
| computeLibrarySourceErrors(source);
|
| @@ -109,15 +123,21 @@ main() {
|
| new N2();
|
| new N3();
|
| }''');
|
| - addNamedSource("/lib1.dart", r'''
|
| + addNamedSource(
|
| + "/lib1.dart",
|
| + r'''
|
| library lib1;
|
| class N {}
|
| class N1 {}''');
|
| - addNamedSource("/lib2.dart", r'''
|
| + addNamedSource(
|
| + "/lib2.dart",
|
| + r'''
|
| library lib2;
|
| class N {}
|
| class N2 {}''');
|
| - addNamedSource("/lib3.dart", r'''
|
| + addNamedSource(
|
| + "/lib3.dart",
|
| + r'''
|
| library lib3;
|
| class N {}
|
| class N3 {}''');
|
| @@ -133,11 +153,15 @@ main() {
|
| new N1();
|
| new N2();
|
| }''');
|
| - addNamedSource("/lib1.dart", r'''
|
| + addNamedSource(
|
| + "/lib1.dart",
|
| + r'''
|
| library lib1;
|
| class N {}
|
| class N1 {}''');
|
| - addNamedSource("/lib2.dart", r'''
|
| + addNamedSource(
|
| + "/lib2.dart",
|
| + r'''
|
| library lib2;
|
| class N {}
|
| class N2 {}''');
|
| @@ -321,7 +345,9 @@ import 'lib1.dart' as foo;
|
| main() {
|
| foo.x = true;
|
| }''');
|
| - addNamedSource("/lib1.dart", r'''
|
| + addNamedSource(
|
| + "/lib1.dart",
|
| + r'''
|
| library lib1;
|
| bool x = false;''');
|
| computeLibrarySourceErrors(source);
|
| @@ -1105,7 +1131,9 @@ const C = F;''');
|
| }
|
|
|
| void test_constEval_propertyExtraction_fieldStatic_targetType() {
|
| - addNamedSource("/math.dart", r'''
|
| + addNamedSource(
|
| + "/math.dart",
|
| + r'''
|
| library math;
|
| const PI = 3.14;''');
|
| Source source = addSource(r'''
|
| @@ -1129,7 +1157,9 @@ const C = A.m;''');
|
| }
|
|
|
| void test_constEval_symbol() {
|
| - addNamedSource("/math.dart", r'''
|
| + addNamedSource(
|
| + "/math.dart",
|
| + r'''
|
| library math;
|
| const PI = 3.14;''');
|
| Source source = addSource(r'''
|
| @@ -1336,7 +1366,9 @@ f() {
|
| library lib;
|
| import 'lib1.dart' hide B;
|
| A a = new A();''');
|
| - addNamedSource("/lib1.dart", r'''
|
| + addNamedSource(
|
| + "/lib1.dart",
|
| + r'''
|
| library lib1;
|
| class A {}
|
| @deprecated
|
| @@ -1941,7 +1973,9 @@ import 'lib.dart';''');
|
| library lib;
|
| import 'part.dart';
|
| A a;''');
|
| - addNamedSource("/part.dart", r'''
|
| + addNamedSource(
|
| + "/part.dart",
|
| + r'''
|
| library lib1;
|
| class A {}''');
|
| computeLibrarySourceErrors(source);
|
| @@ -1969,10 +2003,14 @@ main() {
|
| math.test1();
|
| path.test2();
|
| }''');
|
| - addNamedSource("/lib1.dart", r'''
|
| + addNamedSource(
|
| + "/lib1.dart",
|
| + r'''
|
| library lib1;
|
| test1() {}''');
|
| - addNamedSource("/lib2.dart", r'''
|
| + addNamedSource(
|
| + "/lib2.dart",
|
| + r'''
|
| library lib2;
|
| test2() {}''');
|
| computeLibrarySourceErrors(source);
|
| @@ -2214,7 +2252,9 @@ import 'lib.dart';
|
| class B extends A {
|
| _m() {}
|
| }''');
|
| - addNamedSource("/lib.dart", r'''
|
| + addNamedSource(
|
| + "/lib.dart",
|
| + r'''
|
| library L;
|
| class A {
|
| static var _m;
|
| @@ -2230,7 +2270,9 @@ import 'lib.dart';
|
| class B extends A {
|
| _m() {}
|
| }''');
|
| - addNamedSource("/lib.dart", r'''
|
| + addNamedSource(
|
| + "/lib.dart",
|
| + r'''
|
| library L;
|
| class A {
|
| static _m() {}
|
| @@ -2252,7 +2294,9 @@ class A {
|
| }
|
|
|
| void test_invalidAnnotation_constantVariable_field_importWithPrefix() {
|
| - addNamedSource("/lib.dart", r'''
|
| + addNamedSource(
|
| + "/lib.dart",
|
| + r'''
|
| library lib;
|
| class A {
|
| static const C = 0;
|
| @@ -2279,7 +2323,9 @@ main() {
|
| }
|
|
|
| void test_invalidAnnotation_constantVariable_topLevel_importWithPrefix() {
|
| - addNamedSource("/lib.dart", r'''
|
| + addNamedSource(
|
| + "/lib.dart",
|
| + r'''
|
| library lib;
|
| const C = 0;''');
|
| Source source = addSource(r'''
|
| @@ -2293,7 +2339,9 @@ main() {
|
| }
|
|
|
| void test_invalidAnnotation_constConstructor_importWithPrefix() {
|
| - addNamedSource("/lib.dart", r'''
|
| + addNamedSource(
|
| + "/lib.dart",
|
| + r'''
|
| library lib;
|
| class A {
|
| const A(int p);
|
| @@ -2309,7 +2357,9 @@ main() {
|
| }
|
|
|
| void test_invalidAnnotation_constConstructor_named_importWithPrefix() {
|
| - addNamedSource("/lib.dart", r'''
|
| + addNamedSource(
|
| + "/lib.dart",
|
| + r'''
|
| library lib;
|
| class A {
|
| const A.named(int p);
|
| @@ -2637,7 +2687,9 @@ class B extends A {
|
| }
|
|
|
| void test_invalidOverrideReturnType_returnType_interface() {
|
| - Source source = addNamedSource("/test.dart", r'''
|
| + Source source = addNamedSource(
|
| + "/test.dart",
|
| + r'''
|
| abstract class A {
|
| num m();
|
| }
|
| @@ -2650,7 +2702,9 @@ class B implements A {
|
| }
|
|
|
| void test_invalidOverrideReturnType_returnType_interface2() {
|
| - Source source = addNamedSource("/test.dart", r'''
|
| + Source source = addNamedSource(
|
| + "/test.dart",
|
| + r'''
|
| abstract class A {
|
| num m();
|
| }
|
| @@ -2665,7 +2719,9 @@ class C implements B {
|
| }
|
|
|
| void test_invalidOverrideReturnType_returnType_mixin() {
|
| - Source source = addNamedSource("/test.dart", r'''
|
| + Source source = addNamedSource(
|
| + "/test.dart",
|
| + r'''
|
| class A {
|
| num m() { return 0; }
|
| }
|
| @@ -2691,7 +2747,9 @@ class B extends A<dynamic> {
|
| }
|
|
|
| void test_invalidOverrideReturnType_returnType_sameType() {
|
| - Source source = addNamedSource("/test.dart", r'''
|
| + Source source = addNamedSource(
|
| + "/test.dart",
|
| + r'''
|
| class A {
|
| int m() { return 0; }
|
| }
|
| @@ -2704,7 +2762,9 @@ class B extends A {
|
| }
|
|
|
| void test_invalidOverrideReturnType_returnType_superclass() {
|
| - Source source = addNamedSource("/test.dart", r'''
|
| + Source source = addNamedSource(
|
| + "/test.dart",
|
| + r'''
|
| class A {
|
| num m() { return 0; }
|
| }
|
| @@ -2717,7 +2777,9 @@ class B extends A {
|
| }
|
|
|
| void test_invalidOverrideReturnType_returnType_superclass2() {
|
| - Source source = addNamedSource("/test.dart", r'''
|
| + Source source = addNamedSource(
|
| + "/test.dart",
|
| + r'''
|
| class A {
|
| num m() { return 0; }
|
| }
|
| @@ -4000,7 +4062,9 @@ h(x) {}
|
| }
|
|
|
| void test_prefixCollidesWithTopLevelMembers() {
|
| - addNamedSource("/lib.dart", r'''
|
| + addNamedSource(
|
| + "/lib.dart",
|
| + r'''
|
| library lib;
|
| class A {}''');
|
| Source source = addSource(r'''
|
| @@ -4949,7 +5013,9 @@ main() {
|
| }
|
|
|
| void test_typeType_class_prefixed() {
|
| - addNamedSource("/lib.dart", r'''
|
| + addNamedSource(
|
| + "/lib.dart",
|
| + r'''
|
| library lib;
|
| class C {}''');
|
| Source source = addSource(r'''
|
| @@ -4976,7 +5042,9 @@ main() {
|
| }
|
|
|
| void test_typeType_functionTypeAlias_prefixed() {
|
| - addNamedSource("/lib.dart", r'''
|
| + addNamedSource(
|
| + "/lib.dart",
|
| + r'''
|
| library lib;
|
| typedef F();''');
|
| Source source = addSource(r'''
|
| @@ -5196,7 +5264,9 @@ const B = ~((1 << A) - 1);''');
|
| }
|
|
|
| void test_undefinedSetter_importWithPrefix() {
|
| - addNamedSource("/lib.dart", r'''
|
| + addNamedSource(
|
| + "/lib.dart",
|
| + r'''
|
| library lib;
|
| set y(int value) {}''');
|
| Source source = addSource(r'''
|
|
|