tests/src/fsfw_tests/unit/CatchFactory.cpp

@@ -1,4 +1,5 @@
 #include "CatchFactory.h"
+#include "tests/TestsConfig.h"
 #include "datapoollocal/LocalPoolOwnerBase.h"
 #include "mocks/HkReceiverMock.h"
 

tests/src/fsfw_tests/unit/datapoollocal/DataSetTest.cpp

@@ -1,4 +1,5 @@
 #include "LocalPoolOwnerBase.h"
+#include "tests/TestsConfig.h"
 #include "fsfw_tests/unit/CatchDefinitions.h"
 
 #include <fsfw/objectmanager/ObjectManager.h>

tests/src/fsfw_tests/unit/datapoollocal/LocalPoolOwnerBase.h

@@ -1,7 +1,7 @@
 #ifndef FSFW_UNITTEST_TESTS_DATAPOOLLOCAL_LOCALPOOLOWNERBASE_H_
 #define FSFW_UNITTEST_TESTS_DATAPOOLLOCAL_LOCALPOOLOWNERBASE_H_
 
-#include "objects/systemObjectList.h"
+#include "tests/TestsConfig.h"
 #include "../mocks/MessageQueueMockBase.h"
 
 #include <fsfw/datapoollocal/HasLocalDataPoolIF.h>

tests/src/fsfw_tests/unit/datapoollocal/LocalPoolVariableTest.cpp

@@ -1,4 +1,5 @@
 #include "LocalPoolOwnerBase.h"
+#include "tests/TestsConfig.h"
 #include "fsfw_tests/unit/CatchDefinitions.h"
 
 #include <fsfw/objectmanager/ObjectManager.h>

tests/src/fsfw_tests/unit/datapoollocal/LocalPoolVectorTest.cpp

@@ -1,4 +1,5 @@
 #include "LocalPoolOwnerBase.h"
+#include "tests/TestsConfig.h"
 #include "fsfw_tests/unit/CatchDefinitions.h"
 
 #include <catch2/catch_test_macros.hpp>

tests/src/fsfw_tests/unit/testcfg/CMakeLists.txt

@@ -25,4 +25,4 @@ if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/objects/translateObjects.cpp")
     target_sources(${FSFW_TEST_TGT} PRIVATE
         events/translateEvents.cpp
     )
-endif()
+endif()

tests/src/fsfw_tests/unit/testcfg/TestsConfig.h.in

@@ -5,7 +5,7 @@
 
 #ifdef __cplusplus
 
-#include "objects/systemObjectList.h"
+#include "objects/testObjectList.h"
 #include "events/subsystemIdRanges.h"
 #include "returnvalues/classIds.h"
 

tests/src/fsfw_tests/unit/testcfg/objects/testObjectList.h

@@ -11,17 +11,17 @@ namespace objects {
 		FSFW_CONFIG_RESERVED_START = PUS_SERVICE_1_VERIFICATION,
 		FSFW_CONFIG_RESERVED_END = TM_STORE,
 
-		UDP_BRIDGE = 15,
-		UDP_POLLING_TASK = 16,
+		UDP_BRIDGE = FSFW_OBJECTS_END,
+		UDP_POLLING_TASK = FSFW_OBJECTS_END + 1,
 
-		TEST_ECHO_COM_IF = 20,
-		TEST_DEVICE = 21,
+		TEST_ECHO_COM_IF = FSFW_OBJECTS_END + 2,
+		TEST_DEVICE = FSFW_OBJECTS_END + 3,
 
-		HK_RECEIVER_MOCK = 22,
-		TEST_LOCAL_POOL_OWNER_BASE = 25,
-
-		SHARED_SET_ID = 26
+		HK_RECEIVER_MOCK = FSFW_OBJECTS_END + 4,
+		TEST_LOCAL_POOL_OWNER_BASE = FSFW_OBJECTS_END + 5,
 
+		SHARED_SET_ID = FSFW_OBJECTS_END + 6,
+		FSFW_END_TEST_IDS = FSFW_OBJECTS_END + 7
 	};
 }