refactor(test): rename test_lib to testing

Old test_lib is now testing_internal
test_lib_public is now testing

docs/typescript-definition-package/index.js

@@ -43,7 +43,7 @@ module.exports = new Package('angular-v2-docs', [jsdocPackage, nunjucksPackage,
     'angular2/web_worker/ui.ts',
     'angular2/router.ts',
     'angular2/http.ts',
-    'angular2/test_lib.ts'
+    'angular2/testing.ts'
   ];
   readTypeScriptModules.basePath = path.resolve(path.resolve(__dirname, '../../modules'));
 
@@ -70,12 +70,12 @@ module.exports = new Package('angular-v2-docs', [jsdocPackage, nunjucksPackage,
       modules: {'angular2/http': {namespace: 'ngHttp', id: 'angular2/http'}}
     },
     {
-      id: 'angular2/test_lib',
+      id: 'angular2/testing',
       references: ['./angular2.d.ts'],
       remapTypes: { Type: 'ng.Type', Binding: 'ng.Binding', Provider: 'ng.Provider', ViewMetadata: 'ng.ViewMetadata', Injector: 'ng.Injector',
                     Predicate: 'ng.Predicate', ElementRef: 'ng.ElementRef', DebugElement: 'ng.DebugElement',
                     InjectableReference: 'ng.InjectableReference', ComponentRef: 'ng.ComponentRef' },
-      modules: {'angular2/test_lib': {namespace: 'ngTestLib', id: 'angular2/test_lib'}}
+      modules: {'angular2/testing': {namespace: 'ngTesting', id: 'angular2/testing'}}
     }
   ];
 })

gulpfile.js

@@ -299,7 +299,7 @@ gulp.task('lint', ['build.tools'], function() {
       "requireParameterType": true
     }
   };
-  return gulp.src(['modules/angular2/src/**/*.ts', '!modules/angular2/src/test_lib/**'])
+  return gulp.src(['modules/angular2/src/**/*.ts', '!modules/angular2/src/testing/**'])
       .pipe(tslint({
         tslint: require('tslint'),
         configuration: tslintConfig,
@@ -1044,8 +1044,8 @@ gulp.task('!bundle.testing', ['build.js.dev'], function() {
   devBundleConfig.paths = merge(true, devBundleConfig.paths, {"*": "dist/js/dev/es5/*.js"});
   return bundler.bundle(
     devBundleConfig,
-    'angular2/test_lib + angular2/mock - angular2/angular2',
-    './dist/js/bundle/test_lib.js',
+    'angular2/testing + angular2/mock - angular2/angular2',
+    './dist/js/bundle/testing.js',
     { sourceMaps: true });
 });
 

karma-js.conf.js

@@ -22,7 +22,7 @@ module.exports = function(config) {
       'node_modules/zone.js/dist/jasmine-patch.js',
 
       // Including systemjs because it defines `__eval`, which produces correct stack traces.
-      'modules/angular2/src/test_lib/shims_for_IE.js',
+      'modules/angular2/src/testing/shims_for_IE.js',
       'node_modules/systemjs/dist/system.src.js',
       {pattern: 'node_modules/@reactivex/rxjs/**', included: false, watched: false, served: true},
       'node_modules/reflect-metadata/Reflect.js',

modules/angular2/package.json

@@ -19,7 +19,7 @@
       "bundles/typings/angular2/angular2.d.ts",
       "bundles/typings/angular2/http.d.ts",
       "bundles/typings/angular2/router.d.ts",
-      "bundles/typings/angular2/test_lib.d.ts"
+      "bundles/typings/angular2/testing.d.ts"
     ]
   }
 }

modules/angular2/src/testing/fake_async.dart

@@ -1,4 +1,4 @@
-library test_lib.fake_async;
+library testing.fake_async;
 
 import 'dart:async' show runZoned, ZoneSpecification;
 import 'package:quiver/testing/async.dart' as quiver;

modules/angular2/src/testing/lang_utils.dart

@@ -1,4 +1,4 @@
-library test_lib.lang_utils;
+library testing.lang_utils;
 
 import 'dart:mirrors';
 

modules/angular2/src/testing/matchers.dart

@@ -1,4 +1,4 @@
-library test_lib.matchers;
+library testing.matchers;
 
 import 'dart:async';
 

modules/angular2/src/testing/perf_util.dart

@@ -1,3 +1,3 @@
-library angular2.test_lib.perf_util;
+library angular2.testing.perf_util;
 
 // empty as this file is node.js specific and should not be transpiled to dart

modules/angular2/src/testing/testing.dart

@@ -1,3 +1,3 @@
-library angular2.test_lib_public;
+library angular2.src.testing.testing;
 
 // empty as this file is for external TS/js users and should not be transpiled to dart

modules/angular2/src/testing/testing.ts

@@ -10,7 +10,7 @@ import {createTestInjector, FunctionWithParamTokens, inject, injectAsync} from '
 
 export {inject, injectAsync} from './test_injector';
 
-export {expect} from './matchers';
+export {expect, NgMatchers} from './matchers';
 
 var _global: jasmine.GlobalPolluter = <any>(typeof window === 'undefined' ? global : window);
 

modules/angular2/src/testing/testing_internal.dart

@@ -1,4 +1,4 @@
-library test_lib.test_lib;
+library angular2.src.testing.testing_internal;
 
 import 'dart:async';
 

modules/angular2/test.ts

@@ -1,13 +1,5 @@
 /**
- * @module
- * @description
- * This module is used for writing tests for applications written in Angular.
- *
- * This module is not included in the `angular2` module; you must import the test module explicitly.
- *
+ * @deprecated Please use testing instead
  */
-export * from './src/test_lib/test_lib_public';
-export * from './src/test_lib/test_component_builder';
-export * from './src/test_lib/test_injector';
-export * from './src/test_lib/fake_async';
-export * from './src/test_lib/utils';
+
+export * from './testing';

modules/angular2/test/animate/animation_builder_spec.ts

@@ -1,4 +1,4 @@
-import {el, describe, it, iit, expect, inject, SpyObject} from 'angular2/test_lib';
+import {el, describe, it, iit, expect, inject, SpyObject} from 'angular2/testing_internal';
 import {AnimationBuilder} from 'angular2/src/animate/animation_builder';
 import {DOM} from 'angular2/src/core/dom/dom_adapter';
 

modules/angular2/test/core/application_spec.ts

@@ -9,7 +9,7 @@ import {
   it,
   xdescribe,
   xit
-} from 'angular2/test_lib';
+} from 'angular2/testing_internal';
 import {isPresent, stringify} from 'angular2/src/core/facade/lang';
 import {bootstrap} from 'angular2/bootstrap';
 import {ApplicationRef} from 'angular2/src/core/application_ref';

