From 82299c7e3e2df65f9dc6a8f8f1310bcfcda727b2 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Wed, 14 Jul 2021 10:22:58 +0200 Subject: [PATCH] new test folder --- CMakeLists.txt | 10 +++--- src/CMakeLists.txt | 1 - src/tests/CMakeLists.txt | 5 --- src/tests/internal/internal.mk | 4 --- src/tests/internal/serialize/CMakeLists.txt | 3 -- .../tests/globalfunctions/CMakeLists.txt | 3 -- src/tests/tests/tests.mk | 8 ----- src/tests/user/unlockRealtime.sh | 34 ------------------- tests/CMakeLists.txt | 2 ++ tests/inc/CMakeLists.txt | 3 ++ .../fsfw}/tests/internal/InternalUnitTester.h | 6 ++-- .../fsfw}/tests/internal/UnittDefinitions.h | 5 +-- .../globalfunctions/TestArrayPrinter.h | 0 .../inc/fsfw}/tests/internal/osal/IntTestMq.h | 0 .../fsfw}/tests/internal/osal/IntTestMutex.h | 0 .../tests/internal/osal/IntTestSemaphore.h | 0 .../internal/serialize/IntTestSerialization.h | 2 +- tests/src/CMakeLists.txt | 7 ++++ .../src}/internal/CMakeLists.txt | 2 +- .../src}/internal/InternalUnitTester.cpp | 17 +++++----- .../src}/internal/UnittDefinitions.cpp | 2 +- .../internal/globalfunctions/CMakeLists.txt | 3 ++ .../globalfunctions/TestArrayPrinter.cpp | 2 +- .../src}/internal/osal/CMakeLists.txt | 2 +- .../src}/internal/osal/IntTestMq.cpp | 5 ++- .../src}/internal/osal/IntTestMutex.cpp | 4 +-- .../src}/internal/osal/IntTestSemaphore.cpp | 6 ++-- tests/src/internal/serialize/CMakeLists.txt | 3 ++ .../serialize/IntTestSerialization.cpp | 4 +-- {src/tests => tests/src}/tests/CMakeLists.txt | 1 - .../src}/tests/action/CMakeLists.txt | 0 .../src}/tests/action/TestActionHelper.cpp | 0 .../src}/tests/action/TestActionHelper.h | 0 .../src}/tests/container/CMakeLists.txt | 0 .../src}/tests/container/RingBufferTest.cpp | 0 .../src}/tests/container/TestArrayList.cpp | 0 .../src}/tests/container/TestDynamicFifo.cpp | 0 .../src}/tests/container/TestFifo.cpp | 0 .../tests/container/TestFixedArrayList.cpp | 0 .../src}/tests/container/TestFixedMap.cpp | 0 .../container/TestFixedOrderedMultimap.cpp | 0 .../tests/container/TestPlacementFactory.cpp | 0 .../src}/tests/datapoollocal/CMakeLists.txt | 0 .../src}/tests/datapoollocal/DataSetTest.cpp | 0 .../datapoollocal/LocalPoolManagerTest.cpp | 0 .../datapoollocal/LocalPoolOwnerBase.cpp | 0 .../tests/datapoollocal/LocalPoolOwnerBase.h | 0 .../datapoollocal/LocalPoolVariableTest.cpp | 0 .../datapoollocal/LocalPoolVectorTest.cpp | 0 .../src/tests}/globalfunctions/CMakeLists.txt | 0 .../src}/tests/mocks/HkReceiverMock.h | 0 .../src}/tests/mocks/MessageQueueMockBase.h | 0 .../src}/tests/osal/CMakeLists.txt | 0 .../src}/tests/osal/TestMessageQueue.cpp | 0 .../src}/tests/osal/TestSemaphore.cpp | 0 .../src}/tests/serialize/CMakeLists.txt | 0 .../serialize/TestSerialBufferAdapter.cpp | 0 .../serialize/TestSerialLinkedPacket.cpp | 0 .../tests/serialize/TestSerialLinkedPacket.h | 0 .../tests/serialize/TestSerialization.cpp | 0 .../src}/tests/storagemanager/CMakeLists.txt | 0 .../tests/storagemanager/TestNewAccessor.cpp | 0 .../src}/tests/storagemanager/TestPool.cpp | 0 .../src}/tests/tmtcpacket/CMakeLists.txt | 0 .../src}/tests/tmtcpacket/PusTmTest.cpp | 0 {src/tests => tests}/user/CMakeLists.txt | 0 {src/tests => tests/user}/README.md | 0 {src/tests => tests/user}/lcov.sh | 0 .../user/testcfg/CMakeLists.txt | 0 .../tests => tests}/user/testcfg/FSFWConfig.h | 0 .../user/testcfg/Makefile-FSFW-Tests | 0 .../user/testcfg/TestsConfig.h | 0 .../user/testcfg/cdatapool/dataPoolInit.cpp | 0 .../user/testcfg/cdatapool/dataPoolInit.h | 0 .../user/testcfg/devices/logicalAddresses.cpp | 0 .../user/testcfg/devices/logicalAddresses.h | 0 .../testcfg/devices/powerSwitcherList.cpp | 0 .../user/testcfg/devices/powerSwitcherList.h | 0 .../user/testcfg/events/subsystemIdRanges.h | 0 .../user/testcfg/ipc/MissionMessageTypes.cpp | 0 .../user/testcfg/ipc/MissionMessageTypes.h | 0 .../user/testcfg/objects/systemObjectList.h | 0 .../PollingSequenceFactory.cpp | 0 .../pollingsequence/PollingSequenceFactory.h | 0 .../user/testcfg/returnvalues/classIds.h | 0 {src/tests => tests}/user/testcfg/testcfg.mk | 0 {src/tests => tests}/user/testcfg/tmtc/apid.h | 0 .../user/testcfg/tmtc/pusIds.h | 0 .../user/testtemplate/TestTemplate.cpp | 0 .../user/unittest/CMakeLists.txt | 0 .../user/unittest/core/CMakeLists.txt | 0 .../user/unittest/core/CatchDefinitions.cpp | 0 .../user/unittest/core/CatchDefinitions.h | 0 .../user/unittest/core/CatchFactory.cpp | 0 .../user/unittest/core/CatchFactory.h | 0 .../user/unittest/core/CatchRunner.cpp | 0 .../user/unittest/core/CatchSetup.cpp | 0 .../user/unittest/core/core.mk | 0 .../user/unittest/core/printChar.cpp | 0 .../user/unittest/core/printChar.h | 0 100 files changed, 53 insertions(+), 91 deletions(-) delete mode 100644 src/tests/CMakeLists.txt delete mode 100644 src/tests/internal/internal.mk delete mode 100644 src/tests/internal/serialize/CMakeLists.txt delete mode 100644 src/tests/tests/globalfunctions/CMakeLists.txt delete mode 100644 src/tests/tests/tests.mk delete mode 100644 src/tests/user/unlockRealtime.sh create mode 100644 tests/CMakeLists.txt create mode 100644 tests/inc/CMakeLists.txt rename {src => tests/inc/fsfw}/tests/internal/InternalUnitTester.h (80%) rename {src => tests/inc/fsfw}/tests/internal/UnittDefinitions.h (88%) rename {src => tests/inc/fsfw}/tests/internal/globalfunctions/TestArrayPrinter.h (100%) rename {src => tests/inc/fsfw}/tests/internal/osal/IntTestMq.h (100%) rename {src => tests/inc/fsfw}/tests/internal/osal/IntTestMutex.h (100%) rename {src => tests/inc/fsfw}/tests/internal/osal/IntTestSemaphore.h (100%) rename {src => tests/inc/fsfw}/tests/internal/serialize/IntTestSerialization.h (88%) create mode 100644 tests/src/CMakeLists.txt rename {src/tests => tests/src}/internal/CMakeLists.txt (57%) rename {src/tests => tests/src}/internal/InternalUnitTester.cpp (57%) rename {src/tests => tests/src}/internal/UnittDefinitions.cpp (87%) create mode 100644 tests/src/internal/globalfunctions/CMakeLists.txt rename {src/tests => tests/src}/internal/globalfunctions/TestArrayPrinter.cpp (94%) rename {src/tests => tests/src}/internal/osal/CMakeLists.txt (58%) rename {src/tests => tests/src}/internal/osal/IntTestMq.cpp (93%) rename {src/tests => tests/src}/internal/osal/IntTestMutex.cpp (92%) rename {src/tests => tests/src}/internal/osal/IntTestSemaphore.cpp (96%) create mode 100644 tests/src/internal/serialize/CMakeLists.txt rename {src/tests => tests/src}/internal/serialize/IntTestSerialization.cpp (98%) rename {src/tests => tests/src}/tests/CMakeLists.txt (99%) rename {src/tests => tests/src}/tests/action/CMakeLists.txt (100%) rename {src/tests => tests/src}/tests/action/TestActionHelper.cpp (100%) rename {src/tests => tests/src}/tests/action/TestActionHelper.h (100%) rename {src/tests => tests/src}/tests/container/CMakeLists.txt (100%) rename {src/tests => tests/src}/tests/container/RingBufferTest.cpp (100%) rename {src/tests => tests/src}/tests/container/TestArrayList.cpp (100%) rename {src/tests => tests/src}/tests/container/TestDynamicFifo.cpp (100%) rename {src/tests => tests/src}/tests/container/TestFifo.cpp (100%) rename {src/tests => tests/src}/tests/container/TestFixedArrayList.cpp (100%) rename {src/tests => tests/src}/tests/container/TestFixedMap.cpp (100%) rename {src/tests => tests/src}/tests/container/TestFixedOrderedMultimap.cpp (100%) rename {src/tests => tests/src}/tests/container/TestPlacementFactory.cpp (100%) rename {src/tests => tests/src}/tests/datapoollocal/CMakeLists.txt (100%) rename {src/tests => tests/src}/tests/datapoollocal/DataSetTest.cpp (100%) rename {src/tests => tests/src}/tests/datapoollocal/LocalPoolManagerTest.cpp (100%) rename {src/tests => tests/src}/tests/datapoollocal/LocalPoolOwnerBase.cpp (100%) rename {src/tests => tests/src}/tests/datapoollocal/LocalPoolOwnerBase.h (100%) rename {src/tests => tests/src}/tests/datapoollocal/LocalPoolVariableTest.cpp (100%) rename {src/tests => tests/src}/tests/datapoollocal/LocalPoolVectorTest.cpp (100%) rename {src/tests/internal => tests/src/tests}/globalfunctions/CMakeLists.txt (100%) rename {src/tests => tests/src}/tests/mocks/HkReceiverMock.h (100%) rename {src/tests => tests/src}/tests/mocks/MessageQueueMockBase.h (100%) rename {src/tests => tests/src}/tests/osal/CMakeLists.txt (100%) rename {src/tests => tests/src}/tests/osal/TestMessageQueue.cpp (100%) rename {src/tests => tests/src}/tests/osal/TestSemaphore.cpp (100%) rename {src/tests => tests/src}/tests/serialize/CMakeLists.txt (100%) rename {src/tests => tests/src}/tests/serialize/TestSerialBufferAdapter.cpp (100%) rename {src/tests => tests/src}/tests/serialize/TestSerialLinkedPacket.cpp (100%) rename {src/tests => tests/src}/tests/serialize/TestSerialLinkedPacket.h (100%) rename {src/tests => tests/src}/tests/serialize/TestSerialization.cpp (100%) rename {src/tests => tests/src}/tests/storagemanager/CMakeLists.txt (100%) rename {src/tests => tests/src}/tests/storagemanager/TestNewAccessor.cpp (100%) rename {src/tests => tests/src}/tests/storagemanager/TestPool.cpp (100%) rename {src/tests => tests/src}/tests/tmtcpacket/CMakeLists.txt (100%) rename {src/tests => tests/src}/tests/tmtcpacket/PusTmTest.cpp (100%) rename {src/tests => tests}/user/CMakeLists.txt (100%) rename {src/tests => tests/user}/README.md (100%) rename {src/tests => tests/user}/lcov.sh (100%) rename {src/tests => tests}/user/testcfg/CMakeLists.txt (100%) rename {src/tests => tests}/user/testcfg/FSFWConfig.h (100%) rename {src/tests => tests}/user/testcfg/Makefile-FSFW-Tests (100%) rename {src/tests => tests}/user/testcfg/TestsConfig.h (100%) rename {src/tests => tests}/user/testcfg/cdatapool/dataPoolInit.cpp (100%) rename {src/tests => tests}/user/testcfg/cdatapool/dataPoolInit.h (100%) rename {src/tests => tests}/user/testcfg/devices/logicalAddresses.cpp (100%) rename {src/tests => tests}/user/testcfg/devices/logicalAddresses.h (100%) rename {src/tests => tests}/user/testcfg/devices/powerSwitcherList.cpp (100%) rename {src/tests => tests}/user/testcfg/devices/powerSwitcherList.h (100%) rename {src/tests => tests}/user/testcfg/events/subsystemIdRanges.h (100%) rename {src/tests => tests}/user/testcfg/ipc/MissionMessageTypes.cpp (100%) rename {src/tests => tests}/user/testcfg/ipc/MissionMessageTypes.h (100%) rename {src/tests => tests}/user/testcfg/objects/systemObjectList.h (100%) rename {src/tests => tests}/user/testcfg/pollingsequence/PollingSequenceFactory.cpp (100%) rename {src/tests => tests}/user/testcfg/pollingsequence/PollingSequenceFactory.h (100%) rename {src/tests => tests}/user/testcfg/returnvalues/classIds.h (100%) rename {src/tests => tests}/user/testcfg/testcfg.mk (100%) rename {src/tests => tests}/user/testcfg/tmtc/apid.h (100%) rename {src/tests => tests}/user/testcfg/tmtc/pusIds.h (100%) rename {src/tests => tests}/user/testtemplate/TestTemplate.cpp (100%) rename {src/tests => tests}/user/unittest/CMakeLists.txt (100%) rename {src/tests => tests}/user/unittest/core/CMakeLists.txt (100%) rename {src/tests => tests}/user/unittest/core/CatchDefinitions.cpp (100%) rename {src/tests => tests}/user/unittest/core/CatchDefinitions.h (100%) rename {src/tests => tests}/user/unittest/core/CatchFactory.cpp (100%) rename {src/tests => tests}/user/unittest/core/CatchFactory.h (100%) rename {src/tests => tests}/user/unittest/core/CatchRunner.cpp (100%) rename {src/tests => tests}/user/unittest/core/CatchSetup.cpp (100%) rename {src/tests => tests}/user/unittest/core/core.mk (100%) rename {src/tests => tests}/user/unittest/core/printChar.cpp (100%) rename {src/tests => tests}/user/unittest/core/printChar.h (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 021c3d0a..ecb59506 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,6 +10,7 @@ endif() option(FSFW_WARNING_SHADOW_LOCAL_GCC "Enable -Wshadow=local warning in GCC" ON) # Options to exclude parts of the FSFW from compilation. +option(FSFW_ADD_INTERNAL_TESTS "Add internal unit tests" ON) option(FSFW_USE_RMAP "Compile with RMAP" ON) option(FSFW_USE_DATALINKLAYER "Compile with Data Link Layer" ON) @@ -48,22 +49,22 @@ if(NOT FSFW_OSAL) endif() -set(FSFW_OSAL_DEFINITION FSFW_HOST) +set(FSFW_OSAL_DEFINITION FSFW_OSAL_HOST) if(FSFW_OSAL MATCHES host) set(OS_FSFW_NAME "Host") elseif(FSFW_OSAL MATCHES linux) set(OS_FSFW_NAME "Linux") - set(FSFW_OSAL_DEFINITION FSFW_LINUX) + set(FSFW_OSAL_DEFINITION FSFW_OSAL_LINUX) elseif(FSFW_OSAL MATCHES freertos) set(OS_FSFW_NAME "FreeRTOS") - set(FSFW_OSAL_DEFINITION FSFW_FREERTOS) + set(FSFW_OSAL_DEFINITION FSFW_OSAL_FREERTOS) target_link_libraries(${LIB_FSFW_NAME} PRIVATE ${LIB_OS_NAME} ) elseif(FSFW_OSAL STREQUAL rtems) set(OS_FSFW_NAME "RTEMS") - set(FSFW_OSAL_DEFINITION FSFW_RTEMS) + set(FSFW_OSAL_DEFINITION FSFW_OSAL_RTEMS) else() message(WARNING "Invalid operating system for FSFW specified! Setting to host.." @@ -83,6 +84,7 @@ target_compile_definitions(${LIB_FSFW_NAME} INTERFACE message(STATUS "Compiling FSFW for the ${OS_FSFW_NAME} operating system.") add_subdirectory(src) +add_subdirectory(tests) # The project CMakeLists file has to set the FSFW_CONFIG_PATH and add it. # If this is not given, we include the default configuration and emit a warning. diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 4d5bfc5a..70e6d76e 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,4 +1,3 @@ add_subdirectory(core) add_subdirectory(opt) add_subdirectory(osal) -# add_subdirectory(tests) diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt deleted file mode 100644 index 24f8ef6f..00000000 --- a/src/tests/CMakeLists.txt +++ /dev/null @@ -1,5 +0,0 @@ -add_subdirectory(internal) - -if(LINK_CATCH2) - add_subdirectory(tests) -endif() \ No newline at end of file diff --git a/src/tests/internal/internal.mk b/src/tests/internal/internal.mk deleted file mode 100644 index 1d4c9c99..00000000 --- a/src/tests/internal/internal.mk +++ /dev/null @@ -1,4 +0,0 @@ -CXXSRC += $(wildcard $(CURRENTPATH)/osal/*.cpp) -CXXSRC += $(wildcard $(CURRENTPATH)/serialize/*.cpp) -CXXSRC += $(wildcard $(CURRENTPATH)/globalfunctions/*.cpp) -CXXSRC += $(wildcard $(CURRENTPATH)/*.cpp) \ No newline at end of file diff --git a/src/tests/internal/serialize/CMakeLists.txt b/src/tests/internal/serialize/CMakeLists.txt deleted file mode 100644 index e8dc5717..00000000 --- a/src/tests/internal/serialize/CMakeLists.txt +++ /dev/null @@ -1,3 +0,0 @@ -target_sources(${TARGET_NAME} PRIVATE - IntTestSerialization.cpp -) diff --git a/src/tests/tests/globalfunctions/CMakeLists.txt b/src/tests/tests/globalfunctions/CMakeLists.txt deleted file mode 100644 index 4ea49bf7..00000000 --- a/src/tests/tests/globalfunctions/CMakeLists.txt +++ /dev/null @@ -1,3 +0,0 @@ -target_sources(${TARGET_NAME} PRIVATE - TestArrayPrinter.cpp -) diff --git a/src/tests/tests/tests.mk b/src/tests/tests/tests.mk deleted file mode 100644 index 47e634a2..00000000 --- a/src/tests/tests/tests.mk +++ /dev/null @@ -1,8 +0,0 @@ -CXXSRC += $(wildcard $(CURRENTPATH)/container/*.cpp) -CXXSRC += $(wildcard $(CURRENTPATH)/action/*.cpp) -CXXSRC += $(wildcard $(CURRENTPATH)/serialize/*.cpp) -CXXSRC += $(wildcard $(CURRENTPATH)/storagemanager/*.cpp) - -# OSAL not included for now. - -INCLUDES += $(CURRENTPATH) \ No newline at end of file diff --git a/src/tests/user/unlockRealtime.sh b/src/tests/user/unlockRealtime.sh deleted file mode 100644 index b28d5490..00000000 --- a/src/tests/user/unlockRealtime.sh +++ /dev/null @@ -1,34 +0,0 @@ -#!/bin/bash -# Run this script to unlock all permissions to run the linux binaries -# and create threads - -binaries=$(find $directory -type f -name "*.elf") - -echo Unlocking real time permissions for binaries and bash console... - -# Set up the soft realtime limit to maximum (99) -# Please note that the hard limit needs to be set to 99 too -# for this to work (check with ulimit -Hr). -# If that has not been done yet, add -# hard rtprio 99 -# to /etc/security/limits.conf -# It is also necessary and recommended to add -# soft rtprio 99 -# as well. This can also be done in the command line -# but would need to be done for each session. -ulimit -Sr 99 - -for binary in ${binaries}; do - sudo setcap 'cap_sys_nice=eip' ${binary} - result=$? - if [ ${result} = 0 ];then - echo ${binary} was unlocked - fi -done - -# sudo setcap 'cap_sys_nice=eip' /bin/bash -# result=$? -# if [ ${result} = 0 ];then -# echo /bin/bash was unlocked -# fi - diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt new file mode 100644 index 00000000..26ce12e8 --- /dev/null +++ b/tests/CMakeLists.txt @@ -0,0 +1,2 @@ +add_subdirectory(src) +add_subdirectory(inc) \ No newline at end of file diff --git a/tests/inc/CMakeLists.txt b/tests/inc/CMakeLists.txt new file mode 100644 index 00000000..7ca25bd0 --- /dev/null +++ b/tests/inc/CMakeLists.txt @@ -0,0 +1,3 @@ +target_include_directories(${LIB_FSFW_NAME} PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR} +) diff --git a/src/tests/internal/InternalUnitTester.h b/tests/inc/fsfw/tests/internal/InternalUnitTester.h similarity index 80% rename from src/tests/internal/InternalUnitTester.h rename to tests/inc/fsfw/tests/internal/InternalUnitTester.h index ae954c6a..50c89d77 100644 --- a/src/tests/internal/InternalUnitTester.h +++ b/tests/inc/fsfw/tests/internal/InternalUnitTester.h @@ -2,7 +2,7 @@ #define FRAMEWORK_TEST_UNITTESTCLASS_H_ #include "UnittDefinitions.h" -#include "../../returnvalues/HasReturnvaluesIF.h" +#include "fsfw/returnvalues/HasReturnvaluesIF.h" /** @@ -17,7 +17,7 @@ class InternalUnitTester: public HasReturnvaluesIF { public: struct TestConfig { - bool testArrayPrinter; + bool testArrayPrinter = false; }; InternalUnitTester(); @@ -27,7 +27,7 @@ public: * Some function which calls all other tests * @return */ - virtual ReturnValue_t performTests(struct InternalUnitTester::TestConfig& testConfig); + virtual ReturnValue_t performTests(const struct InternalUnitTester::TestConfig& testConfig); }; diff --git a/src/tests/internal/UnittDefinitions.h b/tests/inc/fsfw/tests/internal/UnittDefinitions.h similarity index 88% rename from src/tests/internal/UnittDefinitions.h rename to tests/inc/fsfw/tests/internal/UnittDefinitions.h index 3e14fec5..7e7e06a6 100644 --- a/src/tests/internal/UnittDefinitions.h +++ b/tests/inc/fsfw/tests/internal/UnittDefinitions.h @@ -1,8 +1,9 @@ #ifndef UNITTEST_INTERNAL_UNITTDEFINITIONS_H_ #define UNITTEST_INTERNAL_UNITTDEFINITIONS_H_ -#include "../../returnvalues/HasReturnvaluesIF.h" -#include "../../serviceinterface/ServiceInterface.h" +#include "fsfw/returnvalues/HasReturnvaluesIF.h" +#include "fsfw/serviceinterface/ServiceInterface.h" + #include #include #include diff --git a/src/tests/internal/globalfunctions/TestArrayPrinter.h b/tests/inc/fsfw/tests/internal/globalfunctions/TestArrayPrinter.h similarity index 100% rename from src/tests/internal/globalfunctions/TestArrayPrinter.h rename to tests/inc/fsfw/tests/internal/globalfunctions/TestArrayPrinter.h diff --git a/src/tests/internal/osal/IntTestMq.h b/tests/inc/fsfw/tests/internal/osal/IntTestMq.h similarity index 100% rename from src/tests/internal/osal/IntTestMq.h rename to tests/inc/fsfw/tests/internal/osal/IntTestMq.h diff --git a/src/tests/internal/osal/IntTestMutex.h b/tests/inc/fsfw/tests/internal/osal/IntTestMutex.h similarity index 100% rename from src/tests/internal/osal/IntTestMutex.h rename to tests/inc/fsfw/tests/internal/osal/IntTestMutex.h diff --git a/src/tests/internal/osal/IntTestSemaphore.h b/tests/inc/fsfw/tests/internal/osal/IntTestSemaphore.h similarity index 100% rename from src/tests/internal/osal/IntTestSemaphore.h rename to tests/inc/fsfw/tests/internal/osal/IntTestSemaphore.h diff --git a/src/tests/internal/serialize/IntTestSerialization.h b/tests/inc/fsfw/tests/internal/serialize/IntTestSerialization.h similarity index 88% rename from src/tests/internal/serialize/IntTestSerialization.h rename to tests/inc/fsfw/tests/internal/serialize/IntTestSerialization.h index 8706e057..0767fb44 100644 --- a/src/tests/internal/serialize/IntTestSerialization.h +++ b/tests/inc/fsfw/tests/internal/serialize/IntTestSerialization.h @@ -1,7 +1,7 @@ #ifndef FSFW_UNITTEST_INTERNAL_INTTESTSERIALIZATION_H_ #define FSFW_UNITTEST_INTERNAL_INTTESTSERIALIZATION_H_ -#include "../../../returnvalues/HasReturnvaluesIF.h" +#include "fsfw/returnvalues/HasReturnvaluesIF.h" #include namespace testserialize { diff --git a/tests/src/CMakeLists.txt b/tests/src/CMakeLists.txt new file mode 100644 index 00000000..3f5d21b5 --- /dev/null +++ b/tests/src/CMakeLists.txt @@ -0,0 +1,7 @@ +if(FSFW_ADD_INTERNAL_TESTS) + add_subdirectory(internal) +endif() + +if(FSFW_ADD_UNITTESTS) + add_subdirectory(tests) +endif() diff --git a/src/tests/internal/CMakeLists.txt b/tests/src/internal/CMakeLists.txt similarity index 57% rename from src/tests/internal/CMakeLists.txt rename to tests/src/internal/CMakeLists.txt index 11fd2b2f..2a144a9b 100644 --- a/src/tests/internal/CMakeLists.txt +++ b/tests/src/internal/CMakeLists.txt @@ -1,4 +1,4 @@ -target_sources(${TARGET_NAME} PRIVATE +target_sources(${LIB_FSFW_NAME} PRIVATE InternalUnitTester.cpp UnittDefinitions.cpp ) diff --git a/src/tests/internal/InternalUnitTester.cpp b/tests/src/internal/InternalUnitTester.cpp similarity index 57% rename from src/tests/internal/InternalUnitTester.cpp rename to tests/src/internal/InternalUnitTester.cpp index a9394ad3..8631ce0d 100644 --- a/src/tests/internal/InternalUnitTester.cpp +++ b/tests/src/internal/InternalUnitTester.cpp @@ -1,11 +1,11 @@ -#include "InternalUnitTester.h" -#include "UnittDefinitions.h" +#include "fsfw/tests/internal/InternalUnitTester.h" +#include "fsfw/tests/internal/UnittDefinitions.h" -#include "osal/IntTestMq.h" -#include "osal/IntTestSemaphore.h" -#include "osal/IntTestMutex.h" -#include "serialize/IntTestSerialization.h" -#include "globalfunctions/TestArrayPrinter.h" +#include "fsfw/tests/internal/osal/IntTestMq.h" +#include "fsfw/tests/internal/osal/IntTestSemaphore.h" +#include "fsfw/tests/internal/osal/IntTestMutex.h" +#include "fsfw/tests/internal/serialize/IntTestSerialization.h" +#include "fsfw/tests/internal/globalfunctions/TestArrayPrinter.h" #include @@ -13,7 +13,8 @@ InternalUnitTester::InternalUnitTester() {} InternalUnitTester::~InternalUnitTester() {} -ReturnValue_t InternalUnitTester::performTests(struct InternalUnitTester::TestConfig& testConfig) { +ReturnValue_t InternalUnitTester::performTests( + const struct InternalUnitTester::TestConfig& testConfig) { #if FSFW_CPP_OSTREAM_ENABLED == 1 sif::info << "Running internal unit tests.." << std::endl; #else diff --git a/src/tests/internal/UnittDefinitions.cpp b/tests/src/internal/UnittDefinitions.cpp similarity index 87% rename from src/tests/internal/UnittDefinitions.cpp rename to tests/src/internal/UnittDefinitions.cpp index ed4b59c1..74fd53be 100644 --- a/src/tests/internal/UnittDefinitions.cpp +++ b/tests/src/internal/UnittDefinitions.cpp @@ -1,4 +1,4 @@ -#include "UnittDefinitions.h" +#include "fsfw/tests/internal/UnittDefinitions.h" ReturnValue_t unitt::put_error(std::string errorId) { #if FSFW_CPP_OSTREAM_ENABLED == 1 diff --git a/tests/src/internal/globalfunctions/CMakeLists.txt b/tests/src/internal/globalfunctions/CMakeLists.txt new file mode 100644 index 00000000..cde97734 --- /dev/null +++ b/tests/src/internal/globalfunctions/CMakeLists.txt @@ -0,0 +1,3 @@ +target_sources(${LIB_FSFW_NAME} PRIVATE + TestArrayPrinter.cpp +) diff --git a/src/tests/internal/globalfunctions/TestArrayPrinter.cpp b/tests/src/internal/globalfunctions/TestArrayPrinter.cpp similarity index 94% rename from src/tests/internal/globalfunctions/TestArrayPrinter.cpp rename to tests/src/internal/globalfunctions/TestArrayPrinter.cpp index de016d19..90578095 100644 --- a/src/tests/internal/globalfunctions/TestArrayPrinter.cpp +++ b/tests/src/internal/globalfunctions/TestArrayPrinter.cpp @@ -1,4 +1,4 @@ -#include "TestArrayPrinter.h" +#include "fsfw/tests/internal/globalfunctions/TestArrayPrinter.h" void arrayprinter::testArrayPrinter() { { diff --git a/src/tests/internal/osal/CMakeLists.txt b/tests/src/internal/osal/CMakeLists.txt similarity index 58% rename from src/tests/internal/osal/CMakeLists.txt rename to tests/src/internal/osal/CMakeLists.txt index c6f1eb95..84316089 100644 --- a/src/tests/internal/osal/CMakeLists.txt +++ b/tests/src/internal/osal/CMakeLists.txt @@ -1,4 +1,4 @@ -target_sources(${TARGET_NAME} PRIVATE +target_sources(${LIB_FSFW_NAME} PRIVATE IntTestMq.cpp IntTestMutex.cpp IntTestSemaphore.cpp diff --git a/src/tests/internal/osal/IntTestMq.cpp b/tests/src/internal/osal/IntTestMq.cpp similarity index 93% rename from src/tests/internal/osal/IntTestMq.cpp rename to tests/src/internal/osal/IntTestMq.cpp index fc8e963e..91bc2c6d 100644 --- a/src/tests/internal/osal/IntTestMq.cpp +++ b/tests/src/internal/osal/IntTestMq.cpp @@ -1,5 +1,5 @@ -#include "IntTestMq.h" -#include +#include "fsfw/tests/internal/osal/IntTestMq.h" +#include "fsfw/tests/internal/UnittDefinitions.h" #include #include @@ -49,5 +49,4 @@ void testmq::testMq() { if(senderId != testSenderMqId) { unitt::put_error(id); } - } diff --git a/src/tests/internal/osal/IntTestMutex.cpp b/tests/src/internal/osal/IntTestMutex.cpp similarity index 92% rename from src/tests/internal/osal/IntTestMutex.cpp rename to tests/src/internal/osal/IntTestMutex.cpp index 13d87a8b..9e7c1481 100644 --- a/src/tests/internal/osal/IntTestMutex.cpp +++ b/tests/src/internal/osal/IntTestMutex.cpp @@ -1,7 +1,7 @@ -#include "IntTestMutex.h" +#include "fsfw/tests/internal/osal/IntTestMutex.h" +#include "fsfw/tests/internal/UnittDefinitions.h" #include -#include #if defined(WIN32) || defined(UNIX) #include diff --git a/src/tests/internal/osal/IntTestSemaphore.cpp b/tests/src/internal/osal/IntTestSemaphore.cpp similarity index 96% rename from src/tests/internal/osal/IntTestSemaphore.cpp rename to tests/src/internal/osal/IntTestSemaphore.cpp index 43990c2c..e278e3c1 100644 --- a/src/tests/internal/osal/IntTestSemaphore.cpp +++ b/tests/src/internal/osal/IntTestSemaphore.cpp @@ -1,8 +1,8 @@ -#include "IntTestSemaphore.h" -#include +#include "fsfw/tests/internal/osal/IntTestSemaphore.h" +#include "fsfw/tests/internal/UnittDefinitions.h" #include -#include +#include #include #include diff --git a/tests/src/internal/serialize/CMakeLists.txt b/tests/src/internal/serialize/CMakeLists.txt new file mode 100644 index 00000000..47e8b538 --- /dev/null +++ b/tests/src/internal/serialize/CMakeLists.txt @@ -0,0 +1,3 @@ +target_sources(${LIB_FSFW_NAME} PRIVATE + IntTestSerialization.cpp +) diff --git a/src/tests/internal/serialize/IntTestSerialization.cpp b/tests/src/internal/serialize/IntTestSerialization.cpp similarity index 98% rename from src/tests/internal/serialize/IntTestSerialization.cpp rename to tests/src/internal/serialize/IntTestSerialization.cpp index 69d82942..3489c759 100644 --- a/src/tests/internal/serialize/IntTestSerialization.cpp +++ b/tests/src/internal/serialize/IntTestSerialization.cpp @@ -1,5 +1,5 @@ -#include "IntTestSerialization.h" -#include +#include "fsfw/tests/internal/serialize/IntTestSerialization.h" +#include "fsfw/tests/internal/UnittDefinitions.h" #include #include diff --git a/src/tests/tests/CMakeLists.txt b/tests/src/tests/CMakeLists.txt similarity index 99% rename from src/tests/tests/CMakeLists.txt rename to tests/src/tests/CMakeLists.txt index 180e1a51..2f3d9f70 100644 --- a/src/tests/tests/CMakeLists.txt +++ b/tests/src/tests/CMakeLists.txt @@ -4,4 +4,3 @@ add_subdirectory(osal) add_subdirectory(serialize) add_subdirectory(datapoollocal) add_subdirectory(storagemanager) - diff --git a/src/tests/tests/action/CMakeLists.txt b/tests/src/tests/action/CMakeLists.txt similarity index 100% rename from src/tests/tests/action/CMakeLists.txt rename to tests/src/tests/action/CMakeLists.txt diff --git a/src/tests/tests/action/TestActionHelper.cpp b/tests/src/tests/action/TestActionHelper.cpp similarity index 100% rename from src/tests/tests/action/TestActionHelper.cpp rename to tests/src/tests/action/TestActionHelper.cpp diff --git a/src/tests/tests/action/TestActionHelper.h b/tests/src/tests/action/TestActionHelper.h similarity index 100% rename from src/tests/tests/action/TestActionHelper.h rename to tests/src/tests/action/TestActionHelper.h diff --git a/src/tests/tests/container/CMakeLists.txt b/tests/src/tests/container/CMakeLists.txt similarity index 100% rename from src/tests/tests/container/CMakeLists.txt rename to tests/src/tests/container/CMakeLists.txt diff --git a/src/tests/tests/container/RingBufferTest.cpp b/tests/src/tests/container/RingBufferTest.cpp similarity index 100% rename from src/tests/tests/container/RingBufferTest.cpp rename to tests/src/tests/container/RingBufferTest.cpp diff --git a/src/tests/tests/container/TestArrayList.cpp b/tests/src/tests/container/TestArrayList.cpp similarity index 100% rename from src/tests/tests/container/TestArrayList.cpp rename to tests/src/tests/container/TestArrayList.cpp diff --git a/src/tests/tests/container/TestDynamicFifo.cpp b/tests/src/tests/container/TestDynamicFifo.cpp similarity index 100% rename from src/tests/tests/container/TestDynamicFifo.cpp rename to tests/src/tests/container/TestDynamicFifo.cpp diff --git a/src/tests/tests/container/TestFifo.cpp b/tests/src/tests/container/TestFifo.cpp similarity index 100% rename from src/tests/tests/container/TestFifo.cpp rename to tests/src/tests/container/TestFifo.cpp diff --git a/src/tests/tests/container/TestFixedArrayList.cpp b/tests/src/tests/container/TestFixedArrayList.cpp similarity index 100% rename from src/tests/tests/container/TestFixedArrayList.cpp rename to tests/src/tests/container/TestFixedArrayList.cpp diff --git a/src/tests/tests/container/TestFixedMap.cpp b/tests/src/tests/container/TestFixedMap.cpp similarity index 100% rename from src/tests/tests/container/TestFixedMap.cpp rename to tests/src/tests/container/TestFixedMap.cpp diff --git a/src/tests/tests/container/TestFixedOrderedMultimap.cpp b/tests/src/tests/container/TestFixedOrderedMultimap.cpp similarity index 100% rename from src/tests/tests/container/TestFixedOrderedMultimap.cpp rename to tests/src/tests/container/TestFixedOrderedMultimap.cpp diff --git a/src/tests/tests/container/TestPlacementFactory.cpp b/tests/src/tests/container/TestPlacementFactory.cpp similarity index 100% rename from src/tests/tests/container/TestPlacementFactory.cpp rename to tests/src/tests/container/TestPlacementFactory.cpp diff --git a/src/tests/tests/datapoollocal/CMakeLists.txt b/tests/src/tests/datapoollocal/CMakeLists.txt similarity index 100% rename from src/tests/tests/datapoollocal/CMakeLists.txt rename to tests/src/tests/datapoollocal/CMakeLists.txt diff --git a/src/tests/tests/datapoollocal/DataSetTest.cpp b/tests/src/tests/datapoollocal/DataSetTest.cpp similarity index 100% rename from src/tests/tests/datapoollocal/DataSetTest.cpp rename to tests/src/tests/datapoollocal/DataSetTest.cpp diff --git a/src/tests/tests/datapoollocal/LocalPoolManagerTest.cpp b/tests/src/tests/datapoollocal/LocalPoolManagerTest.cpp similarity index 100% rename from src/tests/tests/datapoollocal/LocalPoolManagerTest.cpp rename to tests/src/tests/datapoollocal/LocalPoolManagerTest.cpp diff --git a/src/tests/tests/datapoollocal/LocalPoolOwnerBase.cpp b/tests/src/tests/datapoollocal/LocalPoolOwnerBase.cpp similarity index 100% rename from src/tests/tests/datapoollocal/LocalPoolOwnerBase.cpp rename to tests/src/tests/datapoollocal/LocalPoolOwnerBase.cpp diff --git a/src/tests/tests/datapoollocal/LocalPoolOwnerBase.h b/tests/src/tests/datapoollocal/LocalPoolOwnerBase.h similarity index 100% rename from src/tests/tests/datapoollocal/LocalPoolOwnerBase.h rename to tests/src/tests/datapoollocal/LocalPoolOwnerBase.h diff --git a/src/tests/tests/datapoollocal/LocalPoolVariableTest.cpp b/tests/src/tests/datapoollocal/LocalPoolVariableTest.cpp similarity index 100% rename from src/tests/tests/datapoollocal/LocalPoolVariableTest.cpp rename to tests/src/tests/datapoollocal/LocalPoolVariableTest.cpp diff --git a/src/tests/tests/datapoollocal/LocalPoolVectorTest.cpp b/tests/src/tests/datapoollocal/LocalPoolVectorTest.cpp similarity index 100% rename from src/tests/tests/datapoollocal/LocalPoolVectorTest.cpp rename to tests/src/tests/datapoollocal/LocalPoolVectorTest.cpp diff --git a/src/tests/internal/globalfunctions/CMakeLists.txt b/tests/src/tests/globalfunctions/CMakeLists.txt similarity index 100% rename from src/tests/internal/globalfunctions/CMakeLists.txt rename to tests/src/tests/globalfunctions/CMakeLists.txt diff --git a/src/tests/tests/mocks/HkReceiverMock.h b/tests/src/tests/mocks/HkReceiverMock.h similarity index 100% rename from src/tests/tests/mocks/HkReceiverMock.h rename to tests/src/tests/mocks/HkReceiverMock.h diff --git a/src/tests/tests/mocks/MessageQueueMockBase.h b/tests/src/tests/mocks/MessageQueueMockBase.h similarity index 100% rename from src/tests/tests/mocks/MessageQueueMockBase.h rename to tests/src/tests/mocks/MessageQueueMockBase.h diff --git a/src/tests/tests/osal/CMakeLists.txt b/tests/src/tests/osal/CMakeLists.txt similarity index 100% rename from src/tests/tests/osal/CMakeLists.txt rename to tests/src/tests/osal/CMakeLists.txt diff --git a/src/tests/tests/osal/TestMessageQueue.cpp b/tests/src/tests/osal/TestMessageQueue.cpp similarity index 100% rename from src/tests/tests/osal/TestMessageQueue.cpp rename to tests/src/tests/osal/TestMessageQueue.cpp diff --git a/src/tests/tests/osal/TestSemaphore.cpp b/tests/src/tests/osal/TestSemaphore.cpp similarity index 100% rename from src/tests/tests/osal/TestSemaphore.cpp rename to tests/src/tests/osal/TestSemaphore.cpp diff --git a/src/tests/tests/serialize/CMakeLists.txt b/tests/src/tests/serialize/CMakeLists.txt similarity index 100% rename from src/tests/tests/serialize/CMakeLists.txt rename to tests/src/tests/serialize/CMakeLists.txt diff --git a/src/tests/tests/serialize/TestSerialBufferAdapter.cpp b/tests/src/tests/serialize/TestSerialBufferAdapter.cpp similarity index 100% rename from src/tests/tests/serialize/TestSerialBufferAdapter.cpp rename to tests/src/tests/serialize/TestSerialBufferAdapter.cpp diff --git a/src/tests/tests/serialize/TestSerialLinkedPacket.cpp b/tests/src/tests/serialize/TestSerialLinkedPacket.cpp similarity index 100% rename from src/tests/tests/serialize/TestSerialLinkedPacket.cpp rename to tests/src/tests/serialize/TestSerialLinkedPacket.cpp diff --git a/src/tests/tests/serialize/TestSerialLinkedPacket.h b/tests/src/tests/serialize/TestSerialLinkedPacket.h similarity index 100% rename from src/tests/tests/serialize/TestSerialLinkedPacket.h rename to tests/src/tests/serialize/TestSerialLinkedPacket.h diff --git a/src/tests/tests/serialize/TestSerialization.cpp b/tests/src/tests/serialize/TestSerialization.cpp similarity index 100% rename from src/tests/tests/serialize/TestSerialization.cpp rename to tests/src/tests/serialize/TestSerialization.cpp diff --git a/src/tests/tests/storagemanager/CMakeLists.txt b/tests/src/tests/storagemanager/CMakeLists.txt similarity index 100% rename from src/tests/tests/storagemanager/CMakeLists.txt rename to tests/src/tests/storagemanager/CMakeLists.txt diff --git a/src/tests/tests/storagemanager/TestNewAccessor.cpp b/tests/src/tests/storagemanager/TestNewAccessor.cpp similarity index 100% rename from src/tests/tests/storagemanager/TestNewAccessor.cpp rename to tests/src/tests/storagemanager/TestNewAccessor.cpp diff --git a/src/tests/tests/storagemanager/TestPool.cpp b/tests/src/tests/storagemanager/TestPool.cpp similarity index 100% rename from src/tests/tests/storagemanager/TestPool.cpp rename to tests/src/tests/storagemanager/TestPool.cpp diff --git a/src/tests/tests/tmtcpacket/CMakeLists.txt b/tests/src/tests/tmtcpacket/CMakeLists.txt similarity index 100% rename from src/tests/tests/tmtcpacket/CMakeLists.txt rename to tests/src/tests/tmtcpacket/CMakeLists.txt diff --git a/src/tests/tests/tmtcpacket/PusTmTest.cpp b/tests/src/tests/tmtcpacket/PusTmTest.cpp similarity index 100% rename from src/tests/tests/tmtcpacket/PusTmTest.cpp rename to tests/src/tests/tmtcpacket/PusTmTest.cpp diff --git a/src/tests/user/CMakeLists.txt b/tests/user/CMakeLists.txt similarity index 100% rename from src/tests/user/CMakeLists.txt rename to tests/user/CMakeLists.txt diff --git a/src/tests/README.md b/tests/user/README.md similarity index 100% rename from src/tests/README.md rename to tests/user/README.md diff --git a/src/tests/lcov.sh b/tests/user/lcov.sh similarity index 100% rename from src/tests/lcov.sh rename to tests/user/lcov.sh diff --git a/src/tests/user/testcfg/CMakeLists.txt b/tests/user/testcfg/CMakeLists.txt similarity index 100% rename from src/tests/user/testcfg/CMakeLists.txt rename to tests/user/testcfg/CMakeLists.txt diff --git a/src/tests/user/testcfg/FSFWConfig.h b/tests/user/testcfg/FSFWConfig.h similarity index 100% rename from src/tests/user/testcfg/FSFWConfig.h rename to tests/user/testcfg/FSFWConfig.h diff --git a/src/tests/user/testcfg/Makefile-FSFW-Tests b/tests/user/testcfg/Makefile-FSFW-Tests similarity index 100% rename from src/tests/user/testcfg/Makefile-FSFW-Tests rename to tests/user/testcfg/Makefile-FSFW-Tests diff --git a/src/tests/user/testcfg/TestsConfig.h b/tests/user/testcfg/TestsConfig.h similarity index 100% rename from src/tests/user/testcfg/TestsConfig.h rename to tests/user/testcfg/TestsConfig.h diff --git a/src/tests/user/testcfg/cdatapool/dataPoolInit.cpp b/tests/user/testcfg/cdatapool/dataPoolInit.cpp similarity index 100% rename from src/tests/user/testcfg/cdatapool/dataPoolInit.cpp rename to tests/user/testcfg/cdatapool/dataPoolInit.cpp diff --git a/src/tests/user/testcfg/cdatapool/dataPoolInit.h b/tests/user/testcfg/cdatapool/dataPoolInit.h similarity index 100% rename from src/tests/user/testcfg/cdatapool/dataPoolInit.h rename to tests/user/testcfg/cdatapool/dataPoolInit.h diff --git a/src/tests/user/testcfg/devices/logicalAddresses.cpp b/tests/user/testcfg/devices/logicalAddresses.cpp similarity index 100% rename from src/tests/user/testcfg/devices/logicalAddresses.cpp rename to tests/user/testcfg/devices/logicalAddresses.cpp diff --git a/src/tests/user/testcfg/devices/logicalAddresses.h b/tests/user/testcfg/devices/logicalAddresses.h similarity index 100% rename from src/tests/user/testcfg/devices/logicalAddresses.h rename to tests/user/testcfg/devices/logicalAddresses.h diff --git a/src/tests/user/testcfg/devices/powerSwitcherList.cpp b/tests/user/testcfg/devices/powerSwitcherList.cpp similarity index 100% rename from src/tests/user/testcfg/devices/powerSwitcherList.cpp rename to tests/user/testcfg/devices/powerSwitcherList.cpp diff --git a/src/tests/user/testcfg/devices/powerSwitcherList.h b/tests/user/testcfg/devices/powerSwitcherList.h similarity index 100% rename from src/tests/user/testcfg/devices/powerSwitcherList.h rename to tests/user/testcfg/devices/powerSwitcherList.h diff --git a/src/tests/user/testcfg/events/subsystemIdRanges.h b/tests/user/testcfg/events/subsystemIdRanges.h similarity index 100% rename from src/tests/user/testcfg/events/subsystemIdRanges.h rename to tests/user/testcfg/events/subsystemIdRanges.h diff --git a/src/tests/user/testcfg/ipc/MissionMessageTypes.cpp b/tests/user/testcfg/ipc/MissionMessageTypes.cpp similarity index 100% rename from src/tests/user/testcfg/ipc/MissionMessageTypes.cpp rename to tests/user/testcfg/ipc/MissionMessageTypes.cpp diff --git a/src/tests/user/testcfg/ipc/MissionMessageTypes.h b/tests/user/testcfg/ipc/MissionMessageTypes.h similarity index 100% rename from src/tests/user/testcfg/ipc/MissionMessageTypes.h rename to tests/user/testcfg/ipc/MissionMessageTypes.h diff --git a/src/tests/user/testcfg/objects/systemObjectList.h b/tests/user/testcfg/objects/systemObjectList.h similarity index 100% rename from src/tests/user/testcfg/objects/systemObjectList.h rename to tests/user/testcfg/objects/systemObjectList.h diff --git a/src/tests/user/testcfg/pollingsequence/PollingSequenceFactory.cpp b/tests/user/testcfg/pollingsequence/PollingSequenceFactory.cpp similarity index 100% rename from src/tests/user/testcfg/pollingsequence/PollingSequenceFactory.cpp rename to tests/user/testcfg/pollingsequence/PollingSequenceFactory.cpp diff --git a/src/tests/user/testcfg/pollingsequence/PollingSequenceFactory.h b/tests/user/testcfg/pollingsequence/PollingSequenceFactory.h similarity index 100% rename from src/tests/user/testcfg/pollingsequence/PollingSequenceFactory.h rename to tests/user/testcfg/pollingsequence/PollingSequenceFactory.h diff --git a/src/tests/user/testcfg/returnvalues/classIds.h b/tests/user/testcfg/returnvalues/classIds.h similarity index 100% rename from src/tests/user/testcfg/returnvalues/classIds.h rename to tests/user/testcfg/returnvalues/classIds.h diff --git a/src/tests/user/testcfg/testcfg.mk b/tests/user/testcfg/testcfg.mk similarity index 100% rename from src/tests/user/testcfg/testcfg.mk rename to tests/user/testcfg/testcfg.mk diff --git a/src/tests/user/testcfg/tmtc/apid.h b/tests/user/testcfg/tmtc/apid.h similarity index 100% rename from src/tests/user/testcfg/tmtc/apid.h rename to tests/user/testcfg/tmtc/apid.h diff --git a/src/tests/user/testcfg/tmtc/pusIds.h b/tests/user/testcfg/tmtc/pusIds.h similarity index 100% rename from src/tests/user/testcfg/tmtc/pusIds.h rename to tests/user/testcfg/tmtc/pusIds.h diff --git a/src/tests/user/testtemplate/TestTemplate.cpp b/tests/user/testtemplate/TestTemplate.cpp similarity index 100% rename from src/tests/user/testtemplate/TestTemplate.cpp rename to tests/user/testtemplate/TestTemplate.cpp diff --git a/src/tests/user/unittest/CMakeLists.txt b/tests/user/unittest/CMakeLists.txt similarity index 100% rename from src/tests/user/unittest/CMakeLists.txt rename to tests/user/unittest/CMakeLists.txt diff --git a/src/tests/user/unittest/core/CMakeLists.txt b/tests/user/unittest/core/CMakeLists.txt similarity index 100% rename from src/tests/user/unittest/core/CMakeLists.txt rename to tests/user/unittest/core/CMakeLists.txt diff --git a/src/tests/user/unittest/core/CatchDefinitions.cpp b/tests/user/unittest/core/CatchDefinitions.cpp similarity index 100% rename from src/tests/user/unittest/core/CatchDefinitions.cpp rename to tests/user/unittest/core/CatchDefinitions.cpp diff --git a/src/tests/user/unittest/core/CatchDefinitions.h b/tests/user/unittest/core/CatchDefinitions.h similarity index 100% rename from src/tests/user/unittest/core/CatchDefinitions.h rename to tests/user/unittest/core/CatchDefinitions.h diff --git a/src/tests/user/unittest/core/CatchFactory.cpp b/tests/user/unittest/core/CatchFactory.cpp similarity index 100% rename from src/tests/user/unittest/core/CatchFactory.cpp rename to tests/user/unittest/core/CatchFactory.cpp diff --git a/src/tests/user/unittest/core/CatchFactory.h b/tests/user/unittest/core/CatchFactory.h similarity index 100% rename from src/tests/user/unittest/core/CatchFactory.h rename to tests/user/unittest/core/CatchFactory.h diff --git a/src/tests/user/unittest/core/CatchRunner.cpp b/tests/user/unittest/core/CatchRunner.cpp similarity index 100% rename from src/tests/user/unittest/core/CatchRunner.cpp rename to tests/user/unittest/core/CatchRunner.cpp diff --git a/src/tests/user/unittest/core/CatchSetup.cpp b/tests/user/unittest/core/CatchSetup.cpp similarity index 100% rename from src/tests/user/unittest/core/CatchSetup.cpp rename to tests/user/unittest/core/CatchSetup.cpp diff --git a/src/tests/user/unittest/core/core.mk b/tests/user/unittest/core/core.mk similarity index 100% rename from src/tests/user/unittest/core/core.mk rename to tests/user/unittest/core/core.mk diff --git a/src/tests/user/unittest/core/printChar.cpp b/tests/user/unittest/core/printChar.cpp similarity index 100% rename from src/tests/user/unittest/core/printChar.cpp rename to tests/user/unittest/core/printChar.cpp diff --git a/src/tests/user/unittest/core/printChar.h b/tests/user/unittest/core/printChar.h similarity index 100% rename from src/tests/user/unittest/core/printChar.h rename to tests/user/unittest/core/printChar.h