Merge branch 'master' into multiple-functions

[poolifier.git] / tests / test-utils.js

diff --git a/tests/test-utils.js b/tests/test-utils.js
index f4cb38b23cb1ca63c5c6e17109af45d59f66dc0d..a23d8948b146408e85b30b8d5e4c9ded9248d7c1 100644 (file)
--- 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)
           }
         })
-      })
+      }
     })
   }
 
@@ -37,14 +37,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 +59,6 @@ class TestUtils {
 
   /**
    * Intentionally inefficient implementation.
-   *
    * @param {number} n - The number of fibonacci numbers to generate.
    * @returns {number} - The nth fibonacci number.
    */
@@ -73,16 +69,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) {