modules/angular2/test/core/change_detection/change_detector_ref_spec.ts

@@ -9,7 +9,7 @@ import {
   afterEach,
   tick,
   fakeAsync
-} from 'angular2/test_lib';
+} from 'angular2/testing_internal';
 
 import {
   ChangeDetectorRef,

modules/angular2/test/core/change_detection/change_detector_spec.ts

@@ -9,7 +9,7 @@ import {
   afterEach,
   tick,
   fakeAsync
-} from 'angular2/test_lib';
+} from 'angular2/testing_internal';
 
 import {SpyChangeDispatcher} from '../spies';
 

modules/angular2/test/core/change_detection/coalesce_spec.ts

@@ -1,4 +1,13 @@
-import {ddescribe, describe, it, iit, xit, expect, beforeEach, afterEach} from 'angular2/test_lib';
+import {
+  ddescribe,
+  describe,
+  it,
+  iit,
+  xit,
+  expect,
+  beforeEach,
+  afterEach
+} from 'angular2/testing_internal';
 import {isBlank} from 'angular2/src/core/facade/lang';
 
 import {coalesce} from 'angular2/src/core/change_detection/coalesce';

modules/angular2/test/core/change_detection/differs/default_iterable_differ_spec.ts

@@ -1,4 +1,13 @@
-import {ddescribe, describe, it, iit, xit, expect, beforeEach, afterEach} from 'angular2/test_lib';
+import {
+  ddescribe,
+  describe,
+  it,
+  iit,
+  xit,
+  expect,
+  beforeEach,
+  afterEach
+} from 'angular2/testing_internal';
 import {
   DefaultIterableDiffer,
   DefaultIterableDifferFactory

modules/angular2/test/core/change_detection/differs/default_keyvalue_differ_spec.ts

@@ -1,4 +1,13 @@
-import {ddescribe, describe, it, iit, xit, expect, beforeEach, afterEach} from 'angular2/test_lib';
+import {
+  ddescribe,
+  describe,
+  it,
+  iit,
+  xit,
+  expect,
+  beforeEach,
+  afterEach
+} from 'angular2/testing_internal';
 import {
   DefaultKeyValueDiffer,
   DefaultKeyValueDifferFactory

modules/angular2/test/core/change_detection/differs/iterable_differs_spec.ts

@@ -1,4 +1,13 @@
-import {ddescribe, describe, it, iit, xit, expect, beforeEach, afterEach} from 'angular2/test_lib';
+import {
+  ddescribe,
+  describe,
+  it,
+  iit,
+  xit,
+  expect,
+  beforeEach,
+  afterEach
+} from 'angular2/testing_internal';
 import {SpyIterableDifferFactory} from '../../spies';
 import {IterableDiffers} from 'angular2/src/core/change_detection/differs/iterable_differs';
 import {Injector, provide} from 'angular2/core';

modules/angular2/test/core/change_detection/parser/lexer_spec.ts

@@ -1,4 +1,4 @@
-import {ddescribe, describe, it, expect} from 'angular2/test_lib';
+import {ddescribe, describe, it, expect} from 'angular2/testing_internal';
 
 import {Lexer, Token} from 'angular2/src/core/change_detection/parser/lexer';
 

modules/angular2/test/core/change_detection/parser/locals_spec.ts

@@ -1,4 +1,4 @@
-import {ddescribe, describe, it, xit, iit, expect, beforeEach} from 'angular2/test_lib';
+import {ddescribe, describe, it, xit, iit, expect, beforeEach} from 'angular2/testing_internal';
 
 import {Locals} from 'angular2/src/core/change_detection/parser/locals';
 

modules/angular2/test/core/change_detection/parser/parser_spec.ts

@@ -1,4 +1,4 @@
-import {ddescribe, describe, it, xit, iit, expect, beforeEach} from 'angular2/test_lib';
+import {ddescribe, describe, it, xit, iit, expect, beforeEach} from 'angular2/testing_internal';
 import {isBlank, isPresent} from 'angular2/src/core/facade/lang';
 import {reflector} from 'angular2/src/core/reflection/reflection';
 import {Parser} from 'angular2/src/core/change_detection/parser/parser';

modules/angular2/test/core/change_detection/proto_record_builder_spec.ts

@@ -8,7 +8,7 @@ import {
   beforeEach,
   afterEach,
   inject
-} from 'angular2/test_lib';
+} from 'angular2/testing_internal';
 
 import {ProtoRecordBuilder} from 'angular2/src/core/change_detection/proto_change_detector';
 import {BindingRecord} from 'angular2/src/core/change_detection/binding_record';

modules/angular2/test/core/change_detection/proto_record_spec.ts

@@ -1,4 +1,13 @@
-import {ddescribe, describe, it, iit, xit, expect, beforeEach, afterEach} from 'angular2/test_lib';
+import {
+  ddescribe,
+  describe,
+  it,
+  iit,
+  xit,
+  expect,
+  beforeEach,
+  afterEach
+} from 'angular2/testing_internal';
 import {isBlank} from 'angular2/src/core/facade/lang';
 
 import {RecordType, ProtoRecord} from 'angular2/src/core/change_detection/proto_record';

modules/angular2/test/core/compiler/change_definition_factory_spec.ts

@@ -11,7 +11,7 @@ import {
   xit,
   TestComponentBuilder,
   beforeEachBindings
-} from 'angular2/test_lib';
+} from 'angular2/testing_internal';
 import {MapWrapper} from 'angular2/src/core/facade/collection';
 import {
   CompileDirectiveMetadata,

modules/angular2/test/core/compiler/change_detector_compiler_spec.ts

@@ -11,7 +11,7 @@ import {
   AsyncTestCompleter,
   inject,
   beforeEachBindings
-} from 'angular2/test_lib';
+} from 'angular2/testing_internal';
 import {provide} from 'angular2/src/core/di';
 
 import {CONST_EXPR, stringify} from 'angular2/src/core/facade/lang';

