Chromium Code Reviews| Index: pkg/analyzer/test/generated/resolver_test.dart |
| diff --git a/pkg/analyzer/test/generated/resolver_test.dart b/pkg/analyzer/test/generated/resolver_test.dart |
| index 06f6b2be2f0f6f234bb1881e405a3b5142aa1a2a..63bb2cd71fad82f3534c91ea6bfe6c91cfa14b88 100644 |
| --- a/pkg/analyzer/test/generated/resolver_test.dart |
| +++ b/pkg/analyzer/test/generated/resolver_test.dart |
| @@ -172,6 +172,7 @@ class A { |
| } |
| } |
| }'''); |
| + await computeAnalysisResult(source); |
| await assertErrors( |
| source, [ResolverErrorCode.BREAK_LABEL_ON_SWITCH_MEMBER]); |
| verify([source]); |
| @@ -187,7 +188,7 @@ class A { |
| } |
| } |
| }'''); |
| - await assertErrors(source, [ResolverErrorCode.CONTINUE_LABEL_ON_SWITCH]); |
| + await computeAnalysisResult(source); await assertErrors(source, [ResolverErrorCode.CONTINUE_LABEL_ON_SWITCH]); |
|
Brian Wilkerson
2017/01/10 20:53:34
Perhaps format file this so that the two statement
|
| verify([source]); |
| } |
| @@ -216,7 +217,7 @@ class C { |
| expect(functions, isNotNull); |
| expect(functions, hasLength(1)); |
| expect(functions[0].enclosingElement, constructor); |
| - await assertErrors(source, [ParserErrorCode.GETTER_IN_FUNCTION]); |
| + await computeAnalysisResult(source); await assertErrors(source, [ParserErrorCode.GETTER_IN_FUNCTION]); |
| } |
| } |
| @@ -622,7 +623,7 @@ int f(List<int> list) { |
| sum += list[i]; |
| } |
| }'''); |
| - await assertErrors(source, [StaticTypeWarningCode.UNDEFINED_OPERATOR]); |
| + await computeAnalysisResult(source); await assertErrors(source, [StaticTypeWarningCode.UNDEFINED_OPERATOR]); |
| } |
| @override |
| @@ -638,7 +639,7 @@ int f(num n) { |
| assert (n is int); |
| return n & 0x0F; |
| }'''); |
| - await assertErrors(source, [StaticTypeWarningCode.UNDEFINED_OPERATOR]); |
| + await computeAnalysisResult(source); await assertErrors(source, [StaticTypeWarningCode.UNDEFINED_OPERATOR]); |
| } |
| test_conditional_and_is() async { |
| @@ -646,7 +647,7 @@ int f(num n) { |
| int f(num n) { |
| return (n is int && n > 0) ? n & 0x0F : 0; |
| }'''); |
| - await assertNoErrors(source); |
| + await computeAnalysisResult(source); await assertNoErrors(source); |
| } |
| test_conditional_is() async { |
| @@ -654,7 +655,7 @@ int f(num n) { |
| int f(num n) { |
| return (n is int) ? n & 0x0F : 0; |
| }'''); |
| - await assertNoErrors(source); |
| + await computeAnalysisResult(source); await assertNoErrors(source); |
| } |
| test_conditional_isNot() async { |
| @@ -662,7 +663,7 @@ int f(num n) { |
| int f(num n) { |
| return (n is! int) ? 0 : n & 0x0F; |
| }'''); |
| - await assertErrors(source, [StaticTypeWarningCode.UNDEFINED_OPERATOR]); |
| + await computeAnalysisResult(source); await assertErrors(source, [StaticTypeWarningCode.UNDEFINED_OPERATOR]); |
| } |
| test_conditional_or_is() async { |
| @@ -670,7 +671,7 @@ int f(num n) { |
| int f(num n) { |
| return (n is! int || n < 0) ? 0 : n & 0x0F; |
| }'''); |
| - await assertErrors(source, [StaticTypeWarningCode.UNDEFINED_OPERATOR]); |
| + await computeAnalysisResult(source); await assertErrors(source, [StaticTypeWarningCode.UNDEFINED_OPERATOR]); |
| } |
| test_forEach() async { |
| @@ -681,7 +682,7 @@ int f(List<int> list) { |
| sum += n & 0x0F; |
| } |
| }'''); |
| - await assertErrors(source, [StaticTypeWarningCode.UNDEFINED_OPERATOR]); |
| + await computeAnalysisResult(source); await assertErrors(source, [StaticTypeWarningCode.UNDEFINED_OPERATOR]); |
| } |
| test_if_and_is() async { |
| @@ -692,7 +693,7 @@ int f(num n) { |
| } |
| return 0; |
| }'''); |
| - await assertNoErrors(source); |
| + await computeAnalysisResult(source); await assertNoErrors(source); |
| } |
| test_if_is() async { |
| @@ -703,7 +704,7 @@ int f(num n) { |
| } |
| return 0; |
| }'''); |
| - await assertNoErrors(source); |
| + await computeAnalysisResult(source); await assertNoErrors(source); |
| } |
| test_if_isNot() async { |
| @@ -715,7 +716,7 @@ int f(num n) { |
| return n & 0x0F; |
| } |
| }'''); |
| - await assertErrors(source, [StaticTypeWarningCode.UNDEFINED_OPERATOR]); |
| + await computeAnalysisResult(source); await assertErrors(source, [StaticTypeWarningCode.UNDEFINED_OPERATOR]); |
| } |
| test_if_isNot_abrupt() async { |
| @@ -726,7 +727,7 @@ int f(num n) { |
| } |
| return n & 0x0F; |
| }'''); |
| - await assertErrors(source, [StaticTypeWarningCode.UNDEFINED_OPERATOR]); |
| + await computeAnalysisResult(source); await assertErrors(source, [StaticTypeWarningCode.UNDEFINED_OPERATOR]); |
| } |
| test_if_or_is() async { |
| @@ -738,7 +739,7 @@ int f(num n) { |
| return n & 0x0F; |
| } |
| }'''); |
| - await assertErrors(source, [StaticTypeWarningCode.UNDEFINED_OPERATOR]); |
| + await computeAnalysisResult(source); await assertErrors(source, [StaticTypeWarningCode.UNDEFINED_OPERATOR]); |
| } |
| test_localVar() async { |
| @@ -747,7 +748,7 @@ int f() { |
| num n = 1234; |
| return n & 0x0F; |
| }'''); |
| - await assertErrors(source, [StaticTypeWarningCode.UNDEFINED_OPERATOR]); |
| + await computeAnalysisResult(source); await assertErrors(source, [StaticTypeWarningCode.UNDEFINED_OPERATOR]); |
| } |
| } |
| @@ -1077,7 +1078,7 @@ A f(var p) { |
| } |
| }'''); |
| LibraryElement library = resolve2(source); |
| - await assertNoErrors(source); |
| + await computeAnalysisResult(source); await assertNoErrors(source); |
| verify([source]); |
| CompilationUnit unit = resolveCompilationUnit(source, library); |
| ClassDeclaration classA = unit.declarations[0] as ClassDeclaration; |
| @@ -1101,7 +1102,7 @@ A f(var p) { |
| return p; |
| }'''); |
| LibraryElement library = resolve2(source); |
| - await assertNoErrors(source); |
| + await computeAnalysisResult(source); await assertNoErrors(source); |
| verify([source]); |
| CompilationUnit unit = resolveCompilationUnit(source, library); |
| ClassDeclaration classA = unit.declarations[0] as ClassDeclaration; |
| @@ -1123,7 +1124,7 @@ f() { |
| return v; |
| }'''); |
| LibraryElement library = resolve2(source); |
| - await assertNoErrors(source); |
| + await computeAnalysisResult(source); await assertNoErrors(source); |
| verify([source]); |
| CompilationUnit unit = resolveCompilationUnit(source, library); |
| FunctionDeclaration function = unit.declarations[0] as FunctionDeclaration; |
| @@ -1142,7 +1143,7 @@ f() { |
| return v; |
| }'''); |
| LibraryElement library = resolve2(source); |
| - await assertNoErrors(source); |
| + await computeAnalysisResult(source); await assertNoErrors(source); |
| verify([source]); |
| CompilationUnit unit = resolveCompilationUnit(source, library); |
| FunctionDeclaration function = unit.declarations[0] as FunctionDeclaration; |
| @@ -1164,7 +1165,7 @@ main() { |
| { |
| Source source = addSource(code); |
| LibraryElement library = resolve2(source); |
| - await assertNoErrors(source); |
| + await computeAnalysisResult(source); await assertNoErrors(source); |
| verify([source]); |
| unit = resolveCompilationUnit(source, library); |
| } |
| @@ -1196,7 +1197,7 @@ main(CanvasElement canvas) { |
| }'''; |
| Source source = addSource(code); |
| LibraryElement library = resolve2(source); |
| - await assertNoErrors(source); |
| + await computeAnalysisResult(source); await assertNoErrors(source); |
| verify([source]); |
| CompilationUnit unit = resolveCompilationUnit(source, library); |
| SimpleIdentifier identifier = EngineTestCase.findNode( |
| @@ -1215,7 +1216,7 @@ main() { |
| }'''; |
| Source source = addSource(code); |
| LibraryElement library = resolve2(source); |
| - await assertNoErrors(source); |
| + await computeAnalysisResult(source); await assertNoErrors(source); |
| verify([source]); |
| CompilationUnit unit = resolveCompilationUnit(source, library); |
| InterfaceType stringType = typeProvider.stringType; |
| @@ -1243,7 +1244,7 @@ f(Stream<String> stream) async { |
| }'''; |
| Source source = addSource(code); |
| LibraryElement library = resolve2(source); |
| - await assertNoErrors(source); |
| + await computeAnalysisResult(source); await assertNoErrors(source); |
| verify([source]); |
| CompilationUnit unit = resolveCompilationUnit(source, library); |
| InterfaceType stringType = typeProvider.stringType; |
| @@ -1275,7 +1276,7 @@ f(MyCustomStream<String> stream) async { |
| }'''; |
| Source source = addSource(code); |
| LibraryElement library = resolve2(source); |
| - await assertNoErrors(source); |
| + await computeAnalysisResult(source); await assertNoErrors(source); |
| verify([source]); |
| CompilationUnit unit = resolveCompilationUnit(source, library); |
| InterfaceType listOfStringType = |
| @@ -1307,7 +1308,7 @@ f(MyMap<int, String> m) { |
| }'''; |
| Source source = addSource(code); |
| LibraryElement library = resolve2(source); |
| - await assertNoErrors(source); |
| + await computeAnalysisResult(source); await assertNoErrors(source); |
| verify([source]); |
| CompilationUnit unit = resolveCompilationUnit(source, library); |
| // k |
| @@ -1341,7 +1342,7 @@ f(MyMap<int, String> m) { |
| }'''; |
| Source source = addSource(code); |
| LibraryElement library = resolve2(source); |
| - await assertNoErrors(source); |
| + await computeAnalysisResult(source); await assertNoErrors(source); |
| verify([source]); |
| CompilationUnit unit = resolveCompilationUnit(source, library); |
| // k |
| @@ -1365,7 +1366,7 @@ main() { |
| }'''; |
| Source source = addSource(code); |
| LibraryElement library = resolve2(source); |
| - await assertNoErrors(source); |
| + await computeAnalysisResult(source); await assertNoErrors(source); |
| verify([source]); |
| CompilationUnit unit = resolveCompilationUnit(source, library); |
| // v |
| @@ -1393,7 +1394,7 @@ f(MyList list) { |
| }'''; |
| Source source = addSource(code); |
| LibraryElement library = resolve2(source); |
| - await assertNoErrors(source); |
| + await computeAnalysisResult(source); await assertNoErrors(source); |
| verify([source]); |
| CompilationUnit unit = resolveCompilationUnit(source, library); |
| // v |
| @@ -1419,6 +1420,7 @@ x() { |
| }'''; |
| Source source = addSource(code); |
| LibraryElement library = resolve2(source); |
| + await computeAnalysisResult(source); |
| await assertErrors( |
| source, [StaticWarningCode.ARGUMENT_TYPE_NOT_ASSIGNABLE]); |
| verify([source]); |
| @@ -1443,7 +1445,7 @@ f(MyList<String> list) { |
| }'''; |
| Source source = addSource(code); |
| LibraryElement library = resolve2(source); |
| - await assertNoErrors(source); |
| + await computeAnalysisResult(source); await assertNoErrors(source); |
| verify([source]); |
| CompilationUnit unit = resolveCompilationUnit(source, library); |
| // v |
| @@ -1470,7 +1472,7 @@ main(Future<int> firstFuture) { |
| }'''; |
| Source source = addSource(code); |
| LibraryElement library = resolve2(source); |
| - await assertNoErrors(source); |
| + await computeAnalysisResult(source); await assertNoErrors(source); |
| verify([source]); |
| CompilationUnit unit = resolveCompilationUnit(source, library); |
| // p1 |
| @@ -1494,7 +1496,7 @@ f() { |
| return v; |
| }'''); |
| LibraryElement library = resolve2(source); |
| - await assertNoErrors(source); |
| + await computeAnalysisResult(source); await assertNoErrors(source); |
| verify([source]); |
| CompilationUnit unit = resolveCompilationUnit(source, library); |
| FunctionDeclaration function = unit.declarations[0] as FunctionDeclaration; |
| @@ -1542,7 +1544,7 @@ f() { |
| return v; |
| }'''); |
| LibraryElement library = resolve2(source); |
| - await assertNoErrors(source); |
| + await computeAnalysisResult(source); await assertNoErrors(source); |
| verify([source]); |
| CompilationUnit unit = resolveCompilationUnit(source, library); |
| FunctionDeclaration function = unit.declarations[0] as FunctionDeclaration; |
| @@ -1573,7 +1575,7 @@ f() { |
| return v; |
| }'''); |
| LibraryElement library = resolve2(source); |
| - await assertNoErrors(source); |
| + await computeAnalysisResult(source); await assertNoErrors(source); |
| verify([source]); |
| CompilationUnit unit = resolveCompilationUnit(source, library); |
| FunctionDeclaration function = unit.declarations[0] as FunctionDeclaration; |
| @@ -1607,7 +1609,7 @@ main() { |
| { |
| Source source = addSource(code); |
| LibraryElement library = resolve2(source); |
| - await assertNoErrors(source); |
| + await computeAnalysisResult(source); await assertNoErrors(source); |
| verify([source]); |
| unit = resolveCompilationUnit(source, library); |
| } |
| @@ -1651,7 +1653,7 @@ A f(var p) { |
| return (p is A) ? p : null; |
| }'''); |
| LibraryElement library = resolve2(source); |
| - await assertNoErrors(source); |
| + await computeAnalysisResult(source); await assertNoErrors(source); |
| verify([source]); |
| CompilationUnit unit = resolveCompilationUnit(source, library); |
| ClassDeclaration classA = unit.declarations[0] as ClassDeclaration; |
| @@ -1679,7 +1681,7 @@ A f(var p) { |
| } |
| }'''); |
| LibraryElement library = resolve2(source); |
| - await assertNoErrors(source); |
| + await computeAnalysisResult(source); await assertNoErrors(source); |
| verify([source]); |
| CompilationUnit unit = resolveCompilationUnit(source, library); |
| // prepare A |
| @@ -1719,7 +1721,7 @@ A f(A p) { |
| } |
| }'''); |
| LibraryElement library = resolve2(source); |
| - await assertNoErrors(source); |
| + await computeAnalysisResult(source); await assertNoErrors(source); |
| verify([source]); |
| CompilationUnit unit = resolveCompilationUnit(source, library); |
| // ClassDeclaration classA = (ClassDeclaration) unit.getDeclarations().get(0); |
| @@ -1745,7 +1747,7 @@ A f(var p) { |
| } |
| }'''); |
| LibraryElement library = resolve2(source); |
| - await assertNoErrors(source); |
| + await computeAnalysisResult(source); await assertNoErrors(source); |
| verify([source]); |
| CompilationUnit unit = resolveCompilationUnit(source, library); |
| ClassDeclaration classA = unit.declarations[0] as ClassDeclaration; |
| @@ -1769,7 +1771,7 @@ A f(var p) { |
| return p; |
| }'''); |
| LibraryElement library = resolve2(source); |
| - await assertNoErrors(source); |
| + await computeAnalysisResult(source); await assertNoErrors(source); |
| verify([source]); |
| CompilationUnit unit = resolveCompilationUnit(source, library); |
| ClassDeclaration classA = unit.declarations[0] as ClassDeclaration; |
| @@ -1795,7 +1797,7 @@ A f(var p) { |
| return p; |
| }'''); |
| LibraryElement library = resolve2(source); |
| - await assertNoErrors(source); |
| + await computeAnalysisResult(source); await assertNoErrors(source); |
| verify([source]); |
| CompilationUnit unit = resolveCompilationUnit(source, library); |
| ClassDeclaration classA = unit.declarations[0] as ClassDeclaration; |
| @@ -1822,7 +1824,7 @@ A f(A p) { |
| return p; |
| }'''); |
| LibraryElement library = resolve2(source); |
| - await assertNoErrors(source); |
| + await computeAnalysisResult(source); await assertNoErrors(source); |
| CompilationUnit unit = resolveCompilationUnit(source, library); |
| FunctionDeclaration function = unit.declarations[2] as FunctionDeclaration; |
| BlockFunctionBody body = |
| @@ -1845,7 +1847,7 @@ A f(var p) { |
| return p; |
| }'''); |
| LibraryElement library = resolve2(source); |
| - await assertNoErrors(source); |
| + await computeAnalysisResult(source); await assertNoErrors(source); |
| verify([source]); |
| CompilationUnit unit = resolveCompilationUnit(source, library); |
| ClassDeclaration classA = unit.declarations[0] as ClassDeclaration; |
| @@ -1868,7 +1870,7 @@ A f(var p) { |
| return (p is! A) ? null : p; |
| }'''); |
| LibraryElement library = resolve2(source); |
| - await assertNoErrors(source); |
| + await computeAnalysisResult(source); await assertNoErrors(source); |
| verify([source]); |
| CompilationUnit unit = resolveCompilationUnit(source, library); |
| ClassDeclaration classA = unit.declarations[0] as ClassDeclaration; |
| @@ -1896,7 +1898,7 @@ A f(var p) { |
| } |
| }'''); |
| LibraryElement library = resolve2(source); |
| - await assertNoErrors(source); |
| + await computeAnalysisResult(source); await assertNoErrors(source); |
| verify([source]); |
| CompilationUnit unit = resolveCompilationUnit(source, library); |
| ClassDeclaration classA = unit.declarations[0] as ClassDeclaration; |
| @@ -1923,7 +1925,7 @@ A f(var p) { |
| } |
| }'''); |
| LibraryElement library = resolve2(source); |
| - await assertNoErrors(source); |
| + await computeAnalysisResult(source); await assertNoErrors(source); |
| CompilationUnit unit = resolveCompilationUnit(source, library); |
| ClassDeclaration classA = unit.declarations[0] as ClassDeclaration; |
| InterfaceType typeA = |
| @@ -1946,7 +1948,7 @@ A f(var p) { |
| return p; |
| }'''); |
| LibraryElement library = resolve2(source); |
| - await assertNoErrors(source); |
| + await computeAnalysisResult(source); await assertNoErrors(source); |
| verify([source]); |
| CompilationUnit unit = resolveCompilationUnit(source, library); |
| ClassDeclaration classA = unit.declarations[0] as ClassDeclaration; |
| @@ -1970,7 +1972,7 @@ A f(var p) { |
| return p; |
| }'''); |
| LibraryElement library = resolve2(source); |
| - await assertNoErrors(source); |
| + await computeAnalysisResult(source); await assertNoErrors(source); |
| verify([source]); |
| CompilationUnit unit = resolveCompilationUnit(source, library); |
| ClassDeclaration classA = unit.declarations[0] as ClassDeclaration; |
| @@ -2045,7 +2047,7 @@ f() { |
| return v[2]; |
| }'''); |
| LibraryElement library = resolve2(source); |
| - await assertNoErrors(source); |
| + await computeAnalysisResult(source); await assertNoErrors(source); |
| verify([source]); |
| CompilationUnit unit = resolveCompilationUnit(source, library); |
| FunctionDeclaration function = unit.declarations[0] as FunctionDeclaration; |
| @@ -2063,7 +2065,7 @@ f() { |
| return v[2]; |
| }'''); |
| LibraryElement library = resolve2(source); |
| - await assertNoErrors(source); |
| + await computeAnalysisResult(source); await assertNoErrors(source); |
| verify([source]); |
| CompilationUnit unit = resolveCompilationUnit(source, library); |
| FunctionDeclaration function = unit.declarations[0] as FunctionDeclaration; |
| @@ -2087,7 +2089,7 @@ f() { |
| return v; |
| }'''); |
| LibraryElement library = resolve2(source); |
| - await assertNoErrors(source); |
| + await computeAnalysisResult(source); await assertNoErrors(source); |
| verify([source]); |
| CompilationUnit unit = resolveCompilationUnit(source, library); |
| FunctionDeclaration function = unit.declarations[0] as FunctionDeclaration; |
| @@ -2110,7 +2112,7 @@ f() { |
| return v; |
| }'''); |
| LibraryElement library = resolve2(source); |
| - await assertNoErrors(source); |
| + await computeAnalysisResult(source); await assertNoErrors(source); |
| verify([source]); |
| CompilationUnit unit = resolveCompilationUnit(source, library); |
| FunctionDeclaration function = unit.declarations[0] as FunctionDeclaration; |
| @@ -2236,7 +2238,7 @@ void g() { |
| } |
| x = null; |
| }'''); |
| - await assertNoErrors(source); |
| + await computeAnalysisResult(source); await assertNoErrors(source); |
| } |
| test_objectAccessInference_disabled_for_library_prefix() async { |
| @@ -2420,7 +2422,7 @@ main() { |
| return [v1, v2, v3, v4, v5, v6, v7, m1, b1, b2, b3]; |
| }'''); |
| LibraryElement library = resolve2(source); |
| - await assertNoErrors(source); |
| + await computeAnalysisResult(source); await assertNoErrors(source); |
| verify([source]); |
| CompilationUnit unit = resolveCompilationUnit(source, library); |
| FunctionDeclaration main = unit.declarations[0] as FunctionDeclaration; |