test: remove 2 unneeded UTs

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

diff --git a/tests/pools/abstract/abstract-pool.test.js b/tests/pools/abstract/abstract-pool.test.js
index 2fac7f586da5c95f79943b2877150bb54cdb6215..2a6ba85850f5fca930a539f88439f943bb3754ad 100644 (file)
--- a/tests/pools/abstract/abstract-pool.test.js
+++ b/tests/pools/abstract/abstract-pool.test.js
@@ -1,3 +1,4 @@
+const { EventEmitter } = require('events')
 const { expect } = require('expect')
 const sinon = require('sinon')
 const {
@@ -178,7 +179,7 @@ describe('Abstract pool test suite', () => {
       numberOfWorkers,
       './tests/worker-files/thread/testWorker.js'
     )
-    expect(pool.emitter).toBeDefined()
+    expect(pool.emitter).toBeInstanceOf(EventEmitter)
     expect(pool.opts.enableEvents).toBe(true)
     expect(pool.opts.restartWorkerOnError).toBe(true)
     expect(pool.opts.enableTasksQueue).toBe(false)

diff --git a/tests/worker-files/cluster/asyncErrorWorker.js b/tests/worker-files/cluster/asyncErrorWorker.js
index 028a7cf3a77a97689442576fb40d6457c623df8c..468a0ff92ce8dbedfa925eef3ed30b2d44a1e1d3 100644 (file)
--- a/tests/worker-files/cluster/asyncErrorWorker.js
+++ b/tests/worker-files/cluster/asyncErrorWorker.js
@@ -12,6 +12,6 @@ async function error (data) {
 }
 
 module.exports = new ClusterWorker(error, {
-  maxInactiveTime: 500,
-  killBehavior: KillBehaviors.HARD
+  killBehavior: KillBehaviors.HARD,
+  maxInactiveTime: 500
 })

diff --git a/tests/worker-files/cluster/asyncWorker.js b/tests/worker-files/cluster/asyncWorker.js
index b03a505486e4af776ba12c830c53fb80ad68f221..f07625bd974bc5a6d0cc215547c1326962f2ee2d 100644 (file)
--- a/tests/worker-files/cluster/asyncWorker.js
+++ b/tests/worker-files/cluster/asyncWorker.js
@@ -7,6 +7,6 @@ async function sleep (data) {
 }
 
 module.exports = new ClusterWorker(sleep, {
-  maxInactiveTime: 500,
-  killBehavior: KillBehaviors.HARD
+  killBehavior: KillBehaviors.HARD,
+  maxInactiveTime: 500
 })

diff --git a/tests/worker-files/cluster/emptyWorker.js b/tests/worker-files/cluster/emptyWorker.js
index 01d1cf09812e4baf8584e5fc41f9920b7d1db2a0..02a733da0b9ada70a623f54d57f446c9ba2ad672 100644 (file)
--- a/tests/worker-files/cluster/emptyWorker.js
+++ b/tests/worker-files/cluster/emptyWorker.js
@@ -4,6 +4,6 @@ const { ClusterWorker, KillBehaviors } = require('../../../lib')
 function test () {}
 
 module.exports = new ClusterWorker(test, {
-  maxInactiveTime: 500,
-  killBehavior: KillBehaviors.HARD
+  killBehavior: KillBehaviors.HARD,
+  maxInactiveTime: 500
 })

diff --git a/tests/worker-files/cluster/errorWorker.js b/tests/worker-files/cluster/errorWorker.js
index 01cffc5e47641a74297f0ac1e11542eaf4f8e4d9..b8e11d369d20c3ff06e2fc506f83aeda39feaa49 100644 (file)
--- a/tests/worker-files/cluster/errorWorker.js
+++ b/tests/worker-files/cluster/errorWorker.js
@@ -6,6 +6,6 @@ function error () {
 }
 
 module.exports = new ClusterWorker(error, {
-  maxInactiveTime: 500,
-  killBehavior: KillBehaviors.HARD
+  killBehavior: KillBehaviors.HARD,
+  maxInactiveTime: 500
 })

diff --git a/tests/worker-files/cluster/longRunningWorkerHardBehavior.js b/tests/worker-files/cluster/longRunningWorkerHardBehavior.js
index f2c0c1e40bd1c23671aa62679a0475b08e6c2fb6..ee6b93cc87c922019d08d7809533b8f2b1305425 100644 (file)
--- a/tests/worker-files/cluster/longRunningWorkerHardBehavior.js
+++ b/tests/worker-files/cluster/longRunningWorkerHardBehavior.js
@@ -7,6 +7,6 @@ async function sleep (data) {
 }
 
 module.exports = new ClusterWorker(sleep, {
-  maxInactiveTime: 500,
-  killBehavior: KillBehaviors.HARD
+  killBehavior: KillBehaviors.HARD,
+  maxInactiveTime: 500
 })

diff --git a/tests/worker-files/cluster/testMultipleTaskFunctionsWorker.js b/tests/worker-files/cluster/testMultipleTaskFunctionsWorker.js
index 5072691b6e197d54f0b1444d447ca80b630e186b..2bb525e2ff3194b1169b6cb38d6310729b9a2df5 100644 (file)
--- a/tests/worker-files/cluster/testMultipleTaskFunctionsWorker.js
+++ b/tests/worker-files/cluster/testMultipleTaskFunctionsWorker.js
@@ -13,7 +13,7 @@ module.exports = new ClusterWorker(
     fibonacci: (data) => fibonacci(data.n)
   },
   {
-    maxInactiveTime: 500,
-    killBehavior: KillBehaviors.HARD
+    killBehavior: KillBehaviors.HARD,
+    maxInactiveTime: 500
   }
 )

diff --git a/tests/worker-files/cluster/testWorker.js b/tests/worker-files/cluster/testWorker.js
index 8462307cd8826a5b7328ea46405c84a0fbbaf00d..4511bcaacc72844582382b3a9e260df9dd4dc48a 100644 (file)
--- a/tests/worker-files/cluster/testWorker.js
+++ b/tests/worker-files/cluster/testWorker.js
@@ -10,6 +10,6 @@ function test (data) {
 }
 
 module.exports = new ClusterWorker(test, {
-  maxInactiveTime: 500,
-  killBehavior: KillBehaviors.HARD
+  killBehavior: KillBehaviors.HARD,
+  maxInactiveTime: 500
 })

diff --git a/tests/worker-files/thread/asyncErrorWorker.js b/tests/worker-files/thread/asyncErrorWorker.js
index c73fd2919230f03234726bba99e957e86596206b..f696b101947d6dc7ed180feae6fe7a0f763797b6 100644 (file)
--- a/tests/worker-files/thread/asyncErrorWorker.js
+++ b/tests/worker-files/thread/asyncErrorWorker.js
@@ -12,6 +12,6 @@ async function error (data) {
 }
 
 module.exports = new ThreadWorker(error, {
-  maxInactiveTime: 500,
-  killBehavior: KillBehaviors.HARD
+  killBehavior: KillBehaviors.HARD,
+  maxInactiveTime: 500
 })

diff --git a/tests/worker-files/thread/asyncWorker.js b/tests/worker-files/thread/asyncWorker.js
index 2b834b87fd33d9002bd664707159581824f90301..c3bcdc8d0a3b3b94c7a596086f0dc7a9be9739a4 100644 (file)
--- a/tests/worker-files/thread/asyncWorker.js
+++ b/tests/worker-files/thread/asyncWorker.js
@@ -7,6 +7,6 @@ async function sleep (data) {
 }
 
 module.exports = new ThreadWorker(sleep, {
-  maxInactiveTime: 500,
-  killBehavior: KillBehaviors.HARD
+  killBehavior: KillBehaviors.HARD,
+  maxInactiveTime: 500
 })

diff --git a/tests/worker-files/thread/emptyWorker.js b/tests/worker-files/thread/emptyWorker.js
index cb076770c8f59183d24b4504453ac3157d371079..d77b472d22ac3291b5657b8107a6a1c69861f6b7 100644 (file)
--- a/tests/worker-files/thread/emptyWorker.js
+++ b/tests/worker-files/thread/emptyWorker.js
@@ -4,6 +4,6 @@ const { ThreadWorker, KillBehaviors } = require('../../../lib')
 function test () {}
 
 module.exports = new ThreadWorker(test, {
-  maxInactiveTime: 500,
-  killBehavior: KillBehaviors.HARD
+  killBehavior: KillBehaviors.HARD,
+  maxInactiveTime: 500
 })

diff --git a/tests/worker-files/thread/errorWorker.js b/tests/worker-files/thread/errorWorker.js
index 19785dc36152b694d16e62468504590f9e921cb2..e5738982e9c40ee9f17ea83424ef91d9a01cba8a 100644 (file)
--- a/tests/worker-files/thread/errorWorker.js
+++ b/tests/worker-files/thread/errorWorker.js
@@ -6,6 +6,6 @@ function error () {
 }
 
 module.exports = new ThreadWorker(error, {
-  maxInactiveTime: 500,
-  killBehavior: KillBehaviors.HARD
+  killBehavior: KillBehaviors.HARD,
+  maxInactiveTime: 500
 })

diff --git a/tests/worker-files/thread/longRunningWorkerHardBehavior.js b/tests/worker-files/thread/longRunningWorkerHardBehavior.js
index daa381edb226803d905f19314a31530dc357532b..e7d84df9fe0205ab747559c2f8fa390c008349ea 100644 (file)
--- a/tests/worker-files/thread/longRunningWorkerHardBehavior.js
+++ b/tests/worker-files/thread/longRunningWorkerHardBehavior.js
@@ -7,6 +7,6 @@ async function sleep (data) {
 }
 
 module.exports = new ThreadWorker(sleep, {
-  maxInactiveTime: 500,
-  killBehavior: KillBehaviors.HARD
+  killBehavior: KillBehaviors.HARD,
+  maxInactiveTime: 500
 })

diff --git a/tests/worker-files/thread/testMultipleTaskFunctionsWorker.js b/tests/worker-files/thread/testMultipleTaskFunctionsWorker.js
index f2275269735e3ad11126b9527209164a8148954a..188c8e53ab3ce7c118bbc61dd2f5265f7102635b 100644 (file)
--- a/tests/worker-files/thread/testMultipleTaskFunctionsWorker.js
+++ b/tests/worker-files/thread/testMultipleTaskFunctionsWorker.js
@@ -13,7 +13,7 @@ module.exports = new ThreadWorker(
     fibonacci: (data) => fibonacci(data.n)
   },
   {
-    maxInactiveTime: 500,
-    killBehavior: KillBehaviors.HARD
+    killBehavior: KillBehaviors.HARD,
+    maxInactiveTime: 500
   }
 )