modules/angular2/test/core/compiler/command_compiler_spec.ts

@@ -11,7 +11,7 @@ import {
   AsyncTestCompleter,
   inject,
   beforeEachBindings
-} from 'angular2/test_lib';
+} from 'angular2/testing_internal';
 
 import {CONST_EXPR, stringify, isType, Type, isBlank} from 'angular2/src/core/facade/lang';
 import {MapWrapper} from 'angular2/src/core/facade/collection';

modules/angular2/test/core/compiler/directive_metadata_spec.ts

@@ -10,7 +10,7 @@ import {
   it,
   xit,
   TestComponentBuilder
-} from 'angular2/test_lib';
+} from 'angular2/testing_internal';
 
 import {
   CompileDirectiveMetadata,

modules/angular2/test/core/compiler/eval_module_spec.ts

@@ -10,7 +10,7 @@ import {
   afterEach,
   AsyncTestCompleter,
   inject
-} from 'angular2/test_lib';
+} from 'angular2/testing_internal';
 import {IS_DART} from '../../platform';
 
 import {evalModule} from './eval_module';

modules/angular2/test/core/compiler/html_parser_spec.ts

@@ -1,4 +1,13 @@
-import {ddescribe, describe, it, iit, xit, expect, beforeEach, afterEach} from 'angular2/test_lib';
+import {
+  ddescribe,
+  describe,
+  it,
+  iit,
+  xit,
+  expect,
+  beforeEach,
+  afterEach
+} from 'angular2/testing_internal';
 
 import {HtmlParser} from 'angular2/src/core/compiler/html_parser';
 import {

modules/angular2/test/core/compiler/runtime_compiler_spec.ts

@@ -11,7 +11,7 @@ import {
   AsyncTestCompleter,
   inject,
   beforeEachBindings
-} from 'angular2/test_lib';
+} from 'angular2/testing_internal';
 
 import {Component, View, provide} from 'angular2/core';
 import {PromiseWrapper} from 'angular2/src/core/facade/async';

