include fixes

unittest/internal/InternalUnitTester.cpp

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

unittest/internal/InternalUnitTester.h

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

unittest/internal/internal.mk

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

unittest/internal/osal/IntTestMq.cpp

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

unittest/internal/osal/IntTestMutex.cpp

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

unittest/internal/osal/IntTestSemaphore.cpp

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

unittest/internal/serialize/IntTestSerialization.cpp

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