X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=tests%2Fpools%2Fthread%2Ffixed.test.js;h=a42b5d37ede902bd5c6a490ce7ff832e6025d1fc;hb=aee467366d8c393b79e7af82c6a7ab12338ee64e;hp=81ef967ec5e0540abdd94a697b642b3e08c69b3e;hpb=8620fb25c8b80fc7ef55d76e19781181571c5502;p=poolifier.git

diff --git a/tests/pools/thread/fixed.test.js b/tests/pools/thread/fixed.test.js
index 81ef967e..a42b5d37 100644
--- a/tests/pools/thread/fixed.test.js
+++ b/tests/pools/thread/fixed.test.js
@@ -1,43 +1,45 @@
-const expect = require('expect')
-const { FixedThreadPool } = require('../../../lib/index')
+const { expect } = require('expect')
+const { FixedThreadPool, PoolEvents } = require('../../../lib/index')
+const { WorkerFunctions } = require('../../test-types')
 const TestUtils = require('../../test-utils')
-const numberOfThreads = 10
-const pool = new FixedThreadPool(
-  numberOfThreads,
-  './tests/worker-files/thread/testWorker.js',
-  {
-    errorHandler: e => console.error(e)
-  }
-)
-const emptyPool = new FixedThreadPool(
-  1,
-  './tests/worker-files/thread/emptyWorker.js',
-  { exitHandler: () => console.log('empty pool worker exited') }
-)
-const echoPool = new FixedThreadPool(
-  1,
-  './tests/worker-files/thread/echoWorker.js'
-)
-const errorPool = new FixedThreadPool(
-  1,
-  './tests/worker-files/thread/errorWorker.js',
-  {
-    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'
-)
 
 describe('Fixed thread pool test suite', () => {
+  const numberOfThreads = 6
+  const pool = new FixedThreadPool(
+    numberOfThreads,
+    './tests/worker-files/thread/testWorker.js',
+    {
+      errorHandler: e => console.error(e)
+    }
+  )
+  const emptyPool = new FixedThreadPool(
+    numberOfThreads,
+    './tests/worker-files/thread/emptyWorker.js',
+    { exitHandler: () => console.log('empty pool worker exited') }
+  )
+  const echoPool = new FixedThreadPool(
+    numberOfThreads,
+    './tests/worker-files/thread/echoWorker.js'
+  )
+  const errorPool = new FixedThreadPool(
+    numberOfThreads,
+    './tests/worker-files/thread/errorWorker.js',
+    {
+      errorHandler: e => console.error(e)
+    }
+  )
+  const asyncErrorPool = new FixedThreadPool(
+    numberOfThreads,
+    './tests/worker-files/thread/asyncErrorWorker.js',
+    {
+      errorHandler: e => console.error(e)
+    }
+  )
+  const asyncPool = new FixedThreadPool(
+    numberOfThreads,
+    './tests/worker-files/thread/asyncWorker.js'
+  )
+
   after('Destroy all pools', async () => {
     // We need to clean up the resources after our test
     await echoPool.destroy()
@@ -47,46 +49,42 @@ describe('Fixed thread pool test suite', () => {
     await emptyPool.destroy()
   })
 
-  it('Choose worker round robin test', async () => {
-    const results = new Set()
-    for (let i = 0; i < numberOfThreads; i++) {
-      results.add(pool.chooseWorker().threadId)
-    }
-    expect(results.size).toBe(numberOfThreads)
-  })
-
   it('Verify that the function is executed in a worker thread', async () => {
-    const result = await pool.execute({ test: 'test' })
-    expect(result).toBeDefined()
-    expect(result).toBeFalsy()
+    let result = await pool.execute({
+      function: WorkerFunctions.fibonacci
+    })
+    expect(result).toBe(false)
+    result = await pool.execute({
+      function: WorkerFunctions.factorial
+    })
+    expect(result).toBe(false)
   })
 
   it('Verify that is possible to invoke the execute method without input', async () => {
     const result = await pool.execute()
-    expect(result).toBeDefined()
-    expect(result).toBeFalsy()
+    expect(result).toBe(false)
   })
 
-  it('Verify that busy event is emitted', async () => {
-    const promises = []
+  it("Verify that 'busy' event is emitted", async () => {
     let poolBusy = 0
-    pool.emitter.on('busy', () => poolBusy++)
+    pool.emitter.on(PoolEvents.busy, () => ++poolBusy)
     for (let i = 0; i < numberOfThreads * 2; i++) {
-      promises.push(pool.execute({ test: 'test' }))
+      pool.execute()
     }
-    expect(poolBusy).toBe(numberOfThreads)
+    // 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()
+    expect(result).toBeUndefined()
   })
 
   it('Verify that data are sent to the worker correctly', async () => {
     const data = { f: 10 }
     const result = await echoPool.execute(data)
-    expect(result).toBeTruthy()
-    expect(result.f).toBe(data.f)
+    expect(result).toStrictEqual(data)
   })
 
   it('Verify that error handling is working properly:sync', async () => {
@@ -101,6 +99,7 @@ describe('Fixed thread pool test suite', () => {
     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 () => {
@@ -115,32 +114,32 @@ describe('Fixed thread pool test suite', () => {
     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 () => {
     const data = { f: 10 }
-    const startTime = new Date().getTime()
+    const startTime = Date.now()
     const result = await asyncPool.execute(data)
-    const usedTime = new Date().getTime() - startTime
-    expect(result).toBeTruthy()
-    expect(result.f).toBe(data.f)
+    const usedTime = Date.now() - startTime
+    expect(result).toStrictEqual(data)
     expect(usedTime).toBeGreaterThanOrEqual(2000)
   })
 
   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 () => {
     const pool1 = new FixedThreadPool(
-      1,
+      numberOfThreads,
       './tests/worker-files/thread/testWorker.js'
     )
-    const res = await pool1.execute({ test: 'test' })
-    expect(res).toBeFalsy()
+    const res = await pool1.execute()
+    expect(res).toBe(false)
     // We need to clean up the resources after our test
     await pool1.destroy()
   })