From 669796341394caefd889b211ef39cd2bb100644d Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=A9r=C3=B4me=20Benoit?= Date: Wed, 13 Sep 2023 19:42:02 +0200 Subject: [PATCH] test: fix tests MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Jérôme Benoit --- tests/pools/abstract/abstract-pool.test.js | 12 ++- tests/pools/abstract/worker-node.test.js | 4 +- tests/worker/abstract-worker.test.js | 112 ++++++++++++--------- 3 files changed, 74 insertions(+), 54 deletions(-) diff --git a/tests/pools/abstract/abstract-pool.test.js b/tests/pools/abstract/abstract-pool.test.js index bedb1c6c..f2b50667 100644 --- a/tests/pools/abstract/abstract-pool.test.js +++ b/tests/pools/abstract/abstract-pool.test.js @@ -1176,7 +1176,7 @@ describe('Abstract pool test suite', () => { './tests/worker-files/thread/testMultipleTaskFunctionsWorker.js' ) await waitPoolEvents(dynamicThreadPool, PoolEvents.ready, 1) - expect(dynamicThreadPool.listTaskFunctions()).toStrictEqual([ + expect(dynamicThreadPool.listTaskFunctionNames()).toStrictEqual([ DEFAULT_TASK_NAME, 'jsonIntegerSerialization', 'factorial', @@ -1187,7 +1187,7 @@ describe('Abstract pool test suite', () => { './tests/worker-files/cluster/testMultipleTaskFunctionsWorker.js' ) await waitPoolEvents(fixedClusterPool, PoolEvents.ready, 1) - expect(fixedClusterPool.listTaskFunctions()).toStrictEqual([ + expect(fixedClusterPool.listTaskFunctionNames()).toStrictEqual([ DEFAULT_TASK_NAME, 'jsonIntegerSerialization', 'factorial', @@ -1215,14 +1215,14 @@ describe('Abstract pool test suite', () => { expect(pool.info.executingTasks).toBe(0) expect(pool.info.executedTasks).toBe(4) for (const workerNode of pool.workerNodes) { - expect(workerNode.info.taskFunctions).toStrictEqual([ + expect(workerNode.info.taskFunctionNames).toStrictEqual([ DEFAULT_TASK_NAME, 'jsonIntegerSerialization', 'factorial', 'fibonacci' ]) expect(workerNode.taskFunctionsUsage.size).toBe(3) - for (const name of pool.listTaskFunctions()) { + for (const name of pool.listTaskFunctionNames()) { expect(workerNode.getTaskFunctionWorkerUsage(name)).toStrictEqual({ tasks: { executed: expect.any(Number), @@ -1253,7 +1253,9 @@ describe('Abstract pool test suite', () => { expect( workerNode.getTaskFunctionWorkerUsage(DEFAULT_TASK_NAME) ).toStrictEqual( - workerNode.getTaskFunctionWorkerUsage(workerNode.info.taskFunctions[1]) + workerNode.getTaskFunctionWorkerUsage( + workerNode.info.taskFunctionNames[1] + ) ) } await pool.destroy() diff --git a/tests/pools/abstract/worker-node.test.js b/tests/pools/abstract/worker-node.test.js index c57ce953..c670d5bd 100644 --- a/tests/pools/abstract/worker-node.test.js +++ b/tests/pools/abstract/worker-node.test.js @@ -129,7 +129,7 @@ describe('Worker node test suite', () => { "Cannot get task function worker usage for task function name 'invalidTaskFunction' when task function names list is not yet defined" ) ) - threadWorkerNode.info.taskFunctions = [DEFAULT_TASK_NAME, 'fn1'] + threadWorkerNode.info.taskFunctionNames = [DEFAULT_TASK_NAME, 'fn1'] expect(() => threadWorkerNode.getTaskFunctionWorkerUsage('invalidTaskFunction') ).toThrowError( @@ -137,7 +137,7 @@ describe('Worker node test suite', () => { "Cannot get task function worker usage for task function name 'invalidTaskFunction' when task function names list has less than 3 elements" ) ) - threadWorkerNode.info.taskFunctions = [DEFAULT_TASK_NAME, 'fn1', 'fn2'] + threadWorkerNode.info.taskFunctionNames = [DEFAULT_TASK_NAME, 'fn1', 'fn2'] expect( threadWorkerNode.getTaskFunctionWorkerUsage(DEFAULT_TASK_NAME) ).toStrictEqual({ diff --git a/tests/worker/abstract-worker.test.js b/tests/worker/abstract-worker.test.js index 62f6dd2b..161fed18 100644 --- a/tests/worker/abstract-worker.test.js +++ b/tests/worker/abstract-worker.test.js @@ -183,16 +183,20 @@ describe('Abstract worker test suite', () => { return 2 } const worker = new ClusterWorker({ fn1, fn2 }) - expect(() => worker.hasTaskFunction(0)).toThrowError( - new TypeError('name parameter is not a string') - ) - expect(() => worker.hasTaskFunction('')).toThrowError( - new TypeError('name parameter is an empty string') - ) - expect(worker.hasTaskFunction(DEFAULT_TASK_NAME)).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', () => { @@ -206,24 +210,30 @@ describe('Abstract worker test suite', () => { return 3 } const worker = new ThreadWorker(fn1) - expect(() => worker.addTaskFunction(0, fn1)).toThrowError( - new TypeError('name parameter is not a string') - ) - expect(() => worker.addTaskFunction('', fn1)).toThrowError( - new TypeError('name parameter is an empty string') - ) - expect(() => worker.addTaskFunction('fn3', '')).toThrowError( - new TypeError('fn parameter is not a 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_TASK_NAME)).toStrictEqual( worker.taskFunctions.get('fn1') ) - expect(() => worker.addTaskFunction(DEFAULT_TASK_NAME, 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_TASK_NAME)).toBeInstanceOf(Function) expect(worker.taskFunctions.get('fn1')).toBeInstanceOf(Function) @@ -250,12 +260,14 @@ describe('Abstract worker test suite', () => { return 2 } const worker = new ClusterWorker({ fn1, fn2 }) - expect(() => worker.removeTaskFunction(0, fn1)).toThrowError( - new TypeError('name parameter is not a string') - ) - expect(() => worker.removeTaskFunction('', fn1)).toThrowError( - new TypeError('name parameter is an empty string') - ) + 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() @@ -267,16 +279,18 @@ describe('Abstract worker test suite', () => { expect(worker.taskFunctions.get(DEFAULT_TASK_NAME)).toStrictEqual( worker.taskFunctions.get('fn1') ) - expect(() => worker.removeTaskFunction(DEFAULT_TASK_NAME)).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_TASK_NAME)).toBeInstanceOf(Function) expect(worker.taskFunctions.get('fn1')).toBeInstanceOf(Function) @@ -293,7 +307,7 @@ describe('Abstract worker test suite', () => { return 2 } const worker = new ClusterWorker({ fn1, fn2 }) - expect(worker.listTaskFunctions()).toStrictEqual([ + expect(worker.listTaskFunctionNames()).toStrictEqual([ DEFAULT_TASK_NAME, 'fn1', 'fn2' @@ -308,12 +322,14 @@ describe('Abstract worker test suite', () => { return 2 } const worker = new ThreadWorker({ fn1, fn2 }) - expect(() => worker.setDefaultTaskFunction(0, fn1)).toThrowError( - new TypeError('name parameter is not a string') - ) - expect(() => worker.setDefaultTaskFunction('', fn1)).toThrowError( - new TypeError('name parameter is an empty string') - ) + 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) @@ -321,16 +337,18 @@ describe('Abstract worker test suite', () => { expect(worker.taskFunctions.get(DEFAULT_TASK_NAME)).toStrictEqual( worker.taskFunctions.get('fn1') ) - expect(() => worker.setDefaultTaskFunction(DEFAULT_TASK_NAME)).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')).toThrowError( - new Error( + }) + 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_TASK_NAME)).toStrictEqual( worker.taskFunctions.get('fn1') -- 2.34.1