cargdev/angular
1
0
Fork 0
Code Issues 16 Pull Requests Actions Packages Projects Releases Wiki Activity

chore(facade): remove most facade/async functions

Browse Source
This commit is contained in:
Jason Choi
2016-08-02 15:53:34 -07:00
committed by Alex Rickabaugh
parent 6baf3baedd
commit 99989f5d3f
184 changed files with 1609 additions and 1698 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
modules/benchpress/src/metric/multi_metric.ts
View File

@ -7,7 +7,6 @@
*/
import {Injector, OpaqueToken} from '@angular/core/src/di';
import {PromiseWrapper} from '@angular/facade/src/async';
import {StringMapWrapper} from '@angular/facade/src/collection';
import {Metric} from '../metric';
@ -30,7 +29,7 @@ export class MultiMetric extends Metric {
* Starts measuring
*/
beginMeasure(): Promise<any> {
return PromiseWrapper.all(this._metrics.map(metric => metric.beginMeasure()));
return Promise.all(this._metrics.map(metric => metric.beginMeasure()));
}
/**
@ -39,8 +38,8 @@ export class MultiMetric extends Metric {
* @param restart: Whether to restart right after this.
*/
endMeasure(restart: boolean): Promise<{[key: string]: any}> {
return PromiseWrapper.all(this._metrics.map(metric => metric.endMeasure(restart)))
.then(values => mergeStringMaps(values));
return Promise.all(this._metrics.map(metric => metric.endMeasure(restart)))
.then(values => mergeStringMaps(<any>values));
}
/**
@ -52,7 +51,7 @@ export class MultiMetric extends Metric {
}
}
function mergeStringMaps(maps: {[key: string]: string}[]): Object {
function mergeStringMaps(maps: {[key: string]: string}[]): {[key: string]: string} {
var result = {};
maps.forEach(
map => { StringMapWrapper.forEach(map, (value, prop) => { result[prop] = value; }); });

13
modules/benchpress/src/metric/perflog_metric.ts
View File

@ -7,7 +7,6 @@
*/
import {OpaqueToken} from '@angular/core/src/di';
import {PromiseWrapper, TimerWrapper} from '@angular/facade/src/async';
import {ListWrapper, StringMapWrapper} from '@angular/facade/src/collection';
import {BaseException, WrappedException} from '@angular/facade/src/exceptions';
import {Math, NumberWrapper, StringWrapper, isBlank, isPresent} from '@angular/facade/src/lang';
@ -110,7 +109,7 @@ export class PerflogMetric extends Metric {
}
beginMeasure(): Promise<any> {
var resultPromise = PromiseWrapper.resolve(null);
var resultPromise = Promise.resolve(null);
if (this._forceGc) {
resultPromise = resultPromise.then((_) => this._driverExtension.gc());
}
@ -167,10 +166,10 @@ export class PerflogMetric extends Metric {
this._remainingEvents = events;
return result;
}
var completer = PromiseWrapper.completer();
this._setTimeout(
() => completer.resolve(this._readUntilEndMark(markName, loopCount + 1)), 100);
return completer.promise;
var resolve: (result: any) => void;
var promise = new Promise(res => { resolve = res; });
this._setTimeout(() => resolve(this._readUntilEndMark(markName, loopCount + 1)), 100);
return promise;
});
}
@ -402,5 +401,5 @@ var _PROVIDERS = [
Options.CAPTURE_FRAMES, Options.RECEIVED_DATA, Options.REQUEST_COUNT
]
},
{provide: _SET_TIMEOUT, useValue: (fn, millis) => TimerWrapper.setTimeout(fn, millis)}
{provide: _SET_TIMEOUT, useValue: (fn, millis) => <any>setTimeout(fn, millis)}
];

24
modules/benchpress/src/metric/user_metric.ts
View File

