Skip to content

Commit 3a80c41

Browse files
committed
refactor(perf): move navigation into test files and rename runSimpleBenchmark
1 parent 35ac3f3 commit 3a80c41

File tree

8 files changed

+31
-36
lines changed

8 files changed

+31
-36
lines changed

modules/benchmarks/test/perf/change_detection_perf.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,16 @@ describe('ng2 change detection benchmark', function () {
88
afterEach(util.verifyNoErrors);
99

1010
it('should log ng stats', function() {
11-
util.runSimpleBenchmark({
12-
url: URL,
11+
browser.get(URL);
12+
util.runClickBenchmark({
1313
buttons: ['#ng2DetectChanges'],
1414
name: browser.params.lang+'.ng2.changeDetection'
1515
});
1616
});
1717

1818
it('should log baseline stats', function() {
19-
util.runSimpleBenchmark({
20-
url: URL,
19+
browser.get(URL);
20+
util.runClickBenchmark({
2121
buttons: ['#baselineDetectChanges'],
2222
name: browser.params.lang+'.baseline.changeDetection'
2323
});

modules/benchmarks/test/perf/compiler_perf.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,16 @@ describe('ng2 compiler benchmark', function () {
88
afterEach(util.verifyNoErrors);
99

1010
it('should log withBindings stats', function() {
11-
util.runSimpleBenchmark({
12-
url: URL,
11+
browser.get(URL);
12+
util.runClickBenchmark({
1313
buttons: ['#compileWithBindings'],
1414
name: browser.params.lang+'.ng2.compile.withBindings'
1515
});
1616
});
1717

1818
it('should log noBindings stats', function() {
19-
util.runSimpleBenchmark({
20-
url: URL,
19+
browser.get(URL);
20+
util.runClickBenchmark({
2121
buttons: ['#compileNoBindings'],
2222
name: browser.params.lang+'.ng2.compile.noBindings'
2323
});

modules/benchmarks/test/perf/di_perf.js

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,32 +8,32 @@ describe('ng2 di benchmark', function () {
88
afterEach(util.verifyNoErrors);
99

1010
it('should log the stats for getByToken', function() {
11-
util.runSimpleBenchmark({
12-
url: URL,
11+
browser.get(URL);
12+
util.runClickBenchmark({
1313
buttons: ['#getByToken'],
1414
name: browser.params.lang+'.ng2.di.getByToken'
1515
});
1616
});
1717

1818
it('should log the stats for getByKey', function() {
19-
util.runSimpleBenchmark({
20-
url: URL,
19+
browser.get(URL);
20+
util.runClickBenchmark({
2121
buttons: ['#getByKey'],
2222
name: browser.params.lang+'.ng2.di.getByKey'
2323
});
2424
});
2525

2626
it('should log the stats for getChild', function() {
27-
util.runSimpleBenchmark({
28-
url: URL,
27+
browser.get(URL);
28+
util.runClickBenchmark({
2929
buttons: ['#getChild'],
3030
name: browser.params.lang+'.ng2.di.getChild'
3131
});
3232
});
3333

3434
it('should log the stats for instantiate', function() {
35-
util.runSimpleBenchmark({
36-
url: URL,
35+
browser.get(URL);
36+
util.runClickBenchmark({
3737
buttons: ['#instantiate'],
3838
name: browser.params.lang+'.ng2.di.instantiate'
3939
});

modules/benchmarks/test/perf/element_injector_perf.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,16 @@ describe('ng2 element injector benchmark', function () {
88
afterEach(util.verifyNoErrors);
99

1010
it('should log the stats for instantiate', function() {
11-
util.runSimpleBenchmark({
12-
url: URL,
11+
browser.get(URL);
12+
util.runClickBenchmark({
1313
buttons: ['#instantiate'],
1414
name: browser.params.lang+'.ng2.elementInjector.instantiate'
1515
});
1616
});
1717

1818
it('should log the stats for instantiateDirectives', function() {
19-
util.runSimpleBenchmark({
20-
url: URL,
19+
browser.get(URL);
20+
util.runClickBenchmark({
2121
buttons: ['#instantiateDirectives'],
2222
name: browser.params.lang+'.ng2.elementInjector.instantiateDirectives'
2323
});

modules/benchmarks/test/perf/tree_perf.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,16 @@ describe('ng2 tree benchmark', function () {
88
afterEach(util.verifyNoErrors);
99

1010
it('should log the ng stats', function() {
11-
util.runSimpleBenchmark({
12-
url: URL,
11+
browser.get(URL);
12+
util.runClickBenchmark({
1313
buttons: ['#ng2DestroyDom', '#ng2CreateDom'],
1414
name: browser.params.lang+'.ng2.tree'
1515
});
1616
});
1717

1818
it('should log the baseline stats', function() {
19-
util.runSimpleBenchmark({
20-
url: URL,
19+
browser.get(URL);
20+
util.runClickBenchmark({
2121
buttons: ['#baselineDestroyDom', '#baselineCreateDom'],
2222
name: browser.params.lang+'.baseline.tree'
2323
});

modules/benchmarks_external/test/perf/compiler_perf.js

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,15 @@ describe('ng1.x compiler benchmark', function () {
88
afterEach(util.verifyNoErrors);
99

1010
it('should log withBinding stats', function() {
11-
util.runSimpleBenchmark({
12-
url: URL,
11+
browser.get(URL);
12+
util.runClickBenchmark({
1313
buttons: ['#compileWithBindings'],
1414
name: browser.params.lang+'.ng1.compile.withBindings'
1515
});
1616
});
1717

1818
it('should log noBindings stats', function() {
19-
util.runSimpleBenchmark({
20-
url: URL,
19+
util.runClickBenchmark({
2120
buttons: ['#compileNoBindings'],
2221
name: browser.params.lang+'.ng1.compile.noBindings'
2322
});

modules/benchmarks_external/test/perf/tree_perf.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ describe('ng1.x tree benchmark', function () {
88
afterEach(util.verifyNoErrors);
99

1010
it('should log the stats', function() {
11-
util.runSimpleBenchmark({
12-
url: URL,
11+
browser.get(URL);
12+
util.runClickBenchmark({
1313
buttons: ['#destroyDom', '#createDom'],
1414
name: browser.params.lang+'.ng1.tree'
1515
});

tools/perf/util.js

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,12 @@ var webdriver = require('protractor/node_modules/selenium-webdriver');
33
module.exports = {
44
perfLogs: perfLogs,
55
sumTimelineRecords: sumTimelineRecords,
6-
runSimpleBenchmark: runSimpleBenchmark,
6+
runClickBenchmark: runClickBenchmark,
77
verifyNoErrors: verifyNoErrors,
88
printObjectAsMarkdown: printObjectAsMarkdown
99
};
1010

11-
// TODO: rename into runSimpleBenchmark
12-
function runSimpleBenchmark(config) {
13-
// TODO: move this into the tests!
14-
browser.get(config.url);
15-
11+
function runClickBenchmark(config) {
1612
var buttons = config.buttons.map(function(selector) {
1713
return $(selector);
1814
});

0 commit comments

Comments
 (0)