X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=tests%2Fworker%2Fabstract-worker.test.js;h=87a78f5d3925c026abf92c94df4b53ed25889ed3;hb=059cf20e59d680db96e1d812dd6320ba9af55c1c;hp=6fd0ea2cad02f720c7de7392bbf9246259869ba0;hpb=dc021bcca72f8b4d185d96a301579612fba2793b;p=poolifier.git

diff --git a/tests/worker/abstract-worker.test.js b/tests/worker/abstract-worker.test.js
index 6fd0ea2c..87a78f5d 100644
--- a/tests/worker/abstract-worker.test.js
+++ b/tests/worker/abstract-worker.test.js
@@ -1,7 +1,7 @@
 const { expect } = require('expect')
 const sinon = require('sinon')
 const { ClusterWorker, KillBehaviors, ThreadWorker } = require('../../lib')
-const { EMPTY_FUNCTION } = require('../../lib/utils')
+const { DEFAULT_TASK_NAME, EMPTY_FUNCTION } = require('../../lib/utils')
 
 describe('Abstract worker test suite', () => {
   class StubWorkerWithMainWorker extends ThreadWorker {
@@ -17,10 +17,52 @@ describe('Abstract worker test suite', () => {
 
   it('Verify worker options default values', () => {
     const worker = new ThreadWorker(() => {})
-    expect(worker.opts.maxInactiveTime).toStrictEqual(60000)
-    expect(worker.opts.killBehavior).toBe(KillBehaviors.SOFT)
-    expect(worker.opts.killHandler).toStrictEqual(EMPTY_FUNCTION)
-    expect(worker.opts.async).toBe(undefined)
+    expect(worker.opts).toStrictEqual({
+      killBehavior: KillBehaviors.SOFT,
+      maxInactiveTime: 60000,
+      killHandler: EMPTY_FUNCTION
+    })
+  })
+
+  it('Verify that worker options are checked at worker creation', () => {
+    expect(() => new ClusterWorker(() => {}, '')).toThrowError(
+      new TypeError('opts worker options parameter is not a plain object')
+    )
+    expect(
+      () => new ClusterWorker(() => {}, { killBehavior: '' })
+    ).toThrowError(new TypeError("killBehavior option '' is not valid"))
+    expect(() => new ClusterWorker(() => {}, { killBehavior: 0 })).toThrowError(
+      new TypeError("killBehavior option '0' is not valid")
+    )
+    expect(
+      () => new ThreadWorker(() => {}, { maxInactiveTime: '' })
+    ).toThrowError(new TypeError('maxInactiveTime option is not an integer'))
+    expect(
+      () => new ThreadWorker(() => {}, { maxInactiveTime: 0.5 })
+    ).toThrowError(new TypeError('maxInactiveTime option is not an integer'))
+    expect(
+      () => new ThreadWorker(() => {}, { maxInactiveTime: 0 })
+    ).toThrowError(
+      new TypeError(
+        'maxInactiveTime option is not a positive integer greater or equal than 5'
+      )
+    )
+    expect(
+      () => new ThreadWorker(() => {}, { maxInactiveTime: 4 })
+    ).toThrowError(
+      new TypeError(
+        'maxInactiveTime option is not a positive integer greater or equal than 5'
+      )
+    )
+    expect(() => new ThreadWorker(() => {}, { killHandler: '' })).toThrowError(
+      new TypeError('killHandler option is not a function')
+    )
+    expect(() => new ThreadWorker(() => {}, { killHandler: 0 })).toThrowError(
+      new TypeError('killHandler option is not a function')
+    )
+    expect(() => new ThreadWorker(() => {}, { async: true })).toThrowError(
+      new TypeError('async option is deprecated')
+    )
   })
 
   it('Verify that worker options are set at worker creation', () => {
@@ -28,20 +70,20 @@ describe('Abstract worker test suite', () => {
       console.info('Worker received kill message')
     }
     const worker = new ClusterWorker(() => {}, {
+      killBehavior: KillBehaviors.HARD,
       maxInactiveTime: 6000,
+      killHandler
+    })
+    expect(worker.opts).toStrictEqual({
       killBehavior: KillBehaviors.HARD,
-      killHandler,
-      async: true
+      maxInactiveTime: 6000,
+      killHandler
     })
-    expect(worker.opts.maxInactiveTime).toStrictEqual(6000)
-    expect(worker.opts.killBehavior).toBe(KillBehaviors.HARD)
-    expect(worker.opts.killHandler).toStrictEqual(killHandler)
-    expect(worker.opts.async).toBe(undefined)
   })
 
   it('Verify that taskFunctions parameter is mandatory', () => {
     expect(() => new ClusterWorker()).toThrowError(
-      'taskFunctions parameter is mandatory'
+      new Error('taskFunctions parameter is mandatory')
     )
   })
 
@@ -96,19 +138,22 @@ describe('Abstract worker test suite', () => {
 
   it('Verify that taskFunctions parameter with unique function is taken', () => {
     const worker = new ThreadWorker(() => {})
-    expect(worker.taskFunctions.get('default')).toBeInstanceOf(Function)
+    expect(worker.taskFunctions.get(DEFAULT_TASK_NAME)).toBeInstanceOf(Function)
     expect(worker.taskFunctions.get('fn1')).toBeInstanceOf(Function)
     expect(worker.taskFunctions.size).toBe(2)
-    expect(worker.taskFunctions.get('default')).toStrictEqual(
+    expect(worker.taskFunctions.get(DEFAULT_TASK_NAME)).toStrictEqual(
       worker.taskFunctions.get('fn1')
     )
   })
 
-  it('Verify that taskFunctions parameter with multiple task functions contains function', () => {
+  it('Verify that taskFunctions parameter with multiple task functions is checked', () => {
     const fn1 = () => {
       return 1
     }
     const fn2 = ''
+    expect(() => new ThreadWorker({ '': fn1 })).toThrowError(
+      new TypeError('A taskFunctions parameter object key is an empty string')
+    )
     expect(() => new ThreadWorker({ fn1, fn2 })).toThrowError(
       new TypeError('A taskFunctions parameter object value is not a function')
     )
@@ -122,11 +167,11 @@ describe('Abstract worker test suite', () => {
       return 2
     }
     const worker = new ClusterWorker({ fn1, fn2 })
-    expect(worker.taskFunctions.get('default')).toBeInstanceOf(Function)
+    expect(worker.taskFunctions.get(DEFAULT_TASK_NAME)).toBeInstanceOf(Function)
     expect(worker.taskFunctions.get('fn1')).toBeInstanceOf(Function)
     expect(worker.taskFunctions.get('fn2')).toBeInstanceOf(Function)
     expect(worker.taskFunctions.size).toBe(3)
-    expect(worker.taskFunctions.get('default')).toStrictEqual(
+    expect(worker.taskFunctions.get(DEFAULT_TASK_NAME)).toStrictEqual(
       worker.taskFunctions.get('fn1')
     )
   })
@@ -178,10 +223,20 @@ describe('Abstract worker test suite', () => {
       return 2
     }
     const worker = new ClusterWorker({ fn1, fn2 })
-    expect(worker.hasTaskFunction('default')).toBe(true)
-    expect(worker.hasTaskFunction('fn1')).toBe(true)
-    expect(worker.hasTaskFunction('fn2')).toBe(true)
-    expect(worker.hasTaskFunction('fn3')).toBe(false)
+    expect(worker.hasTaskFunction(0)).toStrictEqual({
+      status: false,
+      error: new TypeError('name parameter is not a string')
+    })
+    expect(worker.hasTaskFunction('')).toStrictEqual({
+      status: false,
+      error: new TypeError('name parameter is an empty string')
+    })
+    expect(worker.hasTaskFunction(DEFAULT_TASK_NAME)).toStrictEqual({
+      status: true
+    })
+    expect(worker.hasTaskFunction('fn1')).toStrictEqual({ status: true })
+    expect(worker.hasTaskFunction('fn2')).toStrictEqual({ status: true })
+    expect(worker.hasTaskFunction('fn3')).toStrictEqual({ status: false })
   })
 
   it('Verify that addTaskFunction() works', () => {
@@ -195,29 +250,44 @@ describe('Abstract worker test suite', () => {
       return 3
     }
     const worker = new ThreadWorker(fn1)
-    expect(worker.taskFunctions.get('default')).toBeInstanceOf(Function)
+    expect(worker.addTaskFunction(0, fn1)).toStrictEqual({
+      status: false,
+      error: new TypeError('name parameter is not a string')
+    })
+    expect(worker.addTaskFunction('', fn1)).toStrictEqual({
+      status: false,
+      error: new TypeError('name parameter is an empty string')
+    })
+    expect(worker.addTaskFunction('fn3', '')).toStrictEqual({
+      status: false,
+      error: new TypeError('fn parameter is not a function')
+    })
+    expect(worker.taskFunctions.get(DEFAULT_TASK_NAME)).toBeInstanceOf(Function)
     expect(worker.taskFunctions.get('fn1')).toBeInstanceOf(Function)
     expect(worker.taskFunctions.size).toBe(2)
-    expect(worker.taskFunctions.get('default')).toStrictEqual(
+    expect(worker.taskFunctions.get(DEFAULT_TASK_NAME)).toStrictEqual(
       worker.taskFunctions.get('fn1')
     )
-    expect(() => worker.addTaskFunction('default', fn2)).toThrowError(
-      new Error('Cannot add a task function with the default reserved name')
-    )
+    expect(worker.addTaskFunction(DEFAULT_TASK_NAME, fn2)).toStrictEqual({
+      status: false,
+      error: new Error(
+        'Cannot add a task function with the default reserved name'
+      )
+    })
     worker.addTaskFunction('fn2', fn2)
-    expect(worker.taskFunctions.get('default')).toBeInstanceOf(Function)
+    expect(worker.taskFunctions.get(DEFAULT_TASK_NAME)).toBeInstanceOf(Function)
     expect(worker.taskFunctions.get('fn1')).toBeInstanceOf(Function)
     expect(worker.taskFunctions.get('fn2')).toBeInstanceOf(Function)
     expect(worker.taskFunctions.size).toBe(3)
-    expect(worker.taskFunctions.get('default')).toStrictEqual(
+    expect(worker.taskFunctions.get(DEFAULT_TASK_NAME)).toStrictEqual(
       worker.taskFunctions.get('fn1')
     )
     worker.addTaskFunction('fn1', fn1Replacement)
-    expect(worker.taskFunctions.get('default')).toBeInstanceOf(Function)
+    expect(worker.taskFunctions.get(DEFAULT_TASK_NAME)).toBeInstanceOf(Function)
     expect(worker.taskFunctions.get('fn1')).toBeInstanceOf(Function)
     expect(worker.taskFunctions.get('fn2')).toBeInstanceOf(Function)
     expect(worker.taskFunctions.size).toBe(3)
-    expect(worker.taskFunctions.get('default')).toStrictEqual(
+    expect(worker.taskFunctions.get(DEFAULT_TASK_NAME)).toStrictEqual(
       worker.taskFunctions.get('fn1')
     )
   })
@@ -230,29 +300,39 @@ describe('Abstract worker test suite', () => {
       return 2
     }
     const worker = new ClusterWorker({ fn1, fn2 })
+    expect(worker.removeTaskFunction(0, fn1)).toStrictEqual({
+      status: false,
+      error: new TypeError('name parameter is not a string')
+    })
+    expect(worker.removeTaskFunction('', fn1)).toStrictEqual({
+      status: false,
+      error: new TypeError('name parameter is an empty string')
+    })
     worker.getMainWorker = sinon.stub().returns({
       id: 1,
       send: sinon.stub().returns()
     })
-    expect(worker.taskFunctions.get('default')).toBeInstanceOf(Function)
+    expect(worker.taskFunctions.get(DEFAULT_TASK_NAME)).toBeInstanceOf(Function)
     expect(worker.taskFunctions.get('fn1')).toBeInstanceOf(Function)
     expect(worker.taskFunctions.get('fn2')).toBeInstanceOf(Function)
     expect(worker.taskFunctions.size).toBe(3)
-    expect(worker.taskFunctions.get('default')).toStrictEqual(
+    expect(worker.taskFunctions.get(DEFAULT_TASK_NAME)).toStrictEqual(
       worker.taskFunctions.get('fn1')
     )
-    expect(() => worker.removeTaskFunction('default')).toThrowError(
-      new Error(
+    expect(worker.removeTaskFunction(DEFAULT_TASK_NAME)).toStrictEqual({
+      status: false,
+      error: new Error(
         'Cannot remove the task function with the default reserved name'
       )
-    )
-    expect(() => worker.removeTaskFunction('fn1')).toThrowError(
-      new Error(
+    })
+    expect(worker.removeTaskFunction('fn1')).toStrictEqual({
+      status: false,
+      error: new Error(
         'Cannot remove the task function used as the default task function'
       )
-    )
+    })
     worker.removeTaskFunction('fn2')
-    expect(worker.taskFunctions.get('default')).toBeInstanceOf(Function)
+    expect(worker.taskFunctions.get(DEFAULT_TASK_NAME)).toBeInstanceOf(Function)
     expect(worker.taskFunctions.get('fn1')).toBeInstanceOf(Function)
     expect(worker.taskFunctions.get('fn2')).toBeUndefined()
     expect(worker.taskFunctions.size).toBe(2)
@@ -267,7 +347,11 @@ describe('Abstract worker test suite', () => {
       return 2
     }
     const worker = new ClusterWorker({ fn1, fn2 })
-    expect(worker.listTaskFunctions()).toStrictEqual(['default', 'fn1', 'fn2'])
+    expect(worker.listTaskFunctionNames()).toStrictEqual([
+      DEFAULT_TASK_NAME,
+      'fn1',
+      'fn2'
+    ])
   })
 
   it('Verify that setDefaultTaskFunction() works', () => {
@@ -278,24 +362,39 @@ describe('Abstract worker test suite', () => {
       return 2
     }
     const worker = new ThreadWorker({ fn1, fn2 })
-    expect(worker.taskFunctions.get('default')).toBeInstanceOf(Function)
+    expect(worker.setDefaultTaskFunction(0, fn1)).toStrictEqual({
+      status: false,
+      error: new TypeError('name parameter is not a string')
+    })
+    expect(worker.setDefaultTaskFunction('', fn1)).toStrictEqual({
+      status: false,
+      error: new TypeError('name parameter is an empty string')
+    })
+    expect(worker.taskFunctions.get(DEFAULT_TASK_NAME)).toBeInstanceOf(Function)
     expect(worker.taskFunctions.get('fn1')).toBeInstanceOf(Function)
     expect(worker.taskFunctions.get('fn2')).toBeInstanceOf(Function)
     expect(worker.taskFunctions.size).toBe(3)
-    expect(worker.taskFunctions.get('default')).toStrictEqual(
+    expect(worker.taskFunctions.get(DEFAULT_TASK_NAME)).toStrictEqual(
       worker.taskFunctions.get('fn1')
     )
-    expect(() => worker.setDefaultTaskFunction('default')).toThrowError(
-      new Error(
+    expect(worker.setDefaultTaskFunction(DEFAULT_TASK_NAME)).toStrictEqual({
+      status: false,
+      error: new Error(
         'Cannot set the default task function reserved name as the default task function'
       )
-    )
+    })
+    expect(worker.setDefaultTaskFunction('fn3')).toStrictEqual({
+      status: false,
+      error: new Error(
+        'Cannot set the default task function to a non-existing task function'
+      )
+    })
     worker.setDefaultTaskFunction('fn1')
-    expect(worker.taskFunctions.get('default')).toStrictEqual(
+    expect(worker.taskFunctions.get(DEFAULT_TASK_NAME)).toStrictEqual(
       worker.taskFunctions.get('fn1')
     )
     worker.setDefaultTaskFunction('fn2')
-    expect(worker.taskFunctions.get('default')).toStrictEqual(
+    expect(worker.taskFunctions.get(DEFAULT_TASK_NAME)).toStrictEqual(
       worker.taskFunctions.get('fn2')
     )
   })