diff --git a/tests/worker-files/thread/testWorker.js b/tests/worker-files/thread/testWorker.js
index 64e7921acd3d8fb4a7f2e031c32b92100980396e..3945589f80cb088306c278ffcd5610526a615f6a 100644 (file)
--- a/tests/worker-files/thread/testWorker.js
+++ b/tests/worker-files/thread/testWorker.js
@@ -10,6 +10,6 @@ function test (data) {
 }
 
 module.exports = new ThreadWorker(test, {
-  maxInactiveTime: 500,
-  killBehavior: KillBehaviors.HARD
+  killBehavior: KillBehaviors.HARD,
+  maxInactiveTime: 500
 })

diff --git a/tests/worker/abstract-worker.test.js b/tests/worker/abstract-worker.test.js
index 0a920dd594f0e4e0578d35ce8ae25c1919820a85..62f6dd2bea37b3e8f4789ea2ed7c027cc0fe7a43 100644 (file)
--- a/tests/worker/abstract-worker.test.js
+++ b/tests/worker/abstract-worker.test.js
@@ -17,10 +17,11 @@ describe('Abstract worker test suite', () => {
 
   it('Verify worker options default values', () => {
     const worker = new ThreadWorker(() => {})
-    expect(worker.opts.maxInactiveTime).toStrictEqual(60000)
-    expect(worker.opts.killBehavior).toBe(KillBehaviors.SOFT)
-    expect(worker.opts.killHandler).toStrictEqual(EMPTY_FUNCTION)
-    expect(worker.opts.async).toBe(undefined)
+    expect(worker.opts).toStrictEqual({
+      killBehavior: KillBehaviors.SOFT,
+      maxInactiveTime: 60000,
+      killHandler: EMPTY_FUNCTION
+    })
   })
 
   it('Verify that worker options are set at worker creation', () => {
@@ -28,15 +29,16 @@ describe('Abstract worker test suite', () => {
       console.info('Worker received kill message')
     }
     const worker = new ClusterWorker(() => {}, {
-      maxInactiveTime: 6000,
       killBehavior: KillBehaviors.HARD,
+      maxInactiveTime: 6000,
       killHandler,
       async: true
     })
-    expect(worker.opts.maxInactiveTime).toStrictEqual(6000)
-    expect(worker.opts.killBehavior).toBe(KillBehaviors.HARD)
-    expect(worker.opts.killHandler).toStrictEqual(killHandler)
-    expect(worker.opts.async).toBe(undefined)
+    expect(worker.opts).toStrictEqual({
+      killBehavior: KillBehaviors.HARD,
+      maxInactiveTime: 6000,
+      killHandler
+    })
   })
 
   it('Verify that taskFunctions parameter is mandatory', () => {

diff --git a/tests/worker/cluster-worker.test.js b/tests/worker/cluster-worker.test.js
index 6bbf3246f0b806b37d1165a7a719b216511bb027..f857412bb8820690e887d7167a43515edd20dedd 100644 (file)
--- a/tests/worker/cluster-worker.test.js
+++ b/tests/worker/cluster-worker.test.js
@@ -12,11 +12,6 @@ describe('Cluster worker test suite', () => {
     }
   }
 
-  it('Verify worker has default maxInactiveTime', () => {
-    const worker = new ClusterWorker(() => {})
-    expect(worker.opts.maxInactiveTime).toStrictEqual(60000)
-  })
-
   it('Verify worker invokes the getMainWorker() and send() methods', () => {
     const worker = new SpyWorker(() => {})
     worker.sendToMainWorker({ ok: 1 })

diff --git a/tests/worker/thread-worker.test.js b/tests/worker/thread-worker.test.js
index 072617d35a4e47d3e1c7c0912b754e2afe4bb0cc..495e10b13b92e2ff663ff1de551b65028a8a3841 100644 (file)
--- a/tests/worker/thread-worker.test.js
+++ b/tests/worker/thread-worker.test.js
@@ -13,11 +13,6 @@ describe('Thread worker test suite', () => {
     }
   }
 
-  it('Verify worker has default maxInactiveTime', () => {
-    const worker = new ThreadWorker(() => {})
-    expect(worker.opts.maxInactiveTime).toStrictEqual(60000)
-  })
-
   it('Verify that handleError() method is working properly', () => {
     const error = new Error('Error as an error')
     const worker = new ThreadWorker(() => {})