@ -7,7 +7,6 @@
*/
import {OpaqueToken, Provider, bind} from '@angular/core';
import {PromiseWrapper, TimerWrapper} from '@angular/facade/src/async';
import {StringMapWrapper} from '@angular/facade/src/collection';
import {isNumber} from '@angular/facade/src/lang';
@ -26,35 +25,40 @@ export class UserMetric extends Metric {
/**
* Starts measuring
*/
beginMeasure(): Promise<any> { return PromiseWrapper.resolve(true); }
beginMeasure(): Promise<any> { return Promise.resolve(true); }
/**
* Ends measuring.
*/
endMeasure(restart: boolean): Promise<{[key: string]: any}> {
let completer = PromiseWrapper.completer<{[key: string]: any}>();
let resolve: (result: any) => void;
let reject: (error: any) => void;
let promise = new Promise((res, rej) => {
resolve = res;
reject = rej;
});
let adapter = this._wdAdapter;
let names = StringMapWrapper.keys(this._userMetrics);
function getAndClearValues() {
PromiseWrapper.all(names.map(name => adapter.executeScript(`return window.${name}`)))
Promise.all(names.map(name => adapter.executeScript(`return window.${name}`)))
.then((values: any[]) => {
if (values.every(isNumber)) {
PromiseWrapper.all(names.map(name => adapter.executeScript(`delete window.${name}`)))
Promise.all(names.map(name => adapter.executeScript(`delete window.${name}`)))
.then((_: any[]) => {
let map = StringMapWrapper.create();
for (let i = 0, n = names.length; i < n; i++) {
StringMapWrapper.set(map, names[i], values[i]);
}
completer.resolve(map);
}, completer.reject);
resolve(map);
}, reject);
} else {
TimerWrapper.setTimeout(getAndClearValues, 100);
<any>setTimeout(getAndClearValues, 100);
}
}, completer.reject);
}, reject);
}
getAndClearValues();
return completer.promise;
return promise;
}
/**

5
modules/benchpress/src/reporter/console_reporter.ts
View File

@ -7,7 +7,6 @@
*/
import {OpaqueToken} from '@angular/core/src/di';
import {PromiseWrapper} from '@angular/facade/src/async';
import {ListWrapper, StringMapWrapper} from '@angular/facade/src/collection';
import {NumberWrapper, isBlank, isPresent, print} from '@angular/facade/src/lang';
import {Math} from '@angular/facade/src/math';
@ -80,7 +79,7 @@ export class ConsoleReporter extends Reporter {
return ConsoleReporter._formatNum(value);
});
this._printStringRow(formattedValues);
return PromiseWrapper.resolve(null);
return Promise.resolve(null);
}
reportSample(completeSample: MeasureValues[], validSamples: MeasureValues[]): Promise<any> {
@ -94,7 +93,7 @@ export class ConsoleReporter extends Reporter {
// hickups for consoles...
return NumberWrapper.isNaN(cv) ? formattedMean : `${formattedMean}+-${Math.floor(cv)}%`;
}));
return PromiseWrapper.resolve(null);
return Promise.resolve(null);
}
/** @internal */

5
modules/benchpress/src/reporter/json_file_reporter.ts
View File

