From 477ebe75e223445fe37506bdf4c49bac09bc49b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marius=20B=C3=B6rschig?= Date: Fri, 26 Jun 2026 16:33:54 +0200 Subject: [PATCH] style: fix includes IntegrationTests MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Marius Börschig --- .../IntegrationTests/ExtensionTests/DummyExtension.cpp | 2 +- .../IntegrationTests/ExtensionTests/DummyExtension.hpp | 2 +- .../ExtensionTests/ITest_SilKitExtensions.cpp | 6 +++--- .../ExtensionTests/WrongBuildSystem.cpp | 4 ++-- .../ExtensionTests/WrongVersionExtension.cpp | 4 ++-- SilKit/IntegrationTests/ITest_Internals_DataPubSub.cpp | 2 +- SilKit/IntegrationTests/ITest_Internals_DataPubSub.hpp | 8 ++++---- .../ITest_Internals_ParticipantModes.cpp | 4 ++-- .../IntegrationTests/ITest_Internals_RequestReply.cpp | 8 ++++---- SilKit/IntegrationTests/ITest_Internals_Rpc.cpp | 2 +- SilKit/IntegrationTests/ITest_Internals_Rpc.hpp | 6 +++--- .../ITest_Internals_ServiceDiscovery.cpp | 10 +++++----- .../ITest_Internals_TargetedMessaging.cpp | 6 +++--- .../ITest_MultiThreadedParticipants.hpp | 4 ++-- SilKit/IntegrationTests/ITest_SystemMonitor.cpp | 6 +++--- .../IntegrationTests/IntegrationTestInfrastructure.hpp | 4 ++-- SilKit/IntegrationTests/InternalHelpers.hpp | 2 +- 17 files changed, 40 insertions(+), 40 deletions(-) diff --git a/SilKit/IntegrationTests/ExtensionTests/DummyExtension.cpp b/SilKit/IntegrationTests/ExtensionTests/DummyExtension.cpp index 4e1598be1..ce5a8cbd9 100644 --- a/SilKit/IntegrationTests/ExtensionTests/DummyExtension.cpp +++ b/SilKit/IntegrationTests/ExtensionTests/DummyExtension.cpp @@ -4,7 +4,7 @@ #include "silkit/SilKitVersion.hpp" -#include "SilKitExtensionMacros.hpp" +#include "extensions/SilKitExtensionApi/SilKitExtensionMacros.hpp" #include "DummyExtension.hpp" // Define shared library extension for linking diff --git a/SilKit/IntegrationTests/ExtensionTests/DummyExtension.hpp b/SilKit/IntegrationTests/ExtensionTests/DummyExtension.hpp index 62cfe19d4..90a9ac4b8 100755 --- a/SilKit/IntegrationTests/ExtensionTests/DummyExtension.hpp +++ b/SilKit/IntegrationTests/ExtensionTests/DummyExtension.hpp @@ -4,7 +4,7 @@ #pragma once -#include "SilKitExtensionBase.hpp" +#include "extensions/SilKitExtensionApi/SilKitExtensionBase.hpp" struct DummyExtension : public SilKit::SilKitExtensionBase { diff --git a/SilKit/IntegrationTests/ExtensionTests/ITest_SilKitExtensions.cpp b/SilKit/IntegrationTests/ExtensionTests/ITest_SilKitExtensions.cpp index 947ba7bc7..b588ee498 100644 --- a/SilKit/IntegrationTests/ExtensionTests/ITest_SilKitExtensions.cpp +++ b/SilKit/IntegrationTests/ExtensionTests/ITest_SilKitExtensions.cpp @@ -11,10 +11,10 @@ #include "gtest/gtest.h" #include "gmock/gmock.h" -#include "ParticipantConfiguration.hpp" +#include "config/ParticipantConfiguration.hpp" -#include "MockParticipant.hpp" //for DummyLogger -#include "SilKitExtensions.hpp" +#include "core/mock/participant/MockParticipant.hpp" //for DummyLogger +#include "extensions/SilKitExtensions.hpp" #include "DummyExtension.hpp" diff --git a/SilKit/IntegrationTests/ExtensionTests/WrongBuildSystem.cpp b/SilKit/IntegrationTests/ExtensionTests/WrongBuildSystem.cpp index 786553877..e28b163a3 100644 --- a/SilKit/IntegrationTests/ExtensionTests/WrongBuildSystem.cpp +++ b/SilKit/IntegrationTests/ExtensionTests/WrongBuildSystem.cpp @@ -4,8 +4,8 @@ #include "silkit/SilKitVersion.hpp" -#include "SilKitExtensionBase.hpp" -#include "SilKitExtensionMacros.hpp" +#include "extensions/SilKitExtensionApi/SilKitExtensionBase.hpp" +#include "extensions/SilKitExtensionApi/SilKitExtensionMacros.hpp" // definitions for linking struct WrongBuildSystem : public SilKit::SilKitExtensionBase diff --git a/SilKit/IntegrationTests/ExtensionTests/WrongVersionExtension.cpp b/SilKit/IntegrationTests/ExtensionTests/WrongVersionExtension.cpp index 163cb3324..d1fd82af5 100644 --- a/SilKit/IntegrationTests/ExtensionTests/WrongVersionExtension.cpp +++ b/SilKit/IntegrationTests/ExtensionTests/WrongVersionExtension.cpp @@ -2,8 +2,8 @@ // // SPDX-License-Identifier: MIT -#include "SilKitExtensionBase.hpp" -#include "SilKitExtensionMacros.hpp" +#include "extensions/SilKitExtensionApi/SilKitExtensionBase.hpp" +#include "extensions/SilKitExtensionApi/SilKitExtensionMacros.hpp" // definitions for linking struct WrongVersionExtension : public SilKit::SilKitExtensionBase diff --git a/SilKit/IntegrationTests/ITest_Internals_DataPubSub.cpp b/SilKit/IntegrationTests/ITest_Internals_DataPubSub.cpp index 16408053e..2fb3955e8 100644 --- a/SilKit/IntegrationTests/ITest_Internals_DataPubSub.cpp +++ b/SilKit/IntegrationTests/ITest_Internals_DataPubSub.cpp @@ -7,7 +7,7 @@ #include "ITest_Internals_DataPubSub.hpp" -#include "ParticipantConfigurationFromXImpl.hpp" +#include "config/ParticipantConfigurationFromXImpl.hpp" namespace { diff --git a/SilKit/IntegrationTests/ITest_Internals_DataPubSub.hpp b/SilKit/IntegrationTests/ITest_Internals_DataPubSub.hpp index 1ff4f15ee..d5ed7fa1b 100644 --- a/SilKit/IntegrationTests/ITest_Internals_DataPubSub.hpp +++ b/SilKit/IntegrationTests/ITest_Internals_DataPubSub.hpp @@ -8,10 +8,10 @@ #include "silkit/services/orchestration/all.hpp" #include "silkit/services/all.hpp" -#include "ConfigurationTestUtils.hpp" -#include "IParticipantInternal.hpp" -#include "IServiceDiscovery.hpp" -#include "ServiceDatatypes.hpp" +#include "config/ConfigurationTestUtils.hpp" +#include "core/internal/IParticipantInternal.hpp" +#include "core/service/IServiceDiscovery.hpp" +#include "core/service/ServiceDatatypes.hpp" #include "IntegrationTestInfrastructure.hpp" diff --git a/SilKit/IntegrationTests/ITest_Internals_ParticipantModes.cpp b/SilKit/IntegrationTests/ITest_Internals_ParticipantModes.cpp index 871135299..a95b5d8c0 100644 --- a/SilKit/IntegrationTests/ITest_Internals_ParticipantModes.cpp +++ b/SilKit/IntegrationTests/ITest_Internals_ParticipantModes.cpp @@ -20,8 +20,8 @@ #include "silkit/services/orchestration/string_utils.hpp" #include "silkit/experimental/participant/ParticipantExtensions.hpp" -#include "ConfigurationTestUtils.hpp" -#include "IParticipantInternal.hpp" +#include "config/ConfigurationTestUtils.hpp" +#include "core/internal/IParticipantInternal.hpp" #include "CreateParticipantImpl.hpp" namespace { diff --git a/SilKit/IntegrationTests/ITest_Internals_RequestReply.cpp b/SilKit/IntegrationTests/ITest_Internals_RequestReply.cpp index dd6557c7a..8666a8cc5 100644 --- a/SilKit/IntegrationTests/ITest_Internals_RequestReply.cpp +++ b/SilKit/IntegrationTests/ITest_Internals_RequestReply.cpp @@ -11,11 +11,11 @@ #include "silkit/vendor/CreateSilKitRegistry.hpp" #include "silkit/experimental/services/orchestration/ISystemController.hpp" -#include "IRequestReplyService.hpp" -#include "procs/IParticipantReplies.hpp" +#include "core/requests/IRequestReplyService.hpp" +#include "core/requests/procs/IParticipantReplies.hpp" -#include "ConfigurationTestUtils.hpp" -#include "VAsioRegistry.hpp" +#include "config/ConfigurationTestUtils.hpp" +#include "core/vasio/VAsioRegistry.hpp" #include "CreateParticipantImpl.hpp" #include "gmock/gmock.h" diff --git a/SilKit/IntegrationTests/ITest_Internals_Rpc.cpp b/SilKit/IntegrationTests/ITest_Internals_Rpc.cpp index 7620f406e..a66c48c99 100644 --- a/SilKit/IntegrationTests/ITest_Internals_Rpc.cpp +++ b/SilKit/IntegrationTests/ITest_Internals_Rpc.cpp @@ -7,7 +7,7 @@ #include "ITest_Internals_Rpc.hpp" -#include "ParticipantConfigurationFromXImpl.hpp" +#include "config/ParticipantConfigurationFromXImpl.hpp" namespace { diff --git a/SilKit/IntegrationTests/ITest_Internals_Rpc.hpp b/SilKit/IntegrationTests/ITest_Internals_Rpc.hpp index d3a741838..794ba5c59 100644 --- a/SilKit/IntegrationTests/ITest_Internals_Rpc.hpp +++ b/SilKit/IntegrationTests/ITest_Internals_Rpc.hpp @@ -10,11 +10,11 @@ #include "silkit/services/orchestration/all.hpp" #include "silkit/services/all.hpp" -#include "ConfigurationTestUtils.hpp" +#include "config/ConfigurationTestUtils.hpp" #include "IntegrationTestInfrastructure.hpp" -#include "IParticipantInternal.hpp" -#include "IServiceDiscovery.hpp" +#include "core/internal/IParticipantInternal.hpp" +#include "core/service/IServiceDiscovery.hpp" using namespace std::chrono_literals; using namespace SilKit; diff --git a/SilKit/IntegrationTests/ITest_Internals_ServiceDiscovery.cpp b/SilKit/IntegrationTests/ITest_Internals_ServiceDiscovery.cpp index b8b9dc861..cae0a6949 100644 --- a/SilKit/IntegrationTests/ITest_Internals_ServiceDiscovery.cpp +++ b/SilKit/IntegrationTests/ITest_Internals_ServiceDiscovery.cpp @@ -9,14 +9,14 @@ #include "silkit/services/pubsub/PubSubSpec.hpp" #include "silkit/vendor/CreateSilKitRegistry.hpp" -#include "functional.hpp" +#include "util/functional.hpp" #include "SimTestHarness.hpp" -#include "ServiceDiscovery.hpp" -#include "ConfigurationTestUtils.hpp" -#include "VAsioRegistry.hpp" +#include "core/service/ServiceDiscovery.hpp" +#include "config/ConfigurationTestUtils.hpp" +#include "core/vasio/VAsioRegistry.hpp" #include "CreateParticipantImpl.hpp" -#include "ParticipantConfigurationFromXImpl.hpp" +#include "config/ParticipantConfigurationFromXImpl.hpp" #include "gmock/gmock.h" #include "gtest/gtest.h" diff --git a/SilKit/IntegrationTests/ITest_Internals_TargetedMessaging.cpp b/SilKit/IntegrationTests/ITest_Internals_TargetedMessaging.cpp index 564c19d7c..a8549e343 100644 --- a/SilKit/IntegrationTests/ITest_Internals_TargetedMessaging.cpp +++ b/SilKit/IntegrationTests/ITest_Internals_TargetedMessaging.cpp @@ -8,13 +8,13 @@ #include #include "SimTestHarness.hpp" -#include "IParticipantInternal.hpp" +#include "core/internal/IParticipantInternal.hpp" #include "silkit/services/can/all.hpp" #include "silkit/services/can/CanDatatypes.hpp" -#include "CanController.hpp" +#include "services/can/CanController.hpp" #include "silkit/services/orchestration/all.hpp" -#include "functional.hpp" +#include "util/functional.hpp" #include "gmock/gmock.h" #include "gtest/gtest.h" diff --git a/SilKit/IntegrationTests/ITest_MultiThreadedParticipants.hpp b/SilKit/IntegrationTests/ITest_MultiThreadedParticipants.hpp index 732abf9d2..bc0fce8f8 100644 --- a/SilKit/IntegrationTests/ITest_MultiThreadedParticipants.hpp +++ b/SilKit/IntegrationTests/ITest_MultiThreadedParticipants.hpp @@ -24,8 +24,8 @@ #include "silkit/services/all.hpp" #include "silkit/services/pubsub/PubSubSpec.hpp" -#include "ConfigurationTestUtils.hpp" -#include "functional.hpp" +#include "config/ConfigurationTestUtils.hpp" +#include "util/functional.hpp" #include "silkit/experimental/participant/ParticipantExtensions.hpp" using namespace std::chrono_literals; diff --git a/SilKit/IntegrationTests/ITest_SystemMonitor.cpp b/SilKit/IntegrationTests/ITest_SystemMonitor.cpp index 9b5a47e7b..c0b0537da 100644 --- a/SilKit/IntegrationTests/ITest_SystemMonitor.cpp +++ b/SilKit/IntegrationTests/ITest_SystemMonitor.cpp @@ -8,11 +8,11 @@ #include "silkit/services/all.hpp" #include "silkit/vendor/CreateSilKitRegistry.hpp" -#include "functional.hpp" +#include "util/functional.hpp" #include "SimTestHarness.hpp" -#include "ConfigurationTestUtils.hpp" -#include "SyncDatatypeUtils.hpp" +#include "config/ConfigurationTestUtils.hpp" +#include "services/orchestration/SyncDatatypeUtils.hpp" #include "gmock/gmock.h" #include "gtest/gtest.h" diff --git a/SilKit/IntegrationTests/IntegrationTestInfrastructure.hpp b/SilKit/IntegrationTests/IntegrationTestInfrastructure.hpp index 1a2d12135..3dd4cbfbf 100644 --- a/SilKit/IntegrationTests/IntegrationTestInfrastructure.hpp +++ b/SilKit/IntegrationTests/IntegrationTestInfrastructure.hpp @@ -8,8 +8,8 @@ #include "silkit/SilKit.hpp" #include "silkit/services/all.hpp" -#include "ConfigurationTestUtils.hpp" -#include "IParticipantInternal.hpp" +#include "config/ConfigurationTestUtils.hpp" +#include "core/internal/IParticipantInternal.hpp" #include "CreateParticipantImpl.hpp" using namespace SilKit; diff --git a/SilKit/IntegrationTests/InternalHelpers.hpp b/SilKit/IntegrationTests/InternalHelpers.hpp index 518a01f76..26e72d33d 100644 --- a/SilKit/IntegrationTests/InternalHelpers.hpp +++ b/SilKit/IntegrationTests/InternalHelpers.hpp @@ -4,7 +4,7 @@ #pragma once -#include "IParticipantInternal.hpp" +#include "core/internal/IParticipantInternal.hpp" namespace SilKit {