test: refactor to use getEventListeners in timers

Use `getEventListeners` instead of `listenerCount` because #35991 was landed. Refs: #35991 Refs: #36006 PR-URL: #47759 Reviewed-By: Daeyeon Jeong <[email protected]> Reviewed-By: Benjamin Gruenbaum <[email protected]> Reviewed-By: Mestery <[email protected]>
nodejs · May 3, 2023 · d16d4c9 · d16d4c9
1 parent 83e322c
commit d16d4c9
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/test/parallel/test-timers-immediate-promisified.js b/test/parallel/test-timers-immediate-promisified.js
@@ -6,7 +6,7 @@ const timers = require('timers');
 const { promisify } = require('util');
 const child_process = require('child_process');
 
-// TODO(benjamingr) - refactor to use getEventListeners when #35991 lands
+const { getEventListeners } = require('events');
 const { NodeEventTarget } = require('internal/event_target');
 
 const timerPromises = require('timers/promises');
@@ -60,7 +60,7 @@ process.on('multipleResolves', common.mustNotCall());
   const signal = new NodeEventTarget();
   signal.aborted = false;
   setPromiseImmediate(0, { signal }).finally(common.mustCall(() => {
-    assert.strictEqual(signal.listenerCount('abort'), 0);
+    assert.strictEqual(getEventListeners(signal, 'abort').length, 0);
   }));
 }
 

diff --git a/test/parallel/test-timers-interval-promisified.js b/test/parallel/test-timers-interval-promisified.js
@@ -6,7 +6,7 @@ const timers = require('timers');
 const { promisify } = require('util');
 const child_process = require('child_process');
 
-// TODO(benjamingr) - refactor to use getEventListeners when #35991 lands
+const { getEventListeners } = require('events');
 const { NodeEventTarget } = require('internal/event_target');
 
 const timerPromises = require('timers/promises');
@@ -122,10 +122,10 @@ process.on('multipleResolves', common.mustNotCall());
   signal.aborted = false;
   const iterator = setInterval(1, undefined, { signal });
   iterator.next().then(common.mustCall(() => {
-    assert.strictEqual(signal.listenerCount('abort'), 1);
+    assert.strictEqual(getEventListeners(signal, 'abort').length, 1);
     iterator.return();
   })).finally(common.mustCall(() => {
-    assert.strictEqual(signal.listenerCount('abort'), 0);
+    assert.strictEqual(getEventListeners(signal, 'abort').length, 0);
   }));
 }
 
@@ -139,15 +139,15 @@ process.on('multipleResolves', common.mustNotCall());
     // eslint-disable-next-line no-unused-vars
     for await (const _ of iterator) {
       if (i === 0) {
-        assert.strictEqual(signal.listenerCount('abort'), 1);
+        assert.strictEqual(getEventListeners(signal, 'abort').length, 1);
       }
       i++;
       if (i === 2) {
         break;
       }
     }
     assert.strictEqual(i, 2);
-    assert.strictEqual(signal.listenerCount('abort'), 0);
+    assert.strictEqual(getEventListeners(signal, 'abort').length, 0);
   }
 
   tryBreak().then(common.mustCall());

diff --git a/test/parallel/test-timers-timeout-promisified.js b/test/parallel/test-timers-timeout-promisified.js
@@ -6,7 +6,7 @@ const timers = require('timers');
 const { promisify } = require('util');
 const child_process = require('child_process');
 
-// TODO(benjamingr) - refactor to use getEventListeners when #35991 lands
+const { getEventListeners } = require('events');
 const { NodeEventTarget } = require('internal/event_target');
 
 const timerPromises = require('timers/promises');
@@ -60,7 +60,7 @@ process.on('multipleResolves', common.mustNotCall());
   const signal = new NodeEventTarget();
   signal.aborted = false;
   setPromiseTimeout(0, null, { signal }).finally(common.mustCall(() => {
-    assert.strictEqual(signal.listenerCount('abort'), 0);
+    assert.strictEqual(getEventListeners(signal, 'abort').length, 0);
   }));
 }