diff --git a/iceoryx_binding_c/test/moduletests/test_chunk.cpp b/iceoryx_binding_c/test/moduletests/test_chunk.cpp index 1bee6d09e73..cc0864db4e2 100644 --- a/iceoryx_binding_c/test/moduletests/test_chunk.cpp +++ b/iceoryx_binding_c/test/moduletests/test_chunk.cpp @@ -22,6 +22,7 @@ extern "C" { #include "iceoryx_hoofs/error_handling/error_handling.hpp" #include "iceoryx_hoofs/testing/fatal_failure.hpp" +#include "iceoryx_posh/testing/roudi_environment/minimal_roudi_config.hpp" #include "iceoryx_posh/testing/roudi_gtest.hpp" namespace @@ -33,6 +34,11 @@ using namespace iox::testing; class Chunk_test : public RouDi_GTest { public: + Chunk_test() + : RouDi_GTest(MinimalRouDiConfigBuilder().create()) + { + } + void SetUp() override { iox_runtime_init("hypnotoad"); diff --git a/iceoryx_binding_c/test/moduletests/test_node.cpp b/iceoryx_binding_c/test/moduletests/test_node.cpp index 7c0627e6c2c..7dc156b68fc 100644 --- a/iceoryx_binding_c/test/moduletests/test_node.cpp +++ b/iceoryx_binding_c/test/moduletests/test_node.cpp @@ -18,6 +18,7 @@ #include "iceoryx_hoofs/error_handling/error_handling.hpp" #include "iceoryx_hoofs/testing/fatal_failure.hpp" #include "iceoryx_posh/runtime/posh_runtime.hpp" +#include "iceoryx_posh/testing/roudi_environment/minimal_roudi_config.hpp" #include "iceoryx_posh/testing/roudi_gtest.hpp" #include @@ -35,6 +36,11 @@ using namespace iox::testing; class iox_node_test : public RouDi_GTest { public: + iox_node_test() + : RouDi_GTest(MinimalRouDiConfigBuilder().create()) + { + } + void SetUp() { iox_runtime_init(m_runtimeName.c_str()); diff --git a/iceoryx_binding_c/test/moduletests/test_publisher.cpp b/iceoryx_binding_c/test/moduletests/test_publisher.cpp index 2bcaa2efbda..6fbe0103ca2 100644 --- a/iceoryx_binding_c/test/moduletests/test_publisher.cpp +++ b/iceoryx_binding_c/test/moduletests/test_publisher.cpp @@ -24,6 +24,7 @@ #include "iceoryx_posh/internal/popo/ports/publisher_port_roudi.hpp" #include "iceoryx_posh/internal/popo/ports/publisher_port_user.hpp" #include "iceoryx_posh/mepoo/mepoo_config.hpp" +#include "iceoryx_posh/testing/roudi_environment/minimal_roudi_config.hpp" #include "iceoryx_posh/testing/roudi_environment/roudi_environment.hpp" using namespace iox; @@ -142,7 +143,7 @@ TEST(iox_pub_test_DeathTest, initPublisherWithNotInitializedPublisherOptionsTerm TEST_F(iox_pub_test, initPublisherWithDefaultOptionsWorks) { ::testing::Test::RecordProperty("TEST_ID", "d2e677cd-2fcc-47a2-80e6-2d08245b7c1a"); - iox::roudi::RouDiEnvironment roudiEnv; + iox::roudi::RouDiEnvironment roudiEnv{MinimalRouDiConfigBuilder().create()}; iox_runtime_init("hypnotoad"); diff --git a/iceoryx_binding_c/test/moduletests/test_runtime.cpp b/iceoryx_binding_c/test/moduletests/test_runtime.cpp index 75ddc4b64da..11fb1ce8483 100644 --- a/iceoryx_binding_c/test/moduletests/test_runtime.cpp +++ b/iceoryx_binding_c/test/moduletests/test_runtime.cpp @@ -21,6 +21,7 @@ extern "C" { #include "iceoryx_hoofs/error_handling/error_handling.hpp" #include "iceoryx_hoofs/testing/fatal_failure.hpp" #include "iceoryx_posh/iceoryx_posh_types.hpp" +#include "iceoryx_posh/testing/roudi_environment/minimal_roudi_config.hpp" #include "iceoryx_posh/testing/roudi_gtest.hpp" namespace @@ -32,6 +33,11 @@ using namespace iox::testing; class BindingC_Runtime_test : public RouDi_GTest { public: + BindingC_Runtime_test() + : RouDi_GTest(MinimalRouDiConfigBuilder().create()) + { + } + void SetUp() { } diff --git a/iceoryx_binding_c/test/moduletests/test_subscriber.cpp b/iceoryx_binding_c/test/moduletests/test_subscriber.cpp index 1f9a648f236..4b91a7ceb5d 100644 --- a/iceoryx_binding_c/test/moduletests/test_subscriber.cpp +++ b/iceoryx_binding_c/test/moduletests/test_subscriber.cpp @@ -26,6 +26,7 @@ #include "iceoryx_posh/internal/popo/ports/subscriber_port_single_producer.hpp" #include "iceoryx_posh/internal/popo/ports/subscriber_port_user.hpp" #include "iceoryx_posh/mepoo/mepoo_config.hpp" +#include "iceoryx_posh/testing/roudi_environment/minimal_roudi_config.hpp" #include "iceoryx_posh/testing/roudi_environment/roudi_environment.hpp" #include "mocks/wait_set_mock.hpp" @@ -147,7 +148,7 @@ TEST_F(iox_sub_test, initSubscriberWithNotInitializedSubscriberOptionsTerminates TEST_F(iox_sub_test, initSubscriberWithDefaultOptionsWorks) { ::testing::Test::RecordProperty("TEST_ID", "40eaa006-4781-46cd-bde3-40fa7d572f29"); - iox::roudi::RouDiEnvironment roudiEnv; + iox::roudi::RouDiEnvironment roudiEnv{MinimalRouDiConfigBuilder().create()}; iox_runtime_init("hypnotoad"); @@ -404,7 +405,7 @@ TEST_F(iox_sub_test, hasDataTriggersWaitSetWithCorrectCallback) TEST_F(iox_sub_test, deinitSubscriberDetachesTriggerFromWaitSet) { ::testing::Test::RecordProperty("TEST_ID", "93e350fb-5430-43ff-982b-b43c6ae9b890"); - iox::roudi::RouDiEnvironment roudiEnv; + iox::roudi::RouDiEnvironment roudiEnv{MinimalRouDiConfigBuilder().create()}; iox_runtime_init("hypnotoad"); iox_sub_storage_t storage; diff --git a/iceoryx_posh/test/integrationtests/test_client_server.cpp b/iceoryx_posh/test/integrationtests/test_client_server.cpp index dd46b583e44..9540b09af99 100644 --- a/iceoryx_posh/test/integrationtests/test_client_server.cpp +++ b/iceoryx_posh/test/integrationtests/test_client_server.cpp @@ -21,6 +21,7 @@ #include "iceoryx_posh/popo/untyped_client.hpp" #include "iceoryx_posh/popo/untyped_server.hpp" #include "iceoryx_posh/runtime/posh_runtime.hpp" +#include "iceoryx_posh/testing/roudi_environment/minimal_roudi_config.hpp" #include "iceoryx_posh/testing/roudi_gtest.hpp" #include "test.hpp" @@ -32,6 +33,7 @@ using namespace ::testing; using namespace iox::popo; using namespace iox::capro; using namespace iox::runtime; +using namespace iox::testing; class DummyRequest { @@ -60,6 +62,11 @@ class DummyResponse class ClientServer_test : public RouDi_GTest { public: + ClientServer_test() + : RouDi_GTest(MinimalRouDiConfigBuilder().create()) + { + } + void SetUp() override { PoshRuntime::initRuntime("together"); diff --git a/iceoryx_posh/test/integrationtests/test_interface_port_stack_blowup.cpp b/iceoryx_posh/test/integrationtests/test_interface_port_stack_blowup.cpp index 4fef00149a0..0c2f822789f 100644 --- a/iceoryx_posh/test/integrationtests/test_interface_port_stack_blowup.cpp +++ b/iceoryx_posh/test/integrationtests/test_interface_port_stack_blowup.cpp @@ -18,6 +18,7 @@ #include "iceoryx_posh/gateway/gateway_base.hpp" #include "iceoryx_posh/runtime/posh_runtime.hpp" +#include "iceoryx_posh/testing/roudi_environment/minimal_roudi_config.hpp" #include "iceoryx_posh/testing/roudi_gtest.hpp" #include "test.hpp" @@ -27,10 +28,16 @@ namespace using namespace ::testing; using namespace iox::gw; +using namespace iox::testing; class InterfacePortRequestStackBlowup_test : public RouDi_GTest { public: + InterfacePortRequestStackBlowup_test() + : RouDi_GTest(MinimalRouDiConfigBuilder().create()) + { + } + void SetUp(){}; void TearDown(){}; }; diff --git a/iceoryx_posh/test/integrationtests/test_popo_pub_sub_listener.cpp b/iceoryx_posh/test/integrationtests/test_popo_pub_sub_listener.cpp index 9a0cd09c934..4658d1c4e71 100644 --- a/iceoryx_posh/test/integrationtests/test_popo_pub_sub_listener.cpp +++ b/iceoryx_posh/test/integrationtests/test_popo_pub_sub_listener.cpp @@ -18,6 +18,7 @@ #include "iceoryx_posh/popo/publisher.hpp" #include "iceoryx_posh/popo/subscriber.hpp" #include "iceoryx_posh/popo/untyped_subscriber.hpp" +#include "iceoryx_posh/testing/roudi_environment/minimal_roudi_config.hpp" #include "iceoryx_posh/testing/roudi_gtest.hpp" #include "test.hpp" @@ -29,6 +30,7 @@ using namespace ::testing; using namespace iox::popo; using namespace iox::capro; using namespace iox::runtime; +using namespace iox::testing; void onSampleReceivedCallback(Subscriber* subscriber IOX_MAYBE_UNUSED) { @@ -41,6 +43,11 @@ void onSampleReceivedCallbackForUntypedSub(UntypedSubscriber* subscriber IOX_MAY class PubSubListener_IntegrationTest : public RouDi_GTest { public: + PubSubListener_IntegrationTest() + : RouDi_GTest(MinimalRouDiConfigBuilder().create()) + { + } + void SetUp() override { PoshRuntime::initRuntime("PubSubListener_IntegrationTest"); diff --git a/iceoryx_posh/test/integrationtests/test_roudi_roudi_environment.cpp b/iceoryx_posh/test/integrationtests/test_roudi_roudi_environment.cpp index 20377de3947..390d8568430 100644 --- a/iceoryx_posh/test/integrationtests/test_roudi_roudi_environment.cpp +++ b/iceoryx_posh/test/integrationtests/test_roudi_roudi_environment.cpp @@ -15,6 +15,7 @@ // SPDX-License-Identifier: Apache-2.0 +#include "iceoryx_posh/testing/roudi_environment/minimal_roudi_config.hpp" #include "iceoryx_posh/testing/roudi_environment/roudi_environment.hpp" #include "test.hpp" @@ -23,6 +24,7 @@ namespace { using namespace ::testing; using namespace iox::roudi; +using namespace iox::testing; class RouDiEnvironment_test : public Test { @@ -34,8 +36,8 @@ class RouDiEnvironment_test : public Test TEST_F(RouDiEnvironment_test, StartingRouDiTwiceLeadsToError) { ::testing::Test::RecordProperty("TEST_ID", "38075292-7897-4db5-b20e-f06ab324ad31"); - RouDiEnvironment m_sut{iox::RouDiConfig_t().setDefaults()}; - EXPECT_DEATH({ RouDiEnvironment m_sut2{iox::RouDiConfig_t().setDefaults()}; }, ".*"); + RouDiEnvironment m_sut{MinimalRouDiConfigBuilder().create()}; + EXPECT_DEATH({ RouDiEnvironment m_sut2{MinimalRouDiConfigBuilder().create()}; }, ".*"); } } // namespace diff --git a/iceoryx_posh/test/moduletests/test_popo_trigger_handle.cpp b/iceoryx_posh/test/moduletests/test_popo_trigger_handle.cpp index a242351444d..1f06533b7f0 100644 --- a/iceoryx_posh/test/moduletests/test_popo_trigger_handle.cpp +++ b/iceoryx_posh/test/moduletests/test_popo_trigger_handle.cpp @@ -18,6 +18,7 @@ #include "iceoryx_posh/internal/popo/building_blocks/condition_listener.hpp" #include "iceoryx_posh/internal/popo/building_blocks/condition_variable_data.hpp" #include "iceoryx_posh/popo/trigger_handle.hpp" +#include "iox/deadline_timer.hpp" #include "test.hpp" #include @@ -122,18 +123,25 @@ TEST_F(TriggerHandle_test, triggerNotifiesConditionVariable) ::testing::Test::RecordProperty("TEST_ID", "11e752c8-d473-4bfd-b973-869c3b2d9fbc"); std::atomic_int stage{0}; + iox::deadline_timer timeout{100_ms}; + std::thread t([&] { - ConditionListener(m_condVar).wait(); stage.store(1); + ConditionListener(m_condVar).wait(); }); - std::this_thread::sleep_for(std::chrono::milliseconds(100)); - EXPECT_EQ(stage.load(), 0); + while (!timeout.hasExpired() && stage.load() < 1) + { + std::this_thread::yield(); + } + ASSERT_FALSE(timeout.hasExpired()); + EXPECT_THAT(stage.load(), Eq(1)); + std::this_thread::sleep_for(std::chrono::milliseconds(10)); + EXPECT_THAT(stage.load(), Eq(1)); m_sut.trigger(); - std::this_thread::sleep_for(std::chrono::milliseconds(100)); - EXPECT_EQ(stage.load(), 1); - t.join(); + + EXPECT_FALSE(timeout.hasExpired()); } TEST_F(TriggerHandle_test, wasTriggeredReturnsFalseAfterCreation) diff --git a/iceoryx_posh/test/moduletests/test_posh_runtime.cpp b/iceoryx_posh/test/moduletests/test_posh_runtime.cpp index 9ec98d65743..c9923c9a1be 100644 --- a/iceoryx_posh/test/moduletests/test_posh_runtime.cpp +++ b/iceoryx_posh/test/moduletests/test_posh_runtime.cpp @@ -27,6 +27,7 @@ #include "iceoryx_posh/popo/untyped_server.hpp" #include "iceoryx_posh/runtime/posh_runtime.hpp" #include "iceoryx_posh/testing/mocks/posh_runtime_mock.hpp" +#include "iceoryx_posh/testing/roudi_environment/minimal_roudi_config.hpp" #include "iceoryx_posh/testing/roudi_environment/roudi_environment.hpp" #include "test.hpp" @@ -40,6 +41,7 @@ using namespace iox::capro; using namespace iox::cxx; using namespace iox; using namespace iox::popo; +using namespace iox::testing; using iox::roudi::RouDiEnvironment; class PoshRuntime_test : public Test @@ -104,7 +106,7 @@ class PoshRuntime_test : public Test } const iox::RuntimeName_t m_runtimeName{"publisher"}; - RouDiEnvironment m_roudiEnv{iox::RouDiConfig_t().setDefaults()}; + RouDiEnvironment m_roudiEnv{MinimalRouDiConfigBuilder().create()}; PoshRuntime* m_runtime{&iox::runtime::PoshRuntime::initRuntime(m_runtimeName)}; IpcMessage m_sendBuffer; IpcMessage m_receiveBuffer; diff --git a/iceoryx_posh/test/moduletests/test_posh_runtime_node.cpp b/iceoryx_posh/test/moduletests/test_posh_runtime_node.cpp index b5334558387..bf3d7db4ac7 100644 --- a/iceoryx_posh/test/moduletests/test_posh_runtime_node.cpp +++ b/iceoryx_posh/test/moduletests/test_posh_runtime_node.cpp @@ -17,6 +17,7 @@ #include "iceoryx_posh/runtime/node.hpp" #include "iceoryx_posh/runtime/posh_runtime.hpp" +#include "iceoryx_posh/testing/roudi_environment/minimal_roudi_config.hpp" #include "iceoryx_posh/testing/roudi_environment/roudi_environment.hpp" #include "test.hpp" @@ -26,6 +27,7 @@ namespace using namespace ::testing; using namespace iox::runtime; using namespace iox::roudi; +using namespace iox::testing; using namespace iox; /// @brief Test goal: This test suit verifies class node @@ -46,7 +48,7 @@ class PoshRuntimeNode_test : public Test virtual void TearDown(){}; const RuntimeName_t m_runtimeName{"App"}; - RouDiEnvironment m_roudiEnv{iox::RouDiConfig_t().setDefaults()}; + RouDiEnvironment m_roudiEnv{MinimalRouDiConfigBuilder().create()}; PoshRuntime* m_runtime{&iox::runtime::PoshRuntime::initRuntime(m_runtimeName)}; }; diff --git a/iceoryx_posh/test/moduletests/test_posh_runtime_single_process.cpp b/iceoryx_posh/test/moduletests/test_posh_runtime_single_process.cpp index 37eb4bf2b7d..d33d5a0fee3 100644 --- a/iceoryx_posh/test/moduletests/test_posh_runtime_single_process.cpp +++ b/iceoryx_posh/test/moduletests/test_posh_runtime_single_process.cpp @@ -16,6 +16,7 @@ // SPDX-License-Identifier: Apache-2.0 #include "iceoryx_posh/runtime/posh_runtime_single_process.hpp" +#include "iceoryx_posh/testing/roudi_environment/minimal_roudi_config.hpp" #include "iceoryx_posh/testing/roudi_environment/roudi_environment.hpp" #include "test.hpp" @@ -25,6 +26,7 @@ namespace using namespace ::testing; using namespace iox::runtime; using namespace iox::roudi; +using namespace iox::testing; using namespace iox; /// @brief Test goal: This test suit verifies class posh_runtime_single_process @@ -48,8 +50,8 @@ class PoshRuntimeSingleProcess_test : public Test TEST_F(PoshRuntimeSingleProcess_test, ConstructorPoshRuntimeSingleProcessIsSuccess) { ::testing::Test::RecordProperty("TEST_ID", "9faf7053-86af-4d26-b3a7-fb3c6319ab86"); - iox::RouDiConfig_t defaultRouDiConfig = iox::RouDiConfig_t().setDefaults(); - std::unique_ptr roudiComponents{new IceOryxRouDiComponents(defaultRouDiConfig)}; + std::unique_ptr roudiComponents{ + new IceOryxRouDiComponents(MinimalRouDiConfigBuilder().create())}; std::unique_ptr roudi{new RouDi(roudiComponents->rouDiMemoryManager, roudiComponents->portManager, @@ -64,7 +66,7 @@ TEST_F(PoshRuntimeSingleProcess_test, ConstructorPoshRuntimeSingleProcessIsSucce TEST_F(PoshRuntimeSingleProcess_test, ConstructorPoshRuntimeSingleProcessMultipleProcessIsFound) { ::testing::Test::RecordProperty("TEST_ID", "1cc7ad5d-5878-454a-94ba-5cf412c22682"); - RouDiEnvironment roudiEnv{iox::RouDiConfig_t().setDefaults()}; + RouDiEnvironment roudiEnv{MinimalRouDiConfigBuilder().create()}; const RuntimeName_t runtimeName{"App"}; diff --git a/iceoryx_posh/test/moduletests/test_roudi_iceoyx_roudi_memory_manager.cpp b/iceoryx_posh/test/moduletests/test_roudi_iceoyx_roudi_memory_manager.cpp index cfc43673211..0ddd28969ad 100644 --- a/iceoryx_posh/test/moduletests/test_roudi_iceoyx_roudi_memory_manager.cpp +++ b/iceoryx_posh/test/moduletests/test_roudi_iceoyx_roudi_memory_manager.cpp @@ -18,11 +18,13 @@ #include "test.hpp" #include "iceoryx_posh/roudi/memory/iceoryx_roudi_memory_manager.hpp" +#include "iceoryx_posh/testing/roudi_environment/minimal_roudi_config.hpp" namespace { using namespace ::testing; +using namespace iox::testing; using iox::roudi::IceOryxRouDiMemoryManager; /// @brief This test file verifies that the BaseClass IceoryxRouDiMemoryManager is tested @@ -33,8 +35,8 @@ class IceoryxRoudiMemoryManager_test : public Test void SetUp() override { - auto config = iox::RouDiConfig_t().setDefaults(); - m_roudiMemoryManagerTest = std::unique_ptr(new IceOryxRouDiMemoryManager(config)); + m_roudiMemoryManagerTest = std::unique_ptr( + new IceOryxRouDiMemoryManager(MinimalRouDiConfigBuilder().create())); } void TearDown() override diff --git a/iceoryx_posh/test/moduletests/test_roudi_portmanager_fixture.hpp b/iceoryx_posh/test/moduletests/test_roudi_portmanager_fixture.hpp index fe8082ea229..46c2f29cf5d 100644 --- a/iceoryx_posh/test/moduletests/test_roudi_portmanager_fixture.hpp +++ b/iceoryx_posh/test/moduletests/test_roudi_portmanager_fixture.hpp @@ -29,6 +29,7 @@ #include "iceoryx_posh/popo/client_options.hpp" #include "iceoryx_posh/popo/server_options.hpp" #include "iceoryx_posh/roudi/memory/iceoryx_roudi_memory_manager.hpp" +#include "iceoryx_posh/testing/roudi_environment/minimal_roudi_config.hpp" #include "test.hpp" @@ -43,6 +44,7 @@ using namespace iox::capro; using namespace iox::cxx; using namespace iox::popo; using namespace iox::roudi; +using namespace iox::testing; using iox::runtime::PortConfigInfo; @@ -84,8 +86,7 @@ class PortManager_test : public Test m_eventIdCounter = 0; // starting at {1,1,1} - auto config = iox::RouDiConfig_t().setDefaults(); - m_roudiMemoryManager = new IceOryxRouDiMemoryManager(config); + m_roudiMemoryManager = new IceOryxRouDiMemoryManager(MinimalRouDiConfigBuilder().create()); EXPECT_FALSE(m_roudiMemoryManager->createAndAnnounceMemory().has_error()); m_portManager = new PortManagerTester(m_roudiMemoryManager); diff --git a/iceoryx_posh/test/moduletests/test_roudi_process_manager.cpp b/iceoryx_posh/test/moduletests/test_roudi_process_manager.cpp index 86d6a202312..0abb93f13f4 100644 --- a/iceoryx_posh/test/moduletests/test_roudi_process_manager.cpp +++ b/iceoryx_posh/test/moduletests/test_roudi_process_manager.cpp @@ -23,6 +23,7 @@ #include "iceoryx_posh/mepoo/mepoo_config.hpp" #include "iceoryx_posh/roudi/memory/iceoryx_roudi_memory_manager.hpp" #include "iceoryx_posh/roudi/memory/roudi_memory_interface.hpp" +#include "iceoryx_posh/testing/roudi_environment/minimal_roudi_config.hpp" #include "iceoryx_posh/version/compatibility_check_level.hpp" #include "iox/string.hpp" #include "test.hpp" @@ -34,6 +35,7 @@ using namespace iox::roudi; using namespace iox::popo; using namespace iox::runtime; using namespace iox::posix; +using namespace iox::testing; using namespace iox::version; class ProcessManager_test : public Test @@ -41,8 +43,7 @@ class ProcessManager_test : public Test public: void SetUp() override { - auto config = iox::RouDiConfig_t().setDefaults(); - m_roudiMemoryManager = std::make_unique(config); + m_roudiMemoryManager = std::make_unique(MinimalRouDiConfigBuilder().create()); EXPECT_FALSE(m_roudiMemoryManager->createAndAnnounceMemory().has_error()); m_portManager = std::make_unique(m_roudiMemoryManager.get()); CompatibilityCheckLevel m_compLevel{CompatibilityCheckLevel::OFF};