test: improve pool events check tests

Signed-off-by: Jérôme Benoit <jerome.benoit@sap.com>

diff --git a/tests/pools/abstract/abstract-pool.test.js b/tests/pools/abstract/abstract-pool.test.js
index 6c340ed9f089ea6f9fd5deeb126480dc0e0ab3df..a62caad828a79ab428697eaca2c9b3aa1826fc13 100644 (file)
--- a/tests/pools/abstract/abstract-pool.test.js
+++ b/tests/pools/abstract/abstract-pool.test.js
@@ -75,7 +75,7 @@ describe('Abstract pool test suite', () => {
     )
   })
 
-  it('Verify dynamic pool sizing', () => {
+  it('Verify that dynamic pool sizing is checked', () => {
     expect(
       () =>
         new DynamicThreadPool(2, 1, './tests/worker-files/thread/testWorker.js')

diff --git a/tests/pools/cluster/fixed.test.js b/tests/pools/cluster/fixed.test.js
index f9423e731cbd93a20417b2124d7f4c4f4c8b783d..6daec1400dbc9dc0fdb921d6b25b53dd9d751eab 100644 (file)
--- a/tests/pools/cluster/fixed.test.js
+++ b/tests/pools/cluster/fixed.test.js
@@ -1,9 +1,9 @@
 const { expect } = require('expect')
 const { FixedClusterPool, PoolEvents } = require('../../../lib')
 const { WorkerFunctions } = require('../../test-types')
-const { waitWorkerEvents } = require('../../test-utils')
+const { waitPoolEvents, waitWorkerEvents } = require('../../test-utils')
 
-describe('Fixed cluster pool test suite', () => {
+describe('Fixed cluster pool test suite', async () => {
   const numberOfWorkers = 6
   const pool = new FixedClusterPool(
     numberOfWorkers,
@@ -12,6 +12,9 @@ describe('Fixed cluster pool test suite', () => {
       errorHandler: e => console.error(e)
     }
   )
+  let poolReady = 0
+  pool.emitter.on(PoolEvents.ready, () => ++poolReady)
+  await waitPoolEvents(pool, PoolEvents.ready, 1)
   const queuePool = new FixedClusterPool(
     numberOfWorkers,
     './tests/worker-files/cluster/testWorker.js',
@@ -77,6 +80,10 @@ describe('Fixed cluster pool test suite', () => {
     expect(result).toStrictEqual({ ok: 1 })
   })
 
+  it("Verify that 'ready' event is emitted", async () => {
+    expect(poolReady).toBe(1)
+  })
+
   it("Verify that 'busy' event is emitted", async () => {
     let poolBusy = 0
     pool.emitter.on(PoolEvents.busy, () => ++poolBusy)

diff --git a/tests/pools/thread/fixed.test.js b/tests/pools/thread/fixed.test.js
index 829c8ade42d48ca2938a58c38323f1f7c9298bf8..8b2fe42047bc4c91b2a8d01599842878bd9950e5 100644 (file)
--- a/tests/pools/thread/fixed.test.js
+++ b/tests/pools/thread/fixed.test.js
@@ -1,9 +1,9 @@
 const { expect } = require('expect')
 const { FixedThreadPool, PoolEvents } = require('../../../lib')
 const { WorkerFunctions } = require('../../test-types')
-const { waitWorkerEvents } = require('../../test-utils')
+const { waitPoolEvents, waitWorkerEvents } = require('../../test-utils')
 
-describe('Fixed thread pool test suite', () => {
+describe('Fixed thread pool test suite', async () => {
   const numberOfThreads = 6
   const pool = new FixedThreadPool(
     numberOfThreads,
@@ -12,6 +12,9 @@ describe('Fixed thread pool test suite', () => {
       errorHandler: e => console.error(e)
     }
   )
+  let poolReady = 0
+  pool.emitter.on(PoolEvents.ready, () => ++poolReady)
+  await waitPoolEvents(pool, PoolEvents.ready, 1)
   const queuePool = new FixedThreadPool(
     numberOfThreads,
     './tests/worker-files/thread/testWorker.js',
@@ -77,6 +80,10 @@ describe('Fixed thread pool test suite', () => {
     expect(result).toStrictEqual({ ok: 1 })
   })
 
+  it("Verify that 'ready' event is emitted", async () => {
+    expect(poolReady).toBe(1)
+  })
+
   it("Verify that 'busy' event is emitted", async () => {
     let poolBusy = 0
     pool.emitter.on(PoolEvents.busy, () => ++poolBusy)