X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=tests%2Fworker%2Fabstract-worker.test.mjs;h=ed4fcbdb2f887068d53212b6e7e3b2e36aed5111;hb=refs%2Fheads%2Fmaster;hp=cb91f6963fb92c5275e7d396d1661c22e5ea7b45;hpb=3e931141fe4cbbb1221697a1ee4fd26f4c419c82;p=poolifier.git diff --git a/tests/worker/abstract-worker.test.mjs b/tests/worker/abstract-worker.test.mjs index cb91f6963..3ab729e9c 100644 --- a/tests/worker/abstract-worker.test.mjs +++ b/tests/worker/abstract-worker.test.mjs @@ -1,7 +1,12 @@ -import { expect } from 'expect' +import { expect } from '@std/expect' import { restore, stub } from 'sinon' -import { ClusterWorker, KillBehaviors, ThreadWorker } from '../../lib/index.cjs' +import { + ClusterWorker, + KillBehaviors, + ThreadWorker, + WorkerChoiceStrategies, +} from '../../lib/index.cjs' import { DEFAULT_TASK_NAME, EMPTY_FUNCTION } from '../../lib/utils.cjs' describe('Abstract worker test suite', () => { @@ -20,8 +25,8 @@ describe('Abstract worker test suite', () => { const worker = new ThreadWorker(() => {}) expect(worker.opts).toStrictEqual({ killBehavior: KillBehaviors.SOFT, + killHandler: EMPTY_FUNCTION, maxInactiveTime: 60000, - killHandler: EMPTY_FUNCTION }) }) @@ -36,10 +41,14 @@ describe('Abstract worker test suite', () => { new TypeError("killBehavior option '0' is not valid") ) expect(() => new ThreadWorker(() => {}, { maxInactiveTime: '' })).toThrow( - new TypeError('maxInactiveTime option is not an integer') + new TypeError( + 'maxInactiveTime option is not a positive integer greater or equal than 5' + ) ) expect(() => new ThreadWorker(() => {}, { maxInactiveTime: 0.5 })).toThrow( - new TypeError('maxInactiveTime option is not an integer') + new TypeError( + 'maxInactiveTime option is not a positive integer greater or equal than 5' + ) ) expect(() => new ThreadWorker(() => {}, { maxInactiveTime: 0 })).toThrow( new TypeError( @@ -65,13 +74,13 @@ describe('Abstract worker test suite', () => { } const worker = new ClusterWorker(() => {}, { killBehavior: KillBehaviors.HARD, + killHandler, maxInactiveTime: 6000, - killHandler }) expect(worker.opts).toStrictEqual({ killBehavior: KillBehaviors.HARD, + killHandler, maxInactiveTime: 6000, - killHandler }) }) @@ -132,8 +141,12 @@ describe('Abstract worker test suite', () => { it('Verify that taskFunctions parameter with unique function is taken', () => { const worker = new ThreadWorker(() => {}) - expect(worker.taskFunctions.get(DEFAULT_TASK_NAME)).toBeInstanceOf(Object) - expect(worker.taskFunctions.get('fn1')).toBeInstanceOf(Object) + expect(worker.taskFunctions.get(DEFAULT_TASK_NAME)).toStrictEqual({ + taskFunction: expect.any(Function), + }) + expect(worker.taskFunctions.get('fn1')).toStrictEqual({ + taskFunction: expect.any(Function), + }) expect(worker.taskFunctions.size).toBe(2) expect(worker.taskFunctions.get(DEFAULT_TASK_NAME)).toStrictEqual( worker.taskFunctions.get('fn1') @@ -146,13 +159,38 @@ describe('Abstract worker test suite', () => { } const fn2 = '' expect(() => new ThreadWorker({ '': fn1 })).toThrow( - new TypeError('A taskFunctions parameter object key is an empty string') + new TypeError('name parameter is an empty string') ) expect(() => new ThreadWorker({ fn1, fn2 })).toThrow( new TypeError( "taskFunction object 'taskFunction' property 'undefined' is not a function" ) ) + expect(() => new ThreadWorker({ fn1: { fn1 } })).toThrow( + new TypeError( + "taskFunction object 'taskFunction' property 'undefined' is not a function" + ) + ) + expect(() => new ThreadWorker({ fn2: { taskFunction: fn2 } })).toThrow( + new TypeError( + "taskFunction object 'taskFunction' property '' is not a function" + ) + ) + expect( + () => new ThreadWorker({ fn1: { priority: '', taskFunction: fn1 } }) + ).toThrow(new TypeError("Invalid property 'priority': ''")) + expect( + () => new ThreadWorker({ fn1: { priority: -21, taskFunction: fn1 } }) + ).toThrow(new RangeError("Property 'priority' must be between -20 and 19")) + expect( + () => new ThreadWorker({ fn1: { priority: 20, taskFunction: fn1 } }) + ).toThrow(new RangeError("Property 'priority' must be between -20 and 19")) + expect( + () => + new ThreadWorker({ + fn1: { strategy: 'invalidStrategy', taskFunction: fn1 }, + }) + ).toThrow(new Error("Invalid worker choice strategy 'invalidStrategy'")) }) it('Verify that taskFunctions parameter with multiple task functions is taken', () => { @@ -163,9 +201,42 @@ describe('Abstract worker test suite', () => { return 2 } const worker = new ClusterWorker({ fn1, fn2 }) - expect(worker.taskFunctions.get(DEFAULT_TASK_NAME)).toBeInstanceOf(Object) - expect(worker.taskFunctions.get('fn1')).toBeInstanceOf(Object) - expect(worker.taskFunctions.get('fn2')).toBeInstanceOf(Object) + expect(worker.taskFunctions.get(DEFAULT_TASK_NAME)).toStrictEqual({ + taskFunction: expect.any(Function), + }) + expect(worker.taskFunctions.get('fn1')).toStrictEqual({ + taskFunction: expect.any(Function), + }) + expect(worker.taskFunctions.get('fn2')).toStrictEqual({ + taskFunction: expect.any(Function), + }) + expect(worker.taskFunctions.size).toBe(3) + expect(worker.taskFunctions.get(DEFAULT_TASK_NAME)).toStrictEqual( + worker.taskFunctions.get('fn1') + ) + }) + + it('Verify that taskFunctions parameter with multiple task functions object is taken', () => { + const fn1Obj = { + priority: 5, + taskFunction: () => { + return 1 + }, + } + const fn2Obj = { + priority: 6, + strategy: WorkerChoiceStrategies.LESS_BUSY, + taskFunction: () => { + return 2 + }, + } + const worker = new ThreadWorker({ + fn1: fn1Obj, + fn2: fn2Obj, + }) + expect(worker.taskFunctions.get(DEFAULT_TASK_NAME)).toStrictEqual(fn1Obj) + expect(worker.taskFunctions.get('fn1')).toStrictEqual(fn1Obj) + expect(worker.taskFunctions.get('fn2')).toStrictEqual(fn2Obj) expect(worker.taskFunctions.size).toBe(3) expect(worker.taskFunctions.get(DEFAULT_TASK_NAME)).toStrictEqual( worker.taskFunctions.get('fn1') @@ -175,7 +246,7 @@ describe('Abstract worker test suite', () => { it('Verify that async kill handler is called when worker is killed', () => { const killHandlerStub = stub().returns() const worker = new ClusterWorker(() => {}, { - killHandler: async () => await Promise.resolve(killHandlerStub()) + killHandler: async () => await Promise.resolve(killHandlerStub()), }) worker.isMain = false worker.handleKillMessage() @@ -197,15 +268,15 @@ describe('Abstract worker test suite', () => { } const worker = new ClusterWorker({ fn1, fn2 }) expect(worker.hasTaskFunction(0)).toStrictEqual({ + error: new TypeError('name parameter is not a string'), status: false, - error: new TypeError('name parameter is not a string') }) expect(worker.hasTaskFunction('')).toStrictEqual({ + error: new TypeError('name parameter is an empty string'), status: false, - error: new TypeError('name parameter is an empty string') }) expect(worker.hasTaskFunction(DEFAULT_TASK_NAME)).toStrictEqual({ - status: true + status: true, }) expect(worker.hasTaskFunction('fn1')).toStrictEqual({ status: true }) expect(worker.hasTaskFunction('fn2')).toStrictEqual({ status: true }) @@ -224,50 +295,105 @@ describe('Abstract worker test suite', () => { } const worker = new ThreadWorker(fn1) expect(worker.addTaskFunction(0, fn1)).toStrictEqual({ + error: new TypeError('name parameter is not a string'), status: false, - error: new TypeError('name parameter is not a string') }) expect(worker.addTaskFunction('', fn1)).toStrictEqual({ + error: new TypeError('name parameter is an empty string'), status: false, - error: new TypeError('name parameter is an empty string') }) - expect(worker.addTaskFunction('fn3', '')).toStrictEqual({ + expect(worker.addTaskFunction('fn2', 0)).toStrictEqual({ + error: new TypeError( + "taskFunction object 'taskFunction' property 'undefined' is not a function" + ), status: false, + }) + expect(worker.addTaskFunction('fn3', '')).toStrictEqual({ error: new TypeError( "taskFunction object 'taskFunction' property 'undefined' is not a function" - ) + ), + status: false, + }) + expect(worker.addTaskFunction('fn2', { taskFunction: 0 })).toStrictEqual({ + error: new TypeError( + "taskFunction object 'taskFunction' property '0' is not a function" + ), + status: false, + }) + expect(worker.addTaskFunction('fn3', { taskFunction: '' })).toStrictEqual({ + error: new TypeError( + "taskFunction object 'taskFunction' property '' is not a function" + ), + status: false, + }) + expect( + worker.addTaskFunction('fn2', { priority: -21, taskFunction: () => {} }) + ).toStrictEqual({ + error: new RangeError("Property 'priority' must be between -20 and 19"), + status: false, + }) + expect( + worker.addTaskFunction('fn3', { priority: 20, taskFunction: () => {} }) + ).toStrictEqual({ + error: new RangeError("Property 'priority' must be between -20 and 19"), + status: false, + }) + expect( + worker.addTaskFunction('fn2', { + strategy: 'invalidStrategy', + taskFunction: () => {}, + }) + ).toStrictEqual({ + error: new Error("Invalid worker choice strategy 'invalidStrategy'"), + status: false, + }) + expect(worker.taskFunctions.get(DEFAULT_TASK_NAME)).toStrictEqual({ + taskFunction: expect.any(Function), + }) + expect(worker.taskFunctions.get('fn1')).toStrictEqual({ + taskFunction: expect.any(Function), }) - expect(worker.taskFunctions.get(DEFAULT_TASK_NAME)).toBeInstanceOf(Object) - expect(worker.taskFunctions.get('fn1')).toBeInstanceOf(Object) expect(worker.taskFunctions.size).toBe(2) expect(worker.taskFunctions.get(DEFAULT_TASK_NAME)).toStrictEqual( worker.taskFunctions.get('fn1') ) expect(worker.addTaskFunction(DEFAULT_TASK_NAME, fn2)).toStrictEqual({ - status: false, error: new Error( 'Cannot add a task function with the default reserved name' - ) + ), + status: false, }) worker.addTaskFunction('fn2', fn2) - expect(worker.taskFunctions.get(DEFAULT_TASK_NAME)).toBeInstanceOf(Object) - expect(worker.taskFunctions.get('fn1')).toBeInstanceOf(Object) - expect(worker.taskFunctions.get('fn2')).toBeInstanceOf(Object) + expect(worker.taskFunctions.get(DEFAULT_TASK_NAME)).toStrictEqual({ + taskFunction: expect.any(Function), + }) + expect(worker.taskFunctions.get('fn1')).toStrictEqual({ + taskFunction: expect.any(Function), + }) + expect(worker.taskFunctions.get('fn2')).toStrictEqual({ + taskFunction: expect.any(Function), + }) expect(worker.taskFunctions.size).toBe(3) expect(worker.taskFunctions.get(DEFAULT_TASK_NAME)).toStrictEqual( worker.taskFunctions.get('fn1') ) worker.addTaskFunction('fn1', fn1Replacement) - expect(worker.taskFunctions.get(DEFAULT_TASK_NAME)).toBeInstanceOf(Object) - expect(worker.taskFunctions.get('fn1')).toBeInstanceOf(Object) - expect(worker.taskFunctions.get('fn2')).toBeInstanceOf(Object) + expect(worker.taskFunctions.get(DEFAULT_TASK_NAME)).toStrictEqual({ + taskFunction: expect.any(Function), + }) + expect(worker.taskFunctions.get('fn1')).toStrictEqual({ + taskFunction: expect.any(Function), + }) + expect(worker.taskFunctions.get('fn2')).toStrictEqual({ + taskFunction: expect.any(Function), + }) expect(worker.taskFunctions.size).toBe(3) expect(worker.taskFunctions.get(DEFAULT_TASK_NAME)).toStrictEqual( worker.taskFunctions.get('fn1') ) }) - it('Verify that listTaskFunctionNames() is working', () => { + it('Verify that listTaskFunctionsProperties() is working', () => { const fn1 = () => { return 1 } @@ -278,7 +404,7 @@ describe('Abstract worker test suite', () => { expect(worker.listTaskFunctionsProperties()).toStrictEqual([ { name: DEFAULT_TASK_NAME }, { name: 'fn1' }, - { name: 'fn2' } + { name: 'fn2' }, ]) }) @@ -291,31 +417,37 @@ describe('Abstract worker test suite', () => { } const worker = new ThreadWorker({ fn1, fn2 }) expect(worker.setDefaultTaskFunction(0, fn1)).toStrictEqual({ + error: new TypeError('name parameter is not a string'), status: false, - error: new TypeError('name parameter is not a string') }) expect(worker.setDefaultTaskFunction('', fn1)).toStrictEqual({ + error: new TypeError('name parameter is an empty string'), status: false, - error: new TypeError('name parameter is an empty string') }) - expect(worker.taskFunctions.get(DEFAULT_TASK_NAME)).toBeInstanceOf(Object) - expect(worker.taskFunctions.get('fn1')).toBeInstanceOf(Object) - expect(worker.taskFunctions.get('fn2')).toBeInstanceOf(Object) + expect(worker.taskFunctions.get(DEFAULT_TASK_NAME)).toStrictEqual({ + taskFunction: expect.any(Function), + }) + expect(worker.taskFunctions.get('fn1')).toStrictEqual({ + taskFunction: expect.any(Function), + }) + expect(worker.taskFunctions.get('fn2')).toStrictEqual({ + taskFunction: expect.any(Function), + }) expect(worker.taskFunctions.size).toBe(3) expect(worker.taskFunctions.get(DEFAULT_TASK_NAME)).toStrictEqual( worker.taskFunctions.get('fn1') ) 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' - ) + ), + status: false, }) expect(worker.setDefaultTaskFunction('fn3')).toStrictEqual({ - status: false, error: new Error( 'Cannot set the default task function to a non-existing task function' - ) + ), + status: false, }) worker.setDefaultTaskFunction('fn1') expect(worker.taskFunctions.get(DEFAULT_TASK_NAME)).toStrictEqual(