Skip to content

fix(testbed): rename TestInjector to TestBed #9740

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
juliemr wants to merge 1 commit into from
Closed

fix(testbed): rename TestInjector to TestBed #9740

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 18 additions & 11 deletions modules/@angular/core/testing/test_injector.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import {AsyncTestCompleter} from './async_test_completer';
/**
* @experimental
*/
export class TestInjector {
export class TestBed {
private _instantiated: boolean = false;

private _injector: ReflectiveInjector = null;
Expand Down Expand Up @@ -65,16 +65,23 @@ export class TestInjector {
}
}

var _testInjector: TestInjector = null;
var _testBed: TestBed = null;

/**
* @experimental
*/
export function getTestInjector() {
if (_testInjector == null) {
_testInjector = new TestInjector();
export function getTestBed() {
if (_testBed == null) {
_testBed = new TestBed();
}
return _testInjector;
return _testBed;
}

/**
* @deprecated Use getTestBed().
*/
export function getTestInjector() {
return getTestBed();
}

/**
Expand All @@ -93,7 +100,7 @@ export function getTestInjector() {
export function setBaseTestProviders(
platformProviders: Array<Type|Provider|any[]>,
applicationProviders: Array<Type|Provider|any[]>) {
var testInjector = getTestInjector();
var testInjector = getTestBed();
if (testInjector.platformProviders.length > 0 || testInjector.applicationProviders.length > 0) {
throw new BaseException('Cannot set base providers because it has already been called');
}
Expand All @@ -113,7 +120,7 @@ export function setBaseTestProviders(
* @experimental
*/
export function resetBaseTestProviders() {
var testInjector = getTestInjector();
var testInjector = getTestBed();
testInjector.platformProviders = [];
testInjector.applicationProviders = [];
testInjector.reset();
Expand Down Expand Up @@ -144,7 +151,7 @@ export function resetBaseTestProviders() {
* @stable
*/
export function inject(tokens: any[], fn: Function): () => any {
let testInjector = getTestInjector();
let testInjector = getTestBed();
if (tokens.indexOf(AsyncTestCompleter) >= 0) {
// Return an async test method that returns a Promise if AsyncTestCompleter is one of the
// injected tokens.
Expand All @@ -155,7 +162,7 @@ export function inject(tokens: any[], fn: Function): () => any {
};
} else {
// Return a synchronous test method with the injected tokens.
return () => { return getTestInjector().execute(tokens, fn); };
return () => { return getTestBed().execute(tokens, fn); };
}
}

Expand All @@ -168,7 +175,7 @@ export class InjectSetupWrapper {
private _addProviders() {
var additionalProviders = this._providers();
if (additionalProviders.length > 0) {
getTestInjector().addProviders(additionalProviders);
getTestBed().addProviders(additionalProviders);
}
}

Expand Down
8 changes: 4 additions & 4 deletions modules/@angular/core/testing/testing.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
* allows tests to be asynchronous by either returning a promise or using a 'done' parameter.
*/

import {TestInjector, getTestInjector} from './test_injector';
import {TestBed, getTestBed} from './test_injector';

declare var global: any;

Expand Down Expand Up @@ -107,11 +107,11 @@ export var iit = _global.fit;
export var xit = _global.xit;


var testInjector: TestInjector = getTestInjector();
var testBed: TestBed = getTestBed();

// Reset the test providers before each test.
if (_global.beforeEach) {
beforeEach(() => { testInjector.reset(); });
beforeEach(() => { testBed.reset(); });
}

/**
Expand All @@ -123,7 +123,7 @@ if (_global.beforeEach) {
export function addProviders(providers: Array<any>): void {
if (!providers) return;
try {
testInjector.addProviders(providers);
testBed.addProviders(providers);
} catch (e) {
throw new Error(
'addProviders can\'t be called after the injector has been already created for this test. ' +
Expand Down
10 changes: 5 additions & 5 deletions modules/@angular/core/testing/testing_internal.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import {StringMapWrapper} from '../src/facade/collection';
import {Math, global, isFunction, isPromise} from '../src/facade/lang';

import {AsyncTestCompleter} from './async_test_completer';
import {getTestInjector, inject} from './test_injector';
import {getTestBed, inject} from './test_injector';

export {MockAnimationDriver} from './animation/mock_animation_driver';
export {MockAnimationPlayer} from './animation/mock_animation_player';
Expand Down Expand Up @@ -41,7 +41,7 @@ var inIt = false;
jasmine.DEFAULT_TIMEOUT_INTERVAL = 3000;
var globalTimeOut = jasmine.DEFAULT_TIMEOUT_INTERVAL;

var testInjector = getTestInjector();
var testBed = getTestBed();

/**
* Mechanism to run `beforeEach()` functions of Angular tests.
Expand All @@ -62,7 +62,7 @@ class BeforeEachRunner {
}

// Reset the test providers before each test
jsmBeforeEach(() => { testInjector.reset(); });
jsmBeforeEach(() => { testBed.reset(); });

function _describe(jsmFn: any /** TODO #9100 */, ...args: any[] /** TODO #9100 */) {
var parentRunner = runnerStack.length === 0 ? null : runnerStack[runnerStack.length - 1];
Expand Down Expand Up @@ -111,7 +111,7 @@ export function beforeEachProviders(fn: any /** TODO #9100 */): void {
jsmBeforeEach(() => {
var providers = fn();
if (!providers) return;
testInjector.addProviders(providers);
testBed.addProviders(providers);
});
}

Expand Down Expand Up @@ -140,7 +140,7 @@ function _it(jsmFn: Function, name: string, testFn: Function, testTimeOut: numbe
return new AsyncTestCompleter();
}
};
testInjector.addProviders([completerProvider]);
testBed.addProviders([completerProvider]);
runner.run();

inIt = true;
Expand Down
12 changes: 6 additions & 6 deletions modules/@angular/platform-browser/test/web_workers/worker/renderer_integration_spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

import {inject, ddescribe, describe, it, iit, expect, beforeEach, beforeEachProviders,} from '@angular/core/testing/testing_internal';
import {AsyncTestCompleter} from '@angular/core/testing/testing_internal';
import {TestInjector} from '@angular/core/testing';
import {TestBed} from '@angular/core/testing';
import {TestComponentBuilder} from '@angular/compiler/testing';
import {getDOM} from '@angular/platform-browser/src/dom/dom_adapter';
import {provide, Injector, ViewMetadata, Component, Injectable, ComponentRef} from '@angular/core';
Expand Down Expand Up @@ -65,15 +65,15 @@ export function main() {

beforeEachProviders(() => {
uiRenderStore = new RenderStore();
var testUiInjector = new TestInjector();
testUiInjector.platformProviders = TEST_BROWSER_PLATFORM_PROVIDERS;
testUiInjector.applicationProviders = TEST_BROWSER_APPLICATION_PROVIDERS;
testUiInjector.addProviders([
var uiTestBed = new TestBed();
uiTestBed.platformProviders = TEST_BROWSER_PLATFORM_PROVIDERS;
uiTestBed.applicationProviders = TEST_BROWSER_APPLICATION_PROVIDERS;
uiTestBed.addProviders([
Serializer, {provide: RenderStore, useValue: uiRenderStore},
{provide: DomRootRenderer, useClass: DomRootRenderer_},
{provide: RootRenderer, useExisting: DomRootRenderer}
]);
uiInjector = testUiInjector.createInjector();
uiInjector = uiTestBed.createInjector();
var uiSerializer = uiInjector.get(Serializer);
var domRootRenderer = uiInjector.get(DomRootRenderer);
workerRenderStore = new RenderStore();
Expand Down
27 changes: 15 additions & 12 deletions tools/public_api_guard/core/testing.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,10 @@ export declare var fit: any;
export declare function flushMicrotasks(): void;

/** @experimental */
export declare function getTestInjector(): TestInjector;
export declare function getTestBed(): TestBed;

/** @deprecated */
export declare function getTestInjector(): TestBed;

/** @deprecated */
export declare var iit: any;
Expand All @@ -85,6 +88,17 @@ export declare function resetBaseTestProviders(): void;
/** @experimental */
export declare function setBaseTestProviders(platformProviders: Array<Type | Provider | any[]>, applicationProviders: Array<Type | Provider | any[]>): void;

/** @experimental */
export declare class TestBed {
applicationProviders: Array<Type | Provider | any[] | any>;
platformProviders: Array<Type | Provider | any[] | any>;
addProviders(providers: Array<Type | Provider | any[] | any>): void;
createInjector(): ReflectiveInjector;
execute(tokens: any[], fn: Function): any;
get(token: any): any;
reset(): void;
}

/** @stable */
export declare class TestComponentBuilder {
protected _injector: Injector;
Expand All @@ -106,17 +120,6 @@ export declare class TestComponentRenderer {
insertRootElement(rootElementId: string): void;
}

/** @experimental */
export declare class TestInjector {
applicationProviders: Array<Type | Provider | any[] | any>;
platformProviders: Array<Type | Provider | any[] | any>;
addProviders(providers: Array<Type | Provider | any[] | any>): void;
createInjector(): ReflectiveInjector;
execute(tokens: any[], fn: Function): any;
get(token: any): any;
reset(): void;
}

/** @experimental */
export declare function tick(millis?: number): void;

Expand Down