Skip to content

Commit

Permalink
refactor(dart/transform): Migrates tests to use package:test
Browse files Browse the repository at this point in the history 
Pt 4 of migrating from package:guinness + package:unittest =>
package:test.

This PR migrates DeferredRewriter & DirectiveMetadataLinker unit tests.

Closes #7703
  • Loading branch information
@kegluneq
Tim Blasi authored and kegluneq committed Mar 22, 2016
1 parent 363ed51 commit 72e2466
Show file tree
Hide file tree
Showing 4 changed files with 54 additions and 51 deletions.
12 changes: 6 additions & 6 deletions modules_dart/transform/test/transform/deferred_rewriter/all_tests.dart
View file
Expand Up @@ -2,8 +2,8 @@ library angular2.test.transform.deferred_rewriter.all_tests;

import 'package:barback/barback.dart';
import 'package:dart_style/dart_style.dart';
import 'package:guinness/guinness.dart';
import 'package:path/path.dart' as path;
import 'package:test/test.dart';

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

void _testRewriteDeferredLibraries(String name, String inputPath) {
it(name, () {
test(name, () {
return zone.exec(() async {
var inputId = _assetIdForPath(inputPath);
var reader = new TestAssetReader();
Expand All @@ -48,11 +48,11 @@ void _testRewriteDeferredLibraries(String name, String inputPath) {
var expectedOutput = await reader.readAsString(expectedId);
if (expectedOutput == null) {
// Null expectedOutput signals no output. Ensure that is true.
expect(actualOutput).toBeNull();
expect(actualOutput, isNull);
} else {
expect(actualOutput).toBeNotNull();
expect(formatter.format(actualOutput))
.toEqual(formatter.format(expectedOutput));
expect(actualOutput, isNotNull);
expect(formatter.format(actualOutput),
equals(formatter.format(expectedOutput)));
}
}, log: new RecordingLogger());
});
Expand Down
85 changes: 44 additions & 41 deletions modules_dart/transform/test/transform/directive_metadata_linker/all_tests.dart
View file
Expand Up @@ -5,7 +5,7 @@ import 'dart:convert';

import 'package:barback/barback.dart';
import 'package:dart_style/dart_style.dart';
import 'package:guinness/guinness.dart';
import 'package:test/test.dart';

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

beforeEach(() {
setUp(() {
reader = new TestAssetReader();

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

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

var extracted = await _testLink(reader, fooAssetId);
expect(extracted.identifiers).toContain('FooComponent');
expect(extracted.identifiers).toContain('BarComponent');
expect(extracted.identifiers, contains('FooComponent'));
expect(extracted.identifiers, contains('BarComponent'));

expect(extracted.identifiers['FooComponent'].selector).toEqual('foo');
expect(extracted.identifiers['BarComponent'].selector).toEqual('bar');
expect(extracted.identifiers['FooComponent'].selector, equals('foo'));
expect(extracted.identifiers['BarComponent'].selector, equals('bar'));
});

it('should include `DirectiveMetadata` recursively from exported files.',
test('should include `DirectiveMetadata` recursively from exported files.',
() async {
fooNgMeta.ngDeps.exports.add(new ExportModel()..uri = 'bar.dart');
barNgMeta.ngDeps.exports.add(new ExportModel()..uri = 'baz.dart');
updateReader();

var extracted = await _testLink(reader, fooAssetId);
expect(extracted.identifiers).toContain('FooComponent');
expect(extracted.identifiers).toContain('BarComponent');
expect(extracted.identifiers).toContain('BazComponent');
expect(extracted.identifiers, contains('FooComponent'));
expect(extracted.identifiers, contains('BarComponent'));
expect(extracted.identifiers, contains('BazComponent'));

expect(extracted.identifiers['FooComponent'].selector).toEqual('foo');
expect(extracted.identifiers['BarComponent'].selector).toEqual('bar');
expect(extracted.identifiers['BazComponent'].selector).toEqual('baz');
expect(extracted.identifiers['FooComponent'].selector, equals('foo'));
expect(extracted.identifiers['BarComponent'].selector, equals('bar'));
expect(extracted.identifiers['BazComponent'].selector, equals('baz'));
});

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

var extracted = await _testLink(reader, aliasAssetId);
expect(extracted.identifiers).toContain('BarComponent');
expect(extracted.identifiers, contains('BarComponent'));
});

it('should NOT include metadata recursively from imported files when no aliases defined.',
test(
'should NOT include metadata recursively from imported files when no aliases defined.',
() async {
fooNgMeta.ngDeps.imports.add(new ImportModel()..uri = 'bar.dart');
barNgMeta.ngDeps.imports.add(new ImportModel()..uri = 'baz.dart');
updateReader();

var extracted = await _testLink(reader, fooAssetId);
expect(extracted.identifiers).not.toContain('BarComponent');
expect(extracted.identifiers).not.toContain('BazComponent');
expect(extracted.identifiers, isNot(contains('BarComponent')));
expect(extracted.identifiers, isNot(contains('BazComponent')));
});

it('should handle `DirectiveMetadata` export cycles gracefully.', () async {
test('should handle `DirectiveMetadata` export cycles gracefully.',
() async {
fooNgMeta.ngDeps.exports.add(new ExportModel()..uri = 'bar.dart');
barNgMeta.ngDeps.exports.add(new ExportModel()..uri = 'baz.dart');
bazNgMeta.ngDeps.exports.add(new ExportModel()..uri = 'foo.dart');
updateReader();

var extracted = await _testLink(reader, bazAssetId);
expect(extracted.identifiers).toContain('FooComponent');
expect(extracted.identifiers).toContain('BarComponent');
expect(extracted.identifiers).toContain('BazComponent');
expect(extracted.identifiers, contains('FooComponent'));
expect(extracted.identifiers, contains('BarComponent'));
expect(extracted.identifiers, contains('BazComponent'));
});

it(
test(
'should include `DirectiveMetadata` from exported files '
'expressed as absolute uris', () async {
fooNgMeta.ngDeps.exports
Expand All @@ -136,16 +139,16 @@ void allTests() {

var extracted = await _testLink(reader, fooAssetId);

expect(extracted.identifiers).toContain('FooComponent');
expect(extracted.identifiers).toContain('BarComponent');
expect(extracted.identifiers, contains('FooComponent'));
expect(extracted.identifiers, contains('BarComponent'));

expect(extracted.identifiers['FooComponent'].selector).toEqual('foo');
expect(extracted.identifiers['BarComponent'].selector).toEqual('bar');
expect(extracted.identifiers['FooComponent'].selector, equals('foo'));
expect(extracted.identifiers['BarComponent'].selector, equals('bar'));
});
});

describe('NgDeps linker', () {
it('should chain imported dependencies.', () async {
group('NgDeps linker', () {
test('should chain imported dependencies.', () async {
fooNgMeta.ngDeps
..libraryUri = 'test.foo'
..imports.add(new ImportModel()
Expand All @@ -155,29 +158,29 @@ void allTests() {
updateReader();

var linked = (await _testLink(reader, fooAssetId)).ngDeps;
expect(linked).toBeNotNull();
expect(linked, isNotNull);
var linkedImport = linked.depImports
.firstWhere((i) => i.uri.endsWith('bar.template.dart'));
expect(linkedImport).toBeNotNull();
expect(linkedImport.prefix.startsWith('i')).toBeTrue();
expect(linkedImport, isNotNull);
expect(linkedImport.prefix.startsWith('i'), isTrue);
});

it('should chain exported dependencies.', () async {
test('should chain exported dependencies.', () async {
fooNgMeta.ngDeps
..libraryUri = 'test.foo'
..exports.add(new ExportModel()..uri = 'bar.dart');
barNgMeta.ngDeps.libraryUri = 'test.bar';
updateReader();

var linked = (await _testLink(reader, fooAssetId)).ngDeps;
expect(linked).toBeNotNull();
expect(linked, isNotNull);
var linkedImport = linked.depImports
.firstWhere((i) => i.uri.endsWith('bar.template.dart'));
expect(linkedImport).toBeNotNull();
expect(linkedImport.prefix.startsWith('i')).toBeTrue();
expect(linkedImport, isNotNull);
expect(linkedImport.prefix.startsWith('i'), isTrue);
});

it('should not chain `deferred` libraries.', () async {
test('should not chain `deferred` libraries.', () async {
fooNgMeta.ngDeps
..libraryUri = 'test.foo'
..imports.add(new ImportModel()
Expand All @@ -188,11 +191,11 @@ void allTests() {
updateReader();

var linked = (await _testLink(reader, fooAssetId)).ngDeps;
expect(linked).toBeNotNull();
expect(linked, isNotNull);
var linkedImport = linked.depImports.firstWhere(
(i) => i.uri.endsWith('bar.template.dart'),
orElse: () => null);
expect(linkedImport).toBeNull();
expect(linkedImport, isNull);
});
});
}
Expand Down
4 changes: 4 additions & 0 deletions modules_dart/transform/test/transform/transform.server.spec.dart
View file
Expand Up @@ -8,12 +8,16 @@ import 'common/async_string_writer_tests.dart' as asyncStringWriter;
import 'common/code/ng_deps_code_tests.dart' as ngDepsCode;
import 'common/ng_meta_test.dart' as ngMetaTest;
import 'common/url_resolver_tests.dart' as urlResolver;
import 'deferred_rewriter/all_tests.dart' as deferredRewriter;
import 'directive_metadata_linker/all_tests.dart' as directiveMeta;
import 'directive_processor/all_tests.dart' as directiveProcessor;
import 'inliner_for_test/all_tests.dart' as inliner;

main() {
group('AnnotationMatcher', annotationMatcher.allTests);
group('AsyncStringWriter', asyncStringWriter.allTests);
group('Deferred Rewriter', deferredRewriter.allTests);
group('Directive Metadata Linker', directiveMeta.allTests);
group('Directive Processor', directiveProcessor.allTests);
group('Inliner For Test', inliner.allTests);
group('NgDepsCode', ngDepsCode.allTests);
Expand Down
4 changes: 0 additions & 4 deletions modules_dart/transform/test/transform/transform.unittest.server.spec.dart
View file
Expand Up @@ -4,17 +4,13 @@ import 'package:guinness/guinness.dart';
import 'package:unittest/unittest.dart' hide expect;
import 'package:unittest/vm_config.dart';

import 'deferred_rewriter/all_tests.dart' as deferredRewriter;
import 'directive_metadata_linker/all_tests.dart' as directiveMeta;
import 'reflection_remover/all_tests.dart' as reflectionRemover;
import 'template_compiler/all_tests.dart' as templateCompiler;
import 'stylesheet_compiler/all_tests.dart' as stylesheetCompiler;

main() {
useVMConfiguration();
describe('Directive Metadata Linker', directiveMeta.allTests);
describe('Reflection Remover', reflectionRemover.allTests);
describe('Template Compiler', templateCompiler.allTests);
describe('Deferred Rewriter', deferredRewriter.allTests);
describe('Stylesheet Compiler', stylesheetCompiler.allTests);
}

0 comments on commit 72e2466

Please sign in to comment.