X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=tests%2Fpools%2Fabstract%2Fabstract-pool.test.js;h=e6a7ad36cc5ae2ae5839fdd42497bbd86ce0cd9c;hb=5a94e4b950eaf2234e07f87261ddea1482e839c6;hp=80ebdb9e7e5a04b07f71f7878ed46318cbcd4fdb;hpb=473c717a499d52ce8a069c43ee168b70cb5701f1;p=poolifier.git

diff --git a/tests/pools/abstract/abstract-pool.test.js b/tests/pools/abstract/abstract-pool.test.js
index 80ebdb9e..e6a7ad36 100644
--- a/tests/pools/abstract/abstract-pool.test.js
+++ b/tests/pools/abstract/abstract-pool.test.js
@@ -9,12 +9,11 @@ const {
 describe('Abstract pool test suite', () => {
   const numberOfWorkers = 1
   const workerNotFoundInTasksUsageMapError = new Error(
-    'Worker could not be found in workers tasks usage map'
+    'Worker could not be found in the pool'
   )
   class StubPoolWithRemoveAllWorker extends FixedThreadPool {
     removeAllWorker () {
-      this.workers = []
-      this.workersTasksUsage.clear()
+      this.workers = new Map()
       this.promiseMap.clear()
     }
   }
@@ -200,12 +199,12 @@ describe('Abstract pool test suite', () => {
       numberOfWorkers,
       './tests/worker-files/cluster/testWorker.js'
     )
-    for (const tasksUsage of pool.workersTasksUsage.values()) {
-      expect(tasksUsage).toBeDefined()
-      expect(tasksUsage.run).toBe(0)
-      expect(tasksUsage.running).toBe(0)
-      expect(tasksUsage.runTime).toBe(0)
-      expect(tasksUsage.avgRunTime).toBe(0)
+    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)
     }
     await pool.destroy()
   })
@@ -219,20 +218,20 @@ describe('Abstract pool test suite', () => {
     for (let i = 0; i < numberOfWorkers * 2; i++) {
       promises.push(pool.execute())
     }
-    for (const tasksUsage of pool.workersTasksUsage.values()) {
-      expect(tasksUsage).toBeDefined()
-      expect(tasksUsage.run).toBe(0)
-      expect(tasksUsage.running).toBe(numberOfWorkers * 2)
-      expect(tasksUsage.runTime).toBe(0)
-      expect(tasksUsage.avgRunTime).toBe(0)
+    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)
     }
     await Promise.all(promises)
-    for (const tasksUsage of pool.workersTasksUsage.values()) {
-      expect(tasksUsage).toBeDefined()
-      expect(tasksUsage.run).toBe(numberOfWorkers * 2)
-      expect(tasksUsage.running).toBe(0)
-      expect(tasksUsage.runTime).toBeGreaterThanOrEqual(0)
-      expect(tasksUsage.avgRunTime).toBeGreaterThanOrEqual(0)
+    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)
     }
     await pool.destroy()
   })
@@ -248,20 +247,20 @@ describe('Abstract pool test suite', () => {
       promises.push(pool.execute())
     }
     await Promise.all(promises)
-    for (const tasksUsage of pool.workersTasksUsage.values()) {
-      expect(tasksUsage).toBeDefined()
-      expect(tasksUsage.run).toBe(numberOfWorkers * 2)
-      expect(tasksUsage.running).toBe(0)
-      expect(tasksUsage.runTime).toBeGreaterThanOrEqual(0)
-      expect(tasksUsage.avgRunTime).toBeGreaterThanOrEqual(0)
+    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)
     }
     pool.setWorkerChoiceStrategy(WorkerChoiceStrategies.FAIR_SHARE)
-    for (const tasksUsage of pool.workersTasksUsage.values()) {
-      expect(tasksUsage).toBeDefined()
-      expect(tasksUsage.run).toBe(0)
-      expect(tasksUsage.running).toBe(0)
-      expect(tasksUsage.runTime).toBe(0)
-      expect(tasksUsage.avgRunTime).toBe(0)
+    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)
     }
     await pool.destroy()
   })