modules/angular2/test/core/compiler/runtime_metadata_spec.ts

@@ -11,7 +11,7 @@ import {
   AsyncTestCompleter,
   inject,
   beforeEachBindings
-} from 'angular2/test_lib';
+} from 'angular2/testing_internal';
 
 import {stringify} from 'angular2/src/core/facade/lang';
 import {RuntimeMetadataResolver} from 'angular2/src/core/compiler/runtime_metadata';

modules/angular2/test/core/compiler/schema/dom_element_schema_registry_spec.ts

@@ -8,7 +8,7 @@ import {
   inject,
   it,
   xit
-} from 'angular2/test_lib';
+} from 'angular2/testing_internal';
 import {IS_DART} from '../../../platform';
 
 import {

modules/angular2/test/core/compiler/selector_spec.ts

@@ -1,4 +1,4 @@
-import {describe, it, expect, beforeEach, ddescribe, iit, xit, el} from 'angular2/test_lib';
+import {describe, it, expect, beforeEach, ddescribe, iit, xit, el} from 'angular2/testing_internal';
 import {DOM} from 'angular2/src/core/dom/dom_adapter';
 import {SelectorMatcher} from 'angular2/src/core/compiler/selector';
 import {CssSelector} from 'angular2/src/core/compiler/selector';

modules/angular2/test/core/compiler/shadow_css_html5lib.server.spec.dart

@@ -1,7 +1,7 @@
 library angular2.compiler.shadow_css_html5lib.test;
 
 import 'package:angular2/src/core/dom/html_adapter.dart';
-import 'package:angular2/src/test_lib/test_lib.dart' show testSetup;
+import 'package:angular2/src/testing/testing_internal.dart' show testSetup;
 import 'shadow_css_spec.dart' as shadow_css_spec_test;
 
 void main() {

modules/angular2/test/core/compiler/shadow_css_spec.ts

@@ -9,7 +9,7 @@ import {
   el,
   normalizeCSS,
   browserDetection
-} from 'angular2/test_lib';
+} from 'angular2/testing_internal';
 import {ShadowCss} from 'angular2/src/core/compiler/shadow_css';
 
 import {RegExpWrapper, StringWrapper, isPresent} from 'angular2/src/core/facade/lang';

modules/angular2/test/core/compiler/source_module_spec.ts

@@ -10,7 +10,7 @@ import {
   it,
   xit,
   TestComponentBuilder
-} from 'angular2/test_lib';
+} from 'angular2/testing_internal';
 
 import {SourceModule, moduleRef} from 'angular2/src/core/compiler/source_module';
 

modules/angular2/test/core/compiler/style_compiler_spec.ts

@@ -11,7 +11,7 @@ import {
   AsyncTestCompleter,
   inject,
   beforeEachBindings
-} from 'angular2/test_lib';
+} from 'angular2/testing_internal';
 import {provide} from 'angular2/src/core/di';
 import {SpyXHR} from '../spies';
 import {XHR} from 'angular2/src/core/compiler/xhr';

modules/angular2/test/core/compiler/style_url_resolver_spec.ts

@@ -1,4 +1,4 @@
-import {describe, it, expect, beforeEach, ddescribe, iit, xit, el} from 'angular2/test_lib';
+import {describe, it, expect, beforeEach, ddescribe, iit, xit, el} from 'angular2/testing_internal';
 import {resolveStyleUrls} from 'angular2/src/core/compiler/style_url_resolver';
 
 import {UrlResolver} from 'angular2/src/core/compiler/url_resolver';

modules/angular2/test/core/compiler/template_compiler_spec.ts

