X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=tests%2Ftest-utils.js;h=a23d8948b146408e85b30b8d5e4c9ded9248d7c1;hb=227be16668f5a3adf78a255c20e956d6f5b3f567;hp=76db35571578428b8c6a7a74a91ea4e42cff1dea;hpb=b1620ccf72bc772e9d0542da28dcff9e52b4174a;p=poolifier.git diff --git a/tests/test-utils.js b/tests/test-utils.js index 76db3557..a23d8948 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) } }) - }) + } }) } @@ -37,8 +37,11 @@ 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) { + if (min != null && min !== 0) { min = Math.ceil(min) return Math.floor(Math.random() * (max - min + 1)) + min } @@ -56,7 +59,6 @@ class TestUtils { /** * Intentionally inefficient implementation. - * * @param {number} n - The number of fibonacci numbers to generate. * @returns {number} - The nth fibonacci number. */ @@ -67,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) {