Fix pool execute promises fullfilment in tests

[poolifier.git] / tests / pools / thread / fixed.test.js

diff --git a/tests/pools/thread/fixed.test.js b/tests/pools/thread/fixed.test.js
index 9a2d74d30bc2f2bb194effd9494b90bf7252b6ed..f89977b3a5be536f71972c2db66e2837eac4f3b4 100644 (file)
--- a/tests/pools/thread/fixed.test.js
+++ b/tests/pools/thread/fixed.test.js
@@ -1,8 +1,7 @@
-const expect = require('expect')
+const { expect } = require('expect')
 const { FixedThreadPool } = require('../../../lib/index')
 const TestUtils = require('../../test-utils')
 const numberOfThreads = 10
-const maxTasks = 400
 const pool = new FixedThreadPool(
   numberOfThreads,
   './tests/worker-files/thread/testWorker.js',
@@ -12,7 +11,8 @@ const pool = new FixedThreadPool(
 )
 const emptyPool = new FixedThreadPool(
   1,
-  './tests/worker-files/thread/emptyWorker.js'
+  './tests/worker-files/thread/emptyWorker.js',
+  { exitHandler: () => console.log('empty pool worker exited') }
 )
 const echoPool = new FixedThreadPool(
   1,
@@ -22,14 +22,19 @@ const errorPool = new FixedThreadPool(
   1,
   './tests/worker-files/thread/errorWorker.js',
   {
-    errorHandler: e => console.error(e),
-    onlineHandler: () => console.log('worker is online')
+    errorHandler: e => console.error(e)
+  }
+)
+const asyncErrorPool = new FixedThreadPool(
+  1,
+  './tests/worker-files/thread/asyncErrorWorker.js',
+  {
+    errorHandler: e => console.error(e)
   }
 )
 const asyncPool = new FixedThreadPool(
   1,
-  './tests/worker-files/thread/asyncWorker.js',
-  { maxTasks: maxTasks }
+  './tests/worker-files/thread/asyncWorker.js'
 )
 
 describe('Fixed thread pool test suite', () => {
@@ -38,6 +43,7 @@ describe('Fixed thread pool test suite', () => {
     await echoPool.destroy()
     await asyncPool.destroy()
     await errorPool.destroy()
+    await asyncErrorPool.destroy()
     await emptyPool.destroy()
   })
 
@@ -61,6 +67,19 @@ describe('Fixed thread pool test suite', () => {
     expect(result).toBeFalsy()
   })
 
+  it('Verify that busy event is emitted', async () => {
+    const promises = []
+    let poolBusy = 0
+    pool.emitter.on('busy', () => poolBusy++)
+    for (let i = 0; i < numberOfThreads * 2; i++) {
+      promises.push(pool.execute({ test: 'test' }))
+    }
+    await Promise.all(promises)
+    // The `busy` event is triggered when the number of submitted tasks at once reach the number of fixed pool workers.
+    // So in total numberOfThreads + 1 times for a loop submitting up to numberOfThreads * 2 tasks to the fixed pool.
+    expect(poolBusy).toBe(numberOfThreads + 1)
+  })
+
   it('Verify that is possible to have a worker that return undefined', async () => {
     const result = await emptyPool.execute()
     expect(result).toBeFalsy()
@@ -73,7 +92,7 @@ describe('Fixed thread pool test suite', () => {
     expect(result.f).toBe(data.f)
   })
 
-  it('Verify that error handling is working properly', async () => {
+  it('Verify that error handling is working properly:sync', async () => {
     const data = { f: 10 }
     let inError
     try {
@@ -81,9 +100,26 @@ describe('Fixed thread pool test suite', () => {
     } catch (e) {
       inError = e
     }
-    expect(inError).toBeTruthy()
-    expect(inError instanceof Error).toBeTruthy()
-    expect(inError.message).toBeTruthy()
+    expect(inError).toBeDefined()
+    expect(inError).toBeInstanceOf(Error)
+    expect(inError.message).toBeDefined()
+    expect(typeof inError.message === 'string').toBe(true)
+    expect(inError.message).toBe('Error Message from ThreadWorker')
+  })
+
+  it('Verify that error handling is working properly:async', async () => {
+    const data = { f: 10 }
+    let inError
+    try {
+      await asyncErrorPool.execute(data)
+    } catch (e) {
+      inError = e
+    }
+    expect(inError).toBeDefined()
+    expect(inError).toBeInstanceOf(Error)
+    expect(inError.message).toBeDefined()
+    expect(typeof inError.message === 'string').toBe(true)
+    expect(inError.message).toBe('Error Message from ThreadWorker:async')
   })
 
   it('Verify that async function is working properly', async () => {
@@ -96,16 +132,11 @@ describe('Fixed thread pool test suite', () => {
     expect(usedTime).toBeGreaterThanOrEqual(2000)
   })
 
-  it('Verify that maxTasks is set properly', async () => {
-    const worker = asyncPool.chooseWorker()
-    expect(worker.port2.getMaxListeners()).toBe(maxTasks)
-  })
-
   it('Shutdown test', async () => {
     const exitPromise = TestUtils.waitExits(pool, numberOfThreads)
     await pool.destroy()
-    const res = await exitPromise
-    expect(res).toBe(numberOfThreads)
+    const numberOfExitEvents = await exitPromise
+    expect(numberOfExitEvents).toBe(numberOfThreads)
   })
 
   it('Should work even without opts in input', async () => {