X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=tests%2Fpools%2Fthread%2Fdynamic.test.mjs;h=6cefa0aad2486726fa7e25e9093aa200c7bc7f97;hb=53a0019f59b1d5f10be6acbaca2e6a970dd1fc6c;hp=7b951aaf38576f9ffb3f05fb50ee60ace4882a28;hpb=a2283a198407d558dd7fdca4bad77a032623fdef;p=poolifier.git

diff --git a/tests/pools/thread/dynamic.test.mjs b/tests/pools/thread/dynamic.test.mjs
index 7b951aaf..6cefa0aa 100644
--- a/tests/pools/thread/dynamic.test.mjs
+++ b/tests/pools/thread/dynamic.test.mjs
@@ -1,7 +1,12 @@
 import { expect } from 'expect'
-import { DynamicThreadPool, PoolEvents } from '../../../lib/index.cjs'
+
+import {
+  DynamicThreadPool,
+  PoolEvents,
+  WorkerChoiceStrategies
+} from '../../../lib/index.cjs'
 import { TaskFunctions } from '../../test-types.cjs'
-import { sleep, waitWorkerEvents } from '../../test-utils.cjs'
+import { sleep, waitPoolEvents, waitWorkerEvents } from '../../test-utils.cjs'
 
 describe('Dynamic thread pool test suite', () => {
   const min = 1
@@ -19,7 +24,7 @@ describe('Dynamic thread pool test suite', () => {
     let result = await pool.execute({
       function: TaskFunctions.fibonacci
     })
-    expect(result).toBe(75025)
+    expect(result).toBe(354224848179262000000)
     result = await pool.execute({
       function: TaskFunctions.factorial
     })
@@ -67,7 +72,10 @@ describe('Dynamic thread pool test suite', () => {
     await pool.destroy()
     const numberOfExitEvents = await exitPromise
     expect(pool.started).toBe(false)
-    expect(pool.emitter.eventNames()).toStrictEqual([])
+    expect(pool.emitter.eventNames()).toStrictEqual([
+      PoolEvents.busy,
+      PoolEvents.destroy
+    ])
     expect(pool.readyEventEmitted).toBe(false)
     expect(pool.workerNodes.length).toBe(0)
     expect(numberOfExitEvents).toBe(min)
@@ -154,32 +162,35 @@ describe('Dynamic thread pool test suite', () => {
   })
 
   it('Verify that a pool with zero worker works', async () => {
-    const pool = new DynamicThreadPool(
-      0,
-      max,
-      './tests/worker-files/thread/testWorker.mjs'
-    )
-    expect(pool.starting).toBe(false)
-    expect(pool.workerNodes.length).toBe(pool.info.minSize)
-    const maxMultiplier = 10000
-    const promises = new Set()
-    for (let i = 0; i < max * maxMultiplier; i++) {
-      promises.add(pool.execute())
-    }
-    await Promise.all(promises)
-    expect(pool.workerNodes.length).toBe(max)
-    await waitWorkerEvents(pool, 'exit', max)
-    expect(pool.workerNodes.length).toBe(pool.info.minSize)
-    // pool.enableTasksQueue(true, { concurrency: 2 })
-    promises.clear()
-    for (let i = 0; i < max * maxMultiplier; i++) {
-      promises.add(pool.execute())
+    for (const workerChoiceStrategy of Object.values(WorkerChoiceStrategies)) {
+      const pool = new DynamicThreadPool(
+        0,
+        max,
+        './tests/worker-files/thread/testWorker.mjs',
+        {
+          workerChoiceStrategy
+        }
+      )
+      expect(pool.starting).toBe(false)
+      expect(pool.readyEventEmitted).toBe(false)
+      for (let run = 0; run < 2; run++) {
+        run % 2 !== 0 && pool.enableTasksQueue(true)
+        const maxMultiplier = 4
+        const promises = new Set()
+        expect(pool.workerNodes.length).toBe(pool.info.minSize)
+        for (let i = 0; i < max * maxMultiplier; i++) {
+          promises.add(pool.execute())
+        }
+        await Promise.all(promises)
+        expect(pool.readyEventEmitted).toBe(true)
+        expect(pool.workerNodes.length).toBeGreaterThan(pool.info.minSize)
+        expect(pool.workerNodes.length).toBeLessThanOrEqual(pool.info.maxSize)
+        await waitPoolEvents(pool, PoolEvents.empty, 1)
+        expect(pool.readyEventEmitted).toBe(false)
+        expect(pool.workerNodes.length).toBe(pool.info.minSize)
+      }
+      // We need to clean up the resources after our test
+      await pool.destroy()
     }
-    await Promise.all(promises)
-    expect(pool.workerNodes.length).toBe(max)
-    await waitWorkerEvents(pool, 'exit', max)
-    expect(pool.workerNodes.length).toBe(pool.info.minSize)
-    // We need to clean up the resources after our test
-    await pool.destroy()
   })
 })