diff --git a/src/tools/data-transfer-rate-converter/data-transfer-rate-converter.service.test.ts b/src/tools/data-transfer-rate-converter/data-transfer-rate-converter.service.test.ts index 9e6b9e86..860ed096 100644 --- a/src/tools/data-transfer-rate-converter/data-transfer-rate-converter.service.test.ts +++ b/src/tools/data-transfer-rate-converter/data-transfer-rate-converter.service.test.ts @@ -1,5 +1,5 @@ import { describe, expect, it } from 'vitest'; -import { amountTransferable, neededRate, transferTimeSeconds } from './data-transfer-rate-converter.service'; +import { amountTransferable, transferSpeedRate, transferTimeSeconds } from './data-transfer-rate-converter.service'; describe('data-transfer-converter', () => { describe('transferTimeSeconds', () => { @@ -12,9 +12,9 @@ describe('data-transfer-converter', () => { })).toBe(80); }); }); - describe('neededRate', () => { - it('compute neededRate', () => { - expect(neededRate({ + describe('transferSpeedRate', () => { + it('compute transferSpeedRate', () => { + expect(transferSpeedRate({ dataSize: 100, dataSizeUnit: 'MB', hours: 0, @@ -22,6 +22,14 @@ describe('data-transfer-converter', () => { seconds: 20, bitRateUnit: 'Mb', })).toBe(10); + expect(transferSpeedRate({ + dataSize: 100, + dataSizeUnit: 'MB', + hours: 0, + minutes: 1, + seconds: 20, + bitRateUnit: 'MB', + })).toBe(1.25); }); }); describe('amountTransferable', () => { diff --git a/src/tools/data-transfer-rate-converter/data-transfer-rate-converter.service.ts b/src/tools/data-transfer-rate-converter/data-transfer-rate-converter.service.ts index 3ef1b7bd..0ececcc1 100644 --- a/src/tools/data-transfer-rate-converter/data-transfer-rate-converter.service.ts +++ b/src/tools/data-transfer-rate-converter/data-transfer-rate-converter.service.ts @@ -1,4 +1,4 @@ -import { type AllSupportedUnits, type BitsUnits, convertStorageAndRateUnits } from '../data-storage-unit-converter/data-storage-unit-converter.service'; +import { type AllSupportedUnits, convertStorageAndRateUnits } from '../data-storage-unit-converter/data-storage-unit-converter.service'; export function transferTimeSeconds({ dataSize, @@ -9,14 +9,14 @@ export function transferTimeSeconds({ dataSize: number dataSizeUnit: AllSupportedUnits bitRate: number - bitRateUnit: BitsUnits + bitRateUnit: AllSupportedUnits }): number { const dataSizeInBytes = convertStorageAndRateUnits({ value: dataSize, fromUnit: dataSizeUnit, toUnit: 'B' }); const bitRateInBytes = convertStorageAndRateUnits({ value: bitRate, fromUnit: bitRateUnit, toUnit: 'B' }); return bitRateInBytes > 0 ? dataSizeInBytes / bitRateInBytes : 0; } -export function neededRate({ +export function transferSpeedRate({ dataSize, dataSizeUnit, hours, @@ -29,7 +29,7 @@ export function neededRate({ hours: number minutes: number seconds: number - bitRateUnit: BitsUnits + bitRateUnit: AllSupportedUnits }): number { const dataSizeInBits = convertStorageAndRateUnits({ value: dataSize, fromUnit: dataSizeUnit, toUnit: 'b' }); const timeInSeconds = hours * 3600 + minutes * 60 + seconds; @@ -45,7 +45,7 @@ export function amountTransferable({ dataSizeUnit, }: { bitRate: number - bitRateUnit: BitsUnits + bitRateUnit: AllSupportedUnits hours: number minutes: number seconds: number diff --git a/src/tools/data-transfer-rate-converter/data-transfer-rate-converter.vue b/src/tools/data-transfer-rate-converter/data-transfer-rate-converter.vue index 2be19cbb..a8128dcb 100644 --- a/src/tools/data-transfer-rate-converter/data-transfer-rate-converter.vue +++ b/src/tools/data-transfer-rate-converter/data-transfer-rate-converter.vue @@ -1,7 +1,7 @@