From 2af1822b47fe8a72386d85517045296077a4297c Mon Sep 17 00:00:00 2001
From: Alberto Nidasio <alberto.nidasio@skywarder.eu>
Date: Sun, 10 Apr 2022 11:41:10 +0200
Subject: [PATCH] [CI/CD] Fixed pipeline

---
 doc/Doxyfile                                              | 2 +-
 old_examples/tests/catch/example-test-fsm.cpp             | 2 +-
 old_examples/tests/catch/test-xbee.cpp                    | 2 +-
 scripts/generators/templates/test.cpp.template            | 4 ++--
 src/shared/drivers/spi/SPI.h                              | 2 +-
 src/shared/drivers/spi/SPIBusInterface.h                  | 2 +-
 src/shared/drivers/stepper/Stepper.h                      | 4 ++--
 src/shared/radio/Xbee/Xbee.h                              | 2 +-
 .../utils/{TestUtilsTmp => TestUtils}/FakeSpiTypedef.h    | 2 +-
 .../utils/{TestUtilsTmp => TestUtils}/MockGpioPin.h       | 0
 src/shared/utils/{TestUtilsTmp => TestUtils}/MockSPIBus.h | 2 +-
 .../utils/{TestUtilsTmp => TestUtils}/TestHelper.cpp      | 0
 src/shared/utils/{TestUtilsTmp => TestUtils}/TestHelper.h | 0
 src/shared/utils/{TestUtilsTmp => TestUtils}/TestSensor.h | 0
 .../{TestUtilsTmp => TestUtils}/ThroughputCalculator.h    | 0
 .../algorithms/kalman/test-extended-kalman-eigen.cpp      | 8 ++++----
 src/tests/catch/test-eventbroker.cpp                      | 2 +-
 src/tests/catch/test-sensormanager-catch.cpp              | 2 +-
 src/tests/catch/xbee/MockXbeeSPIBus.h                     | 4 ++--
 src/tests/drivers/xbee/XbeeTransceiver.h                  | 2 +-
 src/tests/drivers/xbee/gui/StatusScreen.h                 | 2 +-
 src/tests/test-sensormanager.cpp                          | 2 +-
 22 files changed, 23 insertions(+), 23 deletions(-)
 rename src/shared/utils/{TestUtilsTmp => TestUtils}/FakeSpiTypedef.h (98%)
 rename src/shared/utils/{TestUtilsTmp => TestUtils}/MockGpioPin.h (100%)
 rename src/shared/utils/{TestUtilsTmp => TestUtils}/MockSPIBus.h (99%)
 rename src/shared/utils/{TestUtilsTmp => TestUtils}/TestHelper.cpp (100%)
 rename src/shared/utils/{TestUtilsTmp => TestUtils}/TestHelper.h (100%)
 rename src/shared/utils/{TestUtilsTmp => TestUtils}/TestSensor.h (100%)
 rename src/shared/utils/{TestUtilsTmp => TestUtils}/ThroughputCalculator.h (100%)

diff --git a/doc/Doxyfile b/doc/Doxyfile
index 22fa2cf16..607537c56 100644
--- a/doc/Doxyfile
+++ b/doc/Doxyfile
@@ -873,7 +873,7 @@ RECURSIVE              = YES
 # Note that relative paths are relative to the directory from which doxygen is
 # run.
 
-EXCLUDE                = ./src/shared/utils/testutils
+EXCLUDE                = ./src/shared/utils/TestUtils
 
 # The EXCLUDE_SYMLINKS tag can be used to select whether or not files or
 # directories that are symbolic links (a Unix file system feature) are excluded
diff --git a/old_examples/tests/catch/example-test-fsm.cpp b/old_examples/tests/catch/example-test-fsm.cpp
index 5c79a2244..e557f212e 100644
--- a/old_examples/tests/catch/example-test-fsm.cpp
+++ b/old_examples/tests/catch/example-test-fsm.cpp
@@ -34,7 +34,7 @@
 #define protected public
 
 #include <miosix.h>
-#include <utils/testutils/TestHelper.h>
+#include <utils/TestUtils/TestHelper.h>
 
 #include <catch2/catch.hpp>
 
