iox-eclipse-iceoryx#1533 Introduce the 'roudi_env' namespace

elBoberido · Sep 7, 2023 · 6e5784c · 6e5784c
1 parent 6e159a4
commit 6e5784c
Show file tree

Hide file tree

Showing 29 changed files with 53 additions and 37 deletions.
diff --git a/iceoryx_binding_c/test/moduletests/test_chunk.cpp b/iceoryx_binding_c/test/moduletests/test_chunk.cpp
@@ -29,6 +29,7 @@ namespace
 {
 using namespace iox;
 using namespace iox::mepoo;
+using namespace iox::roudi_env;
 using namespace iox::testing;
 
 class Chunk_test : public RouDi_GTest

diff --git a/iceoryx_binding_c/test/moduletests/test_node.cpp b/iceoryx_binding_c/test/moduletests/test_node.cpp
@@ -31,6 +31,7 @@ namespace
 {
 using namespace iox;
 using namespace iox::runtime;
+using namespace iox::roudi_env;
 using namespace iox::testing;
 
 class iox_node_test : public RouDi_GTest

diff --git a/iceoryx_binding_c/test/moduletests/test_publisher.cpp b/iceoryx_binding_c/test/moduletests/test_publisher.cpp
@@ -42,6 +42,7 @@ namespace
 {
 using namespace ::testing;
 using namespace iox::testing;
+using namespace iox::roudi_env;
 using namespace iox::capro;
 using namespace iox::cxx;
 using namespace iox::mepoo;

diff --git a/iceoryx_binding_c/test/moduletests/test_runtime.cpp b/iceoryx_binding_c/test/moduletests/test_runtime.cpp
@@ -28,6 +28,7 @@ namespace
 {
 using namespace iox;
 using namespace iox::runtime;
+using namespace iox::roudi_env;
 using namespace iox::testing;
 
 class BindingC_Runtime_test : public RouDi_GTest

diff --git a/iceoryx_binding_c/test/moduletests/test_service_discovery.cpp b/iceoryx_binding_c/test/moduletests/test_service_discovery.cpp
@@ -22,6 +22,7 @@
 
 using namespace iox;
 using namespace iox::runtime;
+using namespace iox::roudi_env;
 using namespace iox::testing;
 
 extern "C" {

diff --git a/iceoryx_binding_c/test/moduletests/test_subscriber.cpp b/iceoryx_binding_c/test/moduletests/test_subscriber.cpp
@@ -32,6 +32,7 @@
 
 using namespace iox;
 using namespace iox::popo;
+using namespace iox::roudi_env;
 using namespace iox::testing;
 
 extern "C" {

diff --git a/iceoryx_posh/include/iceoryx_posh/internal/runtime/posh_runtime_impl.hpp b/iceoryx_posh/include/iceoryx_posh/internal/runtime/posh_runtime_impl.hpp
@@ -83,7 +83,7 @@ class PoshRuntimeImpl : public PoshRuntime
 
   protected:
     friend class PoshRuntime;
-    friend class roudi::RuntimeTestInterface;
+    friend class roudi_env::RuntimeTestInterface;
 
     // Protected constructor for IPC setup
     PoshRuntimeImpl(optional<const RuntimeName_t*> name,

diff --git a/iceoryx_posh/include/iceoryx_posh/runtime/posh_runtime.hpp b/iceoryx_posh/include/iceoryx_posh/runtime/posh_runtime.hpp
@@ -38,10 +38,10 @@
 
 namespace iox
 {
-namespace roudi
+namespace roudi_env
 {
 class RuntimeTestInterface;
-} // namespace roudi
+} // namespace roudi_env
 
 namespace runtime
 {
@@ -159,7 +159,7 @@ class PoshRuntime
     virtual bool sendRequestToRouDi(const IpcMessage& msg, IpcMessage& answer) noexcept = 0;
 
   protected:
-    friend class roudi::RuntimeTestInterface;
+    friend class roudi_env::RuntimeTestInterface;
     using factory_t = PoshRuntime& (*)(optional<const RuntimeName_t*>);
 
     // Protected constructor for derived classes

diff --git a/iceoryx_posh/roudi_env/include/iceoryx_posh/roudi_env/minimal_roudi_config.hpp b/iceoryx_posh/roudi_env/include/iceoryx_posh/roudi_env/minimal_roudi_config.hpp
@@ -22,7 +22,7 @@
 
 namespace iox
 {
-namespace testing
+namespace roudi_env
 {
 /// @brief Builder for a minimal RouDiConfig_t with only one MemPool. This significantly speeds up tests which create a
 /// shared memory.
@@ -44,7 +44,7 @@ class MinimalRouDiConfigBuilder
     /// @brief creates the previously configured RouDiConfig_t
     RouDiConfig_t create() const noexcept;
 };
-} // namespace testing
+} // namespace roudi_env
 } // namespace iox
 
 #endif // IOX_POSH_ROUDI_ENV_MINIMAL_ROUDI_CONFIG_HPP
diff --git a/iceoryx_posh/roudi_env/include/iceoryx_posh/roudi_env/roudi_environment.hpp b/iceoryx_posh/roudi_env/include/iceoryx_posh/roudi_env/roudi_environment.hpp
@@ -35,6 +35,9 @@ namespace iox
 namespace roudi
 {
 class RouDi;
+}
+namespace roudi_env
+{
 
 class RouDiEnvironment
 {
@@ -73,11 +76,11 @@ class RouDiEnvironment
 #else
     iox::units::Duration m_interOpWaitingTimeout{iox::units::Duration::fromMilliseconds(200)};
 #endif
-    std::unique_ptr<IceOryxRouDiComponents> m_roudiComponents;
-    std::unique_ptr<RouDi> m_roudiApp;
+    std::unique_ptr<roudi::IceOryxRouDiComponents> m_roudiComponents;
+    std::unique_ptr<roudi::RouDi> m_roudiApp;
 };
 
-} // namespace roudi
+} // namespace roudi_env
 } // namespace iox
 
 #endif // IOX_POSH_ROUDI_ENV_ROUDI_ENVIRONMENT_HPP
diff --git a/iceoryx_posh/roudi_env/include/iceoryx_posh/roudi_env/runtime_test_interface.hpp b/iceoryx_posh/roudi_env/include/iceoryx_posh/roudi_env/runtime_test_interface.hpp
@@ -29,7 +29,7 @@ namespace runtime
 {
 class PoshRuntime;
 }
-namespace roudi
+namespace roudi_env
 {
 class RuntimeTestInterface
 {
@@ -83,7 +83,7 @@ class RuntimeTestInterface
     void eraseRuntime(const RuntimeName_t& name);
 };
 
-} // namespace roudi
+} // namespace roudi_env
 } // namespace iox
 
 #endif // IOX_POSH_ROUDI_ENVIRONMENT_RUNTIME_TEST_INTERFACE_HPP
diff --git a/iceoryx_posh/roudi_env/source/minimal_roudi_config.cpp b/iceoryx_posh/roudi_env/source/minimal_roudi_config.cpp
@@ -18,7 +18,7 @@
 
 namespace iox
 {
-namespace testing
+namespace roudi_env
 {
 RouDiConfig_t MinimalRouDiConfigBuilder::create() const noexcept
 {
@@ -33,5 +33,5 @@ RouDiConfig_t MinimalRouDiConfigBuilder::create() const noexcept
 
     return roudiConfig;
 }
-} // namespace testing
+} // namespace roudi_env
 } // namespace iox
diff --git a/iceoryx_posh/roudi_env/source/roudi_environment.cpp b/iceoryx_posh/roudi_env/source/roudi_environment.cpp
@@ -24,7 +24,7 @@
 
 namespace iox
 {
-namespace roudi
+namespace roudi_env
 {
 RouDiEnvironment::RouDiEnvironment(BaseCTor, const uint16_t uniqueRouDiId)
 {
@@ -38,10 +38,11 @@ RouDiEnvironment::RouDiEnvironment(const RouDiConfig_t& roudiConfig,
                                    const uint16_t uniqueRouDiId)
     : RouDiEnvironment(BaseCTor::BASE, uniqueRouDiId)
 {
-    m_roudiComponents = std::unique_ptr<IceOryxRouDiComponents>(new IceOryxRouDiComponents(roudiConfig));
-    m_roudiApp = std::unique_ptr<RouDi>(new RouDi(m_roudiComponents->rouDiMemoryManager,
-                                                  m_roudiComponents->portManager,
-                                                  RouDi::RoudiStartupParameters{monitoringMode, false}));
+    m_roudiComponents = std::unique_ptr<roudi::IceOryxRouDiComponents>(new roudi::IceOryxRouDiComponents(roudiConfig));
+    m_roudiApp =
+        std::unique_ptr<roudi::RouDi>(new roudi::RouDi(m_roudiComponents->rouDiMemoryManager,
+                                                       m_roudiComponents->portManager,
+                                                       roudi::RouDi::RoudiStartupParameters{monitoringMode, false}));
 }
 
 RouDiEnvironment::~RouDiEnvironment()
@@ -75,5 +76,5 @@ void RouDiEnvironment::CleanupRuntimes()
     m_runtimes.cleanupRuntimes();
 }
 
-} // namespace roudi
+} // namespace roudi_env
 } // namespace iox
