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

build: reformat repo to new clang@1.4.0 (#36628)

Browse Source 
PR Close #36628
This commit is contained in:
Joey Perrott
2020-04-13 17:43:52 -07:00
committed by atscott
parent 4b3f9ac739
commit 26f49151e7
1163 changed files with 31727 additions and 24036 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/benchpress/index.ts
View File

@ -24,7 +24,7 @@ export {JsonFileReporter} from './src/reporter/json_file_reporter';
export {MultiReporter} from './src/reporter/multi_reporter';
export {Runner} from './src/runner';
export {SampleDescription} from './src/sample_description';
export {SampleState, Sampler} from './src/sampler';
export {Sampler, SampleState} from './src/sampler';
export {Validator} from './src/validator';
export {RegressionSlopeValidator} from './src/validator/regression_slope_validator';
export {SizeValidator} from './src/validator/size_validator';

12
packages/benchpress/src/metric.ts
View File

@ -14,18 +14,24 @@ export abstract class Metric {
/**
* Starts measuring
*/
beginMeasure(): Promise<any> { throw new Error('NYI'); }
beginMeasure(): Promise<any> {
throw new Error('NYI');
}
/**
* Ends measuring and reports the data
* since the begin call.
* @param restart: Whether to restart right after this.
*/
endMeasure(restart: boolean): Promise<{[key: string]: any}> { throw new Error('NYI'); }
endMeasure(restart: boolean): Promise<{[key: string]: any}> {
throw new Error('NYI');
}
/**
* Describes the metrics provided by this metric implementation.
* (e.g. units, ...)
*/
describe(): {[key: string]: string} { throw new Error('NYI'); }
describe(): {[key: string]: string} {
throw new Error('NYI');
}
}

10
packages/benchpress/src/metric/multi_metric.ts
View File

@ -26,7 +26,9 @@ export class MultiMetric extends Metric {
];
}
constructor(private _metrics: Metric[]) { super(); }
constructor(private _metrics: Metric[]) {
super();
}
/**
* Starts measuring
@ -56,7 +58,11 @@ export class MultiMetric extends Metric {
function mergeStringMaps(maps: {[key: string]: string}[]): {[key: string]: string} {
const result: {[key: string]: string} = {};
maps.forEach(map => { Object.keys(map).forEach(prop => { result[prop] = map[prop]; }); });
maps.forEach(map => {
Object.keys(map).forEach(prop => {
result[prop] = map[prop];
});
});
return result;
}

41
packages/benchpress/src/metric/perflog_metric.ts
View File

@ -23,11 +23,12 @@ export class PerflogMetric extends Metric {
static PROVIDERS = [
{
provide: PerflogMetric,
deps: [
WebDriverExtension, PerflogMetric.SET_TIMEOUT, Options.MICRO_METRICS, Options.FORCE_GC,
Options.CAPTURE_FRAMES, Options.RECEIVED_DATA, Options.REQUEST_COUNT,
PerflogMetric.IGNORE_NAVIGATION
]
deps:
[
WebDriverExtension, PerflogMetric.SET_TIMEOUT, Options.MICRO_METRICS, Options.FORCE_GC,
Options.CAPTURE_FRAMES, Options.RECEIVED_DATA, Options.REQUEST_COUNT,
PerflogMetric.IGNORE_NAVIGATION
]
},
{
provide: PerflogMetric.SET_TIMEOUT,
@ -169,7 +170,9 @@ export class PerflogMetric extends Metric {
return result;
}
let resolve: (result: any) => void;
const promise = new Promise<{[key: string]: number}>(res => { resolve = res; });
const promise = new Promise<{[key: string]: number}>(res => {
resolve = res;
});
this._setTimeout(() => resolve(this._readUntilEndMark(markName, loopCount + 1)), 100);
return promise;
});
@ -188,7 +191,7 @@ export class PerflogMetric extends Metric {
}
startEvent['ph'] = 'B';
endEvent['ph'] = 'E';
endEvent['ts'] = startEvent['ts'] ! + startEvent['dur'] !;
endEvent['ts'] = startEvent['ts']! + startEvent['dur']!;
this._remainingEvents.push(startEvent);
this._remainingEvents.push(endEvent);
} else {
@ -198,7 +201,7 @@ export class PerflogMetric extends Metric {
if (needSort) {
// Need to sort because of the ph==='X' events
this._remainingEvents.sort((a, b) => {
const diff = a['ts'] ! - b['ts'] !;
const diff = a['ts']! - b['ts']!;
return diff > 0 ? 1 : diff < 0 ? -1 : 0;
});
}
@ -230,8 +233,8 @@ export class PerflogMetric extends Metric {
result['requestCount'] = 0;
}
let markStartEvent: PerfLogEvent = null !;
let markEndEvent: PerfLogEvent = null !;
let markStartEvent: PerfLogEvent = null!;
let markEndEvent: PerfLogEvent = null!;
events.forEach((event) => {
const ph = event['ph'];
const name = event['name'];
@ -267,7 +270,7 @@ export class PerflogMetric extends Metric {
let inMeasureRange = false;
events.forEach((event) => {
const ph = event['ph'];
let name = event['name'] !;
let name = event['name']!;
let microIterations = 1;
const microIterationsMatch = name.match(_MICRO_ITERATIONS_REGEX);
if (microIterationsMatch) {
@ -286,7 +289,7 @@ export class PerflogMetric extends Metric {
if (this._requestCount && name === 'sendRequest') {
result['requestCount'] += 1;
} else if (this._receivedData && name === 'receivedData' && ph === 'I') {
result['receivedData'] += event['args'] !['encodedDataLength'] !;
result['receivedData'] += event['args']!['encodedDataLength']!;
}
if (ph === 'B' && name === _MARK_NAME_FRAME_CAPTURE) {
if (frameCaptureStartEvent) {
@ -305,7 +308,7 @@ export class PerflogMetric extends Metric {
}
if (ph === 'I' && frameCaptureStartEvent && !frameCaptureEndEvent && name === 'frame') {
frameTimestamps.push(event['ts'] !);
frameTimestamps.push(event['ts']!);
if (frameTimestamps.length >= 2) {
frameTimes.push(
frameTimestamps[frameTimestamps.length - 1] -
@ -324,14 +327,14 @@ export class PerflogMetric extends Metric {
intervalStartCount[name]--;
if (intervalStartCount[name] === 0) {
const startEvent = intervalStarts[name];
const duration = (event['ts'] ! - startEvent['ts'] !);
intervalStarts[name] = null !;
const duration = (event['ts']! - startEvent['ts']!);
intervalStarts[name] = null!;
if (name === 'gc') {
result['gcTime'] += duration;
const amount =
(startEvent['args'] !['usedHeapSize'] ! - event['args'] !['usedHeapSize'] !) / 1000;
(startEvent['args']!['usedHeapSize']! - event['args']!['usedHeapSize']!) / 1000;
result['gcAmount'] += amount;
const majorGc = event['args'] !['majorGc'];
const majorGc = event['args']!['majorGc'];
if (majorGc && majorGc) {
result['majorGcTime'] += duration;
}
@ -374,7 +377,9 @@ export class PerflogMetric extends Metric {
frameTimes.filter(t => t < _FRAME_TIME_SMOOTH_THRESHOLD).length / frameTimes.length;
}
private _markName(index: number) { return `${_MARK_NAME_PREFIX}${index}`; }
private _markName(index: number) {
return `${_MARK_NAME_PREFIX}${index}`;
}
}
const _MICRO_ITERATIONS_REGEX = /(.+)\*(\d+)$/;

11
packages/benchpress/src/metric/user_metric.ts
View File

@ -26,7 +26,9 @@ export class UserMetric extends Metric {
/**
* Starts measuring
*/
beginMeasure(): Promise<any> { return Promise.resolve(true); }
beginMeasure(): Promise<any> {
return Promise.resolve(true);
}
/**
* Ends measuring.
@ -34,8 +36,7 @@ export class UserMetric extends Metric {
endMeasure(restart: boolean): Promise<{[key: string]: any}> {
let resolve: (result: any) => void;
let reject: (error: any) => void;
const promise = new Promise < { [key: string]: any; }
> ((res, rej) => {
const promise = new Promise<{[key: string]: any;}>((res, rej) => {
resolve = res;
reject = rej;
});
@ -67,5 +68,7 @@ export class UserMetric extends Metric {
* Describes the metrics provided by this metric implementation.
* (e.g. units, ...)
*/
describe(): {[key: string]: any} { return this._userMetrics; }
describe(): {[key: string]: any} {
return this._userMetrics;
}
}

