From f4f6b8721ad6e3b77627d97e7436df39a18a2c50 Mon Sep 17 00:00:00 2001
From: Vikram Subramanian <viks@google.com>
Date: Tue, 31 May 2016 15:15:38 -0700
Subject: [PATCH] fix(core): Keep core exports seperate from core/testing
 exports.

---
 modules/@angular/core/private_export.ts                   | 8 --------
 modules/@angular/core/testing/testing_internal.ts         | 3 +++
 modules/@angular/platform-browser/core_private.ts         | 5 -----
 .../test/dom/web_animations_player_spec.ts                | 4 ++--
 4 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/modules/@angular/core/private_export.ts b/modules/@angular/core/private_export.ts
index 1df2965233..c9db551a98 100644
--- a/modules/@angular/core/private_export.ts
+++ b/modules/@angular/core/private_export.ts
@@ -42,8 +42,6 @@ import {
   EMPTY_STATE as EMPTY_STATE_,
   FILL_STYLE_FLAG as FILL_STYLE_FLAG_
 } from './src/animation/animation_constants';
-import {MockAnimationPlayer as MockAnimationPlayer_} from './testing/animation/mock_animation_player';
-import {MockAnimationDriver as MockAnimationDriver_} from './testing/animation/mock_animation_driver';
 
 export declare namespace __core_private_types__ {
   export var isDefaultChangeDetectionStrategy: typeof constants.isDefaultChangeDetectionStrategy;
@@ -130,10 +128,6 @@ export declare namespace __core_private_types__ {
   export var ANY_STATE: typeof ANY_STATE_;
   export var EMPTY_STATE: typeof EMPTY_STATE_;
   export var FILL_STYLE_FLAG: typeof FILL_STYLE_FLAG_;
-  export type MockAnimationPlayer = MockAnimationPlayer_;
-  export var MockAnimationPlayer: typeof MockAnimationPlayer_;
-  export type MockAnimationDriver = MockAnimationDriver_;
-  export var MockAnimationDriver: typeof MockAnimationDriver_;
 }
 
 export var __core_private__ = {
@@ -195,8 +189,6 @@ export var __core_private__ = {
   AnimationKeyframe: AnimationKeyframe_,
   AnimationStyleUtil: AnimationStyleUtil_,
   AnimationStyles: AnimationStyles_,
-  MockAnimationPlayer: MockAnimationPlayer_,
-  MockAnimationDriver: MockAnimationDriver_,
   ANY_STATE: ANY_STATE_,
   EMPTY_STATE: EMPTY_STATE_,
   FILL_STYLE_FLAG: FILL_STYLE_FLAG_
diff --git a/modules/@angular/core/testing/testing_internal.ts b/modules/@angular/core/testing/testing_internal.ts
index cb7e312502..5834157854 100644
--- a/modules/@angular/core/testing/testing_internal.ts
+++ b/modules/@angular/core/testing/testing_internal.ts
@@ -8,6 +8,9 @@ export {expect} from './testing';
 export {inject} from './test_injector';
 export {AsyncTestCompleter} from './async_test_completer';
 
+export {MockAnimationPlayer} from './animation/mock_animation_player';
+export {MockAnimationDriver} from './animation/mock_animation_driver';
+
 export var proxy: ClassDecorator = (t) => t;
 
 var _global = <any>(typeof window === 'undefined' ? global : window);
diff --git a/modules/@angular/platform-browser/core_private.ts b/modules/@angular/platform-browser/core_private.ts
index 9c6e8db754..a87fe807ae 100644
--- a/modules/@angular/platform-browser/core_private.ts
+++ b/modules/@angular/platform-browser/core_private.ts
@@ -32,8 +32,3 @@ export type AnimationStyleUtil = t.AnimationStyleUtil;
 export var AnimationStyleUtil: typeof t.AnimationStyleUtil = r.AnimationStyleUtil;
 export type AnimationStyles = t.AnimationStyles;
 export var AnimationStyles: typeof t.AnimationStyles = r.AnimationStyles;
-
-export type MockAnimationPlayer = t.MockAnimationPlayer;
-export var MockAnimationPlayer: typeof t.MockAnimationPlayer = r.MockAnimationPlayer;
-export type MockAnimationDriver = t.MockAnimationDriver;
-export var MockAnimationDriver: typeof t.MockAnimationDriver = r.MockAnimationDriver;
diff --git a/modules/@angular/platform-browser/test/dom/web_animations_player_spec.ts b/modules/@angular/platform-browser/test/dom/web_animations_player_spec.ts
index 2a488eb91f..3832a02735 100644
--- a/modules/@angular/platform-browser/test/dom/web_animations_player_spec.ts
+++ b/modules/@angular/platform-browser/test/dom/web_animations_player_spec.ts
@@ -9,13 +9,13 @@ import {
   inject,
   it,
   xit,
-  beforeEachProviders
+  beforeEachProviders,
+  MockAnimationPlayer
 } from '@angular/core/testing/testing_internal';
 
 import {isPresent} from "../../src/facade/lang";
 import {WebAnimationsPlayer} from '../../src/dom/web_animations_player';
 import {DomAnimatePlayer} from '../../src/dom/dom_animate_player';
-import {MockAnimationPlayer} from '../../core_private';
 
 export class MockDomAnimatePlayer implements DomAnimatePlayer {
   public captures: {[key: string]: any[]} = {};