X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=tests%2Ftest-utils.js;h=0e71c718a8eee83c85011e10f417725811ae34f8;hb=71002f09cd4b8ac7b8c6d5704222eb045acd1d7a;hp=31a33c627eec12c671872e3e2acf8c89d6bfe34c;hpb=6db75ad932064c1415ff6f03645929530209a5fe;p=poolifier.git

diff --git a/tests/test-utils.js b/tests/test-utils.js
index 31a33c62..0e71c718 100644
--- a/tests/test-utils.js
+++ b/tests/test-utils.js
@@ -1,17 +1,20 @@
-const WorkerFunctions = require('./test-types')
+const { WorkerFunctions } = require('./test-types')
 
 class TestUtils {
   static async waitExits (pool, numberOfExitEventsToWait) {
-    let exitEvents = 0
     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)
           }
         })
-      })
+      }
     })
   }
 
@@ -36,6 +39,18 @@ class TestUtils {
     })
   }
 
+  static generateRandomInteger (max = Number.MAX_SAFE_INTEGER, min = 0) {
+    if (max < min || max < 0 || min < 0) {
+      throw new RangeError('Invalid interval')
+    }
+    max = Math.floor(max)
+    if (min != null && min !== 0) {
+      min = Math.ceil(min)
+      return Math.floor(Math.random() * (max - min + 1)) + min
+    }
+    return Math.floor(Math.random() * (max + 1))
+  }
+
   static jsonIntegerSerialization (n) {
     for (let i = 0; i < n; i++) {
       const o = {
@@ -47,7 +62,6 @@ class TestUtils {
 
   /**
    * Intentionally inefficient implementation.
-   *
    * @param {number} n - The number of fibonacci numbers to generate.
    * @returns {number} - The nth fibonacci number.
    */
@@ -58,16 +72,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) {