Skip to content

style: fix includes IntegrationTests #381

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
MariusBgm wants to merge 1 commit into
base: main
Choose a base branch
from
Open

style: fix includes IntegrationTests #381

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion SilKit/IntegrationTests/ExtensionTests/DummyExtension.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion SilKit/IntegrationTests/ExtensionTests/DummyExtension.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

#pragma once

#include "SilKitExtensionBase.hpp"
#include "extensions/SilKitExtensionApi/SilKitExtensionBase.hpp"

struct DummyExtension : public SilKit::SilKitExtensionBase
{
Expand Down
6 changes: 3 additions & 3 deletions SilKit/IntegrationTests/ExtensionTests/ITest_SilKitExtensions.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"


Expand Down
4 changes: 2 additions & 2 deletions SilKit/IntegrationTests/ExtensionTests/WrongBuildSystem.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions SilKit/IntegrationTests/ExtensionTests/WrongVersionExtension.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion SilKit/IntegrationTests/ITest_Internals_DataPubSub.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

#include "ITest_Internals_DataPubSub.hpp"

#include "ParticipantConfigurationFromXImpl.hpp"
#include "config/ParticipantConfigurationFromXImpl.hpp"

namespace {

Expand Down
8 changes: 4 additions & 4 deletions SilKit/IntegrationTests/ITest_Internals_DataPubSub.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
4 changes: 2 additions & 2 deletions SilKit/IntegrationTests/ITest_Internals_ParticipantModes.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
8 changes: 4 additions & 4 deletions SilKit/IntegrationTests/ITest_Internals_RequestReply.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion SilKit/IntegrationTests/ITest_Internals_Rpc.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

#include "ITest_Internals_Rpc.hpp"

#include "ParticipantConfigurationFromXImpl.hpp"
#include "config/ParticipantConfigurationFromXImpl.hpp"

namespace {

Expand Down
6 changes: 3 additions & 3 deletions SilKit/IntegrationTests/ITest_Internals_Rpc.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
10 changes: 5 additions & 5 deletions SilKit/IntegrationTests/ITest_Internals_ServiceDiscovery.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
6 changes: 3 additions & 3 deletions SilKit/IntegrationTests/ITest_Internals_TargetedMessaging.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@
#include <future>

#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"
Expand Down
4 changes: 2 additions & 2 deletions SilKit/IntegrationTests/ITest_MultiThreadedParticipants.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
6 changes: 3 additions & 3 deletions SilKit/IntegrationTests/ITest_SystemMonitor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions SilKit/IntegrationTests/IntegrationTestInfrastructure.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion SilKit/IntegrationTests/InternalHelpers.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

#pragma once

#include "IParticipantInternal.hpp"
#include "core/internal/IParticipantInternal.hpp"


namespace SilKit {
Expand Down
Loading