X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=tests%2Fpools%2Fthread%2Fdynamic.test.js;h=9cd4e72c57b1098256b9c2f356fcfc0ded6da730;hb=2d2e32c20d55c1b81771659fd81004bd7ca34b73;hp=ae78649f91d2851d91163d2ebf6f65e2c084c468;hpb=a61a07243eee5cc54e7cf0d8e231202781f73f30;p=poolifier.git

diff --git a/tests/pools/thread/dynamic.test.js b/tests/pools/thread/dynamic.test.js
index ae78649f..9cd4e72c 100644
--- a/tests/pools/thread/dynamic.test.js
+++ b/tests/pools/thread/dynamic.test.js
@@ -1,22 +1,29 @@
 const { expect } = require('expect')
 const { DynamicThreadPool } = require('../../../lib/index')
+const { WorkerFunctions } = require('../../test-types')
 const TestUtils = require('../../test-utils')
-const min = 1
-const max = 3
-const pool = new DynamicThreadPool(
-  min,
-  max,
-  './tests/worker-files/thread/testWorker.js',
-  {
-    errorHandler: e => console.error(e)
-  }
-)
 
 describe('Dynamic thread pool test suite', () => {
+  const min = 1
+  const max = 3
+  const pool = new DynamicThreadPool(
+    min,
+    max,
+    './tests/worker-files/thread/testWorker.js',
+    {
+      errorHandler: e => console.error(e)
+    }
+  )
+
   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 new workers are created when required, max size is not exceeded and that after a while new workers will die', async () => {
@@ -24,26 +31,27 @@ describe('Dynamic thread pool test suite', () => {
     let poolBusy = 0
     pool.emitter.on('busy', () => poolBusy++)
     for (let i = 0; i < max * 2; i++) {
-      promises.push(pool.execute({ test: 'test' }))
+      promises.push(pool.execute())
     }
-    expect(pool.workers.length).toBe(max)
+    expect(pool.workers.length).toBeLessThanOrEqual(max)
+    expect(pool.workers.length).toBeGreaterThan(min)
     // The `busy` event is triggered when the number of submitted tasks at once reach the max number of workers in the dynamic pool.
     // So in total numberOfWorkers + 1 times for a loop submitting up to numberOfWorkers * 2 tasks to the dynamic pool.
     expect(poolBusy).toBe(max + 1)
-    const res = await TestUtils.waitExits(pool, max - min)
-    expect(res).toBe(max - min)
+    const numberOfExitEvents = await TestUtils.waitExits(pool, max - min)
+    expect(numberOfExitEvents).toBe(max - min)
   })
 
   it('Verify scale thread up and down is working', async () => {
     expect(pool.workers.length).toBe(min)
     for (let i = 0; i < max * 10; i++) {
-      pool.execute({ test: 'test' })
+      pool.execute()
     }
     expect(pool.workers.length).toBe(max)
     await TestUtils.waitExits(pool, max - min)
     expect(pool.workers.length).toBe(min)
     for (let i = 0; i < max * 10; i++) {
-      pool.execute({ test: 'test' })
+      pool.execute()
     }
     expect(pool.workers.length).toBe(max)
     await TestUtils.waitExits(pool, max - min)
@@ -51,14 +59,10 @@ describe('Dynamic thread pool test suite', () => {
   })
 
   it('Shutdown test', async () => {
-    let closedThreads = 0
-    pool.workers.forEach(w => {
-      w.on('exit', () => {
-        closedThreads++
-      })
-    })
+    const exitPromise = TestUtils.waitExits(pool, min)
     await pool.destroy()
-    expect(closedThreads).toBe(min)
+    const numberOfExitEvents = await exitPromise
+    expect(numberOfExitEvents).toBe(min)
   })
 
   it('Validation of inputs test', () => {
@@ -69,13 +73,12 @@ describe('Dynamic thread pool test suite', () => {
 
   it('Should work even without opts in input', async () => {
     const pool1 = new DynamicThreadPool(
-      1,
-      1,
+      min,
+      max,
       './tests/worker-files/thread/testWorker.js'
     )
-    const res = await pool1.execute({ test: 'test' })
-    expect(res).toBeDefined()
-    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()
   })
@@ -93,7 +96,7 @@ describe('Dynamic thread pool test suite', () => {
     )
     expect(longRunningPool.workers.length).toBe(min)
     for (let i = 0; i < max * 10; i++) {
-      longRunningPool.execute({ test: 'test' })
+      longRunningPool.execute()
     }
     expect(longRunningPool.workers.length).toBe(max)
     await TestUtils.waitExits(longRunningPool, max - min)
@@ -115,7 +118,7 @@ describe('Dynamic thread pool test suite', () => {
     )
     expect(longRunningPool.workers.length).toBe(min)
     for (let i = 0; i < max * 10; i++) {
-      longRunningPool.execute({ test: 'test' })
+      longRunningPool.execute()
     }
     expect(longRunningPool.workers.length).toBe(max)
     await TestUtils.sleep(1500)