benchmark,test: use Object.hasOwn() where applicable

Trott · danielleadams · commit e68bf84e312d · 2022-01-31T23:53:29.000-05:00
Refs: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object/hasOwn PR-URL: #41229 Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com> Reviewed-By: Darshan Sen <raisinten@gmail.com> Reviewed-By: Luigi Pinca <luigipinca@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Tobias Nießen <tniessen@tnie.de>
diff --git a/benchmark/common.js b/benchmark/common.js
@@ -91,7 +91,7 @@ class Benchmark {
         process.exit(1);
       }
       const [, key, value] = match;
-      if (Object.prototype.hasOwnProperty.call(configs, key)) {
+      if (Object.hasOwn(configs, key)) {
         if (!cliOptions[key])
           cliOptions[key] = [];
         cliOptions[key].push(
diff --git a/benchmark/es/map-bench.js b/benchmark/es/map-bench.js
@@ -72,7 +72,7 @@ function fakeMap() {
     get(key) { return m[`$${key}`]; },
     set(key, val) { m[`$${key}`] = val; },
     get size() { return Object.keys(m).length; },
-    has(key) { return Object.prototype.hasOwnProperty.call(m, `$${key}`); }
+    has(key) { return Object.hasOwn(m, `$${key}`); }
   };
 }
 
diff --git a/test/parallel/test-http2-capture-rejection.js b/test/parallel/test-http2-capture-rejection.js
@@ -90,8 +90,7 @@ events.captureRejections = true;
 
     req.on('response', common.mustCall((headers) => {
       assert.strictEqual(headers[':status'], 500);
-      assert.strictEqual(Object.hasOwnProperty.call(headers, 'content-type'),
-                         false);
+      assert.strictEqual(Object.hasOwn(headers, 'content-type'), false);
     }));
 
     req.on('close', common.mustCall(() => {
diff --git a/test/parallel/test-http2-compat-serverrequest-host.js b/test/parallel/test-http2-compat-serverrequest-host.js
@@ -36,8 +36,8 @@ server.listen(0, common.mustCall(function() {
       assert.strictEqual(rawHeaders[position + 1], value);
     }
 
-    assert(!Object.hasOwnProperty.call(headers, ':authority'));
-    assert(!Object.hasOwnProperty.call(rawHeaders, ':authority'));
+    assert(!Object.hasOwn(headers, ':authority'));
+    assert(!Object.hasOwn(rawHeaders, ':authority'));
 
     response.on('finish', common.mustCall(function() {
       server.close();
diff --git a/test/parallel/test-process-env.js b/test/parallel/test-process-env.js
@@ -29,8 +29,7 @@ if (process.argv[2] === 'you-are-the-child') {
   assert.strictEqual('NODE_PROCESS_ENV_DELETED' in process.env, false);
   assert.strictEqual(process.env.NODE_PROCESS_ENV, '42');
   assert.strictEqual(process.env.hasOwnProperty, 'asdf');
-  const hasOwnProperty = Object.prototype.hasOwnProperty;
-  const has = hasOwnProperty.call(process.env, 'hasOwnProperty');
+  const has = Object.hasOwn(process.env, 'hasOwnProperty');
   assert.strictEqual(has, true);
   process.exit(0);
 }
diff --git a/test/parallel/test-whatwg-url-properties.js b/test/parallel/test-whatwg-url-properties.js
@@ -68,7 +68,7 @@ function testMethod(target, name, methodName = stringifyName(name)) {
   assert.strictEqual(typeof value, 'function');
   assert.strictEqual(value.name, methodName);
   assert.strictEqual(
-    Object.prototype.hasOwnProperty.call(value, 'prototype'),
+    Object.hasOwn(value, 'prototype'),
     false,
   );
 }
@@ -83,7 +83,7 @@ function testAccessor(target, name, readonly = false) {
   assert.strictEqual(typeof get, 'function');
   assert.strictEqual(get.name, `get ${methodName}`);
   assert.strictEqual(
-    Object.prototype.hasOwnProperty.call(get, 'prototype'),
+    Object.hasOwn(get, 'prototype'),
     false,
   );
 
@@ -93,7 +93,7 @@ function testAccessor(target, name, readonly = false) {
     assert.strictEqual(typeof set, 'function');
     assert.strictEqual(set.name, `set ${methodName}`);
     assert.strictEqual(
-      Object.prototype.hasOwnProperty.call(set, 'prototype'),
+      Object.hasOwn(set, 'prototype'),
       false,
     );
   }

Original file line number	Diff line number	Diff line change
`@@ -91,7 +91,7 @@ class Benchmark {`
`91`	`91`	`process.exit(1);`
`92`	`92`	`}`
`93`	`93`	`const [, key, value] = match;`
`94`		`- if (Object.prototype.hasOwnProperty.call(configs, key)) {`
	`94`	`+ if (Object.hasOwn(configs, key)) {`
`95`	`95`	`if (!cliOptions[key])`
`96`	`96`	`cliOptions[key] = [];`
`97`	`97`	`cliOptions[key].push(`
Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@ function fakeMap() {`
`72`	`72`	get(key) { return m[`$${key}`]; },
`73`	`73`	set(key, val) { m[`$${key}`] = val; },
`74`	`74`	`get size() { return Object.keys(m).length; },`
`75`		- has(key) { return Object.prototype.hasOwnProperty.call(m, `$${key}`); }
	`75`	+ has(key) { return Object.hasOwn(m, `$${key}`); }
`76`	`76`	`};`
`77`	`77`	`}`
`78`	`78`
Original file line number	Diff line number	Diff line change
`@@ -36,8 +36,8 @@ server.listen(0, common.mustCall(function() {`
`36`	`36`	`assert.strictEqual(rawHeaders[position + 1], value);`
`37`	`37`	`}`
`38`	`38`
`39`		`- assert(!Object.hasOwnProperty.call(headers, ':authority'));`
`40`		`- assert(!Object.hasOwnProperty.call(rawHeaders, ':authority'));`
	`39`	`+ assert(!Object.hasOwn(headers, ':authority'));`
	`40`	`+ assert(!Object.hasOwn(rawHeaders, ':authority'));`
`41`	`41`
`42`	`42`	`response.on('finish', common.mustCall(function() {`
`43`	`43`	`server.close();`