repackaging: all the repackaging changes squashed

modules/benchpress/test/metric/multi_metric_spec.ts

@@ -1,6 +1,5 @@
 import {
   afterEach,
-  AsyncTestCompleter,
   beforeEach,
   ddescribe,
   describe,
@@ -9,11 +8,8 @@ import {
   inject,
   it,
   xit,
-} from 'angular2/testing_internal';
-
-import {ListWrapper} from 'angular2/src/facade/collection';
-import {PromiseWrapper} from 'angular2/src/facade/async';
-
+} from '@angular/core/testing';
+import {AsyncTestCompleter} from '@angular/core/testing/testing_internal';
 import {Metric, MultiMetric, bind, provide, ReflectiveInjector} from 'benchpress/common';
 
 export function main() {
@@ -23,7 +19,7 @@ export function main() {
                                 MultiMetric.createBindings(ids)
                               ])
                 .get(MultiMetric);
-    return PromiseWrapper.resolve(m);
+    return Promise.resolve(m);
   }
 
   describe('multi metric', () => {
@@ -68,12 +64,12 @@ class MockMetric extends Metric {
     this._id = id;
   }
 
-  beginMeasure(): Promise<string> { return PromiseWrapper.resolve(`${this._id}_beginMeasure`); }
+  beginMeasure(): Promise<string> { return Promise.resolve(`${this._id}_beginMeasure`); }
 
   endMeasure(restart: boolean): Promise<{[key: string]: any}> {
     var result = {};
     result[this._id] = {'restart': restart};
-    return PromiseWrapper.resolve(result);
+    return Promise.resolve(result);
   }
 
   describe(): {[key: string]: string} {

modules/benchpress/test/metric/perflog_metric_spec.ts

@@ -9,11 +9,11 @@ import {
   inject,
   it,
   xit,
-} from 'angular2/testing_internal';
+} from '@angular/testing/testing_internal';
 
-import {StringMapWrapper} from 'angular2/src/facade/collection';
-import {PromiseWrapper} from 'angular2/src/facade/async';
-import {isPresent, isBlank} from 'angular2/src/facade/lang';
+import {StringMapWrapper} from '@angular/facade';
+import {PromiseWrapper} from '@angular/facade';
+import {isPresent, isBlank} from '@angular/facade';
 
 import {
   Metric,

modules/benchpress/test/reporter/console_reporter_spec.ts

@@ -7,9 +7,9 @@ import {
   expect,
   beforeEach,
   afterEach
-} from 'angular2/testing_internal';
+} from '@angular/testing/testing_internal';
 
-import {isBlank, isPresent, Date, DateWrapper} from 'angular2/src/facade/lang';
+import {isBlank, isPresent, Date, DateWrapper} from '@angular/facade';
 
 import {
   SampleState,

modules/benchpress/test/reporter/json_file_reporter_spec.ts

@@ -9,10 +9,10 @@ import {
   inject,
   it,
   xit,
-} from 'angular2/testing_internal';
+} from '@angular/testing/testing_internal';
 
-import {DateWrapper, Json, RegExpWrapper, isPresent} from 'angular2/src/facade/lang';
-import {PromiseWrapper} from 'angular2/src/facade/async';
+import {DateWrapper, Json, RegExpWrapper, isPresent} from '@angular/facade';
+import {PromiseWrapper} from '@angular/facade';
 
 import {
   bind,

modules/benchpress/test/reporter/multi_reporter_spec.ts

@@ -9,10 +9,10 @@ import {
   inject,
   it,
   xit,
-} from 'angular2/testing_internal';
+} from '@angular/testing/testing_internal';
 
-import {PromiseWrapper} from 'angular2/src/facade/async';
-import {DateWrapper} from 'angular2/src/facade/lang';
+import {PromiseWrapper} from '@angular/facade';
+import {DateWrapper} from '@angular/facade';
 
 import {
   Reporter,

modules/benchpress/test/runner_spec.ts

@@ -9,7 +9,7 @@ import {
   inject,
   it,
   xit,
-} from 'angular2/testing_internal';
+} from '@angular/testing/testing_internal';
 import {
   Runner,
   Sampler,
@@ -24,8 +24,8 @@ import {
   WebDriverAdapter,
   SampleState
 } from 'benchpress/common';
-import {isBlank} from 'angular2/src/facade/lang';
-import {PromiseWrapper} from 'angular2/src/facade/async';
+import {isBlank} from '@angular/facade';
+import {PromiseWrapper} from '@angular/facade';
 
 export function main() {
   describe('runner', () => {

modules/benchpress/test/sampler_spec.ts

@@ -9,10 +9,10 @@ import {
   inject,
   it,
   xit,
-} from 'angular2/testing_internal';
+} from '@angular/testing/testing_internal';
 
-import {isBlank, isPresent, stringify, Date, DateWrapper} from 'angular2/src/facade/lang';
-import {PromiseWrapper} from 'angular2/src/facade/async';
+import {isBlank, isPresent, stringify, Date, DateWrapper} from '@angular/facade';
+import {PromiseWrapper} from '@angular/facade';
 
 import {
   Sampler,

modules/benchpress/test/statistic_spec.ts

@@ -7,11 +7,11 @@ import {
   expect,
   beforeEach,
   afterEach
-} from 'angular2/testing_internal';
+} from '@angular/testing/testing_internal';
 
 import {Statistic} from 'benchpress/src/statistic';
 
-import {NaN} from 'angular2/src/facade/math';
+import {NaN} from '@angular/facade';
 
 export function main() {
   describe('statistic', () => {
@@ -40,4 +40,4 @@ export function main() {
     });
 
   });
-}
+}

modules/benchpress/test/trace_event_factory.ts

@@ -1,4 +1,4 @@
-import {isPresent} from 'angular2/src/facade/lang';
+import {isPresent} from '@angular/facade';
 
 export class TraceEventFactory {
   private _cat: string;

modules/benchpress/test/validator/regression_slope_validator_spec.ts

@@ -7,9 +7,9 @@ import {
   expect,
   beforeEach,
   afterEach
-} from 'angular2/testing_internal';
-import {Date, DateWrapper} from 'angular2/src/facade/lang';
-import {ListWrapper} from 'angular2/src/facade/collection';
+} from '@angular/testing/testing_internal';
+import {Date, DateWrapper} from '@angular/facade';
+import {ListWrapper} from '@angular/facade';
 
 import {
   Validator,

modules/benchpress/test/validator/size_validator_spec.ts

@@ -7,9 +7,9 @@ import {
   expect,
   beforeEach,
   afterEach
-} from 'angular2/testing_internal';
-import {Date, DateWrapper} from 'angular2/src/facade/lang';
-import {ListWrapper} from 'angular2/src/facade/collection';
+} from '@angular/testing/testing_internal';
+import {Date, DateWrapper} from '@angular/facade';
+import {ListWrapper} from '@angular/facade';
 
 import {
   Validator,

modules/benchpress/test/web_driver_extension_spec.ts

@@ -9,10 +9,10 @@ import {
   inject,
   it,
   xit,
-} from 'angular2/testing_internal';
+} from '@angular/testing/testing_internal';
 
-import {isPresent, StringWrapper} from 'angular2/src/facade/lang';
-import {PromiseWrapper} from 'angular2/src/facade/async';
+import {isPresent, StringWrapper} from '@angular/facade';
+import {PromiseWrapper} from '@angular/facade';
 
 import {WebDriverExtension, bind, provide, ReflectiveInjector, Options} from 'benchpress/common';
 

modules/benchpress/test/webdriver/chrome_driver_extension_spec.ts

@@ -9,10 +9,10 @@ import {
   inject,
   it,
   xit,
-} from 'angular2/testing_internal';
+} from '@angular/testing/testing_internal';
 
-import {PromiseWrapper} from 'angular2/src/facade/async';
-import {Json, isBlank} from 'angular2/src/facade/lang';
+import {PromiseWrapper} from '@angular/facade';
+import {Json, isBlank} from '@angular/facade';
 
 import {
   WebDriverExtension,

modules/benchpress/test/webdriver/ios_driver_extension_spec.ts

@@ -9,10 +9,10 @@ import {
   inject,
   it,
   xit,
-} from 'angular2/testing_internal';
+} from '@angular/testing/testing_internal';
 
-import {PromiseWrapper} from 'angular2/src/facade/async';
-import {Json, isBlank, isPresent} from 'angular2/src/facade/lang';
+import {PromiseWrapper} from '@angular/facade';
+import {Json, isBlank, isPresent} from '@angular/facade';
 
 import {
   WebDriverExtension,