X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=tests%2Fpools%2Fthread%2Ffixed.test.js;h=48dd10b6800d788de30f3040ec9646e88db15019;hb=d46660cd0cccf38566337876c3fad0c3795aeb94;hp=0c3ba276f3b4e40c4d2d40e2a5484efd679cb094;hpb=ec3e56520d46660ea043d5184f5d8246c834d252;p=poolifier.git

diff --git a/tests/pools/thread/fixed.test.js b/tests/pools/thread/fixed.test.js
index 0c3ba276..48dd10b6 100644
--- a/tests/pools/thread/fixed.test.js
+++ b/tests/pools/thread/fixed.test.js
@@ -99,21 +99,23 @@ describe('Fixed thread pool test suite', () => {
       expect(workerNode.tasksUsage.running).toBeLessThanOrEqual(
         queuePool.opts.tasksQueueOptions.concurrency
       )
-      expect(workerNode.tasksUsage.run).toBe(0)
+      expect(workerNode.tasksUsage.ran).toBe(0)
       expect(workerNode.tasksQueue.size).toBeGreaterThan(0)
     }
-    expect(queuePool.numberOfRunningTasks).toBe(numberOfThreads)
-    expect(queuePool.numberOfQueuedTasks).toBe(
+    expect(queuePool.info.runningTasks).toBe(numberOfThreads)
+    expect(queuePool.info.queuedTasks).toBe(
+      numberOfThreads * maxMultiplier - numberOfThreads
+    )
+    expect(queuePool.info.maxQueuedTasks).toBe(
       numberOfThreads * maxMultiplier - numberOfThreads
     )
     await Promise.all(promises)
     for (const workerNode of queuePool.workerNodes) {
       expect(workerNode.tasksUsage.running).toBe(0)
-      expect(workerNode.tasksUsage.run).toBeGreaterThan(0)
-      expect(workerNode.tasksUsage.run).toBeLessThanOrEqual(maxMultiplier)
+      expect(workerNode.tasksUsage.ran).toBeGreaterThan(0)
+      expect(workerNode.tasksUsage.ran).toBeLessThanOrEqual(maxMultiplier)
       expect(workerNode.tasksQueue.size).toBe(0)
     }
-    promises.clear()
   })
 
   it('Verify that is possible to have a worker that return undefined', async () => {
@@ -129,6 +131,10 @@ describe('Fixed thread pool test suite', () => {
 
   it('Verify that error handling is working properly:sync', async () => {
     const data = { f: 10 }
+    let taskError
+    errorPool.emitter.on(PoolEvents.taskError, e => {
+      taskError = e
+    })
     let inError
     try {
       await errorPool.execute(data)
@@ -140,6 +146,10 @@ describe('Fixed thread pool test suite', () => {
     expect(inError.message).toBeDefined()
     expect(typeof inError.message === 'string').toBe(true)
     expect(inError.message).toBe('Error Message from ThreadWorker')
+    expect(taskError).toStrictEqual({
+      error: new Error('Error Message from ThreadWorker'),
+      errorData: data
+    })
     expect(
       errorPool.workerNodes.some(
         workerNode => workerNode.tasksUsage.error === 1
@@ -149,6 +159,10 @@ describe('Fixed thread pool test suite', () => {
 
   it('Verify that error handling is working properly:async', async () => {
     const data = { f: 10 }
+    // let taskError
+    // errorPool.emitter.on(PoolEvents.taskError, e => {
+    //   taskError = e
+    // })
     let inError
     try {
       await asyncErrorPool.execute(data)
@@ -160,6 +174,10 @@ describe('Fixed thread pool test suite', () => {
     expect(inError.message).toBeDefined()
     expect(typeof inError.message === 'string').toBe(true)
     expect(inError.message).toBe('Error Message from ThreadWorker:async')
+    // expect(taskError).toStrictEqual({
+    //   error: new Error('Error Message from ThreadWorker:async'),
+    //   errorData: data
+    // })
     expect(
       asyncErrorPool.workerNodes.some(
         workerNode => workerNode.tasksUsage.error === 1