X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=tests%2Fpools%2Fthread%2Ffixed.test.js;h=acd944067c4e134b5f0a2f0dd31fa57bebed3ccd;hb=9a74dd068711dc57719532b141cd44b4938d2fb9;hp=065774ec695ef29a3c94dec2a96830d5f82cd68d;hpb=bb9423b78d11f9420b9b2a8cb865ea8c1315e642;p=poolifier.git

diff --git a/tests/pools/thread/fixed.test.js b/tests/pools/thread/fixed.test.js
index 065774ec..acd94406 100644
--- a/tests/pools/thread/fixed.test.js
+++ b/tests/pools/thread/fixed.test.js
@@ -11,7 +11,7 @@ describe('Fixed thread pool test suite', () => {
     numberOfThreads,
     './tests/worker-files/thread/testWorker.js',
     {
-      errorHandler: (e) => console.error(e)
+      errorHandler: e => console.error(e)
     }
   )
   const queuePool = new FixedThreadPool(
@@ -22,7 +22,7 @@ describe('Fixed thread pool test suite', () => {
       tasksQueueOptions: {
         concurrency: tasksConcurrency
       },
-      errorHandler: (e) => console.error(e)
+      errorHandler: e => console.error(e)
     }
   )
   const emptyPool = new FixedThreadPool(
@@ -38,14 +38,14 @@ describe('Fixed thread pool test suite', () => {
     numberOfThreads,
     './tests/worker-files/thread/errorWorker.js',
     {
-      errorHandler: (e) => console.error(e)
+      errorHandler: e => console.error(e)
     }
   )
   const asyncErrorPool = new FixedThreadPool(
     numberOfThreads,
     './tests/worker-files/thread/asyncErrorWorker.js',
     {
-      errorHandler: (e) => console.error(e)
+      errorHandler: e => console.error(e)
     }
   )
   const asyncPool = new FixedThreadPool(
@@ -84,20 +84,24 @@ describe('Fixed thread pool test suite', () => {
       numberOfThreads,
       './tests/worker-files/thread/testWorker.js',
       {
-        errorHandler: (e) => console.error(e)
+        errorHandler: e => console.error(e)
       }
     )
+    expect(pool.emitter.eventNames()).toStrictEqual([])
     let poolReady = 0
     pool.emitter.on(PoolEvents.ready, () => ++poolReady)
     await waitPoolEvents(pool, PoolEvents.ready, 1)
+    expect(pool.emitter.eventNames()).toStrictEqual([PoolEvents.ready])
     expect(poolReady).toBe(1)
     await pool.destroy()
   })
 
   it("Verify that 'busy' event is emitted", async () => {
     const promises = new Set()
+    expect(pool.emitter.eventNames()).toStrictEqual([])
     let poolBusy = 0
     pool.emitter.on(PoolEvents.busy, () => ++poolBusy)
+    expect(pool.emitter.eventNames()).toStrictEqual([PoolEvents.busy])
     for (let i = 0; i < numberOfThreads * 2; i++) {
       promises.add(pool.execute())
     }
@@ -205,10 +209,12 @@ describe('Fixed thread pool test suite', () => {
 
   it('Verify that error handling is working properly:sync', async () => {
     const data = { f: 10 }
+    expect(errorPool.emitter.eventNames()).toStrictEqual([])
     let taskError
-    errorPool.emitter.on(PoolEvents.taskError, (e) => {
+    errorPool.emitter.on(PoolEvents.taskError, e => {
       taskError = e
     })
+    expect(errorPool.emitter.eventNames()).toStrictEqual([PoolEvents.taskError])
     let inError
     try {
       await errorPool.execute(data)
@@ -227,17 +233,21 @@ describe('Fixed thread pool test suite', () => {
     })
     expect(
       errorPool.workerNodes.some(
-        (workerNode) => workerNode.usage.tasks.failed === 1
+        workerNode => workerNode.usage.tasks.failed === 1
       )
     ).toBe(true)
   })
 
   it('Verify that error handling is working properly:async', async () => {
     const data = { f: 10 }
+    expect(asyncErrorPool.emitter.eventNames()).toStrictEqual([])
     let taskError
-    asyncErrorPool.emitter.on(PoolEvents.taskError, (e) => {
+    asyncErrorPool.emitter.on(PoolEvents.taskError, e => {
       taskError = e
     })
+    expect(asyncErrorPool.emitter.eventNames()).toStrictEqual([
+      PoolEvents.taskError
+    ])
     let inError
     try {
       await asyncErrorPool.execute(data)
@@ -256,7 +266,7 @@ describe('Fixed thread pool test suite', () => {
     })
     expect(
       asyncErrorPool.workerNodes.some(
-        (workerNode) => workerNode.usage.tasks.failed === 1
+        workerNode => workerNode.usage.tasks.failed === 1
       )
     ).toBe(true)
   })
@@ -272,8 +282,13 @@ describe('Fixed thread pool test suite', () => {
 
   it('Shutdown test', async () => {
     const exitPromise = waitWorkerEvents(pool, 'exit', numberOfThreads)
+    expect(pool.emitter.eventNames()).toStrictEqual([PoolEvents.busy])
     let poolDestroy = 0
     pool.emitter.on(PoolEvents.destroy, () => ++poolDestroy)
+    expect(pool.emitter.eventNames()).toStrictEqual([
+      PoolEvents.busy,
+      PoolEvents.destroy
+    ])
     await pool.destroy()
     const numberOfExitEvents = await exitPromise
     expect(pool.started).toBe(false)
@@ -301,16 +316,28 @@ describe('Fixed thread pool test suite', () => {
   })
 
   it('Should work even without opts in input', async () => {
-    const pool = new FixedThreadPool(
-      numberOfThreads,
-      './tests/worker-files/thread/testWorker.js'
-    )
+    const workerFilePath = './tests/worker-files/thread/testWorker.js'
+    const pool = new FixedThreadPool(numberOfThreads, workerFilePath)
     const res = await pool.execute()
     expect(res).toStrictEqual({ ok: 1 })
     // We need to clean up the resources after our test
     await pool.destroy()
   })
 
+  it('Verify destroyWorkerNode()', async () => {
+    const workerFilePath = './tests/worker-files/thread/testWorker.js'
+    const pool = new FixedThreadPool(numberOfThreads, workerFilePath)
+    const workerNodeKey = 0
+    let exitEvent = 0
+    pool.workerNodes[workerNodeKey].worker.on('exit', () => {
+      ++exitEvent
+    })
+    await expect(pool.destroyWorkerNode(workerNodeKey)).resolves.toBeUndefined()
+    expect(exitEvent).toBe(1)
+    expect(pool.workerNodes.length).toBe(numberOfThreads - 1)
+    await pool.destroy()
+  })
+
   it('Verify that a pool with zero worker fails', async () => {
     expect(
       () => new FixedThreadPool(0, './tests/worker-files/thread/testWorker.js')