refactor: align error handling helpers behavior

Signed-off-by: Jérôme Benoit <jerome.benoit@piment-noir.org>

diff --git a/src/charging-station/ocpp/1.6/OCPP16IncomingRequestService.ts b/src/charging-station/ocpp/1.6/OCPP16IncomingRequestService.ts
index 2d64527debc0e381ee828b3cceff3419608085c8..7c0afb283aabf5f24336948b5bd3088220f024bb 100644 (file)
--- a/src/charging-station/ocpp/1.6/OCPP16IncomingRequestService.ts
+++ b/src/charging-station/ocpp/1.6/OCPP16IncomingRequestService.ts
@@ -694,7 +694,6 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService {
         error as Error,
         {
           errorResponse: OCPP16Constants.OCPP_CANCEL_RESERVATION_RESPONSE_REJECTED,
-          throwError: false,
         }
       )!
     }
@@ -914,7 +913,7 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService {
         chargingStation,
         OCPP16IncomingRequestCommand.DATA_TRANSFER,
         error as Error,
-        { errorResponse: OCPP16Constants.OCPP_DATA_TRANSFER_RESPONSE_REJECTED, throwError: false }
+        { errorResponse: OCPP16Constants.OCPP_DATA_TRANSFER_RESPONSE_REJECTED }
       )!
     }
   }
@@ -1180,7 +1179,7 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService {
           chargingStation,
           OCPP16IncomingRequestCommand.GET_DIAGNOSTICS,
           error as Error,
-          { errorResponse: OCPP16Constants.OCPP_RESPONSE_EMPTY, throwError: false }
+          { errorResponse: OCPP16Constants.OCPP_RESPONSE_EMPTY }
         )!
       }
     } else {
@@ -1374,7 +1373,7 @@ export class OCPP16IncomingRequestService extends OCPPIncomingRequestService {
         chargingStation,
         OCPP16IncomingRequestCommand.RESERVE_NOW,
         error as Error,
-        { errorResponse: OCPP16Constants.OCPP_RESERVATION_RESPONSE_FAULTED, throwError: false }
+        { errorResponse: OCPP16Constants.OCPP_RESERVATION_RESPONSE_FAULTED }
       )!
     }
   }

diff --git a/src/utils/ErrorUtils.ts b/src/utils/ErrorUtils.ts
index 75998b96506fc9ad335a2537c451eba972bb1c00..5f4082c3c76e1d4d2db23d00abc092c6b27ac98f 100644 (file)
--- a/src/utils/ErrorUtils.ts
+++ b/src/utils/ErrorUtils.ts
@@ -131,7 +131,7 @@ export const handleIncomingRequestError = <T extends JsonType>(
   params = {
     ...{
       consoleOut: false,
-      throwError: true,
+      throwError: false,
     },
     ...params,
   }

diff --git a/tests/utils/ErrorUtils.test.ts b/tests/utils/ErrorUtils.test.ts
index 9da6f63dadaa2c6f4e25317b58a05980f3c47343..77ebcc09754c54983c893ec4d6f0019a3955b891 100644 (file)
--- a/tests/utils/ErrorUtils.test.ts
+++ b/tests/utils/ErrorUtils.test.ts
@@ -87,19 +87,18 @@ await describe('ErrorUtils test suite', async () => {
     const error = new Error()
     expect(() => {
       handleIncomingRequestError(chargingStation, IncomingRequestCommand.CLEAR_CACHE, error)
-    }).toThrow(error)
+    }).not.toThrow(error)
     expect(() => {
       handleIncomingRequestError(chargingStation, IncomingRequestCommand.CLEAR_CACHE, error, {
-        throwError: false,
+        throwError: true,
       })
-    }).not.toThrow()
+    }).toThrow()
     const errorResponse = {
       status: GenericStatus.Rejected,
     }
     expect(
       handleIncomingRequestError(chargingStation, IncomingRequestCommand.CLEAR_CACHE, error, {
         errorResponse,
-        throwError: false,
       })
     ).toStrictEqual(errorResponse)
     expect(chargingStation.logPrefix.mock.calls.length).toBe(3)