From 52f80f4c6f4e09fd20725cf18ac7482dbc99fdbc Mon Sep 17 00:00:00 2001
From: Eugenio Collado <eugeniocollado@eprosima.com>
Date: Thu, 9 Jan 2025 16:33:07 +0100
Subject: [PATCH] Fix windows test compilation

Signed-off-by: Eugenio Collado <eugeniocollado@eprosima.com>
---
 ddsrecorder/test/blackbox/FileCreationTest.hpp              | 2 +-
 ddsrecorder/test/blackbox/mcap/McapFileCreationTest.cpp     | 3 ++-
 ddsrecorder/test/blackbox/mcap/McapLogErrorTest.cpp         | 2 +-
 ddsrecorder/test/blackbox/sql/SqlFileCreationTest.cpp       | 2 +-
 ddsrecorder/test/blackbox/sql/SqlLogErrorTest.cpp           | 2 +-
 ddsreplayer/test/blackbox/FileReadTest.hpp                  | 3 +--
 ddsreplayer/test/blackbox/mcap/McapFileReadTest.cpp         | 3 +--
 ddsreplayer/test/blackbox/mcap/McapFileReadWithTypeTest.cpp | 3 +--
 ddsreplayer/test/blackbox/sql/SqlFileReadTest.cpp           | 3 +--
 ddsreplayer/test/blackbox/sql/SqlFileReadWithTypeTest.cpp   | 3 +--
 10 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/ddsrecorder/test/blackbox/FileCreationTest.hpp b/ddsrecorder/test/blackbox/FileCreationTest.hpp
index 6b74326ae..a65fd8e5c 100644
--- a/ddsrecorder/test/blackbox/FileCreationTest.hpp
+++ b/ddsrecorder/test/blackbox/FileCreationTest.hpp
@@ -21,6 +21,7 @@
 #include <thread>
 #include <vector>
 
+#include <cpp_utils/testing/gtest_aux.hpp>
 #include <gtest/gtest.h>
 
 #include <fastdds/dds/core/policy/QosPolicies.hpp>
@@ -42,7 +43,6 @@
 #include <fastdds/dds/xtypes/type_representation/ITypeObjectRegistry.hpp>
 #include <fastdds/dds/xtypes/utils.hpp>
 
-#include <cpp_utils/testing/gtest_aux.hpp>
 #include <cpp_utils/ros2_mangling.hpp>
 
 #include <ddsrecorder_participants/recorder/output/FileTracker.hpp>
diff --git a/ddsrecorder/test/blackbox/mcap/McapFileCreationTest.cpp b/ddsrecorder/test/blackbox/mcap/McapFileCreationTest.cpp
index 9fb75bc41..18ffae5d2 100644
--- a/ddsrecorder/test/blackbox/mcap/McapFileCreationTest.cpp
+++ b/ddsrecorder/test/blackbox/mcap/McapFileCreationTest.cpp
@@ -17,6 +17,8 @@
 #include <string>
 
 #include <mcap/reader.hpp>
+
+#include <cpp_utils/testing/gtest_aux.hpp>
 #include <gtest/gtest.h>
 
 #include <fastdds/dds/domain/DomainParticipantFactory.hpp>
@@ -30,7 +32,6 @@
 #include <fastdds/dds/xtypes/type_representation/TypeObject.hpp>
 
 #include <cpp_utils/ros2_mangling.hpp>
-#include <cpp_utils/testing/gtest_aux.hpp>
 
 #include <ddspipe_core/types/dds/TopicQoS.hpp>
 
diff --git a/ddsrecorder/test/blackbox/mcap/McapLogErrorTest.cpp b/ddsrecorder/test/blackbox/mcap/McapLogErrorTest.cpp
index be77744a6..d58c9440b 100644
--- a/ddsrecorder/test/blackbox/mcap/McapLogErrorTest.cpp
+++ b/ddsrecorder/test/blackbox/mcap/McapLogErrorTest.cpp
@@ -14,12 +14,12 @@
 
 #include <memory>
 
+#include <cpp_utils/testing/gtest_aux.hpp>
 #include <gtest/gtest.h>
 #include <mcap/writer.hpp>
 
 #include <cpp_utils/Log.hpp>
 #include <cpp_utils/exception/InitializationException.hpp>
-#include <cpp_utils/testing/gtest_aux.hpp>
 #include <cpp_utils/testing/LogChecker.hpp>
 
 #include <ddspipe_core/efficiency/payload/PayloadPool.hpp>
diff --git a/ddsrecorder/test/blackbox/sql/SqlFileCreationTest.cpp b/ddsrecorder/test/blackbox/sql/SqlFileCreationTest.cpp
index f50b50e2d..43368b789 100644
--- a/ddsrecorder/test/blackbox/sql/SqlFileCreationTest.cpp
+++ b/ddsrecorder/test/blackbox/sql/SqlFileCreationTest.cpp
@@ -23,12 +23,12 @@
 
 #include <sqlite/sqlite3.h>
 