diff --git a/old_examples/tests/catch/test-xbee.cpp b/old_examples/tests/catch/test-xbee.cpp
index 9973a4db0..3ec81dfba 100644
--- a/old_examples/tests/catch/test-xbee.cpp
+++ b/old_examples/tests/catch/test-xbee.cpp
@@ -30,7 +30,7 @@
 #define private public
 
 #include <radio/Xbee/Xbee.h>
-#include <utils/testutils/BusTemplateMock.h>
+#include <utils/TestUtils/BusTemplateMock.h>
 
 using std::vector;
 
diff --git a/scripts/generators/templates/test.cpp.template b/scripts/generators/templates/test.cpp.template
index 73a930884..2523e3866 100644
--- a/scripts/generators/templates/test.cpp.template
+++ b/scripts/generators/templates/test.cpp.template
@@ -30,11 +30,11 @@
 
 #include <miosix.h>
 
-#include <utils/testutils/catch.hpp>
+#include <utils/TestUtils/catch.hpp>
 
 #include "{state_machine_name}Controller/{state_machine_name}Controller.h"
 #include <events/Events.h>
-#include <utils/testutils/TestHelper.h>
+#include <utils/TestUtils/TestHelper.h>
 
 using miosix::Thread;
 using namespace DeathStackBoard;
diff --git a/src/shared/drivers/spi/SPI.h b/src/shared/drivers/spi/SPI.h
index 06cbfb7a1..8d2077fca 100644
--- a/src/shared/drivers/spi/SPI.h
+++ b/src/shared/drivers/spi/SPI.h
@@ -29,7 +29,7 @@
 #ifndef USE_MOCK_PERIPHERALS
 using SPIType = SPI_TypeDef;
 #else
-#include <utils/testutils/FakeSpiTypedef.h>
+#include <utils/TestUtils/FakeSpiTypedef.h>
 using SPIType = FakeSpiTypedef;
 #endif
 
diff --git a/src/shared/drivers/spi/SPIBusInterface.h b/src/shared/drivers/spi/SPIBusInterface.h
index e0eb8bd38..0c9ff5328 100644
--- a/src/shared/drivers/spi/SPIBusInterface.h
+++ b/src/shared/drivers/spi/SPIBusInterface.h
@@ -29,7 +29,7 @@
 #ifndef USE_MOCK_PERIPHERALS
 using GpioType = miosix::GpioPin;
 #else
-#include <utils/testutils/MockGpioPin.h>
+#include <utils/TestUtils/MockGpioPin.h>
 using GpioType = MockGpioPin;
 #endif
 
diff --git a/src/shared/drivers/stepper/Stepper.h b/src/shared/drivers/stepper/Stepper.h
index 57942567c..b08639af1 100644
--- a/src/shared/drivers/stepper/Stepper.h
+++ b/src/shared/drivers/stepper/Stepper.h
@@ -24,7 +24,7 @@
 
 #include <interfaces-impl/gpio_impl.h>
 #include <interfaces/delays.h>
-#include <utils/testutils/MockGpioPin.h>
+#include <utils/TestUtils/MockGpioPin.h>
 
 namespace Boardcore
 {
@@ -261,4 +261,4 @@ inline int Stepper::getMicrosteppingValue()
     return 1;
 }
 
-}  // namespace Boardcore
\ No newline at end of file
+}  // namespace Boardcore
diff --git a/src/shared/radio/Xbee/Xbee.h b/src/shared/radio/Xbee/Xbee.h
index ea748a68f..abb1be501 100644
--- a/src/shared/radio/Xbee/Xbee.h
+++ b/src/shared/radio/Xbee/Xbee.h
@@ -38,7 +38,7 @@ using miosix::FastMutex;
 #ifndef USE_MOCK_PERIPHERALS
 using GpioType = miosix::GpioPin;
 #else
-#include <utils/testutils/MockGpioPin.h>
+#include <utils/TestUtils/MockGpioPin.h>
 using GpioType = MockGpioPin;
 #endif
 