@@ -11,7 +11,7 @@ import {
   AsyncTestCompleter,
   inject,
   beforeEachBindings
-} from 'angular2/test_lib';
+} from 'angular2/testing_internal';
 
 import {Promise, PromiseWrapper} from 'angular2/src/core/facade/async';
 import {Type, isPresent, isBlank, stringify, isString} from 'angular2/src/core/facade/lang';

modules/angular2/test/core/compiler/template_normalizer_spec.ts

@@ -11,7 +11,7 @@ import {
   xit,
   TestComponentBuilder,
   beforeEachBindings
-} from 'angular2/test_lib';
+} from 'angular2/testing_internal';
 
 import {
   CompileTypeMetadata,

modules/angular2/test/core/compiler/template_parser_spec.ts

@@ -9,7 +9,7 @@ import {
   afterEach,
   inject,
   beforeEachBindings
-} from 'angular2/test_lib';
+} from 'angular2/testing_internal';
 import {provide} from 'angular2/src/core/di';
 
 import {TEST_PROVIDERS} from './test_bindings';

modules/angular2/test/core/compiler/template_preparser_spec.ts

@@ -11,7 +11,7 @@ import {
   AsyncTestCompleter,
   inject,
   beforeEachBindings
-} from 'angular2/test_lib';
+} from 'angular2/testing_internal';
 
 import {HtmlParser} from 'angular2/src/core/compiler/html_parser';
 import {

modules/angular2/test/core/compiler/url_resolver_spec.ts

@@ -1,4 +1,4 @@
-import {describe, it, expect, beforeEach, ddescribe, iit, xit, el} from 'angular2/test_lib';
+import {describe, it, expect, beforeEach, ddescribe, iit, xit, el} from 'angular2/testing_internal';
 import {UrlResolver} from 'angular2/src/core/compiler/url_resolver';
 
 export function main() {

modules/angular2/test/core/compiler/util_spec.ts

@@ -10,7 +10,7 @@ import {
   it,
   xit,
   TestComponentBuilder
-} from 'angular2/test_lib';
+} from 'angular2/testing_internal';
 
 import {IS_DART} from '../../platform';
 import {escapeSingleQuoteString, escapeDoubleQuoteString} from 'angular2/src/core/compiler/util';

modules/angular2/test/core/compiler/xhr_impl_spec.ts

@@ -8,7 +8,7 @@ import {
   inject,
   it,
   xit
-} from 'angular2/test_lib';
+} from 'angular2/testing_internal';
 
 import {XHRImpl} from 'angular2/src/core/compiler/xhr_impl';
 import {PromiseWrapper} from 'angular2/src/core/facade/async';

modules/angular2/test/core/compiler/xhr_mock_spec.ts

@@ -8,7 +8,7 @@ import {
   iit,
   inject,
   it,
-} from 'angular2/test_lib';
+} from 'angular2/testing_internal';
 import {MockXHR} from 'angular2/src/core/compiler/xhr_mock';
 import {PromiseWrapper, Promise} from 'angular2/src/core/facade/async';
 import {isPresent} from 'angular2/src/core/facade/lang';

modules/angular2/test/core/debug/debug_element_spec.ts

@@ -12,7 +12,7 @@ import {
   it,
   xit,
   TestComponentBuilder
-} from 'angular2/test_lib';
+} from 'angular2/testing_internal';
 
 import {DOM} from 'angular2/src/core/dom/dom_adapter';
 

modules/angular2/test/core/debug/debug_element_view_listener_spec.ts

@@ -12,7 +12,7 @@ import {
   it,
   xit,
   TestComponentBuilder,
-} from 'angular2/test_lib';
+} from 'angular2/testing_internal';
 import {global} from 'angular2/src/core/facade/lang';
 import {APP_VIEW_POOL_CAPACITY} from 'angular2/src/core/linker/view_pool';
 import {provide, Component, Directive, Injectable, View} from 'angular2/core';

modules/angular2/test/core/di/binding_spec.dart

@@ -3,7 +3,7 @@
 library angular2.test.di.binding_dart_spec;
 
 import 'dart:mirrors';
-import 'package:angular2/test_lib.dart';
+import 'package:angular2/testing_internal.dart';
 import 'package:angular2/core.dart';
 
 main() {

modules/angular2/test/core/di/binding_spec.ts

@@ -8,7 +8,7 @@ import {
   inject,
   it,
   xit,
-} from 'angular2/test_lib';
+} from 'angular2/testing_internal';
 
 import {bind, provide} from 'angular2/core';
 

modules/angular2/test/core/di/forward_ref_spec.ts