+#include <cpp_utils/testing/gtest_aux.hpp>
 #include <gtest/gtest.h>
 
 #include <cpp_utils/exception/InitializationException.hpp>
 #include <cpp_utils/Formatter.hpp>
 #include <cpp_utils/ros2_mangling.hpp>
-#include <cpp_utils/testing/gtest_aux.hpp>
 
 #include <ddspipe_core/types/dds/TopicQoS.hpp>
 
diff --git a/ddsrecorder/test/blackbox/sql/SqlLogErrorTest.cpp b/ddsrecorder/test/blackbox/sql/SqlLogErrorTest.cpp
index 245a5a17c..68150799e 100644
--- a/ddsrecorder/test/blackbox/sql/SqlLogErrorTest.cpp
+++ b/ddsrecorder/test/blackbox/sql/SqlLogErrorTest.cpp
@@ -14,12 +14,12 @@
 
 #include <memory>
 
+#include <cpp_utils/testing/gtest_aux.hpp>
 #include <gtest/gtest.h>
 
 #include <cpp_utils/Log.hpp>
 #include <cpp_utils/exception/InconsistencyException.hpp>
 #include <cpp_utils/exception/InitializationException.hpp>
-#include <cpp_utils/testing/gtest_aux.hpp>
 #include <cpp_utils/testing/LogChecker.hpp>
 
 #include <ddspipe_core/efficiency/payload/PayloadPool.hpp>
diff --git a/ddsreplayer/test/blackbox/FileReadTest.hpp b/ddsreplayer/test/blackbox/FileReadTest.hpp
index c0e7799d5..ef21137a0 100644
--- a/ddsreplayer/test/blackbox/FileReadTest.hpp
+++ b/ddsreplayer/test/blackbox/FileReadTest.hpp
@@ -18,12 +18,11 @@
 #include <string>
 #include <thread>
 
+#include <cpp_utils/testing/gtest_aux.hpp>
 #include <gtest/gtest.h>
 
 #include <fastdds/dds/domain/DomainParticipantListener.hpp>
 
-#include <cpp_utils/testing/gtest_aux.hpp>
-
 #include <ddsrecorder_yaml/recorder/YamlReaderConfiguration.hpp>
 
 #include <tool/DdsReplayer.hpp>
diff --git a/ddsreplayer/test/blackbox/mcap/McapFileReadTest.cpp b/ddsreplayer/test/blackbox/mcap/McapFileReadTest.cpp
index f5c1917d6..d402cc7a1 100644
--- a/ddsreplayer/test/blackbox/mcap/McapFileReadTest.cpp
+++ b/ddsreplayer/test/blackbox/mcap/McapFileReadTest.cpp
@@ -12,9 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include <gtest/gtest.h>
-
 #include <cpp_utils/testing/gtest_aux.hpp>
+#include <gtest/gtest.h>
 
 #include "McapFileReadTest.hpp"
 
diff --git a/ddsreplayer/test/blackbox/mcap/McapFileReadWithTypeTest.cpp b/ddsreplayer/test/blackbox/mcap/McapFileReadWithTypeTest.cpp
index f4302b4bf..4b5875dd1 100644
--- a/ddsreplayer/test/blackbox/mcap/McapFileReadWithTypeTest.cpp
+++ b/ddsreplayer/test/blackbox/mcap/McapFileReadWithTypeTest.cpp
@@ -12,9 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include <gtest/gtest.h>
-
 #include <cpp_utils/testing/gtest_aux.hpp>
+#include <gtest/gtest.h>
 
 #include "McapFileReadWithTypeTest.hpp"
 
diff --git a/ddsreplayer/test/blackbox/sql/SqlFileReadTest.cpp b/ddsreplayer/test/blackbox/sql/SqlFileReadTest.cpp
index 98cea4bf7..e973e7b72 100644
--- a/ddsreplayer/test/blackbox/sql/SqlFileReadTest.cpp
+++ b/ddsreplayer/test/blackbox/sql/SqlFileReadTest.cpp
@@ -12,9 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include <gtest/gtest.h>
-
 #include <cpp_utils/testing/gtest_aux.hpp>
+#include <gtest/gtest.h>
 
 #include "SqlFileReadTest.hpp"
 
diff --git a/ddsreplayer/test/blackbox/sql/SqlFileReadWithTypeTest.cpp b/ddsreplayer/test/blackbox/sql/SqlFileReadWithTypeTest.cpp
index cc5860092..36de25cb8 100644
--- a/ddsreplayer/test/blackbox/sql/SqlFileReadWithTypeTest.cpp
+++ b/ddsreplayer/test/blackbox/sql/SqlFileReadWithTypeTest.cpp
@@ -12,9 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include <gtest/gtest.h>
-
 #include <cpp_utils/testing/gtest_aux.hpp>
+#include <gtest/gtest.h>
 
 #include "SqlFileReadWithTypeTest.hpp"