From 11ca99a317920b6f0f29924c2b0b1e9ce54663e6 Mon Sep 17 00:00:00 2001 From: LauraV-702 Date: Sun, 1 Dec 2024 06:37:40 +0000 Subject: [PATCH 1/3] Added testcase C5 to the file readingsCompareMeterQuantity --- .../test/web/readingsCompareMeterQuantity.js | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/src/server/test/web/readingsCompareMeterQuantity.js b/src/server/test/web/readingsCompareMeterQuantity.js index 1d933f8d8..c492b6292 100644 --- a/src/server/test/web/readingsCompareMeterQuantity.js +++ b/src/server/test/web/readingsCompareMeterQuantity.js @@ -68,9 +68,22 @@ mocha.describe('readings API', () => { }); expectCompareToEqualExpected(res, expected); }); + // Add C4 here - // Add C5 here + mocha.it('C5: 7 day shift end 2022-11-01 15:00:00 (beyond data) for 15 minute reading intervals and quantity units & kWh as kWh', async () => { + await prepareTest(unitDatakWh, conversionDatakWh, meterDatakWh); + const unitId = await getUnitId('kWh'); + const expected = [9132.81261972035, 13147.7382388332]; + const res = await chai.request(app).get(`/api/compareReadings/meters/${METER_ID}`) + .query({ + curr_start: '2022-10-30 00:00:00', + curr_end: '2022-11-01 15:00:00', // 3-day window, ends at 2022-11-01 15:00:00 + shift: 'P7D', // 7-day shift (different from C3) + graphicUnitId: unitId + }); + expectCompareToEqualExpected(res, expected); + }); // Add C6 here From 529efe1d75d955cacdc6858b1ee44bc3a584c9fb Mon Sep 17 00:00:00 2001 From: LauraV-702 Date: Sun, 1 Dec 2024 07:39:47 +0000 Subject: [PATCH 2/3] Removed comments from testcase C5 --- src/server/test/web/readingsCompareMeterQuantity.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/server/test/web/readingsCompareMeterQuantity.js b/src/server/test/web/readingsCompareMeterQuantity.js index c492b6292..fb7641024 100644 --- a/src/server/test/web/readingsCompareMeterQuantity.js +++ b/src/server/test/web/readingsCompareMeterQuantity.js @@ -68,7 +68,7 @@ mocha.describe('readings API', () => { }); expectCompareToEqualExpected(res, expected); }); - + // Add C4 here mocha.it('C5: 7 day shift end 2022-11-01 15:00:00 (beyond data) for 15 minute reading intervals and quantity units & kWh as kWh', async () => { @@ -78,8 +78,8 @@ mocha.describe('readings API', () => { const res = await chai.request(app).get(`/api/compareReadings/meters/${METER_ID}`) .query({ curr_start: '2022-10-30 00:00:00', - curr_end: '2022-11-01 15:00:00', // 3-day window, ends at 2022-11-01 15:00:00 - shift: 'P7D', // 7-day shift (different from C3) + curr_end: '2022-11-01 15:00:00', + shift: 'P7D', graphicUnitId: unitId }); expectCompareToEqualExpected(res, expected); From 6fc88ebb3c231e647948c00b1de8c7c46e3b3c5e Mon Sep 17 00:00:00 2001 From: LauraV-702 Date: Sun, 1 Dec 2024 21:26:42 +0000 Subject: [PATCH 3/3] Fixed formatting, removed white spaces, and extra tabs from testcase C5 in the readingsCompareMeterQuantity.js file --- .../test/web/readingsCompareMeterQuantity.js | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/server/test/web/readingsCompareMeterQuantity.js b/src/server/test/web/readingsCompareMeterQuantity.js index fb7641024..89002d46b 100644 --- a/src/server/test/web/readingsCompareMeterQuantity.js +++ b/src/server/test/web/readingsCompareMeterQuantity.js @@ -76,14 +76,14 @@ mocha.describe('readings API', () => { const unitId = await getUnitId('kWh'); const expected = [9132.81261972035, 13147.7382388332]; const res = await chai.request(app).get(`/api/compareReadings/meters/${METER_ID}`) - .query({ - curr_start: '2022-10-30 00:00:00', - curr_end: '2022-11-01 15:00:00', - shift: 'P7D', - graphicUnitId: unitId - }); + .query({ + curr_start: '2022-10-30 00:00:00', + curr_end: '2022-11-01 15:00:00', + shift: 'P7D', + graphicUnitId: unitId + }); expectCompareToEqualExpected(res, expected); - }); + }); // Add C6 here