From d75502eeee2a699daac2f9b197aebf0e357473b3 Mon Sep 17 00:00:00 2001 From: Julie Ralph Date: Tue, 9 Aug 2016 10:46:28 -0700 Subject: [PATCH] refactor(testing): remove deprecated test setup functions (#10600) Remove test setup functions which were deprecated in rc5. See the changelog for rc5 for how to update. In brief, instead of `setBaseTestProviders`, use `TestBed.initTestEnvironment`. --- modules/@angular/core/testing/test_bed.ts | 40 --------------- .../platform-browser-dynamic/testing.ts | 41 ++------------- .../platform-browser/testing/browser.ts | 22 -------- .../platform-server/testing/server.ts | 51 +------------------ tools/cjs-jasmine/test-cjs-main.ts | 2 +- tools/public_api_guard/core/testing.d.ts | 9 ---- .../platform-browser-dynamic/testing.d.ts | 6 --- .../platform-browser/testing.d.ts | 9 ---- .../platform-server/testing.d.ts | 9 ---- 9 files changed, 6 insertions(+), 183 deletions(-) diff --git a/modules/@angular/core/testing/test_bed.ts b/modules/@angular/core/testing/test_bed.ts index 6339868ff0..6885fe9c93 100644 --- a/modules/@angular/core/testing/test_bed.ts +++ b/modules/@angular/core/testing/test_bed.ts @@ -378,46 +378,6 @@ export function getTestBed() { return _testBed; } -/** - * @deprecated use getTestBed instead. - */ -export function getTestInjector() { - return getTestBed(); -} - -/** - * Set the providers that the test injector should use. These should be providers - * common to every test in the suite. - * - * This may only be called once, to set up the common providers for the current test - * suite on the current platform. If you absolutely need to change the providers, - * first use `resetBaseTestProviders`. - * - * Test modules and platforms for individual platforms are available from - * 'angular2/platform/testing/'. - * - * @deprecated Use TestBed.initTestEnvironment instead - */ -export function setBaseTestProviders( - platformProviders: Array, - applicationProviders: Array) { - if (platformProviders.length === 1 && typeof platformProviders[0] === 'function') { - (platformProviders[0])(applicationProviders); - } else { - throw new Error( - `setBaseTestProviders is deprecated and only supports platformProviders that are predefined by Angular. Use 'TestBed.initTestEnvironment' instead.`); - } -} - -/** - * Reset the providers for the test injector. - * - * @deprecated Use TestBed.resetTestEnvironment instead. - */ -export function resetBaseTestProviders() { - TestBed.resetTestEnvironment(); -} - /** * Allows injecting dependencies in `beforeEach()` and `it()`. * diff --git a/modules/@angular/platform-browser-dynamic/testing.ts b/modules/@angular/platform-browser-dynamic/testing.ts index 9b15aeb5b1..95bfb11f0f 100644 --- a/modules/@angular/platform-browser-dynamic/testing.ts +++ b/modules/@angular/platform-browser-dynamic/testing.ts @@ -6,13 +6,11 @@ * found in the LICENSE file at https://angular.io/license */ -import {CompilerConfig, DirectiveResolver, NgModuleResolver, analyzeAppProvidersForDeprecatedConfiguration} from '@angular/compiler'; import {OverridingTestComponentBuilder, platformCoreDynamicTesting} from '@angular/compiler/testing'; -import {COMPILER_OPTIONS, Compiler, CompilerFactory, NgModule, PlatformRef, Provider, ReflectiveInjector, Type, createPlatform, createPlatformFactory} from '@angular/core'; -import {TestBed, TestComponentBuilder, TestComponentRenderer} from '@angular/core/testing'; -import {BrowserTestingModule, platformBrowserTesting} from '@angular/platform-browser/testing'; +import {NgModule, PlatformRef, createPlatformFactory} from '@angular/core'; +import {TestComponentBuilder, TestComponentRenderer} from '@angular/core/testing'; +import {BrowserTestingModule} from '@angular/platform-browser/testing'; -import {Console} from './core_private'; import {INTERNAL_BROWSER_DYNAMIC_PLATFORM_PROVIDERS} from './src/platform_providers'; import {DOMTestComponentRenderer} from './testing/dom_test_component_renderer'; @@ -39,36 +37,3 @@ export const platformBrowserDynamicTesting = createPlatformFactory( }) export class BrowserDynamicTestingModule { } - -/** - * @deprecated Use initTestEnvironment with platformBrowserDynamicTesting instead. - */ -export const TEST_BROWSER_DYNAMIC_PLATFORM_PROVIDERS: Array = - // Note: This is not a real provider but a hack to still support the deprecated - // `setBaseTestProviders` method! - [(appProviders: any[]) => { - const deprecatedConfiguration = analyzeAppProvidersForDeprecatedConfiguration(appProviders); - const platformRef = - createPlatformFactory(platformBrowserDynamicTesting, 'browserDynamicTestingDeprecated', [{ - provide: COMPILER_OPTIONS, - useValue: deprecatedConfiguration.compilerOptions, - multi: true - }])(); - - @NgModule({ - exports: [BrowserDynamicTestingModule], - declarations: [deprecatedConfiguration.moduleDeclarations] - }) - class DynamicTestModule { - } - - const testInjector = TestBed.initTestEnvironment(DynamicTestModule, platformRef); - const console: Console = testInjector.get(Console); - deprecatedConfiguration.deprecationMessages.forEach((msg) => console.warn(msg)); - }]; - -/** - * @deprecated Use initTestEnvironment with BrowserDynamicTestingModule instead. - */ -export const TEST_BROWSER_DYNAMIC_APPLICATION_PROVIDERS: Array = - []; diff --git a/modules/@angular/platform-browser/testing/browser.ts b/modules/@angular/platform-browser/testing/browser.ts index 8fdfdceb40..7b32589320 100644 --- a/modules/@angular/platform-browser/testing/browser.ts +++ b/modules/@angular/platform-browser/testing/browser.ts @@ -28,23 +28,6 @@ function createNgZone(): NgZone { const _TEST_BROWSER_PLATFORM_PROVIDERS: Array = [{provide: PLATFORM_INITIALIZER, useValue: initBrowserTests, multi: true}]; -/** - * Providers for the browser test platform - * - * @deprecated Use `platformBrowserTesting()` or create a custom platform factory via - * `createPlatformFactory(platformBrowserTesting, ...)` - */ -export const TEST_BROWSER_PLATFORM_PROVIDERS: Array = - [PLATFORM_COMMON_PROVIDERS, _TEST_BROWSER_PLATFORM_PROVIDERS]; - -/** - * @deprecated Use initTestEnvironment with BrowserTestModule instead. This is empty for backwards - * compatibility, - * as all of our bootstrap methods add a module implicitly, i.e. keeping this filled would add the - * providers 2x. - */ -export const TEST_BROWSER_APPLICATION_PROVIDERS: Array = []; - /** * Platform for testing * @@ -53,11 +36,6 @@ export const TEST_BROWSER_APPLICATION_PROVIDERS: Array = - // Note: This is not a real provider but a hack to still support the deprecated - // `setBaseTestProviders` method! - [(appProviders: any[]) => { - const deprecatedConfiguration = analyzeAppProvidersForDeprecatedConfiguration(appProviders); - const platformRef = createPlatformFactory(platformServerTesting, 'serverTestingDeprecated', [{ - provide: COMPILER_OPTIONS, - useValue: deprecatedConfiguration.compilerOptions, - multi: true - }])(); - - @NgModule({ - exports: [ServerTestingModule], - declarations: [deprecatedConfiguration.moduleDeclarations] - }) - class DynamicTestModule { - } - - const testInjector = TestBed.initTestEnvironment(DynamicTestModule, platformRef); - const console: Console = testInjector.get(Console); - deprecatedConfiguration.deprecationMessages.forEach((msg) => console.warn(msg)); - }]; - -/** - * @deprecated Use initTestEnvironment with ServerTestModule instead. This is empty for backwards - * compatibility, - * as all of our bootstrap methods add a module implicitly, i.e. keeping this filled would add the - * providers 2x. - */ -export const TEST_SERVER_APPLICATION_PROVIDERS: Array = []; diff --git a/tools/cjs-jasmine/test-cjs-main.ts b/tools/cjs-jasmine/test-cjs-main.ts index 60cab6b52d..06a7c6f9d0 100644 --- a/tools/cjs-jasmine/test-cjs-main.ts +++ b/tools/cjs-jasmine/test-cjs-main.ts @@ -2,4 +2,4 @@ var testingPlatformServer = require('../../all/@angular/platform-server/testing/ var testing = require('../../all/@angular/core/testing'); testing.TestBed.initTestEnvironment( - testingPlatformServer.ServerTestingModule, testingPlatformServer.serverTestingPlatform()); + testingPlatformServer.ServerTestingModule, testingPlatformServer.platformServerTesting()); diff --git a/tools/public_api_guard/core/testing.d.ts b/tools/public_api_guard/core/testing.d.ts index 2aed47e4f4..d74adb96da 100644 --- a/tools/public_api_guard/core/testing.d.ts +++ b/tools/public_api_guard/core/testing.d.ts @@ -40,9 +40,6 @@ export declare function flushMicrotasks(): void; /** @experimental */ export declare function getTestBed(): TestBed; -/** @deprecated */ -export declare function getTestInjector(): TestBed; - /** @stable */ export declare function inject(tokens: any[], fn: Function): () => any; @@ -59,15 +56,9 @@ export declare type MetadataOverride = { set?: T; }; -/** @deprecated */ -export declare function resetBaseTestProviders(): void; - /** @experimental */ export declare function resetFakeAsyncZone(): void; -/** @deprecated */ -export declare function setBaseTestProviders(platformProviders: Array, applicationProviders: Array): void; - /** @experimental */ export declare class TestBed implements Injector { ngModule: Type; diff --git a/tools/public_api_guard/platform-browser-dynamic/testing.d.ts b/tools/public_api_guard/platform-browser-dynamic/testing.d.ts index 8019615d36..f3570c6880 100644 --- a/tools/public_api_guard/platform-browser-dynamic/testing.d.ts +++ b/tools/public_api_guard/platform-browser-dynamic/testing.d.ts @@ -4,9 +4,3 @@ export declare class BrowserDynamicTestingModule { /** @experimental */ export declare const platformBrowserDynamicTesting: (extraProviders?: any[]) => PlatformRef; - -/** @deprecated */ -export declare const TEST_BROWSER_DYNAMIC_APPLICATION_PROVIDERS: Array; - -/** @deprecated */ -export declare const TEST_BROWSER_DYNAMIC_PLATFORM_PROVIDERS: Array; diff --git a/tools/public_api_guard/platform-browser/testing.d.ts b/tools/public_api_guard/platform-browser/testing.d.ts index 571c2400d1..749fa73152 100644 --- a/tools/public_api_guard/platform-browser/testing.d.ts +++ b/tools/public_api_guard/platform-browser/testing.d.ts @@ -2,14 +2,5 @@ export declare class BrowserTestingModule { } -/** @deprecated */ -export declare const browserTestingPlatform: (extraProviders?: any[]) => PlatformRef; - /** @experimental */ export declare const platformBrowserTesting: (extraProviders?: any[]) => PlatformRef; - -/** @deprecated */ -export declare const TEST_BROWSER_APPLICATION_PROVIDERS: Array; - -/** @deprecated */ -export declare const TEST_BROWSER_PLATFORM_PROVIDERS: Array; diff --git a/tools/public_api_guard/platform-server/testing.d.ts b/tools/public_api_guard/platform-server/testing.d.ts index 19cdee2f78..da4c2fcf08 100644 --- a/tools/public_api_guard/platform-server/testing.d.ts +++ b/tools/public_api_guard/platform-server/testing.d.ts @@ -4,12 +4,3 @@ export declare const platformServerTesting: (extraProviders?: any[]) => Platform /** @experimental */ export declare class ServerTestingModule { } - -/** @deprecated */ -export declare const serverTestingPlatform: (extraProviders?: any[]) => PlatformRef; - -/** @deprecated */ -export declare const TEST_SERVER_APPLICATION_PROVIDERS: Array; - -/** @deprecated */ -export declare const TEST_SERVER_PLATFORM_PROVIDERS: Array;