Tests enhancement (#172)

[poolifier.git] / tests / pools / thread / fixed.test.js

diff --git a/tests/pools/thread/fixed.test.js b/tests/pools/thread/fixed.test.js
index ff945a700f6bf6efe85359b260499597c3497a1c..2a7d005b3dcd6d88a53e4e53e1d2216c55483de4 100644 (file)
--- a/tests/pools/thread/fixed.test.js
+++ b/tests/pools/thread/fixed.test.js
@@ -1,13 +1,13 @@
 const expect = require('expect')
 const { FixedThreadPool } = require('../../../lib/index')
+const TestUtils = require('../../test-utils')
 const numberOfThreads = 10
 const maxTasks = 400
 const pool = new FixedThreadPool(
   numberOfThreads,
   './tests/worker-files/thread/testWorker.js',
   {
-    errorHandler: e => console.error(e),
-    onlineHandler: () => console.log('worker is online')
+    errorHandler: e => console.error(e)
   }
 )
 const emptyPool = new FixedThreadPool(
@@ -94,26 +94,10 @@ describe('Fixed thread pool test suite ', () => {
   })
 
   it('Shutdown test', async () => {
-    let closedThreads = 0
-    pool.workers.forEach(w => {
-      w.on('exit', () => {
-        closedThreads++
-      })
-    })
+    const exitPromise = TestUtils.waitExits(pool, numberOfThreads)
     await pool.destroy()
-    expect(closedThreads).toBe(numberOfThreads)
-  })
-
-  it('Validations test', () => {
-    let error
-    try {
-      const pool1 = new FixedThreadPool()
-      console.log(pool1)
-    } catch (e) {
-      error = e
-    }
-    expect(error).toBeTruthy()
-    expect(error.message).toBeTruthy()
+    const res = await exitPromise
+    expect(res).toBe(numberOfThreads)
   })
 
   it('Should work even without opts in input', async () => {