From 4dcda1a5911be5f1f99fd3107c428a008c7d4cfe Mon Sep 17 00:00:00 2001 From: Dario Piotrowicz Date: Mon, 20 Jan 2025 23:35:17 +0000 Subject: [PATCH 1/5] test: refactor `test-event-emitter-num-args` refacotr the structure of the `test-event-emitter-num-args` test file to improve its readability, use the node test runner and avoid collecting data and asserting it all in one go --- test/parallel/test-event-emitter-num-args.js | 46 +++++++++----------- 1 file changed, 21 insertions(+), 25 deletions(-) diff --git a/test/parallel/test-event-emitter-num-args.js b/test/parallel/test-event-emitter-num-args.js index 8bb22743033ca4..690cff7d91dcf7 100644 --- a/test/parallel/test-event-emitter-num-args.js +++ b/test/parallel/test-event-emitter-num-args.js @@ -20,35 +20,31 @@ // USE OR OTHER DEALINGS IN THE SOFTWARE. 'use strict'; -require('../common'); -const assert = require('assert'); -const events = require('events'); +const common = require('../common'); +const assert = require('node:assert'); +const events = require('node:events'); +const { test } = require('node:test'); -const e = new events.EventEmitter(); -const num_args_emitted = []; +[...Array(15).keys()].forEach(number => { + test(`eventEmitter.on registered callback correctly gets ${number} arguments`, () => { + const eventEmitter = new events.EventEmitter(); -e.on('numArgs', function() { - const numArgs = arguments.length; - num_args_emitted.push(numArgs); -}); - -e.on('foo', function() { - num_args_emitted.push(arguments.length); -}); + eventEmitter.on('numArgs', common.mustCall(function () { + assert.strictEqual(arguments.length, number); + })); -e.on('foo', function() { - num_args_emitted.push(arguments.length); -}); + eventEmitter.emit('numArgs', ...new Array(number).fill(null)); + }) -e.emit('numArgs'); -e.emit('numArgs', null); -e.emit('numArgs', null, null); -e.emit('numArgs', null, null, null); -e.emit('numArgs', null, null, null, null); -e.emit('numArgs', null, null, null, null, null); + test(`eventEmitter.on multiple registered callbacks correctly get ${number} arguments`, () => { + const eventEmitter = new events.EventEmitter(); -e.emit('foo', null, null, null, null); + [0, 1, 2].forEach(() => { + eventEmitter.on('numArgs', common.mustCall(function () { + assert.strictEqual(arguments.length, number); + })); + }) -process.on('exit', function() { - assert.deepStrictEqual(num_args_emitted, [0, 1, 2, 3, 4, 5, 4, 4]); + eventEmitter.emit('numArgs', ...new Array(number).fill(null)); + }) }); From 12597bbb12f3536bcdb4de5b64cd29117cdbcf6a Mon Sep 17 00:00:00 2001 From: Dario Piotrowicz Date: Tue, 21 Jan 2025 18:01:07 +0000 Subject: [PATCH 2/5] fixup! test: refactor `test-event-emitter-num-args` avoid array spearing --- test/parallel/test-event-emitter-num-args.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/parallel/test-event-emitter-num-args.js b/test/parallel/test-event-emitter-num-args.js index 690cff7d91dcf7..ee71e881460c76 100644 --- a/test/parallel/test-event-emitter-num-args.js +++ b/test/parallel/test-event-emitter-num-args.js @@ -25,7 +25,7 @@ const assert = require('node:assert'); const events = require('node:events'); const { test } = require('node:test'); -[...Array(15).keys()].forEach(number => { +[0, 1, 2, 3, 4, 5].forEach(number => { test(`eventEmitter.on registered callback correctly gets ${number} arguments`, () => { const eventEmitter = new events.EventEmitter(); From 0858c4d82dfd245a4826e6270f64e6094520930e Mon Sep 17 00:00:00 2001 From: Dario Piotrowicz Date: Tue, 21 Jan 2025 18:01:35 +0000 Subject: [PATCH 3/5] fixup! test: refactor `test-event-emitter-num-args` fix linting issues --- test/parallel/test-event-emitter-num-args.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/test/parallel/test-event-emitter-num-args.js b/test/parallel/test-event-emitter-num-args.js index ee71e881460c76..45b82a0f13ac38 100644 --- a/test/parallel/test-event-emitter-num-args.js +++ b/test/parallel/test-event-emitter-num-args.js @@ -25,26 +25,26 @@ const assert = require('node:assert'); const events = require('node:events'); const { test } = require('node:test'); -[0, 1, 2, 3, 4, 5].forEach(number => { +[0, 1, 2, 3, 4, 5].forEach((number) => { test(`eventEmitter.on registered callback correctly gets ${number} arguments`, () => { const eventEmitter = new events.EventEmitter(); - eventEmitter.on('numArgs', common.mustCall(function () { + eventEmitter.on('numArgs', common.mustCall(() => { assert.strictEqual(arguments.length, number); })); eventEmitter.emit('numArgs', ...new Array(number).fill(null)); - }) + }); test(`eventEmitter.on multiple registered callbacks correctly get ${number} arguments`, () => { const eventEmitter = new events.EventEmitter(); [0, 1, 2].forEach(() => { - eventEmitter.on('numArgs', common.mustCall(function () { + eventEmitter.on('numArgs', common.mustCall(() => { assert.strictEqual(arguments.length, number); })); - }) + }); eventEmitter.emit('numArgs', ...new Array(number).fill(null)); - }) + }); }); From 52bfe1a22f07f7c8137a0f646fe46dd7373881ac Mon Sep 17 00:00:00 2001 From: Dario Piotrowicz Date: Tue, 21 Jan 2025 21:39:07 +0000 Subject: [PATCH 4/5] fixup! test: refactor `test-event-emitter-num-args` fix dumb mistake --- test/parallel/test-event-emitter-num-args.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/parallel/test-event-emitter-num-args.js b/test/parallel/test-event-emitter-num-args.js index 45b82a0f13ac38..460c87ae1ead1b 100644 --- a/test/parallel/test-event-emitter-num-args.js +++ b/test/parallel/test-event-emitter-num-args.js @@ -29,7 +29,7 @@ const { test } = require('node:test'); test(`eventEmitter.on registered callback correctly gets ${number} arguments`, () => { const eventEmitter = new events.EventEmitter(); - eventEmitter.on('numArgs', common.mustCall(() => { + eventEmitter.on('numArgs', common.mustCall(function () { assert.strictEqual(arguments.length, number); })); @@ -40,7 +40,7 @@ const { test } = require('node:test'); const eventEmitter = new events.EventEmitter(); [0, 1, 2].forEach(() => { - eventEmitter.on('numArgs', common.mustCall(() => { + eventEmitter.on('numArgs', common.mustCall(function () { assert.strictEqual(arguments.length, number); })); }); From c8a4a7738417b3eedb491434ccbd3fd9de7b3efc Mon Sep 17 00:00:00 2001 From: Dario Piotrowicz Date: Tue, 21 Jan 2025 21:44:01 +0000 Subject: [PATCH 5/5] fixup! test: refactor `test-event-emitter-num-args` fix linting --- test/parallel/test-event-emitter-num-args.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/parallel/test-event-emitter-num-args.js b/test/parallel/test-event-emitter-num-args.js index 460c87ae1ead1b..5e5eac414c84c4 100644 --- a/test/parallel/test-event-emitter-num-args.js +++ b/test/parallel/test-event-emitter-num-args.js @@ -29,7 +29,7 @@ const { test } = require('node:test'); test(`eventEmitter.on registered callback correctly gets ${number} arguments`, () => { const eventEmitter = new events.EventEmitter(); - eventEmitter.on('numArgs', common.mustCall(function () { + eventEmitter.on('numArgs', common.mustCall(function() { assert.strictEqual(arguments.length, number); })); @@ -39,8 +39,8 @@ const { test } = require('node:test'); test(`eventEmitter.on multiple registered callbacks correctly get ${number} arguments`, () => { const eventEmitter = new events.EventEmitter(); - [0, 1, 2].forEach(() => { - eventEmitter.on('numArgs', common.mustCall(function () { + [0, 1, 2].forEach(function() { + eventEmitter.on('numArgs', common.mustCall(function() { assert.strictEqual(arguments.length, number); })); });