Tests: simplify tasks usage reset

[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 8a2b90c2fdbf24b5786936b0aed8e295aa8c0709..01622f1622c87237e1dc501313ff14ef348cc2dd 100644 (file)
--- a/tests/pools/thread/fixed.test.js
+++ b/tests/pools/thread/fixed.test.js
@@ -1,44 +1,45 @@
 const { expect } = require('expect')
 const { FixedThreadPool } = require('../../../lib/index')
-const WorkerFunctions = require('../../test-types')
+const { WorkerFunctions } = require('../../test-types')
 const TestUtils = require('../../test-utils')
-const numberOfThreads = 10
-const pool = new FixedThreadPool(
-  numberOfThreads,
-  './tests/worker-files/thread/testWorker.js',
-  {
-    errorHandler: e => console.error(e)
-  }
-)
-const emptyPool = new FixedThreadPool(
-  1,
-  './tests/worker-files/thread/emptyWorker.js',
-  { exitHandler: () => console.log('empty pool worker exited') }
-)
-const echoPool = new FixedThreadPool(
-  1,
-  './tests/worker-files/thread/echoWorker.js'
-)
-const errorPool = new FixedThreadPool(
-  1,
-  './tests/worker-files/thread/errorWorker.js',
-  {
-    errorHandler: e => console.error(e)
-  }
-)
-const asyncErrorPool = new FixedThreadPool(
-  1,
-  './tests/worker-files/thread/asyncErrorWorker.js',
-  {
-    errorHandler: e => console.error(e)
-  }
-)
-const asyncPool = new FixedThreadPool(
-  1,
-  './tests/worker-files/thread/asyncWorker.js'
-)
 
 describe('Fixed thread pool test suite', () => {
+  const numberOfThreads = 6
+  const pool = new FixedThreadPool(
+    numberOfThreads,
+    './tests/worker-files/thread/testWorker.js',
+    {
+      errorHandler: e => console.error(e)
+    }
+  )
+  const emptyPool = new FixedThreadPool(
+    numberOfThreads,
+    './tests/worker-files/thread/emptyWorker.js',
+    { exitHandler: () => console.log('empty pool worker exited') }
+  )
+  const echoPool = new FixedThreadPool(
+    numberOfThreads,
+    './tests/worker-files/thread/echoWorker.js'
+  )
+  const errorPool = new FixedThreadPool(
+    numberOfThreads,
+    './tests/worker-files/thread/errorWorker.js',
+    {
+      errorHandler: e => console.error(e)
+    }
+  )
+  const asyncErrorPool = new FixedThreadPool(
+    numberOfThreads,
+    './tests/worker-files/thread/asyncErrorWorker.js',
+    {
+      errorHandler: e => console.error(e)
+    }
+  )
+  const asyncPool = new FixedThreadPool(
+    numberOfThreads,
+    './tests/worker-files/thread/asyncWorker.js'
+  )
+
   after('Destroy all pools', async () => {
     // We need to clean up the resources after our test
     await echoPool.destroy()
@@ -92,7 +93,7 @@ describe('Fixed thread pool test suite', () => {
   it('Verify that data are sent to the worker correctly', async () => {
     const data = { f: 10 }
     const result = await echoPool.execute(data)
-    expect(result).toEqual(data)
+    expect(result).toStrictEqual(data)
   })
 
   it('Verify that error handling is working properly:sync', async () => {
@@ -127,10 +128,10 @@ describe('Fixed thread pool test suite', () => {
 
   it('Verify that async function is working properly', async () => {
     const data = { f: 10 }
-    const startTime = new Date().getTime()
+    const startTime = Date.now()
     const result = await asyncPool.execute(data)
-    const usedTime = new Date().getTime() - startTime
-    expect(result).toEqual(data)
+    const usedTime = Date.now() - startTime
+    expect(result).toStrictEqual(data)
     expect(usedTime).toBeGreaterThanOrEqual(2000)
   })
 
@@ -143,7 +144,7 @@ describe('Fixed thread pool test suite', () => {
 
   it('Should work even without opts in input', async () => {
     const pool1 = new FixedThreadPool(
-      1,
+      numberOfThreads,
       './tests/worker-files/thread/testWorker.js'
     )
     const res = await pool1.execute()