Merge branch 'master' of github.com:jerome-benoit/poolifier

[poolifier.git] / tests / pools / abstract / abstract-pool.test.js

diff --git a/tests/pools/abstract/abstract-pool.test.js b/tests/pools/abstract/abstract-pool.test.js
index 011456aea0aa23c4b8111ceb32230aa2a96ca558..5bb5cde50cfbc16bbb439e101cb20ad2a8f23add 100644 (file)
--- a/tests/pools/abstract/abstract-pool.test.js
+++ b/tests/pools/abstract/abstract-pool.test.js
@@ -13,8 +13,8 @@ describe('Abstract pool test suite', () => {
   )
   class StubPoolWithRemoveAllWorker extends FixedThreadPool {
     removeAllWorker () {
-      this.workers = new Map()
-      this.promiseMap.clear()
+      this.workers = []
+      this.promiseResponseMap.clear()
     }
   }
   class StubPoolWithIsMain extends FixedThreadPool {
@@ -98,7 +98,7 @@ describe('Abstract pool test suite', () => {
       numberOfWorkers,
       './tests/worker-files/thread/testWorker.js',
       {
-        workerChoiceStrategy: WorkerChoiceStrategies.LESS_RECENTLY_USED,
+        workerChoiceStrategy: WorkerChoiceStrategies.LESS_USED,
         enableEvents: false,
         messageHandler: testHandler,
         errorHandler: testHandler,
@@ -109,7 +109,7 @@ describe('Abstract pool test suite', () => {
     expect(pool.opts.enableEvents).toBe(false)
     expect(pool.emitter).toBeUndefined()
     expect(pool.opts.workerChoiceStrategy).toBe(
-      WorkerChoiceStrategies.LESS_RECENTLY_USED
+      WorkerChoiceStrategies.LESS_USED
     )
     expect(pool.opts.messageHandler).toStrictEqual(testHandler)
     expect(pool.opts.errorHandler).toStrictEqual(testHandler)
@@ -139,12 +139,13 @@ describe('Abstract pool test suite', () => {
       numberOfWorkers,
       './tests/worker-files/cluster/testWorker.js'
     )
-    for (const value of pool.workers.values()) {
-      expect(value.tasksUsage).toBeDefined()
-      expect(value.tasksUsage.run).toBe(0)
-      expect(value.tasksUsage.running).toBe(0)
-      expect(value.tasksUsage.runTime).toBe(0)
-      expect(value.tasksUsage.avgRunTime).toBe(0)
+    for (const workerItem of pool.workers) {
+      expect(workerItem.tasksUsage).toBeDefined()
+      expect(workerItem.tasksUsage.run).toBe(0)
+      expect(workerItem.tasksUsage.running).toBe(0)
+      expect(workerItem.tasksUsage.runTime).toBe(0)
+      expect(workerItem.tasksUsage.avgRunTime).toBe(0)
+      expect(workerItem.tasksUsage.error).toBe(0)
     }
     await pool.destroy()
   })
@@ -158,20 +159,22 @@ describe('Abstract pool test suite', () => {
     for (let i = 0; i < numberOfWorkers * 2; i++) {
       promises.push(pool.execute())
     }
-    for (const value of pool.workers.values()) {
-      expect(value.tasksUsage).toBeDefined()
-      expect(value.tasksUsage.run).toBe(0)
-      expect(value.tasksUsage.running).toBe(numberOfWorkers * 2)
-      expect(value.tasksUsage.runTime).toBe(0)
-      expect(value.tasksUsage.avgRunTime).toBe(0)
+    for (const workerItem of pool.workers) {
+      expect(workerItem.tasksUsage).toBeDefined()
+      expect(workerItem.tasksUsage.run).toBe(0)
+      expect(workerItem.tasksUsage.running).toBe(numberOfWorkers * 2)
+      expect(workerItem.tasksUsage.runTime).toBe(0)
+      expect(workerItem.tasksUsage.avgRunTime).toBe(0)
+      expect(workerItem.tasksUsage.error).toBe(0)
     }
     await Promise.all(promises)
-    for (const value of pool.workers.values()) {
-      expect(value.tasksUsage).toBeDefined()
-      expect(value.tasksUsage.run).toBe(numberOfWorkers * 2)
-      expect(value.tasksUsage.running).toBe(0)
-      expect(value.tasksUsage.runTime).toBeGreaterThanOrEqual(0)
-      expect(value.tasksUsage.avgRunTime).toBeGreaterThanOrEqual(0)
+    for (const workerItem of pool.workers) {
+      expect(workerItem.tasksUsage).toBeDefined()
+      expect(workerItem.tasksUsage.run).toBe(numberOfWorkers * 2)
+      expect(workerItem.tasksUsage.running).toBe(0)
+      expect(workerItem.tasksUsage.runTime).toBeGreaterThanOrEqual(0)
+      expect(workerItem.tasksUsage.avgRunTime).toBeGreaterThanOrEqual(0)
+      expect(workerItem.tasksUsage.error).toBe(0)
     }
     await pool.destroy()
   })
@@ -187,20 +190,22 @@ describe('Abstract pool test suite', () => {
       promises.push(pool.execute())
     }
     await Promise.all(promises)
-    for (const value of pool.workers.values()) {
-      expect(value.tasksUsage).toBeDefined()
-      expect(value.tasksUsage.run).toBe(numberOfWorkers * 2)
-      expect(value.tasksUsage.running).toBe(0)
-      expect(value.tasksUsage.runTime).toBeGreaterThanOrEqual(0)
-      expect(value.tasksUsage.avgRunTime).toBeGreaterThanOrEqual(0)
+    for (const workerItem of pool.workers) {
+      expect(workerItem.tasksUsage).toBeDefined()
+      expect(workerItem.tasksUsage.run).toBe(numberOfWorkers * 2)
+      expect(workerItem.tasksUsage.running).toBe(0)
+      expect(workerItem.tasksUsage.runTime).toBeGreaterThanOrEqual(0)
+      expect(workerItem.tasksUsage.avgRunTime).toBeGreaterThanOrEqual(0)
+      expect(workerItem.tasksUsage.error).toBe(0)
     }
     pool.setWorkerChoiceStrategy(WorkerChoiceStrategies.FAIR_SHARE)
-    for (const value of pool.workers.values()) {
-      expect(value.tasksUsage).toBeDefined()
-      expect(value.tasksUsage.run).toBe(0)
-      expect(value.tasksUsage.running).toBe(0)
-      expect(value.tasksUsage.runTime).toBe(0)
-      expect(value.tasksUsage.avgRunTime).toBe(0)
+    for (const workerItem of pool.workers) {
+      expect(workerItem.tasksUsage).toBeDefined()
+      expect(workerItem.tasksUsage.run).toBe(0)
+      expect(workerItem.tasksUsage.running).toBe(0)
+      expect(workerItem.tasksUsage.runTime).toBe(0)
+      expect(workerItem.tasksUsage.avgRunTime).toBe(0)
+      expect(workerItem.tasksUsage.error).toBe(0)
     }
     await pool.destroy()
   })