X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=tests%2Ftest-utils.js;h=ef759824ce7e9b4d0294d84f2fa6dff02aba493a;hb=30d7f6e094a9b837fd85c74ef23188ab28e86644;hp=67d10e4a93e690c3cd70f6fc3d2e63641f91ff83;hpb=393e2d28fa2af53ff3e271a96daa19080b83ee89;p=poolifier.git

diff --git a/tests/test-utils.js b/tests/test-utils.js
index 67d10e4a..ef759824 100644
--- a/tests/test-utils.js
+++ b/tests/test-utils.js
@@ -1,10 +1,11 @@
-const { WorkerFunctions } = require('./test-types')
+const { TaskFunctions } = require('./test-types.js')
 
 const waitWorkerEvents = async (pool, workerEvent, numberOfEventsToWait) => {
-  return new Promise(resolve => {
+  return await new Promise(resolve => {
     let events = 0
     if (numberOfEventsToWait === 0) {
       resolve(events)
+      return
     }
     for (const workerNode of pool.workerNodes) {
       workerNode.worker.on(workerEvent, () => {
@@ -18,10 +19,11 @@ const waitWorkerEvents = async (pool, workerEvent, numberOfEventsToWait) => {
 }
 
 const waitPoolEvents = async (pool, poolEvent, numberOfEventsToWait) => {
-  return new Promise(resolve => {
+  return await new Promise(resolve => {
     let events = 0
     if (numberOfEventsToWait === 0) {
       resolve(events)
+      return
     }
     pool.emitter?.on(poolEvent, () => {
       ++events
@@ -33,16 +35,16 @@ const waitPoolEvents = async (pool, poolEvent, numberOfEventsToWait) => {
 }
 
 const sleep = async ms => {
-  return new Promise(resolve => setTimeout(resolve, ms))
+  return await new Promise(resolve => setTimeout(resolve, ms))
 }
 
-const sleepWorkerFunction = async (
+const sleepTaskFunction = async (
   data,
   ms,
   rejection = false,
   rejectionMessage = ''
 ) => {
-  return new Promise((resolve, reject) => {
+  return await new Promise((resolve, reject) => {
     setTimeout(
       () =>
         rejection === true
@@ -97,13 +99,13 @@ const factorial = n => {
   return factorial(n - 1) * n
 }
 
-const executeWorkerFunction = data => {
+const executeTaskFunction = data => {
   switch (data.function) {
-    case WorkerFunctions.jsonIntegerSerialization:
+    case TaskFunctions.jsonIntegerSerialization:
       return jsonIntegerSerialization(data.n || 100)
-    case WorkerFunctions.fibonacci:
+    case TaskFunctions.fibonacci:
       return fibonacci(data.n || 25)
-    case WorkerFunctions.factorial:
+    case TaskFunctions.factorial:
       return factorial(data.n || 100)
     default:
       throw new Error('Unknown worker function')
@@ -111,13 +113,13 @@ const executeWorkerFunction = data => {
 }
 
 module.exports = {
-  executeWorkerFunction,
+  executeTaskFunction,
   factorial,
   fibonacci,
   generateRandomInteger,
   jsonIntegerSerialization,
   sleep,
-  sleepWorkerFunction,
+  sleepTaskFunction,
   waitPoolEvents,
   waitWorkerEvents
 }