refactor: code cleanup

Signed-off-by: Jérôme Benoit <jerome.benoit@piment-noir.org>

diff --git a/tests/pools/abstract-pool.test.mjs b/tests/pools/abstract-pool.test.mjs
index 84212a3f4f81f953fe50a718cac4f5f0edba1cdf..c7792d79f8cc476dfa205e976ac85a51895bbcf5 100644 (file)
--- a/tests/pools/abstract-pool.test.mjs
+++ b/tests/pools/abstract-pool.test.mjs
@@ -1,5 +1,7 @@
 import { EventEmitterAsyncResource } from 'node:events'
+import { dirname, join } from 'node:path'
 import { readFileSync } from 'node:fs'
+import { fileURLToPath } from 'node:url'
 import { expect } from 'expect'
 import { restore, stub } from 'sinon'
 import {
@@ -19,7 +21,12 @@ import { waitPoolEvents } from '../test-utils.js'
 import { WorkerNode } from '../../lib/pools/worker-node.js'
 
 describe('Abstract pool test suite', () => {
-  const version = JSON.parse(readFileSync('./package.json', 'utf8')).version
+  const version = JSON.parse(
+    readFileSync(
+      join(dirname(fileURLToPath(import.meta.url)), '../../package.json'),
+      'utf8'
+    )
+  ).version
   const numberOfWorkers = 2
   class StubPoolWithIsMain extends FixedThreadPool {
     isMain () {

diff --git a/tests/test-utils.js b/tests/test-utils.js
index 4478d29015ede00b981e8e66262204e2dc686a04..3963adecdba419b1d9d09437b08312ed02f631f9 100644 (file)
--- a/tests/test-utils.js
+++ b/tests/test-utils.js
@@ -1,4 +1,4 @@
-const { TaskFunctions } = require('./test-types')
+const { TaskFunctions } = require('./test-types.js')
 
 const waitWorkerEvents = async (pool, workerEvent, numberOfEventsToWait) => {
   return await new Promise(resolve => {

diff --git a/tests/worker-files/cluster/asyncErrorWorker.js b/tests/worker-files/cluster/asyncErrorWorker.js
index 468a0ff92ce8dbedfa925eef3ed30b2d44a1e1d3..f358fc3ea409ddb987efa05a1ab38ee245afc4df 100644 (file)
--- a/tests/worker-files/cluster/asyncErrorWorker.js
+++ b/tests/worker-files/cluster/asyncErrorWorker.js
@@ -1,6 +1,6 @@
 'use strict'
 const { ClusterWorker, KillBehaviors } = require('../../../lib')
-const { sleepTaskFunction } = require('../../test-utils')
+const { sleepTaskFunction } = require('../../test-utils.js')
 
 async function error (data) {
   return sleepTaskFunction(

diff --git a/tests/worker-files/cluster/asyncWorker.js b/tests/worker-files/cluster/asyncWorker.js
index f07625bd974bc5a6d0cc215547c1326962f2ee2d..3ec0d9508849627e494139fd0d5b70517abd631c 100644 (file)
--- a/tests/worker-files/cluster/asyncWorker.js
+++ b/tests/worker-files/cluster/asyncWorker.js
@@ -1,6 +1,6 @@
 'use strict'
 const { ClusterWorker, KillBehaviors } = require('../../../lib')
-const { sleepTaskFunction } = require('../../test-utils')
+const { sleepTaskFunction } = require('../../test-utils.js')
 
 async function sleep (data) {
   return sleepTaskFunction(data, 2000)

diff --git a/tests/worker-files/cluster/longRunningWorkerHardBehavior.js b/tests/worker-files/cluster/longRunningWorkerHardBehavior.js
index ee6b93cc87c922019d08d7809533b8f2b1305425..a95d6538b49f3647c5376c8f4459db799ac92c6c 100644 (file)
--- a/tests/worker-files/cluster/longRunningWorkerHardBehavior.js
+++ b/tests/worker-files/cluster/longRunningWorkerHardBehavior.js
@@ -1,6 +1,6 @@
 'use strict'
 const { ClusterWorker, KillBehaviors } = require('../../../lib')
-const { sleepTaskFunction } = require('../../test-utils')
+const { sleepTaskFunction } = require('../../test-utils.js')
 
 async function sleep (data) {
   return sleepTaskFunction(data, 50000)

diff --git a/tests/worker-files/cluster/longRunningWorkerSoftBehavior.js b/tests/worker-files/cluster/longRunningWorkerSoftBehavior.js
index cd057ef06562455a2b30a93140ba23efa404c568..0459acf73067dde08a3eadf59bbad27783fc2ce5 100644 (file)
--- a/tests/worker-files/cluster/longRunningWorkerSoftBehavior.js
+++ b/tests/worker-files/cluster/longRunningWorkerSoftBehavior.js
@@ -1,6 +1,6 @@
 'use strict'
 const { ClusterWorker } = require('../../../lib')
-const { sleepTaskFunction } = require('../../test-utils')
+const { sleepTaskFunction } = require('../../test-utils.js')
 
 async function sleep (data) {
   return sleepTaskFunction(data, 50000)

diff --git a/tests/worker-files/cluster/testMultipleTaskFunctionsWorker.js b/tests/worker-files/cluster/testMultipleTaskFunctionsWorker.js
index aecd5bbf9afcac9c0bb85c586205361323afc0a8..0777cecb011019367c412359bc2ec766066b6a63 100644 (file)
--- a/tests/worker-files/cluster/testMultipleTaskFunctionsWorker.js
+++ b/tests/worker-files/cluster/testMultipleTaskFunctionsWorker.js
@@ -4,7 +4,7 @@ const {
   jsonIntegerSerialization,
   factorial,
   fibonacci
-} = require('../../test-utils')
+} = require('../../test-utils.js')
 
 module.exports = new ClusterWorker(
   {

diff --git a/tests/worker-files/cluster/testWorker.js b/tests/worker-files/cluster/testWorker.js
index 4511bcaacc72844582382b3a9e260df9dd4dc48a..57715266bcf7c181c955b4995ec4ee9b9c46c981 100644 (file)
--- a/tests/worker-files/cluster/testWorker.js
+++ b/tests/worker-files/cluster/testWorker.js
@@ -1,7 +1,7 @@
 'use strict'
 const { ClusterWorker, KillBehaviors } = require('../../../lib')
-const { executeTaskFunction } = require('../../test-utils')
-const { TaskFunctions } = require('../../test-types')
+const { executeTaskFunction } = require('../../test-utils.js')
+const { TaskFunctions } = require('../../test-types.js')
 
 function test (data) {
   data = data || {}

diff --git a/tests/worker-files/thread/asyncErrorWorker.mjs b/tests/worker-files/thread/asyncErrorWorker.mjs
index ff16bb6a87251d7e7315580eb620d478d018d943..c7c9371c565d6b9bcb486737bfd7414825e7cf82 100644 (file)
--- a/tests/worker-files/thread/asyncErrorWorker.mjs
+++ b/tests/worker-files/thread/asyncErrorWorker.mjs
@@ -4,6 +4,7 @@ import { sleepTaskFunction } from '../../test-utils.js'
 /**
  *
  * @param data
+ * @returns
  */
 async function error (data) {
   return sleepTaskFunction(

diff --git a/tests/worker-files/thread/asyncWorker.mjs b/tests/worker-files/thread/asyncWorker.mjs
index 4c52783f7bdb8df473b0b91ec1494f7c6c94bf1b..30442bfca19b8ca1219eb4ee02c8e17d7425499c 100644 (file)
--- a/tests/worker-files/thread/asyncWorker.mjs
+++ b/tests/worker-files/thread/asyncWorker.mjs
@@ -4,6 +4,7 @@ import { sleepTaskFunction } from '../../test-utils.js'
 /**
  *
  * @param data
+ * @returns
  */
 async function sleep (data) {
   return sleepTaskFunction(data, 2000)

diff --git a/tests/worker-files/thread/echoWorker.mjs b/tests/worker-files/thread/echoWorker.mjs
index 0b9251cb1138eba4c8f687c146d197b9071f9357..04b6c9965f2b1b11e3a93d58499f8e02bec73cad 100644 (file)
--- a/tests/worker-files/thread/echoWorker.mjs
+++ b/tests/worker-files/thread/echoWorker.mjs
@@ -3,6 +3,7 @@ import { KillBehaviors, ThreadWorker } from '../../../lib/index.js'
 /**
  *
  * @param data
+ * @returns
  */
 function echo (data) {
   return data

diff --git a/tests/worker-files/thread/longRunningWorkerHardBehavior.mjs b/tests/worker-files/thread/longRunningWorkerHardBehavior.mjs
index 911ddb9ffdfc11542bb06a5dc7ae77bce6224867..01cf3c0e6013cc8240f36a5866ac72e5bd160cbc 100644 (file)
--- a/tests/worker-files/thread/longRunningWorkerHardBehavior.mjs
+++ b/tests/worker-files/thread/longRunningWorkerHardBehavior.mjs
@@ -4,6 +4,7 @@ import { sleepTaskFunction } from '../../test-utils.js'
 /**
  *
  * @param data
+ * @returns
  */
 async function sleep (data) {
   return sleepTaskFunction(data, 50000)

diff --git a/tests/worker-files/thread/longRunningWorkerSoftBehavior.mjs b/tests/worker-files/thread/longRunningWorkerSoftBehavior.mjs
index 6441a1837a6cbf127b236e632502460a77c2966d..9083e1d1b3692119bcda3608ad39738159c262b9 100644 (file)
--- a/tests/worker-files/thread/longRunningWorkerSoftBehavior.mjs
+++ b/tests/worker-files/thread/longRunningWorkerSoftBehavior.mjs
@@ -4,6 +4,7 @@ import { sleepTaskFunction } from '../../test-utils.js'
 /**
  *
  * @param data
+ * @returns
  */
 async function sleep (data) {
   return sleepTaskFunction(data, 50000)

diff --git a/tests/worker-files/thread/testWorker.mjs b/tests/worker-files/thread/testWorker.mjs
index e2c6706752ccee68ed96575a34ecec744633468b..618a9ac00c3be427f13e528b097fb449b758cb5a 100644 (file)
--- a/tests/worker-files/thread/testWorker.mjs
+++ b/tests/worker-files/thread/testWorker.mjs
@@ -5,6 +5,7 @@ import { TaskFunctions } from '../../test-types.js'
 /**
  *
  * @param data
+ * @returns
  */
 function test (data) {
   data = data || {}