From 7f26014e50d2d14eefc6879f53d02e51e8ac646c Mon Sep 17 00:00:00 2001 From: Steve Reis <stevereis93@gmail.com> Date: Mon, 8 Aug 2022 15:59:17 +0200 Subject: [PATCH] ci: Fix issue with comparison test --- .../algorithms/linear-regression-cv.handler.spec.ts | 2 +- .../handlers/algorithms/linear-regression.handler.spec.ts | 4 ++-- .../handlers/algorithms/ttest-paired.handler.spec.ts | 6 +++--- .../exareme/handlers/algorithms/ttest-paired.handler.ts | 3 ++- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/api/src/engine/connectors/exareme/handlers/algorithms/linear-regression-cv.handler.spec.ts b/api/src/engine/connectors/exareme/handlers/algorithms/linear-regression-cv.handler.spec.ts index 728ecb5..22413df 100644 --- a/api/src/engine/connectors/exareme/handlers/algorithms/linear-regression-cv.handler.spec.ts +++ b/api/src/engine/connectors/exareme/handlers/algorithms/linear-regression-cv.handler.spec.ts @@ -93,7 +93,7 @@ describe('Linear regression CV result handler', () => { experiment.algorithm.name = 'dummy_algo'; linearHandler.handle(experiment, data, domain); - expect(experiment.results.length === 0); + expect(experiment.results.length).toBe(0); }); }); }); diff --git a/api/src/engine/connectors/exareme/handlers/algorithms/linear-regression.handler.spec.ts b/api/src/engine/connectors/exareme/handlers/algorithms/linear-regression.handler.spec.ts index b4dee3e..5fe1ecb 100644 --- a/api/src/engine/connectors/exareme/handlers/algorithms/linear-regression.handler.spec.ts +++ b/api/src/engine/connectors/exareme/handlers/algorithms/linear-regression.handler.spec.ts @@ -68,13 +68,13 @@ describe('Linear regression result handler', () => { const json = JSON.stringify(experiment.results); expect(json.includes(domain.variables[0].label)).toBeTruthy(); - expect(experiment.results.length === 2); + expect(experiment.results.length).toBe(2); }); it('Should be empty with another algo', () => { experiment.algorithm.name = 'dummy_algo'; linearHandler.handle(experiment, data, domain); - expect(experiment.results.length === 0); + expect(experiment.results.length).toBe(0); }); }); }); diff --git a/api/src/engine/connectors/exareme/handlers/algorithms/ttest-paired.handler.spec.ts b/api/src/engine/connectors/exareme/handlers/algorithms/ttest-paired.handler.spec.ts index d026714..b1e0629 100644 --- a/api/src/engine/connectors/exareme/handlers/algorithms/ttest-paired.handler.spec.ts +++ b/api/src/engine/connectors/exareme/handlers/algorithms/ttest-paired.handler.spec.ts @@ -41,15 +41,15 @@ describe('T-Test Paired handler', () => { const table = experiment.results[0] as TableResult; - expect(experiment.results.length === 1); - expect(table.data.length === 7); + expect(experiment.results.length).toBe(1); + expect(table.data.length).toBe(8); }); it('Should be empty with another algo', () => { experiment.algorithm.name = 'dummy_algo'; tTestPairedHandler.handle(experiment, data); - expect(experiment.results.length === 0); + expect(experiment.results.length).toBe(0); }); }); }); diff --git a/api/src/engine/connectors/exareme/handlers/algorithms/ttest-paired.handler.ts b/api/src/engine/connectors/exareme/handlers/algorithms/ttest-paired.handler.ts index e04ccb7..f7196ee 100644 --- a/api/src/engine/connectors/exareme/handlers/algorithms/ttest-paired.handler.ts +++ b/api/src/engine/connectors/exareme/handlers/algorithms/ttest-paired.handler.ts @@ -50,7 +50,8 @@ export default class TTestPairedHandler extends BaseHandler { } handle(experiment: Experiment, data: any, domain?: Domain): void { - if (!this.canHandle) return super.handle(experiment, data, domain); + if (!this.canHandle(experiment.algorithm.name)) + return super.handle(experiment, data, domain); const tableModel = this.getTable(data); -- GitLab