repackaging: all the repackaging changes squashed
This commit is contained in:
@ -1,4 +1,4 @@
|
||||
import {bind, provide} from 'angular2/src/core/di';
|
||||
import {bind, provide} from '@angular/core/src/di';
|
||||
import {Options} from './common';
|
||||
|
||||
export * from './common';
|
||||
|
@ -19,4 +19,4 @@ export {MeasureValues} from './src/measure_values';
|
||||
export {MultiMetric} from './src/metric/multi_metric';
|
||||
export {MultiReporter} from './src/reporter/multi_reporter';
|
||||
|
||||
export {bind, provide, Injector, ReflectiveInjector, OpaqueToken} from 'angular2/src/core/di';
|
||||
export {bind, provide, Injector, ReflectiveInjector, OpaqueToken} from '@angular/core/src/di';
|
||||
|
@ -1,5 +1,5 @@
|
||||
import {bind, provide, Provider, OpaqueToken} from 'angular2/src/core/di';
|
||||
import {DateWrapper} from 'angular2/src/facade/lang';
|
||||
import {bind, provide, Provider, OpaqueToken} from '@angular/core/src/di';
|
||||
import {DateWrapper} from '@angular/facade';
|
||||
|
||||
export class Options {
|
||||
static get DEFAULT_PROVIDERS(): Provider[] { return _DEFAULT_PROVIDERS; }
|
||||
|
@ -1,5 +1,5 @@
|
||||
import {Date, DateWrapper} from 'angular2/src/facade/lang';
|
||||
import {Map} from 'angular2/src/facade/collection';
|
||||
import {Date, DateWrapper} from '@angular/facade';
|
||||
import {Map} from '@angular/facade';
|
||||
|
||||
export class MeasureValues {
|
||||
constructor(public runIndex: number, public timeStamp: Date,
|
||||
|
@ -1,5 +1,5 @@
|
||||
import {bind, provide, Provider} from 'angular2/src/core/di';
|
||||
import {BaseException, WrappedException} from 'angular2/src/facade/exceptions';
|
||||
import {bind, provide, Provider} from '@angular/core/src/di';
|
||||
import {BaseException, WrappedException} from '@angular/facade';
|
||||
|
||||
/**
|
||||
* A metric is measures values
|
||||
|
@ -1,6 +1,6 @@
|
||||
import {bind, provide, Binding, Provider, Injector, OpaqueToken} from 'angular2/src/core/di';
|
||||
import {StringMapWrapper} from 'angular2/src/facade/collection';
|
||||
import {PromiseWrapper} from 'angular2/src/facade/async';
|
||||
import {bind, provide, Binding, Provider, Injector, OpaqueToken} from '@angular/core/src/di';
|
||||
import {StringMapWrapper} from '@angular/facade';
|
||||
import {PromiseWrapper} from '@angular/facade';
|
||||
|
||||
import {Metric} from '../metric';
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
import {PromiseWrapper, TimerWrapper} from 'angular2/src/facade/async';
|
||||
import {PromiseWrapper, TimerWrapper} from '@angular/facade';
|
||||
import {
|
||||
isPresent,
|
||||
isBlank,
|
||||
@ -6,10 +6,10 @@ import {
|
||||
Math,
|
||||
RegExpWrapper,
|
||||
NumberWrapper
|
||||
} from 'angular2/src/facade/lang';
|
||||
import {BaseException, WrappedException} from 'angular2/src/facade/exceptions';
|
||||
import {ListWrapper, StringMapWrapper} from 'angular2/src/facade/collection';
|
||||
import {bind, provide, Provider, OpaqueToken} from 'angular2/src/core/di';
|
||||
} from '@angular/facade';
|
||||
import {BaseException, WrappedException} from '@angular/facade';
|
||||
import {ListWrapper, StringMapWrapper} from '@angular/facade';
|
||||
import {bind, provide, Provider, OpaqueToken} from '@angular/core/src/di';
|
||||
|
||||
import {WebDriverExtension, PerfLogFeatures} from '../web_driver_extension';
|
||||
import {Metric} from '../metric';
|
||||
|
@ -1,5 +1,5 @@
|
||||
import {bind, provide, Provider} from 'angular2/src/core/di';
|
||||
import {BaseException, WrappedException} from 'angular2/src/facade/exceptions';
|
||||
import {bind, provide, Provider} from '@angular/core/src/di';
|
||||
import {BaseException, WrappedException} from '@angular/facade';
|
||||
import {MeasureValues} from './measure_values';
|
||||
|
||||
/**
|
||||
|
@ -1,8 +1,8 @@
|
||||
import {print, isPresent, isBlank, NumberWrapper} from 'angular2/src/facade/lang';
|
||||
import {StringMapWrapper, ListWrapper} from 'angular2/src/facade/collection';
|
||||
import {PromiseWrapper} from 'angular2/src/facade/async';
|
||||
import {Math} from 'angular2/src/facade/math';
|
||||
import {bind, provide, Provider, OpaqueToken} from 'angular2/src/core/di';
|
||||
import {print, isPresent, isBlank, NumberWrapper} from '@angular/facade';
|
||||
import {StringMapWrapper, ListWrapper} from '@angular/facade';
|
||||
import {PromiseWrapper} from '@angular/facade';
|
||||
import {Math} from '@angular/facade';
|
||||
import {bind, provide, Provider, OpaqueToken} from '@angular/core/src/di';
|
||||
|
||||
import {Statistic} from '../statistic';
|
||||
import {Reporter} from '../reporter';
|
||||
|
@ -1,7 +1,7 @@
|
||||
import {DateWrapper, isPresent, isBlank, Json} from 'angular2/src/facade/lang';
|
||||
import {PromiseWrapper} from 'angular2/src/facade/async';
|
||||
import {DateWrapper, isPresent, isBlank, Json} from '@angular/facade';
|
||||
import {PromiseWrapper} from '@angular/facade';
|
||||
|
||||
import {bind, provide, Provider, OpaqueToken} from 'angular2/src/core/di';
|
||||
import {bind, provide, Provider, OpaqueToken} from '@angular/core/src/di';
|
||||
|
||||
import {Reporter} from '../reporter';
|
||||
import {SampleDescription} from '../sample_description';
|
||||
|
@ -1,5 +1,5 @@
|
||||
import {bind, provide, Provider, Injector, OpaqueToken} from 'angular2/src/core/di';
|
||||
import {PromiseWrapper} from 'angular2/src/facade/async';
|
||||
import {bind, provide, Provider, Injector, OpaqueToken} from '@angular/core/src/di';
|
||||
import {PromiseWrapper} from '@angular/facade';
|
||||
|
||||
import {MeasureValues} from '../measure_values';
|
||||
import {Reporter} from '../reporter';
|
||||
|
@ -1,6 +1,6 @@
|
||||
import {Injector, bind, provide, Provider, ReflectiveInjector} from 'angular2/src/core/di';
|
||||
import {isPresent, isBlank} from 'angular2/src/facade/lang';
|
||||
import {PromiseWrapper} from 'angular2/src/facade/async';
|
||||
import {Injector, bind, provide, Provider, ReflectiveInjector} from '@angular/core';
|
||||
import {isPresent, isBlank} from '@angular/facade';
|
||||
import {PromiseWrapper} from '@angular/facade';
|
||||
|
||||
import {Sampler, SampleState} from './sampler';
|
||||
import {ConsoleReporter} from './reporter/console_reporter';
|
||||
|
@ -1,5 +1,5 @@
|
||||
import {StringMapWrapper} from 'angular2/src/facade/collection';
|
||||
import {bind, provide, Provider, OpaqueToken} from 'angular2/src/core/di';
|
||||
import {StringMapWrapper} from '@angular/facade';
|
||||
import {bind, provide, Provider, OpaqueToken} from '@angular/core/src/di';
|
||||
import {Validator} from './validator';
|
||||
import {Metric} from './metric';
|
||||
import {Options} from './common_options';
|
||||
|
@ -1,6 +1,6 @@
|
||||
import {isPresent, isBlank, Date, DateWrapper} from 'angular2/src/facade/lang';
|
||||
import {PromiseWrapper} from 'angular2/src/facade/async';
|
||||
import {bind, provide, Provider, OpaqueToken} from 'angular2/src/core/di';
|
||||
import {isPresent, isBlank, Date, DateWrapper} from '@angular/facade';
|
||||
import {PromiseWrapper} from '@angular/facade';
|
||||
import {bind, provide, Provider, OpaqueToken} from '@angular/core/src/di';
|
||||
|
||||
import {Metric} from './metric';
|
||||
import {Validator} from './validator';
|
||||
|
@ -1,4 +1,4 @@
|
||||
import {Math} from 'angular2/src/facade/math';
|
||||
import {Math} from '@angular/facade';
|
||||
|
||||
export class Statistic {
|
||||
static calculateCoefficientOfVariation(sample, mean) {
|
||||
|
@ -1,5 +1,5 @@
|
||||
import {bind, provide, Provider} from 'angular2/src/core/di';
|
||||
import {BaseException, WrappedException} from 'angular2/src/facade/exceptions';
|
||||
import {bind, provide, Provider} from '@angular/core/src/di';
|
||||
import {BaseException, WrappedException} from '@angular/facade';
|
||||
|
||||
import {MeasureValues} from './measure_values';
|
||||
|
||||
|
@ -1,5 +1,5 @@
|
||||
import {ListWrapper} from 'angular2/src/facade/collection';
|
||||
import {bind, provide, Provider, OpaqueToken} from 'angular2/src/core/di';
|
||||
import {ListWrapper} from '@angular/facade';
|
||||
import {bind, provide, Provider, OpaqueToken} from '@angular/core/src/di';
|
||||
|
||||
import {Validator} from '../validator';
|
||||
import {Statistic} from '../statistic';
|
||||
|
@ -1,5 +1,5 @@
|
||||
import {ListWrapper} from 'angular2/src/facade/collection';
|
||||
import {bind, provide, Provider, OpaqueToken} from 'angular2/src/core/di';
|
||||
import {ListWrapper} from '@angular/facade';
|
||||
import {bind, provide, Provider, OpaqueToken} from '@angular/core/src/di';
|
||||
|
||||
import {Validator} from '../validator';
|
||||
import {MeasureValues} from '../measure_values';
|
||||
|
@ -1,6 +1,6 @@
|
||||
import {bind, provide, Provider} from 'angular2/src/core/di';
|
||||
import {BaseException, WrappedException} from 'angular2/src/facade/exceptions';
|
||||
import {Map} from 'angular2/src/facade/collection';
|
||||
import {bind, provide, Provider} from '@angular/core/src/di';
|
||||
import {BaseException, WrappedException} from '@angular/facade';
|
||||
import {Map} from '@angular/facade';
|
||||
|
||||
/**
|
||||
* A WebDriverAdapter bridges API differences between different WebDriver clients,
|
||||
|
@ -1,7 +1,7 @@
|
||||
import {bind, provide, Provider, Injector, OpaqueToken} from 'angular2/src/core/di';
|
||||
import {bind, provide, Provider, Injector, OpaqueToken} from '@angular/core/src/di';
|
||||
|
||||
import {isBlank, isPresent} from 'angular2/src/facade/lang';
|
||||
import {BaseException, WrappedException} from 'angular2/src/facade/exceptions';
|
||||
import {isBlank, isPresent} from '@angular/facade';
|
||||
import {BaseException, WrappedException} from '@angular/facade';
|
||||
|
||||
import {Options} from './common_options';
|
||||
|
||||
|
@ -1,5 +1,5 @@
|
||||
import {bind, provide, Provider} from 'angular2/src/core/di';
|
||||
import {ListWrapper, StringMapWrapper} from 'angular2/src/facade/collection';
|
||||
import {bind, provide, Provider} from '@angular/core/src/di';
|
||||
import {ListWrapper, StringMapWrapper} from '@angular/facade';
|
||||
import {
|
||||
Json,
|
||||
isPresent,
|
||||
@ -7,8 +7,8 @@ import {
|
||||
RegExpWrapper,
|
||||
StringWrapper,
|
||||
NumberWrapper
|
||||
} from 'angular2/src/facade/lang';
|
||||
import {BaseException, WrappedException} from 'angular2/src/facade/exceptions';
|
||||
} from '@angular/facade';
|
||||
import {BaseException, WrappedException} from '@angular/facade';
|
||||
|
||||
import {WebDriverExtension, PerfLogFeatures} from '../web_driver_extension';
|
||||
import {WebDriverAdapter} from '../web_driver_adapter';
|
||||
|
@ -1,5 +1,5 @@
|
||||
import {bind, provide, Provider} from 'angular2/src/core/di';
|
||||
import {isPresent, StringWrapper} from 'angular2/src/facade/lang';
|
||||
import {bind, provide, Provider} from '@angular/core/src/di';
|
||||
import {isPresent, StringWrapper} from '@angular/facade';
|
||||
import {WebDriverExtension, PerfLogFeatures} from '../web_driver_extension';
|
||||
import {WebDriverAdapter} from '../web_driver_adapter';
|
||||
|
||||
|
@ -1,6 +1,6 @@
|
||||
import {bind, provide, Provider} from 'angular2/src/core/di';
|
||||
import {Json, isPresent, isBlank, RegExpWrapper, StringWrapper} from 'angular2/src/facade/lang';
|
||||
import {BaseException, WrappedException} from 'angular2/src/facade/exceptions';
|
||||
import {bind, provide, Provider} from '@angular/core/src/di';
|
||||
import {Json, isPresent, isBlank, RegExpWrapper, StringWrapper} from '@angular/facade';
|
||||
import {BaseException, WrappedException} from '@angular/facade';
|
||||
|
||||
import {WebDriverExtension, PerfLogFeatures} from '../web_driver_extension';
|
||||
import {WebDriverAdapter} from '../web_driver_adapter';
|
||||
|
@ -1,5 +1,5 @@
|
||||
import {PromiseWrapper} from 'angular2/src/facade/async';
|
||||
import {bind, provide, Provider} from 'angular2/src/core/di';
|
||||
import {PromiseWrapper} from '@angular/facade';
|
||||
import {bind, provide, Provider} from '@angular/core/src/di';
|
||||
import {WebDriverAdapter} from '../web_driver_adapter';
|
||||
|
||||
import * as webdriver from 'selenium-webdriver';
|
||||
|
@ -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} {
|
||||
|
@ -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,
|
||||
|
@ -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,
|
||||
|
@ -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,
|
||||
|
@ -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,
|
||||
|
@ -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', () => {
|
||||
|
@ -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,
|
||||
|
@ -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() {
|
||||
});
|
||||
|
||||
});
|
||||
}
|
||||
}
|
||||
|
@ -1,4 +1,4 @@
|
||||
import {isPresent} from 'angular2/src/facade/lang';
|
||||
import {isPresent} from '@angular/facade';
|
||||
|
||||
export class TraceEventFactory {
|
||||
private _cat: string;
|
||||
|
@ -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,
|
||||
|
@ -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,
|
||||
|
@ -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';
|
||||
|
||||
|
@ -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,
|
||||
|
@ -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,
|
||||
|
Reference in New Issue
Block a user