From e8cfdbe3b97e214ab262a1e145d0366313f3c635 Mon Sep 17 00:00:00 2001 From: Carlos Valente Date: Fri, 10 May 2024 20:21:36 +0200 Subject: [PATCH] refactor: simplify tests --- .../common/utils/__tests__/dateConfig.test.js | 177 +++++++++--------- .../utils/src/date-utils/conversionUtils.ts | 2 +- 2 files changed, 90 insertions(+), 89 deletions(-) diff --git a/apps/client/src/common/utils/__tests__/dateConfig.test.js b/apps/client/src/common/utils/__tests__/dateConfig.test.js index 42c0d88e2..3c35ef70b 100644 --- a/apps/client/src/common/utils/__tests__/dateConfig.test.js +++ b/apps/client/src/common/utils/__tests__/dateConfig.test.js @@ -1,3 +1,5 @@ +import { MILLIS_PER_HOUR, MILLIS_PER_MINUTE, MILLIS_PER_SECOND } from 'ontime-utils'; + import { forgivingStringToMillis, millisToDelayString } from '../dateConfig'; describe('test forgivingStringToMillis()', () => { @@ -6,22 +8,22 @@ describe('test forgivingStringToMillis()', () => { { value: '', expect: 0 }, { value: '0', expect: 0 }, { value: '-0', expect: 0 }, - { value: '1', expect: 60 * 1000 }, - { value: '-1', expect: 60 * 1000 }, + { value: '1', expect: MILLIS_PER_MINUTE }, + { value: '-1', expect: MILLIS_PER_MINUTE }, { value: '0h0m0s', expect: 0 }, - { value: '0h0m1s', expect: 1000 }, - { value: '0h1m0s', expect: 1000 * 60 }, - { value: '1h0m0s', expect: 1000 * 60 * 60 }, - { value: '23h0m0s', expect: 1000 * 60 * 60 * 23 }, - { value: '12h12m12s', expect: 12 * 1000 + 12 * 60 * 1000 + 12 * 1000 * 60 * 60 }, - { value: '12H12M12S', expect: 12 * 1000 + 12 * 60 * 1000 + 12 * 1000 * 60 * 60 }, - { value: '2m', expect: 2 * 60 * 1000 }, - { value: '1h5s', expect: 1000 * 60 * 60 + 1000 * 5 }, - { value: '1h2m', expect: 1000 * 60 * 60 + 1000 * 60 * 2 }, + { value: '0h0m1s', expect: MILLIS_PER_SECOND }, + { value: '0h1m0s', expect: MILLIS_PER_MINUTE }, + { value: '1h0m0s', expect: MILLIS_PER_HOUR }, + { value: '23h0m0s', expect: 23 * MILLIS_PER_HOUR }, + { value: '12h12m12s', expect: 12 * MILLIS_PER_SECOND + 12 * MILLIS_PER_MINUTE + 12 * MILLIS_PER_HOUR }, + { value: '12H12M12S', expect: 12 * MILLIS_PER_SECOND + 12 * MILLIS_PER_MINUTE + 12 * MILLIS_PER_HOUR }, + { value: '2m', expect: 2 * MILLIS_PER_MINUTE }, + { value: '1h5s', expect: MILLIS_PER_HOUR + 5 * MILLIS_PER_SECOND }, + { value: '1h2m', expect: MILLIS_PER_HOUR + 2 * MILLIS_PER_MINUTE }, ]; for (const s of testData) { - it(`handles ${s.value} to left`, () => { + it(`handles ${s.value}`, () => { expect(typeof forgivingStringToMillis(s.value)).toBe('number'); expect(forgivingStringToMillis(s.value)).toBe(s.expect); }); @@ -30,10 +32,10 @@ describe('test forgivingStringToMillis()', () => { describe('parses strings correctly', () => { const ts = [ - { value: '1.1.1', expect: 60 * 60 * 1000 + 60 * 1000 + 1000 }, - { value: '12.1.1', expect: 12 * 60 * 60 * 1000 + 60 * 1000 + 1000 }, - { value: '12.55.1', expect: 12 * 60 * 60 * 1000 + 55 * 60 * 1000 + 1000 }, - { value: '12.55.40', expect: 12 * 60 * 60 * 1000 + 55 * 60 * 1000 + 40 * 1000 }, + { value: '1.1.1', expect: MILLIS_PER_HOUR + MILLIS_PER_MINUTE + MILLIS_PER_SECOND }, + { value: '12.1.1', expect: 12 * MILLIS_PER_HOUR + MILLIS_PER_MINUTE + MILLIS_PER_SECOND }, + { value: '12.55.1', expect: 12 * MILLIS_PER_HOUR + 55 * MILLIS_PER_MINUTE + MILLIS_PER_SECOND }, + { value: '12.55.40', expect: 12 * MILLIS_PER_HOUR + 55 * MILLIS_PER_MINUTE + 40 * MILLIS_PER_SECOND }, ]; for (const s of ts) { @@ -45,15 +47,15 @@ describe('test forgivingStringToMillis()', () => { describe('parses time strings', () => { const ts = [ - { value: '1h2m3s', expect: 60 * 60 * 1000 + 2 * 60 * 1000 + 3 * 1000 }, - { value: '1h3s', expect: 60 * 60 * 1000 + 3 * 1000 }, - { value: '1h2m', expect: 60 * 60 * 1000 + 2 * 60 * 1000 }, - { value: '10h', expect: 10 * 60 * 60 * 1000 }, - { value: '10m', expect: 10 * 60 * 1000 }, - { value: '10s', expect: 10 * 1000 }, - { value: '120h', expect: 120 * 60 * 60 * 1000 }, - { value: '120m', expect: 120 * 60 * 1000 }, - { value: '120s', expect: 120 * 1000 }, + { value: '1h2m3s', expect: MILLIS_PER_HOUR + 2 * MILLIS_PER_MINUTE + 3 * MILLIS_PER_SECOND }, + { value: '1h3s', expect: MILLIS_PER_HOUR + 3 * MILLIS_PER_SECOND }, + { value: '1h2m', expect: MILLIS_PER_HOUR + 2 * MILLIS_PER_MINUTE }, + { value: '10h', expect: 10 * MILLIS_PER_HOUR }, + { value: '10m', expect: 10 * MILLIS_PER_MINUTE }, + { value: '10s', expect: 10 * MILLIS_PER_SECOND }, + { value: '120h', expect: 120 * MILLIS_PER_HOUR }, + { value: '120m', expect: 120 * MILLIS_PER_MINUTE }, + { value: '120s', expect: 120 * MILLIS_PER_SECOND }, ]; for (const s of ts) { @@ -65,20 +67,20 @@ describe('test forgivingStringToMillis()', () => { describe('handles am/pm', () => { const ampm = [ - { value: '9:10:11am', expect: 9 * 60 * 60 * 1000 + 10 * 60 * 1000 + 11 * 1000 }, - { value: '9:10:11a', expect: 9 * 60 * 60 * 1000 + 10 * 60 * 1000 + 11 * 1000 }, - { value: '9:10:11pm', expect: (12 + 9) * 60 * 60 * 1000 + 10 * 60 * 1000 + 11 * 1000 }, - { value: '9:10:11p', expect: (12 + 9) * 60 * 60 * 1000 + 10 * 60 * 1000 + 11 * 1000 }, - { value: '9:10am', expect: 9 * 60 * 60 * 1000 + 10 * 60 * 1000 }, - { value: '9:10a', expect: 9 * 60 * 60 * 1000 + 10 * 60 * 1000 }, - { value: '9:10pm', expect: (12 + 9) * 60 * 60 * 1000 + 10 * 60 * 1000 }, - { value: '9:10p', expect: (12 + 9) * 60 * 60 * 1000 + 10 * 60 * 1000 }, - { value: '9am', expect: 9 * 60 * 60 * 1000 }, - { value: '9a', expect: 9 * 60 * 60 * 1000 }, - { value: '9pm', expect: (12 + 9) * 60 * 60 * 1000 }, - { value: '9p', expect: (12 + 9) * 60 * 60 * 1000 }, + { value: '9:10:11am', expect: 9 * MILLIS_PER_HOUR + 10 * MILLIS_PER_MINUTE + 11 * MILLIS_PER_SECOND }, + { value: '9:10:11a', expect: 9 * MILLIS_PER_HOUR + 10 * MILLIS_PER_MINUTE + 11 * MILLIS_PER_SECOND }, + { value: '9:10:11pm', expect: (12 + 9) * MILLIS_PER_HOUR + 10 * MILLIS_PER_MINUTE + 11 * MILLIS_PER_SECOND }, + { value: '9:10:11p', expect: (12 + 9) * MILLIS_PER_HOUR + 10 * MILLIS_PER_MINUTE + 11 * MILLIS_PER_SECOND }, + { value: '9:10am', expect: 9 * MILLIS_PER_HOUR + 10 * MILLIS_PER_MINUTE }, + { value: '9:10a', expect: 9 * MILLIS_PER_HOUR + 10 * MILLIS_PER_MINUTE }, + { value: '9:10pm', expect: (12 + 9) * MILLIS_PER_HOUR + 10 * MILLIS_PER_MINUTE }, + { value: '9:10p', expect: (12 + 9) * MILLIS_PER_HOUR + 10 * MILLIS_PER_MINUTE }, + { value: '9am', expect: 9 * MILLIS_PER_HOUR }, + { value: '9a', expect: 9 * MILLIS_PER_HOUR }, + { value: '9pm', expect: (12 + 9) * MILLIS_PER_HOUR }, + { value: '9p', expect: (12 + 9) * MILLIS_PER_HOUR }, { value: '12am', expect: 0 }, - { value: '12pm', expect: 12 * 60 * 60 * 1000 }, + { value: '12pm', expect: 12 * MILLIS_PER_HOUR }, ]; for (const s of ampm) { @@ -90,12 +92,12 @@ describe('test forgivingStringToMillis()', () => { describe('it infers separators when non existent', () => { const testCases = [ - { value: '1', expect: 1000 * 60 }, // 00:01:00 - { value: '12', expect: 1000 * 60 * 12 }, // 00:12:00 - { value: '123', expect: 1000 * 60 * 23 + 1000 * 60 * 60 }, // 01:23:00 - { value: '1234', expect: 1000 * 60 * 34 + 1000 * 60 * 60 * 12 }, // 12:34:00 - { value: '12345', expect: 1000 * 60 * 34 + 1000 * 60 * 60 * 12 + 5 * 1000 }, // 12:34:05 - { value: '123456', expect: 1000 * 60 * 34 + 1000 * 60 * 60 * 12 + 56 * 1000 }, // 12:34:56 + { value: '1', expect: MILLIS_PER_MINUTE }, // 00:01:00 + { value: '12', expect: 12 * MILLIS_PER_MINUTE }, // 00:12:00 + { value: '123', expect: MILLIS_PER_HOUR + 23 * MILLIS_PER_MINUTE }, // 01:23:00 + { value: '1234', expect: 12 * MILLIS_PER_HOUR + 34 * MILLIS_PER_MINUTE }, // 12:34:00 + { value: '12345', expect: 12 * MILLIS_PER_HOUR + 34 * MILLIS_PER_MINUTE + 5 * MILLIS_PER_SECOND }, // 12:34:05 + { value: '123456', expect: 12 * MILLIS_PER_HOUR + 34 * MILLIS_PER_MINUTE + 56 * MILLIS_PER_SECOND }, // 12:34:56 ]; for (const s of testCases) { @@ -105,12 +107,12 @@ describe('test forgivingStringToMillis()', () => { } const sixDigits = [ - { value: '000000', expect: 0 }, - { value: '000001', expect: 1000 }, - { value: '000100', expect: 1000 * 60 }, - { value: '010000', expect: 1000 * 60 * 60 }, - { value: '230000', expect: 1000 * 60 * 60 * 23 }, - { value: '121212', expect: 12 * 1000 + 12 * 60 * 1000 + 12 * 1000 * 60 * 60 }, + { value: '000000', expect: 0 }, // 00:00:00 + { value: '000001', expect: MILLIS_PER_SECOND }, // 00:00:01 + { value: '000100', expect: MILLIS_PER_MINUTE }, // 00:01:00 + { value: '010000', expect: MILLIS_PER_HOUR }, // 01:00:00 + { value: '230000', expect: MILLIS_PER_HOUR * 23 }, // 23:00:00 + { value: '121212', expect: 12 * MILLIS_PER_HOUR + 12 * MILLIS_PER_MINUTE + 12 * MILLIS_PER_SECOND }, // 12:12:12 ]; for (const s of sixDigits) { @@ -121,13 +123,13 @@ describe('test forgivingStringToMillis()', () => { const fiveDigits = [ { value: '00000', expect: 0 }, - { value: '00001', expect: 1000 }, // 00:00:01 - { value: '00010', expect: 1000 * 60 }, // 00:01:00 - { value: '00100', expect: 1000 * 60 * 10 }, // 00:10:00 - { value: '01000', expect: 1000 * 60 * 60 }, // 01:00:00 - { value: '10000', expect: 1000 * 60 * 60 * 10 }, // 10:00:00 - { value: '23000', expect: 1000 * 60 * 60 * 23 }, // 23:00:00 - { value: '12121', expect: 1000 + 12 * 60 * 1000 + 12 * 1000 * 60 * 60 }, // 12:12:01 + { value: '00001', expect: MILLIS_PER_SECOND }, // 00:00:01 + { value: '00010', expect: MILLIS_PER_MINUTE }, // 00:01:00 + { value: '00100', expect: 10 * MILLIS_PER_MINUTE }, // 00:10:00 + { value: '01000', expect: MILLIS_PER_HOUR }, // 01:00:00 + { value: '10000', expect: 10 * MILLIS_PER_HOUR }, // 10:00:00 + { value: '23000', expect: 23 * MILLIS_PER_HOUR }, // 23:00:00 + { value: '12121', expect: 12 * MILLIS_PER_HOUR + 12 * MILLIS_PER_MINUTE + 1 * MILLIS_PER_SECOND }, // 12:12:01 ]; for (const s of fiveDigits) { @@ -138,12 +140,12 @@ describe('test forgivingStringToMillis()', () => { const fourDigits = [ { value: '0000', expect: 0 }, - { value: '0001', expect: 1000 * 60 }, // 00:01:00 - { value: '0010', expect: 1000 * 60 * 10 }, // 00:10:00 - { value: '0100', expect: 1000 * 60 * 60 }, // 01:00:00 - { value: '1000', expect: 1000 * 60 * 60 * 10 }, // 10:00:00 - { value: '2300', expect: 1000 * 60 * 60 * 23 }, // 23:00:00 - { value: '1212', expect: 12 * 60 * 1000 + 12 * 1000 * 60 * 60 }, // 12:12:00 + { value: '0001', expect: MILLIS_PER_MINUTE }, // 00:01:00 + { value: '0010', expect: 10 * MILLIS_PER_MINUTE }, // 00:10:00 + { value: '0100', expect: MILLIS_PER_HOUR }, // 01:00:00 + { value: '1000', expect: 10 * MILLIS_PER_HOUR }, // 10:00:00 + { value: '2300', expect: 23 * MILLIS_PER_HOUR }, // 23:00:00 + { value: '1212', expect: 12 * MILLIS_PER_HOUR + 12 * MILLIS_PER_MINUTE }, // 12:12:00 ]; for (const s of fourDigits) { @@ -154,11 +156,11 @@ describe('test forgivingStringToMillis()', () => { const threeDigits = [ { value: '000', expect: 0 }, - { value: '001', expect: 1000 * 60 }, // 00:01:00 - { value: '010', expect: 1000 * 60 * 10 }, // 00:10:00 - { value: '100', expect: 1000 * 60 * 60 }, // 01:00:00 - { value: '230', expect: 2 * 1000 * 60 * 60 + 30 * 1000 * 60 }, // 02:30:00 - { value: '121', expect: 21 * 60 * 1000 + 1000 * 60 * 60 }, // 01:21:00 + { value: '001', expect: MILLIS_PER_MINUTE }, // 00:01:00 + { value: '010', expect: 10 * MILLIS_PER_MINUTE }, // 00:10:00 + { value: '100', expect: MILLIS_PER_HOUR }, // 01:00:00 + { value: '230', expect: 2 * MILLIS_PER_HOUR + 30 * MILLIS_PER_MINUTE }, // 02:30:00 + { value: '121', expect: MILLIS_PER_HOUR + 21 * MILLIS_PER_MINUTE }, // 01:21:00 ]; for (const s of threeDigits) { @@ -169,9 +171,9 @@ describe('test forgivingStringToMillis()', () => { const twoDigits = [ { value: '00', expect: 0 }, - { value: '01', expect: 1000 * 60 }, // 00:01:00 - { value: '10', expect: 1000 * 60 * 10 }, // 00:10:00 - { value: '23', expect: 1000 * 60 * 23 }, // 00:23:00 + { value: '01', expect: MILLIS_PER_MINUTE }, // 00:01:00 + { value: '10', expect: 10 * MILLIS_PER_MINUTE }, // 00:10:00 + { value: '23', expect: 23 * MILLIS_PER_MINUTE }, // 00:23:00 ]; for (const s of twoDigits) { @@ -192,18 +194,17 @@ describe('test forgivingStringToMillis()', () => { describe('handles overflows', () => { const ts = [ // minutes overflow - { value: '2.0.0', expect: 1000 * 60 * 120 }, - { value: '99', expect: 1000 * 60 * 99 }, - { value: '1.39.0', expect: 1000 * 60 * 99 }, + { value: '99', expect: 99 * MILLIS_PER_MINUTE }, + { value: '1.39.0', expect: 99 * MILLIS_PER_MINUTE }, // seconds overflow - { value: '0.0.120', expect: 120 * 1000 }, - { value: '0.2.0', expect: 120 * 1000 }, - { value: '0.0.99', expect: 99 * 1000 }, - { value: '0.1.39', expect: 99 * 1000 }, + { value: '0.0.120', expect: 120 * MILLIS_PER_SECOND }, + { value: '0.2.0', expect: 120 * MILLIS_PER_SECOND }, + { value: '0.0.99', expect: 99 * MILLIS_PER_SECOND }, + { value: '0.1.39', expect: 99 * MILLIS_PER_SECOND }, // hours overflow - { value: '25.0.0', expect: 1000 * 60 * 60 * 25 }, + { value: '25.0.0', expect: 25 * MILLIS_PER_HOUR }, // hours overflow - { value: '50.0.0', expect: 1000 * 60 * 60 * 50 }, + { value: '50.0.0', expect: 50 * MILLIS_PER_HOUR }, ]; for (const s of ts) { @@ -216,10 +217,10 @@ describe('test forgivingStringToMillis()', () => { describe('test fillLeft', () => { describe('function handles separators', () => { const testData = [ - { value: '1:2:3:10', expect: 3723000 }, - { value: '2,10', expect: 2 * 60 * 60 * 1000 + 60 * 10 * 1000 }, - { value: '2.10', expect: 2 * 60 * 60 * 1000 + 60 * 10 * 1000 }, - { value: '2 10', expect: 2 * 60 * 60 * 1000 + 60 * 10 * 1000 }, + { value: '1:2:3:10', expect: MILLIS_PER_HOUR + 2 * MILLIS_PER_MINUTE + 3 * MILLIS_PER_SECOND }, // 01:02:03 + { value: '2,10', expect: 2 * MILLIS_PER_HOUR + 10 * MILLIS_PER_MINUTE }, + { value: '2.10', expect: 2 * MILLIS_PER_HOUR + 10 * MILLIS_PER_MINUTE }, + { value: '2 10', expect: 2 * MILLIS_PER_HOUR + 10 * MILLIS_PER_MINUTE }, ]; for (const s of testData) { @@ -232,8 +233,8 @@ describe('test forgivingStringToMillis()', () => { describe('parses strings correctly', () => { const ts = [ - { value: '1.2', expect: 60 * 60 * 1000 + 2 * 60 * 1000 }, - { value: '1.70', expect: 60 * 60 * 1000 + 70 * 60 * 1000 }, + { value: '1.2', expect: MILLIS_PER_HOUR + 2 * MILLIS_PER_MINUTE }, + { value: '1.70', expect: MILLIS_PER_HOUR + 70 * MILLIS_PER_MINUTE }, ]; for (const s of ts) { @@ -246,8 +247,8 @@ describe('test forgivingStringToMillis()', () => { describe('handles overflows', () => { const ts = [ // minutes overflow - { value: '0.120', expect: 120 * 60 * 1000 }, - { value: '0.99', expect: 99 * 60 * 1000 }, + { value: '0.120', expect: 120 * MILLIS_PER_MINUTE }, + { value: '0.99', expect: 99 * MILLIS_PER_MINUTE }, ]; for (const s of ts) { diff --git a/packages/utils/src/date-utils/conversionUtils.ts b/packages/utils/src/date-utils/conversionUtils.ts index 17bb9a4f7..316049bc0 100644 --- a/packages/utils/src/date-utils/conversionUtils.ts +++ b/packages/utils/src/date-utils/conversionUtils.ts @@ -5,7 +5,7 @@ export const MILLIS_PER_MINUTE = 1000 * 60; export const MILLIS_PER_HOUR = 1000 * 60 * 60; function convertMillis(millis: MaybeNumber, conversion: number) { - if (millis == null || millis === 0) { + if (!millis) { return 0; }