Moved functionality to create message id from message_queue to call_t…

…ypes and made it a free function. Removed unused imports and usage of boost/uuid headers Signed-off-by: Piet Gömpel <[email protected]>
EVerest · Nov 19, 2024 · cac80bc · cac80bc
1 parent 350430f
commit cac80bc
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 11 deletions.
diff --git a/lib/ocpp/v201/charge_point.cpp b/lib/ocpp/v201/charge_point.cpp
@@ -258,7 +258,8 @@ ChargePoint::on_get_15118_ev_certificate_request(const Get15118EVCertificateRequ
     }
 
     EVLOG_debug << "Received Get15118EVCertificateRequest " << request;
-    auto future_res = this->message_dispatcher->dispatch_call_async(ocpp::Call<Get15118EVCertificateRequest>(request));
+    auto future_res = this->message_dispatcher->dispatch_call_async(
+        ocpp::Call<Get15118EVCertificateRequest>(request));
 
     if (future_res.wait_for(DEFAULT_WAIT_FOR_FUTURE_TIMEOUT) == std::future_status::timeout) {
         EVLOG_warning << "Waiting for Get15118EVCertificateRequest.conf future timed out!";

diff --git a/tests/lib/ocpp/v16/test_message_queue.cpp b/tests/lib/ocpp/v16/test_message_queue.cpp
@@ -26,12 +26,12 @@ class ControlMessageV16Test : public ::testing::Test {
 
 TEST_F(ControlMessageV16Test, test_is_transactional) {
 
-    EXPECT_TRUE(is_transaction_message((ControlMessage<v16::MessageType>{
-        Call<v16::StartTransactionRequest>{
-            v16::StartTransactionRequest{}}}.messageType)));
-    EXPECT_TRUE(is_transaction_message((ControlMessage<v16::MessageType>{
-        Call<v16::StopTransactionRequest>{
-            v16::StopTransactionRequest{}}}.messageType)));
+    EXPECT_TRUE(is_transaction_message(
+        (ControlMessage<v16::MessageType>{Call<v16::StartTransactionRequest>{v16::StartTransactionRequest{}}}
+             .messageType)));
+    EXPECT_TRUE(is_transaction_message(
+        (ControlMessage<v16::MessageType>{Call<v16::StopTransactionRequest>{v16::StopTransactionRequest{}}}
+             .messageType)));
     EXPECT_TRUE(is_transaction_message(ControlMessage<v16::MessageType>{
         Call<v16::SecurityEventNotificationRequest>{v16::SecurityEventNotificationRequest{}}}
                                            .messageType));
@@ -43,10 +43,12 @@ TEST_F(ControlMessageV16Test, test_is_transactional) {
 
 TEST_F(ControlMessageV16Test, test_is_transactional_update) {
 
-    EXPECT_TRUE(!(ControlMessage<v16::MessageType>{Call<v16::StartTransactionRequest>{v16::StartTransactionRequest{}}})
-                     .is_transaction_update_message());
-    EXPECT_TRUE(!(ControlMessage<v16::MessageType>{Call<v16::StopTransactionRequest>{v16::StopTransactionRequest{}}})
-                     .is_transaction_update_message());
+    EXPECT_TRUE(
+        !(ControlMessage<v16::MessageType>{Call<v16::StartTransactionRequest>{v16::StartTransactionRequest{}}})
+             .is_transaction_update_message());
+    EXPECT_TRUE(
+        !(ControlMessage<v16::MessageType>{Call<v16::StopTransactionRequest>{v16::StopTransactionRequest{}}})
+             .is_transaction_update_message());
     EXPECT_TRUE(!(ControlMessage<v16::MessageType>{
                       Call<v16::SecurityEventNotificationRequest>{v16::SecurityEventNotificationRequest{}}})
                      .is_transaction_update_message());