From e2639a009bde71721535ca5d6c31c0b83d16cbad Mon Sep 17 00:00:00 2001
From: Fabian Reister <fabian.reister@kit.edu>
Date: Tue, 17 Dec 2024 09:50:24 +0100
Subject: [PATCH] clang-format-17: tests: moving <RobotAPI/Test.h> up
---
source/RobotAPI/components/ArViz/test/Client/ColorTest.cpp | 3 ++-
.../RobotAPI/components/ArViz/test/Client/PointCloudTest.cpp | 3 ++-
.../test/ArticulatedObjectLocalizerExampleTest.cpp | 4 ++--
.../DebugDrawerToArViz/test/DebugDrawerToArVizTest.cpp | 3 ++-
.../DummyTextToSpeech/test/DummyTextToSpeechTest.cpp | 3 ++-
.../test/DynamicObstacleManagerTest.cpp | 4 ++--
.../components/FrameTracking/test/FrameTrackingTest.cpp | 3 ++-
.../GamepadControlUnit/test/GamepadControlUnitTest.cpp | 3 ++-
.../RobotAPI/components/KITHandUnit/test/KITHandUnitTest.cpp | 3 ++-
.../test/KITProstheticHandObserverTest.cpp | 3 ++-
.../KITProstheticHandUnit/test/KITProstheticHandUnitTest.cpp | 3 ++-
.../components/MultiHandUnit/test/MultiHandUnitTest.cpp | 3 ++-
.../components/NaturalIKTest/test/NaturalIKTestTest.cpp | 3 ++-
.../components/RobotDefinition/test/RobotNameServiceTest.cpp | 3 ++-
.../RobotAPI/components/RobotHealth/test/RobotHealthTest.cpp | 3 ++-
.../components/RobotHealthDummy/test/RobotHealthDummyTest.cpp | 3 ++-
.../components/RobotNameService/test/RobotNameServiceTest.cpp | 3 ++-
source/RobotAPI/components/RobotState/test/RobotStateTest.cpp | 3 ++-
.../components/RobotToArViz/test/RobotToArVizTest.cpp | 3 ++-
.../armem/MemoryNameSystem/test/MemoryNameSystemTest.cpp | 4 ++--
.../armem/server/ExampleMemory/test/ExampleMemoryTest.cpp | 3 ++-
.../armem/server/MotionMemory/test/MotionMemoryTest.cpp | 3 ++-
.../armem/server/ObjectMemory/test/ObjectMemory.cpp | 3 ++-
.../armem/server/SubjectMemory/test/SubjectMemoryTest.cpp | 3 ++-
.../components/units/RobotUnit/test/BasicControllerTest.cpp | 4 ++--
.../units/RobotUnit/test/SingleBasicControllerTest.cpp | 4 ++--
source/RobotAPI/drivers/GamepadUnit/test/GamepadUnitTest.cpp | 3 ++-
.../drivers/HokuyoLaserUnit/test/HokuyoLaserUnitTest.cpp | 3 ++-
source/RobotAPI/drivers/OptoForce/test/OptoForceTest.cpp | 3 ++-
.../RobotAPI/drivers/OptoForceUnit/test/OptoForceUnitTest.cpp | 3 ++-
.../libraries/ArmarXObjects/test/ArmarXObjectsTest.cpp | 3 ++-
source/RobotAPI/libraries/ArmarXObjects/test/ObjectIDTest.cpp | 4 ++--
.../test/DebugDrawerConfigWidgetTest.cpp | 4 ++--
.../test/RobotAPIComponentPluginsTest.cpp | 4 ++--
.../RobotAPIVariantWidget/test/RobotAPIVariantWidgetTest.cpp | 4 ++--
.../test/RobotUnitDataStreamingReceiverTest.cpp | 4 ++--
.../libraries/SimpleTrajectory/test/TrajectoryTest.cpp | 4 ++--
.../libraries/armem/server/test/ArMemLTMBenchmark.cpp | 3 ++-
source/RobotAPI/libraries/armem/server/test/ArMemLTMTest.cpp | 1 +
.../RobotAPI/libraries/armem/server/test/ArMemMemoryTest.cpp | 3 ++-
.../RobotAPI/libraries/armem/server/test/ArMemQueryTest.cpp | 3 ++-
.../libraries/armem/test/ArMemEntityInstanceDataTest.cpp | 3 ++-
source/RobotAPI/libraries/armem/test/ArMemForEachTest.cpp | 3 ++-
source/RobotAPI/libraries/armem/test/ArMemGetFindTest.cpp | 3 ++-
.../RobotAPI/libraries/armem/test/ArMemIceConversionsTest.cpp | 3 ++-
source/RobotAPI/libraries/armem/test/ArMemMemoryIDTest.cpp | 3 ++-
source/RobotAPI/libraries/armem/test/ArMemPrefixesTest.cpp | 3 ++-
.../RobotAPI/libraries/armem/test/ArMemQueryBuilderTest.cpp | 3 ++-
.../libraries/armem_objects/test/ArMemObjectsTest.cpp | 4 ++--
.../RobotAPI/libraries/aron/common/test/aron_common_test.cpp | 3 ++-
.../libraries/core/remoterobot/test/ArmarPoseTest.cpp | 3 ++-
.../libraries/core/test/CartesianVelocityControllerTest.cpp | 4 ++--
.../core/test/CartesianVelocityControllerWithRampTest.cpp | 4 ++--
.../libraries/core/test/CartesianVelocityRampTest.cpp | 3 ++-
source/RobotAPI/libraries/core/test/DebugDrawerTopicTest.cpp | 3 ++-
source/RobotAPI/libraries/core/test/MathUtilsTest.cpp | 4 ++--
source/RobotAPI/libraries/core/test/PIDControllerTest.cpp | 4 ++--
source/RobotAPI/libraries/core/test/RobotTest.cpp | 4 ++--
source/RobotAPI/libraries/core/test/TrajectoryTest.cpp | 3 ++-
source/RobotAPI/libraries/diffik/test/diffikTest.cpp | 4 ++--
source/RobotAPI/libraries/natik/test/natikTest.cpp | 4 ++--
61 files changed, 121 insertions(+), 79 deletions(-)
diff --git a/source/RobotAPI/components/ArViz/test/Client/ColorTest.cpp b/source/RobotAPI/components/ArViz/test/Client/ColorTest.cpp
index 831a9a8f5..2776da1b6 100644
--- a/source/RobotAPI/components/ArViz/test/Client/ColorTest.cpp
+++ b/source/RobotAPI/components/ArViz/test/Client/ColorTest.cpp
@@ -24,9 +24,10 @@
#define ARMARX_BOOST_TEST
+#include <RobotAPI/Test.h>
+
#include <iostream>
-#include <RobotAPI/Test.h>
#include <RobotAPI/components/ArViz/Client/elements/Color.h>
namespace
diff --git a/source/RobotAPI/components/ArViz/test/Client/PointCloudTest.cpp b/source/RobotAPI/components/ArViz/test/Client/PointCloudTest.cpp
index 9a4c0c5e9..ffa9714c8 100644
--- a/source/RobotAPI/components/ArViz/test/Client/PointCloudTest.cpp
+++ b/source/RobotAPI/components/ArViz/test/Client/PointCloudTest.cpp
@@ -24,11 +24,12 @@
#define ARMARX_BOOST_TEST
+#include <RobotAPI/Test.h>
+
#include <iostream>
#include <SimoxUtility/color/cmaps.h>
-#include <RobotAPI/Test.h>
#include <RobotAPI/components/ArViz/Client/elements/PointCloud.h>
#include <RobotAPI/components/ArViz/Client/elements/point_cloud_type_traits.hpp>
diff --git a/source/RobotAPI/components/ArticulatedObjectLocalizerExample/test/ArticulatedObjectLocalizerExampleTest.cpp b/source/RobotAPI/components/ArticulatedObjectLocalizerExample/test/ArticulatedObjectLocalizerExampleTest.cpp
index 3fc13780f..2d4b8abf9 100644
--- a/source/RobotAPI/components/ArticulatedObjectLocalizerExample/test/ArticulatedObjectLocalizerExampleTest.cpp
+++ b/source/RobotAPI/components/ArticulatedObjectLocalizerExample/test/ArticulatedObjectLocalizerExampleTest.cpp
@@ -26,10 +26,10 @@
#include "../ArticulatedObjectLocalizerExample.h"
-#include <iostream>
-
#include <RobotAPI/Test.h>
+#include <iostream>
+
BOOST_AUTO_TEST_CASE(testExample)
{
armarx::articulated_object::ArticulatedObjectLocalizerExample instance;
diff --git a/source/RobotAPI/components/DebugDrawerToArViz/test/DebugDrawerToArVizTest.cpp b/source/RobotAPI/components/DebugDrawerToArViz/test/DebugDrawerToArVizTest.cpp
index 6c3bdc742..b74d8c4e5 100644
--- a/source/RobotAPI/components/DebugDrawerToArViz/test/DebugDrawerToArVizTest.cpp
+++ b/source/RobotAPI/components/DebugDrawerToArViz/test/DebugDrawerToArVizTest.cpp
@@ -24,9 +24,10 @@
#define ARMARX_BOOST_TEST
+#include <RobotAPI/Test.h>
+
#include <iostream>
-#include <RobotAPI/Test.h>
#include <RobotAPI/components/DebugDrawerToArViz/DebugDrawerToArVizComponent.h>
BOOST_AUTO_TEST_CASE(testExample)
diff --git a/source/RobotAPI/components/DummyTextToSpeech/test/DummyTextToSpeechTest.cpp b/source/RobotAPI/components/DummyTextToSpeech/test/DummyTextToSpeechTest.cpp
index 8ac6aa85c..fd8b38255 100644
--- a/source/RobotAPI/components/DummyTextToSpeech/test/DummyTextToSpeechTest.cpp
+++ b/source/RobotAPI/components/DummyTextToSpeech/test/DummyTextToSpeechTest.cpp
@@ -24,9 +24,10 @@
#define ARMARX_BOOST_TEST
+#include <RobotAPI/Test.h>
+
#include <iostream>
-#include <RobotAPI/Test.h>
#include <RobotAPI/components/DummyTextToSpeech/DummyTextToSpeech.h>
BOOST_AUTO_TEST_CASE(testExample)
diff --git a/source/RobotAPI/components/DynamicObstacleManager/test/DynamicObstacleManagerTest.cpp b/source/RobotAPI/components/DynamicObstacleManager/test/DynamicObstacleManagerTest.cpp
index 242565ed2..771cc2117 100644
--- a/source/RobotAPI/components/DynamicObstacleManager/test/DynamicObstacleManagerTest.cpp
+++ b/source/RobotAPI/components/DynamicObstacleManager/test/DynamicObstacleManagerTest.cpp
@@ -24,10 +24,10 @@
#define ARMARX_BOOST_TEST
-#include <iostream>
-
#include <RobotAPI/Test.h>
+#include <iostream>
+
#include <armar6_skills/components/DynamicObstacleManager/DynamicObstacleManager.h>
BOOST_AUTO_TEST_CASE(testExample)
diff --git a/source/RobotAPI/components/FrameTracking/test/FrameTrackingTest.cpp b/source/RobotAPI/components/FrameTracking/test/FrameTrackingTest.cpp
index 997c2a709..67f432a40 100644
--- a/source/RobotAPI/components/FrameTracking/test/FrameTrackingTest.cpp
+++ b/source/RobotAPI/components/FrameTracking/test/FrameTrackingTest.cpp
@@ -24,9 +24,10 @@
#define ARMARX_BOOST_TEST
+#include <RobotAPI/Test.h>
+
#include <iostream>
-#include <RobotAPI/Test.h>
#include <RobotAPI/components/FrameTracking/FrameTracking.h>
BOOST_AUTO_TEST_CASE(testExample)
diff --git a/source/RobotAPI/components/GamepadControlUnit/test/GamepadControlUnitTest.cpp b/source/RobotAPI/components/GamepadControlUnit/test/GamepadControlUnitTest.cpp
index 130173d94..0b134232d 100644
--- a/source/RobotAPI/components/GamepadControlUnit/test/GamepadControlUnitTest.cpp
+++ b/source/RobotAPI/components/GamepadControlUnit/test/GamepadControlUnitTest.cpp
@@ -24,9 +24,10 @@
#define ARMARX_BOOST_TEST
+#include <RobotAPI/Test.h>
+
#include <iostream>
-#include <RobotAPI/Test.h>
#include <RobotAPI/components/GamepadControlUnit/GamepadControlUnit.h>
BOOST_AUTO_TEST_CASE(testExample)
diff --git a/source/RobotAPI/components/KITHandUnit/test/KITHandUnitTest.cpp b/source/RobotAPI/components/KITHandUnit/test/KITHandUnitTest.cpp
index 6a1f907fa..e22425284 100644
--- a/source/RobotAPI/components/KITHandUnit/test/KITHandUnitTest.cpp
+++ b/source/RobotAPI/components/KITHandUnit/test/KITHandUnitTest.cpp
@@ -24,9 +24,10 @@
#define ARMARX_BOOST_TEST
+#include <RobotAPI/Test.h>
+
#include <iostream>
-#include <RobotAPI/Test.h>
#include <RobotAPI/components/KITHandUnit/KITHandUnit.h>
BOOST_AUTO_TEST_CASE(testExample)
diff --git a/source/RobotAPI/components/KITProstheticHandObserver/test/KITProstheticHandObserverTest.cpp b/source/RobotAPI/components/KITProstheticHandObserver/test/KITProstheticHandObserverTest.cpp
index a521d5028..b3c5ea231 100644
--- a/source/RobotAPI/components/KITProstheticHandObserver/test/KITProstheticHandObserverTest.cpp
+++ b/source/RobotAPI/components/KITProstheticHandObserver/test/KITProstheticHandObserverTest.cpp
@@ -24,9 +24,10 @@
#define ARMARX_BOOST_TEST
+#include <RobotAPI/Test.h>
+
#include <iostream>
-#include <RobotAPI/Test.h>
#include <RobotAPI/components/KITProstheticHandObserver/KITProstheticHandObserver.h>
BOOST_AUTO_TEST_CASE(testExample)
diff --git a/source/RobotAPI/components/KITProstheticHandUnit/test/KITProstheticHandUnitTest.cpp b/source/RobotAPI/components/KITProstheticHandUnit/test/KITProstheticHandUnitTest.cpp
index cf59c5d5f..04b3e82f4 100644
--- a/source/RobotAPI/components/KITProstheticHandUnit/test/KITProstheticHandUnitTest.cpp
+++ b/source/RobotAPI/components/KITProstheticHandUnit/test/KITProstheticHandUnitTest.cpp
@@ -24,9 +24,10 @@
#define ARMARX_BOOST_TEST
+#include <RobotAPI/Test.h>
+
#include <iostream>
-#include <RobotAPI/Test.h>
#include <RobotAPI/components/KITProstheticHandUnit/KITProstheticHandUnit.h>
BOOST_AUTO_TEST_CASE(testExample)
diff --git a/source/RobotAPI/components/MultiHandUnit/test/MultiHandUnitTest.cpp b/source/RobotAPI/components/MultiHandUnit/test/MultiHandUnitTest.cpp
index 8e51871ab..c8b91e5c5 100644
--- a/source/RobotAPI/components/MultiHandUnit/test/MultiHandUnitTest.cpp
+++ b/source/RobotAPI/components/MultiHandUnit/test/MultiHandUnitTest.cpp
@@ -24,9 +24,10 @@
#define ARMARX_BOOST_TEST
+#include <RobotAPI/Test.h>
+
#include <iostream>
-#include <RobotAPI/Test.h>
#include <RobotAPI/components/MultiHandUnit/MultiHandUnit.h>
BOOST_AUTO_TEST_CASE(testExample)
diff --git a/source/RobotAPI/components/NaturalIKTest/test/NaturalIKTestTest.cpp b/source/RobotAPI/components/NaturalIKTest/test/NaturalIKTestTest.cpp
index 0cf769b76..94a1da70e 100644
--- a/source/RobotAPI/components/NaturalIKTest/test/NaturalIKTestTest.cpp
+++ b/source/RobotAPI/components/NaturalIKTest/test/NaturalIKTestTest.cpp
@@ -24,9 +24,10 @@
#define ARMARX_BOOST_TEST
+#include <RobotAPI/Test.h>
+
#include <iostream>
-#include <RobotAPI/Test.h>
#include <RobotAPI/components/NaturalIKTest/NaturalIKTest.h>
BOOST_AUTO_TEST_CASE(testExample)
diff --git a/source/RobotAPI/components/RobotDefinition/test/RobotNameServiceTest.cpp b/source/RobotAPI/components/RobotDefinition/test/RobotNameServiceTest.cpp
index b634619b3..6e3e4af63 100644
--- a/source/RobotAPI/components/RobotDefinition/test/RobotNameServiceTest.cpp
+++ b/source/RobotAPI/components/RobotDefinition/test/RobotNameServiceTest.cpp
@@ -24,9 +24,10 @@
#define ARMARX_BOOST_TEST
+#include <RobotAPI/Test.h>
+
#include <iostream>
-#include <RobotAPI/Test.h>
#include <RobotAPI/components/RobotNameService/RobotNameService.h>
BOOST_AUTO_TEST_CASE(testExample)
diff --git a/source/RobotAPI/components/RobotHealth/test/RobotHealthTest.cpp b/source/RobotAPI/components/RobotHealth/test/RobotHealthTest.cpp
index 0e439092d..7b154c2a9 100644
--- a/source/RobotAPI/components/RobotHealth/test/RobotHealthTest.cpp
+++ b/source/RobotAPI/components/RobotHealth/test/RobotHealthTest.cpp
@@ -24,9 +24,10 @@
#define ARMARX_BOOST_TEST
+#include <RobotAPI/Test.h>
+
#include <iostream>
-#include <RobotAPI/Test.h>
#include <RobotAPI/components/RobotHealth/RobotHealth.h>
BOOST_AUTO_TEST_CASE(testExample)
diff --git a/source/RobotAPI/components/RobotHealthDummy/test/RobotHealthDummyTest.cpp b/source/RobotAPI/components/RobotHealthDummy/test/RobotHealthDummyTest.cpp
index 855578762..89eec0a0f 100644
--- a/source/RobotAPI/components/RobotHealthDummy/test/RobotHealthDummyTest.cpp
+++ b/source/RobotAPI/components/RobotHealthDummy/test/RobotHealthDummyTest.cpp
@@ -24,9 +24,10 @@
#define ARMARX_BOOST_TEST
+#include <RobotAPI/Test.h>
+
#include <iostream>
-#include <RobotAPI/Test.h>
#include <RobotAPI/components/RobotHealthDummy/RobotHealthDummy.h>
BOOST_AUTO_TEST_CASE(testExample)
diff --git a/source/RobotAPI/components/RobotNameService/test/RobotNameServiceTest.cpp b/source/RobotAPI/components/RobotNameService/test/RobotNameServiceTest.cpp
index b634619b3..6e3e4af63 100644
--- a/source/RobotAPI/components/RobotNameService/test/RobotNameServiceTest.cpp
+++ b/source/RobotAPI/components/RobotNameService/test/RobotNameServiceTest.cpp
@@ -24,9 +24,10 @@
#define ARMARX_BOOST_TEST
+#include <RobotAPI/Test.h>
+
#include <iostream>
-#include <RobotAPI/Test.h>
#include <RobotAPI/components/RobotNameService/RobotNameService.h>
BOOST_AUTO_TEST_CASE(testExample)
diff --git a/source/RobotAPI/components/RobotState/test/RobotStateTest.cpp b/source/RobotAPI/components/RobotState/test/RobotStateTest.cpp
index 36056c0d1..b360e4688 100644
--- a/source/RobotAPI/components/RobotState/test/RobotStateTest.cpp
+++ b/source/RobotAPI/components/RobotState/test/RobotStateTest.cpp
@@ -22,10 +22,11 @@
#define BOOST_TEST_MODULE RobotAPI::FramedPose::Test
#define ARMARX_BOOST_TEST
+#include <RobotAPI/Test.h>
+
#include <ArmarXCore/core/test/IceTestHelper.h>
#include <ArmarXCore/util/json/JSONObject.h>
-#include <RobotAPI/Test.h>
#include <RobotAPI/components/RobotState/RobotStateComponent.h>
#include <RobotAPI/libraries/core/FramedPose.h>
diff --git a/source/RobotAPI/components/RobotToArViz/test/RobotToArVizTest.cpp b/source/RobotAPI/components/RobotToArViz/test/RobotToArVizTest.cpp
index a714a93f9..eb985b211 100644
--- a/source/RobotAPI/components/RobotToArViz/test/RobotToArVizTest.cpp
+++ b/source/RobotAPI/components/RobotToArViz/test/RobotToArVizTest.cpp
@@ -24,9 +24,10 @@
#define ARMARX_BOOST_TEST
+#include <RobotAPI/Test.h>
+
#include <iostream>
-#include <RobotAPI/Test.h>
#include <RobotAPI/components/RobotToArViz/RobotToArViz.h>
BOOST_AUTO_TEST_CASE(testExample)
diff --git a/source/RobotAPI/components/armem/MemoryNameSystem/test/MemoryNameSystemTest.cpp b/source/RobotAPI/components/armem/MemoryNameSystem/test/MemoryNameSystemTest.cpp
index f161ee1fc..20be15059 100644
--- a/source/RobotAPI/components/armem/MemoryNameSystem/test/MemoryNameSystemTest.cpp
+++ b/source/RobotAPI/components/armem/MemoryNameSystem/test/MemoryNameSystemTest.cpp
@@ -26,10 +26,10 @@
#include "../MemoryNameSystem.h"
-#include <iostream>
-
#include <RobotAPI/Test.h>
+#include <iostream>
+
BOOST_AUTO_TEST_CASE(testExample)
{
armarx::MemoryNameSystem instance;
diff --git a/source/RobotAPI/components/armem/server/ExampleMemory/test/ExampleMemoryTest.cpp b/source/RobotAPI/components/armem/server/ExampleMemory/test/ExampleMemoryTest.cpp
index 6bb3d2221..81988955c 100644
--- a/source/RobotAPI/components/armem/server/ExampleMemory/test/ExampleMemoryTest.cpp
+++ b/source/RobotAPI/components/armem/server/ExampleMemory/test/ExampleMemoryTest.cpp
@@ -26,9 +26,10 @@
#include "../ExampleMemory.h"
+#include <RobotAPI/Test.h>
+
#include <iostream>
-#include <RobotAPI/Test.h>
#include <RobotAPI/components/armem/server/ExampleMemory/aron/ExampleData.aron.generated.h>
#include <RobotAPI/libraries/armem/core.h>
diff --git a/source/RobotAPI/components/armem/server/MotionMemory/test/MotionMemoryTest.cpp b/source/RobotAPI/components/armem/server/MotionMemory/test/MotionMemoryTest.cpp
index 1550602df..d9e1c5b73 100644
--- a/source/RobotAPI/components/armem/server/MotionMemory/test/MotionMemoryTest.cpp
+++ b/source/RobotAPI/components/armem/server/MotionMemory/test/MotionMemoryTest.cpp
@@ -26,9 +26,10 @@
#include "../MotionMemory.h"
+#include <RobotAPI/Test.h>
+
#include <iostream>
-#include <RobotAPI/Test.h>
#include <RobotAPI/libraries/armem/core.h>
namespace armem = armarx::armem;
diff --git a/source/RobotAPI/components/armem/server/ObjectMemory/test/ObjectMemory.cpp b/source/RobotAPI/components/armem/server/ObjectMemory/test/ObjectMemory.cpp
index 162ac42d1..93e89faa6 100644
--- a/source/RobotAPI/components/armem/server/ObjectMemory/test/ObjectMemory.cpp
+++ b/source/RobotAPI/components/armem/server/ObjectMemory/test/ObjectMemory.cpp
@@ -24,9 +24,10 @@
#define ARMARX_BOOST_TEST
+#include <RobotAPI/Test.h>
+
#include <iostream>
-#include <RobotAPI/Test.h>
#include <RobotAPI/components/ObjectMemory/ObjectMemory.h>
#include <RobotAPI/libraries/ArmarXObjects/ice_conversions.h>
#include <RobotAPI/libraries/core/Pose.h>
diff --git a/source/RobotAPI/components/armem/server/SubjectMemory/test/SubjectMemoryTest.cpp b/source/RobotAPI/components/armem/server/SubjectMemory/test/SubjectMemoryTest.cpp
index 89392106e..b44292dbb 100644
--- a/source/RobotAPI/components/armem/server/SubjectMemory/test/SubjectMemoryTest.cpp
+++ b/source/RobotAPI/components/armem/server/SubjectMemory/test/SubjectMemoryTest.cpp
@@ -24,9 +24,10 @@
#define ARMARX_BOOST_TEST
+#include <RobotAPI/Test.h>
+
#include <iostream>
-#include <RobotAPI/Test.h>
#include <RobotAPI/libraries/armem/core.h>
#include "../MotionMemory.h"
diff --git a/source/RobotAPI/components/units/RobotUnit/test/BasicControllerTest.cpp b/source/RobotAPI/components/units/RobotUnit/test/BasicControllerTest.cpp
index f02cd9172..82e09c9e8 100644
--- a/source/RobotAPI/components/units/RobotUnit/test/BasicControllerTest.cpp
+++ b/source/RobotAPI/components/units/RobotUnit/test/BasicControllerTest.cpp
@@ -23,6 +23,8 @@
#define BOOST_TEST_MODULE RobotAPI::BasicControllers::Test
#define ARMARX_BOOST_TEST
#define CREATE_LOGFILES
+#include <RobotAPI/Test.h>
+
#include <filesystem>
#include <iostream>
#include <random>
@@ -32,8 +34,6 @@
#include <ArmarXCore/core/logging/Logging.h>
#include <ArmarXCore/core/util/algorithm.h>
-#include <RobotAPI/Test.h>
-
#include "../BasicControllers.h"
#include "../util/CtrlUtil.h"
using namespace armarx;
diff --git a/source/RobotAPI/components/units/RobotUnit/test/SingleBasicControllerTest.cpp b/source/RobotAPI/components/units/RobotUnit/test/SingleBasicControllerTest.cpp
index c34b618af..2863db263 100644
--- a/source/RobotAPI/components/units/RobotUnit/test/SingleBasicControllerTest.cpp
+++ b/source/RobotAPI/components/units/RobotUnit/test/SingleBasicControllerTest.cpp
@@ -23,6 +23,8 @@
#define BOOST_TEST_MODULE RobotAPI::BasicControllers::Test
#define ARMARX_BOOST_TEST
#define CREATE_LOGFILES
+#include <RobotAPI/Test.h>
+
#include <iostream>
#include <random>
@@ -31,8 +33,6 @@
#include <ArmarXCore/core/logging/Logging.h>
#include <ArmarXCore/core/util/algorithm.h>
-#include <RobotAPI/Test.h>
-
#include "../BasicControllers.h"
using namespace armarx;
//params for random tests
diff --git a/source/RobotAPI/drivers/GamepadUnit/test/GamepadUnitTest.cpp b/source/RobotAPI/drivers/GamepadUnit/test/GamepadUnitTest.cpp
index 63c421cfd..4af36becd 100644
--- a/source/RobotAPI/drivers/GamepadUnit/test/GamepadUnitTest.cpp
+++ b/source/RobotAPI/drivers/GamepadUnit/test/GamepadUnitTest.cpp
@@ -24,9 +24,10 @@
#define ARMARX_BOOST_TEST
+#include <RobotAPI/Test.h>
+
#include <iostream>
-#include <RobotAPI/Test.h>
#include <RobotAPI/drivers/GamepadUnit/GamepadUnit.h>
BOOST_AUTO_TEST_CASE(testExample)
diff --git a/source/RobotAPI/drivers/HokuyoLaserUnit/test/HokuyoLaserUnitTest.cpp b/source/RobotAPI/drivers/HokuyoLaserUnit/test/HokuyoLaserUnitTest.cpp
index f3f1dd95e..46d49defb 100644
--- a/source/RobotAPI/drivers/HokuyoLaserUnit/test/HokuyoLaserUnitTest.cpp
+++ b/source/RobotAPI/drivers/HokuyoLaserUnit/test/HokuyoLaserUnitTest.cpp
@@ -24,9 +24,10 @@
#define ARMARX_BOOST_TEST
+#include <RobotAPI/Test.h>
+
#include <iostream>
-#include <RobotAPI/Test.h>
#include <RobotAPI/drivers/HokuyoLaserUnit/HokuyoLaserUnit.h>
BOOST_AUTO_TEST_CASE(testExample)
diff --git a/source/RobotAPI/drivers/OptoForce/test/OptoForceTest.cpp b/source/RobotAPI/drivers/OptoForce/test/OptoForceTest.cpp
index 753e7260f..aee4bfc14 100644
--- a/source/RobotAPI/drivers/OptoForce/test/OptoForceTest.cpp
+++ b/source/RobotAPI/drivers/OptoForce/test/OptoForceTest.cpp
@@ -24,9 +24,10 @@
#define ARMARX_BOOST_TEST
+#include <RobotAPI/Test.h>
+
#include <iostream>
-#include <RobotAPI/Test.h>
#include <RobotAPI/components/OptoForceOMD/OptoForceOMD.h>
BOOST_AUTO_TEST_CASE(testExample)
diff --git a/source/RobotAPI/drivers/OptoForceUnit/test/OptoForceUnitTest.cpp b/source/RobotAPI/drivers/OptoForceUnit/test/OptoForceUnitTest.cpp
index 8f01cfaf7..e82d92a06 100644
--- a/source/RobotAPI/drivers/OptoForceUnit/test/OptoForceUnitTest.cpp
+++ b/source/RobotAPI/drivers/OptoForceUnit/test/OptoForceUnitTest.cpp
@@ -24,9 +24,10 @@
#define ARMARX_BOOST_TEST
+#include <RobotAPI/Test.h>
+
#include <iostream>
-#include <RobotAPI/Test.h>
#include <RobotAPI/drivers/OptoForceUnit/OptoForceUnit.h>
BOOST_AUTO_TEST_CASE(testExample)
diff --git a/source/RobotAPI/libraries/ArmarXObjects/test/ArmarXObjectsTest.cpp b/source/RobotAPI/libraries/ArmarXObjects/test/ArmarXObjectsTest.cpp
index 4a775da39..43f32e28a 100644
--- a/source/RobotAPI/libraries/ArmarXObjects/test/ArmarXObjectsTest.cpp
+++ b/source/RobotAPI/libraries/ArmarXObjects/test/ArmarXObjectsTest.cpp
@@ -26,11 +26,12 @@
#include "../ArmarXObjects.h"
+#include <RobotAPI/Test.h>
+
#include <iostream>
#include <ArmarXCore/core/system/cmake/CMakePackageFinder.h>
-#include <RobotAPI/Test.h>
#include <RobotAPI/libraries/ArmarXObjects/ObjectFinder.h>
#include <RobotAPI/libraries/ArmarXObjects/aron/ObjectPose.aron.generated.h>
diff --git a/source/RobotAPI/libraries/ArmarXObjects/test/ObjectIDTest.cpp b/source/RobotAPI/libraries/ArmarXObjects/test/ObjectIDTest.cpp
index 3f4e5ce17..d079c0c3c 100644
--- a/source/RobotAPI/libraries/ArmarXObjects/test/ObjectIDTest.cpp
+++ b/source/RobotAPI/libraries/ArmarXObjects/test/ObjectIDTest.cpp
@@ -26,10 +26,10 @@
#include "../ObjectID.h"
-#include <iostream>
-
#include <RobotAPI/Test.h>
+#include <iostream>
+
#include "../ArmarXObjects.h"
namespace armarx
diff --git a/source/RobotAPI/libraries/DebugDrawerConfigWidget/test/DebugDrawerConfigWidgetTest.cpp b/source/RobotAPI/libraries/DebugDrawerConfigWidget/test/DebugDrawerConfigWidgetTest.cpp
index 0b86e0070..086936eae 100644
--- a/source/RobotAPI/libraries/DebugDrawerConfigWidget/test/DebugDrawerConfigWidgetTest.cpp
+++ b/source/RobotAPI/libraries/DebugDrawerConfigWidget/test/DebugDrawerConfigWidgetTest.cpp
@@ -26,10 +26,10 @@
#include "../DebugDrawerConfigWidget.h"
-#include <iostream>
-
#include <RobotAPI/Test.h>
+#include <iostream>
+
BOOST_AUTO_TEST_CASE(testExample)
{
diff --git a/source/RobotAPI/libraries/RobotAPIComponentPlugins/test/RobotAPIComponentPluginsTest.cpp b/source/RobotAPI/libraries/RobotAPIComponentPlugins/test/RobotAPIComponentPluginsTest.cpp
index 67fbab9c2..9012139fa 100644
--- a/source/RobotAPI/libraries/RobotAPIComponentPlugins/test/RobotAPIComponentPluginsTest.cpp
+++ b/source/RobotAPI/libraries/RobotAPIComponentPlugins/test/RobotAPIComponentPluginsTest.cpp
@@ -24,10 +24,10 @@
#define ARMARX_BOOST_TEST
-#include <iostream>
-
#include <RobotAPI/Test.h>
+#include <iostream>
+
#include "../DebugDrawerHelperComponentPlugin.h"
#include "../RobotStateComponentPlugin.h"
diff --git a/source/RobotAPI/libraries/RobotAPIVariantWidget/test/RobotAPIVariantWidgetTest.cpp b/source/RobotAPI/libraries/RobotAPIVariantWidget/test/RobotAPIVariantWidgetTest.cpp
index 774a78a22..e6d1198c4 100644
--- a/source/RobotAPI/libraries/RobotAPIVariantWidget/test/RobotAPIVariantWidgetTest.cpp
+++ b/source/RobotAPI/libraries/RobotAPIVariantWidget/test/RobotAPIVariantWidgetTest.cpp
@@ -26,10 +26,10 @@
#include "../RobotAPIVariantWidget.h"
-#include <iostream>
-
#include <RobotAPI/Test.h>
+#include <iostream>
+
BOOST_AUTO_TEST_CASE(testExample)
{
diff --git a/source/RobotAPI/libraries/RobotUnitDataStreamingReceiver/test/RobotUnitDataStreamingReceiverTest.cpp b/source/RobotAPI/libraries/RobotUnitDataStreamingReceiver/test/RobotUnitDataStreamingReceiverTest.cpp
index a46fed817..4704c1ed4 100644
--- a/source/RobotAPI/libraries/RobotUnitDataStreamingReceiver/test/RobotUnitDataStreamingReceiverTest.cpp
+++ b/source/RobotAPI/libraries/RobotUnitDataStreamingReceiver/test/RobotUnitDataStreamingReceiverTest.cpp
@@ -26,10 +26,10 @@
#include "../RobotUnitDataStreamingReceiver.h"
-#include <iostream>
-
#include <RobotAPI/Test.h>
+#include <iostream>
+
BOOST_AUTO_TEST_CASE(testExample)
{
diff --git a/source/RobotAPI/libraries/SimpleTrajectory/test/TrajectoryTest.cpp b/source/RobotAPI/libraries/SimpleTrajectory/test/TrajectoryTest.cpp
index b38df4828..de2a34215 100644
--- a/source/RobotAPI/libraries/SimpleTrajectory/test/TrajectoryTest.cpp
+++ b/source/RobotAPI/libraries/SimpleTrajectory/test/TrajectoryTest.cpp
@@ -5,10 +5,10 @@
#include "../Trajectory.h"
-#include <iostream>
-
#include <RobotAPI/Test.h>
+#include <iostream>
+
using namespace armarx::trajectory;
diff --git a/source/RobotAPI/libraries/armem/server/test/ArMemLTMBenchmark.cpp b/source/RobotAPI/libraries/armem/server/test/ArMemLTMBenchmark.cpp
index d2bbeb2f8..824816db1 100644
--- a/source/RobotAPI/libraries/armem/server/test/ArMemLTMBenchmark.cpp
+++ b/source/RobotAPI/libraries/armem/server/test/ArMemLTMBenchmark.cpp
@@ -24,12 +24,13 @@
#define ARMARX_BOOST_TEST
+#include <RobotAPI/Test.h>
+
#include <filesystem>
#include <iostream>
#include <ArmarXCore/core/time/StopWatch.h>
-#include <RobotAPI/Test.h>
#include <RobotAPI/libraries/armem/core/error.h>
#include <RobotAPI/libraries/armem/server/ltm/Memory.h>
#include <RobotAPI/libraries/aron/core/data/variant/All.h>
diff --git a/source/RobotAPI/libraries/armem/server/test/ArMemLTMTest.cpp b/source/RobotAPI/libraries/armem/server/test/ArMemLTMTest.cpp
index db6c68b2d..ee2b2a7a1 100644
--- a/source/RobotAPI/libraries/armem/server/test/ArMemLTMTest.cpp
+++ b/source/RobotAPI/libraries/armem/server/test/ArMemLTMTest.cpp
@@ -25,6 +25,7 @@
#define ARMARX_BOOST_TEST
#include <RobotAPI/Test.h>
+
#include <RobotAPI/libraries/armem/core/error.h>
#include <RobotAPI/libraries/armem/core/wm/ice_conversions.h>
#include <RobotAPI/libraries/armem/server/ltm/Memory.h>
diff --git a/source/RobotAPI/libraries/armem/server/test/ArMemMemoryTest.cpp b/source/RobotAPI/libraries/armem/server/test/ArMemMemoryTest.cpp
index eb562e327..d2548f8a3 100644
--- a/source/RobotAPI/libraries/armem/server/test/ArMemMemoryTest.cpp
+++ b/source/RobotAPI/libraries/armem/server/test/ArMemMemoryTest.cpp
@@ -24,11 +24,12 @@
#define ARMARX_BOOST_TEST
+#include <RobotAPI/Test.h>
+
#include <iostream>
#include <SimoxUtility/meta/type_name.h>
-#include <RobotAPI/Test.h>
#include <RobotAPI/libraries/armem/core/error.h>
#include <RobotAPI/libraries/armem/core/operations.h>
#include <RobotAPI/libraries/armem/core/wm/memory_definitions.h>
diff --git a/source/RobotAPI/libraries/armem/server/test/ArMemQueryTest.cpp b/source/RobotAPI/libraries/armem/server/test/ArMemQueryTest.cpp
index 31262dbd9..bdca8325a 100644
--- a/source/RobotAPI/libraries/armem/server/test/ArMemQueryTest.cpp
+++ b/source/RobotAPI/libraries/armem/server/test/ArMemQueryTest.cpp
@@ -24,6 +24,8 @@
#define ARMARX_BOOST_TEST
+#include <RobotAPI/Test.h>
+
#include <iostream>
#include <SimoxUtility/algorithm/get_map_keys_values.h>
@@ -31,7 +33,6 @@
#include <ArmarXCore/core/exceptions/LocalException.h>
-#include <RobotAPI/Test.h>
#include <RobotAPI/interface/armem/query.h>
#include <RobotAPI/libraries/armem/core/base/detail/negative_index_semantics.h>
#include <RobotAPI/libraries/armem/core/error.h>
diff --git a/source/RobotAPI/libraries/armem/test/ArMemEntityInstanceDataTest.cpp b/source/RobotAPI/libraries/armem/test/ArMemEntityInstanceDataTest.cpp
index 241932274..67e6c797d 100644
--- a/source/RobotAPI/libraries/armem/test/ArMemEntityInstanceDataTest.cpp
+++ b/source/RobotAPI/libraries/armem/test/ArMemEntityInstanceDataTest.cpp
@@ -24,10 +24,11 @@
#define ARMARX_BOOST_TEST
+#include <RobotAPI/Test.h>
+
#include <iostream>
#include <set>
-#include <RobotAPI/Test.h>
#include <RobotAPI/libraries/armem/core/wm/memory_definitions.h>
#include <RobotAPI/libraries/aron/common/aron/Color.aron.generated.h>
#include <RobotAPI/libraries/aron/common/aron/time.aron.generated.h>
diff --git a/source/RobotAPI/libraries/armem/test/ArMemForEachTest.cpp b/source/RobotAPI/libraries/armem/test/ArMemForEachTest.cpp
index 537714031..44384b3fe 100644
--- a/source/RobotAPI/libraries/armem/test/ArMemForEachTest.cpp
+++ b/source/RobotAPI/libraries/armem/test/ArMemForEachTest.cpp
@@ -24,10 +24,11 @@
#define ARMARX_BOOST_TEST
+#include <RobotAPI/Test.h>
+
#include <iostream>
#include <set>
-#include <RobotAPI/Test.h>
#include <RobotAPI/libraries/armem/core/Commit.h>
#include <RobotAPI/libraries/armem/core/operations.h>
#include <RobotAPI/libraries/armem/core/wm/memory_definitions.h>
diff --git a/source/RobotAPI/libraries/armem/test/ArMemGetFindTest.cpp b/source/RobotAPI/libraries/armem/test/ArMemGetFindTest.cpp
index 4c133b5ac..8587db94c 100644
--- a/source/RobotAPI/libraries/armem/test/ArMemGetFindTest.cpp
+++ b/source/RobotAPI/libraries/armem/test/ArMemGetFindTest.cpp
@@ -24,9 +24,10 @@
#define ARMARX_BOOST_TEST
+#include <RobotAPI/Test.h>
+
#include <iostream>
-#include <RobotAPI/Test.h>
#include <RobotAPI/libraries/armem/core/error.h>
#include <RobotAPI/libraries/armem/core/operations.h>
#include <RobotAPI/libraries/armem/core/wm/memory_definitions.h>
diff --git a/source/RobotAPI/libraries/armem/test/ArMemIceConversionsTest.cpp b/source/RobotAPI/libraries/armem/test/ArMemIceConversionsTest.cpp
index 65c2a0e8f..9342630e1 100644
--- a/source/RobotAPI/libraries/armem/test/ArMemIceConversionsTest.cpp
+++ b/source/RobotAPI/libraries/armem/test/ArMemIceConversionsTest.cpp
@@ -24,13 +24,14 @@
#define ARMARX_BOOST_TEST
+#include <RobotAPI/Test.h>
+
#include <iostream>
#include <SimoxUtility/algorithm/get_map_keys_values.h>
#include <ArmarXCore/core/ice_conversions/ice_conversions_templates.h>
-#include <RobotAPI/Test.h>
#include <RobotAPI/libraries/armem/core/wm/ice_conversions.h>
diff --git a/source/RobotAPI/libraries/armem/test/ArMemMemoryIDTest.cpp b/source/RobotAPI/libraries/armem/test/ArMemMemoryIDTest.cpp
index 8074c6d9e..875542b5c 100644
--- a/source/RobotAPI/libraries/armem/test/ArMemMemoryIDTest.cpp
+++ b/source/RobotAPI/libraries/armem/test/ArMemMemoryIDTest.cpp
@@ -24,9 +24,10 @@
#define ARMARX_BOOST_TEST
+#include <RobotAPI/Test.h>
+
#include <iostream>
-#include <RobotAPI/Test.h>
#include <RobotAPI/libraries/armem/core/MemoryID.h>
#include <RobotAPI/libraries/armem/core/error.h>
diff --git a/source/RobotAPI/libraries/armem/test/ArMemPrefixesTest.cpp b/source/RobotAPI/libraries/armem/test/ArMemPrefixesTest.cpp
index c6f400e7d..e327d2cc9 100644
--- a/source/RobotAPI/libraries/armem/test/ArMemPrefixesTest.cpp
+++ b/source/RobotAPI/libraries/armem/test/ArMemPrefixesTest.cpp
@@ -24,9 +24,10 @@
#define ARMARX_BOOST_TEST
+#include <RobotAPI/Test.h>
+
#include <iostream>
-#include <RobotAPI/Test.h>
#include <RobotAPI/libraries/armem/core/container_maps.h>
#include <RobotAPI/libraries/armem/core/error.h>
diff --git a/source/RobotAPI/libraries/armem/test/ArMemQueryBuilderTest.cpp b/source/RobotAPI/libraries/armem/test/ArMemQueryBuilderTest.cpp
index be1e89c78..1738bd7d3 100644
--- a/source/RobotAPI/libraries/armem/test/ArMemQueryBuilderTest.cpp
+++ b/source/RobotAPI/libraries/armem/test/ArMemQueryBuilderTest.cpp
@@ -24,12 +24,13 @@
#define ARMARX_BOOST_TEST
+#include <RobotAPI/Test.h>
+
#include <iostream>
#include <ArmarXCore/core/ice_conversions/ice_conversions_templates.h>
#include <ArmarXCore/core/time/ice_conversions.h>
-#include <RobotAPI/Test.h>
#include <RobotAPI/libraries/armem/client/query/Builder.h>
#include <RobotAPI/libraries/armem/client/query/query_fns.h>
diff --git a/source/RobotAPI/libraries/armem_objects/test/ArMemObjectsTest.cpp b/source/RobotAPI/libraries/armem_objects/test/ArMemObjectsTest.cpp
index d325b3836..652e4bf89 100644
--- a/source/RobotAPI/libraries/armem_objects/test/ArMemObjectsTest.cpp
+++ b/source/RobotAPI/libraries/armem_objects/test/ArMemObjectsTest.cpp
@@ -24,10 +24,10 @@
#define ARMARX_BOOST_TEST
-#include <iostream>
-
#include <RobotAPI/Test.h>
+#include <iostream>
+
BOOST_AUTO_TEST_CASE(test_armem_objects)
{
BOOST_CHECK(true);
diff --git a/source/RobotAPI/libraries/aron/common/test/aron_common_test.cpp b/source/RobotAPI/libraries/aron/common/test/aron_common_test.cpp
index e9488681f..8d8a4fe96 100644
--- a/source/RobotAPI/libraries/aron/common/test/aron_common_test.cpp
+++ b/source/RobotAPI/libraries/aron/common/test/aron_common_test.cpp
@@ -24,9 +24,10 @@
#define ARMARX_BOOST_TEST
+#include <RobotAPI/Test.h>
+
#include <iostream>
-#include <RobotAPI/Test.h>
#include <RobotAPI/libraries/aron/core/aron_conversions.h>
#include "MyCustomType.h"
diff --git a/source/RobotAPI/libraries/core/remoterobot/test/ArmarPoseTest.cpp b/source/RobotAPI/libraries/core/remoterobot/test/ArmarPoseTest.cpp
index e805d2919..be144d554 100644
--- a/source/RobotAPI/libraries/core/remoterobot/test/ArmarPoseTest.cpp
+++ b/source/RobotAPI/libraries/core/remoterobot/test/ArmarPoseTest.cpp
@@ -23,9 +23,10 @@
#define BOOST_TEST_MODULE RobotAPI::FramedPose::Test
#define ARMARX_BOOST_TEST
+#include <RobotAPI/Test.h>
+
#include <ArmarXCore/util/json/JSONObject.h>
-#include <RobotAPI/Test.h>
#include <RobotAPI/libraries/core/FramedPose.h>
diff --git a/source/RobotAPI/libraries/core/test/CartesianVelocityControllerTest.cpp b/source/RobotAPI/libraries/core/test/CartesianVelocityControllerTest.cpp
index 2645ec230..4e3a63100 100644
--- a/source/RobotAPI/libraries/core/test/CartesianVelocityControllerTest.cpp
+++ b/source/RobotAPI/libraries/core/test/CartesianVelocityControllerTest.cpp
@@ -24,6 +24,8 @@
#define ARMARX_BOOST_TEST
#include "../CartesianVelocityController.h"
+#include <RobotAPI/Test.h>
+
#include <VirtualRobot/IK/DifferentialIK.h>
#include <VirtualRobot/IK/IKSolver.h>
#include <VirtualRobot/RobotNodeSet.h>
@@ -33,8 +35,6 @@
#include <ArmarXCore/core/system/cmake/CMakePackageFinder.h>
#include <ArmarXCore/core/test/IceTestHelper.h>
-#include <RobotAPI/Test.h>
-
using namespace armarx;
void
diff --git a/source/RobotAPI/libraries/core/test/CartesianVelocityControllerWithRampTest.cpp b/source/RobotAPI/libraries/core/test/CartesianVelocityControllerWithRampTest.cpp
index 20df3569c..def5f3e1c 100644
--- a/source/RobotAPI/libraries/core/test/CartesianVelocityControllerWithRampTest.cpp
+++ b/source/RobotAPI/libraries/core/test/CartesianVelocityControllerWithRampTest.cpp
@@ -23,14 +23,14 @@
#include <VirtualRobot/IK/DifferentialIK.h>
#define BOOST_TEST_MODULE RobotAPI::CartesianVelocityController::Test
#define ARMARX_BOOST_TEST
+#include <RobotAPI/Test.h>
+
#include <VirtualRobot/XML/RobotIO.h>
#include <ArmarXCore/core/system/ArmarXDataPath.h>
#include <ArmarXCore/core/system/cmake/CMakePackageFinder.h>
#include <ArmarXCore/core/test/IceTestHelper.h>
-#include <RobotAPI/Test.h>
-
#include "../CartesianVelocityControllerWithRamp.h"
using namespace armarx;
diff --git a/source/RobotAPI/libraries/core/test/CartesianVelocityRampTest.cpp b/source/RobotAPI/libraries/core/test/CartesianVelocityRampTest.cpp
index 29550789c..3225346ad 100644
--- a/source/RobotAPI/libraries/core/test/CartesianVelocityRampTest.cpp
+++ b/source/RobotAPI/libraries/core/test/CartesianVelocityRampTest.cpp
@@ -24,13 +24,14 @@
#define ARMARX_BOOST_TEST
#include "../CartesianVelocityRamp.h"
+#include <RobotAPI/Test.h>
+
#include <VirtualRobot/XML/RobotIO.h>
#include <ArmarXCore/core/system/ArmarXDataPath.h>
#include <ArmarXCore/core/system/cmake/CMakePackageFinder.h>
#include <ArmarXCore/core/test/IceTestHelper.h>
-#include <RobotAPI/Test.h>
#include <RobotAPI/libraries/core/EigenHelpers.h>
using namespace armarx;
diff --git a/source/RobotAPI/libraries/core/test/DebugDrawerTopicTest.cpp b/source/RobotAPI/libraries/core/test/DebugDrawerTopicTest.cpp
index 5fd6f18fe..8f64c7b09 100644
--- a/source/RobotAPI/libraries/core/test/DebugDrawerTopicTest.cpp
+++ b/source/RobotAPI/libraries/core/test/DebugDrawerTopicTest.cpp
@@ -26,9 +26,10 @@
#define ARMARX_BOOST_TEST
+#include <RobotAPI/Test.h>
+
#include <ArmarXCore/core/test/IceTestHelper.h>
-#include <RobotAPI/Test.h>
#include <RobotAPI/libraries/core/visualization/DebugDrawerTopic.h>
diff --git a/source/RobotAPI/libraries/core/test/MathUtilsTest.cpp b/source/RobotAPI/libraries/core/test/MathUtilsTest.cpp
index b08b54822..c51464a81 100644
--- a/source/RobotAPI/libraries/core/test/MathUtilsTest.cpp
+++ b/source/RobotAPI/libraries/core/test/MathUtilsTest.cpp
@@ -24,10 +24,10 @@
#define ARMARX_BOOST_TEST
#include "../math/MathUtils.h"
-#include <ArmarXCore/core/test/IceTestHelper.h>
-
#include <RobotAPI/Test.h>
+#include <ArmarXCore/core/test/IceTestHelper.h>
+
#include "../FramedPose.h"
#include "../math/ColorUtils.h"
using namespace armarx;
diff --git a/source/RobotAPI/libraries/core/test/PIDControllerTest.cpp b/source/RobotAPI/libraries/core/test/PIDControllerTest.cpp
index 8e7f27e4b..0b9ae1ad6 100644
--- a/source/RobotAPI/libraries/core/test/PIDControllerTest.cpp
+++ b/source/RobotAPI/libraries/core/test/PIDControllerTest.cpp
@@ -24,11 +24,11 @@
#define ARMARX_BOOST_TEST
#include "../PIDController.h"
+#include <RobotAPI/Test.h>
+
#include <ArmarXCore/core/test/IceTestHelper.h>
#include <ArmarXCore/util/json/JSONObject.h>
-#include <RobotAPI/Test.h>
-
using namespace armarx;
BOOST_AUTO_TEST_CASE(PIDControllerTest)
diff --git a/source/RobotAPI/libraries/core/test/RobotTest.cpp b/source/RobotAPI/libraries/core/test/RobotTest.cpp
index 5fc62e963..4705b89d2 100644
--- a/source/RobotAPI/libraries/core/test/RobotTest.cpp
+++ b/source/RobotAPI/libraries/core/test/RobotTest.cpp
@@ -24,6 +24,8 @@
#define BOOST_TEST_MODULE RobotAPI::RobotTest::Test
#define ARMARX_BOOST_TEST
+#include <RobotAPI/Test.h>
+
#include <VirtualRobot/XML/RobotIO.h>
#include <ArmarXCore/core/exceptions/local/ExpressionException.h>
@@ -32,8 +34,6 @@
#include <ArmarXCore/core/test/IceTestHelper.h>
#include <ArmarXCore/util/json/JSONObject.h>
-#include <RobotAPI/Test.h>
-
#include "../RobotPool.h"
using namespace armarx;
diff --git a/source/RobotAPI/libraries/core/test/TrajectoryTest.cpp b/source/RobotAPI/libraries/core/test/TrajectoryTest.cpp
index 3de5dcb70..831830c8c 100644
--- a/source/RobotAPI/libraries/core/test/TrajectoryTest.cpp
+++ b/source/RobotAPI/libraries/core/test/TrajectoryTest.cpp
@@ -24,12 +24,13 @@
#define ARMARX_BOOST_TEST
#include "../Trajectory.h"
+#include <RobotAPI/Test.h>
+
#include <random>
#include <ArmarXCore/core/test/IceTestHelper.h>
#include <ArmarXCore/util/json/JSONObject.h>
-#include <RobotAPI/Test.h>
#include <RobotAPI/libraries/core/math/MathUtils.h>
#include "../TrajectoryController.h"
diff --git a/source/RobotAPI/libraries/diffik/test/diffikTest.cpp b/source/RobotAPI/libraries/diffik/test/diffikTest.cpp
index e5500104e..1a01d9b57 100644
--- a/source/RobotAPI/libraries/diffik/test/diffikTest.cpp
+++ b/source/RobotAPI/libraries/diffik/test/diffikTest.cpp
@@ -26,10 +26,10 @@
#include "../diffik.h"
-#include <iostream>
-
#include <RobotAPI/Test.h>
+#include <iostream>
+
BOOST_AUTO_TEST_CASE(testExample)
{
diff --git a/source/RobotAPI/libraries/natik/test/natikTest.cpp b/source/RobotAPI/libraries/natik/test/natikTest.cpp
index a69209770..19891b1e8 100644
--- a/source/RobotAPI/libraries/natik/test/natikTest.cpp
+++ b/source/RobotAPI/libraries/natik/test/natikTest.cpp
@@ -24,12 +24,12 @@
#define ARMARX_BOOST_TEST
+#include <RobotAPI/Test.h>
+
#include <iostream>
#include <ArmarXCore/core/logging/Logging.h>
-#include <RobotAPI/Test.h>
-
#include "../NaturalIK.h"
using namespace armarx;
--
GitLab