From 73b9d058e5a9fb2b897b0a6e59cb2e51feb7dbb5 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Fri, 15 Jan 2021 16:56:36 +0100 Subject: [PATCH] updated internal unit test --- unittest/internal/InternalUnitTester.cpp | 15 ++++++++++++++- unittest/internal/InternalUnitTester.h | 2 +- .../internal/globalfunctions/TestArrayPrinter.cpp | 4 ++++ .../internal/globalfunctions/TestArrayPrinter.h | 12 ++++++++++++ .../tests/globalfunctions/TestArrayPrinter.cpp | 5 ----- 5 files changed, 31 insertions(+), 7 deletions(-) create mode 100644 unittest/internal/globalfunctions/TestArrayPrinter.cpp create mode 100644 unittest/internal/globalfunctions/TestArrayPrinter.h delete mode 100644 unittest/tests/globalfunctions/TestArrayPrinter.cpp diff --git a/unittest/internal/InternalUnitTester.cpp b/unittest/internal/InternalUnitTester.cpp index bd41969c..199a3cf0 100644 --- a/unittest/internal/InternalUnitTester.cpp +++ b/unittest/internal/InternalUnitTester.cpp @@ -5,24 +5,37 @@ #include "osal/IntTestSemaphore.h" #include "osal/IntTestMutex.h" #include "serialize/IntTestSerialization.h" +#include "globalfunctions/TestArrayPrinter.h" #include +struct TestConfig { + bool testArrayPrinter; +}; InternalUnitTester::InternalUnitTester() {} InternalUnitTester::~InternalUnitTester() {} -ReturnValue_t InternalUnitTester::performTests() { +ReturnValue_t InternalUnitTester::performTests(struct TestConfig testConfig) { #if FSFW_CPP_OSTREAM_ENABLED == 1 sif::info << "Running internal unit tests.." << std::endl; +#else + sif::printInfo("Running internal unit tests..\n"); #endif + testserialize::test_serialization(); testmq::testMq(); testsemaph::testBinSemaph(); testsemaph::testCountingSemaph(); testmutex::testMutex(); + if(testConfig.testArrayPrinter) { + arrayprinter::testArrayPrinter(); + } + #if FSFW_CPP_OSTREAM_ENABLED == 1 sif::info << "Internal unit tests finished." << std::endl; +#else + sif::printInfo("Running internal unit tests..\n"); #endif return RETURN_OK; } diff --git a/unittest/internal/InternalUnitTester.h b/unittest/internal/InternalUnitTester.h index d0b1c106..e67777b9 100644 --- a/unittest/internal/InternalUnitTester.h +++ b/unittest/internal/InternalUnitTester.h @@ -22,7 +22,7 @@ public: * Some function which calls all other tests * @return */ - virtual ReturnValue_t performTests(); + virtual ReturnValue_t performTests(struct TestConfig testConfig); }; diff --git a/unittest/internal/globalfunctions/TestArrayPrinter.cpp b/unittest/internal/globalfunctions/TestArrayPrinter.cpp new file mode 100644 index 00000000..078134e1 --- /dev/null +++ b/unittest/internal/globalfunctions/TestArrayPrinter.cpp @@ -0,0 +1,4 @@ +#include "TestArrayPrinter.cpp" + +void arrayprinter::testArrayPrinter() { +} diff --git a/unittest/internal/globalfunctions/TestArrayPrinter.h b/unittest/internal/globalfunctions/TestArrayPrinter.h new file mode 100644 index 00000000..b77f1897 --- /dev/null +++ b/unittest/internal/globalfunctions/TestArrayPrinter.h @@ -0,0 +1,12 @@ +#ifndef FSFW_UNITTEST_INTERNAL_GLOBALFUNCTIONS_TESTARRAYPRINTER_H_ +#define FSFW_UNITTEST_INTERNAL_GLOBALFUNCTIONS_TESTARRAYPRINTER_H_ + +namespace arrayprinter { + +void testArrayPrinter(); + +} + + + +#endif /* FSFW_UNITTEST_INTERNAL_GLOBALFUNCTIONS_TESTARRAYPRINTER_H_ */ diff --git a/unittest/tests/globalfunctions/TestArrayPrinter.cpp b/unittest/tests/globalfunctions/TestArrayPrinter.cpp deleted file mode 100644 index 59143619..00000000 --- a/unittest/tests/globalfunctions/TestArrayPrinter.cpp +++ /dev/null @@ -1,5 +0,0 @@ -#include - - - -