diff --git a/tests/integrationtests/AdaptorAndProxy_test.cpp b/tests/integrationtests/AdaptorAndProxy_test.cpp index 8ee2a44..b780c8f 100644 --- a/tests/integrationtests/AdaptorAndProxy_test.cpp +++ b/tests/integrationtests/AdaptorAndProxy_test.cpp @@ -57,12 +57,12 @@ using SdbusTestObject = TestFixture; TEST(AdaptorAndProxy, CanBeConstructedSuccesfully) { auto connection = sdbus::createConnection(); - connection->requestName(INTERFACE_NAME); + connection->requestName(BUS_NAME); ASSERT_NO_THROW(TestAdaptor adaptor(*connection)); - ASSERT_NO_THROW(TestProxy proxy(INTERFACE_NAME, OBJECT_PATH)); + ASSERT_NO_THROW(TestProxy proxy(BUS_NAME, OBJECT_PATH)); - connection->releaseName(INTERFACE_NAME); + connection->releaseName(BUS_NAME); } // Methods @@ -260,7 +260,7 @@ TEST_F(SdbusTestObject, RunsServerSideAsynchoronousMethodAsynchronously) std::atomic startedCount{}; auto call = [&](uint32_t param) { - TestProxy proxy{INTERFACE_NAME, OBJECT_PATH}; + TestProxy proxy{BUS_NAME, OBJECT_PATH}; ++startedCount; while (!invoke) ; auto result = proxy.doOperationAsync(param); @@ -283,7 +283,7 @@ TEST_F(SdbusTestObject, HandlesCorrectlyABulkOfParallelServerSideAsyncMethods) std::atomic startedCount{}; auto call = [&]() { - TestProxy proxy{INTERFACE_NAME, OBJECT_PATH}; + TestProxy proxy{BUS_NAME, OBJECT_PATH}; ++startedCount; while (!invoke) ; @@ -403,7 +403,7 @@ TEST_F(SdbusTestObject, FailsCallingMethodOnNonexistentDestination) TEST_F(SdbusTestObject, FailsCallingMethodOnNonexistentObject) { - TestProxy proxy(INTERFACE_NAME, "/sdbuscpp/path/that/does/not/exist"); + TestProxy proxy(BUS_NAME, "/sdbuscpp/path/that/does/not/exist"); ASSERT_THROW(proxy.getInt(), sdbus::Error); } @@ -440,8 +440,8 @@ TEST_F(SdbusTestObject, EmitsSimpleSignalSuccesfully) TEST_F(SdbusTestObject, EmitsSimpleSignalToMultipleProxiesSuccesfully) { - auto proxy1 = std::make_unique(*s_connection, INTERFACE_NAME, OBJECT_PATH); - auto proxy2 = std::make_unique(*s_connection, INTERFACE_NAME, OBJECT_PATH); + auto proxy1 = std::make_unique(*s_connection, BUS_NAME, OBJECT_PATH); + auto proxy2 = std::make_unique(*s_connection, BUS_NAME, OBJECT_PATH); m_adaptor->emitSimpleSignal(); diff --git a/tests/integrationtests/DBusAsyncMethodsTests.cpp b/tests/integrationtests/DBusAsyncMethodsTests.cpp index cb0f5cc..5bb5811 100644 --- a/tests/integrationtests/DBusAsyncMethodsTests.cpp +++ b/tests/integrationtests/DBusAsyncMethodsTests.cpp @@ -93,7 +93,7 @@ TEST_F(SdbusTestObject, RunsServerSideAsynchoronousMethodAsynchronously) std::atomic startedCount{}; auto call = [&](uint32_t param) { - TestProxy proxy{INTERFACE_NAME, OBJECT_PATH}; + TestProxy proxy{BUS_NAME, OBJECT_PATH}; ++startedCount; while (!invoke) ; auto result = proxy.doOperationAsync(param); @@ -116,7 +116,7 @@ TEST_F(SdbusTestObject, HandlesCorrectlyABulkOfParallelServerSideAsyncMethods) std::atomic startedCount{}; auto call = [&]() { - TestProxy proxy{INTERFACE_NAME, OBJECT_PATH}; + TestProxy proxy{BUS_NAME, OBJECT_PATH}; ++startedCount; while (!invoke) ; diff --git a/tests/integrationtests/DBusConnectionTests.cpp b/tests/integrationtests/DBusConnectionTests.cpp index 983f1ca..7258feb 100644 --- a/tests/integrationtests/DBusConnectionTests.cpp +++ b/tests/integrationtests/DBusConnectionTests.cpp @@ -54,7 +54,7 @@ TEST(Connection, CanRequestRegisteredDbusName) { auto connection = sdbus::createConnection(); - ASSERT_NO_THROW(connection->requestName(INTERFACE_NAME)) + ASSERT_NO_THROW(connection->requestName(BUS_NAME)) << "Perhaps you've forgotten to copy `org.sdbuscpp.integrationtests.conf` file to `/etc/dbus-1/system.d` directory before running the tests?"; } @@ -68,8 +68,8 @@ TEST(Connection, CanReleasedRequestedName) { auto connection = sdbus::createConnection(); - connection->requestName(INTERFACE_NAME); - ASSERT_NO_THROW(connection->releaseName(INTERFACE_NAME)); + connection->requestName(BUS_NAME); + ASSERT_NO_THROW(connection->releaseName(BUS_NAME)); } TEST(Connection, CannotReleaseNonrequestedName) @@ -81,7 +81,7 @@ TEST(Connection, CannotReleaseNonrequestedName) TEST(Connection, CanEnterAndLeaveEventLoop) { auto connection = sdbus::createConnection(); - connection->requestName(INTERFACE_NAME); + connection->requestName(BUS_NAME); std::thread t([&](){ connection->enterEventLoop(); }); connection->leaveEventLoop(); diff --git a/tests/integrationtests/DBusGeneralTests.cpp b/tests/integrationtests/DBusGeneralTests.cpp index 2ee1f02..29880e4 100644 --- a/tests/integrationtests/DBusGeneralTests.cpp +++ b/tests/integrationtests/DBusGeneralTests.cpp @@ -47,8 +47,8 @@ using namespace sdbus::test; TEST(AdaptorAndProxy, CanBeConstructedSuccesfully) { auto connection = sdbus::createConnection(); - connection->requestName(INTERFACE_NAME); + connection->requestName(BUS_NAME); ASSERT_NO_THROW(TestAdaptor adaptor(*connection, OBJECT_PATH)); - ASSERT_NO_THROW(TestProxy proxy(INTERFACE_NAME, OBJECT_PATH)); + ASSERT_NO_THROW(TestProxy proxy(BUS_NAME, OBJECT_PATH)); } diff --git a/tests/integrationtests/DBusMethodsTests.cpp b/tests/integrationtests/DBusMethodsTests.cpp index 2d9a006..8afaf88 100644 --- a/tests/integrationtests/DBusMethodsTests.cpp +++ b/tests/integrationtests/DBusMethodsTests.cpp @@ -227,7 +227,7 @@ TEST_F(SdbusTestObject, FailsCallingMethodOnNonexistentDestination) TEST_F(SdbusTestObject, FailsCallingMethodOnNonexistentObject) { - TestProxy proxy(INTERFACE_NAME, "/sdbuscpp/path/that/does/not/exist"); + TestProxy proxy(BUS_NAME, "/sdbuscpp/path/that/does/not/exist"); ASSERT_THROW(proxy.getInt(), sdbus::Error); } diff --git a/tests/integrationtests/DBusSignalsTests.cpp b/tests/integrationtests/DBusSignalsTests.cpp index 801e7bc..b9dbcc7 100644 --- a/tests/integrationtests/DBusSignalsTests.cpp +++ b/tests/integrationtests/DBusSignalsTests.cpp @@ -58,8 +58,8 @@ TEST_F(SdbusTestObject, EmitsSimpleSignalSuccesfully) TEST_F(SdbusTestObject, EmitsSimpleSignalToMultipleProxiesSuccesfully) { - auto proxy1 = std::make_unique(*s_adaptorConnection, INTERFACE_NAME, OBJECT_PATH); - auto proxy2 = std::make_unique(*s_adaptorConnection, INTERFACE_NAME, OBJECT_PATH); + auto proxy1 = std::make_unique(*s_adaptorConnection, BUS_NAME, OBJECT_PATH); + auto proxy2 = std::make_unique(*s_adaptorConnection, BUS_NAME, OBJECT_PATH); m_adaptor->emitSimpleSignal(); @@ -70,7 +70,7 @@ TEST_F(SdbusTestObject, EmitsSimpleSignalToMultipleProxiesSuccesfully) TEST_F(SdbusTestObject, ProxyDoesNotReceiveSignalFromOtherBusName) { - auto otherBusName = INTERFACE_NAME + "2"; + auto otherBusName = BUS_NAME + "2"; auto connection2 = sdbus::createConnection(otherBusName); auto adaptor2 = std::make_unique(*connection2, OBJECT_PATH); diff --git a/tests/integrationtests/Defs.h b/tests/integrationtests/Defs.h index 5419290..5f3f675 100644 --- a/tests/integrationtests/Defs.h +++ b/tests/integrationtests/Defs.h @@ -32,6 +32,7 @@ namespace sdbus { namespace test { const std::string INTERFACE_NAME{"org.sdbuscpp.integrationtests"}; +const std::string BUS_NAME = INTERFACE_NAME; const std::string MANAGER_PATH {"/org/sdbuscpp/integrationtests"}; const std::string OBJECT_PATH {"/org/sdbuscpp/integrationtests/ObjectA1"}; const std::string OBJECT_PATH_2{"/org/sdbuscpp/integrationtests/ObjectB1"}; diff --git a/tests/integrationtests/TestFixture.h b/tests/integrationtests/TestFixture.h index 69c2094..dd49d40 100644 --- a/tests/integrationtests/TestFixture.h +++ b/tests/integrationtests/TestFixture.h @@ -47,14 +47,14 @@ public: static void SetUpTestCase() { s_proxyConnection->enterEventLoopAsync(); - s_adaptorConnection->requestName(INTERFACE_NAME); + s_adaptorConnection->requestName(BUS_NAME); s_adaptorConnection->enterEventLoopAsync(); std::this_thread::sleep_for(std::chrono::milliseconds(50)); // Give time for the proxy connection to start listening to signals } static void TearDownTestCase() { - s_adaptorConnection->releaseName(INTERFACE_NAME); + s_adaptorConnection->releaseName(BUS_NAME); s_adaptorConnection->leaveEventLoop(); s_proxyConnection->leaveEventLoop(); } @@ -84,8 +84,8 @@ public: private: void SetUp() override { - m_objectManagerProxy = std::make_unique(*s_proxyConnection, INTERFACE_NAME, MANAGER_PATH); - m_proxy = std::make_unique(*s_proxyConnection, INTERFACE_NAME, OBJECT_PATH); + m_objectManagerProxy = std::make_unique(*s_proxyConnection, BUS_NAME, MANAGER_PATH); + m_proxy = std::make_unique(*s_proxyConnection, BUS_NAME, OBJECT_PATH); m_objectManagerAdaptor = std::make_unique(*s_adaptorConnection, MANAGER_PATH); m_adaptor = std::make_unique(*s_adaptorConnection, OBJECT_PATH);