From 567cbd39efc2708a2cb0a1f46a1e16bcbba32644 Mon Sep 17 00:00:00 2001
From: "Robin.Mueller" <robin.mueller.m@gmail.com>
Date: Thu, 29 Oct 2020 17:22:41 +0100
Subject: [PATCH] include fixes

---
 unittest/internal/InternalUnitTester.cpp            | 13 +++++++------
 unittest/internal/InternalUnitTester.h              |  4 ++--
 unittest/internal/internal.mk                       |  3 +++
 unittest/internal/osal/IntTestMq.cpp                |  4 ++--
 unittest/internal/osal/IntTestMutex.cpp             |  3 ++-
 unittest/internal/osal/IntTestSemaphore.cpp         |  3 ++-
 .../internal/serialize/IntTestSerialization.cpp     |  2 +-
 7 files changed, 19 insertions(+), 13 deletions(-)
 create mode 100644 unittest/internal/internal.mk

diff --git a/unittest/internal/InternalUnitTester.cpp b/unittest/internal/InternalUnitTester.cpp
index 7b72d6458..503a71ec3 100644
--- a/unittest/internal/InternalUnitTester.cpp
+++ b/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>
 
diff --git a/unittest/internal/InternalUnitTester.h b/unittest/internal/InternalUnitTester.h
index b61c8bfe4..b301b9232 100644
--- a/unittest/internal/InternalUnitTester.h
+++ b/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();
 };
 
 
diff --git a/unittest/internal/internal.mk b/unittest/internal/internal.mk
new file mode 100644
index 000000000..799fd7960
--- /dev/null
+++ b/unittest/internal/internal.mk
@@ -0,0 +1,3 @@
+CXXSRC += $(wildcard $(CURRENTPATH)/osal/*.cpp)
+CXXSRC += $(wildcard $(CURRENTPATH)/serialize/*.cpp)
+CXXSRC += $(wildcard $(CURRENTPATH)/*.cpp)
\ No newline at end of file
diff --git a/unittest/internal/osal/IntTestMq.cpp b/unittest/internal/osal/IntTestMq.cpp
index 265aa62a9..630163743 100644
--- a/unittest/internal/osal/IntTestMq.cpp
+++ b/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>
 
diff --git a/unittest/internal/osal/IntTestMutex.cpp b/unittest/internal/osal/IntTestMutex.cpp
index bf0b827d9..3fd668dfd 100644
--- a/unittest/internal/osal/IntTestMutex.cpp
+++ b/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>
 
diff --git a/unittest/internal/osal/IntTestSemaphore.cpp b/unittest/internal/osal/IntTestSemaphore.cpp
index 176db4de6..534a6a6d5 100644
--- a/unittest/internal/osal/IntTestSemaphore.cpp
+++ b/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]";
diff --git a/unittest/internal/serialize/IntTestSerialization.cpp b/unittest/internal/serialize/IntTestSerialization.cpp
index 2452ac6db..3f231a417 100644
--- a/unittest/internal/serialize/IntTestSerialization.cpp
+++ b/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>