@@ -8,7 +8,7 @@ import {
   inject,
   it,
   xit,
-} from 'angular2/test_lib';
+} from 'angular2/testing_internal';
 import {forwardRef, resolveForwardRef} from 'angular2/core';
 import {Type} from 'angular2/src/core/facade/lang';
 

modules/angular2/test/core/di/injector_dart_spec.dart

@@ -1,7 +1,7 @@
 /// This file contains tests that make sense only in Dart
 library angular2.test.di.injector_dart_spec;
 
-import 'package:angular2/test_lib.dart';
+import 'package:angular2/testing_internal.dart';
 import 'package:angular2/core.dart';
 
 main() {

modules/angular2/test/core/di/injector_spec.ts

@@ -1,6 +1,6 @@
 import {isBlank, stringify} from 'angular2/src/core/facade/lang';
 import {BaseException, WrappedException} from 'angular2/src/core/facade/exceptions';
-import {describe, ddescribe, it, iit, expect, beforeEach} from 'angular2/test_lib';
+import {describe, ddescribe, it, iit, expect, beforeEach} from 'angular2/testing_internal';
 import {SpyDependencyProvider} from '../spies';
 import {
   Injector,

modules/angular2/test/core/di/key_dart_spec.dart

@@ -1,7 +1,7 @@
 /// This file contains tests that make sense only in Dart
 library angular2.test.di.key_dart_spec;
 
-import 'package:angular2/test_lib.dart';
+import 'package:angular2/testing_internal.dart';
 import 'package:angular2/core.dart';
 import 'package:angular2/src/core/di/key.dart';
 

modules/angular2/test/core/di/key_spec.ts

@@ -1,4 +1,4 @@
-import {describe, iit, it, expect, beforeEach} from 'angular2/test_lib';
+import {describe, iit, it, expect, beforeEach} from 'angular2/testing_internal';
 import {Key, KeyRegistry} from 'angular2/src/core/di/key';
 
 export function main() {

modules/angular2/test/core/directive_lifecycle_integration_spec.ts

@@ -11,7 +11,7 @@ import {
   xit,
   Log,
   TestComponentBuilder
-} from 'angular2/test_lib';
+} from 'angular2/testing_internal';
 
 import {
   OnChanges,

modules/angular2/test/core/directives/ng_class_spec.ts

@@ -13,7 +13,7 @@ import {
   inject,
   it,
   xit,
-} from 'angular2/test_lib';
+} from 'angular2/testing_internal';
 import {ListWrapper, StringMapWrapper} from 'angular2/src/core/facade/collection';
 import {Component, View, NgFor, provide} from 'angular2/angular2';
 import {NgClass} from 'angular2/src/core/directives/ng_class';

modules/angular2/test/core/directives/ng_for_spec.ts

@@ -11,7 +11,7 @@ import {
   inject,
   it,
   xit,
-} from 'angular2/test_lib';
+} from 'angular2/testing_internal';
 
 import {ListWrapper} from 'angular2/src/core/facade/collection';
 

modules/angular2/test/core/directives/ng_if_spec.ts

@@ -10,7 +10,7 @@ import {
   inject,
   it,
   xit,
-} from 'angular2/test_lib';
+} from 'angular2/testing_internal';
 
 import {DOM} from 'angular2/src/core/dom/dom_adapter';
 

modules/angular2/test/core/directives/ng_style_spec.ts

@@ -12,7 +12,7 @@ import {
   inject,
   it,
   xit,
-} from 'angular2/test_lib';
+} from 'angular2/testing_internal';
 
 import {StringMapWrapper} from 'angular2/src/core/facade/collection';
 

modules/angular2/test/core/directives/ng_switch_spec.ts

@@ -10,7 +10,7 @@ import {
   inject,
   it,
   xit,
-} from 'angular2/test_lib';
+} from 'angular2/testing_internal';
 
 import {Component, View} from 'angular2/angular2';
 

modules/angular2/test/core/directives/non_bindable_spec.ts

@@ -10,7 +10,7 @@ import {
   inject,
   it,
   xit,
-} from 'angular2/test_lib';
+} from 'angular2/testing_internal';
 import {DOM} from 'angular2/src/core/dom/dom_adapter';
 import {Component, Directive, View} from 'angular2/core';
 import {ElementRef} from 'angular2/src/core/linker/element_ref';

modules/angular2/test/core/directives/observable_list_diff_spec.dart

@@ -1,6 +1,6 @@
 library angular2.test.directives.observable_list_iterable_diff_spec;
 
-import 'package:angular2/test_lib.dart';
+import 'package:angular2/testing_internal.dart';
 import 'package:observe/observe.dart' show ObservableList;
 import 'package:angular2/core.dart' show ObservableListDiffFactory, ChangeDetectorRef;
 

