From 79cf009049675f07e695fe4627b021b5912902e3 Mon Sep 17 00:00:00 2001
From: Robin Mueller <robin.mueller.m@gmail.com>
Date: Fri, 15 Jan 2021 17:06:05 +0100
Subject: [PATCH] updated internal unit tester

---
 unittest/internal/CMakeLists.txt                       | 3 ++-
 unittest/internal/InternalUnitTester.cpp               | 5 +----
 unittest/internal/InternalUnitTester.h                 | 7 ++++++-
 unittest/internal/globalfunctions/CMakeLists.txt       | 3 +++
 unittest/internal/globalfunctions/TestArrayPrinter.cpp | 2 +-
 unittest/internal/internal.mk                          | 1 +
 6 files changed, 14 insertions(+), 7 deletions(-)
 create mode 100644 unittest/internal/globalfunctions/CMakeLists.txt

diff --git a/unittest/internal/CMakeLists.txt b/unittest/internal/CMakeLists.txt
index 9c24317f..11fd2b2f 100644
--- a/unittest/internal/CMakeLists.txt
+++ b/unittest/internal/CMakeLists.txt
@@ -4,4 +4,5 @@ target_sources(${TARGET_NAME} PRIVATE
 )
 
 add_subdirectory(osal)
-add_subdirectory(serialize)
\ No newline at end of file
+add_subdirectory(serialize)
+add_subdirectory(globalfunctions)
\ No newline at end of file
diff --git a/unittest/internal/InternalUnitTester.cpp b/unittest/internal/InternalUnitTester.cpp
index 199a3cf0..f89d093a 100644
--- a/unittest/internal/InternalUnitTester.cpp
+++ b/unittest/internal/InternalUnitTester.cpp
@@ -9,14 +9,11 @@
 
 #include <cstdlib>
 
-struct TestConfig {
-    bool testArrayPrinter;
-};
 InternalUnitTester::InternalUnitTester() {}
 
 InternalUnitTester::~InternalUnitTester() {}
 
-ReturnValue_t InternalUnitTester::performTests(struct TestConfig testConfig) {
+ReturnValue_t InternalUnitTester::performTests(struct InternalUnitTester::TestConfig& testConfig) {
 #if FSFW_CPP_OSTREAM_ENABLED == 1
 	sif::info << "Running internal unit tests.." << std::endl;
 #else
diff --git a/unittest/internal/InternalUnitTester.h b/unittest/internal/InternalUnitTester.h
index e67777b9..ae954c6a 100644
--- a/unittest/internal/InternalUnitTester.h
+++ b/unittest/internal/InternalUnitTester.h
@@ -4,6 +4,7 @@
 #include "UnittDefinitions.h"
 #include "../../returnvalues/HasReturnvaluesIF.h"
 
+
 /**
  * @brief	Can be used for internal testing, for example for hardware specific
  * 			tests which can not be run on a host-machine.
@@ -15,6 +16,10 @@
  */
 class InternalUnitTester: public HasReturnvaluesIF {
 public:
+    struct TestConfig {
+        bool testArrayPrinter;
+    };
+
 	InternalUnitTester();
 	virtual~ InternalUnitTester();
 
@@ -22,7 +27,7 @@ public:
 	 * Some function which calls all other tests
 	 * @return
 	 */
-	virtual ReturnValue_t performTests(struct TestConfig testConfig);
+	virtual ReturnValue_t performTests(struct InternalUnitTester::TestConfig& testConfig);
 };
 
 
diff --git a/unittest/internal/globalfunctions/CMakeLists.txt b/unittest/internal/globalfunctions/CMakeLists.txt
new file mode 100644
index 00000000..4ea49bf7
--- /dev/null
+++ b/unittest/internal/globalfunctions/CMakeLists.txt
@@ -0,0 +1,3 @@
+target_sources(${TARGET_NAME} PRIVATE
+	TestArrayPrinter.cpp
+)
diff --git a/unittest/internal/globalfunctions/TestArrayPrinter.cpp b/unittest/internal/globalfunctions/TestArrayPrinter.cpp
index 078134e1..c26faa85 100644
--- a/unittest/internal/globalfunctions/TestArrayPrinter.cpp
+++ b/unittest/internal/globalfunctions/TestArrayPrinter.cpp
@@ -1,4 +1,4 @@
-#include "TestArrayPrinter.cpp"
+#include "TestArrayPrinter.h"
 
 void arrayprinter::testArrayPrinter() {
 }
diff --git a/unittest/internal/internal.mk b/unittest/internal/internal.mk
index 799fd796..1d4c9c99 100644
--- a/unittest/internal/internal.mk
+++ b/unittest/internal/internal.mk
@@ -1,3 +1,4 @@
 CXXSRC += $(wildcard $(CURRENTPATH)/osal/*.cpp)
 CXXSRC += $(wildcard $(CURRENTPATH)/serialize/*.cpp)
+CXXSRC += $(wildcard $(CURRENTPATH)/globalfunctions/*.cpp)
 CXXSRC += $(wildcard $(CURRENTPATH)/*.cpp)
\ No newline at end of file