Skip to content

Commit 9babd3b

Browse files
btfordbtford
committed
5c330ea chore(publish): run router publish with additional memory
1 parent 99aaa71 commit 9babd3b

5 files changed

Lines changed: 53 additions & 56 deletions

File tree

‎BUILD_INFO‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
Tue Mar 22 00:43:38 UTC 2016
2-
865dde2cc3a5241f3f310d38c82673dca13dc30f
1+
Tue Mar 22 00:54:44 UTC 2016
2+
5c330ea492ca33082b9e7ffbf3f8113181e0de61

‎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';
56
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-
test(name, () {
39+
it(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, isNull);
51+
expect(actualOutput).toBeNull();
5252
} else {
53-
expect(actualOutput, isNotNull);
54-
expect(formatter.format(actualOutput),
55-
equals(formatter.format(expectedOutput)));
53+
expect(actualOutput).toBeNotNull();
54+
expect(formatter.format(actualOutput))
55+
.toEqual(formatter.format(expectedOutput));
5656
}
5757
}, log: new RecordingLogger());
5858
});

‎test/transform/directive_metadata_linker/all_tests.dart‎

Lines changed: 41 additions & 44 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:test/test.dart';
8+
import 'package:guinness/guinness.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-
setUp(() {
40+
beforeEach(() {
4141
reader = new TestAssetReader();
4242

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

67-
group('NgMeta linker', () {
68-
test('should include `DirectiveMetadata` from exported files.', () async {
67+
describe('NgMeta linker', () {
68+
it('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, contains('FooComponent'));
74-
expect(extracted.identifiers, contains('BarComponent'));
73+
expect(extracted.identifiers).toContain('FooComponent');
74+
expect(extracted.identifiers).toContain('BarComponent');
7575

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

80-
test('should include `DirectiveMetadata` recursively from exported files.',
80+
it('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, contains('FooComponent'));
88-
expect(extracted.identifiers, contains('BarComponent'));
89-
expect(extracted.identifiers, contains('BazComponent'));
87+
expect(extracted.identifiers).toContain('FooComponent');
88+
expect(extracted.identifiers).toContain('BarComponent');
89+
expect(extracted.identifiers).toContain('BazComponent');
9090

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

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

102101
var extracted = await _testLink(reader, aliasAssetId);
103-
expect(extracted.identifiers, contains('BarComponent'));
102+
expect(extracted.identifiers).toContain('BarComponent');
104103
});
105104

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

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

118-
test('should handle `DirectiveMetadata` export cycles gracefully.',
119-
() async {
116+
it('should handle `DirectiveMetadata` export cycles gracefully.', () async {
120117
fooNgMeta.ngDeps.exports.add(new ExportModel()..uri = 'bar.dart');
121118
barNgMeta.ngDeps.exports.add(new ExportModel()..uri = 'baz.dart');
122119
bazNgMeta.ngDeps.exports.add(new ExportModel()..uri = 'foo.dart');
123120
updateReader();
124121

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

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

140137
var extracted = await _testLink(reader, fooAssetId);
141138

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

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

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

160157
var linked = (await _testLink(reader, fooAssetId)).ngDeps;
161-
expect(linked, isNotNull);
158+
expect(linked).toBeNotNull();
162159
var linkedImport = linked.depImports
163160
.firstWhere((i) => i.uri.endsWith('bar.template.dart'));
164-
expect(linkedImport, isNotNull);
165-
expect(linkedImport.prefix.startsWith('i'), isTrue);
161+
expect(linkedImport).toBeNotNull();
162+
expect(linkedImport.prefix.startsWith('i')).toBeTrue();
166163
});
167164

168-
test('should chain exported dependencies.', () async {
165+
it('should chain exported dependencies.', () async {
169166
fooNgMeta.ngDeps
170167
..libraryUri = 'test.foo'
171168
..exports.add(new ExportModel()..uri = 'bar.dart');
172169
barNgMeta.ngDeps.libraryUri = 'test.bar';
173170
updateReader();
174171

175172
var linked = (await _testLink(reader, fooAssetId)).ngDeps;
176-
expect(linked, isNotNull);
173+
expect(linked).toBeNotNull();
177174
var linkedImport = linked.depImports
178175
.firstWhere((i) => i.uri.endsWith('bar.template.dart'));
179-
expect(linkedImport, isNotNull);
180-
expect(linkedImport.prefix.startsWith('i'), isTrue);
176+
expect(linkedImport).toBeNotNull();
177+
expect(linkedImport.prefix.startsWith('i')).toBeTrue();
181178
});
182179

183-
test('should not chain `deferred` libraries.', () async {
180+
it('should not chain `deferred` libraries.', () async {
184181
fooNgMeta.ngDeps
185182
..libraryUri = 'test.foo'
186183
..imports.add(new ImportModel()
@@ -191,11 +188,11 @@ void allTests() {
191188
updateReader();
192189

193190
var linked = (await _testLink(reader, fooAssetId)).ngDeps;
194-
expect(linked, isNotNull);
191+
expect(linked).toBeNotNull();
195192
var linkedImport = linked.depImports.firstWhere(
196193
(i) => i.uri.endsWith('bar.template.dart'),
197194
orElse: () => null);
198-
expect(linkedImport, isNull);
195+
expect(linkedImport).toBeNull();
199196
});
200197
});
201198
}

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,12 @@ 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;
1311
import 'directive_processor/all_tests.dart' as directiveProcessor;
1412
import 'inliner_for_test/all_tests.dart' as inliner;
1513

1614
main() {
1715
group('AnnotationMatcher', annotationMatcher.allTests);
1816
group('AsyncStringWriter', asyncStringWriter.allTests);
19-
group('Deferred Rewriter', deferredRewriter.allTests);
20-
group('Directive Metadata Linker', directiveMeta.allTests);
2117
group('Directive Processor', directiveProcessor.allTests);
2218
group('Inliner For Test', inliner.allTests);
2319
group('NgDepsCode', ngDepsCode.allTests);

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,17 @@ 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;
79
import 'reflection_remover/all_tests.dart' as reflectionRemover;
810
import 'template_compiler/all_tests.dart' as templateCompiler;
911
import 'stylesheet_compiler/all_tests.dart' as stylesheetCompiler;
1012

1113
main() {
1214
useVMConfiguration();
15+
describe('Directive Metadata Linker', directiveMeta.allTests);
1316
describe('Reflection Remover', reflectionRemover.allTests);
1417
describe('Template Compiler', templateCompiler.allTests);
18+
describe('Deferred Rewriter', deferredRewriter.allTests);
1519
describe('Stylesheet Compiler', stylesheetCompiler.allTests);
1620
}

0 commit comments

Comments
 (0)