Kistler-Group/sdbus-cpp
1
0
Fork 1
mirror of https://github.com/Kistler-Group/sdbus-cpp.git synced 2025-07-30 10:07:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

integrationtests: differentiate BUS_NAME from INTERFACE_NAME

Browse Source 
Even though they have the same value, they are something fundamentally different.
Therefore it is extremely confusing if the constant INTERFACE_NAME is passed
where actually a well-known BUS_NAME (destination) should go.
This commit is contained in:
Urs Ritzmann
2021-10-14 16:08:38 +02:00
parent a5ecbbfcec
commit 35176c4988
8 changed files with 25 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
tests/integrationtests/AdaptorAndProxy_test.cpp
View File

@ -57,12 +57,12 @@ using SdbusTestObject = TestFixture;
TEST(AdaptorAndProxy, CanBeConstructedSuccesfully) TEST(AdaptorAndProxy, CanBeConstructedSuccesfully)
{ {
auto connection = sdbus::createConnection(); auto connection = sdbus::createConnection();
connection->requestName(INTERFACE_NAME); connection->requestName(BUS_NAME);
ASSERT_NO_THROW(TestAdaptor adaptor(*connection)); 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 // Methods
@ -260,7 +260,7 @@ TEST_F(SdbusTestObject, RunsServerSideAsynchoronousMethodAsynchronously)
std::atomic<int> startedCount{}; std::atomic<int> startedCount{};
auto call = [&](uint32_t param) auto call = [&](uint32_t param)
{ {
TestProxy proxy{INTERFACE_NAME, OBJECT_PATH}; TestProxy proxy{BUS_NAME, OBJECT_PATH};
++startedCount; ++startedCount;
while (!invoke) ; while (!invoke) ;
auto result = proxy.doOperationAsync(param); auto result = proxy.doOperationAsync(param);
@ -283,7 +283,7 @@ TEST_F(SdbusTestObject, HandlesCorrectlyABulkOfParallelServerSideAsyncMethods)
std::atomic<int> startedCount{}; std::atomic<int> startedCount{};
auto call = [&]() auto call = [&]()
{ {
TestProxy proxy{INTERFACE_NAME, OBJECT_PATH}; TestProxy proxy{BUS_NAME, OBJECT_PATH};
++startedCount; ++startedCount;
while (!invoke) ; while (!invoke) ;
@ -403,7 +403,7 @@ TEST_F(SdbusTestObject, FailsCallingMethodOnNonexistentDestination)
TEST_F(SdbusTestObject, FailsCallingMethodOnNonexistentObject) 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); ASSERT_THROW(proxy.getInt(), sdbus::Error);
} }
@ -440,8 +440,8 @@ TEST_F(SdbusTestObject, EmitsSimpleSignalSuccesfully)
TEST_F(SdbusTestObject, EmitsSimpleSignalToMultipleProxiesSuccesfully) TEST_F(SdbusTestObject, EmitsSimpleSignalToMultipleProxiesSuccesfully)
{ {
auto proxy1 = std::make_unique<TestProxy>(*s_connection, INTERFACE_NAME, OBJECT_PATH); auto proxy1 = std::make_unique<TestProxy>(*s_connection, BUS_NAME, OBJECT_PATH);
auto proxy2 = std::make_unique<TestProxy>(*s_connection, INTERFACE_NAME, OBJECT_PATH); auto proxy2 = std::make_unique<TestProxy>(*s_connection, BUS_NAME, OBJECT_PATH);
m_adaptor->emitSimpleSignal(); m_adaptor->emitSimpleSignal();

4
tests/integrationtests/DBusAsyncMethodsTests.cpp
View File

@ -93,7 +93,7 @@ TEST_F(SdbusTestObject, RunsServerSideAsynchoronousMethodAsynchronously)
std::atomic<int> startedCount{}; std::atomic<int> startedCount{};
auto call = [&](uint32_t param) auto call = [&](uint32_t param)
{ {
TestProxy proxy{INTERFACE_NAME, OBJECT_PATH}; TestProxy proxy{BUS_NAME, OBJECT_PATH};
++startedCount; ++startedCount;
while (!invoke) ; while (!invoke) ;
auto result = proxy.doOperationAsync(param); auto result = proxy.doOperationAsync(param);
@ -116,7 +116,7 @@ TEST_F(SdbusTestObject, HandlesCorrectlyABulkOfParallelServerSideAsyncMethods)
std::atomic<int> startedCount{}; std::atomic<int> startedCount{};
auto call = [&]() auto call = [&]()
{ {
TestProxy proxy{INTERFACE_NAME, OBJECT_PATH}; TestProxy proxy{BUS_NAME, OBJECT_PATH};
++startedCount; ++startedCount;
while (!invoke) ; while (!invoke) ;

8
tests/integrationtests/DBusConnectionTests.cpp
View File

@ -54,7 +54,7 @@ TEST(Connection, CanRequestRegisteredDbusName)
{ {
auto connection = sdbus::createConnection(); 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?"; << "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(); auto connection = sdbus::createConnection();
connection->requestName(INTERFACE_NAME); connection->requestName(BUS_NAME);
ASSERT_NO_THROW(connection->releaseName(INTERFACE_NAME)); ASSERT_NO_THROW(connection->releaseName(BUS_NAME));
} }
TEST(Connection, CannotReleaseNonrequestedName) TEST(Connection, CannotReleaseNonrequestedName)
@ -81,7 +81,7 @@ TEST(Connection, CannotReleaseNonrequestedName)
TEST(Connection, CanEnterAndLeaveEventLoop) TEST(Connection, CanEnterAndLeaveEventLoop)
{ {
auto connection = sdbus::createConnection(); auto connection = sdbus::createConnection();
connection->requestName(INTERFACE_NAME); connection->requestName(BUS_NAME);
std::thread t([&](){ connection->enterEventLoop(); }); std::thread t([&](){ connection->enterEventLoop(); });
connection->leaveEventLoop(); connection->leaveEventLoop();

4
tests/integrationtests/DBusGeneralTests.cpp
View File

@ -47,8 +47,8 @@ using namespace sdbus::test;
TEST(AdaptorAndProxy, CanBeConstructedSuccesfully) TEST(AdaptorAndProxy, CanBeConstructedSuccesfully)
{ {
auto connection = sdbus::createConnection(); auto connection = sdbus::createConnection();
connection->requestName(INTERFACE_NAME); connection->requestName(BUS_NAME);
ASSERT_NO_THROW(TestAdaptor adaptor(*connection, OBJECT_PATH)); 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));
} }

2
tests/integrationtests/DBusMethodsTests.cpp
View File

@ -227,7 +227,7 @@ TEST_F(SdbusTestObject, FailsCallingMethodOnNonexistentDestination)
TEST_F(SdbusTestObject, FailsCallingMethodOnNonexistentObject) 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); ASSERT_THROW(proxy.getInt(), sdbus::Error);
} }

6
tests/integrationtests/DBusSignalsTests.cpp
View File

@ -58,8 +58,8 @@ TEST_F(SdbusTestObject, EmitsSimpleSignalSuccesfully)
TEST_F(SdbusTestObject, EmitsSimpleSignalToMultipleProxiesSuccesfully) TEST_F(SdbusTestObject, EmitsSimpleSignalToMultipleProxiesSuccesfully)
{ {
auto proxy1 = std::make_unique<TestProxy>(*s_adaptorConnection, INTERFACE_NAME, OBJECT_PATH); auto proxy1 = std::make_unique<TestProxy>(*s_adaptorConnection, BUS_NAME, OBJECT_PATH);
auto proxy2 = std::make_unique<TestProxy>(*s_adaptorConnection, INTERFACE_NAME, OBJECT_PATH); auto proxy2 = std::make_unique<TestProxy>(*s_adaptorConnection, BUS_NAME, OBJECT_PATH);
m_adaptor->emitSimpleSignal(); m_adaptor->emitSimpleSignal();
@ -70,7 +70,7 @@ TEST_F(SdbusTestObject, EmitsSimpleSignalToMultipleProxiesSuccesfully)
TEST_F(SdbusTestObject, ProxyDoesNotReceiveSignalFromOtherBusName) TEST_F(SdbusTestObject, ProxyDoesNotReceiveSignalFromOtherBusName)
{ {
auto otherBusName = INTERFACE_NAME + "2"; auto otherBusName = BUS_NAME + "2";
auto connection2 = sdbus::createConnection(otherBusName); auto connection2 = sdbus::createConnection(otherBusName);
auto adaptor2 = std::make_unique<TestAdaptor>(*connection2, OBJECT_PATH); auto adaptor2 = std::make_unique<TestAdaptor>(*connection2, OBJECT_PATH);

1
tests/integrationtests/Defs.h
View File

@ -32,6 +32,7 @@
namespace sdbus { namespace test { namespace sdbus { namespace test {
const std::string INTERFACE_NAME{"org.sdbuscpp.integrationtests"}; 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 MANAGER_PATH {"/org/sdbuscpp/integrationtests"};
const std::string OBJECT_PATH {"/org/sdbuscpp/integrationtests/ObjectA1"}; const std::string OBJECT_PATH {"/org/sdbuscpp/integrationtests/ObjectA1"};
const std::string OBJECT_PATH_2{"/org/sdbuscpp/integrationtests/ObjectB1"}; const std::string OBJECT_PATH_2{"/org/sdbuscpp/integrationtests/ObjectB1"};

8
tests/integrationtests/TestFixture.h
View File

@ -47,14 +47,14 @@ public:
static void SetUpTestCase() static void SetUpTestCase()
{ {
s_proxyConnection->enterEventLoopAsync(); s_proxyConnection->enterEventLoopAsync();
s_adaptorConnection->requestName(INTERFACE_NAME); s_adaptorConnection->requestName(BUS_NAME);
s_adaptorConnection->enterEventLoopAsync(); s_adaptorConnection->enterEventLoopAsync();
std::this_thread::sleep_for(std::chrono::milliseconds(50)); // Give time for the proxy connection to start listening to signals std::this_thread::sleep_for(std::chrono::milliseconds(50)); // Give time for the proxy connection to start listening to signals
} }
static void TearDownTestCase() static void TearDownTestCase()
{ {
s_adaptorConnection->releaseName(INTERFACE_NAME); s_adaptorConnection->releaseName(BUS_NAME);
s_adaptorConnection->leaveEventLoop(); s_adaptorConnection->leaveEventLoop();
s_proxyConnection->leaveEventLoop(); s_proxyConnection->leaveEventLoop();
} }
@ -84,8 +84,8 @@ public:
private: private:
void SetUp() override void SetUp() override
{ {
m_objectManagerProxy = std::make_unique<ObjectManagerTestProxy>(*s_proxyConnection, INTERFACE_NAME, MANAGER_PATH); m_objectManagerProxy = std::make_unique<ObjectManagerTestProxy>(*s_proxyConnection, BUS_NAME, MANAGER_PATH);
m_proxy = std::make_unique<TestProxy>(*s_proxyConnection, INTERFACE_NAME, OBJECT_PATH); m_proxy = std::make_unique<TestProxy>(*s_proxyConnection, BUS_NAME, OBJECT_PATH);
m_objectManagerAdaptor = std::make_unique<ObjectManagerTestAdaptor>(*s_adaptorConnection, MANAGER_PATH); m_objectManagerAdaptor = std::make_unique<ObjectManagerTestAdaptor>(*s_adaptorConnection, MANAGER_PATH);
m_adaptor = std::make_unique<TestAdaptor>(*s_adaptorConnection, OBJECT_PATH); m_adaptor = std::make_unique<TestAdaptor>(*s_adaptorConnection, OBJECT_PATH);