Chromium Code Reviews| Index: pkg/analyzer/test/generated/incremental_resolver_test.dart |
| diff --git a/pkg/analyzer/test/generated/incremental_resolver_test.dart b/pkg/analyzer/test/generated/incremental_resolver_test.dart |
| index 6a52fce139b749fa7c421eac10b7f5c405fe223e..b79660f032e5324540ecc251192227c3cc9c3905 100644 |
| --- a/pkg/analyzer/test/generated/incremental_resolver_test.dart |
| +++ b/pkg/analyzer/test/generated/incremental_resolver_test.dart |
| @@ -10,7 +10,7 @@ import 'package:analyzer/src/dart/element/element.dart'; |
| import 'package:analyzer/src/generated/ast.dart'; |
| import 'package:analyzer/src/generated/engine.dart'; |
| import 'package:analyzer/src/generated/error.dart'; |
| -import 'package:analyzer/src/generated/incremental_logger.dart' as log; |
| +import 'package:analyzer/src/generated/incremental_logger.dart' as lg; |
|
Brian Wilkerson
2016/01/14 14:51:47
I don't understand why you changed the prefix from
|
| import 'package:analyzer/src/generated/incremental_resolution_validator.dart'; |
| import 'package:analyzer/src/generated/incremental_resolver.dart'; |
| import 'package:analyzer/src/generated/java_engine.dart'; |
| @@ -3092,7 +3092,7 @@ class IncrementalResolverTest extends ResolverTestCase { |
| void setUp() { |
| super.setUp(); |
| test_resolveApiChanges = true; |
| - log.logger = log.NULL_LOGGER; |
| + lg.logger = lg.NULL_LOGGER; |
| } |
| void test_classMemberAccessor_body() { |
| @@ -3523,6 +3523,8 @@ class B { |
| */ |
| @reflectiveTest |
| class PoorMansIncrementalResolutionTest extends ResolverTestCase { |
| + final _TestLogger logger = new _TestLogger(); |
| + |
| Source source; |
| String code; |
| LibraryElement oldLibrary; |
| @@ -3886,6 +3888,25 @@ main() { |
| '''); |
| } |
| + void test_endOfLineComment_toDartDoc() { |
| + _resolveUnit(r''' |
| +class A { |
| + // text |
| + main() { |
| + print(42); |
| + } |
| +}'''); |
| + _updateAndValidate( |
| + r''' |
| +class A { |
| + /// text |
| + main() { |
| + print(42); |
| + } |
| +}''', |
| + expectedSuccess: false); |
| + } |
| + |
| void test_false_constConstructor_initializer() { |
| _resolveUnit(r''' |
| class C { |
| @@ -4697,8 +4718,7 @@ class B extends A {} |
| AnalysisOptionsImpl analysisOptions = new AnalysisOptionsImpl(); |
| analysisOptions.incremental = enable; |
| analysisOptions.incrementalApi = enable; |
| -// log.logger = log.PRINT_LOGGER; |
| - log.logger = log.NULL_LOGGER; |
| + lg.logger = logger; |
| analysisContext2.analysisOptions = analysisOptions; |
| } |
| @@ -4730,6 +4750,7 @@ class B extends A {} |
| _resetWithIncremental(true); |
| analysisContext2.setContents(source, newCode); |
| CompilationUnit newUnit = resolveCompilationUnit(source, oldLibrary); |
| + expect(logger.hasError, isFalse); |
| List<AnalysisError> newErrors = analysisContext.computeErrors(source); |
| LineInfo newLineInfo = analysisContext.getLineInfo(source); |
| // check for expected failure |
| @@ -5022,3 +5043,26 @@ class _Edit { |
| final String replacement; |
| _Edit(this.offset, this.length, this.replacement); |
| } |
| + |
| +class _TestLogger implements lg.Logger { |
| + bool hasError = false; |
| + |
| + @override |
| + void enter(String name) {} |
| + |
| + @override |
| + void exit() {} |
| + |
| + @override |
| + void log(Object obj) {} |
| + |
| + @override |
| + void logException(Object exception, Object stackTrace) { |
| + hasError = true; |
| + } |
| + |
| + @override |
| + lg.LoggingTimer startTimer() { |
| + return new lg.LoggingTimer(this); |
| + } |
| +} |