diff --git a/src/shared/utils/TestUtilsTmp/FakeSpiTypedef.h b/src/shared/utils/TestUtils/FakeSpiTypedef.h
similarity index 98%
rename from src/shared/utils/TestUtilsTmp/FakeSpiTypedef.h
rename to src/shared/utils/TestUtils/FakeSpiTypedef.h
index 46b770c44..dae48554a 100644
--- a/src/shared/utils/TestUtilsTmp/FakeSpiTypedef.h
+++ b/src/shared/utils/TestUtils/FakeSpiTypedef.h
@@ -22,7 +22,7 @@
 
 #pragma once
 #include <miosix.h>
-#include <utils/testutils/MockGpioPin.h>
+#include <utils/TestUtils/MockGpioPin.h>
 
 #include <cstdint>
 #include <vector>
diff --git a/src/shared/utils/TestUtilsTmp/MockGpioPin.h b/src/shared/utils/TestUtils/MockGpioPin.h
similarity index 100%
rename from src/shared/utils/TestUtilsTmp/MockGpioPin.h
rename to src/shared/utils/TestUtils/MockGpioPin.h
diff --git a/src/shared/utils/TestUtilsTmp/MockSPIBus.h b/src/shared/utils/TestUtils/MockSPIBus.h
similarity index 99%
rename from src/shared/utils/TestUtilsTmp/MockSPIBus.h
rename to src/shared/utils/TestUtils/MockSPIBus.h
index 9bdc6129e..93398ef8e 100644
--- a/src/shared/utils/TestUtilsTmp/MockSPIBus.h
+++ b/src/shared/utils/TestUtils/MockSPIBus.h
@@ -57,7 +57,7 @@ namespace Boardcore
     "SpiBusInterface must be built using MockGpioPin (-DUSE_MOCK_PERIPHERALS)"
 #endif
 
-#include <utils/testutils/MockGpioPin.h>
+#include <utils/TestUtils/MockGpioPin.h>
 
 using miosix::FastMutex;
 using miosix::Lock;
diff --git a/src/shared/utils/TestUtilsTmp/TestHelper.cpp b/src/shared/utils/TestUtils/TestHelper.cpp
similarity index 100%
rename from src/shared/utils/TestUtilsTmp/TestHelper.cpp
rename to src/shared/utils/TestUtils/TestHelper.cpp
diff --git a/src/shared/utils/TestUtilsTmp/TestHelper.h b/src/shared/utils/TestUtils/TestHelper.h
similarity index 100%
rename from src/shared/utils/TestUtilsTmp/TestHelper.h
rename to src/shared/utils/TestUtils/TestHelper.h
diff --git a/src/shared/utils/TestUtilsTmp/TestSensor.h b/src/shared/utils/TestUtils/TestSensor.h
similarity index 100%
rename from src/shared/utils/TestUtilsTmp/TestSensor.h
rename to src/shared/utils/TestUtils/TestSensor.h
diff --git a/src/shared/utils/TestUtilsTmp/ThroughputCalculator.h b/src/shared/utils/TestUtils/ThroughputCalculator.h
similarity index 100%
rename from src/shared/utils/TestUtilsTmp/ThroughputCalculator.h
rename to src/shared/utils/TestUtils/ThroughputCalculator.h
diff --git a/src/tests/algorithms/kalman/test-extended-kalman-eigen.cpp b/src/tests/algorithms/kalman/test-extended-kalman-eigen.cpp
index 4caf55b06..a814b7a51 100644
--- a/src/tests/algorithms/kalman/test-extended-kalman-eigen.cpp
+++ b/src/tests/algorithms/kalman/test-extended-kalman-eigen.cpp
@@ -176,9 +176,9 @@ void bmxCallback()
     magneticField.normalize();
     kalman->correctMEKF(magneticField);
 
-    auto kalmanState    = kalman->getState();
-    auto kalmanRotation = SkyQuaternion::quat2eul(Vector4f(
-        kalmanState(6), kalmanState(7), kalmanState(8), kalmanState(9)));
+    auto kalmanState = kalman->getState();
+    // auto kalmanRotation = SkyQuaternion::quat2eul(Vector4f(
+    //     kalmanState(6), kalmanState(7), kalmanState(8), kalmanState(9)));
 
     // data.accelerationTimestamp =
     // TimestampTimer::getInstance().getTimestamp();
