From a0689320d1e72cb41a1059a4c1254d3533cb7d8e Mon Sep 17 00:00:00 2001
From: "Robin.Mueller" <robin.mueller.m@gmail.com>
Date: Tue, 1 Dec 2020 16:55:24 +0100
Subject: [PATCH] more include fixes

---
 unittest/tests/container/RingBufferTest.cpp           | 4 ++--
 unittest/tests/container/TestArrayList.cpp            | 5 +++--
 unittest/tests/container/TestDynamicFifo.cpp          | 6 +++---
 unittest/tests/container/TestFifo.cpp                 | 6 +++---
 unittest/tests/container/TestFixedArrayList.cpp       | 4 ++--
 unittest/tests/container/TestFixedOrderedMultimap.cpp | 4 ++--
 unittest/tests/osal/TestMessageQueue.cpp              | 8 ++++----
 unittest/tests/serialize/TestSerialLinkedPacket.cpp   | 7 ++++---
 unittest/tests/serialize/TestSerialization.cpp        | 2 +-
 9 files changed, 24 insertions(+), 22 deletions(-)

diff --git a/unittest/tests/container/RingBufferTest.cpp b/unittest/tests/container/RingBufferTest.cpp
index 8b82d407..9c1c8a23 100644
--- a/unittest/tests/container/RingBufferTest.cpp
+++ b/unittest/tests/container/RingBufferTest.cpp
@@ -1,7 +1,7 @@
-#include <fsfw/container/SimpleRingBuffer.h>
-#include <catch2/catch.hpp>
 #include "../../core/CatchDefinitions.h"
+#include "../../container/SimpleRingBuffer.h"
 
+#include <catch2/catch.hpp>
 #include <cstring>
 
 TEST_CASE("Ring Buffer Test" , "[RingBufferTest]") {
diff --git a/unittest/tests/container/TestArrayList.cpp b/unittest/tests/container/TestArrayList.cpp
index 914188cb..2f884276 100644
--- a/unittest/tests/container/TestArrayList.cpp
+++ b/unittest/tests/container/TestArrayList.cpp
@@ -1,5 +1,6 @@
-#include <fsfw/container/ArrayList.h>
-#include <fsfw/returnvalues/HasReturnvaluesIF.h>
+#include "../../container/ArrayList.h"
+#include "../../returnvalues/HasReturnvaluesIF.h"
+
 #include <catch2/catch.hpp>
 #include "../../core/CatchDefinitions.h"
 
diff --git a/unittest/tests/container/TestDynamicFifo.cpp b/unittest/tests/container/TestDynamicFifo.cpp
index 6c9b7415..bb19131e 100644
--- a/unittest/tests/container/TestDynamicFifo.cpp
+++ b/unittest/tests/container/TestDynamicFifo.cpp
@@ -1,7 +1,7 @@
 
-#include <fsfw/container/DynamicFIFO.h>
-#include <fsfw/container/FIFO.h>
-#include <fsfw/returnvalues/HasReturnvaluesIF.h>
+#include "../../container/DynamicFIFO.h"
+#include "../../container/FIFO.h"
+#include "../../returnvalues/HasReturnvaluesIF.h"
 
 #include <catch.hpp>
 #include <CatchDefinitions.h>
diff --git a/unittest/tests/container/TestFifo.cpp b/unittest/tests/container/TestFifo.cpp
index 3775f424..bd727e00 100644
--- a/unittest/tests/container/TestFifo.cpp
+++ b/unittest/tests/container/TestFifo.cpp
@@ -1,7 +1,7 @@
 
-#include <fsfw/container/DynamicFIFO.h>
-#include <fsfw/container/FIFO.h>
-#include <fsfw/returnvalues/HasReturnvaluesIF.h>
+#include "../../container/DynamicFIFO.h"
+#include "../../container/FIFO.h"
+#include "../../returnvalues/HasReturnvaluesIF.h"
 
 #include <catch2/catch.hpp>
 #include "../../core/CatchDefinitions.h"
diff --git a/unittest/tests/container/TestFixedArrayList.cpp b/unittest/tests/container/TestFixedArrayList.cpp
index 737932e3..5a1bd280 100644
--- a/unittest/tests/container/TestFixedArrayList.cpp
+++ b/unittest/tests/container/TestFixedArrayList.cpp
@@ -1,7 +1,7 @@
 #include "../../core/CatchDefinitions.h"
 
-#include <fsfw/container/FixedArrayList.h>
-#include <fsfw/returnvalues/HasReturnvaluesIF.h>
+#include "../../container/FixedArrayList.h"
+#include "../../returnvalues/HasReturnvaluesIF.h"
 
 #include <catch2/catch.hpp>
 
diff --git a/unittest/tests/container/TestFixedOrderedMultimap.cpp b/unittest/tests/container/TestFixedOrderedMultimap.cpp
index 95194cb5..e625b559 100644
--- a/unittest/tests/container/TestFixedOrderedMultimap.cpp
+++ b/unittest/tests/container/TestFixedOrderedMultimap.cpp
@@ -1,5 +1,5 @@
-#include <fsfw/container/FixedOrderedMultimap.h>
-#include <fsfw/returnvalues/HasReturnvaluesIF.h>
+#include "../../container/FixedOrderedMultimap.h"
+#include "../../returnvalues/HasReturnvaluesIF.h"
 
 #include <catch2/catch.hpp>
 #include "../../core/CatchDefinitions.h"
diff --git a/unittest/tests/osal/TestMessageQueue.cpp b/unittest/tests/osal/TestMessageQueue.cpp
index 8e59fa08..441d32e7 100644
--- a/unittest/tests/osal/TestMessageQueue.cpp
+++ b/unittest/tests/osal/TestMessageQueue.cpp
@@ -1,8 +1,8 @@
-#include <fsfw/ipc/MessageQueueIF.h>
-#include <fsfw/ipc/QueueFactory.h>
-#include "catch.hpp"
+#include "../../ipc/MessageQueueIF.h"
+#include "../../ipc/QueueFactory.h"
+#include <catch.hpp>
 #include <array>
-#include "core/CatchDefinitions.h"
+#include "../../core/CatchDefinitions.h"
 
 TEST_CASE("MessageQueue Basic Test","[TestMq]") {
 	MessageQueueIF* testSenderMq =
diff --git a/unittest/tests/serialize/TestSerialLinkedPacket.cpp b/unittest/tests/serialize/TestSerialLinkedPacket.cpp
index 0a09e430..fbe48894 100644
--- a/unittest/tests/serialize/TestSerialLinkedPacket.cpp
+++ b/unittest/tests/serialize/TestSerialLinkedPacket.cpp
@@ -1,8 +1,9 @@
-#include <fsfw/globalfunctions/arrayprinter.h>
+#include "TestSerialLinkedPacket.h"
+#include "../../core/CatchDefinitions.h"
+
+#include "../../globalfunctions/arrayprinter.h"
 
 #include <catch2/catch.hpp>
-#include "../../core/CatchDefinitions.h"
-#include "TestSerialLinkedPacket.h"
 
 
 TEST_CASE("Serial Linked Packet" , "[SerLinkPacket]") {
diff --git a/unittest/tests/serialize/TestSerialization.cpp b/unittest/tests/serialize/TestSerialization.cpp
index 4c9ba181..6e31170a 100644
--- a/unittest/tests/serialize/TestSerialization.cpp
+++ b/unittest/tests/serialize/TestSerialization.cpp
@@ -1,4 +1,4 @@
-#include <fsfw/serialize/SerializeAdapter.h>
+#include "../../serialize/SerializeAdapter.h"
 
 #include "catch.hpp"
 #include <array>