X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=tests%2Ftest-utils.js;h=cba320a75896311e11d7b0b69ff27cf721dd0807;hb=refs%2Ftags%2Fv2.6.2;hp=f4cb38b23cb1ca63c5c6e17109af45d59f66dc0d;hpb=4af5c11ae8d0f0ac6dfe1e597fc231f9724a665f;p=poolifier.git

diff --git a/tests/test-utils.js b/tests/test-utils.js
index f4cb38b2..cba320a7 100644
--- a/tests/test-utils.js
+++ b/tests/test-utils.js
@@ -1,16 +1,34 @@
 const { WorkerFunctions } = require('./test-types')
 
 class TestUtils {
-  static async waitExits (pool, numberOfExitEventsToWait) {
-    let exitEvents = 0
+  static async waitWorkerExits (pool, numberOfExitEventsToWait) {
     return new Promise(resolve => {
-      pool.workers.forEach(w => {
-        w.on('exit', () => {
-          exitEvents++
+      let exitEvents = 0
+      if (numberOfExitEventsToWait === 0) {
+        resolve(exitEvents)
+      }
+      for (const workerNode of pool.workerNodes) {
+        workerNode.worker.on('exit', () => {
+          ++exitEvents
           if (exitEvents === numberOfExitEventsToWait) {
             resolve(exitEvents)
           }
         })
+      }
+    })
+  }
+
+  static async waitPoolEvents (pool, poolEvent, numberOfEventsToWait) {
+    return new Promise(resolve => {
+      let events = 0
+      if (numberOfEventsToWait === 0) {
+        resolve(events)
+      }
+      pool.emitter.on(poolEvent, () => {
+        ++events
+        if (events === numberOfEventsToWait) {
+          resolve(events)
+        }
       })
     })
   }
@@ -37,14 +55,11 @@ class TestUtils {
   }
 
   static generateRandomInteger (max = Number.MAX_SAFE_INTEGER, min = 0) {
-    if (max < 0) {
+    if (max < min || max < 0 || min < 0) {
       throw new RangeError('Invalid interval')
     }
     max = Math.floor(max)
     if (min != null && min !== 0) {
-      if (max < min || min < 0) {
-        throw new RangeError('Invalid interval')
-      }
       min = Math.ceil(min)
       return Math.floor(Math.random() * (max - min + 1)) + min
     }
@@ -62,7 +77,6 @@ class TestUtils {
 
   /**
    * Intentionally inefficient implementation.
-   *
    * @param {number} n - The number of fibonacci numbers to generate.
    * @returns {number} - The nth fibonacci number.
    */
@@ -73,16 +87,14 @@ class TestUtils {
 
   /**
    * Intentionally inefficient implementation.
-   *
    * @param {number} n - The number to calculate the factorial of.
    * @returns {number} - The factorial of n.
    */
   static factorial (n) {
     if (n === 0) {
       return 1
-    } else {
-      return TestUtils.factorial(n - 1) * n
     }
+    return TestUtils.factorial(n - 1) * n
   }
 
   static executeWorkerFunction (data) {