test: remove unused function arguments in async-hooks tests

Remove unused function arguments in three async-hooks tests and improve test consistancy. PR-URL: #24406 Reviewed-By: Weijia Wang <starkwang@126.com> Reviewed-By: Refael Ackermann <refack@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com>
nodejs · Nov 28, 2018 · 2777bc42aaa4b40debe7fdc17002a32f4c39aa71 · 2777bc4
1 parent ed78339
commit 2777bc42aaa4b40debe7fdc17002a32f4c39aa71
Showing with 14 additions and 16 deletions.

+2 −2 test/async-hooks/test-promise.chain-promise-before-init-hooks.js

+10 −12 test/async-hooks/test-promise.js

+2 −2 test/async-hooks/test-promise.promise-before-init-hooks.js
diff --git a/test/async-hooks/test-promise.chain-promise-before-init-hooks.js b/test/async-hooks/test-promise.chain-promise-before-init-hooks.js
@@ -8,11 +8,11 @@ const { checkInvocations } = require('./hook-checks');
 if (!common.isMainThread)
   common.skip('Worker bootstrapping works differently -> different async IDs');
 
-const p = new Promise(common.mustCall(function executor(resolve, reject) {
+const p = new Promise(common.mustCall(function executor(resolve) {
   resolve(5);
 }));
 
-p.then(function afterresolution(val) {
+p.then(function afterResolution(val) {
   assert.strictEqual(val, 5);
   return val;
 });

diff --git a/test/async-hooks/test-promise.js b/test/async-hooks/test-promise.js
@@ -13,24 +13,22 @@ const hooks = initHooks();
 
 hooks.enable();
 
-const p = (new Promise(common.mustCall(executor)));
-p.then(afterresolution);
-
-function executor(resolve, reject) {
-  const as = hooks.activitiesOfTypes('PROMISE');
-  assert.strictEqual(as.length, 1);
-  const a = as[0];
-  checkInvocations(a, { init: 1 }, 'while in promise executor');
-  resolve(5);
-}
-
-function afterresolution(val) {
+const p = new Promise(common.mustCall(executor));
+p.then(function afterResolution(val) {
   assert.strictEqual(val, 5);
   const as = hooks.activitiesOfTypes('PROMISE');
   assert.strictEqual(as.length, 2);
   checkInvocations(as[0], { init: 1 }, 'after resolution parent promise');
   checkInvocations(as[1], { init: 1, before: 1 },
                    'after resolution child promise');
+});
+
+function executor(resolve) {
+  const as = hooks.activitiesOfTypes('PROMISE');
+  assert.strictEqual(as.length, 1);
+  const a = as[0];
+  checkInvocations(a, { init: 1 }, 'while in promise executor');
+  resolve(5);
 }
 
 process.on('exit', onexit);

diff --git a/test/async-hooks/test-promise.promise-before-init-hooks.js b/test/async-hooks/test-promise.promise-before-init-hooks.js
@@ -5,15 +5,15 @@ const assert = require('assert');
 const initHooks = require('./init-hooks');
 const { checkInvocations } = require('./hook-checks');
 
-const p = new Promise(common.mustCall(function executor(resolve, reject) {
+const p = new Promise(common.mustCall(function executor(resolve) {
   resolve(5);
 }));
 
 // init hooks after promise was created
 const hooks = initHooks({ allowNoInit: true });
 hooks.enable();
 
-p.then(function afterresolution(val) {
+p.then(function afterResolution(val) {
   assert.strictEqual(val, 5);
   const as = hooks.activitiesOfTypes('PROMISE');
   assert.strictEqual(as.length, 1);