Benchmark cleanup

benchmark/assert/deepequal-prims-and-objs-big-array.js

@@ -1,22 +1,25 @@
 'use strict';
 var common = require('../common.js');
 var assert = require('assert');
+
+const primValues = {
+  'null': null,
+  'undefined': undefined,
+  'string': 'a',
+  'number': 1,
+  'boolean': true,
+  'object': { 0: 'a' },
+  'array': [1, 2, 3],
+  'new-array': new Array([1, 2, 3])
+};
+
 var bench = common.createBenchmark(main, {
-  prim: [
-    null,
-    undefined,
-    'a',
-    1,
-    true,
-    {0: 'a'},
-    [1, 2, 3],
-    new Array([1, 2, 3])
-  ],
+  prim: Object.keys(primValues),
   n: [25]
 });
 
 function main(conf) {
-  var prim = conf.prim;
+  var prim = primValues[conf.prim];
   var n = +conf.n;
   var primArray;
   var primArrayCompare;

benchmark/assert/deepequal-prims-and-objs-big-loop.js

@@ -1,22 +1,25 @@
 'use strict';
 var common = require('../common.js');
 var assert = require('assert');
+
+const primValues = {
+  'null': null,
+  'undefined': undefined,
+  'string': 'a',
+  'number': 1,
+  'boolean': true,
+  'object': { 0: 'a' },
+  'array': [1, 2, 3],
+  'new-array': new Array([1, 2, 3])
+};
+
 var bench = common.createBenchmark(main, {
-  prim: [
-    null,
-    undefined,
-    'a',
-    1,
-    true,
-    {0: 'a'},
-    [1, 2, 3],
-    new Array([1, 2, 3])
-  ],
+  prim: Object.keys(primValues),
   n: [1e5]
 });
 
 function main(conf) {
-  var prim = conf.prim;
+  var prim = primValues[conf.prim];
   var n = +conf.n;
   var x;
 

benchmark/buffers/buffer-read.js

@@ -2,7 +2,7 @@
 var common = require('../common.js');
 
 var bench = common.createBenchmark(main, {
-  noAssert: [false, true],
+  noAssert: ['false', 'true'],
   buffer: ['fast', 'slow'],
   type: ['UInt8', 'UInt16LE', 'UInt16BE',
          'UInt32LE', 'UInt32BE',

benchmark/buffers/buffer-tostring.js

@@ -3,13 +3,13 @@
 const common = require('../common.js');
 
 const bench = common.createBenchmark(main, {
-  arg: [true, false],
+  arg: ['true', 'false'],
   len: [0, 1, 64, 1024],
   n: [1e7]
 });
 
 function main(conf) {
-  const arg = conf.arg;
+  const arg = conf.arg === 'true';
   const len = conf.len | 0;
   const n = conf.n | 0;
   const buf = Buffer(len).fill(42);

benchmark/buffers/buffer-write.js

@@ -1,7 +1,7 @@
 'use strict';
 var common = require('../common.js');
 var bench = common.createBenchmark(main, {
-  noAssert: [false, true],
+  noAssert: ['false', 'true'],
   buffer: ['fast', 'slow'],
   type: ['UInt8', 'UInt16LE', 'UInt16BE',
          'UInt32LE', 'UInt32BE',

benchmark/common.js

@@ -154,6 +154,10 @@ Benchmark.prototype._run = function() {
     var j = 0;
     set.forEach(function(s) {
       vals.forEach(function(val) {
+        if (typeof val !== 'number' && typeof val !== 'string') {
+          throw new TypeError(`configuration "${key}" had type ${typeof val}`);
+        }
+
         newSet[j++] = s.concat(key + '=' + val);
       });
     });

benchmark/url/url-resolve.js

@@ -3,30 +3,43 @@ var common = require('../common.js');
 var url = require('url');
 var v8 = require('v8');
 
+var hrefs = [
+  'http://example.com/',
+  'http://nodejs.org/docs/latest/api/url.html#url_url_format_urlobj',
+  'http://blog.nodejs.org/',
+  'https://encrypted.google.com/search?q=url&q=site:npmjs.org&hl=en',
+  'javascript:alert("node is awesome");',
+  'some.ran/dom/url.thing?oh=yes#whoo'
+];
+
+
+var paths = [
+  '../../../../../etc/passwd',
+  '../foo/bar?baz=boom',
+  'foo/bar',
+  'http://nodejs.org',
+  './foo/bar?baz'
+];
+
 var bench = common.createBenchmark(main, {
-  type: ['one'],
-  n: [1e5],
+  href: Object.keys(hrefs),
+  path: Object.keys(paths),
+  n: [1e5]
 });
 
 function main(conf) {
-  var type = conf.type;
   var n = conf.n | 0;
-
-  var inputs = {
-    one: ['http://example.com/', '../../../../../etc/passwd'],
-  };
-  var input = inputs[type] || [];
+  var href = hrefs[conf.href];
+  var path = paths[conf.path];
 
   // Force-optimize url.resolve() so that the benchmark doesn't get
   // disrupted by the optimizer kicking in halfway through.
-  for (var name in inputs)
-    url.resolve(inputs[name][0], inputs[name][1]);
-
+  url.resolve(href, path);
   v8.setFlagsFromString('--allow_natives_syntax');
   eval('%OptimizeFunctionOnNextCall(url.resolve)');
 
   bench.start();
   for (var i = 0; i < n; i += 1)
-    url.resolve(input[0], input[1]);
+    url.resolve(href, path);
   bench.end(n);
 }