test: use shorthand properties

PR-URL: #18105
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: Weijia Wang <starkwang@126.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>

test/fixtures/tls-connect.js

@@ -44,10 +44,7 @@ exports.connect = function connect(options, callback) {
 
   const server = {};
   const client = {};
-  const pair = {
-    server: server,
-    client: client,
-  };
+  const pair = { server, client };
 
   tls.createServer(options.server, function(conn) {
     server.conn = conn;

test/internet/test-tls-reuse-host-from-socket.js

@@ -30,7 +30,7 @@ const tls = require('tls');
 const net = require('net');
 
 const socket = net.connect(443, 'www.example.org', common.mustCall(() => {
-  const secureSocket = tls.connect({ socket: socket }, common.mustCall(() => {
+  const secureSocket = tls.connect({ socket }, common.mustCall(() => {
     secureSocket.destroy();
     console.log('ok');
   }));

test/parallel/test-child-process-env.js

@@ -39,10 +39,10 @@ Object.setPrototypeOf(env, {
 let child;
 if (common.isWindows) {
   child = spawn('cmd.exe', ['/c', 'set'],
-                Object.assign({}, process.env, { env: env }));
+                Object.assign({}, process.env, { env }));
 } else {
   child = spawn('/usr/bin/env', [],
-                Object.assign({}, process.env, { env: env }));
+                Object.assign({}, process.env, { env }));
 }
 
 

test/parallel/test-cluster-dgram-1.js

@@ -102,7 +102,7 @@ function worker() {
 
     // Every 10 messages, notify the master.
     if (received === PACKETS_PER_WORKER) {
-      process.send({ received: received });
+      process.send({ received });
       socket.close();
     }
   }, PACKETS_PER_WORKER));

test/parallel/test-cluster-worker-no-exit.js

@@ -60,7 +60,7 @@ if (cluster.isMaster) {
 
     worker = cluster.fork()
       .on('online', function() {
-        this.send({ port: port });
+        this.send({ port });
       });
   });
   process.on('exit', function() {

test/parallel/test-fs-realpath-buffer-encoding.js

@@ -21,13 +21,13 @@ for (encoding in expected) {
   const expected_value = expected[encoding];
   let result;
 
-  result = fs.realpathSync(string_dir, { encoding: encoding });
+  result = fs.realpathSync(string_dir, { encoding });
   assert.strictEqual(result, expected_value);
 
   result = fs.realpathSync(string_dir, encoding);
   assert.strictEqual(result, expected_value);
 
-  result = fs.realpathSync(buffer_dir, { encoding: encoding });
+  result = fs.realpathSync(buffer_dir, { encoding });
   assert.strictEqual(result, expected_value);
 
   result = fs.realpathSync(buffer_dir, encoding);
@@ -53,7 +53,7 @@ for (encoding in expected) {
 
   fs.realpath(
     string_dir,
-    { encoding: encoding },
+    { encoding },
     common.mustCall((err, res) => {
       assert.ifError(err);
       assert.strictEqual(res, expected_value);
@@ -65,7 +65,7 @@ for (encoding in expected) {
   }));
   fs.realpath(
     buffer_dir,
-    { encoding: encoding },
+    { encoding },
     common.mustCall((err, res) => {
       assert.ifError(err);
       assert.strictEqual(res, expected_value);

test/parallel/test-fs-write-file-sync.js

@@ -51,7 +51,7 @@ common.refreshTmpDir();
 // Test writeFileSync
 const file1 = path.join(common.tmpDir, 'testWriteFileSync.txt');
 
-fs.writeFileSync(file1, '123', { mode: mode });
+fs.writeFileSync(file1, '123', { mode });
 
 content = fs.readFileSync(file1, { encoding: 'utf8' });
 assert.strictEqual(content, '123');
@@ -61,7 +61,7 @@ assert.strictEqual(fs.statSync(file1).mode & 0o777, mode);
 // Test appendFileSync
 const file2 = path.join(common.tmpDir, 'testAppendFileSync.txt');
 
-fs.appendFileSync(file2, 'abc', { mode: mode });
+fs.appendFileSync(file2, 'abc', { mode });
 
 content = fs.readFileSync(file2, { encoding: 'utf8' });
 assert.strictEqual(content, 'abc');

test/parallel/test-http-client-read-in-error.js

@@ -34,7 +34,7 @@ class Agent extends http.Agent {
 const agent = new Agent();
 
 http.request({
-  agent: agent
+  agent
 }).once('error', function() {
   console.log('ignore');
 });

test/parallel/test-http-pipeline-flood.js

@@ -66,7 +66,7 @@ function child() {
   const net = require('net');
 
   const port = +process.argv[3];
-  const conn = net.connect({ port: port });
+  const conn = net.connect({ port });
 
   let req = `GET / HTTP/1.1\r\nHost: localhost:${port}\r\nAccept: */*\r\n\r\n`;
 

test/parallel/test-http2-create-client-connect.js

@@ -22,8 +22,8 @@ const URL = url.URL;
       [`http://localhost:${port}`],
       [new URL(`http://localhost:${port}`)],
       [url.parse(`http://localhost:${port}`)],
-      [{ port: port }, { protocol: 'http:' }],
-      [{ port: port, hostname: '127.0.0.1' }, { protocol: 'http:' }]
+      [{ port }, { protocol: 'http:' }],
+      [{ port, hostname: '127.0.0.1' }, { protocol: 'http:' }]
     ];
 
     const serverClose = new Countdown(items.length + 1,

test/parallel/test-https-agent-create-connection.js

@@ -51,10 +51,7 @@ function createServer() {
       port: port,
       host: host,
       rejectUnauthorized: false,
-      _agentKey: agent.getName({
-        port: port,
-        host: host,
-      }),
+      _agentKey: agent.getName({ port, host })
     };
 
     const socket = agent.createConnection(options);
@@ -70,10 +67,7 @@ function createServer() {
     const host = 'localhost';
     const options = {
       rejectUnauthorized: false,
-      _agentKey: agent.getName({
-        port: port,
-        host: host,
-      }),
+      _agentKey: agent.getName({ port, host })
     };
     const socket = agent.createConnection(port, options);
     checkRequest(socket, server);
@@ -88,10 +82,7 @@ function createServer() {
     const host = 'localhost';
     const options = {
       rejectUnauthorized: false,
-      _agentKey: agent.getName({
-        port: port,
-        host: host,
-      }),
+      _agentKey: agent.getName({ port, host })
     };
     const socket = agent.createConnection(port, host, options);
     checkRequest(socket, server);

test/parallel/test-https-strict.js

@@ -112,11 +112,7 @@ function listening() {
 
 function makeReq(path, port, error, host, ca) {
   pending++;
-  const options = {
-    port: port,
-    path: path,
-    ca: ca
-  };
+  const options = { port, path, ca };
 
   if (!ca) {
     options.agent = agent0;
@@ -134,7 +130,7 @@ function makeReq(path, port, error, host, ca) {
   }
 
   if (host) {
-    options.headers = { host: host };
+    options.headers = { host };
   }
   const req = https.get(options);
   const server = port === server1.address().port ? server1 :

test/parallel/test-https-truncate.js

@@ -38,7 +38,7 @@ const data = Buffer.alloc(1024 * 32 + 1);
 httpsTest();
 
 function httpsTest() {
-  const sopt = { key: key, cert: cert };
+  const sopt = { key, cert };
 
   const server = https.createServer(sopt, function(req, res) {
     res.setHeader('content-length', data.length);

test/parallel/test-net-connect-options-port.js

@@ -60,7 +60,7 @@ const net = require('net');
 {
   // connect({hint}, cb) and connect({hint})
   const hints = (dns.ADDRCONFIG | dns.V4MAPPED) + 42;
-  const hintOptBlocks = doConnect([{ hints: hints }],
+  const hintOptBlocks = doConnect([{ hints }],
                                   () => common.mustNotCall());
   for (const block of hintOptBlocks) {
     common.expectsError(block, {

test/parallel/test-net-server-listen-handle.js

@@ -144,7 +144,7 @@ if (!common.isWindows) {  // Windows doesn't support {fd: <n>}
   // Test invalid fd
   const fd = fs.openSync(__filename, 'r');
   net.createServer()
-    .listen({ fd: fd }, common.mustNotCall())
+    .listen({ fd }, common.mustNotCall())
     .on('error', common.mustCall(function(err) {
       assert.strictEqual(String(err), 'Error: listen EINVAL');
       this.close();

test/parallel/test-net-server-listen-options.js

@@ -17,7 +17,7 @@ function close() { this.close(); }
     .on('listening', common.mustCall(close));
 }
 
-// Test listen(port, cb) and listen({port: port}, cb) combinations
+// Test listen(port, cb) and listen({ port }, cb) combinations
 const listenOnPort = [
   (port, cb) => net.createServer().listen({ port }, cb),
   (port, cb) => net.createServer().listen(port, cb)

test/parallel/test-stream2-readable-wrap.js

@@ -29,8 +29,7 @@ const EE = require('events').EventEmitter;
 function runTest(highWaterMark, objectMode, produce) {
 
   const old = new EE();
-  const r = new Readable({ highWaterMark: highWaterMark,
-                           objectMode: objectMode });
+  const r = new Readable({ highWaterMark, objectMode });
   assert.strictEqual(r, r.wrap(old));
 
   r.on('end', common.mustCall());
@@ -63,7 +62,7 @@ function runTest(highWaterMark, objectMode, produce) {
   }
 
   const w = new Writable({ highWaterMark: highWaterMark * 2,
-                           objectMode: objectMode });
+                           objectMode });
   const written = [];
   w._write = function(chunk, encoding, cb) {
     written.push(chunk);

test/parallel/test-tls-cert-regression.js

@@ -68,8 +68,8 @@ sPWhSOb9VQjMXekI4Y2l8fqAVTS2Fn6+8jkVKxXBywSVCw==
 
 function test(cert, key, cb) {
   const server = tls.createServer({
-    cert: cert,
-    key: key
+    cert,
+    key
   }).listen(0, function() {
     server.close(cb);
   });

test/parallel/test-tls-connect-no-host.js

@@ -16,8 +16,8 @@ const key = fixtures.readSync('test_key.pem');
 // tls.connect(options) with no options.host should accept a cert with
 //   CN:'localhost'
 tls.createServer({
-  key: key,
-  cert: cert
+  key,
+  cert
 }).listen(0, function() {
   const socket = tls.connect({
     port: this.address().port,

test/parallel/test-tls-ecdh-multiple.js

@@ -74,7 +74,7 @@ process.on('exit', function() {
     unsupportedCurves.push('brainpoolP256r1');
 
   unsupportedCurves.forEach((ecdhCurve) => {
-    assert.throws(() => tls.createServer({ ecdhCurve: ecdhCurve }),
+    assert.throws(() => tls.createServer({ ecdhCurve }),
                   /Error: Failed to set ECDH curve/);
   });
 });

test/parallel/test-tls-env-extra-ca.js

@@ -38,7 +38,7 @@ const server = tls.createServer(options, common.mustCall(function(s) {
     NODE_EXTRA_CA_CERTS: fixtures.path('keys', 'ca1-cert.pem')
   });
 
-  fork(__filename, { env: env }).on('exit', common.mustCall(function(status) {
+  fork(__filename, { env }).on('exit', common.mustCall(function(status) {
     assert.strictEqual(status, 0, 'client did not succeed in connecting');
   }));
 }));

test/parallel/test-tls-friendly-error-message.js

@@ -31,7 +31,7 @@ const tls = require('tls');
 const key = fixtures.readKey('agent1-key.pem');
 const cert = fixtures.readKey('agent1-cert.pem');
 
-tls.createServer({ key: key, cert: cert }, common.mustCall(function(conn) {
+tls.createServer({ key, cert }, common.mustCall(function(conn) {
   conn.end();
   this.close();
 })).listen(0, common.mustCall(function() {

test/parallel/test-tls-no-sslv3.js

@@ -13,7 +13,7 @@ const fixtures = require('../common/fixtures');
 
 const cert = fixtures.readSync('test_cert.pem');
 const key = fixtures.readSync('test_key.pem');
-const server = tls.createServer({ cert: cert, key: key }, common.mustNotCall());
+const server = tls.createServer({ cert, key }, common.mustNotCall());
 const errors = [];
 let stderr = '';
 

test/parallel/test-tls-over-http-tunnel.js

@@ -35,10 +35,7 @@ let gotRequest = false;
 const key = fixtures.readKey('agent1-key.pem');
 const cert = fixtures.readKey('agent1-cert.pem');
 
-const options = {
-  key: key,
-  cert: cert
-};
+const options = { key, cert };
 
 const server = https.createServer(options, function(req, res) {
   console.log('SERVER: got request');

test/parallel/test-tls-securepair-server.js

@@ -42,7 +42,7 @@ function log(a) {
 
 const server = net.createServer(common.mustCall(function(socket) {
   log(`connection fd=${socket.fd}`);
-  const sslcontext = tls.createSecureContext({ key: key, cert: cert });
+  const sslcontext = tls.createSecureContext({ key, cert });
   sslcontext.context.setCiphers('RC4-SHA:AES128-SHA:AES256-SHA');
 
   const pair = tls.createSecurePair(sslcontext, true);

test/parallel/test-tls-session-cache.js

@@ -71,10 +71,7 @@ function doTest(testOptions, callback) {
     // Emulate asynchronous store
     setTimeout(function() {
       assert.ok(!session);
-      session = {
-        id: id,
-        data: data
-      };
+      session = { id, data };
       cb();
     }, 1000);
   });

test/parallel/test-tls-starttls-server.js

@@ -21,10 +21,7 @@ const server = net.createServer(common.mustCall((s) => {
     isServer: true,
     server: server,
 
-    secureContext: tls.createSecureContext({
-      key: key,
-      cert: cert
-    }),
+    secureContext: tls.createSecureContext({ key, cert }),
 
     SNICallback: common.mustCall((hostname, callback) => {
       assert.strictEqual(hostname, 'test.test');

test/parallel/test-tls-zero-clear-in.js

@@ -32,8 +32,8 @@ const cert = fixtures.readSync('test_cert.pem');
 const key = fixtures.readSync('test_key.pem');
 
 const server = tls.createServer({
-  cert: cert,
-  key: key
+  cert,
+  key
 }, function(c) {
   // Nop
   setTimeout(function() {

test/parallel/test-util-inspect.js

@@ -149,7 +149,7 @@ for (const showHidden of [true, false]) {
 // Now do the same checks but from a different context
 for (const showHidden of [true, false]) {
   const ab = vm.runInNewContext('new ArrayBuffer(4)');
-  const dv = vm.runInNewContext('new DataView(ab, 1, 2)', { ab: ab });
+  const dv = vm.runInNewContext('new DataView(ab, 1, 2)', { ab });
   assert.strictEqual(
     util.inspect(ab, showHidden),
     'ArrayBuffer { byteLength: 4 }'

test/parallel/test-vm-access-process-env.js

@@ -29,7 +29,7 @@ const assert = require('assert');
 const vm = require('vm');
 
 assert.doesNotThrow(function() {
-  const context = vm.createContext({ process: process });
+  const context = vm.createContext({ process });
   const result = vm.runInContext('process.env["PATH"]', context);
   assert.notStrictEqual(undefined, result);
 });

test/parallel/test-vm-context.js

@@ -81,7 +81,7 @@ const contextifiedSandboxErrorMsg =
 script = vm.createScript('const assert = require(\'assert\'); assert.throws(' +
                          'function() { throw "hello world"; }, /hello/);',
                          'some.js');
-script.runInNewContext({ require: require });
+script.runInNewContext({ require });
 
 // Issue GH-7529
 script = vm.createScript('delete b');

test/parallel/test-vm-function-declaration.js

@@ -24,7 +24,7 @@ require('../common');
 const assert = require('assert');
 
 const vm = require('vm');
-const o = vm.createContext({ console: console });
+const o = vm.createContext({ console });
 
 // Function declaration and expression should both be copied to the
 // sandboxed context.