X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=tests%2Fpools%2Fthread%2Ffixed.test.js;h=785c6e5d2d01c8801c0e34e1d33bc292bd543347;hb=ac1417a5d54f03b1575de1a53073182ea5f4e2ef;hp=cc60a9b5a021253819445d46ff49fab6e91abe2f;hpb=1927ee6758147bb8a2479b987322564cea20992b;p=poolifier.git

diff --git a/tests/pools/thread/fixed.test.js b/tests/pools/thread/fixed.test.js
index cc60a9b5..785c6e5d 100644
--- a/tests/pools/thread/fixed.test.js
+++ b/tests/pools/thread/fixed.test.js
@@ -1,4 +1,4 @@
-const expect = require('expect')
+const { expect } = require('expect')
 const { FixedThreadPool } = require('../../../lib/index')
 const TestUtils = require('../../test-utils')
 const numberOfThreads = 10
@@ -11,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,
@@ -21,8 +22,14 @@ 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(
@@ -36,6 +43,7 @@ describe('Fixed thread pool test suite', () => {
     await echoPool.destroy()
     await asyncPool.destroy()
     await errorPool.destroy()
+    await asyncErrorPool.destroy()
     await emptyPool.destroy()
   })
 
@@ -59,6 +67,18 @@ 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' }))
+    }
+    // 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()
@@ -71,7 +91,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 {
@@ -79,9 +99,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 () => {
@@ -97,8 +134,8 @@ describe('Fixed thread pool test suite', () => {
   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 () => {