eive/fsfw
eive
/
fsfw
forked from fsfw/fsfw
14
1
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

Merge branch 'mueller/test-update' into mueller/master

This commit is contained in:
Robin Müller 2020-12-27 15:16:08 +01:00
parent 978cbea341 254b1437e9
commit 1538a39d5b
4 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@ -1,10 +1,10 @@
#include "IntTestMutex.h" #include "IntTestMutex.h"
#include "../../../ipc/MutexFactory.h" #include <fsfw/ipc/MutexFactory.h>
#include "../UnittDefinitions.h" #include <fsfw/unittest/internal/UnittDefinitions.h>
#if defined(hosted) #if defined(hosted)
#include "../../osal/hosted/Mutex.h" #include <fsfw/osal/hosted/Mutex.h>
#include <thread> #include <thread>
#include <future> #include <future>
#endif #endif

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

@ -1,10 +1,11 @@
#include "IntTestSemaphore.h" #include "IntTestSemaphore.h"
#include "../UnittDefinitions.h" #include <fsfw/unittest/internal/UnittDefinitions.h>
#include "../../../tasks/SemaphoreFactory.h" #include <fsfw/tasks/SemaphoreFactory.h>
#include "../../../serviceinterface/ServiceInterfaceStream.h" #include <fsfw/serviceinterface/ServiceInterfaceStream.h>
#include "../../../timemanager/Stopwatch.h" #include <fsfw/timemanager/Stopwatch.h>
#include <cstdlib>
void testsemaph::testBinSemaph() { void testsemaph::testBinSemaph() {
std::string id = "[BinSemaphore]"; std::string id = "[BinSemaphore]";
@ -138,7 +139,7 @@ void testsemaph::testCountingSemaphImplementation(SemaphoreIF* countingSemaph,
// attempt to take when count is 0, measure time // attempt to take when count is 0, measure time
result = countingSemaph->acquire(SemaphoreIF::TimeoutType::WAITING, 10); result = countingSemaph->acquire(SemaphoreIF::TimeoutType::WAITING, 10);
dur_millis_t time = stopwatch.stop(); dur_millis_t time = stopwatch.stop();
if(abs(time - 10) > 1) { if(std::abs(static_cast<int32_t>(time - 10)) > 1) {
unitt::put_error(id); unitt::put_error(id);
} }
} }

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

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