Fix after merge.

Signed-off-by: Maaike Zijderveld, iolar <[email protected]>
EVerest · Nov 1, 2024 · 4c1f3e5 · 4c1f3e5
1 parent f33623a
commit 4c1f3e5
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/lib/ocpp/v201/charge_point.cpp b/lib/ocpp/v201/charge_point.cpp
@@ -78,10 +78,10 @@ ChargePoint::ChargePoint(const std::map<int32_t, int32_t>& evse_connector_struct
 }
 
 ChargePoint::ChargePoint(const std::map<int32_t, int32_t>& evse_connector_structure,
-                         std::unique_ptr<DeviceModelInterface> device_model_interface, const std::string& ocpp_main_path,
-                         const std::string& core_database_path, const std::string& sql_init_path,
-                         const std::string& message_log_path, const std::shared_ptr<EvseSecurity> evse_security,
-                         const Callbacks& callbacks) :
+                         std::unique_ptr<DeviceModelInterface> device_model_interface,
+                         const std::string& ocpp_main_path, const std::string& core_database_path,
+                         const std::string& sql_init_path, const std::string& message_log_path,
+                         const std::shared_ptr<EvseSecurity> evse_security, const Callbacks& callbacks) :
     ChargePoint(
         evse_connector_structure, std::make_shared<DeviceModel>(std::move(device_model_interface)),
         std::make_shared<DatabaseHandler>(

diff --git a/tests/lib/ocpp/v201/test_charge_point.cpp b/tests/lib/ocpp/v201/test_charge_point.cpp
@@ -538,13 +538,13 @@ TEST_F(ChargePointConstructorTestFixtureV201, CreateChargePoint_InitializeInCorr
 }
 
 TEST_F(ChargePointConstructorTestFixtureV201,
-       CreateChargePoint_EVSEConnectorStructureDefinedBadly_ThrowsDeviceModelStorageError) {
+       CreateChargePoint_EVSEConnectorStructureDefinedBadly_ThrowsDeviceModelError) {
     configure_callbacks_with_mocks();
     auto evse_connector_structure = std::map<int32_t, int32_t>();
 
     EXPECT_THROW(ocpp::v201::ChargePoint(evse_connector_structure, device_model, database_handler,
                                          create_message_queue(database_handler), "/tmp", evse_security, callbacks),
-                 DeviceModelStorageError);
+                 DeviceModelError);
 }
 
 TEST_F(ChargePointConstructorTestFixtureV201, CreateChargePoint_MissingDeviceModel_ThrowsInvalidArgument) {