From 6f358d297d4560bcefd5b1eb87d0f83033fae2cf Mon Sep 17 00:00:00 2001 From: Alex Holliday Date: Tue, 22 Oct 2024 10:11:02 +0800 Subject: [PATCH] Update service and tests to use new --- Server/service/networkService.js | 32 +++++++----- Server/tests/services/networkService.test.js | 55 +++++--------------- 2 files changed, 32 insertions(+), 55 deletions(-) diff --git a/Server/service/networkService.js b/Server/service/networkService.js index d4f9f11c8..e90180835 100644 --- a/Server/service/networkService.js +++ b/Server/service/networkService.js @@ -316,13 +316,15 @@ class NetworkService { used_bytes: 2, usage_percent: 0.5, }, - disk: { - read_speed_bytes: 3, - write_speed_bytes: 3, - total_bytes: 10, - free_bytes: 2, - usage_percent: 0.8, - }, + disk: [ + { + read_speed_bytes: 3, + write_speed_bytes: 3, + total_bytes: 10, + free_bytes: 2, + usage_percent: 0.8, + }, + ], host: { os: "Linux", platform: "Ubuntu", @@ -350,13 +352,15 @@ class NetworkService { used_bytes: 0, usage_percent: 0, }, - disk: { - read_speed_bytes: 0, - write_speed_bytes: 0, - total_bytes: 0, - free_bytes: 0, - usage_percent: 0, - }, + disk: [ + { + read_speed_bytes: 0, + write_speed_bytes: 0, + total_bytes: 0, + free_bytes: 0, + usage_percent: 0, + }, + ], host: { os: "", platform: "", diff --git a/Server/tests/services/networkService.test.js b/Server/tests/services/networkService.test.js index 1428b3bac..5d3e81a22 100644 --- a/Server/tests/services/networkService.test.js +++ b/Server/tests/services/networkService.test.js @@ -688,13 +688,15 @@ describe("networkService - handleHardware", () => { used_bytes: 2, usage_percent: 0.5, }, - disk: { - read_speed_bytes: 3, - write_speed_bytes: 3, - total_bytes: 10, - free_bytes: 2, - usage_percent: 0.8, - }, + disk: [ + { + read_speed_bytes: 3, + write_speed_bytes: 3, + total_bytes: 10, + free_bytes: 2, + usage_percent: 0.8, + }, + ], host: { os: "Linux", platform: "Ubuntu", @@ -714,40 +716,11 @@ describe("networkService - handleHardware", () => { it("should handle an error Hardware response", async () => { logAndStoreCheckStub.throws(new Error("Hardware error")); - await networkService.handleHardware(jobMock); - const nullData = { - monitorId: job.data._id, - cpu: { - physical_core: 0, - logical_core: 0, - frequency: 0, - temperature: 0, - free_percent: 0, - usage_percent: 0, - }, - memory: { - total_bytes: 0, - available_bytes: 0, - used_bytes: 0, - usage_percent: 0, - }, - disk: { - read_speed_bytes: 0, - write_speed_bytes: 0, - total_bytes: 0, - free_bytes: 0, - usage_percent: 0, - }, - host: { - os: "", - platform: "", - kernel_version: "", - }, - }; - - expect( - logAndStoreCheckStub.calledWith(nullData, networkService.db.createHardwareCheck) - ).to.be.true; + try { + await networkService.handleHardware(jobMock); + } catch (error) { + expect(error.message).to.equal("Hardware error"); + } }); });