From 3d8775e8e5bb1ae459faec4cb2869f82b4fc4dd5 Mon Sep 17 00:00:00 2001 From: Victor Date: Tue, 22 Apr 2014 21:50:23 +0200 Subject: [PATCH] test(transformer): fix - remove usage of obsolet syntax, - re-enable the parsing of attribute annotations by adding a class level annotation. --- .../expression_generator_spec.dart | 2 +- .../transformer/metadata_generator_spec.dart | 31 ++++++++++++++++--- 2 files changed, 27 insertions(+), 6 deletions(-) diff --git a/test/tools/transformer/expression_generator_spec.dart b/test/tools/transformer/expression_generator_spec.dart index 763ef5c77..096e314c9 100644 --- a/test/tools/transformer/expression_generator_spec.dart +++ b/test/tools/transformer/expression_generator_spec.dart @@ -97,7 +97,7 @@ main() { 'a|web/main.dart': ''' import 'package:angular/angular.dart'; - @NgComponent( + @Component( templateUrl: 'lib/foo.html', selector: 'my-component') class FooComponent extends BarComponent { diff --git a/test/tools/transformer/metadata_generator_spec.dart b/test/tools/transformer/metadata_generator_spec.dart index 2e6b580c5..cd733fd5d 100644 --- a/test/tools/transformer/metadata_generator_spec.dart +++ b/test/tools/transformer/metadata_generator_spec.dart @@ -77,7 +77,7 @@ main() { String get twoWayStuff => null; } - @NgDirective(selector: r'[*=/{{.*}}/]') + @Decorator(selector: r'[*=/{{.*}}/]') class InternalCombustionEngine extends Engine { @NgOneWay('ice-expression') String iceExpression; @@ -91,7 +91,7 @@ main() { ], classes: { 'import_0.InternalCombustionEngine': [ - 'const import_1.NgDirective(selector: r\'[*=/{{.*}}/]\', ' + 'const import_1.Decorator(selector: r\'[*=/{{.*}}/]\', ' 'map: const {' '\'ice-expression\': \'=>iceExpression\', ' '\'another-expression\': \'=>anotherExpression\', ' @@ -109,6 +109,7 @@ main() { 'a|web/main.dart': ''' import 'package:angular/angular.dart'; + @DummyAnnotation("parse attribute annotations") class Engine { @NgCallback('callback') @NgOneWay('another-expression') @@ -117,8 +118,17 @@ main() { main() {} ''' }, + imports: [ + 'import \'main.dart\' as import_0;', + 'import \'package:angular/angular.dart\' as import_1;', + ], + classes: { + 'import_0.Engine': [ + 'const import_1.DummyAnnotation("parse attribute annotations")', + ] + }, messages: ['warning: callback can only have one annotation. ' - '(web/main.dart 3 18)']); + '(web/main.dart 4 18)']); }); it('should warn on duplicated annotations', () { @@ -200,6 +210,7 @@ main() { 'a|web/main.dart': ''' import 'package:angular/angular.dart'; + @DummyAnnotation("parse attribute annotations") class Engine { @NgCallback('callback') set callback(Function) {} @@ -210,8 +221,17 @@ main() { main() {} ''' }, + imports: [ + 'import \'main.dart\' as import_0;', + 'import \'package:angular/angular.dart\' as import_1;', + ], + classes: { + 'import_0.Engine': [ + 'const import_1.DummyAnnotation("parse attribute annotations")', + ] + }, messages: ['warning: callback can only have one annotation. ' - '(web/main.dart 3 18)']); + '(web/main.dart 4 18)']); }); it('should extract map arguments', () { @@ -722,8 +742,9 @@ class NgCallback { } class NgAttr { - const NgAttr(); + const NgAttr(arg); } + class NgOneWayOneTime { const NgOneWayOneTime(arg); }