4
packages/benchpress/src/reporter.ts
View File

@ -12,7 +12,9 @@ import {MeasureValues} from './measure_values';
* A reporter reports measure values and the valid sample.
*/
export abstract class Reporter {
reportMeasureValues(values: MeasureValues): Promise<any> { throw new Error('NYI'); }
reportMeasureValues(values: MeasureValues): Promise<any> {
throw new Error('NYI');
}
reportSample(completeSample: MeasureValues[], validSample: MeasureValues[]): Promise<any> {
throw new Error('NYI');

13
packages/benchpress/src/reporter/console_reporter.ts
View File

@ -28,10 +28,11 @@ export class ConsoleReporter extends Reporter {
},
{provide: ConsoleReporter.COLUMN_WIDTH, useValue: 18}, {
provide: ConsoleReporter.PRINT,
useValue: function(v: any) {
// tslint:disable-next-line:no-console
console.log(v);
}
useValue:
function(v: any) {
// tslint:disable-next-line:no-console
console.log(v);
}
}
];
@ -58,7 +59,9 @@ export class ConsoleReporter extends Reporter {
this._print(`BENCHMARK ${sampleDescription.id}`);
this._print('Description:');
const props = sortedProps(sampleDescription.description);
props.forEach((prop) => { this._print(`- ${prop}: ${sampleDescription.description[prop]}`); });
props.forEach((prop) => {
this._print(`- ${prop}: ${sampleDescription.description[prop]}`);
});
this._print('Metrics:');
this._metricNames.forEach((metricName) => {
this._print(`- ${metricName}: ${sampleDescription.metrics[metricName]}`);

4
packages/benchpress/src/reporter/json_file_reporter.ts
View File

@ -37,7 +37,9 @@ export class JsonFileReporter extends Reporter {
super();
}
reportMeasureValues(measureValues: MeasureValues): Promise<any> { return Promise.resolve(null); }
reportMeasureValues(measureValues: MeasureValues): Promise<any> {
return Promise.resolve(null);
}
reportSample(completeSample: MeasureValues[], validSample: MeasureValues[]): Promise<any> {
const stats: {[key: string]: string} = {};

4
packages/benchpress/src/reporter/multi_reporter.ts
View File

@ -27,7 +27,9 @@ export class MultiReporter extends Reporter {
];
}
constructor(private _reporters: Reporter[]) { super(); }
constructor(private _reporters: Reporter[]) {
super();
}
reportMeasureValues(values: MeasureValues): Promise<any[]> {
return Promise.all(this._reporters.map(reporter => reporter.reportMeasureValues(values)));

2
packages/benchpress/src/runner.ts
View File

@ -17,7 +17,7 @@ import {Reporter} from './reporter';
import {ConsoleReporter} from './reporter/console_reporter';
import {MultiReporter} from './reporter/multi_reporter';
import {SampleDescription} from './sample_description';
import {SampleState, Sampler} from './sampler';
import {Sampler, SampleState} from './sampler';
import {Validator} from './validator';
import {RegressionSlopeValidator} from './validator/regression_slope_validator';
import {SizeValidator} from './validator/size_validator';

17
packages/benchpress/src/sample_description.ts
View File

@ -29,10 +29,11 @@ export class SampleDescription {
userDesc
],
metric.describe()),
deps: [
Metric, Options.SAMPLE_ID, Options.FORCE_GC, Options.USER_AGENT, Validator,
Options.DEFAULT_DESCRIPTION, Options.SAMPLE_DESCRIPTION
]
deps:
[
Metric, Options.SAMPLE_ID, Options.FORCE_GC, Options.USER_AGENT, Validator,
Options.DEFAULT_DESCRIPTION, Options.SAMPLE_DESCRIPTION
]
}];
description: {[key: string]: any};
@ -41,9 +42,13 @@ export class SampleDescription {
public metrics: {[key: string]: any}) {
this.description = {};
descriptions.forEach(description => {
Object.keys(description).forEach(prop => { this.description[prop] = description[prop]; });
Object.keys(description).forEach(prop => {
this.description[prop] = description[prop];
});
});
}
toJson() { return {'id': this.id, 'description': this.description, 'metrics': this.metrics}; }
toJson() {
return {'id': this.id, 'description': this.description, 'metrics': this.metrics};
}
}

8
packages/benchpress/src/sampler.ts
View File

@ -28,9 +28,11 @@ import {WebDriverAdapter} from './web_driver_adapter';
export class Sampler {
static PROVIDERS = <StaticProvider[]>[{
provide: Sampler,
deps: [
WebDriverAdapter, Metric, Reporter, Validator, Options.PREPARE, Options.EXECUTE, Options.NOW
]
deps:
[
WebDriverAdapter, Metric, Reporter, Validator, Options.PREPARE, Options.EXECUTE,
Options.NOW
]
}];
constructor(
private _driver: WebDriverAdapter, private _metric: Metric, private _reporter: Reporter,

8
packages/benchpress/src/validator.ts
View File

@ -17,11 +17,15 @@ export abstract class Validator {
/**
* Calculates a valid sample out of the complete sample
*/
validate(completeSample: MeasureValues[]): MeasureValues[]|null { throw new Error('NYI'); }
validate(completeSample: MeasureValues[]): MeasureValues[]|null {
throw new Error('NYI');
}
/**
* Returns a Map that describes the properties of the validator
* (e.g. sample size, ...)
*/
describe(): {[key: string]: any} { throw new Error('NYI'); }
describe(): {[key: string]: any} {
throw new Error('NYI');
}
}

8
packages/benchpress/src/validator/size_validator.ts
View File

@ -22,9 +22,13 @@ export class SizeValidator extends Validator {
{provide: SizeValidator.SAMPLE_SIZE, useValue: 10}
];
constructor(@Inject(SizeValidator.SAMPLE_SIZE) private _sampleSize: number) { super(); }
constructor(@Inject(SizeValidator.SAMPLE_SIZE) private _sampleSize: number) {
super();
}
describe(): {[key: string]: any} { return {'sampleSize': this._sampleSize}; }
describe(): {[key: string]: any} {
return {'sampleSize': this._sampleSize};
}
validate(completeSample: MeasureValues[]): MeasureValues[]|null {
if (completeSample.length >= this._sampleSize) {

20
packages/benchpress/src/web_driver_adapter.ts
View File

@ -14,9 +14,19 @@
* Needs one implementation for every supported WebDriver client.
*/
export abstract class WebDriverAdapter {
waitFor(callback: Function): Promise<any> { throw new Error('NYI'); }
executeScript(script: string): Promise<any> { throw new Error('NYI'); }
executeAsyncScript(script: string): Promise<any> { throw new Error('NYI'); }
capabilities(): Promise<{[key: string]: any}> { throw new Error('NYI'); }
logs(type: string): Promise<any[]> { throw new Error('NYI'); }
waitFor(callback: Function): Promise<any> {
throw new Error('NYI');
}
executeScript(script: string): Promise<any> {
throw new Error('NYI');
}
executeAsyncScript(script: string): Promise<any> {
throw new Error('NYI');
}
capabilities(): Promise<{[key: string]: any}> {
throw new Error('NYI');
}
logs(type: string): Promise<any[]> {
throw new Error('NYI');
}
}

28
packages/benchpress/src/web_driver_extension.ts
View File

@ -12,7 +12,7 @@ import {Options} from './common_options';
export type PerfLogEvent = {
[key: string]: any
} & {
}&{
ph?: 'X' | 'B' | 'E' | 'I',
ts?: number,
dur?: number,
@ -43,7 +43,7 @@ export abstract class WebDriverExtension {
{
provide: WebDriverExtension,
useFactory: (children: WebDriverExtension[], capabilities: {[key: string]: any}) => {
let delegate: WebDriverExtension = undefined !;
let delegate: WebDriverExtension = undefined!;
children.forEach(extension => {
if (extension.supports(capabilities)) {
delegate = extension;
@ -60,11 +60,17 @@ export abstract class WebDriverExtension {
return res;
}
gc(): Promise<any> { throw new Error('NYI'); }
gc(): Promise<any> {
throw new Error('NYI');
}
timeBegin(name: string): Promise<any> { throw new Error('NYI'); }
timeBegin(name: string): Promise<any> {
throw new Error('NYI');
}
timeEnd(name: string, restartName: string|null): Promise<any> { throw new Error('NYI'); }
timeEnd(name: string, restartName: string|null): Promise<any> {
throw new Error('NYI');
}
/**
* Format:
@ -78,11 +84,17 @@ export abstract class WebDriverExtension {
* Based on [Chrome Trace Event
*Format](https://docs.google.com/document/d/1CvAClvFfyA5R-PhYUmn5OOQtYMH4h6I0nSsKchNAySU/edit)
**/
readPerfLog(): Promise<PerfLogEvent[]> { throw new Error('NYI'); }
readPerfLog(): Promise<PerfLogEvent[]> {
throw new Error('NYI');
}
perfLogFeatures(): PerfLogFeatures { throw new Error('NYI'); }
perfLogFeatures(): PerfLogFeatures {
throw new Error('NYI');
}
supports(capabilities: {[key: string]: any}): boolean { return true; }
supports(capabilities: {[key: string]: any}): boolean {
return true;
}
}
export class PerfLogFeatures {

10
packages/benchpress/src/webdriver/chrome_driver_extension.ts
View File

@ -54,7 +54,9 @@ export class ChromeDriverExtension extends WebDriverExtension {
return parseInt(v, 10);
}
gc() { return this.driver.executeScript('window.gc()'); }
gc() {
return this.driver.executeScript('window.gc()');
}
async timeBegin(name: string): Promise<any> {
if (this._firstRun) {
@ -108,7 +110,7 @@ export class ChromeDriverExtension extends WebDriverExtension {
chromeEvents.forEach((event) => {
const categories = this._parseCategories(event['cat']);
const normalizedEvent = this._convertEvent(event, categories);
if (normalizedEvent != null) normalizedEvents !.push(normalizedEvent);
if (normalizedEvent != null) normalizedEvents!.push(normalizedEvent);
});
return normalizedEvents;
}
@ -184,7 +186,9 @@ export class ChromeDriverExtension extends WebDriverExtension {
return null; // nothing useful in this event
}
private _parseCategories(categories: string): string[] { return categories.split(','); }
private _parseCategories(categories: string): string[] {
return categories.split(',');
}
private _isEvent(
eventCategories: string[], eventName: string, expectedCategories: string[],

8
packages/benchpress/src/webdriver/firefox_driver_extension.ts
View File

@ -22,7 +22,9 @@ export class FirefoxDriverExtension extends WebDriverExtension {
this._profilerStarted = false;
}
gc() { return this._driver.executeScript('window.forceGC()'); }
gc() {
return this._driver.executeScript('window.forceGC()');
}
timeBegin(name: string): Promise<any> {
if (!this._profilerStarted) {
@ -44,7 +46,9 @@ export class FirefoxDriverExtension extends WebDriverExtension {
return this._driver.executeAsyncScript('var cb = arguments[0]; window.getProfile(cb);');
}
perfLogFeatures(): PerfLogFeatures { return new PerfLogFeatures({render: true, gc: true}); }
perfLogFeatures(): PerfLogFeatures {
return new PerfLogFeatures({render: true, gc: true});
}
supports(capabilities: {[key: string]: any}): boolean {
return capabilities['browserName'].toLowerCase() === 'firefox';

25
packages/benchpress/src/webdriver/ios_driver_extension.ts
View File

@ -15,9 +15,13 @@ import {PerfLogEvent, PerfLogFeatures, WebDriverExtension} from '../web_driver_e
export class IOsDriverExtension extends WebDriverExtension {
static PROVIDERS = [{provide: IOsDriverExtension, deps: [WebDriverAdapter]}];
constructor(private _driver: WebDriverAdapter) { super(); }
constructor(private _driver: WebDriverAdapter) {
super();
}
gc(): Promise<any> { throw new Error('Force GC is not supported on iOS'); }
gc(): Promise<any> {
throw new Error('Force GC is not supported on iOS');
}
timeBegin(name: string): Promise<any> {
return this._driver.executeScript(`console.time('${name}');`);
@ -62,16 +66,16 @@ export class IOsDriverExtension extends WebDriverExtension {
const endTime = record['endTime'];
if (type === 'FunctionCall' && (data == null || data['scriptName'] !== 'InjectedScript')) {
events !.push(createStartEvent('script', startTime));
events!.push(createStartEvent('script', startTime));
endEvent = createEndEvent('script', endTime);
} else if (type === 'Time') {
events !.push(createMarkStartEvent(data['message'], startTime));
events!.push(createMarkStartEvent(data['message'], startTime));
} else if (type === 'TimeEnd') {
events !.push(createMarkEndEvent(data['message'], startTime));
events!.push(createMarkEndEvent(data['message'], startTime));
} else if (
type === 'RecalculateStyles' || type === 'Layout' || type === 'UpdateLayerTree' ||
type === 'Paint' || type === 'Rasterize' || type === 'CompositeLayers') {
events !.push(createStartEvent('render', startTime));
events!.push(createStartEvent('render', startTime));
endEvent = createEndEvent('render', endTime);
}
// Note: ios used to support GCEvent up until iOS 6 :-(
@ -79,21 +83,22 @@ export class IOsDriverExtension extends WebDriverExtension {
this._convertPerfRecordsToEvents(record['children'], events);
}
if (endEvent != null) {
events !.push(endEvent);
events!.push(endEvent);
}
});
return events;
}
perfLogFeatures(): PerfLogFeatures { return new PerfLogFeatures({render: true}); }
perfLogFeatures(): PerfLogFeatures {
return new PerfLogFeatures({render: true});
}
supports(capabilities: {[key: string]: any}): boolean {
return capabilities['browserName'].toLowerCase() === 'safari';
}
}
function createEvent(
ph: 'X' | 'B' | 'E' | 'B' | 'E', name: string, time: number, args: any = null) {
function createEvent(ph: 'X'|'B'|'E'|'B'|'E', name: string, time: number, args: any = null) {
const result: PerfLogEvent = {
'cat': 'timeline',
'name': name,

24
packages/benchpress/src/webdriver/selenium_webdriver_adapter.ts
View File

@ -21,11 +21,17 @@ export class SeleniumWebDriverAdapter extends WebDriverAdapter {
deps: []
}];
constructor(private _driver: any) { super(); }
constructor(private _driver: any) {
super();
}
waitFor(callback: () => any): Promise<any> { return this._driver.call(callback); }
waitFor(callback: () => any): Promise<any> {
return this._driver.call(callback);
}
executeScript(script: string): Promise<any> { return this._driver.executeScript(script); }
executeScript(script: string): Promise<any> {
return this._driver.executeScript(script);
}
executeAsyncScript(script: string): Promise<any> {
return this._driver.executeAsyncScript(script);
@ -58,7 +64,9 @@ class Command {
private parameters_: {[key: string]: any} = {};
constructor(private name_: string) {}
getName() { return this.name_; }
getName() {
return this.name_;
}
setParameter(name: string, value: any) {
this.parameters_[name] = value;
@ -70,7 +78,11 @@ class Command {
return this;
}
getParameter(key: string) { return this.parameters_[key]; }
getParameter(key: string) {
return this.parameters_[key];
}
getParameters() { return this.parameters_; }
getParameters() {
return this.parameters_;
}
}

68
packages/benchpress/test/metric/multi_metric_spec.ts
View File

@ -11,50 +11,52 @@ import {AsyncTestCompleter, describe, expect, inject, it} from '@angular/core/te
import {Injector, Metric, MultiMetric} from '../../index';
(function() {
function createMetric(ids: any[]) {
const m = Injector
.create([
ids.map(id => ({provide: id, useValue: new MockMetric(id)})),
MultiMetric.provideWith(ids)
])
.get<MultiMetric>(MultiMetric);
return Promise.resolve(m);
}
function createMetric(ids: any[]) {
const m = Injector
.create([
ids.map(id => ({provide: id, useValue: new MockMetric(id)})),
MultiMetric.provideWith(ids)
])
.get<MultiMetric>(MultiMetric);
return Promise.resolve(m);
}
describe('multi metric', () => {
it('should merge descriptions', inject([AsyncTestCompleter], (async: AsyncTestCompleter) => {
createMetric(['m1', 'm2']).then((m) => {
expect(m.describe()).toEqual({'m1': 'describe', 'm2': 'describe'});
async.done();
});
}));
describe('multi metric', () => {
it('should merge descriptions', inject([AsyncTestCompleter], (async: AsyncTestCompleter) => {
createMetric(['m1', 'm2']).then((m) => {
expect(m.describe()).toEqual({'m1': 'describe', 'm2': 'describe'});
async.done();
});
}));
it('should merge all beginMeasure calls',
it('should merge all beginMeasure calls',
inject([AsyncTestCompleter], (async: AsyncTestCompleter) => {
createMetric(['m1', 'm2']).then((m) => m.beginMeasure()).then((values) => {
expect(values).toEqual(['m1_beginMeasure', 'm2_beginMeasure']);
async.done();
});
}));
[false, true].forEach((restartFlag) => {
it(`should merge all endMeasure calls for restart=${restartFlag}`,
inject([AsyncTestCompleter], (async: AsyncTestCompleter) => {
createMetric(['m1', 'm2']).then((m) => m.beginMeasure()).then((values) => {
expect(values).toEqual(['m1_beginMeasure', 'm2_beginMeasure']);
createMetric(['m1', 'm2']).then((m) => m.endMeasure(restartFlag)).then((values) => {
expect(values).toEqual({'m1': {'restart': restartFlag}, 'm2': {'restart': restartFlag}});
async.done();
});
}));
[false, true].forEach((restartFlag) => {
it(`should merge all endMeasure calls for restart=${restartFlag}`,
inject([AsyncTestCompleter], (async: AsyncTestCompleter) => {
createMetric(['m1', 'm2']).then((m) => m.endMeasure(restartFlag)).then((values) => {
expect(values).toEqual(
{'m1': {'restart': restartFlag}, 'm2': {'restart': restartFlag}});
async.done();
});
}));
});
});
});
})();
class MockMetric extends Metric {
constructor(private _id: string) { super(); }
constructor(private _id: string) {
super();
}
beginMeasure(): Promise<string> { return Promise.resolve(`${this._id}_beginMeasure`); }
beginMeasure(): Promise<string> {
return Promise.resolve(`${this._id}_beginMeasure`);
}
endMeasure(restart: boolean): Promise<{[key: string]: any}> {
const result: {[key: string]: any} = {};

1266
packages/benchpress/test/metric/perflog_metric_spec.ts
View File

File diff suppressed because it is too large Load Diff

90
packages/benchpress/test/metric/user_metric_spec.ts
View File

@ -12,55 +12,55 @@ import {AsyncTestCompleter, describe, expect, inject, it} from '@angular/core/te
import {Options, PerfLogEvent, PerfLogFeatures, UserMetric, WebDriverAdapter} from '../../index';
(function() {
let wdAdapter: MockDriverAdapter;
let wdAdapter: MockDriverAdapter;
function createMetric(
perfLogs: PerfLogEvent[], perfLogFeatures: PerfLogFeatures,
{userMetrics}: {userMetrics?: {[key: string]: string}} = {}): UserMetric {
if (!perfLogFeatures) {
perfLogFeatures =
new PerfLogFeatures({render: true, gc: true, frameCapture: true, userTiming: true});
}
if (!userMetrics) {
userMetrics = {};
}
wdAdapter = new MockDriverAdapter();
const providers: StaticProvider[] = [
Options.DEFAULT_PROVIDERS, UserMetric.PROVIDERS,
{provide: Options.USER_METRICS, useValue: userMetrics},
{provide: WebDriverAdapter, useValue: wdAdapter}
];
return Injector.create(providers).get(UserMetric);
function createMetric(
perfLogs: PerfLogEvent[], perfLogFeatures: PerfLogFeatures,
{userMetrics}: {userMetrics?: {[key: string]: string}} = {}): UserMetric {
if (!perfLogFeatures) {
perfLogFeatures =
new PerfLogFeatures({render: true, gc: true, frameCapture: true, userTiming: true});
}
if (!userMetrics) {
userMetrics = {};
}
wdAdapter = new MockDriverAdapter();
const providers: StaticProvider[] = [
Options.DEFAULT_PROVIDERS, UserMetric.PROVIDERS,
{provide: Options.USER_METRICS, useValue: userMetrics},
{provide: WebDriverAdapter, useValue: wdAdapter}
];
return Injector.create(providers).get(UserMetric);
}
describe('user metric', () => {
it('should describe itself based on userMetrics', () => {
expect(createMetric([[]], new PerfLogFeatures(), {
userMetrics: {'loadTime': 'time to load'}
}).describe())
.toEqual({'loadTime': 'time to load'});
});
describe('endMeasure', () => {
it('should stop measuring when all properties have numeric values',
inject([AsyncTestCompleter], (async: AsyncTestCompleter) => {
const metric = createMetric(
[[]], new PerfLogFeatures(),
{userMetrics: {'loadTime': 'time to load', 'content': 'time to see content'}});
metric.beginMeasure().then(() => metric.endMeasure(true)).then(values => {
expect(values['loadTime']).toBe(25);
expect(values['content']).toBe(250);
async.done();
});
wdAdapter.data['loadTime'] = 25;
// Wait before setting 2nd property.
setTimeout(() => { wdAdapter.data['content'] = 250; }, 50);
}), 600);
});
describe('user metric', () => {
it('should describe itself based on userMetrics', () => {
expect(createMetric([[]], new PerfLogFeatures(), {
userMetrics: {'loadTime': 'time to load'}
}).describe())
.toEqual({'loadTime': 'time to load'});
});
describe('endMeasure', () => {
it('should stop measuring when all properties have numeric values',
inject([AsyncTestCompleter], (async: AsyncTestCompleter) => {
const metric = createMetric(
[[]], new PerfLogFeatures(),
{userMetrics: {'loadTime': 'time to load', 'content': 'time to see content'}});
metric.beginMeasure().then(() => metric.endMeasure(true)).then(values => {
expect(values['loadTime']).toBe(25);
expect(values['content']).toBe(250);
async.done();
});
wdAdapter.data['loadTime'] = 25;
// Wait before setting 2nd property.
setTimeout(() => {
wdAdapter.data['content'] = 250;
}, 50);
}), 600);
});
});
})();
class MockDriverAdapter extends WebDriverAdapter {

11
packages/benchpress/test/reporter/console_reporter_spec.ts
View File

@ -18,10 +18,10 @@ import {ConsoleReporter, Injector, MeasureValues, SampleDescription} from '../..
function createReporter(
{columnWidth = null, sampleId = null, descriptions = null, metrics = null}: {
columnWidth?: number | null,
sampleId?: string | null,
descriptions?: {[key: string]: any}[] | null,
metrics?: {[key: string]: any} | null
columnWidth?: number|null,
sampleId?: string|null,
descriptions?: {[key: string]: any}[]|null,
metrics?: {[key: string]: any}|null
}) {
log = [];
if (!descriptions) {
@ -33,7 +33,7 @@ import {ConsoleReporter, Injector, MeasureValues, SampleDescription} from '../..
const providers: StaticProvider[] = [
ConsoleReporter.PROVIDERS, {
provide: SampleDescription,
useValue: new SampleDescription(sampleId, descriptions, metrics !)
useValue: new SampleDescription(sampleId, descriptions, metrics!)
},
{provide: ConsoleReporter.PRINT, useValue: (line: string) => log.push(line)}
];
@ -84,7 +84,6 @@ import {ConsoleReporter, Injector, MeasureValues, SampleDescription} from '../..
reporter.reportSample([], [mv(0, 0, {'a': 3, 'b': 0}), mv(1, 1, {'a': 5, 'b': 0})]);
expect(log).toEqual(['======== | ========', '4.00+-25% | 0.00']);
});
});
}

8
packages/benchpress/test/reporter/json_file_reporter_spec.ts
View File

@ -62,16 +62,12 @@ import {Injector, JsonFileReporter, MeasureValues, Options, SampleDescription} f
{'timeStamp': '1970-01-01T00:00:00.000Z', 'runIndex': 0, 'values': {'a': 3, 'b': 6}}
],
'validSample': [
{'timeStamp': '1970-01-01T00:00:00.000Z', 'runIndex': 0, 'values': {'a': 3, 'b': 6}}, {
'timeStamp': '1970-01-01T00:00:00.001Z',
'runIndex': 1,
'values': {'a': 5, 'b': 9}
}
{'timeStamp': '1970-01-01T00:00:00.000Z', 'runIndex': 0, 'values': {'a': 3, 'b': 6}},
{'timeStamp': '1970-01-01T00:00:00.001Z', 'runIndex': 1, 'values': {'a': 5, 'b': 9}}
]
});
async.done();
}));
});
}

74
packages/benchpress/test/reporter/multi_reporter_spec.ts
View File

@ -11,50 +11,48 @@ import {AsyncTestCompleter, describe, expect, inject, it} from '@angular/core/te
import {Injector, MeasureValues, MultiReporter, Reporter} from '../../index';
(function() {
function createReporters(ids: any[]) {
const r = Injector
.create([
ids.map(id => ({provide: id, useValue: new MockReporter(id)})),
MultiReporter.provideWith(ids)
])
.get<MultiReporter>(MultiReporter);
return Promise.resolve(r);
}
function createReporters(ids: any[]) {
const r = Injector
.create([
ids.map(id => ({provide: id, useValue: new MockReporter(id)})),
MultiReporter.provideWith(ids)
])
.get<MultiReporter>(MultiReporter);
return Promise.resolve(r);
}
describe('multi reporter', () => {
describe('multi reporter', () => {
it('should reportMeasureValues to all',
inject([AsyncTestCompleter], (async: AsyncTestCompleter) => {
const mv = new MeasureValues(0, new Date(), {});
createReporters(['m1', 'm2']).then((r) => r.reportMeasureValues(mv)).then((values) => {
expect(values).toEqual([{'id': 'm1', 'values': mv}, {'id': 'm2', 'values': mv}]);
async.done();
});
}));
it('should reportMeasureValues to all',
inject([AsyncTestCompleter], (async: AsyncTestCompleter) => {
const mv = new MeasureValues(0, new Date(), {});
createReporters(['m1', 'm2']).then((r) => r.reportMeasureValues(mv)).then((values) => {
it('should reportSample to call', inject([AsyncTestCompleter], (async: AsyncTestCompleter) => {
const completeSample =
[new MeasureValues(0, new Date(), {}), new MeasureValues(1, new Date(), {})];
const validSample = [completeSample[1]];
expect(values).toEqual([{'id': 'm1', 'values': mv}, {'id': 'm2', 'values': mv}]);
async.done();
});
}));
it('should reportSample to call', inject([AsyncTestCompleter], (async: AsyncTestCompleter) => {
const completeSample =
[new MeasureValues(0, new Date(), {}), new MeasureValues(1, new Date(), {})];
const validSample = [completeSample[1]];
createReporters(['m1', 'm2'])
.then((r) => r.reportSample(completeSample, validSample))
.then((values) => {
expect(values).toEqual([
{'id': 'm1', 'completeSample': completeSample, 'validSample': validSample},
{'id': 'm2', 'completeSample': completeSample, 'validSample': validSample}
]);
async.done();
});
}));
});
createReporters(['m1', 'm2'])
.then((r) => r.reportSample(completeSample, validSample))
.then((values) => {
expect(values).toEqual([
{'id': 'm1', 'completeSample': completeSample, 'validSample': validSample},
{'id': 'm2', 'completeSample': completeSample, 'validSample': validSample}
]);
async.done();
});
}));
});
})();
class MockReporter extends Reporter {
constructor(private _id: string) { super(); }
constructor(private _id: string) {
super();
}
reportMeasureValues(values: MeasureValues): Promise<{[key: string]: any}> {
return Promise.resolve({'id': this._id, 'values': values});

38
packages/benchpress/test/runner_spec.ts
View File

@ -8,7 +8,7 @@
import {AsyncTestCompleter, describe, expect, inject, it} from '@angular/core/testing/src/testing_internal';
import {Injector, Metric, Options, Runner, SampleDescription, SampleState, Sampler, Validator, WebDriverAdapter} from '../index';
import {Injector, Metric, Options, Runner, SampleDescription, Sampler, SampleState, Validator, WebDriverAdapter} from '../index';
{
describe('runner', () => {
@ -68,7 +68,6 @@ import {Injector, Metric, Options, Runner, SampleDescription, SampleState, Sampl
.sample({id: 'someId'})
.then((_) => injector.get(SampleDescription))
.then((desc) => {
expect(desc.metrics).toEqual({'m1': 'some metric'});
async.done();
});
@ -109,32 +108,45 @@ import {Injector, Metric, Options, Runner, SampleDescription, SampleState, Sampl
})
.then((_) => injector.get(SampleDescription))
.then((desc) => {
expect(desc.description['a']).toBe(2);
async.done();
});
}));
});
}
class MockWebDriverAdapter extends WebDriverAdapter {
executeScript(script: string): Promise<string> { return Promise.resolve('someUserAgent'); }
capabilities(): Promise<Map<string, any>> { return null !; }
executeScript(script: string): Promise<string> {
return Promise.resolve('someUserAgent');
}
capabilities(): Promise<Map<string, any>> {
return null!;
}
}
class MockValidator extends Validator {
constructor() { super(); }
describe() { return {'v': 11}; }
constructor() {
super();
}
describe() {
return {'v': 11};
}
}
class MockMetric extends Metric {
constructor() { super(); }
describe() { return {'m1': 'some metric'}; }
constructor() {
super();
}
describe() {
return {'m1': 'some metric'};
}
}
class MockSampler extends Sampler {
constructor() { super(null !, null !, null !, null !, null !, null !, null !); }
sample(): Promise<SampleState> { return Promise.resolve(new SampleState([], [])); }
constructor() {
super(null!, null!, null!, null!, null!, null!, null!);
}
sample(): Promise<SampleState> {
return Promise.resolve(new SampleState([], []));
}
}

38
packages/benchpress/test/sampler_spec.ts
View File

@ -67,7 +67,6 @@ import {Injector, MeasureValues, Metric, Options, Reporter, Sampler, Validator,
expect(log).toEqual([0, 1, 2, 3]);
async.done();
});
}));
it('should call prepare, beginMeasure, execute, endMeasure for every iteration',
@ -77,8 +76,12 @@ import {Injector, MeasureValues, Metric, Options, Reporter, Sampler, Validator,
createSampler({
metric: createCountingMetric(log),
validator: createCountingValidator(2),
prepare: () => { log.push(`p${workCount++}`); },
execute: () => { log.push(`w${workCount++}`); }
prepare: () => {
log.push(`p${workCount++}`);
},
execute: () => {
log.push(`w${workCount++}`);
}
});
sampler.sample().then((_) => {
expect(log).toEqual([
@ -102,7 +105,9 @@ import {Injector, MeasureValues, Metric, Options, Reporter, Sampler, Validator,
createSampler({
metric: createCountingMetric(log),
validator: createCountingValidator(2),
execute: () => { log.push(`w${workCount++}`); },
execute: () => {
log.push(`w${workCount++}`);
},
prepare: null
});
sampler.sample().then((_) => {
@ -130,7 +135,9 @@ import {Injector, MeasureValues, Metric, Options, Reporter, Sampler, Validator,
scriptTime = 0;
return result;
}),
prepare: () => { scriptTime = 1 * iterationCount; },
prepare: () => {
scriptTime = 1 * iterationCount;
},
execute: () => {
scriptTime = 10 * iterationCount;
iterationCount++;
@ -147,7 +154,7 @@ import {Injector, MeasureValues, Metric, Options, Reporter, Sampler, Validator,
it('should call the validator for every execution and store the valid sample',
inject([AsyncTestCompleter], (async: AsyncTestCompleter) => {
const log: any[] = [];
const validSample = [mv(null !, null !, {})];
const validSample = [mv(null!, null!, {})];
createSampler({
metric: createCountingMetric(),
@ -174,7 +181,7 @@ import {Injector, MeasureValues, Metric, Options, Reporter, Sampler, Validator,
it('should report the metric values',
inject([AsyncTestCompleter], (async: AsyncTestCompleter) => {
const log: any[] = [];
const validSample = [mv(null !, null !, {})];
const validSample = [mv(null!, null!, {})];
createSampler({
validator: createCountingValidator(2, validSample),
metric: createCountingMetric(),
@ -198,7 +205,6 @@ import {Injector, MeasureValues, Metric, Options, Reporter, Sampler, Validator,
async.done();
});
}));
});
}
@ -223,7 +229,9 @@ function createCountingMetric(log: any[] = []) {
}
class MockDriverAdapter extends WebDriverAdapter {
constructor(private _log: any[] = [], private _waitFor: Function|null = null) { super(); }
constructor(private _log: any[] = [], private _waitFor: Function|null = null) {
super();
}
waitFor(callback: Function): Promise<any> {
if (this._waitFor != null) {
return this._waitFor(callback);
@ -235,7 +243,9 @@ class MockDriverAdapter extends WebDriverAdapter {
class MockValidator extends Validator {
constructor(private _log: any[] = [], private _validate: Function|null = null) { super(); }
constructor(private _log: any[] = [], private _validate: Function|null = null) {
super();
}
validate(completeSample: MeasureValues[]): MeasureValues[] {
const stableSample = this._validate != null ? this._validate(completeSample) : completeSample;
this._log.push(['validate', completeSample, stableSample]);
@ -244,7 +254,9 @@ class MockValidator extends Validator {
}
class MockMetric extends Metric {
constructor(private _log: any[] = [], private _endMeasure: Function|null = null) { super(); }
constructor(private _log: any[] = [], private _endMeasure: Function|null = null) {
super();
}
beginMeasure() {
this._log.push(['beginMeasure']);
return Promise.resolve(null);
@ -257,7 +269,9 @@ class MockMetric extends Metric {
}
class MockReporter extends Reporter {
constructor(private _log: any[] = []) { super(); }
constructor(private _log: any[] = []) {
super();
}
reportMeasureValues(values: MeasureValues): Promise<any> {
this._log.push(['reportMeasureValues', values]);
return Promise.resolve(null);

2
packages/benchpress/test/statistic_spec.ts
View File

@ -11,7 +11,6 @@ import {Statistic} from '../src/statistic';
{
describe('statistic', () => {
it('should calculate the mean', () => {
expect(Statistic.calculateMean([])).toBeNaN();
expect(Statistic.calculateMean([1, 2, 3])).toBe(2.0);
@ -34,6 +33,5 @@ import {Statistic} from '../src/statistic';
expect(Statistic.calculateRegressionSlope([1], 1, [2], 2)).toBeNaN();
expect(Statistic.calculateRegressionSlope([1, 2], 1.5, [2, 4], 3)).toBe(2.0);
});
});
}

16
packages/benchpress/test/trace_event_factory.ts
View File

@ -20,13 +20,21 @@ export class TraceEventFactory {
return res;
}
markStart(name: string, time: number) { return this.create('B', name, time); }
markStart(name: string, time: number) {
return this.create('B', name, time);
}
markEnd(name: string, time: number) { return this.create('E', name, time); }
markEnd(name: string, time: number) {
return this.create('E', name, time);
}
start(name: string, time: number, args: any = null) { return this.create('B', name, time, args); }
start(name: string, time: number, args: any = null) {
return this.create('B', name, time, args);
}
end(name: string, time: number, args: any = null) { return this.create('E', name, time, args); }
end(name: string, time: number, args: any = null) {
return this.create('E', name, time, args);
}
instant(name: string, time: number, args: any = null) {
return this.create('I', name, time, args);

1
packages/benchpress/test/validator/regression_slope_validator_spec.ts
View File

@ -53,7 +53,6 @@ import {Injector, MeasureValues, RegressionSlopeValidator} from '../../index';
expect(validator.validate(sample.slice(0, 2))).toEqual(sample.slice(0, 2));
expect(validator.validate(sample)).toEqual(sample.slice(1, 3));
});
});
}

1
packages/benchpress/test/validator/size_validator_spec.ts
View File

@ -39,7 +39,6 @@ import {Injector, MeasureValues, SizeValidator} from '../../index';
expect(validator.validate(sample.slice(0, 2))).toEqual(sample.slice(0, 2));
expect(validator.validate(sample)).toEqual(sample.slice(1, 3));
});
});
}

69
packages/benchpress/test/web_driver_extension_spec.ts
View File

@ -11,44 +11,45 @@ import {AsyncTestCompleter, describe, expect, inject, it} from '@angular/core/te
import {Injector, Options, WebDriverExtension} from '../index';
(function() {
function createExtension(ids: any[], caps: any) {
return new Promise<any>((res, rej) => {
try {
res(Injector
.create([
ids.map((id) => ({provide: id, useValue: new MockExtension(id)})),
{provide: Options.CAPABILITIES, useValue: caps},
WebDriverExtension.provideFirstSupported(ids)
])
.get(WebDriverExtension));
} catch (e) {
rej(e);
}
});
}
describe('WebDriverExtension.provideFirstSupported', () => {
it('should provide the extension that matches the capabilities',
inject([AsyncTestCompleter], (async: AsyncTestCompleter) => {
createExtension(['m1', 'm2', 'm3'], {'browser': 'm2'}).then((m) => {
expect(m.id).toEqual('m2');
async.done();
});
}));
it('should throw if there is no match',
inject([AsyncTestCompleter], (async: AsyncTestCompleter) => {
createExtension(['m1'], {'browser': 'm2'}).catch((err) => {
expect(err != null).toBe(true);
async.done();
});
}));
function createExtension(ids: any[], caps: any) {
return new Promise<any>((res, rej) => {
try {
res(Injector
.create([
ids.map((id) => ({provide: id, useValue: new MockExtension(id)})),
{provide: Options.CAPABILITIES, useValue: caps},
WebDriverExtension.provideFirstSupported(ids)
])
.get(WebDriverExtension));
} catch (e) {
rej(e);
}
});
}
describe('WebDriverExtension.provideFirstSupported', () => {
it('should provide the extension that matches the capabilities',
inject([AsyncTestCompleter], (async: AsyncTestCompleter) => {
createExtension(['m1', 'm2', 'm3'], {'browser': 'm2'}).then((m) => {
expect(m.id).toEqual('m2');
async.done();
});
}));
it('should throw if there is no match',
inject([AsyncTestCompleter], (async: AsyncTestCompleter) => {
createExtension(['m1'], {'browser': 'm2'}).catch((err) => {
expect(err != null).toBe(true);
async.done();
});
}));
});
})();
class MockExtension extends WebDriverExtension {
constructor(public id: string) { super(); }
constructor(public id: string) {
super();
}
supports(capabilities: {[key: string]: any}): boolean {
return capabilities['browser'] === this.id;

42
packages/benchpress/test/webdriver/chrome_driver_extension_spec.ts
View File

@ -32,7 +32,7 @@ import {TraceEventFactory} from '../trace_event_factory';
const normEvents = new TraceEventFactory('timeline', 'pid0');
function createExtension(
perfRecords: any[] | null = null, userAgent: string | null = null,
perfRecords: any[]|null = null, userAgent: string|null = null,
messageMethod = 'Tracing.dataCollected'): WebDriverExtension {
if (!perfRecords) {
perfRecords = [];
@ -97,9 +97,9 @@ import {TraceEventFactory} from '../trace_event_factory';
it('should mark the timeline via performance.mark() with start and end of a test',
inject([AsyncTestCompleter], (async: AsyncTestCompleter) => {
createExtension().timeEnd('name1', 'name2').then((_) => {
expect(log).toEqual([[
'executeScript', `performance.mark('name1-bpend');performance.mark('name2-bpstart');`
]]);
expect(log).toEqual([
['executeScript', `performance.mark('name1-bpend');performance.mark('name2-bpstart');`]
]);
async.done();
});
}));
@ -173,7 +173,8 @@ import {TraceEventFactory} from '../trace_event_factory';
[
chromeTimelineV8Events.start('MajorGC', 1000, {'usedHeapSizeBefore': 1000}),
chromeTimelineV8Events.end('MajorGC', 2000, {'usedHeapSizeAfter': 0}),
], )
],
)
.readPerfLog()
.then((events) => {
expect(events.length).toEqual(2);
@ -192,7 +193,8 @@ import {TraceEventFactory} from '../trace_event_factory';
[
chrome45TimelineEvents.start(recordType, 1234),
chrome45TimelineEvents.end(recordType, 2345)
], )
],
)
.readPerfLog()
.then((events) => {
expect(events).toEqual([
@ -210,7 +212,8 @@ import {TraceEventFactory} from '../trace_event_factory';
[
chromeBlinkTimelineEvents.start('UpdateLayoutTree', 1234),
chromeBlinkTimelineEvents.end('UpdateLayoutTree', 2345)
], )
],
)
.readPerfLog()
.then((events) => {
expect(events).toEqual([
@ -254,8 +257,10 @@ import {TraceEventFactory} from '../trace_event_factory';
}));
it('should report receivedData', inject([AsyncTestCompleter], (async: AsyncTestCompleter) => {
createExtension([chrome45TimelineEvents.instant(
'ResourceReceivedData', 1234, {'data': {'encodedDataLength': 987}})], )
createExtension(
[chrome45TimelineEvents.instant(
'ResourceReceivedData', 1234, {'data': {'encodedDataLength': 987}})],
)
.readPerfLog()
.then((events) => {
expect(events).toEqual(
@ -265,9 +270,11 @@ import {TraceEventFactory} from '../trace_event_factory';
}));
it('should report sendRequest', inject([AsyncTestCompleter], (async: AsyncTestCompleter) => {
createExtension([chrome45TimelineEvents.instant(
'ResourceSendRequest', 1234,
{'data': {'url': 'http://here', 'requestMethod': 'GET'}})], )
createExtension(
[chrome45TimelineEvents.instant(
'ResourceSendRequest', 1234,
{'data': {'url': 'http://here', 'requestMethod': 'GET'}})],
)
.readPerfLog()
.then((events) => {
expect(events).toEqual([normEvents.instant(
@ -277,7 +284,6 @@ import {TraceEventFactory} from '../trace_event_factory';
}));
describe('readPerfLog (common)', () => {
it('should execute a dummy script before reading them',
inject([AsyncTestCompleter], (async: AsyncTestCompleter) => {
// TODO(tbosch): This seems to be a bug in ChromeDriver:
@ -296,7 +302,8 @@ import {TraceEventFactory} from '../trace_event_factory';
[
chromeTimelineEvents.start(recordType, 1234),
chromeTimelineEvents.end(recordType, 2345)
], )
],
)
.readPerfLog()
.then((events) => {
expect(events).toEqual([
@ -337,7 +344,6 @@ import {TraceEventFactory} from '../trace_event_factory';
it('should throw when ImplThreadRenderingStats contains more than one frame',
inject([AsyncTestCompleter], (async: AsyncTestCompleter) => {
createExtension([benchmarkEvents.instant(
'BenchmarkInstrumentation::ImplThreadRenderingStats', 1100,
{'data': {'frame_count': 2}})])
@ -349,7 +355,6 @@ import {TraceEventFactory} from '../trace_event_factory';
async.done();
});
}));
});
it('should report begin timestamps',
@ -374,7 +379,6 @@ import {TraceEventFactory} from '../trace_event_factory';
it('should throw an error on buffer overflow',
inject([AsyncTestCompleter], (async: AsyncTestCompleter) => {
createExtension(
[
chromeTimelineEvents.start('FunctionCall', 1234),
@ -394,9 +398,7 @@ import {TraceEventFactory} from '../trace_event_factory';
expect(createExtension().supports({'browserName': 'Chrome'})).toBe(true);
});
});
});
}
@ -419,7 +421,7 @@ class MockDriverAdapter extends WebDriverAdapter {
{'message': {'method': this._messageMethod, 'params': event}}, null, 2)
})));
} else {
return null !;
return null!;
}
}
}

15
packages/benchpress/test/webdriver/ios_driver_extension_spec.ts
View File

@ -8,7 +8,7 @@
import {AsyncTestCompleter, describe, expect, inject, it} from '@angular/core/testing/src/testing_internal';
import {IOsDriverExtension, Injector, WebDriverAdapter, WebDriverExtension} from '../../index';
import {Injector, IOsDriverExtension, WebDriverAdapter, WebDriverExtension} from '../../index';
import {TraceEventFactory} from '../trace_event_factory';
{
@ -18,7 +18,7 @@ import {TraceEventFactory} from '../trace_event_factory';
const normEvents = new TraceEventFactory('timeline', 'pid0');
function createExtension(perfRecords: any[] | null = null): WebDriverExtension {
function createExtension(perfRecords: any[]|null = null): WebDriverExtension {
if (!perfRecords) {
perfRecords = [];
}
@ -63,7 +63,6 @@ import {TraceEventFactory} from '../trace_event_factory';
}));
describe('readPerfLog', () => {
it('should execute a dummy script before reading them',
inject([AsyncTestCompleter], (async: AsyncTestCompleter) => {
// TODO(tbosch): This seems to be a bug in ChromeDriver:
@ -140,9 +139,7 @@ import {TraceEventFactory} from '../trace_event_factory';
expect(createExtension().supports({'browserName': 'Safari'})).toBe(true);
});
});
});
}
@ -155,7 +152,7 @@ function timeEndRecord(name: string, time: number) {
}
function durationRecord(
type: string, startTime: number, endTime: number, children: any[] | null = null) {
type: string, startTime: number, endTime: number, children: any[]|null = null) {
if (!children) {
children = [];
}
@ -172,7 +169,9 @@ function internalScriptRecord(startTime: number, endTime: number) {
}
class MockDriverAdapter extends WebDriverAdapter {
constructor(private _log: any[], private _perfRecords: any[]) { super(); }
constructor(private _log: any[], private _perfRecords: any[]) {
super();
}
executeScript(script: string) {
this._log.push(['executeScript', script]);
@ -190,7 +189,7 @@ class MockDriverAdapter extends WebDriverAdapter {
};
}));
} else {
return null !;
return null!;
}
}
}