diff --git a/unittest/CMakeLists.txt b/unittest/CMakeLists.txt new file mode 100644 index 00000000..119ef243 --- /dev/null +++ b/unittest/CMakeLists.txt @@ -0,0 +1,2 @@ +add_subdirectory(internal) +add_subdirectory(tests) \ No newline at end of file diff --git a/unittest/internal/CMakeLists.txt b/unittest/internal/CMakeLists.txt new file mode 100644 index 00000000..9c24317f --- /dev/null +++ b/unittest/internal/CMakeLists.txt @@ -0,0 +1,7 @@ +target_sources(${TARGET_NAME} PRIVATE + InternalUnitTester.cpp + UnittDefinitions.cpp +) + +add_subdirectory(osal) +add_subdirectory(serialize) \ No newline at end of file diff --git a/unittest/internal/osal/CMakeLists.txt b/unittest/internal/osal/CMakeLists.txt new file mode 100644 index 00000000..c6f1eb95 --- /dev/null +++ b/unittest/internal/osal/CMakeLists.txt @@ -0,0 +1,5 @@ +target_sources(${TARGET_NAME} PRIVATE + IntTestMq.cpp + IntTestMutex.cpp + IntTestSemaphore.cpp +) diff --git a/unittest/internal/serialize/CMakeLists.txt b/unittest/internal/serialize/CMakeLists.txt new file mode 100644 index 00000000..e8dc5717 --- /dev/null +++ b/unittest/internal/serialize/CMakeLists.txt @@ -0,0 +1,3 @@ +target_sources(${TARGET_NAME} PRIVATE + IntTestSerialization.cpp +) diff --git a/unittest/tests/CMakeLists.txt b/unittest/tests/CMakeLists.txt new file mode 100644 index 00000000..97074417 --- /dev/null +++ b/unittest/tests/CMakeLists.txt @@ -0,0 +1,6 @@ +add_subdirectory(action) +add_subdirectory(container) +add_subdirectory(osal) +add_subdirectory(serialize) +add_subdirectory(storagemanager) + diff --git a/unittest/tests/action/CMakeLists.txt b/unittest/tests/action/CMakeLists.txt new file mode 100644 index 00000000..0339000f --- /dev/null +++ b/unittest/tests/action/CMakeLists.txt @@ -0,0 +1,3 @@ +target_sources(${TARGET_NAME} PRIVATE + TestActionHelper.cpp +) diff --git a/unittest/tests/action/TestActionHelper.cpp b/unittest/tests/action/TestActionHelper.cpp index 944ad705..3109eba1 100644 --- a/unittest/tests/action/TestActionHelper.cpp +++ b/unittest/tests/action/TestActionHelper.cpp @@ -1,8 +1,11 @@ #include "TestActionHelper.h" + +#include + #include #include -#include -#include "../../core/CatchDefinitions.h" + +#include TEST_CASE( "Action Helper" , "[ActionHelper]") { diff --git a/unittest/tests/action/TestActionHelper.h b/unittest/tests/action/TestActionHelper.h index 4ba417eb..610fb09e 100644 --- a/unittest/tests/action/TestActionHelper.h +++ b/unittest/tests/action/TestActionHelper.h @@ -3,7 +3,7 @@ #include #include -#include +#include #include diff --git a/unittest/tests/container/CMakeLists.txt b/unittest/tests/container/CMakeLists.txt new file mode 100644 index 00000000..966c5834 --- /dev/null +++ b/unittest/tests/container/CMakeLists.txt @@ -0,0 +1,10 @@ +target_sources(${TARGET_NAME} PRIVATE + RingBufferTest.cpp + TestArrayList.cpp + TestDynamicFifo.cpp + TestFifo.cpp + TestFixedArrayList.cpp + TestFixedMap.cpp + TestFixedOrderedMultimap.cpp + TestPlacementFactory.cpp +) diff --git a/unittest/tests/container/RingBufferTest.cpp b/unittest/tests/container/RingBufferTest.cpp index 9c1c8a23..32a2502d 100644 --- a/unittest/tests/container/RingBufferTest.cpp +++ b/unittest/tests/container/RingBufferTest.cpp @@ -1,7 +1,7 @@ -#include "../../core/CatchDefinitions.h" -#include "../../container/SimpleRingBuffer.h" +#include +#include -#include +#include #include TEST_CASE("Ring Buffer Test" , "[RingBufferTest]") { diff --git a/unittest/tests/container/TestArrayList.cpp b/unittest/tests/container/TestArrayList.cpp index 2f884276..1fd330b6 100644 --- a/unittest/tests/container/TestArrayList.cpp +++ b/unittest/tests/container/TestArrayList.cpp @@ -1,8 +1,8 @@ -#include "../../container/ArrayList.h" -#include "../../returnvalues/HasReturnvaluesIF.h" +#include +#include -#include -#include "../../core/CatchDefinitions.h" +#include +#include /** * @brief Array List test diff --git a/unittest/tests/container/TestDynamicFifo.cpp b/unittest/tests/container/TestDynamicFifo.cpp index bb19131e..759fcc66 100644 --- a/unittest/tests/container/TestDynamicFifo.cpp +++ b/unittest/tests/container/TestDynamicFifo.cpp @@ -1,10 +1,9 @@ +#include "../../../container/DynamicFIFO.h" +#include "../../../container/FIFO.h" +#include "../../../returnvalues/HasReturnvaluesIF.h" -#include "../../container/DynamicFIFO.h" -#include "../../container/FIFO.h" -#include "../../returnvalues/HasReturnvaluesIF.h" - -#include -#include +#include +#include TEST_CASE( "Dynamic Fifo Tests", "[TestDynamicFifo]") { INFO("Dynamic Fifo Tests"); diff --git a/unittest/tests/container/TestFifo.cpp b/unittest/tests/container/TestFifo.cpp index bd727e00..f7bfb1de 100644 --- a/unittest/tests/container/TestFifo.cpp +++ b/unittest/tests/container/TestFifo.cpp @@ -1,10 +1,9 @@ +#include "../../../container/DynamicFIFO.h" +#include "../../../container/FIFO.h" +#include "../../../returnvalues/HasReturnvaluesIF.h" -#include "../../container/DynamicFIFO.h" -#include "../../container/FIFO.h" -#include "../../returnvalues/HasReturnvaluesIF.h" - -#include -#include "../../core/CatchDefinitions.h" +#include +#include TEST_CASE( "Static Fifo Tests", "[TestFifo]") { INFO("Fifo Tests"); diff --git a/unittest/tests/container/TestFixedArrayList.cpp b/unittest/tests/container/TestFixedArrayList.cpp index 5a1bd280..b2baa3e7 100644 --- a/unittest/tests/container/TestFixedArrayList.cpp +++ b/unittest/tests/container/TestFixedArrayList.cpp @@ -1,9 +1,8 @@ -#include "../../core/CatchDefinitions.h" +#include "../../../container/FixedArrayList.h" +#include "../../../returnvalues/HasReturnvaluesIF.h" -#include "../../container/FixedArrayList.h" -#include "../../returnvalues/HasReturnvaluesIF.h" - -#include +#include +#include TEST_CASE( "FixedArrayList Tests", "[TestFixedArrayList]") { diff --git a/unittest/tests/container/TestFixedMap.cpp b/unittest/tests/container/TestFixedMap.cpp index da0c84e3..f93065b6 100644 --- a/unittest/tests/container/TestFixedMap.cpp +++ b/unittest/tests/container/TestFixedMap.cpp @@ -1,8 +1,8 @@ -#include "../../container/FixedMap.h" -#include "../../returnvalues/HasReturnvaluesIF.h" +#include "../../../container/FixedMap.h" +#include "../../../returnvalues/HasReturnvaluesIF.h" -#include -#include "../../core/CatchDefinitions.h" +#include +#include template class FixedMap; diff --git a/unittest/tests/container/TestFixedOrderedMultimap.cpp b/unittest/tests/container/TestFixedOrderedMultimap.cpp index e625b559..b337a9c8 100644 --- a/unittest/tests/container/TestFixedOrderedMultimap.cpp +++ b/unittest/tests/container/TestFixedOrderedMultimap.cpp @@ -1,8 +1,8 @@ -#include "../../container/FixedOrderedMultimap.h" -#include "../../returnvalues/HasReturnvaluesIF.h" +#include "../../../container/FixedOrderedMultimap.h" +#include "../../../returnvalues/HasReturnvaluesIF.h" -#include -#include "../../core/CatchDefinitions.h" +#include +#include TEST_CASE( "FixedOrderedMultimap Tests", "[TestFixedOrderedMultimap]") { INFO("FixedOrderedMultimap Tests"); diff --git a/unittest/tests/osal/CMakeLists.txt b/unittest/tests/osal/CMakeLists.txt new file mode 100644 index 00000000..5ca5e400 --- /dev/null +++ b/unittest/tests/osal/CMakeLists.txt @@ -0,0 +1,4 @@ +target_sources(${TARGET_NAME} PRIVATE + TestMessageQueue.cpp + TestSemaphore.cpp +) diff --git a/unittest/tests/osal/TestMessageQueue.cpp b/unittest/tests/osal/TestMessageQueue.cpp index 441d32e7..5360974f 100644 --- a/unittest/tests/osal/TestMessageQueue.cpp +++ b/unittest/tests/osal/TestMessageQueue.cpp @@ -1,8 +1,10 @@ -#include "../../ipc/MessageQueueIF.h" -#include "../../ipc/QueueFactory.h" -#include +#include "../../../ipc/MessageQueueIF.h" +#include "../../../ipc/QueueFactory.h" + +#include +#include + #include -#include "../../core/CatchDefinitions.h" TEST_CASE("MessageQueue Basic Test","[TestMq]") { MessageQueueIF* testSenderMq = diff --git a/unittest/tests/serialize/CMakeLists.txt b/unittest/tests/serialize/CMakeLists.txt new file mode 100644 index 00000000..5a9d9a0f --- /dev/null +++ b/unittest/tests/serialize/CMakeLists.txt @@ -0,0 +1,5 @@ +target_sources(${TARGET_NAME} PRIVATE + TestSerialBufferAdapter.cpp + TestSerialization.cpp + TestSerialLinkedPacket.cpp +) diff --git a/unittest/tests/serialize/TestSerialBufferAdapter.cpp b/unittest/tests/serialize/TestSerialBufferAdapter.cpp index 07cd3f9c..778f857e 100644 --- a/unittest/tests/serialize/TestSerialBufferAdapter.cpp +++ b/unittest/tests/serialize/TestSerialBufferAdapter.cpp @@ -1,7 +1,9 @@ -#include "../../serialize/SerialBufferAdapter.h" +#include "../../../serialize/SerialBufferAdapter.h" -#include -#include "../../core/CatchDefinitions.h" +#include +#include + +#include static bool test_value_bool = true; diff --git a/unittest/tests/serialize/TestSerialLinkedPacket.cpp b/unittest/tests/serialize/TestSerialLinkedPacket.cpp index fbe48894..83bdf857 100644 --- a/unittest/tests/serialize/TestSerialLinkedPacket.cpp +++ b/unittest/tests/serialize/TestSerialLinkedPacket.cpp @@ -1,9 +1,12 @@ #include "TestSerialLinkedPacket.h" -#include "../../core/CatchDefinitions.h" +#include -#include "../../globalfunctions/arrayprinter.h" +#include "../../../globalfunctions/arrayprinter.h" -#include +#include +#include + +#include TEST_CASE("Serial Linked Packet" , "[SerLinkPacket]") { diff --git a/unittest/tests/serialize/TestSerialLinkedPacket.h b/unittest/tests/serialize/TestSerialLinkedPacket.h index 6c720577..71f258f9 100644 --- a/unittest/tests/serialize/TestSerialLinkedPacket.h +++ b/unittest/tests/serialize/TestSerialLinkedPacket.h @@ -37,7 +37,7 @@ public: return buffer.entry.getConstBuffer(); } - const size_t getBufferLength() { + size_t getBufferLength() { return buffer.getSerializedSize(); } diff --git a/unittest/tests/serialize/TestSerialization.cpp b/unittest/tests/serialize/TestSerialization.cpp index 6e31170a..2877d09a 100644 --- a/unittest/tests/serialize/TestSerialization.cpp +++ b/unittest/tests/serialize/TestSerialization.cpp @@ -1,8 +1,10 @@ -#include "../../serialize/SerializeAdapter.h" +#include "../../../serialize/SerializeAdapter.h" + +#include +#include +#include -#include "catch.hpp" #include -#include "../../core/CatchDefinitions.h" static bool test_value_bool = true; static uint8_t tv_uint8 {5}; @@ -119,10 +121,10 @@ TEST_CASE("Auto Serialize Adapter testing", "[single-file]") { REQUIRE(tv_int16 == -829); REQUIRE(tv_int32 == -2312); - REQUIRE(tv_float == Approx(8.214921)); - REQUIRE(tv_double == Approx(9.2132142141e8)); - REQUIRE(tv_sfloat == Approx(-922.2321321)); - REQUIRE(tv_sdouble == Approx(-2.2421e19)); + REQUIRE(tv_float == Catch::Approx(8.214921)); + REQUIRE(tv_double == Catch::Approx(9.2132142141e8)); + REQUIRE(tv_sfloat == Catch::Approx(-922.2321321)); + REQUIRE(tv_sdouble == Catch::Approx(-2.2421e19)); } } diff --git a/unittest/tests/storagemanager/CMakeLists.txt b/unittest/tests/storagemanager/CMakeLists.txt new file mode 100644 index 00000000..ed7be7d5 --- /dev/null +++ b/unittest/tests/storagemanager/CMakeLists.txt @@ -0,0 +1,4 @@ +target_sources(${TARGET_NAME} PRIVATE + TestNewAccessor.cpp + TestPool.cpp +) diff --git a/unittest/tests/storagemanager/TestPool.cpp b/unittest/tests/storagemanager/TestPool.cpp index daeb6bb5..dcfb6c03 100644 --- a/unittest/tests/storagemanager/TestPool.cpp +++ b/unittest/tests/storagemanager/TestPool.cpp @@ -1,10 +1,8 @@ -#include "CatchDefinitions.h" - #include #include -#include -#include +#include +#include #include diff --git a/unittest/user/CMakeLists.txt b/unittest/user/CMakeLists.txt new file mode 100644 index 00000000..ad6d4787 --- /dev/null +++ b/unittest/user/CMakeLists.txt @@ -0,0 +1 @@ +add_subdirectory(core) diff --git a/unittest/user/testcfg/CMakeLists.txt b/unittest/user/testcfg/CMakeLists.txt new file mode 100644 index 00000000..dbf0256f --- /dev/null +++ b/unittest/user/testcfg/CMakeLists.txt @@ -0,0 +1,11 @@ +target_sources(${TARGET_NAME} + PRIVATE + ipc/MissionMessageTypes.cpp + pollingsequence/PollingSequenceFactory.cpp +) + +# Add include paths for the executable +target_include_directories(${TARGET_NAME} + PUBLIC + ${CMAKE_CURRENT_SOURCE_DIR} +) diff --git a/unittest/testcfg/FSFWConfig.h b/unittest/user/testcfg/FSFWConfig.h similarity index 100% rename from unittest/testcfg/FSFWConfig.h rename to unittest/user/testcfg/FSFWConfig.h diff --git a/unittest/testcfg/Makefile-FSFW-Tests b/unittest/user/testcfg/Makefile-FSFW-Tests similarity index 100% rename from unittest/testcfg/Makefile-FSFW-Tests rename to unittest/user/testcfg/Makefile-FSFW-Tests diff --git a/unittest/testcfg/TestsConfig.h b/unittest/user/testcfg/TestsConfig.h similarity index 100% rename from unittest/testcfg/TestsConfig.h rename to unittest/user/testcfg/TestsConfig.h diff --git a/unittest/testcfg/cdatapool/dataPoolInit.cpp b/unittest/user/testcfg/cdatapool/dataPoolInit.cpp similarity index 100% rename from unittest/testcfg/cdatapool/dataPoolInit.cpp rename to unittest/user/testcfg/cdatapool/dataPoolInit.cpp diff --git a/unittest/testcfg/cdatapool/dataPoolInit.h b/unittest/user/testcfg/cdatapool/dataPoolInit.h similarity index 100% rename from unittest/testcfg/cdatapool/dataPoolInit.h rename to unittest/user/testcfg/cdatapool/dataPoolInit.h diff --git a/unittest/testcfg/devices/logicalAddresses.cpp b/unittest/user/testcfg/devices/logicalAddresses.cpp similarity index 100% rename from unittest/testcfg/devices/logicalAddresses.cpp rename to unittest/user/testcfg/devices/logicalAddresses.cpp diff --git a/unittest/testcfg/devices/logicalAddresses.h b/unittest/user/testcfg/devices/logicalAddresses.h similarity index 100% rename from unittest/testcfg/devices/logicalAddresses.h rename to unittest/user/testcfg/devices/logicalAddresses.h diff --git a/unittest/testcfg/devices/powerSwitcherList.cpp b/unittest/user/testcfg/devices/powerSwitcherList.cpp similarity index 100% rename from unittest/testcfg/devices/powerSwitcherList.cpp rename to unittest/user/testcfg/devices/powerSwitcherList.cpp diff --git a/unittest/testcfg/devices/powerSwitcherList.h b/unittest/user/testcfg/devices/powerSwitcherList.h similarity index 100% rename from unittest/testcfg/devices/powerSwitcherList.h rename to unittest/user/testcfg/devices/powerSwitcherList.h diff --git a/unittest/testcfg/events/subsystemIdRanges.h b/unittest/user/testcfg/events/subsystemIdRanges.h similarity index 100% rename from unittest/testcfg/events/subsystemIdRanges.h rename to unittest/user/testcfg/events/subsystemIdRanges.h diff --git a/unittest/testcfg/ipc/MissionMessageTypes.cpp b/unittest/user/testcfg/ipc/MissionMessageTypes.cpp similarity index 100% rename from unittest/testcfg/ipc/MissionMessageTypes.cpp rename to unittest/user/testcfg/ipc/MissionMessageTypes.cpp diff --git a/unittest/testcfg/ipc/MissionMessageTypes.h b/unittest/user/testcfg/ipc/MissionMessageTypes.h similarity index 100% rename from unittest/testcfg/ipc/MissionMessageTypes.h rename to unittest/user/testcfg/ipc/MissionMessageTypes.h diff --git a/unittest/testcfg/objects/systemObjectList.h b/unittest/user/testcfg/objects/systemObjectList.h similarity index 100% rename from unittest/testcfg/objects/systemObjectList.h rename to unittest/user/testcfg/objects/systemObjectList.h diff --git a/unittest/testcfg/pollingsequence/PollingSequenceFactory.cpp b/unittest/user/testcfg/pollingsequence/PollingSequenceFactory.cpp similarity index 100% rename from unittest/testcfg/pollingsequence/PollingSequenceFactory.cpp rename to unittest/user/testcfg/pollingsequence/PollingSequenceFactory.cpp diff --git a/unittest/testcfg/pollingsequence/PollingSequenceFactory.h b/unittest/user/testcfg/pollingsequence/PollingSequenceFactory.h similarity index 100% rename from unittest/testcfg/pollingsequence/PollingSequenceFactory.h rename to unittest/user/testcfg/pollingsequence/PollingSequenceFactory.h diff --git a/unittest/testcfg/returnvalues/classIds.h b/unittest/user/testcfg/returnvalues/classIds.h similarity index 100% rename from unittest/testcfg/returnvalues/classIds.h rename to unittest/user/testcfg/returnvalues/classIds.h diff --git a/unittest/testcfg/testcfg.mk b/unittest/user/testcfg/testcfg.mk similarity index 100% rename from unittest/testcfg/testcfg.mk rename to unittest/user/testcfg/testcfg.mk diff --git a/unittest/testcfg/tmtc/apid.h b/unittest/user/testcfg/tmtc/apid.h similarity index 100% rename from unittest/testcfg/tmtc/apid.h rename to unittest/user/testcfg/tmtc/apid.h diff --git a/unittest/testcfg/tmtc/pusIds.h b/unittest/user/testcfg/tmtc/pusIds.h similarity index 100% rename from unittest/testcfg/tmtc/pusIds.h rename to unittest/user/testcfg/tmtc/pusIds.h diff --git a/unittest/testtemplate/TestTemplate.cpp b/unittest/user/testtemplate/TestTemplate.cpp similarity index 100% rename from unittest/testtemplate/TestTemplate.cpp rename to unittest/user/testtemplate/TestTemplate.cpp diff --git a/unittest/user/unittest/core/CMakeLists.txt b/unittest/user/unittest/core/CMakeLists.txt new file mode 100644 index 00000000..d78f45f1 --- /dev/null +++ b/unittest/user/unittest/core/CMakeLists.txt @@ -0,0 +1,7 @@ +target_sources(${TARGET_NAME} PRIVATE + CatchDefinitions.cpp + CatchFactory.cpp + CatchRunner.cpp + CatchSetup.cpp + printChar.cpp +) diff --git a/unittest/core/CatchDefinitions.cpp b/unittest/user/unittest/core/CatchDefinitions.cpp similarity index 100% rename from unittest/core/CatchDefinitions.cpp rename to unittest/user/unittest/core/CatchDefinitions.cpp diff --git a/unittest/core/CatchDefinitions.h b/unittest/user/unittest/core/CatchDefinitions.h similarity index 100% rename from unittest/core/CatchDefinitions.h rename to unittest/user/unittest/core/CatchDefinitions.h diff --git a/unittest/core/CatchFactory.cpp b/unittest/user/unittest/core/CatchFactory.cpp similarity index 100% rename from unittest/core/CatchFactory.cpp rename to unittest/user/unittest/core/CatchFactory.cpp diff --git a/unittest/core/CatchFactory.h b/unittest/user/unittest/core/CatchFactory.h similarity index 100% rename from unittest/core/CatchFactory.h rename to unittest/user/unittest/core/CatchFactory.h diff --git a/unittest/core/CatchRunner.cpp b/unittest/user/unittest/core/CatchRunner.cpp similarity index 100% rename from unittest/core/CatchRunner.cpp rename to unittest/user/unittest/core/CatchRunner.cpp diff --git a/unittest/core/CatchSetup.cpp b/unittest/user/unittest/core/CatchSetup.cpp similarity index 100% rename from unittest/core/CatchSetup.cpp rename to unittest/user/unittest/core/CatchSetup.cpp diff --git a/unittest/core/core.mk b/unittest/user/unittest/core/core.mk similarity index 100% rename from unittest/core/core.mk rename to unittest/user/unittest/core/core.mk diff --git a/unittest/core/printChar.cpp b/unittest/user/unittest/core/printChar.cpp similarity index 100% rename from unittest/core/printChar.cpp rename to unittest/user/unittest/core/printChar.cpp diff --git a/unittest/core/printChar.h b/unittest/user/unittest/core/printChar.h similarity index 100% rename from unittest/core/printChar.h rename to unittest/user/unittest/core/printChar.h diff --git a/unittest/unlockRealtime.sh b/unittest/user/unlockRealtime.sh similarity index 100% rename from unittest/unlockRealtime.sh rename to unittest/user/unlockRealtime.sh