diff --git a/modules/benchmarks/e2e_test/change_detection_perf.es6 b/modules/benchmarks/e2e_test/change_detection_perf.es6 index 442b11dbad..a78a174997 100644 --- a/modules/benchmarks/e2e_test/change_detection_perf.es6 +++ b/modules/benchmarks/e2e_test/change_detection_perf.es6 @@ -9,7 +9,7 @@ describe('ng2 change detection benchmark', function () { it('should log ng stats', function() { browser.get(URL); - runClickTimeBenchmark({ + runClickBenchmark({ buttons: ['#ng2DetectChanges'], logId: 'ng2.changeDetection' }); @@ -17,7 +17,7 @@ describe('ng2 change detection benchmark', function () { it('should log baseline stats', function() { browser.get(URL); - runClickTimeBenchmark({ + runClickBenchmark({ buttons: ['#baselineDetectChanges'], logId: 'baseline.changeDetection' }); @@ -25,12 +25,12 @@ describe('ng2 change detection benchmark', function () { }); -function runClickTimeBenchmark(config) { +function runClickBenchmark(config) { var buttons = config.buttons.map(function(selector) { return $(selector); }); - var timeParams = browser.params.timeBenchmark; - benchpress.runTimeBenchmark({ + var timeParams = browser.params.benchmark; + benchpress.runBenchmark({ sampleSize: timeParams.sampleSize, targetCoefficientOfVariation: timeParams.targetCoefficientOfVariation, timeout: timeParams.timeout, diff --git a/modules/benchmarks/e2e_test/compiler_perf.es6 b/modules/benchmarks/e2e_test/compiler_perf.es6 index e01259efef..b4941316a2 100644 --- a/modules/benchmarks/e2e_test/compiler_perf.es6 +++ b/modules/benchmarks/e2e_test/compiler_perf.es6 @@ -9,7 +9,7 @@ describe('ng2 compiler benchmark', function () { it('should log withBindings stats', function() { browser.get(URL); - runClickTimeBenchmark({ + runClickBenchmark({ buttons: ['#compileWithBindings'], logId: 'ng2.compile.withBindings' }); @@ -17,7 +17,7 @@ describe('ng2 compiler benchmark', function () { it('should log noBindings stats', function() { browser.get(URL); - runClickTimeBenchmark({ + runClickBenchmark({ buttons: ['#compileNoBindings'], logId: 'ng2.compile.noBindings' }); @@ -25,12 +25,12 @@ describe('ng2 compiler benchmark', function () { }); -function runClickTimeBenchmark(config) { +function runClickBenchmark(config) { var buttons = config.buttons.map(function(selector) { return $(selector); }); - var timeParams = browser.params.timeBenchmark; - benchpress.runTimeBenchmark({ + var timeParams = browser.params.benchmark; + benchpress.runBenchmark({ sampleSize: timeParams.sampleSize, targetCoefficientOfVariation: timeParams.targetCoefficientOfVariation, timeout: timeParams.timeout, diff --git a/modules/benchmarks/e2e_test/di_perf.es6 b/modules/benchmarks/e2e_test/di_perf.es6 index b07809bfe1..0ebabb94a4 100644 --- a/modules/benchmarks/e2e_test/di_perf.es6 +++ b/modules/benchmarks/e2e_test/di_perf.es6 @@ -9,7 +9,7 @@ describe('ng2 di benchmark', function () { it('should log the stats for getByToken', function() { browser.get(URL); - runClickTimeBenchmark({ + runClickBenchmark({ buttons: ['#getByToken'], logId: 'ng2.di.getByToken' }); @@ -17,7 +17,7 @@ describe('ng2 di benchmark', function () { it('should log the stats for getByKey', function() { browser.get(URL); - runClickTimeBenchmark({ + runClickBenchmark({ buttons: ['#getByKey'], logId: 'ng2.di.getByKey' }); @@ -25,7 +25,7 @@ describe('ng2 di benchmark', function () { it('should log the stats for getChild', function() { browser.get(URL); - runClickTimeBenchmark({ + runClickBenchmark({ buttons: ['#getChild'], logId: 'ng2.di.getChild' }); @@ -33,7 +33,7 @@ describe('ng2 di benchmark', function () { it('should log the stats for instantiate', function() { browser.get(URL); - runClickTimeBenchmark({ + runClickBenchmark({ buttons: ['#instantiate'], logId: 'ng2.di.instantiate' }); @@ -41,12 +41,12 @@ describe('ng2 di benchmark', function () { }); -function runClickTimeBenchmark(config) { +function runClickBenchmark(config) { var buttons = config.buttons.map(function(selector) { return $(selector); }); - var timeParams = browser.params.timeBenchmark; - benchpress.runTimeBenchmark({ + var timeParams = browser.params.benchmark; + benchpress.runBenchmark({ sampleSize: timeParams.sampleSize, targetCoefficientOfVariation: timeParams.targetCoefficientOfVariation, timeout: timeParams.timeout, diff --git a/modules/benchmarks/e2e_test/element_injector_perf.es6 b/modules/benchmarks/e2e_test/element_injector_perf.es6 index de69facba1..3d7d75545c 100644 --- a/modules/benchmarks/e2e_test/element_injector_perf.es6 +++ b/modules/benchmarks/e2e_test/element_injector_perf.es6 @@ -9,7 +9,7 @@ describe('ng2 element injector benchmark', function () { it('should log the stats for instantiate', function() { browser.get(URL); - runClickTimeBenchmark({ + runClickBenchmark({ buttons: ['#instantiate'], logId: 'ng2.elementInjector.instantiate' }); @@ -17,7 +17,7 @@ describe('ng2 element injector benchmark', function () { it('should log the stats for instantiateDirectives', function() { browser.get(URL); - runClickTimeBenchmark({ + runClickBenchmark({ buttons: ['#instantiateDirectives'], logId: 'ng2.elementInjector.instantiateDirectives' }); @@ -25,12 +25,12 @@ describe('ng2 element injector benchmark', function () { }); -function runClickTimeBenchmark(config) { +function runClickBenchmark(config) { var buttons = config.buttons.map(function(selector) { return $(selector); }); - var timeParams = browser.params.timeBenchmark; - benchpress.runTimeBenchmark({ + var timeParams = browser.params.benchmark; + benchpress.runBenchmark({ sampleSize: timeParams.sampleSize, targetCoefficientOfVariation: timeParams.targetCoefficientOfVariation, timeout: timeParams.timeout, diff --git a/modules/benchmarks/e2e_test/tree_perf.es6 b/modules/benchmarks/e2e_test/tree_perf.es6 index f1ee059ebd..82a1505f4f 100644 --- a/modules/benchmarks/e2e_test/tree_perf.es6 +++ b/modules/benchmarks/e2e_test/tree_perf.es6 @@ -9,7 +9,7 @@ describe('ng2 tree benchmark', function () { it('should log the ng stats', function() { browser.get(URL); - runClickTimeBenchmark({ + runClickBenchmark({ buttons: ['#ng2DestroyDom', '#ng2CreateDom'], logId: 'ng2.tree' }); @@ -17,7 +17,7 @@ describe('ng2 tree benchmark', function () { it('should log the baseline stats', function() { browser.get(URL); - runClickTimeBenchmark({ + runClickBenchmark({ buttons: ['#baselineDestroyDom', '#baselineCreateDom'], logId: 'baseline.tree' }); @@ -25,12 +25,12 @@ describe('ng2 tree benchmark', function () { }); -function runClickTimeBenchmark(config) { +function runClickBenchmark(config) { var buttons = config.buttons.map(function(selector) { return $(selector); }); - var timeParams = browser.params.timeBenchmark; - benchpress.runTimeBenchmark({ + var timeParams = browser.params.benchmark; + benchpress.runBenchmark({ sampleSize: timeParams.sampleSize, targetCoefficientOfVariation: timeParams.targetCoefficientOfVariation, timeout: timeParams.timeout, diff --git a/modules/benchmarks_external/e2e_test/compiler_perf.es6 b/modules/benchmarks_external/e2e_test/compiler_perf.es6 index b149e86c7a..85cc23cd28 100644 --- a/modules/benchmarks_external/e2e_test/compiler_perf.es6 +++ b/modules/benchmarks_external/e2e_test/compiler_perf.es6 @@ -9,7 +9,7 @@ describe('ng1.x compiler benchmark', function () { it('should log withBinding stats', function() { browser.get(URL); - runClickTimeBenchmark({ + runClickBenchmark({ buttons: ['#compileWithBindings'], logId: 'ng1.compile.withBindings' }); @@ -17,7 +17,7 @@ describe('ng1.x compiler benchmark', function () { it('should log noBindings stats', function() { browser.get(URL); - runClickTimeBenchmark({ + runClickBenchmark({ buttons: ['#compileNoBindings'], logId: 'ng1.compile.noBindings' }); @@ -25,12 +25,12 @@ describe('ng1.x compiler benchmark', function () { }); -function runClickTimeBenchmark(config) { +function runClickBenchmark(config) { var buttons = config.buttons.map(function(selector) { return $(selector); }); - var timeParams = browser.params.timeBenchmark; - benchpress.runTimeBenchmark({ + var timeParams = browser.params.benchmark; + benchpress.runBenchmark({ sampleSize: timeParams.sampleSize, targetCoefficientOfVariation: timeParams.targetCoefficientOfVariation, timeout: timeParams.timeout, diff --git a/modules/benchmarks_external/e2e_test/tree_perf.es6 b/modules/benchmarks_external/e2e_test/tree_perf.es6 index ce2adf2af5..b85d152e8e 100644 --- a/modules/benchmarks_external/e2e_test/tree_perf.es6 +++ b/modules/benchmarks_external/e2e_test/tree_perf.es6 @@ -9,7 +9,7 @@ describe('ng1.x tree benchmark', function () { it('should log the stats', function() { browser.get(URL); - runClickTimeBenchmark({ + runClickBenchmark({ buttons: ['#destroyDom', '#createDom'], logId: 'ng1.tree' }); @@ -17,12 +17,12 @@ describe('ng1.x tree benchmark', function () { }); -function runClickTimeBenchmark(config) { +function runClickBenchmark(config) { var buttons = config.buttons.map(function(selector) { return $(selector); }); - var timeParams = browser.params.timeBenchmark; - benchpress.runTimeBenchmark({ + var timeParams = browser.params.benchmark; + benchpress.runBenchmark({ sampleSize: timeParams.sampleSize, targetCoefficientOfVariation: timeParams.targetCoefficientOfVariation, timeout: timeParams.timeout, diff --git a/protractor-perf-shared.js b/protractor-perf-shared.js index 4436f428b8..b6026427f0 100644 --- a/protractor-perf-shared.js +++ b/protractor-perf-shared.js @@ -6,7 +6,7 @@ var config = exports.config = { specs: ['dist/cjs/**/*_perf.js'], params: { - timeBenchmark: { + benchmark: { // size of the sample to take sampleSize: 10, targetCoefficientOfVariation: 4, diff --git a/tools/benchpress/index.es6 b/tools/benchpress/index.es6 index ded2d8d211..1bf252309b 100644 --- a/tools/benchpress/index.es6 +++ b/tools/benchpress/index.es6 @@ -1,7 +1,7 @@ -var timeBenchmark = require('./src/time_benchmark'); +var benchmark = require('./src/benchmark'); var tools = require('./src/tools'); module.exports = { - runTimeBenchmark: timeBenchmark.runTimeBenchmark, + runBenchmark: benchmark.runBenchmark, verifyNoBrowserErrors: tools.verifyNoBrowserErrors }; \ No newline at end of file diff --git a/tools/benchpress/src/time_benchmark.es6 b/tools/benchpress/src/benchmark.es6 similarity index 98% rename from tools/benchpress/src/time_benchmark.es6 rename to tools/benchpress/src/benchmark.es6 index 39b8e90d64..236bf233ba 100644 --- a/tools/benchpress/src/time_benchmark.es6 +++ b/tools/benchpress/src/benchmark.es6 @@ -20,11 +20,11 @@ var MODE_INDETERMINATE = 'indeterminate'; var nextTimestampId = 0; module.exports = { - runTimeBenchmark: runTimeBenchmark, + runBenchmark: runBenchmark, supportedMetrics: SUPPORTED_METRICS }; -function runTimeBenchmark(config, workCallback) { +function runBenchmark(config, workCallback) { config.metrics.forEach(function(metric) { if (!(metric in SUPPORTED_METRICS)) { throw new Error('Metric '+metric+' is not suported by benchpress right now');