X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=tests%2Fpools%2Fthread%2Ffixed.test.js;h=636121fd4812eb8705bb2aed57119e8b84f8bcfb;hb=3f7d99f5a6b9783554886f1850aa45c5bc237b65;hp=f044895335af397c1599faeee10f6e90d63dcf42;hpb=eb7bf7441d410ca5d9ff9bb08f191ef22399371c;p=poolifier.git

diff --git a/tests/pools/thread/fixed.test.js b/tests/pools/thread/fixed.test.js
index f0448953..636121fd 100644
--- a/tests/pools/thread/fixed.test.js
+++ b/tests/pools/thread/fixed.test.js
@@ -1,7 +1,7 @@
 const { expect } = require('expect')
 const { FixedThreadPool, PoolEvents } = require('../../../lib')
 const { WorkerFunctions } = require('../../test-types')
-const TestUtils = require('../../test-utils')
+const { waitPoolEvents, waitWorkerEvents } = require('../../test-utils')
 
 describe('Fixed thread pool test suite', () => {
   const numberOfThreads = 6
@@ -74,7 +74,23 @@ describe('Fixed thread pool test suite', () => {
 
   it('Verify that is possible to invoke the execute() method without input', async () => {
     const result = await pool.execute()
-    expect(result).toBe(false)
+    expect(result).toStrictEqual({ ok: 1 })
+  })
+
+  it("Verify that 'ready' event is emitted", async () => {
+    const pool1 = new FixedThreadPool(
+      numberOfThreads,
+      './tests/worker-files/thread/testWorker.js',
+      {
+        errorHandler: e => console.error(e)
+      }
+    )
+    let poolReady = 0
+    pool1.emitter.on(PoolEvents.ready, () => ++poolReady)
+    if (!pool1.info.ready) {
+      await waitPoolEvents(pool1, PoolEvents.ready, 1)
+    }
+    expect(poolReady).toBe(1)
   })
 
   it("Verify that 'busy' event is emitted", async () => {
@@ -147,10 +163,12 @@ describe('Fixed thread pool test suite', () => {
     expect(inError).toBeInstanceOf(Error)
     expect(inError.message).toBeDefined()
     expect(typeof inError.message === 'string').toBe(true)
-    expect(inError.message).toContain(
-      'Error Message from ThreadWorker on worker'
-    )
-    expect(taskError.data).toStrictEqual(data)
+    expect(inError.message).toBe('Error Message from ThreadWorker')
+    expect(taskError).toStrictEqual({
+      name: 'default',
+      message: new Error('Error Message from ThreadWorker'),
+      data
+    })
     expect(
       errorPool.workerNodes.some(
         workerNode => workerNode.usage.tasks.failed === 1
@@ -174,10 +192,12 @@ describe('Fixed thread pool test suite', () => {
     expect(inError).toBeInstanceOf(Error)
     expect(inError.message).toBeDefined()
     expect(typeof inError.message === 'string').toBe(true)
-    expect(inError.message).toContain(
-      'Error Message from ThreadWorker:async on worker'
-    )
-    expect(taskError.data).toStrictEqual(data)
+    expect(inError.message).toBe('Error Message from ThreadWorker:async')
+    expect(taskError).toStrictEqual({
+      name: 'default',
+      message: new Error('Error Message from ThreadWorker:async'),
+      data
+    })
     expect(
       asyncErrorPool.workerNodes.some(
         workerNode => workerNode.usage.tasks.failed === 1
@@ -195,11 +215,7 @@ describe('Fixed thread pool test suite', () => {
   })
 
   it('Shutdown test', async () => {
-    const exitPromise = TestUtils.waitWorkerEvents(
-      pool,
-      'exit',
-      numberOfThreads
-    )
+    const exitPromise = waitWorkerEvents(pool, 'exit', numberOfThreads)
     await pool.destroy()
     const numberOfExitEvents = await exitPromise
     expect(numberOfExitEvents).toBe(numberOfThreads)
@@ -229,7 +245,7 @@ describe('Fixed thread pool test suite', () => {
       './tests/worker-files/thread/testWorker.js'
     )
     const res = await pool1.execute()
-    expect(res).toBe(false)
+    expect(res).toStrictEqual({ ok: 1 })
     // We need to clean up the resources after our test
     await pool1.destroy()
   })
@@ -237,6 +253,6 @@ describe('Fixed thread pool test suite', () => {
   it('Verify that a pool with zero worker fails', async () => {
     expect(
       () => new FixedThreadPool(0, './tests/worker-files/thread/testWorker.js')
-    ).toThrowError('Cannot instantiate a fixed pool with no worker')
+    ).toThrowError('Cannot instantiate a fixed pool with zero worker')
   })
 })