X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=tests%2Fpools%2Fabstract%2Fabstract-pool.test.js;h=62c461841b82fbf8c014b95b3502ec050e9d6406;hb=b56c2ee50ed3b58219552e7138e638dfce62da01;hp=05e4c34ea094023d61db4f0584c022af645e8c5e;hpb=2dca6cabeaaf9c19cca7574deff10ef7af183a92;p=poolifier.git

diff --git a/tests/pools/abstract/abstract-pool.test.js b/tests/pools/abstract/abstract-pool.test.js
index 05e4c34e..62c46184 100644
--- a/tests/pools/abstract/abstract-pool.test.js
+++ b/tests/pools/abstract/abstract-pool.test.js
@@ -5,8 +5,8 @@ const {
   FixedClusterPool,
   FixedThreadPool,
   PoolEvents,
-  WorkerChoiceStrategies,
   PoolTypes,
+  WorkerChoiceStrategies,
   WorkerTypes
 } = require('../../../lib')
 const { CircularArray } = require('../../../lib/circular-array')
@@ -45,6 +45,15 @@ describe('Abstract pool test suite', () => {
     expect(() => new FixedThreadPool(numberOfWorkers, '')).toThrowError(
       expectedError
     )
+    expect(() => new FixedThreadPool(numberOfWorkers, 0)).toThrowError(
+      expectedError
+    )
+    expect(() => new FixedThreadPool(numberOfWorkers, true)).toThrowError(
+      expectedError
+    )
+    expect(
+      () => new FixedThreadPool(numberOfWorkers, './dummyWorker.ts')
+    ).toThrowError(new Error("Cannot find the worker file './dummyWorker.ts'"))
   })
 
   it('Verify that numberOfWorkers is checked', () => {
@@ -97,7 +106,7 @@ describe('Abstract pool test suite', () => {
         new DynamicThreadPool(0, 0, './tests/worker-files/thread/testWorker.js')
     ).toThrowError(
       new RangeError(
-        'Cannot instantiate a dynamic pool with a minimum pool size and a maximum pool size equal to zero'
+        'Cannot instantiate a dynamic pool with a pool size equal to zero'
       )
     )
   })
@@ -415,24 +424,6 @@ describe('Abstract pool test suite', () => {
       numberOfWorkers,
       './tests/worker-files/thread/testWorker.js'
     )
-    expect(pool.info).toStrictEqual({
-      version,
-      type: PoolTypes.fixed,
-      worker: WorkerTypes.thread,
-      ready: false,
-      strategy: WorkerChoiceStrategies.ROUND_ROBIN,
-      minSize: numberOfWorkers,
-      maxSize: numberOfWorkers,
-      workerNodes: numberOfWorkers,
-      idleWorkerNodes: numberOfWorkers,
-      busyWorkerNodes: 0,
-      executedTasks: 0,
-      executingTasks: 0,
-      queuedTasks: 0,
-      maxQueuedTasks: 0,
-      failedTasks: 0
-    })
-    await waitPoolEvents(pool, PoolEvents.ready, 1)
     expect(pool.info).toStrictEqual({
       version,
       type: PoolTypes.fixed,
@@ -456,24 +447,6 @@ describe('Abstract pool test suite', () => {
       numberOfWorkers,
       './tests/worker-files/cluster/testWorker.js'
     )
-    expect(pool.info).toStrictEqual({
-      version,
-      type: PoolTypes.dynamic,
-      worker: WorkerTypes.cluster,
-      ready: false,
-      strategy: WorkerChoiceStrategies.ROUND_ROBIN,
-      minSize: Math.floor(numberOfWorkers / 2),
-      maxSize: numberOfWorkers,
-      workerNodes: Math.floor(numberOfWorkers / 2),
-      idleWorkerNodes: Math.floor(numberOfWorkers / 2),
-      busyWorkerNodes: 0,
-      executedTasks: 0,
-      executingTasks: 0,
-      queuedTasks: 0,
-      maxQueuedTasks: 0,
-      failedTasks: 0
-    })
-    await waitPoolEvents(pool, PoolEvents.ready, 1)
     expect(pool.info).toStrictEqual({
       version,
       type: PoolTypes.dynamic,
@@ -557,15 +530,6 @@ describe('Abstract pool test suite', () => {
       numberOfWorkers,
       './tests/worker-files/cluster/testWorker.js'
     )
-    for (const workerNode of pool.workerNodes) {
-      expect(workerNode.info).toStrictEqual({
-        id: expect.any(Number),
-        type: WorkerTypes.cluster,
-        dynamic: false,
-        ready: false
-      })
-    }
-    await waitPoolEvents(pool, PoolEvents.ready, 1)
     for (const workerNode of pool.workerNodes) {
       expect(workerNode.info).toStrictEqual({
         id: expect.any(Number),
@@ -580,15 +544,6 @@ describe('Abstract pool test suite', () => {
       numberOfWorkers,
       './tests/worker-files/thread/testWorker.js'
     )
-    for (const workerNode of pool.workerNodes) {
-      expect(workerNode.info).toStrictEqual({
-        id: expect.any(Number),
-        type: WorkerTypes.thread,
-        dynamic: false,
-        ready: false
-      })
-    }
-    await waitPoolEvents(pool, PoolEvents.ready, 1)
     for (const workerNode of pool.workerNodes) {
       expect(workerNode.info).toStrictEqual({
         id: expect.any(Number),
@@ -701,6 +656,10 @@ describe('Abstract pool test suite', () => {
       })
       expect(workerNode.usage.tasks.executed).toBeGreaterThan(0)
       expect(workerNode.usage.tasks.executed).toBeLessThanOrEqual(maxMultiplier)
+      expect(workerNode.usage.runTime.history.length).toBe(0)
+      expect(workerNode.usage.waitTime.history.length).toBe(0)
+      expect(workerNode.usage.elu.idle.history.length).toBe(0)
+      expect(workerNode.usage.elu.active.history.length).toBe(0)
     }
     pool.setWorkerChoiceStrategy(WorkerChoiceStrategies.FAIR_SHARE)
     for (const workerNode of pool.workerNodes) {
@@ -729,6 +688,8 @@ describe('Abstract pool test suite', () => {
       })
       expect(workerNode.usage.runTime.history.length).toBe(0)
       expect(workerNode.usage.waitTime.history.length).toBe(0)
+      expect(workerNode.usage.elu.idle.history.length).toBe(0)
+      expect(workerNode.usage.elu.active.history.length).toBe(0)
     }
     await pool.destroy()
   })
@@ -779,8 +740,8 @@ describe('Abstract pool test suite', () => {
       numberOfWorkers,
       './tests/worker-files/cluster/testWorker.js'
     )
-    let poolReady = 0
     let poolInfo
+    let poolReady = 0
     pool.emitter.on(PoolEvents.ready, info => {
       ++poolReady
       poolInfo = info