diff --git a/iceoryx_posh/roudi_env/source/runtime_test_interface.cpp b/iceoryx_posh/roudi_env/source/runtime_test_interface.cpp
@@ -20,7 +20,7 @@
 
 namespace iox
 {
-namespace roudi
+namespace roudi_env
 {
 using runtime::PoshRuntime;
 
@@ -124,5 +124,5 @@ PoshRuntime& RuntimeTestInterface::runtimeFactoryGetInstance(optional<const Runt
     return *RuntimeTestInterface::t_activeRuntime;
 }
 
-} // namespace roudi
+} // namespace roudi_env
 } // namespace iox
diff --git a/iceoryx_posh/test/integrationtests/test_client_server.cpp b/iceoryx_posh/test/integrationtests/test_client_server.cpp
@@ -33,7 +33,7 @@ using namespace ::testing;
 using namespace iox::popo;
 using namespace iox::capro;
 using namespace iox::runtime;
-using namespace iox::testing;
+using namespace iox::roudi_env;
 
 class DummyRequest
 {

diff --git a/iceoryx_posh/test/integrationtests/test_interface_port_stack_blowup.cpp b/iceoryx_posh/test/integrationtests/test_interface_port_stack_blowup.cpp
@@ -28,7 +28,7 @@ namespace
 using namespace ::testing;
 
 using namespace iox::gw;
-using namespace iox::testing;
+using namespace iox::roudi_env;
 
 class InterfacePortRequestStackBlowup_test : public RouDi_GTest
 {

diff --git a/iceoryx_posh/test/integrationtests/test_popo_pub_sub_listener.cpp b/iceoryx_posh/test/integrationtests/test_popo_pub_sub_listener.cpp
@@ -30,7 +30,7 @@ using namespace ::testing;
 using namespace iox::popo;
 using namespace iox::capro;
 using namespace iox::runtime;
-using namespace iox::testing;
+using namespace iox::roudi_env;
 
 void onSampleReceivedCallback(Subscriber<int>* subscriber IOX_MAYBE_UNUSED)
 {

diff --git a/iceoryx_posh/test/integrationtests/test_publisher_subscriber_communication.cpp b/iceoryx_posh/test/integrationtests/test_publisher_subscriber_communication.cpp
@@ -39,7 +39,7 @@ using namespace ::testing;
 using namespace iox;
 using namespace iox::popo;
 using namespace iox::cxx;
-using namespace iox::testing;
+using namespace iox::roudi_env;
 
 template <typename T>
 struct ComplexDataType

diff --git a/iceoryx_posh/test/integrationtests/test_roudi_roudi_environment.cpp b/iceoryx_posh/test/integrationtests/test_roudi_roudi_environment.cpp
@@ -23,8 +23,7 @@
 namespace
 {
 using namespace ::testing;
-using namespace iox::roudi;
-using namespace iox::testing;
+using namespace iox::roudi_env;
 
 class RouDiEnvironment_test : public Test
 {

diff --git a/iceoryx_posh/test/integrationtests/test_service_discovery.cpp b/iceoryx_posh/test/integrationtests/test_service_discovery.cpp
@@ -43,11 +43,10 @@ using namespace iox::runtime;
 using namespace iox::cxx;
 using namespace iox::popo;
 using namespace iox::capro;
-using namespace iox::testing;
+using namespace iox::roudi_env;
 using iox::capro::IdString_t;
 using iox::capro::ServiceDescription;
 using iox::popo::MessagingPattern;
-using iox::roudi::RouDiEnvironment;
 
 using ServiceContainer = std::vector<ServiceDescription>;
 

diff --git a/iceoryx_posh/test/moduletests/test_posh_runtime.cpp b/iceoryx_posh/test/moduletests/test_posh_runtime.cpp
@@ -41,7 +41,7 @@ using namespace iox::capro;
 using namespace iox::cxx;
 using namespace iox;
 using namespace iox::popo;
-using namespace iox::testing;
+using namespace iox::roudi_env;
 using iox::roudi::RouDiEnvironment;
 
 class PoshRuntime_test : public Test

diff --git a/iceoryx_posh/test/moduletests/test_posh_runtime_node.cpp b/iceoryx_posh/test/moduletests/test_posh_runtime_node.cpp
@@ -27,7 +27,7 @@ namespace
 using namespace ::testing;
 using namespace iox::runtime;
 using namespace iox::roudi;
-using namespace iox::testing;
+using namespace iox::roudi_env;
 using namespace iox;
 
 /// @brief Test goal: This test suit verifies class node

diff --git a/iceoryx_posh/test/moduletests/test_posh_runtime_single_process.cpp b/iceoryx_posh/test/moduletests/test_posh_runtime_single_process.cpp
@@ -26,7 +26,7 @@ namespace
 using namespace ::testing;
 using namespace iox::runtime;
 using namespace iox::roudi;
-using namespace iox::testing;
+using namespace iox::roudi_env;
 using namespace iox;
 
 /// @brief Test goal: This test suit verifies class posh_runtime_single_process

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
@@ -24,7 +24,7 @@ namespace
 {
 using namespace ::testing;
 
-using namespace iox::testing;
+using namespace iox::roudi_env;
 using iox::roudi::IceOryxRouDiMemoryManager;
 
 /// @brief This test file verifies that the BaseClass IceoryxRouDiMemoryManager is tested

diff --git a/iceoryx_posh/test/moduletests/test_roudi_portmanager_fixture.hpp b/iceoryx_posh/test/moduletests/test_roudi_portmanager_fixture.hpp
@@ -44,7 +44,7 @@ using namespace iox::capro;
 using namespace iox::cxx;
 using namespace iox::popo;
 using namespace iox::roudi;
-using namespace iox::testing;
+using namespace iox::roudi_env;
 
 using iox::runtime::PortConfigInfo;
 

diff --git a/iceoryx_posh/test/moduletests/test_roudi_process_manager.cpp b/iceoryx_posh/test/moduletests/test_roudi_process_manager.cpp
@@ -35,7 +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::roudi_env;
 using namespace iox::version;
 
 class ProcessManager_test : public Test

diff --git a/iceoryx_posh/testing/include/iceoryx_posh/testing/roudi_environment/roudi_environment.hpp b/iceoryx_posh/testing/include/iceoryx_posh/testing/roudi_environment/roudi_environment.hpp
@@ -20,4 +20,12 @@
 
 #include "iceoryx_posh/roudi_env/roudi_environment.hpp"
 
+namespace iox
+{
+namespace roudi
+{
+using roudi_env::RouDiEnvironment;
+}
+} // namespace iox
+
 #endif // IOX_POSH_ROUDI_ENVIRONMENT_ROUDI_ENVIRONMENT_HPP
diff --git a/iceoryx_posh/testing/include/iceoryx_posh/testing/roudi_gtest.hpp b/iceoryx_posh/testing/include/iceoryx_posh/testing/roudi_gtest.hpp
@@ -24,7 +24,7 @@
 
 using namespace ::testing;
 
-class RouDi_GTest : public iox::roudi::RouDiEnvironment, public Test
+class RouDi_GTest : public iox::roudi_env::RouDiEnvironment, public Test
 {
   public:
     RouDi_GTest() = default;

diff --git a/iceoryx_posh/testing/source/roudi_gtest.cpp b/iceoryx_posh/testing/source/roudi_gtest.cpp
@@ -18,6 +18,6 @@
 #include "iceoryx_posh/testing/roudi_gtest.hpp"
 
 RouDi_GTest::RouDi_GTest(const iox::RouDiConfig_t& roudiConfig)
-    : iox::roudi::RouDiEnvironment(roudiConfig)
+    : iox::roudi_env::RouDiEnvironment(roudiConfig)
 {
 }