Add SdBus interface to proper namespace

test/CMakeLists.txt

@@ -37,7 +37,8 @@ set(UNITTESTS_SRCS
     ${UNITTESTS_SOURCE_DIR}/Message_test.cpp
     ${UNITTESTS_SOURCE_DIR}/Types_test.cpp
     ${UNITTESTS_SOURCE_DIR}/TypeTraits_test.cpp
-    ${UNITTESTS_SOURCE_DIR}/Connection_test.cpp)
+    ${UNITTESTS_SOURCE_DIR}/Connection_test.cpp
+    ${UNITTESTS_SOURCE_DIR}/mocks/SdBusMock.h)
 
 set(INTEGRATIONTESTS_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/integrationtests)
 set(INTEGRATIONTESTS_SRCS

test/integrationtests/AdaptorAndProxy_test.cpp

@@ -57,20 +57,20 @@ class AdaptorAndProxyFixture : public ::testing::Test
 public:
     static void SetUpTestCase()
     {
-        m_connection.requestName(INTERFACE_NAME);
-        m_connection.enterProcessingLoopAsync();
+        s_connection->requestName(INTERFACE_NAME);
+        s_connection->enterProcessingLoopAsync();
     }
 
     static void TearDownTestCase()
     {
-        m_connection.leaveProcessingLoop();
-        m_connection.releaseName(INTERFACE_NAME);
+        s_connection->leaveProcessingLoop();
+        s_connection->releaseName(INTERFACE_NAME);
     }
 
 private:
     void SetUp() override
     {
-        m_adaptor = std::make_unique<TestingAdaptor>(m_connection);
+        m_adaptor = std::make_unique<TestingAdaptor>(*s_connection);
         m_proxy = std::make_unique<TestingProxy>(INTERFACE_NAME, OBJECT_PATH);
         std::this_thread::sleep_for(50ms); // Give time for the proxy to start listening to signals
     }
@@ -82,14 +82,13 @@ private:
     }
 
 public:
-    static sdbus::internal::Connection m_connection;
+    static std::unique_ptr<sdbus::IConnection> s_connection;
 
     std::unique_ptr<TestingAdaptor> m_adaptor;
     std::unique_ptr<TestingProxy> m_proxy;
 };
 
-sdbus::internal::Connection AdaptorAndProxyFixture::m_connection{sdbus::internal::Connection::BusType::eSystem,
-                                                                 std::make_unique<SdBus>()};
+std::unique_ptr<sdbus::IConnection> AdaptorAndProxyFixture::s_connection = sdbus::createSystemBusConnection();
 
 }
 

test/unittests/mocks/SdBusMock.h

@@ -31,7 +31,7 @@
 
 #include <gmock/gmock.h>
 
-class SdBusMock : public ISdBus
+class SdBusMock : public sdbus::internal::ISdBus
 {
 public:
     MOCK_METHOD3(sd_bus_request_name, int(sd_bus *bus, const char *name, uint64_t flags));