iox-#1533 Port to non-deprecated API

iceoryx_binding_c/test/moduletests/test_chunk.cpp

@@ -27,6 +27,7 @@ extern "C" {
 
 namespace
 {
+using namespace ::testing;
 using namespace iox;
 using namespace iox::mepoo;
 using namespace iox::roudi_env;

iceoryx_binding_c/test/moduletests/test_node.cpp

@@ -29,6 +29,7 @@ extern "C" {
 
 namespace
 {
+using namespace ::testing;
 using namespace iox;
 using namespace iox::runtime;
 using namespace iox::roudi_env;

iceoryx_binding_c/test/moduletests/test_publisher.cpp

@@ -25,7 +25,7 @@
 #include "iceoryx_posh/internal/popo/ports/publisher_port_user.hpp"
 #include "iceoryx_posh/mepoo/mepoo_config.hpp"
 #include "iceoryx_posh/roudi_env/minimal_roudi_config.hpp"
-#include "iceoryx_posh/testing/roudi_environment/roudi_environment.hpp"
+#include "iceoryx_posh/roudi_env/roudi_env.hpp"
 
 using namespace iox;
 using namespace iox::popo;
@@ -144,7 +144,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{MinimalRouDiConfigBuilder().create()};
+    iox::roudi_env::RouDiEnv roudiEnv{MinimalRouDiConfigBuilder().create()};
 
     iox_runtime_init("hypnotoad");
 

iceoryx_binding_c/test/moduletests/test_runtime.cpp

@@ -26,6 +26,7 @@ extern "C" {
 
 namespace
 {
+using namespace ::testing;
 using namespace iox;
 using namespace iox::runtime;
 using namespace iox::roudi_env;

iceoryx_binding_c/test/moduletests/test_service_discovery.cpp

@@ -84,7 +84,7 @@ TEST_F(iox_service_discovery_test,
     ::testing::Test::RecordProperty("TEST_ID", "09a2cd6c-fba9-4b9d-af96-c5a6cc168d98");
 
     // let the roudi discovery loop run at least once
-    InterOpWait();
+    triggerDiscoveryLoopAndWaitToFinish();
 
     iox_service_discovery_find_service_apply_callable_with_context_data(
         sut, nullptr, nullptr, nullptr, findHandler, &searchResult, MessagingPattern_PUB_SUB);
@@ -104,7 +104,7 @@ TEST_F(iox_service_discovery_test, FindServiceWithCallableAndContextDataReturnsO
     ASSERT_NE(publisher, nullptr);
     const iox_service_description_t SERVICE_DESCRIPTION = iox_pub_get_service_description(publisher);
 
-    InterOpWait();
+    triggerDiscoveryLoopAndWaitToFinish();
 
     iox_service_discovery_find_service_apply_callable_with_context_data(sut,
                                                                         SERVICE_DESCRIPTION.serviceString,
@@ -125,7 +125,7 @@ TEST_F(iox_service_discovery_test, FindServiceWithCallableWithNullptrsForService
 {
     ::testing::Test::RecordProperty("TEST_ID", "ec565ca3-7494-42d7-9440-2000f1513759");
 
-    InterOpWait();
+    triggerDiscoveryLoopAndWaitToFinish();
 
     auto findHandler = [](const iox_service_description_t s) { EXPECT_THAT(s.instanceString, StrEq("RouDi_ID")); };
     iox_service_discovery_find_service_apply_callable(
@@ -141,7 +141,7 @@ TEST_F(iox_service_discovery_test, FindServiceWithCallableReturnsFindsCorrectSer
     auto* publisher = iox_pub_init(&storage, "service", "instance", "event", &options);
     ASSERT_NE(publisher, nullptr);
 
-    InterOpWait();
+    triggerDiscoveryLoopAndWaitToFinish();
 
     auto findHandler = [](const iox_service_description_t s) {
         EXPECT_THAT(s.serviceString, StrEq("service"));
@@ -158,7 +158,7 @@ TEST_F(iox_service_discovery_test, FindServiceWithNullptrsForServiceInstanceEven
 {
     ::testing::Test::RecordProperty("TEST_ID", "75b411d7-b8c7-42d5-8acd-3916fd172081");
 
-    InterOpWait();
+    triggerDiscoveryLoopAndWaitToFinish();
 
     const uint64_t SERVICE_CONTAINER_CAPACITY = 10U;
     iox_service_description_t serviceContainer[SERVICE_CONTAINER_CAPACITY];
@@ -190,7 +190,7 @@ TEST_F(iox_service_discovery_test, FindServiceReturnsOfferedService)
     ASSERT_NE(publisher, nullptr);
     const iox_service_description_t SERVICE_DESCRIPTION = iox_pub_get_service_description(publisher);
 
-    InterOpWait();
+    triggerDiscoveryLoopAndWaitToFinish();
 
     const uint64_t SERVICE_CONTAINER_CAPACITY = 10U;
     iox_service_description_t serviceContainer[SERVICE_CONTAINER_CAPACITY];
@@ -217,7 +217,7 @@ TEST_F(iox_service_discovery_test, FindServiceReturnsCorrectNumberOfServicesWhen
 {
     ::testing::Test::RecordProperty("TEST_ID", "01047b88-f257-447c-8c5e-9bef7c358433");
 
-    InterOpWait();
+    triggerDiscoveryLoopAndWaitToFinish();
 
     const uint64_t SERVICE_CONTAINER_CAPACITY = 3U;
     iox_service_description_t serviceContainer[SERVICE_CONTAINER_CAPACITY];

iceoryx_binding_c/test/moduletests/test_subscriber.cpp

@@ -27,7 +27,7 @@
 #include "iceoryx_posh/internal/popo/ports/subscriber_port_user.hpp"
 #include "iceoryx_posh/mepoo/mepoo_config.hpp"
 #include "iceoryx_posh/roudi_env/minimal_roudi_config.hpp"
-#include "iceoryx_posh/testing/roudi_environment/roudi_environment.hpp"
+#include "iceoryx_posh/roudi_env/roudi_env.hpp"
 #include "mocks/wait_set_mock.hpp"
 
 using namespace iox;
@@ -149,7 +149,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{MinimalRouDiConfigBuilder().create()};
+    RouDiEnv roudiEnv{MinimalRouDiConfigBuilder().create()};
 
     iox_runtime_init("hypnotoad");
 
@@ -406,7 +406,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{MinimalRouDiConfigBuilder().create()};
+    RouDiEnv roudiEnv{MinimalRouDiConfigBuilder().create()};
     iox_runtime_init("hypnotoad");
 
     iox_sub_storage_t storage;

iceoryx_posh/test/integrationtests/test_interface_port_stack_blowup.cpp

@@ -29,6 +29,7 @@ using namespace ::testing;
 
 using namespace iox::gw;
 using namespace iox::roudi_env;
+using namespace iox::testing;
 
 class InterfacePortRequestStackBlowup_test : public RouDi_GTest
 {

iceoryx_posh/test/integrationtests/test_popo_pub_sub_listener.cpp

@@ -31,6 +31,7 @@ using namespace iox::popo;
 using namespace iox::capro;
 using namespace iox::runtime;
 using namespace iox::roudi_env;
+using namespace iox::testing;
 
 void onSampleReceivedCallback(Subscriber<int>* subscriber IOX_MAYBE_UNUSED)
 {

iceoryx_posh/test/integrationtests/test_posh_mepoo.cpp

@@ -23,8 +23,8 @@
 #include "iceoryx_posh/popo/wait_set.hpp"
 #include "iceoryx_posh/roudi/introspection_types.hpp"
 #include "iceoryx_posh/roudi/roudi_app.hpp"
+#include "iceoryx_posh/roudi_env/roudi_env.hpp"
 #include "iceoryx_posh/runtime/posh_runtime.hpp"
-#include "iceoryx_posh/testing/roudi_environment/roudi_environment.hpp"
 #include "iox/duration.hpp"
 #include "iox/optional.hpp"
 
@@ -38,8 +38,8 @@ namespace
 {
 using namespace ::testing;
 using namespace iox::units::duration_literals;
+using namespace iox::roudi_env;
 using iox::mepoo::MePooConfig;
-using iox::roudi::RouDiEnvironment;
 
 class Mepoo_IntegrationTest : public Test
 {
@@ -115,7 +115,7 @@ class Mepoo_IntegrationTest : public Test
                const configType defaultconf = configType::DEFAULT)
     {
         auto config = createRouDiConfig(memPoolTestContainer, testMempoolConfig, defaultconf);
-        m_roudiEnv = iox::optional<RouDiEnvironment>(config);
+        m_roudiEnv.emplace(config);
 
         ASSERT_THAT(m_roudiEnv.has_value(), Eq(true));
 
@@ -133,7 +133,7 @@ class Mepoo_IntegrationTest : public Test
                         const configType defaultconf = configType::DEFAULT)
     {
         auto config = createRouDiConfig(memPoolTestContainer, testMempoolConfig, defaultconf);
-        m_roudiEnv = iox::optional<RouDiEnvironment>(config);
+        m_roudiEnv.emplace(config);
 
         ASSERT_THAT(m_roudiEnv.has_value(), Eq(true));
     }
@@ -347,7 +347,7 @@ class Mepoo_IntegrationTest : public Test
     iox::optional<iox::popo::PublisherPortUser> publisherPort;
     iox::optional<iox::popo::SubscriberPortUser> subscriberPort;
 
-    iox::optional<RouDiEnvironment> m_roudiEnv;
+    iox::optional<RouDiEnv> m_roudiEnv;
 };
 
 constexpr uint32_t Mepoo_IntegrationTest::DEFAULT_NUMBER_OF_CHUNKS;

iceoryx_posh/test/integrationtests/test_publisher_subscriber_communication.cpp

@@ -40,6 +40,7 @@ using namespace iox;
 using namespace iox::popo;
 using namespace iox::cxx;
 using namespace iox::roudi_env;
+using namespace iox::testing;
 
 template <typename T>
 struct ComplexDataType

iceoryx_posh/test/integrationtests/test_roudi_env.cpp

@@ -16,7 +16,7 @@
 
 
 #include "iceoryx_posh/roudi_env/minimal_roudi_config.hpp"
-#include "iceoryx_posh/testing/roudi_environment/roudi_environment.hpp"
+#include "iceoryx_posh/roudi_env/roudi_env.hpp"
 
 #include "test.hpp"
 

iceoryx_posh/test/integrationtests/test_service_discovery.cpp

@@ -196,7 +196,7 @@ TYPED_TEST(ServiceDiscovery_test, ReofferedServiceCanBeFound)
     const iox::capro::ServiceDescription SERVICE_DESCRIPTION("service", "instance", "event");
     typename TestFixture::CommunicationKind::Producer producer(SERVICE_DESCRIPTION);
 
-    this->InterOpWait();
+    this->triggerDiscoveryLoopAndWaitToFinish();
 
     this->findService(SERVICE_DESCRIPTION);
 
@@ -205,15 +205,15 @@ TYPED_TEST(ServiceDiscovery_test, ReofferedServiceCanBeFound)
 
     producer.stopOffer();
 
-    this->InterOpWait();
+    this->triggerDiscoveryLoopAndWaitToFinish();
 
     this->findService(SERVICE_DESCRIPTION);
 
     EXPECT_TRUE(serviceContainer.empty());
 
     producer.offer();
 
-    this->InterOpWait();
+    this->triggerDiscoveryLoopAndWaitToFinish();
 
     this->findService(SERVICE_DESCRIPTION);
 
@@ -228,7 +228,7 @@ TYPED_TEST(ServiceDiscovery_test, ServiceOfferedMultipleTimesCanBeFound)
     const iox::capro::ServiceDescription SERVICE_DESCRIPTION("service", "instance", "event");
     typename TestFixture::CommunicationKind::Producer producer(SERVICE_DESCRIPTION);
 
-    this->InterOpWait();
+    this->triggerDiscoveryLoopAndWaitToFinish();
 
     this->findService(SERVICE_DESCRIPTION);
 
@@ -237,7 +237,7 @@ TYPED_TEST(ServiceDiscovery_test, ServiceOfferedMultipleTimesCanBeFound)
 
     producer.offer();
 
-    this->InterOpWait();
+    this->triggerDiscoveryLoopAndWaitToFinish();
 
     this->findService(SERVICE_DESCRIPTION);
 
@@ -805,7 +805,7 @@ TYPED_TEST(ServiceDiscoveryFindService_test, FindWhenNothingOffered)
     ::testing::Test::RecordProperty("TEST_ID", "7f0bf2c0-5e96-4da6-b282-f84917bb5243");
 
     // ensure the discovery loop ran at least once
-    this->InterOpWait();
+    this->triggerDiscoveryLoopAndWaitToFinish();
 
     // Checks whether the reference implementation result matches the sut result if we call
     // findService({"a"}, {"b"}, {"c"}).
@@ -819,7 +819,7 @@ TYPED_TEST(ServiceDiscoveryFindService_test, FindWhenSingleServiceOffered)
     ::testing::Test::RecordProperty("TEST_ID", "aab09c10-8b1e-4f25-8f72-bd762b69f2cb");
     this->add({"a", "b", "c"});
 
-    this->InterOpWait();
+    this->triggerDiscoveryLoopAndWaitToFinish();
 
     this->testFindService({"a"}, {"b"}, {"c"});
 }
@@ -830,7 +830,7 @@ TYPED_TEST(ServiceDiscoveryFindService_test, FindWhenSingleServiceIsOfferedMulti
     this->add({"a", "b", "c"});
     this->add({"a", "b", "c"});
 
-    this->InterOpWait();
+    this->triggerDiscoveryLoopAndWaitToFinish();
 
     this->testFindService({"a"}, {"b"}, {"c"});
 }
@@ -843,7 +843,7 @@ TYPED_TEST(ServiceDiscoveryFindService_test, FindWhenMultipleServicesAreOffered)
     this->add({"aa", "a", "c"});
     this->add({"a", "ab", "a"});
 
-    this->InterOpWait();
+    this->triggerDiscoveryLoopAndWaitToFinish();
 
     this->testFindService({"aa"}, {"a"}, {"c"});
 }
@@ -854,7 +854,7 @@ TYPED_TEST(ServiceDiscoveryFindService_test, FindWhenMultipleInstancesOfTheSameS
     this->add({"a", "b", "c"});
     this->add({"a", "d", "c"});
 
-    this->InterOpWait();
+    this->triggerDiscoveryLoopAndWaitToFinish();
 
     this->testFindService({"a"}, {"d"}, {"c"});
 }
@@ -867,7 +867,7 @@ TYPED_TEST(ServiceDiscoveryFindService_test, RepeatedSearchYieldsSameResult)
     this->add({"aa", "a", "c"});
     this->add({"a", "ab", "a"});
 
-    this->InterOpWait();
+    this->triggerDiscoveryLoopAndWaitToFinish();
 
     this->testFindService({"a"}, {"b"}, {"aa"});
     auto previousResult = serviceContainer;
@@ -881,7 +881,7 @@ TYPED_TEST(ServiceDiscoveryFindService_test, FindNonExistingService)
     ::testing::Test::RecordProperty("TEST_ID", "6f953d0d-bae3-45a1-82e7-c78a32b6d365");
     this->add({"a", "b", "c"});
 
-    this->InterOpWait();
+    this->triggerDiscoveryLoopAndWaitToFinish();
 
     // those are all representatives of equivalence classes of mismatches
     // that hould not be found
@@ -906,7 +906,7 @@ TYPED_TEST(ServiceDiscoveryFindService_test, FindNonExistingServiceAmongMultiple
     this->add({"x", "b", "x"});
     this->add({"x", "x", "x"});
 
-    this->InterOpWait();
+    this->triggerDiscoveryLoopAndWaitToFinish();
 
     this->testFindService({"a"}, {"b"}, {"c"});
 }
@@ -956,7 +956,7 @@ TYPED_TEST(ServiceDiscoveryFindService_test, FindInMaximumServices)
 
     EXPECT_EQ(created, MAX);
 
-    this->InterOpWait();
+    this->triggerDiscoveryLoopAndWaitToFinish();
 
     // search for specific services we inserted at various times (includes wildcard searches etc.):
     // find first offered service, last offered service and some service offered inbetween
@@ -975,7 +975,7 @@ TYPED_TEST(ServiceDiscoveryFindService_test, SameServerAndPublisherCanBeFound)
     this->add({"Ferdinand", "Schnüffel", "Spitz"});
     this->addOther({"Ferdinand", "Schnüffel", "Spitz"});
 
-    this->InterOpWait();
+    this->triggerDiscoveryLoopAndWaitToFinish();
 
     this->testFindService({"Ferdinand"}, {"Schnüffel"}, {"Spitz"});
 }
@@ -986,7 +986,7 @@ TYPED_TEST(ServiceDiscoveryFindService_test, OtherServiceKindWithMatchingNameIsN
     this->add({"Schnüffel", "Ferdinand", "Spitz"});
     this->addOther({"Ferdinand", "Schnüffel", "Spitz"});
 
-    this->InterOpWait();
+    this->triggerDiscoveryLoopAndWaitToFinish();
 
     this->testFindService({"Ferdinand"}, {"Schnüffel"}, {"Spitz"});
 }
@@ -1070,7 +1070,7 @@ TYPED_TEST(ServiceDiscoveryFindService_test, FindInMaximumMixedServices)
 
     EXPECT_EQ(created, OTHER_MAX);
 
-    this->InterOpWait();
+    this->triggerDiscoveryLoopAndWaitToFinish();
 
     // now we have the maximum of services of both kinds with semi-random services
 

iceoryx_posh/test/moduletests/test_posh_runtime.cpp

@@ -26,9 +26,9 @@
 #include "iceoryx_posh/popo/untyped_client.hpp"
 #include "iceoryx_posh/popo/untyped_server.hpp"
 #include "iceoryx_posh/roudi_env/minimal_roudi_config.hpp"
+#include "iceoryx_posh/roudi_env/roudi_env.hpp"
 #include "iceoryx_posh/runtime/posh_runtime.hpp"
 #include "iceoryx_posh/testing/mocks/posh_runtime_mock.hpp"
-#include "iceoryx_posh/testing/roudi_environment/roudi_environment.hpp"
 #include "test.hpp"
 
 #include <type_traits>
@@ -42,7 +42,6 @@ using namespace iox::cxx;
 using namespace iox;
 using namespace iox::popo;
 using namespace iox::roudi_env;
-using iox::roudi::RouDiEnvironment;
 
 class PoshRuntime_test : public Test
 {
@@ -106,7 +105,7 @@ class PoshRuntime_test : public Test
     }
 
     const iox::RuntimeName_t m_runtimeName{"publisher"};
-    RouDiEnvironment m_roudiEnv{MinimalRouDiConfigBuilder().create()};
+    RouDiEnv m_roudiEnv{MinimalRouDiConfigBuilder().create()};
     PoshRuntime* m_runtime{&iox::runtime::PoshRuntime::initRuntime(m_runtimeName)};
     IpcMessage m_sendBuffer;
     IpcMessage m_receiveBuffer;