modules/angular2/test/core/dom/dom_adapter_spec.ts

@@ -12,7 +12,7 @@ import {
   beforeEachBindings,
   SpyObject,
   stringifyElement
-} from 'angular2/test_lib';
+} from 'angular2/testing_internal';
 
 import {DOM} from 'angular2/src/core/dom/dom_adapter';
 

modules/angular2/test/core/dom/shim_spec.ts

@@ -9,7 +9,7 @@ import {
   inject,
   it,
   xit
-} from 'angular2/test_lib';
+} from 'angular2/testing_internal';
 
 export function main() {
   describe('Shim', () => {

modules/angular2/test/core/facade/async_dart_spec.dart

@@ -1,7 +1,7 @@
 /// This file contains tests that make sense only in Dart
 library angular2.test.facade.async_dart_spec;
 
-import 'package:angular2/test_lib.dart';
+import 'package:angular2/testing_internal.dart';
 import 'package:angular2/src/core/facade/async.dart';
 
 class MockException implements Error {

modules/angular2/test/core/facade/async_spec.ts

@@ -10,7 +10,7 @@ import {
   SpyObject,
   AsyncTestCompleter,
   inject
-} from 'angular2/test_lib';
+} from 'angular2/testing_internal';
 
 import {ObservableWrapper, EventEmitter, PromiseWrapper} from 'angular2/src/core/facade/async';
 

modules/angular2/test/core/facade/collection_spec.ts

@@ -1,4 +1,4 @@
-import {describe, it, expect, beforeEach, ddescribe, iit, xit} from 'angular2/test_lib';
+import {describe, it, expect, beforeEach, ddescribe, iit, xit} from 'angular2/testing_internal';
 
 import {ListWrapper, StringMapWrapper, MapWrapper} from 'angular2/src/core/facade/collection';
 

modules/angular2/test/core/facade/exception_handler_spec.ts

@@ -10,7 +10,7 @@ import {
   xdescribe,
   xit,
   Log
-} from 'angular2/test_lib';
+} from 'angular2/testing_internal';
 import {
   BaseException,
   WrappedException,

modules/angular2/test/core/facade/lang_spec.ts

@@ -1,4 +1,4 @@
-import {describe, it, expect, beforeEach, ddescribe, iit, xit, el} from 'angular2/test_lib';
+import {describe, it, expect, beforeEach, ddescribe, iit, xit, el} from 'angular2/testing_internal';
 import {
   isPresent,
   RegExpWrapper,

modules/angular2/test/core/forms/directives_spec.ts

@@ -12,7 +12,7 @@ import {
   el,
   AsyncTestCompleter,
   inject
-} from 'angular2/test_lib';
+} from 'angular2/testing_internal';
 
 import {SpyNgControl, SpyValueAccessor} from '../spies';
 

modules/angular2/test/core/forms/form_builder_spec.ts

@@ -8,7 +8,7 @@ import {
   beforeEach,
   afterEach,
   el
-} from 'angular2/test_lib';
+} from 'angular2/testing_internal';
 import {Control, FormBuilder, Validators} from 'angular2/core';
 
 export function main() {

modules/angular2/test/core/forms/integration_spec.ts

@@ -16,7 +16,7 @@ import {
   iit,
   xit,
   browserDetection
-} from 'angular2/test_lib';
+} from 'angular2/testing_internal';
 
 import {DOM} from 'angular2/src/core/dom/dom_adapter';
 import {

modules/angular2/test/core/forms/model_spec.ts

@@ -12,7 +12,7 @@ import {
   fakeAsync,
   tick,
   inject
-} from 'angular2/test_lib';
+} from 'angular2/testing_internal';
 import {ControlGroup, Control, ControlArray, Validators} from 'angular2/core';
 import {ObservableWrapper} from 'angular2/src/core/facade/async';
 

modules/angular2/test/core/forms/validators_spec.ts

@@ -8,7 +8,7 @@ import {
   beforeEach,
   afterEach,
   el
-} from 'angular2/test_lib';
+} from 'angular2/testing_internal';
 import {ControlGroup, Control, Validators} from 'angular2/core';
 
 export function main() {

modules/angular2/test/core/forward_ref_integration_spec.ts

@@ -9,7 +9,7 @@ import {
   inject,
   it,
   xit
-} from 'angular2/test_lib';
+} from 'angular2/testing_internal';
 import {
   bind,
   provide,

modules/angular2/test/core/life_cycle/life_cycle_spec.ts

@@ -12,7 +12,7 @@ import {
   fakeAsync,
   tick,
   inject
-} from 'angular2/test_lib';
+} from 'angular2/testing_internal';
 import {SpyChangeDetector} from '../spies';
 import {LifeCycle_} from "angular2/src/core/life_cycle/life_cycle";
 

modules/angular2/test/core/linker/compiler_spec.ts

@@ -11,7 +11,7 @@ import {
   AsyncTestCompleter,
   inject,
   beforeEachBindings
-} from 'angular2/test_lib';
+} from 'angular2/testing_internal';
 
 import {Component, View, provide} from 'angular2/core';
 import {SpyProtoViewFactory} from '../spies';

