X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=tests%2Ftest-utils.js;h=dc8d5941f51b86da8433d239687f9cb061eb5cb3;hb=74f29142ea20199700ef7021402616ea9de714a8;hp=78218e2668c34bbfef44e680e1e9676eccf7b7cd;hpb=2d2e32c20d55c1b81771659fd81004bd7ca34b73;p=poolifier.git

diff --git a/tests/test-utils.js b/tests/test-utils.js
index 78218e26..dc8d5941 100644
--- a/tests/test-utils.js
+++ b/tests/test-utils.js
@@ -2,16 +2,16 @@ 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
+      for (const workerNode of pool.workerNodes) {
+        workerNode.worker.on('exit', () => {
+          ++exitEvents
           if (exitEvents === numberOfExitEventsToWait) {
             resolve(exitEvents)
           }
         })
-      })
+      }
     })
   }
 
@@ -36,6 +36,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 = {
@@ -65,9 +77,8 @@ class TestUtils {
   static factorial (n) {
     if (n === 0) {
       return 1
-    } else {
-      return TestUtils.factorial(n - 1) * n
     }
+    return TestUtils.factorial(n - 1) * n
   }
 
   static executeWorkerFunction (data) {