Skip to content

Commit 908a0aa

Browse files
pkozlowski-opensourcemhevery
pkozlowski-opensource
authored and
mhevery
committed
test: introduce TemplateResolver mock
Closes angular#768
1 parent 4d35dd4 commit 908a0aa

8 files changed

Lines changed: 49 additions & 193 deletions

File tree

‎modules/angular2/src/mock/template_resolver_mock.js‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
import {Map, MapWrapper, ListWrapper} from 'angular2/src/facade/collection';
2+
import {Type, isPresent} from 'angular2/src/facade/lang';
3+
4+
import {Template} from 'angular2/src/core/annotations/template';
5+
import {TemplateResolver} from 'angular2/src/core/compiler/template_resolver';
6+
7+
export class MockTemplateResolver extends TemplateResolver {
8+
_cmpTemplates: Map;
9+
10+
constructor() {
11+
super();
12+
this._cmpTemplates = MapWrapper.create();
13+
}
14+
15+
setTemplate(component: Type, template: Template) {
16+
MapWrapper.set(this._cmpTemplates, component, template);
17+
}
18+
19+
resolve(component: Type): Template {
20+
var override = MapWrapper.get(this._cmpTemplates, component);
21+
22+
if (isPresent(override)) {
23+
return override;
24+
}
25+
26+
return super.resolve(component);
27+
}
28+
}

‎modules/angular2/test/core/compiler/integration_spec.js‎

Lines changed: 3 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
import {describe, xit, it, expect, beforeEach, ddescribe, iit, el} from 'angular2/test_lib';
22

33
import {DOM} from 'angular2/src/facade/dom';
4-
import {Map, MapWrapper} from 'angular2/src/facade/collection';
5-
import {Type, isPresent} from 'angular2/src/facade/lang';
64

75
import {Injector} from 'angular2/di';
86
import {Lexer, Parser, ChangeDetector, dynamicChangeDetection,
@@ -12,7 +10,7 @@ import {Compiler, CompilerCache} from 'angular2/src/core/compiler/compiler';
1210
import {DirectiveMetadataReader} from 'angular2/src/core/compiler/directive_metadata_reader';
1311
import {NativeShadowDomStrategy} from 'angular2/src/core/compiler/shadow_dom_strategy';
1412
import {TemplateLoader} from 'angular2/src/core/compiler/template_loader';
15-
import {TemplateResolver} from 'angular2/src/core/compiler/template_resolver';
13+
import {MockTemplateResolver} from 'angular2/src/mock/template_resolver_mock';
1614
import {BindingPropagationConfig} from 'angular2/src/core/compiler/binding_propagation_config';
1715

1816
import {Decorator, Component, Viewport} from 'angular2/src/core/annotations/annotations';
@@ -37,7 +35,7 @@ export function main() {
3735
}
3836

3937
beforeEach( () => {
40-
tplResolver = new FakeTemplateResolver();
38+
tplResolver = new MockTemplateResolver();
4139
compiler = createCompiler(tplResolver, dynamicChangeDetection);
4240
});
4341

@@ -492,30 +490,6 @@ class MyService {
492490
}
493491
}
494492

