From: Jérôme Benoit Date: Fri, 27 Feb 2026 18:18:14 +0000 (+0100) Subject: refactor(tests): consolidate duplicate test constants X-Git-Tag: v3~115 X-Git-Url: https://git.piment-noir.org/?a=commitdiff_plain;h=b17f81facff881a623135995620245810d76225a;p=e-mobility-charging-stations-simulator.git refactor(tests): consolidate duplicate test constants - Delete duplicate OCPP20TestConstants.ts file - Update all 21 OCPP 2.0 test files to import from canonical ChargingStationTestConstants.js - All 7 constants verified as available in canonical source: * TEST_CHARGING_STATION_BASE_NAME * TEST_CHARGE_POINT_MODEL * TEST_CHARGE_POINT_SERIAL_NUMBER * TEST_CHARGE_POINT_VENDOR * TEST_FIRMWARE_VERSION * TEST_CONNECTOR_VALID_INSTANCE * TEST_CONNECTOR_INVALID_INSTANCE - Test suite passes with 280/280 tests passing --- diff --git a/tests/charging-station/ocpp/2.0/OCPP20IncomingRequestService-CertificateSigned.test.ts b/tests/charging-station/ocpp/2.0/OCPP20IncomingRequestService-CertificateSigned.test.ts index 8288297d..10df4609 100644 --- a/tests/charging-station/ocpp/2.0/OCPP20IncomingRequestService-CertificateSigned.test.ts +++ b/tests/charging-station/ocpp/2.0/OCPP20IncomingRequestService-CertificateSigned.test.ts @@ -20,7 +20,7 @@ import { } from '../../../../src/types/index.js' import { Constants } from '../../../../src/utils/index.js' import { createChargingStation } from '../../../ChargingStationFactory.js' -import { TEST_CHARGING_STATION_BASE_NAME } from './OCPP20TestConstants.js' +import { TEST_CHARGING_STATION_BASE_NAME } from '../../ChargingStationTestConstants.js' const VALID_PEM_CERTIFICATE = `-----BEGIN CERTIFICATE----- MIIBkTCB+wIJAKHBfpvPA0GXMA0GCSqGSIb3DQEBCwUAMBExDzANBgNVBAMMBnRl diff --git a/tests/charging-station/ocpp/2.0/OCPP20IncomingRequestService-ClearCache.test.ts b/tests/charging-station/ocpp/2.0/OCPP20IncomingRequestService-ClearCache.test.ts index 86edbab7..d512634c 100644 --- a/tests/charging-station/ocpp/2.0/OCPP20IncomingRequestService-ClearCache.test.ts +++ b/tests/charging-station/ocpp/2.0/OCPP20IncomingRequestService-ClearCache.test.ts @@ -15,7 +15,7 @@ import { OCPPAuthServiceFactory } from '../../../../src/charging-station/ocpp/au import { GenericStatus, OCPPVersion } from '../../../../src/types/index.js' import { Constants } from '../../../../src/utils/index.js' import { createChargingStation } from '../../../ChargingStationFactory.js' -import { TEST_CHARGING_STATION_BASE_NAME } from './OCPP20TestConstants.js' +import { TEST_CHARGING_STATION_BASE_NAME } from '../../ChargingStationTestConstants.js' await describe('C11 - Clear Authorization Data in Authorization Cache', async () => { const mockChargingStation = createChargingStation({ diff --git a/tests/charging-station/ocpp/2.0/OCPP20IncomingRequestService-DeleteCertificate.test.ts b/tests/charging-station/ocpp/2.0/OCPP20IncomingRequestService-DeleteCertificate.test.ts index 2cbba94c..25b010bf 100644 --- a/tests/charging-station/ocpp/2.0/OCPP20IncomingRequestService-DeleteCertificate.test.ts +++ b/tests/charging-station/ocpp/2.0/OCPP20IncomingRequestService-DeleteCertificate.test.ts @@ -21,7 +21,7 @@ import { } from '../../../../src/types/index.js' import { Constants } from '../../../../src/utils/index.js' import { createChargingStation } from '../../../ChargingStationFactory.js' -import { TEST_CHARGING_STATION_BASE_NAME } from './OCPP20TestConstants.js' +import { TEST_CHARGING_STATION_BASE_NAME } from '../../ChargingStationTestConstants.js' const VALID_CERTIFICATE_HASH_DATA = { hashAlgorithm: HashAlgorithmEnumType.SHA256, diff --git a/tests/charging-station/ocpp/2.0/OCPP20IncomingRequestService-GetBaseReport.test.ts b/tests/charging-station/ocpp/2.0/OCPP20IncomingRequestService-GetBaseReport.test.ts index 8ad2278f..a8976e31 100644 --- a/tests/charging-station/ocpp/2.0/OCPP20IncomingRequestService-GetBaseReport.test.ts +++ b/tests/charging-station/ocpp/2.0/OCPP20IncomingRequestService-GetBaseReport.test.ts @@ -39,7 +39,7 @@ import { TEST_CHARGE_POINT_VENDOR, TEST_CHARGING_STATION_BASE_NAME, TEST_FIRMWARE_VERSION, -} from './OCPP20TestConstants.js' +} from '../../ChargingStationTestConstants.js' await describe('B07 - Get Base Report', async () => { const mockChargingStation = createChargingStation({ diff --git a/tests/charging-station/ocpp/2.0/OCPP20IncomingRequestService-GetInstalledCertificateIds.test.ts b/tests/charging-station/ocpp/2.0/OCPP20IncomingRequestService-GetInstalledCertificateIds.test.ts index fc8e5954..5a126d71 100644 --- a/tests/charging-station/ocpp/2.0/OCPP20IncomingRequestService-GetInstalledCertificateIds.test.ts +++ b/tests/charging-station/ocpp/2.0/OCPP20IncomingRequestService-GetInstalledCertificateIds.test.ts @@ -23,7 +23,7 @@ import { } from '../../../../src/types/index.js' import { Constants } from '../../../../src/utils/index.js' import { createChargingStation } from '../../../ChargingStationFactory.js' -import { TEST_CHARGING_STATION_BASE_NAME } from './OCPP20TestConstants.js' +import { TEST_CHARGING_STATION_BASE_NAME } from '../../ChargingStationTestConstants.js' const createMockCertificateHashData = (serialNumber = '123456789'): CertificateHashDataType => ({ hashAlgorithm: HashAlgorithmEnumType.SHA256, diff --git a/tests/charging-station/ocpp/2.0/OCPP20IncomingRequestService-GetVariables.test.ts b/tests/charging-station/ocpp/2.0/OCPP20IncomingRequestService-GetVariables.test.ts index 59366030..db8c9ccc 100644 --- a/tests/charging-station/ocpp/2.0/OCPP20IncomingRequestService-GetVariables.test.ts +++ b/tests/charging-station/ocpp/2.0/OCPP20IncomingRequestService-GetVariables.test.ts @@ -25,7 +25,7 @@ import { createChargingStation } from '../../../ChargingStationFactory.js' import { TEST_CHARGING_STATION_BASE_NAME, TEST_CONNECTOR_VALID_INSTANCE, -} from './OCPP20TestConstants.js' +} from '../../ChargingStationTestConstants.js' import { resetLimits, resetReportingValueSize, diff --git a/tests/charging-station/ocpp/2.0/OCPP20IncomingRequestService-InstallCertificate.test.ts b/tests/charging-station/ocpp/2.0/OCPP20IncomingRequestService-InstallCertificate.test.ts index d6e841df..9515c1e5 100644 --- a/tests/charging-station/ocpp/2.0/OCPP20IncomingRequestService-InstallCertificate.test.ts +++ b/tests/charging-station/ocpp/2.0/OCPP20IncomingRequestService-InstallCertificate.test.ts @@ -20,7 +20,7 @@ import { } from '../../../../src/types/index.js' import { Constants } from '../../../../src/utils/index.js' import { createChargingStation } from '../../../ChargingStationFactory.js' -import { TEST_CHARGING_STATION_BASE_NAME } from './OCPP20TestConstants.js' +import { TEST_CHARGING_STATION_BASE_NAME } from '../../ChargingStationTestConstants.js' const VALID_PEM_CERTIFICATE = `-----BEGIN CERTIFICATE----- MIIBkTCB+wIJAKHBfpvPA0GXMA0GCSqGSIb3DQEBCwUAMBExDzANBgNVBAMMBnRl diff --git a/tests/charging-station/ocpp/2.0/OCPP20IncomingRequestService-RequestStartTransaction.test.ts b/tests/charging-station/ocpp/2.0/OCPP20IncomingRequestService-RequestStartTransaction.test.ts index 9caf893f..bacf1a23 100644 --- a/tests/charging-station/ocpp/2.0/OCPP20IncomingRequestService-RequestStartTransaction.test.ts +++ b/tests/charging-station/ocpp/2.0/OCPP20IncomingRequestService-RequestStartTransaction.test.ts @@ -24,7 +24,7 @@ import { import { Constants } from '../../../../src/utils/index.js' import { createChargingStation } from '../../../ChargingStationFactory.js' import { createMockAuthService } from '../auth/helpers/MockFactories.js' -import { TEST_CHARGING_STATION_BASE_NAME } from './OCPP20TestConstants.js' +import { TEST_CHARGING_STATION_BASE_NAME } from '../../ChargingStationTestConstants.js' import { resetConnectorTransactionState, resetLimits, diff --git a/tests/charging-station/ocpp/2.0/OCPP20IncomingRequestService-RequestStopTransaction.test.ts b/tests/charging-station/ocpp/2.0/OCPP20IncomingRequestService-RequestStopTransaction.test.ts index b0fe70a1..e8b513d4 100644 --- a/tests/charging-station/ocpp/2.0/OCPP20IncomingRequestService-RequestStopTransaction.test.ts +++ b/tests/charging-station/ocpp/2.0/OCPP20IncomingRequestService-RequestStopTransaction.test.ts @@ -33,7 +33,7 @@ import { import { Constants } from '../../../../src/utils/index.js' import { createChargingStation } from '../../../ChargingStationFactory.js' import { createMockAuthService } from '../auth/helpers/MockFactories.js' -import { TEST_CHARGING_STATION_BASE_NAME } from './OCPP20TestConstants.js' +import { TEST_CHARGING_STATION_BASE_NAME } from '../../ChargingStationTestConstants.js' import { resetLimits, resetReportingValueSize } from './OCPP20TestUtils.js' await describe('F03 - Remote Stop Transaction', async () => { diff --git a/tests/charging-station/ocpp/2.0/OCPP20IncomingRequestService-Reset.test.ts b/tests/charging-station/ocpp/2.0/OCPP20IncomingRequestService-Reset.test.ts index 4b69942e..129a9aaf 100644 --- a/tests/charging-station/ocpp/2.0/OCPP20IncomingRequestService-Reset.test.ts +++ b/tests/charging-station/ocpp/2.0/OCPP20IncomingRequestService-Reset.test.ts @@ -22,7 +22,7 @@ import { } from '../../../../src/types/index.js' import { Constants } from '../../../../src/utils/index.js' import { createChargingStation } from '../../../ChargingStationFactory.js' -import { TEST_CHARGING_STATION_BASE_NAME } from './OCPP20TestConstants.js' +import { TEST_CHARGING_STATION_BASE_NAME } from '../../ChargingStationTestConstants.js' await describe('B11 & B12 - Reset', async () => { beforeEach(() => { diff --git a/tests/charging-station/ocpp/2.0/OCPP20IncomingRequestService-SetVariables.test.ts b/tests/charging-station/ocpp/2.0/OCPP20IncomingRequestService-SetVariables.test.ts index 56495150..8a0add0c 100644 --- a/tests/charging-station/ocpp/2.0/OCPP20IncomingRequestService-SetVariables.test.ts +++ b/tests/charging-station/ocpp/2.0/OCPP20IncomingRequestService-SetVariables.test.ts @@ -30,7 +30,7 @@ import { createChargingStation } from '../../../ChargingStationFactory.js' import { TEST_CHARGING_STATION_BASE_NAME, TEST_CONNECTOR_VALID_INSTANCE, -} from './OCPP20TestConstants.js' +} from '../../ChargingStationTestConstants.js' import { resetLimits, resetValueSizeLimits, diff --git a/tests/charging-station/ocpp/2.0/OCPP20RequestService-BootNotification.test.ts b/tests/charging-station/ocpp/2.0/OCPP20RequestService-BootNotification.test.ts index 827c98bc..8dff0b81 100644 --- a/tests/charging-station/ocpp/2.0/OCPP20RequestService-BootNotification.test.ts +++ b/tests/charging-station/ocpp/2.0/OCPP20RequestService-BootNotification.test.ts @@ -27,7 +27,7 @@ import { TEST_CHARGE_POINT_VENDOR, TEST_CHARGING_STATION_BASE_NAME, TEST_FIRMWARE_VERSION, -} from './OCPP20TestConstants.js' +} from '../../ChargingStationTestConstants.js' await describe('B01 - Cold Boot Charging Station', async () => { const mockResponseService = new OCPP20ResponseService() diff --git a/tests/charging-station/ocpp/2.0/OCPP20RequestService-HeartBeat.test.ts b/tests/charging-station/ocpp/2.0/OCPP20RequestService-HeartBeat.test.ts index 79e0ba2b..083f20fe 100644 --- a/tests/charging-station/ocpp/2.0/OCPP20RequestService-HeartBeat.test.ts +++ b/tests/charging-station/ocpp/2.0/OCPP20RequestService-HeartBeat.test.ts @@ -25,7 +25,7 @@ import { TEST_CHARGE_POINT_VENDOR, TEST_CHARGING_STATION_BASE_NAME, TEST_FIRMWARE_VERSION, -} from './OCPP20TestConstants.js' +} from '../../ChargingStationTestConstants.js' await describe('G02 - Heartbeat', async () => { const mockResponseService = new OCPP20ResponseService() diff --git a/tests/charging-station/ocpp/2.0/OCPP20RequestService-ISO15118.test.ts b/tests/charging-station/ocpp/2.0/OCPP20RequestService-ISO15118.test.ts index 63589ef9..583ccc21 100644 --- a/tests/charging-station/ocpp/2.0/OCPP20RequestService-ISO15118.test.ts +++ b/tests/charging-station/ocpp/2.0/OCPP20RequestService-ISO15118.test.ts @@ -29,7 +29,7 @@ import { } from '../../../../src/types/index.js' import { Constants } from '../../../../src/utils/index.js' import { createChargingStation } from '../../../ChargingStationFactory.js' -import { TEST_CHARGING_STATION_BASE_NAME } from './OCPP20TestConstants.js' +import { TEST_CHARGING_STATION_BASE_NAME } from '../../ChargingStationTestConstants.js' // Sample Base64 EXI request (mock - represents CertificateInstallationReq) const MOCK_EXI_REQUEST = 'SGVsbG8gV29ybGQgRVhJIFJlcXVlc3Q=' diff --git a/tests/charging-station/ocpp/2.0/OCPP20RequestService-NotifyReport.test.ts b/tests/charging-station/ocpp/2.0/OCPP20RequestService-NotifyReport.test.ts index 6d274d5a..8075a7ce 100644 --- a/tests/charging-station/ocpp/2.0/OCPP20RequestService-NotifyReport.test.ts +++ b/tests/charging-station/ocpp/2.0/OCPP20RequestService-NotifyReport.test.ts @@ -31,7 +31,7 @@ import { TEST_CHARGE_POINT_VENDOR, TEST_CHARGING_STATION_BASE_NAME, TEST_FIRMWARE_VERSION, -} from './OCPP20TestConstants.js' +} from '../../ChargingStationTestConstants.js' await describe('B07/B08 - NotifyReport', async () => { const mockResponseService = new OCPP20ResponseService() diff --git a/tests/charging-station/ocpp/2.0/OCPP20RequestService-SignCertificate.test.ts b/tests/charging-station/ocpp/2.0/OCPP20RequestService-SignCertificate.test.ts index ed8c76ef..68924e0f 100644 --- a/tests/charging-station/ocpp/2.0/OCPP20RequestService-SignCertificate.test.ts +++ b/tests/charging-station/ocpp/2.0/OCPP20RequestService-SignCertificate.test.ts @@ -22,7 +22,7 @@ import { } from '../../../../src/types/index.js' import { Constants } from '../../../../src/utils/index.js' import { createChargingStation } from '../../../ChargingStationFactory.js' -import { TEST_CHARGING_STATION_BASE_NAME } from './OCPP20TestConstants.js' +import { TEST_CHARGING_STATION_BASE_NAME } from '../../ChargingStationTestConstants.js' const MOCK_ORGANIZATION_NAME = 'Test Organization Inc.' diff --git a/tests/charging-station/ocpp/2.0/OCPP20RequestService-StatusNotification.test.ts b/tests/charging-station/ocpp/2.0/OCPP20RequestService-StatusNotification.test.ts index 6ac27aa9..cb9fe7bd 100644 --- a/tests/charging-station/ocpp/2.0/OCPP20RequestService-StatusNotification.test.ts +++ b/tests/charging-station/ocpp/2.0/OCPP20RequestService-StatusNotification.test.ts @@ -26,7 +26,7 @@ import { TEST_STATUS_CHARGE_POINT_SERIAL_NUMBER, TEST_STATUS_CHARGE_POINT_VENDOR, TEST_STATUS_CHARGING_STATION_BASE_NAME, -} from './OCPP20TestConstants.js' +} from '../../ChargingStationTestConstants.js' await describe('G01 - Status Notification', async () => { const mockResponseService = new OCPP20ResponseService() diff --git a/tests/charging-station/ocpp/2.0/OCPP20ServiceUtils-TransactionEvent-Offline.test.ts b/tests/charging-station/ocpp/2.0/OCPP20ServiceUtils-TransactionEvent-Offline.test.ts index 8dbdfb91..09240a59 100644 --- a/tests/charging-station/ocpp/2.0/OCPP20ServiceUtils-TransactionEvent-Offline.test.ts +++ b/tests/charging-station/ocpp/2.0/OCPP20ServiceUtils-TransactionEvent-Offline.test.ts @@ -21,7 +21,7 @@ import { } from '../../../../src/types/index.js' import { Constants, generateUUID } from '../../../../src/utils/index.js' import { createChargingStation } from '../../../ChargingStationFactory.js' -import { TEST_CHARGING_STATION_BASE_NAME } from './OCPP20TestConstants.js' +import { TEST_CHARGING_STATION_BASE_NAME } from '../../ChargingStationTestConstants.js' import { resetLimits } from './OCPP20TestUtils.js' await describe('E02 - OCPP 2.0.1 Offline TransactionEvent Queueing', async () => { diff --git a/tests/charging-station/ocpp/2.0/OCPP20ServiceUtils-TransactionEvent-Periodic.test.ts b/tests/charging-station/ocpp/2.0/OCPP20ServiceUtils-TransactionEvent-Periodic.test.ts index 2404d4ce..2b63b981 100644 --- a/tests/charging-station/ocpp/2.0/OCPP20ServiceUtils-TransactionEvent-Periodic.test.ts +++ b/tests/charging-station/ocpp/2.0/OCPP20ServiceUtils-TransactionEvent-Periodic.test.ts @@ -23,7 +23,7 @@ import { } from '../../../../src/types/index.js' import { Constants, generateUUID } from '../../../../src/utils/index.js' import { createChargingStation } from '../../../ChargingStationFactory.js' -import { TEST_CHARGING_STATION_BASE_NAME } from './OCPP20TestConstants.js' +import { TEST_CHARGING_STATION_BASE_NAME } from '../../ChargingStationTestConstants.js' import { resetLimits } from './OCPP20TestUtils.js' await describe('E02 - OCPP 2.0.1 Periodic TransactionEvent at TxUpdatedInterval', async () => { diff --git a/tests/charging-station/ocpp/2.0/OCPP20ServiceUtils-TransactionEvent.test.ts b/tests/charging-station/ocpp/2.0/OCPP20ServiceUtils-TransactionEvent.test.ts index 2a121271..4520f432 100644 --- a/tests/charging-station/ocpp/2.0/OCPP20ServiceUtils-TransactionEvent.test.ts +++ b/tests/charging-station/ocpp/2.0/OCPP20ServiceUtils-TransactionEvent.test.ts @@ -24,7 +24,7 @@ import { } from '../../../../src/types/ocpp/2.0/Transaction.js' import { Constants, generateUUID } from '../../../../src/utils/index.js' import { createChargingStation } from '../../../ChargingStationFactory.js' -import { TEST_CHARGING_STATION_BASE_NAME } from './OCPP20TestConstants.js' +import { TEST_CHARGING_STATION_BASE_NAME } from '../../ChargingStationTestConstants.js' import { createMockOCPP20TransactionTestStation, resetLimits } from './OCPP20TestUtils.js' await describe('E01-E04 - OCPP 2.0.1 TransactionEvent Implementation', async () => { diff --git a/tests/charging-station/ocpp/2.0/OCPP20TestConstants.ts b/tests/charging-station/ocpp/2.0/OCPP20TestConstants.ts deleted file mode 100644 index 92c1e577..00000000 --- a/tests/charging-station/ocpp/2.0/OCPP20TestConstants.ts +++ /dev/null @@ -1,20 +0,0 @@ -/** - * Common test constants for OCPP 2.0 tests - */ - -// Test charging station information -export const TEST_CHARGING_STATION_BASE_NAME = 'CS-TEST' -export const TEST_CHARGE_POINT_MODEL = 'Test Model' -export const TEST_CHARGE_POINT_SERIAL_NUMBER = 'TEST-SN-001' -export const TEST_CHARGE_POINT_VENDOR = 'Test Vendor' -export const TEST_FIRMWARE_VERSION = '1.0.0' - -// Test connector instances -export const TEST_CONNECTOR_VALID_INSTANCE = '1' -export const TEST_CONNECTOR_INVALID_INSTANCE = '999' - -// Test charging station information for status notification tests -export const TEST_STATUS_CHARGING_STATION_BASE_NAME = 'CS-TEST-STATUS' -export const TEST_STATUS_CHARGE_POINT_MODEL = 'Test Status Model' -export const TEST_STATUS_CHARGE_POINT_SERIAL_NUMBER = 'TEST-STATUS-SN-001' -export const TEST_STATUS_CHARGE_POINT_VENDOR = 'Test Status Vendor' diff --git a/tests/charging-station/ocpp/2.0/OCPP20VariableManager.test.ts b/tests/charging-station/ocpp/2.0/OCPP20VariableManager.test.ts index bf75a4ef..031d2df2 100644 --- a/tests/charging-station/ocpp/2.0/OCPP20VariableManager.test.ts +++ b/tests/charging-station/ocpp/2.0/OCPP20VariableManager.test.ts @@ -35,7 +35,7 @@ import { } from '../../../../src/types/index.js' import { Constants } from '../../../../src/utils/index.js' import { createChargingStation } from '../../../ChargingStationFactory.js' -import { TEST_CHARGING_STATION_BASE_NAME } from './OCPP20TestConstants.js' +import { TEST_CHARGING_STATION_BASE_NAME } from '../../ChargingStationTestConstants.js' import { resetReportingValueSize, resetValueSizeLimits,