X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=tests%2Fpools%2Fthread%2Fdynamic.test.js;h=1f2a646355b04ba8b10908edd1bda43c817c43f9;hb=2cf93bc8e7b3d9c6c642288939732edd7cd9142d;hp=241a1b60ce312a77dd265e3d1390ae6e25ab5786;hpb=14916bf9ec9e7e60b1c03e9b6d876fc23990afad;p=poolifier.git

diff --git a/tests/pools/thread/dynamic.test.js b/tests/pools/thread/dynamic.test.js
index 241a1b60..1f2a6463 100644
--- a/tests/pools/thread/dynamic.test.js
+++ b/tests/pools/thread/dynamic.test.js
@@ -1,81 +1,83 @@
-const expect = require('expect')
-const { DynamicThreadPool } = require('../../../lib/index')
+const { expect } = require('expect')
+const { DynamicThreadPool, PoolEvents } = require('../../../lib')
+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(121393)
+    result = await pool.execute({
+      function: WorkerFunctions.factorial
+    })
+    expect(result).toBe(9.33262154439441e157)
   })
 
   it('Verify that new workers are created when required, max size is not exceeded and that after a while new workers will die', async () => {
-    const promises = []
     let poolBusy = 0
-    pool.emitter.on('busy', () => poolBusy++)
+    pool.emitter.on(PoolEvents.busy, () => ++poolBusy)
     for (let i = 0; i < max * 2; i++) {
-      promises.push(pool.execute({ test: 'test' }))
+      pool.execute()
     }
-    expect(pool.workers.length).toBe(max)
+    expect(pool.workerNodes.length).toBeLessThanOrEqual(max)
+    expect(pool.workerNodes.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' })
+    expect(pool.workerNodes.length).toBe(min)
+    for (let i = 0; i < max * 2; i++) {
+      pool.execute()
     }
-    expect(pool.workers.length).toBe(max)
+    expect(pool.workerNodes.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' })
+    expect(pool.workerNodes.length).toBe(min)
+    for (let i = 0; i < max * 2; i++) {
+      pool.execute()
     }
-    expect(pool.workers.length).toBe(max)
+    expect(pool.workerNodes.length).toBe(max)
     await TestUtils.waitExits(pool, max - min)
-    expect(pool.workers.length).toBe(min)
+    expect(pool.workerNodes.length).toBe(min)
   })
 
   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', () => {
     expect(() => new DynamicThreadPool(min)).toThrowError(
-      new Error('Please specify a file with a worker implementation')
+      'Please specify a file with a worker implementation'
     )
   })
 
   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()
   })
@@ -91,13 +93,18 @@ describe('Dynamic thread pool test suite', () => {
         exitHandler: () => console.log('long running worker exited')
       }
     )
-    expect(longRunningPool.workers.length).toBe(min)
-    for (let i = 0; i < max * 10; i++) {
-      longRunningPool.execute({ test: 'test' })
+    expect(longRunningPool.workerNodes.length).toBe(min)
+    for (let i = 0; i < max * 2; i++) {
+      longRunningPool.execute()
     }
-    expect(longRunningPool.workers.length).toBe(max)
+    expect(longRunningPool.workerNodes.length).toBe(max)
     await TestUtils.waitExits(longRunningPool, max - min)
-    expect(longRunningPool.workers.length).toBe(min)
+    expect(longRunningPool.workerNodes.length).toBe(min)
+    expect(
+      longRunningPool.workerChoiceStrategyContext.workerChoiceStrategies.get(
+        longRunningPool.workerChoiceStrategyContext.workerChoiceStrategy
+      ).nextWorkerNodeId
+    ).toBeLessThan(longRunningPool.workerNodes.length)
     // We need to clean up the resources after our test
     await longRunningPool.destroy()
   })
@@ -113,14 +120,14 @@ describe('Dynamic thread pool test suite', () => {
         exitHandler: () => console.log('long running worker exited')
       }
     )
-    expect(longRunningPool.workers.length).toBe(min)
-    for (let i = 0; i < max * 10; i++) {
-      longRunningPool.execute({ test: 'test' })
+    expect(longRunningPool.workerNodes.length).toBe(min)
+    for (let i = 0; i < max * 2; i++) {
+      longRunningPool.execute()
     }
-    expect(longRunningPool.workers.length).toBe(max)
+    expect(longRunningPool.workerNodes.length).toBe(max)
     await TestUtils.sleep(1500)
-    // Here we expect the workers to be at the max size since that the task is still running
-    expect(longRunningPool.workers.length).toBe(max)
+    // Here we expect the workerNodes to be at the max size since the task is still running
+    expect(longRunningPool.workerNodes.length).toBe(max)
     // We need to clean up the resources after our test
     await longRunningPool.destroy()
   })