@ -7,7 +7,6 @@
*/
import {OpaqueToken} from '@angular/core/src/di';
import {PromiseWrapper} from '@angular/facade/src/async';
import {DateWrapper, Json, isBlank, isPresent} from '@angular/facade/src/lang';
import {Options} from '../common_options';
@ -42,9 +41,7 @@ export class JsonFileReporter extends Reporter {
this._now = now;
}
reportMeasureValues(measureValues: MeasureValues): Promise<any> {
return PromiseWrapper.resolve(null);
}
reportMeasureValues(measureValues: MeasureValues): Promise<any> { return Promise.resolve(null); }
reportSample(completeSample: MeasureValues[], validSample: MeasureValues[]): Promise<any> {
var content = Json.stringify({

6
modules/benchpress/src/reporter/multi_reporter.ts
View File

@ -7,7 +7,6 @@
*/
import {Injector, OpaqueToken} from '@angular/core/src/di';
import {PromiseWrapper} from '@angular/facade/src/async';
import {MeasureValues} from '../measure_values';
import {Reporter} from '../reporter';
@ -37,12 +36,11 @@ export class MultiReporter extends Reporter {
}
reportMeasureValues(values: MeasureValues): Promise<any[]> {
return PromiseWrapper.all(
this._reporters.map(reporter => reporter.reportMeasureValues(values)));
return Promise.all(this._reporters.map(reporter => reporter.reportMeasureValues(values)));
}
reportSample(completeSample: MeasureValues[], validSample: MeasureValues[]): Promise<any[]> {
return PromiseWrapper.all(
return Promise.all(
this._reporters.map(reporter => reporter.reportSample(completeSample, validSample)));
}
}

3
modules/benchpress/src/runner.ts
View File

@ -7,7 +7,6 @@
*/
import {ReflectiveInjector} from '@angular/core';
import {PromiseWrapper} from '@angular/facade/src/async';
import {isBlank, isPresent} from '@angular/facade/src/lang';
import {Options} from './common_options';
@ -71,7 +70,7 @@ export class Runner {
var inj = ReflectiveInjector.resolveAndCreate(sampleProviders);
var adapter = inj.get(WebDriverAdapter);
return PromiseWrapper
return Promise
.all([adapter.capabilities(), adapter.executeScript('return window.navigator.userAgent;')])
.then((args) => {
var capabilities = args[0];

3
modules/benchpress/src/sampler.ts
View File

@ -6,7 +6,6 @@
* found in the LICENSE file at https://angular.io/license
*/
import {PromiseWrapper} from '@angular/facade/src/async';
import {Date, DateWrapper, isBlank, isPresent} from '@angular/facade/src/lang';
import {Options} from './common_options';
@ -82,7 +81,7 @@ export class Sampler {
if (isPresent(this._prepare)) {
resultPromise = this._driver.waitFor(this._prepare);
} else {
resultPromise = PromiseWrapper.resolve(null);
resultPromise = Promise.resolve(null);
}
if (isPresent(this._prepare) || lastState.completeSample.length === 0) {
resultPromise = resultPromise.then((_) => this._metric.beginMeasure());

13
modules/benchpress/src/webdriver/selenium_webdriver_adapter.ts
View File

@ -6,12 +6,12 @@
* found in the LICENSE file at https://angular.io/license
*/
import {PromiseWrapper} from '@angular/facade/src/async';
import * as webdriver from 'selenium-webdriver';
import {WebDriverAdapter} from '../web_driver_adapter';
/**
* Adapter for the selenium-webdriver.
*/
@ -22,13 +22,18 @@ export class SeleniumWebDriverAdapter extends WebDriverAdapter {
/** @internal */
private _convertPromise(thenable) {
var completer = PromiseWrapper.completer();
var resolve: (result: any) => void;
var reject: (error: any) => void;
var promise = new Promise((res, rej) => {
resolve = res;
reject = rej;
});
thenable.then(
// selenium-webdriver uses an own Node.js context,
// so we need to convert data into objects of this context.
// Previously needed for rtts_asserts.
(data) => completer.resolve(convertToLocalProcess(data)), completer.reject);
return completer.promise;
(data) => resolve(convertToLocalProcess(data)), reject);
return promise;
}
waitFor(callback): Promise<any> {

51
modules/benchpress/test/metric/perflog_metric_spec.ts
View File

@ -7,7 +7,6 @@
*/
import {AsyncTestCompleter, afterEach, beforeEach, ddescribe, describe, expect, iit, inject, it, xit} from '@angular/core/testing/testing_internal';
import {PromiseWrapper} from '@angular/facade/src/async';
import {StringMapWrapper} from '@angular/facade/src/collection';
import {isBlank, isPresent} from '@angular/facade/src/lang';
import {Metric, Options, PerfLogFeatures, PerflogMetric, ReflectiveInjector, WebDriverExtension} from 'benchpress/common';
@ -320,11 +319,11 @@ export function main() {
}));
it('should throw if no start event', inject([AsyncTestCompleter], (async) => {
PromiseWrapper.catchError(
aggregate(
[eventFactory.instant('frame', 4), eventFactory.markEnd('frameCapture', 5)],
{captureFrames: true}),
(err): any => {
aggregate(
[eventFactory.instant('frame', 4), eventFactory.markEnd('frameCapture', 5)],
{captureFrames: true})
.catch((err): any => {
expect(() => {
throw err;
}).toThrowError('missing start event for frame capture');
@ -333,25 +332,25 @@ export function main() {
}));
it('should throw if no end event', inject([AsyncTestCompleter], (async) => {
PromiseWrapper.catchError(
aggregate(
[eventFactory.markStart('frameCapture', 3), eventFactory.instant('frame', 4)],
{captureFrames: true}),
(err): any => {
aggregate(
[eventFactory.markStart('frameCapture', 3), eventFactory.instant('frame', 4)],
{captureFrames: true})
.catch((err): any => {
expect(() => { throw err; }).toThrowError('missing end event for frame capture');
async.done();
});
}));
it('should throw if trying to capture twice', inject([AsyncTestCompleter], (async) => {
PromiseWrapper.catchError(
aggregate(
[
eventFactory.markStart('frameCapture', 3),
eventFactory.markStart('frameCapture', 4)
],
{captureFrames: true}),
(err): any => {
aggregate(
[
eventFactory.markStart('frameCapture', 3),
eventFactory.markStart('frameCapture', 4)
],
{captureFrames: true})
.catch((err): any => {
expect(() => {
throw err;
}).toThrowError('can capture frames only once per benchmark run');
@ -361,7 +360,7 @@ export function main() {
it('should throw if trying to capture when frame capture is disabled',
inject([AsyncTestCompleter], (async) => {
PromiseWrapper.catchError(aggregate([eventFactory.markStart('frameCapture', 3)]), (err) => {
aggregate([eventFactory.markStart('frameCapture', 3)]).catch((err) => {
expect(() => { throw err; })
.toThrowError(
'found start event for frame capture, but frame capture was not requested in benchpress');
@ -372,7 +371,7 @@ export function main() {
it('should throw if frame capture is enabled, but nothing is captured',
inject([AsyncTestCompleter], (async) => {
PromiseWrapper.catchError(aggregate([], {captureFrames: true}), (err): any => {
aggregate([], {captureFrames: true}).catch((err): any => {
expect(() => { throw err; })
.toThrowError(
'frame capture requested in benchpress, but no start event was found');
@ -638,12 +637,12 @@ class MockDriverExtension extends WebDriverExtension {
timeBegin(name): Promise<any> {
this._commandLog.push(['timeBegin', name]);
return PromiseWrapper.resolve(null);
return Promise.resolve(null);
}
timeEnd(name, restartName): Promise<any> {
this._commandLog.push(['timeEnd', name, restartName]);
return PromiseWrapper.resolve(null);
return Promise.resolve(null);
}
perfLogFeatures(): PerfLogFeatures { return this._perfLogFeatures; }
@ -653,14 +652,14 @@ class MockDriverExtension extends WebDriverExtension {
if (this._perfLogs.length > 0) {
var next = this._perfLogs[0];
this._perfLogs.shift();
return PromiseWrapper.resolve(next);
return Promise.resolve(next);
} else {
return PromiseWrapper.resolve([]);
return Promise.resolve([]);
}
}
gc(): Promise<any> {
this._commandLog.push(['gc']);
return PromiseWrapper.resolve(null);
return Promise.resolve(null);
}
}

9
modules/benchpress/test/metric/user_metric_spec.ts
View File

@ -8,7 +8,6 @@
import {ReflectiveInjector} from '@angular/core';
import {AsyncTestCompleter, afterEach, beforeEach, ddescribe, describe, expect, iit, inject, it, xit} from '@angular/core/testing/testing_internal';
import {PromiseWrapper, TimerWrapper} from '@angular/facade/src/async';
import {StringMapWrapper} from '@angular/facade/src/collection';
import {Json, isBlank, isPresent} from '@angular/facade/src/lang';
import {Injector, Metric, MultiMetric, Options, PerfLogFeatures, PerflogMetric, UserMetric, WebDriverAdapter, WebDriverExtension, bind, provide} from 'benchpress/common';
@ -60,7 +59,7 @@ export function main() {
wdAdapter.data['loadTime'] = 25;
// Wait before setting 2nd property.
TimerWrapper.setTimeout(() => { wdAdapter.data['content'] = 250; }, 50);
setTimeout(() => { wdAdapter.data['content'] = 250; }, 50);
}), 600);
});
@ -74,11 +73,11 @@ class MockDriverAdapter extends WebDriverAdapter {
// Just handles `return window.propName` ignores `delete window.propName`.
if (script.indexOf('return window.') == 0) {
let metricName = script.substring('return window.'.length);
return PromiseWrapper.resolve(this.data[metricName]);
return Promise.resolve(this.data[metricName]);
} else if (script.indexOf('delete window.') == 0) {
return PromiseWrapper.resolve(null);
return Promise.resolve(null);
} else {
return PromiseWrapper.reject(`Unexpected syntax: ${script}`, null);
return Promise.reject(`Unexpected syntax: ${script}`);
}
}
}

3
modules/benchpress/test/reporter/json_file_reporter_spec.ts
View File

@ -7,7 +7,6 @@
*/
import {AsyncTestCompleter, afterEach, beforeEach, ddescribe, describe, expect, iit, inject, it, xit} from '@angular/core/testing/testing_internal';
import {PromiseWrapper} from '@angular/facade/src/async';
import {DateWrapper, Json, isPresent} from '@angular/facade/src/lang';
import {MeasureValues, Options, ReflectiveInjector, SampleDescription} from 'benchpress/common';
import {JsonFileReporter} from 'benchpress/src/reporter/json_file_reporter';
@ -27,7 +26,7 @@ export function main() {
provide: Options.WRITE_FILE,
useValue: (filename, content) => {
loggedFile = {'filename': filename, 'content': content};
return PromiseWrapper.resolve(null);
return Promise.resolve(null);
}
}
];

7
modules/benchpress/test/reporter/multi_reporter_spec.ts
View File

@ -7,7 +7,6 @@
*/
import {AsyncTestCompleter, afterEach, beforeEach, ddescribe, describe, expect, iit, inject, it, xit} from '@angular/core/testing/testing_internal';
import {PromiseWrapper} from '@angular/facade/src/async';
import {DateWrapper} from '@angular/facade/src/lang';
import {MeasureValues, MultiReporter, ReflectiveInjector, Reporter} from 'benchpress/common';
@ -19,7 +18,7 @@ export function main() {
MultiReporter.createBindings(ids)
])
.get(MultiReporter);
return PromiseWrapper.resolve(r);
return Promise.resolve(r);
}
describe('multi reporter', () => {
@ -58,12 +57,12 @@ class MockReporter extends Reporter {
constructor(private _id: string) { super(); }
reportMeasureValues(values: MeasureValues): Promise<{[key: string]: any}> {
return PromiseWrapper.resolve({'id': this._id, 'values': values});
return Promise.resolve({'id': this._id, 'values': values});
}
reportSample(completeSample: MeasureValues[], validSample: MeasureValues[]):
Promise<{[key: string]: any}> {
return PromiseWrapper.resolve(
return Promise.resolve(
{'id': this._id, 'completeSample': completeSample, 'validSample': validSample});
}
}

5
modules/benchpress/test/runner_spec.ts
View File

@ -7,7 +7,6 @@
*/
import {AsyncTestCompleter, afterEach, beforeEach, ddescribe, describe, expect, iit, inject, it, xit} from '@angular/core/testing/testing_internal';
import {PromiseWrapper} from '@angular/facade/src/async';
import {isBlank} from '@angular/facade/src/lang';
import {Injector, Metric, Options, ReflectiveInjector, Runner, SampleDescription, SampleState, Sampler, Validator, WebDriverAdapter} from 'benchpress/common';
@ -115,7 +114,7 @@ export function main() {
}
class MockWebDriverAdapter extends WebDriverAdapter {
executeScript(script): Promise<string> { return PromiseWrapper.resolve('someUserAgent'); }
executeScript(script): Promise<string> { return Promise.resolve('someUserAgent'); }
capabilities() { return null; }
}
@ -131,5 +130,5 @@ class MockMetric extends Metric {
class MockSampler extends Sampler {
constructor() { super(); }
sample(): Promise<SampleState> { return PromiseWrapper.resolve(new SampleState([], [])); }
sample(): Promise<SampleState> { return Promise.resolve(new SampleState([], [])); }
}

15
modules/benchpress/test/sampler_spec.ts
View File

@ -7,7 +7,6 @@
*/
import {AsyncTestCompleter, afterEach, beforeEach, ddescribe, describe, expect, iit, inject, it, xit} from '@angular/core/testing/testing_internal';
import {PromiseWrapper} from '@angular/facade/src/async';
import {Date, DateWrapper, isBlank, isPresent, stringify} from '@angular/facade/src/lang';
import {MeasureValues, Metric, Options, ReflectiveInjector, Reporter, Sampler, Validator, WebDriverAdapter} from 'benchpress/common';
@ -55,7 +54,7 @@ export function main() {
var driver = new MockDriverAdapter([], (callback) => {
var result = callback();
log.push(result);
return PromiseWrapper.resolve(result);
return Promise.resolve(result);
});
createSampler({
driver: driver,
@ -127,7 +126,7 @@ export function main() {
metric: new MockMetric(
[],
() => {
var result = PromiseWrapper.resolve({'script': scriptTime});
var result = Promise.resolve({'script': scriptTime});
scriptTime = 0;
return result;
}),
@ -238,7 +237,7 @@ class MockDriverAdapter extends WebDriverAdapter {
if (isPresent(this._waitFor)) {
return this._waitFor(callback);
} else {
return PromiseWrapper.resolve(callback());
return Promise.resolve(callback());
}
}
}
@ -273,12 +272,12 @@ class MockMetric extends Metric {
}
beginMeasure() {
this._log.push(['beginMeasure']);
return PromiseWrapper.resolve(null);
return Promise.resolve(null);
}
endMeasure(restart) {
var measureValues = isPresent(this._endMeasure) ? this._endMeasure() : {};
this._log.push(['endMeasure', restart, measureValues]);
return PromiseWrapper.resolve(measureValues);
return Promise.resolve(measureValues);
}
}
@ -294,10 +293,10 @@ class MockReporter extends Reporter {
}
reportMeasureValues(values): Promise<any> {
this._log.push(['reportMeasureValues', values]);
return PromiseWrapper.resolve(null);
return Promise.resolve(null);
}
reportSample(completeSample, validSample): Promise<any> {
this._log.push(['reportSample', completeSample, validSample]);
return PromiseWrapper.resolve(null);
return Promise.resolve(null);
}
}

21
modules/benchpress/test/web_driver_extension_spec.ts
View File

@ -7,19 +7,22 @@
*/
import {AsyncTestCompleter, afterEach, beforeEach, ddescribe, describe, expect, iit, inject, it, xit} from '@angular/core/testing/testing_internal';
import {PromiseWrapper} from '@angular/facade/src/async';
import {StringWrapper, isPresent} from '@angular/facade/src/lang';
import {Options, ReflectiveInjector, WebDriverExtension} from 'benchpress/common';
export function main() {
function createExtension(ids: any[], caps) {
return PromiseWrapper.wrap(() => {
return ReflectiveInjector
.resolveAndCreate([
ids.map((id) => { return {provide: id, useValue: new MockExtension(id)}; }),
{provide: Options.CAPABILITIES, useValue: caps}, WebDriverExtension.bindTo(ids)
])
.get(WebDriverExtension);
return new Promise<any>((res, rej) => {
try {
res(ReflectiveInjector
.resolveAndCreate([
ids.map((id) => { return {provide: id, useValue: new MockExtension(id)}; }),
{provide: Options.CAPABILITIES, useValue: caps}, WebDriverExtension.bindTo(ids)
])
.get(WebDriverExtension));
} catch (e) {
rej(e);
}
});
}
@ -34,7 +37,7 @@ export function main() {
}));
it('should throw if there is no match', inject([AsyncTestCompleter], (async) => {
PromiseWrapper.catchError(createExtension(['m1'], {'browser': 'm2'}), (err) => {
createExtension(['m1'], {'browser': 'm2'}).catch((err) => {
expect(isPresent(err)).toBe(true);
async.done();
});

34
modules/benchpress/test/webdriver/chrome_driver_extension_spec.ts
View File

@ -7,7 +7,6 @@
*/
import {AsyncTestCompleter, afterEach, beforeEach, ddescribe, describe, expect, iit, inject, it, xit} from '@angular/core/testing/testing_internal';
import {PromiseWrapper} from '@angular/facade/src/async';
import {Json, isBlank} from '@angular/facade/src/lang';
import {ChromeDriverExtension, Options, ReflectiveInjector, WebDriverAdapter, WebDriverExtension} from 'benchpress/common';
@ -433,13 +432,12 @@ export function main() {
it('should throw when ImplThreadRenderingStats contains more than one frame',
inject([AsyncTestCompleter], (async) => {
PromiseWrapper.catchError(
createExtension([
benchmarkEvents.instant(
'BenchmarkInstrumentation::ImplThreadRenderingStats', 1100,
{'data': {'frame_count': 2}})
]).readPerfLog(),
(err): any => {
createExtension([benchmarkEvents.instant(
'BenchmarkInstrumentation::ImplThreadRenderingStats', 1100,
{'data': {'frame_count': 2}})])
.readPerfLog()
.catch((err): any => {
expect(() => {
throw err;
}).toThrowError('multi-frame render stats not supported');
@ -468,14 +466,14 @@ export function main() {
}));
it('should throw an error on buffer overflow', inject([AsyncTestCompleter], (async) => {
PromiseWrapper.catchError(
createExtension(
[
chromeTimelineEvents.start('FunctionCall', 1234),
],
CHROME45_USER_AGENT, 'Tracing.bufferUsage')
.readPerfLog(),
(err): any => {
createExtension(
[
chromeTimelineEvents.start('FunctionCall', 1234),
],
CHROME45_USER_AGENT, 'Tracing.bufferUsage')
.readPerfLog()
.catch((err): any => {
expect(() => {
throw err;
}).toThrowError('The DevTools trace buffer filled during the test!');
@ -501,13 +499,13 @@ class MockDriverAdapter extends WebDriverAdapter {
executeScript(script) {
this._log.push(['executeScript', script]);
return PromiseWrapper.resolve(null);
return Promise.resolve(null);
}
logs(type) {
this._log.push(['logs', type]);
if (type === 'performance') {
return PromiseWrapper.resolve(this._events.map((event) => {
return Promise.resolve(this._events.map((event) => {
return {
'message': Json.stringify({'message': {'method': this._messageMethod, 'params': event}})
};

8
modules/benchpress/test/webdriver/ios_driver_extension_spec.ts
View File

@ -7,10 +7,8 @@
*/
import {AsyncTestCompleter, afterEach, beforeEach, ddescribe, describe, expect, iit, inject, it, xit} from '@angular/core/testing/testing_internal';
import {PromiseWrapper} from '@angular/facade/src/async';
import {Json, isBlank, isPresent} from '@angular/facade/src/lang';
import {WebDriverExtension, IOsDriverExtension, WebDriverAdapter, ReflectiveInjector,} from 'benchpress/common';
import {IOsDriverExtension, ReflectiveInjector, WebDriverAdapter, WebDriverExtension} from 'benchpress/common';
import {TraceEventFactory} from '../trace_event_factory';
@ -172,13 +170,13 @@ class MockDriverAdapter extends WebDriverAdapter {
executeScript(script) {
this._log.push(['executeScript', script]);
return PromiseWrapper.resolve(null);
return Promise.resolve(null);
}
logs(type) {
this._log.push(['logs', type]);
if (type === 'performance') {
return PromiseWrapper.resolve(this._perfRecords.map(function(record) {
return Promise.resolve(this._perfRecords.map(function(record) {
return {
'message': Json.stringify(
{'message': {'method': 'Timeline.eventRecorded', 'params': {'record': record}}})