@@ -206,4 +206,4 @@ void lisCallback()
     // kalman->correctMEKF(magneticField);
 
     // std::cout << magneticField.transpose() << std::endl;
-}
\ No newline at end of file
+}
diff --git a/src/tests/catch/test-eventbroker.cpp b/src/tests/catch/test-eventbroker.cpp
index 3139a50ed..04475591c 100644
--- a/src/tests/catch/test-eventbroker.cpp
+++ b/src/tests/catch/test-eventbroker.cpp
@@ -29,7 +29,7 @@
 
 #include <events/EventBroker.h>
 #include <miosix.h>
-#include <utils/testutils/TestHelper.h>
+#include <utils/TestUtils/TestHelper.h>
 
 #include <catch2/catch.hpp>
 #include <cstdio>
diff --git a/src/tests/catch/test-sensormanager-catch.cpp b/src/tests/catch/test-sensormanager-catch.cpp
index 6aa7aef70..1bead9c7c 100644
--- a/src/tests/catch/test-sensormanager-catch.cpp
+++ b/src/tests/catch/test-sensormanager-catch.cpp
@@ -24,7 +24,7 @@
 #include "catch-tests-entry.cpp"
 #endif
 
-#include <utils/testutils/TestSensor.h>
+#include <utils/TestUtils/TestSensor.h>
 
 #include <catch2/catch.hpp>
 #include <iostream>
diff --git a/src/tests/catch/xbee/MockXbeeSPIBus.h b/src/tests/catch/xbee/MockXbeeSPIBus.h
index d54b3167c..44c48d141 100644
--- a/src/tests/catch/xbee/MockXbeeSPIBus.h
+++ b/src/tests/catch/xbee/MockXbeeSPIBus.h
@@ -24,8 +24,8 @@
 
 #include <radio/Xbee/APIFrameParser.h>
 #include <radio/Xbee/APIFrames.h>
-#include <utils/testutils/MockGpioPin.h>
-#include <utils/testutils/MockSPIBus.h>
+#include <utils/TestUtils/MockGpioPin.h>
+#include <utils/TestUtils/MockSPIBus.h>
 
 #include <deque>
 #include <functional>
diff --git a/src/tests/drivers/xbee/XbeeTransceiver.h b/src/tests/drivers/xbee/XbeeTransceiver.h
index 049b9afe7..3e41850e5 100644
--- a/src/tests/drivers/xbee/XbeeTransceiver.h
+++ b/src/tests/drivers/xbee/XbeeTransceiver.h
@@ -28,7 +28,7 @@
 #include <radio/Xbee/APIFramesLog.h>
 #include <radio/Xbee/Xbee.h>
 #include <utils/Debug.h>
-#include <utils/testutils/ThroughputCalculator.h>
+#include <utils/TestUtils/ThroughputCalculator.h>
 
 #include <functional>
 
diff --git a/src/tests/drivers/xbee/gui/StatusScreen.h b/src/tests/drivers/xbee/gui/StatusScreen.h
index 19cc9e6e9..b397715e0 100644
--- a/src/tests/drivers/xbee/gui/StatusScreen.h
+++ b/src/tests/drivers/xbee/gui/StatusScreen.h
@@ -24,11 +24,11 @@
 
 #include <logger/Logger.h>
 #include <mxgui/display.h>
+#include <utils/TestUtils/ThroughputCalculator.h>
 #include <utils/gui/GridLayout.h>
 #include <utils/gui/OptionView.h>
 #include <utils/gui/TextView.h>
 #include <utils/gui/VerticalLayout.h>
-#include <utils/testutils/ThroughputCalculator.h>
 
 #include <cstdint>
 #include <cstring>
diff --git a/src/tests/test-sensormanager.cpp b/src/tests/test-sensormanager.cpp
index 72560d47c..1a8b06648 100644
--- a/src/tests/test-sensormanager.cpp
+++ b/src/tests/test-sensormanager.cpp
@@ -25,7 +25,7 @@
 #include <sensors/Sensor.h>
 #include <sensors/SensorManager.h>
 #include <utils/Debug.h>
-#include <utils/testutils/TestSensor.h>
+#include <utils/TestUtils/TestSensor.h>
 
 #include <functional>
 #include <iostream>
-- 
GitLab