Skip to content

Commit 72e2466

Browse files
Tim Blasikegluneq
Tim Blasi
authored and
kegluneq
committed
refactor(dart/transform): Migrates tests to use package:test
Pt 4 of migrating from package:guinness + package:unittest => package:test. This PR migrates DeferredRewriter & DirectiveMetadataLinker unit tests. Closes angular#7703
1 parent 363ed51 commit 72e2466

4 files changed

Lines changed: 54 additions & 51 deletions

File tree

‎modules_dart/transform/test/transform/deferred_rewriter/all_tests.dart‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ library angular2.test.transform.deferred_rewriter.all_tests;
22

33
import 'package:barback/barback.dart';
44
import 'package:dart_style/dart_style.dart';
5-
import 'package:guinness/guinness.dart';
65
import 'package:path/path.dart' as path;
6+
import 'package:test/test.dart';
77

88
import 'package:angular2/src/transform/common/zone.dart' as zone;
99
import 'package:angular2/src/transform/deferred_rewriter/transformer.dart';
@@ -36,7 +36,7 @@ void allTests() {
3636
}
3737

3838
void _testRewriteDeferredLibraries(String name, String inputPath) {
39-
it(name, () {
39+
test(name, () {
4040
return zone.exec(() async {
4141
var inputId = _assetIdForPath(inputPath);
4242
var reader = new TestAssetReader();
@@ -48,11 +48,11 @@ void _testRewriteDeferredLibraries(String name, String inputPath) {
4848
var expectedOutput = await reader.readAsString(expectedId);
4949
if (expectedOutput == null) {
5050
// Null expectedOutput signals no output. Ensure that is true.
51-
expect(actualOutput).toBeNull();
51+
expect(actualOutput, isNull);
5252
} else {
53-
expect(actualOutput).toBeNotNull();
54-
expect(formatter.format(actualOutput))
55-
.toEqual(formatter.format(expectedOutput));
53+
expect(actualOutput, isNotNull);
54+
expect(formatter.format(actualOutput),
55+
equals(formatter.format(expectedOutput)));
5656
}
5757
}, log: new RecordingLogger());
5858
});

‎modules_dart/transform/test/transform/directive_metadata_linker/all_tests.dart‎

Lines changed: 44 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import 'dart:convert';
55

66
import 'package:barback/barback.dart';
77
import 'package:dart_style/dart_style.dart';
8-
import 'package:guinness/guinness.dart';
8+
import 'package:test/test.dart';
99

1010
import 'package:angular2/src/transform/common/asset_reader.dart';
1111
import 'package:angular2/src/transform/common/names.dart';
@@ -37,7 +37,7 @@ void allTests() {
3737
..addAsset(bazAssetId, JSON.encode(bazNgMeta.toJson()))
3838
..addAsset(aliasAssetId, JSON.encode(aliasNgMeta.toJson()));
3939

40-
beforeEach(() {
40+
setUp(() {
4141
reader = new TestAssetReader();
4242

4343
// Establish some test NgMeta objects with one Component each.
@@ -64,68 +64,71 @@ void allTests() {
6464
updateReader();
6565
});
6666

67-
describe('NgMeta linker', () {
68-
it('should include `DirectiveMetadata` from exported files.', () async {
67+
group('NgMeta linker', () {
68+
test('should include `DirectiveMetadata` from exported files.', () async {
6969
fooNgMeta.ngDeps.exports.add(new ExportModel()..uri = 'bar.dart');
7070
updateReader();
7171

7272
var extracted = await _testLink(reader, fooAssetId);
73-
expect(extracted.identifiers).toContain('FooComponent');
74-
expect(extracted.identifiers).toContain('BarComponent');
73+
expect(extracted.identifiers, contains('FooComponent'));
74+
expect(extracted.identifiers, contains('BarComponent'));
7575

76-
expect(extracted.identifiers['FooComponent'].selector).toEqual('foo');
77-
expect(extracted.identifiers['BarComponent'].selector).toEqual('bar');
76+
expect(extracted.identifiers['FooComponent'].selector, equals('foo'));
77+
expect(extracted.identifiers['BarComponent'].selector, equals('bar'));
7878
});
7979

80-
it('should include `DirectiveMetadata` recursively from exported files.',
80+
test('should include `DirectiveMetadata` recursively from exported files.',
8181
() async {
8282
fooNgMeta.ngDeps.exports.add(new ExportModel()..uri = 'bar.dart');
8383
barNgMeta.ngDeps.exports.add(new ExportModel()..uri = 'baz.dart');
8484
updateReader();
8585

8686
var extracted = await _testLink(reader, fooAssetId);
87-
expect(extracted.identifiers).toContain('FooComponent');
88-
expect(extracted.identifiers).toContain('BarComponent');
89-
expect(extracted.identifiers).toContain('BazComponent');
87+
expect(extracted.identifiers, contains('FooComponent'));
88+
expect(extracted.identifiers, contains('BarComponent'));
89+
expect(extracted.identifiers, contains('BazComponent'));
9090

91-
expect(extracted.identifiers['FooComponent'].selector).toEqual('foo');
92-
expect(extracted.identifiers['BarComponent'].selector).toEqual('bar');
93-
expect(extracted.identifiers['BazComponent'].selector).toEqual('baz');
91+
expect(extracted.identifiers['FooComponent'].selector, equals('foo'));
92+
expect(extracted.identifiers['BarComponent'].selector, equals('bar'));
93+
expect(extracted.identifiers['BazComponent'].selector, equals('baz'));
9494
});
9595

96-
it('should include metadata recursively from imported files when they are aliases.',
96+
test(
97+
'should include metadata recursively from imported files when they are aliases.',
9798
() async {
9899
aliasNgMeta.ngDeps.imports.add(new ImportModel()..uri = 'bar.dart');
99100
updateReader();
100101

101102
var extracted = await _testLink(reader, aliasAssetId);
102-
expect(extracted.identifiers).toContain('BarComponent');
103+
expect(extracted.identifiers, contains('BarComponent'));
103104
});
104105

105-
it('should NOT include metadata recursively from imported files when no aliases defined.',
106+
test(
107+
'should NOT include metadata recursively from imported files when no aliases defined.',
106108
() async {
107109
fooNgMeta.ngDeps.imports.add(new ImportModel()..uri = 'bar.dart');
108110
barNgMeta.ngDeps.imports.add(new ImportModel()..uri = 'baz.dart');
109111
updateReader();
110112

111113
var extracted = await _testLink(reader, fooAssetId);
112-
expect(extracted.identifiers).not.toContain('BarComponent');
113-
expect(extracted.identifiers).not.toContain('BazComponent');
114+
expect(extracted.identifiers, isNot(contains('BarComponent')));
115+
expect(extracted.identifiers, isNot(contains('BazComponent')));
114116
});
115117

116-
it('should handle `DirectiveMetadata` export cycles gracefully.', () async {
118+
test('should handle `DirectiveMetadata` export cycles gracefully.',
119+
() async {
117120
fooNgMeta.ngDeps.exports.add(new ExportModel()..uri = 'bar.dart');
118121
barNgMeta.ngDeps.exports.add(new ExportModel()..uri = 'baz.dart');
119122
bazNgMeta.ngDeps.exports.add(new ExportModel()..uri = 'foo.dart');
120123
updateReader();
121124

122125
var extracted = await _testLink(reader, bazAssetId);
123-
expect(extracted.identifiers).toContain('FooComponent');
124-
expect(extracted.identifiers).toContain('BarComponent');
125-
expect(extracted.identifiers).toContain('BazComponent');
126+
expect(extracted.identifiers, contains('FooComponent'));
127+
expect(extracted.identifiers, contains('BarComponent'));
128+
expect(extracted.identifiers, contains('BazComponent'));
126129
});
127130

128-
it(
131+
test(
129132
'should include `DirectiveMetadata` from exported files '
130133
'expressed as absolute uris', () async {
131134
fooNgMeta.ngDeps.exports
@@ -136,16 +139,16 @@ void allTests() {
136139

137140
var extracted = await _testLink(reader, fooAssetId);
138141

139-
expect(extracted.identifiers).toContain('FooComponent');
140-
expect(extracted.identifiers).toContain('BarComponent');
142+
expect(extracted.identifiers, contains('FooComponent'));
143+
expect(extracted.identifiers, contains('BarComponent'));
141144

142-
expect(extracted.identifiers['FooComponent'].selector).toEqual('foo');
143-
expect(extracted.identifiers['BarComponent'].selector).toEqual('bar');
145+
expect(extracted.identifiers['FooComponent'].selector, equals('foo'));
146+
expect(extracted.identifiers['BarComponent'].selector, equals('bar'));
144147
});
145148
});
146149

147-
describe('NgDeps linker', () {
148-
it('should chain imported dependencies.', () async {
150+
group('NgDeps linker', () {
151+
test('should chain imported dependencies.', () async {
149152
fooNgMeta.ngDeps
150153
..libraryUri = 'test.foo'
151154
..imports.add(new ImportModel()
@@ -155,29 +158,29 @@ void allTests() {
155158
updateReader();
156159

157160
var linked = (await _testLink(reader, fooAssetId)).ngDeps;
158-
expect(linked).toBeNotNull();
161+
expect(linked, isNotNull);
159162
var linkedImport = linked.depImports
160163
.firstWhere((i) => i.uri.endsWith('bar.template.dart'));
161-
expect(linkedImport).toBeNotNull();
162-
expect(linkedImport.prefix.startsWith('i')).toBeTrue();
164+
expect(linkedImport, isNotNull);
165+
expect(linkedImport.prefix.startsWith('i'), isTrue);
163166
});
164167

165-
it('should chain exported dependencies.', () async {
168+
test('should chain exported dependencies.', () async {
166169
fooNgMeta.ngDeps
167170
..libraryUri = 'test.foo'
168171
..exports.add(new ExportModel()..uri = 'bar.dart');
169172
barNgMeta.ngDeps.libraryUri = 'test.bar';
170173
updateReader();
171174

172175
var linked = (await _testLink(reader, fooAssetId)).ngDeps;
173-
expect(linked).toBeNotNull();
176+
expect(linked, isNotNull);
174177
var linkedImport = linked.depImports
175178
.firstWhere((i) => i.uri.endsWith('bar.template.dart'));
176-
expect(linkedImport).toBeNotNull();
177-
expect(linkedImport.prefix.startsWith('i')).toBeTrue();
179+
expect(linkedImport, isNotNull);
180+
expect(linkedImport.prefix.startsWith('i'), isTrue);
178181
});
179182

180-
it('should not chain `deferred` libraries.', () async {
183+
test('should not chain `deferred` libraries.', () async {
181184
fooNgMeta.ngDeps
182185
..libraryUri = 'test.foo'
183186
..imports.add(new ImportModel()
@@ -188,11 +191,11 @@ void allTests() {
188191
updateReader();
189192

190193
var linked = (await _testLink(reader, fooAssetId)).ngDeps;
191-
expect(linked).toBeNotNull();
194+
expect(linked, isNotNull);
192195
var linkedImport = linked.depImports.firstWhere(
193196
(i) => i.uri.endsWith('bar.template.dart'),
194197
orElse: () => null);
195-
expect(linkedImport).toBeNull();
198+
expect(linkedImport, isNull);
196199
});
197200
});
198201
}

‎modules_dart/transform/test/transform/transform.server.spec.dart‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,16 @@ import 'common/async_string_writer_tests.dart' as asyncStringWriter;
88
import 'common/code/ng_deps_code_tests.dart' as ngDepsCode;
99
import 'common/ng_meta_test.dart' as ngMetaTest;
1010
import 'common/url_resolver_tests.dart' as urlResolver;
11+
import 'deferred_rewriter/all_tests.dart' as deferredRewriter;
12+
import 'directive_metadata_linker/all_tests.dart' as directiveMeta;
1113
import 'directive_processor/all_tests.dart' as directiveProcessor;
1214
import 'inliner_for_test/all_tests.dart' as inliner;
1315

1416
main() {
1517
group('AnnotationMatcher', annotationMatcher.allTests);
1618
group('AsyncStringWriter', asyncStringWriter.allTests);
19+
group('Deferred Rewriter', deferredRewriter.allTests);
20+
group('Directive Metadata Linker', directiveMeta.allTests);
1721
group('Directive Processor', directiveProcessor.allTests);
1822
group('Inliner For Test', inliner.allTests);
1923
group('NgDepsCode', ngDepsCode.allTests);

‎modules_dart/transform/test/transform/transform.unittest.server.spec.dart‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,13 @@ import 'package:guinness/guinness.dart';
44
import 'package:unittest/unittest.dart' hide expect;
55
import 'package:unittest/vm_config.dart';
66

7-
import 'deferred_rewriter/all_tests.dart' as deferredRewriter;
8-
import 'directive_metadata_linker/all_tests.dart' as directiveMeta;
97
import 'reflection_remover/all_tests.dart' as reflectionRemover;
108
import 'template_compiler/all_tests.dart' as templateCompiler;
119
import 'stylesheet_compiler/all_tests.dart' as stylesheetCompiler;
1210

1311
main() {
1412
useVMConfiguration();
15-
describe('Directive Metadata Linker', directiveMeta.allTests);
1613
describe('Reflection Remover', reflectionRemover.allTests);
1714
describe('Template Compiler', templateCompiler.allTests);
18-
describe('Deferred Rewriter', deferredRewriter.allTests);
1915
describe('Stylesheet Compiler', stylesheetCompiler.allTests);
2016
}

0 commit comments

Comments
 (0)