modules/angular2/test/core/linker/directive_lifecycle_spec.dart

@@ -1,6 +1,6 @@
 library angular2.test.core.compiler.directive_lifecycle_spec;
 
-import 'package:angular2/test_lib.dart';
+import 'package:angular2/testing_internal.dart';
 import 'package:angular2/src/core/linker/directive_lifecycle_reflector.dart';
 import 'package:angular2/src/core/linker/interfaces.dart';
 

modules/angular2/test/core/linker/directive_lifecycle_spec.ts

@@ -11,7 +11,7 @@ import {
   it,
   SpyObject,
   proxy
-} from 'angular2/test_lib';
+} from 'angular2/testing_internal';
 
 import {hasLifecycleHook} from 'angular2/src/core/linker/directive_lifecycle_reflector';
 import {LifecycleHooks} from 'angular2/src/core/linker/interfaces';

modules/angular2/test/core/linker/directive_resolver_spec.ts

@@ -1,4 +1,4 @@
-import {ddescribe, describe, it, iit, expect, beforeEach} from 'angular2/test_lib';
+import {ddescribe, describe, it, iit, expect, beforeEach} from 'angular2/testing_internal';
 import {DirectiveResolver} from 'angular2/src/core/linker/directive_resolver';
 import {
   DirectiveMetadata,

modules/angular2/test/core/linker/dynamic_component_loader_spec.ts

@@ -14,7 +14,7 @@ import {
   xit,
   TestComponentBuilder,
   RootTestComponent
-} from 'angular2/test_lib';
+} from 'angular2/testing_internal';
 
 import {OnDestroy} from 'angular2/lifecycle_hooks';
 import {Injector, NgIf} from 'angular2/core';
@@ -24,7 +24,7 @@ import {DynamicComponentLoader} from 'angular2/src/core/linker/dynamic_component
 import {ElementRef} from 'angular2/src/core/linker/element_ref';
 import {DOCUMENT} from 'angular2/src/core/render/render';
 import {DOM} from 'angular2/src/core/dom/dom_adapter';
-import {RootTestComponent_} from "angular2/src/test_lib/test_component_builder";
+import {RootTestComponent_} from "angular2/src/testing/test_component_builder";
 
 export function main() {
   describe('DynamicComponentLoader', function() {

modules/angular2/test/core/linker/element_injector_spec.ts

@@ -14,7 +14,7 @@ import {
   AsyncTestCompleter,
   el,
   containsRegexp
-} from 'angular2/test_lib';
+} from 'angular2/testing_internal';
 import {SpyView, SpyElementRef} from '../spies';
 import {isBlank, isPresent, stringify} from 'angular2/src/core/facade/lang';
 import {

modules/angular2/test/core/linker/event_config_spec.ts

@@ -1,5 +1,5 @@
 import {EventConfig} from 'angular2/src/core/linker/event_config';
-import {ddescribe, describe, expect, it} from 'angular2/test_lib';
+import {ddescribe, describe, expect, it} from 'angular2/testing_internal';
 
 export function main() {
   describe('EventConfig', () => {

modules/angular2/test/core/linker/integration_dart_spec.dart

@@ -4,7 +4,7 @@ library angular2.test.di.integration_dart_spec;
 import 'package:angular2/angular2.dart';
 import 'package:angular2/core.dart';
 import 'package:angular2/src/core/debug.dart';
-import 'package:angular2/test_lib.dart';
+import 'package:angular2/testing_internal.dart';
 import 'package:observe/observe.dart';
 import 'package:angular2/src/core/change_detection/differs/default_iterable_differ.dart';
 import 'package:angular2/src/core/change_detection/change_detection.dart';

modules/angular2/test/core/linker/integration_spec.ts

@@ -19,7 +19,7 @@ import {
   tick,
   clearPendingTimers,
   RootTestComponent
-} from 'angular2/test_lib';
+} from 'angular2/testing_internal';
 
 
 import {DOM} from 'angular2/src/core/dom/dom_adapter';