From: Jérôme Benoit <jerome.benoit@sap.com>
Date: Mon, 16 Mar 2026 12:36:04 +0000 (+0100)
Subject: refactor: use union types consistently in common code and tests
X-Git-Tag: ocpp-server@v3.1.1~24
X-Git-Url: https://git.piment-noir.org/?a=commitdiff_plain;h=19ab6a48a0203485185f8bdfe1a11012d9a72160;p=e-mobility-charging-stations-simulator.git

refactor: use union types consistently in common code and tests

- OCPPServiceUtils: use SampledValue union in generics, use
  StatusNotificationRequest union in satisfies, remove unused
  OCPP20StatusNotificationRequest import
- BroadcastChannel: use MeterValuesRequest/Response unions
- OCPPServiceUtils-validation.test: OCPP16MessageTrigger → MessageTrigger,
  remove redundant casts
---

diff --git a/tests/charging-station/ocpp/OCPPServiceUtils-validation.test.ts b/tests/charging-station/ocpp/OCPPServiceUtils-validation.test.ts
index 9561c1e8..5ecc8d35 100644
--- a/tests/charging-station/ocpp/OCPPServiceUtils-validation.test.ts
+++ b/tests/charging-station/ocpp/OCPPServiceUtils-validation.test.ts
@@ -15,12 +15,7 @@ import { afterEach, describe, it } from 'node:test'
 import type { ChargingStation } from '../../../src/charging-station/ChargingStation.js'
 
 import { OCPPServiceUtils } from '../../../src/charging-station/ocpp/OCPPServiceUtils.js'
-import {
-  IncomingRequestCommand,
-  type MessageTrigger,
-  OCPP16MessageTrigger,
-  RequestCommand,
-} from '../../../src/types/index.js'
+import { IncomingRequestCommand, MessageTrigger, RequestCommand } from '../../../src/types/index.js'
 import { standardCleanup } from '../../helpers/TestLifecycleHelpers.js'
 
 /**
@@ -152,14 +147,11 @@ await describe('OCPPServiceUtils — command/trigger validation', async () => {
     await it('should return true when trigger is not explicitly disabled', () => {
       const station = makeStationMock({
         messageTriggerSupport: {
-          [OCPP16MessageTrigger.Heartbeat]: true,
+          [MessageTrigger.Heartbeat]: true,
         },
       })
 
-      const result = OCPPServiceUtils.isMessageTriggerSupported(
-        station,
-        OCPP16MessageTrigger.Heartbeat as MessageTrigger
-      )
+      const result = OCPPServiceUtils.isMessageTriggerSupported(station, MessageTrigger.Heartbeat)
 
       assert.strictEqual(result, true)
     })
@@ -167,14 +159,11 @@ await describe('OCPPServiceUtils — command/trigger validation', async () => {
     await it('should return false when trigger is explicitly disabled', () => {
       const station = makeStationMock({
         messageTriggerSupport: {
-          [OCPP16MessageTrigger.Heartbeat]: false,
+          [MessageTrigger.Heartbeat]: false,
         },
       })
 
-      const result = OCPPServiceUtils.isMessageTriggerSupported(
-        station,
-        OCPP16MessageTrigger.Heartbeat as MessageTrigger
-      )
+      const result = OCPPServiceUtils.isMessageTriggerSupported(station, MessageTrigger.Heartbeat)
 
       assert.strictEqual(result, false)
     })
@@ -182,10 +171,7 @@ await describe('OCPPServiceUtils — command/trigger validation', async () => {
     await it('should return true when messageTriggerSupport is undefined', () => {
       const station = makeStationMock({})
 
-      const result = OCPPServiceUtils.isMessageTriggerSupported(
-        station,
-        OCPP16MessageTrigger.Heartbeat as MessageTrigger
-      )
+      const result = OCPPServiceUtils.isMessageTriggerSupported(station, MessageTrigger.Heartbeat)
 
       assert.strictEqual(result, true)
     })
@@ -195,10 +181,7 @@ await describe('OCPPServiceUtils — command/trigger validation', async () => {
         messageTriggerSupport: null,
       })
 
-      const result = OCPPServiceUtils.isMessageTriggerSupported(
-        station,
-        OCPP16MessageTrigger.Heartbeat as MessageTrigger
-      )
+      const result = OCPPServiceUtils.isMessageTriggerSupported(station, MessageTrigger.Heartbeat)
 
       assert.strictEqual(result, true)
     })