KSat/fsfw
15
4
Fork 0
forked from fsfw/fsfw
Code Issues Pull Requests 1 Releases Wiki Activity

fixes for internal unittest

Browse Source
This commit is contained in:
Robin Müller 2020-10-29 17:21:51 +01:00
parent 3fc2068011
commit 777457482b
8 changed files with 25 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
events/EventManager.cpp
View File

@ -11,9 +11,12 @@
// So a good guess is 75 to a max of 100 pools required for each, which fits well. // So a good guess is 75 to a max of 100 pools required for each, which fits well.
// This should be configurable.. // This should be configurable..
const LocalPool::LocalPoolConfig EventManager::poolConfig = { const LocalPool::LocalPoolConfig EventManager::poolConfig = {
{240, sizeof(EventMatchTree::Node)}, {fsfwconfig::FSFW_EVENTMGMR_MATCHTREE_NODES,
{120, sizeof(EventIdRangeMatcher)}, sizeof(EventMatchTree::Node)},
{120, sizeof(ReporterRangeMatcher)} {fsfwconfig::FSFW_EVENTMGMT_EVENTIDMATCHERS,
sizeof(EventIdRangeMatcher)},
{fsfwconfig::FSFW_EVENTMGMR_RANGEMATCHERS,
sizeof(ReporterRangeMatcher)}
}; };
EventManager::EventManager(object_id_t setObjectId) : EventManager::EventManager(object_id_t setObjectId) :

13
unittest/internal/InternalUnitTester.cpp
View File

@ -1,9 +1,10 @@
#include <unittest/internal/InternalUnitTester.h> #include "InternalUnitTester.h"
#include <unittest/internal/IntTestMq.h> #include "UnittDefinitions.h"
#include <unittest/internal/IntTestSemaphore.h>
#include <unittest/internal/IntTestSerialization.h> #include "osal/IntTestMq.h"
#include <unittest/internal/UnittDefinitions.h> #include "osal/IntTestSemaphore.h"
#include <unittest/internal/IntTestMutex.h> #include "osal/IntTestMutex.h"
#include "serialize/IntTestSerialization.h"
#include <cstdlib> #include <cstdlib>

4
unittest/internal/InternalUnitTester.h
View File

@ -1,7 +1,7 @@
#ifndef FRAMEWORK_TEST_UNITTESTCLASS_H_ #ifndef FRAMEWORK_TEST_UNITTESTCLASS_H_
#define FRAMEWORK_TEST_UNITTESTCLASS_H_ #define FRAMEWORK_TEST_UNITTESTCLASS_H_
#include <unittest/internal/UnittDefinitions.h> #include "UnittDefinitions.h"
#include <fsfw/returnvalues/HasReturnvaluesIF.h> #include <fsfw/returnvalues/HasReturnvaluesIF.h>
/** /**
@ -22,7 +22,7 @@ public:
* Some function which calls all other tests * Some function which calls all other tests
* @return * @return
*/ */
ReturnValue_t performTests(); virtual ReturnValue_t performTests();
}; };

3
unittest/internal/internal.mk Normal file
View File

@ -0,0 +1,3 @@
CXXSRC += $(wildcard $(CURRENTPATH)/osal/*.cpp)
CXXSRC += $(wildcard $(CURRENTPATH)/serialize/*.cpp)
CXXSRC += $(wildcard $(CURRENTPATH)/*.cpp)

4
unittest/internal/osal/IntTestMq.cpp
View File

@ -1,7 +1,7 @@
#include <fsfw/ipc/MessageQueueIF.h> #include <fsfw/ipc/MessageQueueIF.h>
#include <fsfw/ipc/QueueFactory.h> #include <fsfw/ipc/QueueFactory.h>
#include <unittest/internal/IntTestMq.h> #include <fsfw/unittest/internal/osal/IntTestMq.h>
#include <unittest/internal/UnittDefinitions.h> #include <fsfw/unittest/internal/UnittDefinitions.h>
#include <array> #include <array>

3
unittest/internal/osal/IntTestMutex.cpp
View File

@ -1,4 +1,5 @@
#include <unittest/internal/IntTestMutex.h> #include "IntTestMutex.h"
#include <fsfw/ipc/MutexFactory.h> #include <fsfw/ipc/MutexFactory.h>
#include <unittest/internal/UnittDefinitions.h> #include <unittest/internal/UnittDefinitions.h>

3
unittest/internal/osal/IntTestSemaphore.cpp
View File

@ -1,8 +1,9 @@
#include "IntTestSemaphore.h"
#include <fsfw/tasks/SemaphoreFactory.h> #include <fsfw/tasks/SemaphoreFactory.h>
#include <unittest/internal/UnittDefinitions.h> #include <unittest/internal/UnittDefinitions.h>
#include <fsfw/serviceinterface/ServiceInterfaceStream.h> #include <fsfw/serviceinterface/ServiceInterfaceStream.h>
#include <fsfw/timemanager/Stopwatch.h> #include <fsfw/timemanager/Stopwatch.h>
#include <unittest/internal/IntTestSemaphore.h>
void testsemaph::testBinSemaph() { void testsemaph::testBinSemaph() {
std::string id = "[BinSemaphore]"; std::string id = "[BinSemaphore]";

2
unittest/internal/serialize/IntTestSerialization.cpp
View File

@ -1,4 +1,4 @@
#include <unittest/internal/IntTestSerialization.h> #include "IntTestSerialization.h"
#include <fsfw/serialize/SerializeElement.h> #include <fsfw/serialize/SerializeElement.h>
#include <fsfw/serialize/SerialBufferAdapter.h> #include <fsfw/serialize/SerialBufferAdapter.h>
#include <unittest/internal/UnittDefinitions.h> #include <unittest/internal/UnittDefinitions.h>