From 69fc1a802d99c139d1165b8c6ff06fc12c574b58 Mon Sep 17 00:00:00 2001
From: kpetridis <petridkon@gmail.com>
Date: Sun, 8 May 2022 15:10:01 +0300
Subject: [PATCH] Removed redundant lines of code
---
inc/Helpers/AllMessageTypes.hpp | 11 -----------
test/Services/RealTimeForwardingControl.cpp | 2 +-
2 files changed, 1 insertion(+), 12 deletions(-)
diff --git a/inc/Helpers/AllMessageTypes.hpp b/inc/Helpers/AllMessageTypes.hpp
index 136a6447..6db8bf21 100644
--- a/inc/Helpers/AllMessageTypes.hpp
+++ b/inc/Helpers/AllMessageTypes.hpp
@@ -17,17 +17,6 @@
* Namespace containing all the message types for every service type.
*/
namespace AllMessageTypes {
- extern etl::vector<uint8_t, ECSSMaxReportTypeDefinitions> st01Messages;
- extern etl::vector<uint8_t, ECSSMaxReportTypeDefinitions> st03Messages;
- extern etl::vector<uint8_t, ECSSMaxReportTypeDefinitions> st04Messages;
- extern etl::vector<uint8_t, ECSSMaxReportTypeDefinitions> st05Messages;
- extern etl::vector<uint8_t, ECSSMaxReportTypeDefinitions> st06Messages;
- extern etl::vector<uint8_t, ECSSMaxReportTypeDefinitions> st11Messages;
- extern etl::vector<uint8_t, ECSSMaxReportTypeDefinitions> st13Messages;
- extern etl::vector<uint8_t, ECSSMaxReportTypeDefinitions> st17Messages;
- extern etl::vector<uint8_t, ECSSMaxReportTypeDefinitions> st19Messages;
- extern etl::vector<uint8_t, ECSSMaxReportTypeDefinitions> st20Messages;
-
/**
* Map containing all the message types, per service. The key is the ServiceType and the value,
* an etl vector containing the message types.
diff --git a/test/Services/RealTimeForwardingControl.cpp b/test/Services/RealTimeForwardingControl.cpp
index 58a943af..cfcab115 100644
--- a/test/Services/RealTimeForwardingControl.cpp
+++ b/test/Services/RealTimeForwardingControl.cpp
@@ -307,7 +307,7 @@ TEST_CASE("Add report types to the Application Process Configuration") {
realTimeForwarding.controlledApplications.push_back(applicationID);
validReportTypes(request);
- for (auto message: AllMessageTypes::st03Messages) {
+ for (auto message: AllMessageTypes::messagesOfService[serviceType]) {
realTimeForwarding.applicationProcessConfiguration.definitions[std::make_pair(applicationID, serviceType)]
.push_back(message);
}
--
GitLab