495-
class FakeTemplateResolver extends TemplateResolver {
496-
_cmpTemplates: Map;
497-
498-
constructor() {
499-
super();
500-
this._cmpTemplates = MapWrapper.create();
501-
}
502-
503-
setTemplate(component: Type, template: Template) {
504-
MapWrapper.set(this._cmpTemplates, component, template);
505-
}
506-
507-
resolve(component: Type): Template {
508-
var override = MapWrapper.get(this._cmpTemplates, component);
509-
510-
if (isPresent(override)) {
511-
return override;
512-
}
513-
514-
return super.resolve(component);
515-
}
516-
}
517-
518-
519493
class DoublePipe extends Pipe {
520494
supports(obj) {
521495
return true;
@@ -534,4 +508,4 @@ class DoublePipeFactory {
534508
create() {
535509
return new DoublePipe();
536510
}
537-
}
511+
}

‎modules/angular2/test/core/compiler/shadow_dom/shadow_dom_emulation_integration_spec.js‎

Lines changed: 4 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import {describe, xit, it, expect, beforeEach, ddescribe, iit, el} from 'angular2/test_lib';
22

3-
import {StringMapWrapper, MapWrapper, List} from 'angular2/src/facade/collection';
4-
import {isPresent, Type} from 'angular2/src/facade/lang';
3+
import {StringMapWrapper, List} from 'angular2/src/facade/collection';
4+
import {Type} from 'angular2/src/facade/lang';
55

66
import {Injector} from 'angular2/di';
77
import {Lexer, Parser, ChangeDetector, dynamicChangeDetection} from 'angular2/change_detection';
@@ -14,7 +14,7 @@ import {ShadowDomStrategy,
1414
NativeShadowDomStrategy,
1515
EmulatedShadowDomStrategy} from 'angular2/src/core/compiler/shadow_dom_strategy';
1616
import {TemplateLoader} from 'angular2/src/core/compiler/template_loader';
17-
import {TemplateResolver} from 'angular2/src/core/compiler/template_resolver';
17+
import {MockTemplateResolver} from 'angular2/src/mock/template_resolver_mock';
1818

1919
import {Decorator, Component, Viewport} from 'angular2/src/core/annotations/annotations';
2020
import {Template} from 'angular2/src/core/annotations/template';
@@ -34,7 +34,7 @@ export function main() {
3434
var compiler, tplResolver;
3535

3636
beforeEach(() => {
37-
tplResolver = new FakeTemplateResolver();
37+
tplResolver = new MockTemplateResolver();
3838
compiler = new Compiler(dynamicChangeDetection,
3939
new TemplateLoader(null),
4040
new DirectiveMetadataReader(),
@@ -337,26 +337,3 @@ function createView(pv) {
337337
view.hydrate(new Injector([]), null, {});
338338
return view;
339339
}
340-
341-
class FakeTemplateResolver extends TemplateResolver {
342-
_cmpTemplates: Map;
343-
344-
constructor() {
345-
super();
346-
this._cmpTemplates = MapWrapper.create();
347-
}
348-
349-
setTemplate(component: Type, template: Template) {
350-
MapWrapper.set(this._cmpTemplates, component, template);
351-
}
352-
353-
resolve(component: Type): Template {
354-
var override = MapWrapper.get(this._cmpTemplates, component);
355-
356-
if (isPresent(override)) {
357-
return override;
358-
}
359-
360-
return super.resolve(component);
361-
}
362-
}

‎modules/angular2/test/directives/foreach_spec.js‎

Lines changed: 5 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
import {describe, xit, it, expect, beforeEach, ddescribe, iit, el} from 'angular2/test_lib';
22

33
import {DOM} from 'angular2/src/facade/dom';
4-
import {Map, MapWrapper, ListWrapper} from 'angular2/src/facade/collection';
5-
import {Type, isPresent} from 'angular2/src/facade/lang';
4+
import {ListWrapper} from 'angular2/src/facade/collection';
65

76
import {Injector} from 'angular2/di';
87
import {Lexer, Parser, ChangeDetector, dynamicChangeDetection} from 'angular2/change_detection';
@@ -11,18 +10,19 @@ import {Compiler, CompilerCache} from 'angular2/src/core/compiler/compiler';
1110
import {DirectiveMetadataReader} from 'angular2/src/core/compiler/directive_metadata_reader';
1211
import {NativeShadowDomStrategy} from 'angular2/src/core/compiler/shadow_dom_strategy';
1312
import {TemplateLoader} from 'angular2/src/core/compiler/template_loader';
14-
import {TemplateResolver} from 'angular2/src/core/compiler/template_resolver';
1513

16-
import {Decorator, Component, Viewport} from 'angular2/src/core/annotations/annotations';
1714
import {Template} from 'angular2/src/core/annotations/template';
15+
import {Decorator, Component, Viewport} from 'angular2/src/core/annotations/annotations';
16+
17+
import {MockTemplateResolver} from 'angular2/src/mock/template_resolver_mock';
1818

1919
import {Foreach} from 'angular2/src/directives/foreach';
2020

2121
export function main() {
2222
describe('foreach', () => {
2323
var view, cd, compiler, component, tplResolver;
2424
beforeEach(() => {
25-
tplResolver = new FakeTemplateResolver();
25+
tplResolver = new MockTemplateResolver();
2626
compiler = new Compiler(dynamicChangeDetection, new TemplateLoader(null),
2727
new DirectiveMetadataReader(), new Parser(new Lexer()), new CompilerCache(),
2828
new NativeShadowDomStrategy(), tplResolver);
@@ -234,26 +234,3 @@ class TestComponent {
234234
this.items = [1, 2];
235235
}
236236
}
237-
238-
class FakeTemplateResolver extends TemplateResolver {
239-
_cmpTemplates: Map;
240-
241-
constructor() {
242-
super();
243-
this._cmpTemplates = MapWrapper.create();
244-
}
245-
246-
setTemplate(component: Type, template: Template) {
247-
MapWrapper.set(this._cmpTemplates, component, template);
248-
}
249-
250-
resolve(component: Type): Template {
251-
var override = MapWrapper.get(this._cmpTemplates, component);
252-
253-
if (isPresent(override)) {
254-
return override;
255-
}
256-
257-
return super.resolve(component);
258-
}
259-
}

‎modules/angular2/test/directives/if_spec.js‎

Lines changed: 3 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
import {describe, xit, it, expect, beforeEach, ddescribe, iit, el, IS_DARTIUM} from 'angular2/test_lib';
22

33
import {DOM} from 'angular2/src/facade/dom';
4-
import {Map, MapWrapper} from 'angular2/src/facade/collection';
5-
import {Type, isPresent} from 'angular2/src/facade/lang';
64

75
import {Injector} from 'angular2/di';
86
import {Lexer, Parser, ChangeDetector, dynamicChangeDetection} from 'angular2/change_detection';
@@ -11,19 +9,20 @@ import {Compiler, CompilerCache} from 'angular2/src/core/compiler/compiler';
119
import {DirectiveMetadataReader} from 'angular2/src/core/compiler/directive_metadata_reader';
1210
import {NativeShadowDomStrategy} from 'angular2/src/core/compiler/shadow_dom_strategy';
1311
import {TemplateLoader} from 'angular2/src/core/compiler/template_loader';
14-
import {TemplateResolver} from 'angular2/src/core/compiler/template_resolver';
1512

1613
import {Component} from 'angular2/src/core/annotations/annotations';
1714
import {Template} from 'angular2/src/core/annotations/template';
1815

16+
import {MockTemplateResolver} from 'angular2/src/mock/template_resolver_mock';
17+
1918
import {If} from 'angular2/src/directives/if';
2019

2120
export function main() {
2221
describe('if directive', () => {
2322
var view, cd, compiler, component, tplResolver;
2423

2524
beforeEach(() => {
26-
tplResolver = new FakeTemplateResolver();
25+
tplResolver = new MockTemplateResolver();
2726
compiler = new Compiler(dynamicChangeDetection, new TemplateLoader(null),
2827
new DirectiveMetadataReader(), new Parser(new Lexer()), new CompilerCache(),
2928
new NativeShadowDomStrategy(), tplResolver);
@@ -219,26 +218,3 @@ class TestComponent {
219218
this.nullCondition = null;
220219
}
221220
}
222-
223-
class FakeTemplateResolver extends TemplateResolver {
224-
_cmpTemplates: Map;
225-
226-
constructor() {
227-
super();
228-
this._cmpTemplates = MapWrapper.create();
229-
}
230-
231-
setTemplate(component: Type, template: Template) {
232-
MapWrapper.set(this._cmpTemplates, component, template);
233-
}
234-
235-
resolve(component: Type): Template {
236-
var override = MapWrapper.get(this._cmpTemplates, component);
237-
238-
if (isPresent(override)) {
239-
return override;
240-
}
241-
242-
return super.resolve(component);
243-
}
244-
}

‎modules/angular2/test/directives/non_bindable_spec.js‎

Lines changed: 2 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
import {describe, xit, it, expect, beforeEach, ddescribe, iit, el} from 'angular2/test_lib';
22
import {DOM} from 'angular2/src/facade/dom';
3-
import {Map, MapWrapper} from 'angular2/src/facade/collection';
4-
import {Type, isPresent} from 'angular2/src/facade/lang';
53
import {Injector} from 'angular2/di';
64
import {Lexer, Parser, ChangeDetector, dynamicChangeDetection} from 'angular2/change_detection';
75
import {Compiler, CompilerCache} from 'angular2/src/core/compiler/compiler';
@@ -10,15 +8,15 @@ import {NativeShadowDomStrategy} from 'angular2/src/core/compiler/shadow_dom_str
108
import {Decorator, Component} from 'angular2/src/core/annotations/annotations';
119
import {Template} from 'angular2/src/core/annotations/template';
1210
import {TemplateLoader} from 'angular2/src/core/compiler/template_loader';
13-
import {TemplateResolver} from 'angular2/src/core/compiler/template_resolver';
1411
import {NgElement} from 'angular2/src/core/dom/element';
1512
import {NonBindable} from 'angular2/src/directives/non_bindable';
13+
import {MockTemplateResolver} from 'angular2/src/mock/template_resolver_mock';
1614

1715
export function main() {
1816
describe('non-bindable', () => {
1917
var view, cd, compiler, component, tplResolver;
2018
beforeEach(() => {
21-
tplResolver = new FakeTemplateResolver();
19+
tplResolver = new MockTemplateResolver();
2220
compiler = new Compiler(dynamicChangeDetection, new TemplateLoader(null),
2321
new DirectiveMetadataReader(), new Parser(new Lexer()), new CompilerCache(),
2422
new NativeShadowDomStrategy(), tplResolver);
@@ -90,26 +88,3 @@ class TestDecorator {
9088
DOM.addClass(el.domElement, 'compiled');
9189
}
9290
}
93-
94-
class FakeTemplateResolver extends TemplateResolver {
95-
_cmpTemplates: Map;
96-
97-
constructor() {
98-
super();
99-
this._cmpTemplates = MapWrapper.create();
100-
}
101-
102-
setTemplate(component: Type, template: Template) {
103-
MapWrapper.set(this._cmpTemplates, component, template);
104-
}
105-
106-
resolve(component: Type): Template {
107-
var override = MapWrapper.get(this._cmpTemplates, component);
108-
109-
if (isPresent(override)) {
110-
return override;
111-
}
112-
113-
return super.resolve(component);
114-
}
115-
}

‎modules/angular2/test/directives/switch_spec.js‎

Lines changed: 2 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
import {describe, xit, it, expect, beforeEach, ddescribe, iit, el} from 'angular2/test_lib';
22
import {DOM} from 'angular2/src/facade/dom';
3-
import {Map, MapWrapper} from 'angular2/src/facade/collection';
4-
import {Type, isPresent} from 'angular2/src/facade/lang';
53
import {Injector} from 'angular2/di';
64
import {Lexer, Parser, dynamicChangeDetection} from 'angular2/change_detection';
75
import {Compiler, CompilerCache} from 'angular2/src/core/compiler/compiler';
@@ -10,14 +8,14 @@ import {NativeShadowDomStrategy} from 'angular2/src/core/compiler/shadow_dom_str
108
import {Component} from 'angular2/src/core/annotations/annotations';
119
import {Template} from 'angular2/src/core/annotations/template';
1210
import {TemplateLoader} from 'angular2/core';
13-
import {TemplateResolver} from 'angular2/src/core/compiler/template_resolver';
1411
import {Switch, SwitchWhen, SwitchDefault} from 'angular2/src/directives/switch';
12+
import {MockTemplateResolver} from 'angular2/src/mock/template_resolver_mock';
1513

1614
export function main() {
1715
describe('switch', () => {
1816
var view, cd, compiler, component, tplResolver;
1917
beforeEach(() => {
20-
tplResolver = new FakeTemplateResolver();
18+
tplResolver = new MockTemplateResolver();
2119
compiler = new Compiler(dynamicChangeDetection, new TemplateLoader(null),
2220
new DirectiveMetadataReader(), new Parser(new Lexer()), new CompilerCache(),
2321
new NativeShadowDomStrategy(), tplResolver);
@@ -166,26 +164,3 @@ class TestComponent {
166164
this.when2 = null;
167165
}
168166
}
169-
170-
class FakeTemplateResolver extends TemplateResolver {
171-
_cmpTemplates: Map;
172-
173-
constructor() {
174-
super();
175-
this._cmpTemplates = MapWrapper.create();
176-
}
177-
178-
setTemplate(component: Type, template: Template) {
179-
MapWrapper.set(this._cmpTemplates, component, template);
180-
}
181-
182-
resolve(component: Type): Template {
183-
var override = MapWrapper.get(this._cmpTemplates, component);
184-
185-
if (isPresent(override)) {
186-
return override;
187-
}
188-
189-
return super.resolve(component);
190-
}
191-
}

0 commit comments

Comments
 (0)