feedc0de/sdbus-cpp
1
0
Fork 0
forked from Kistler-Group/sdbus-cpp
Code Pull Requests Activity

refactor: remove floating_slot_t tag and use return_slot_t instead (#439)

Browse Source 
Make all the API consistent by using return_slot_t-based overloads for returning the slots to clients, and overloads without that tag for "floating" slots. floating_slot_t tag was previously added for API backwards compatibility reasons, but now is a (counter-)duplicate to the return_slot_t.
This commit is contained in:
Stanislav Angelovič
2024-04-24 20:20:29 +02:00
parent 2bc9d3ebb3
commit 798eaf8626
10 changed files with 111 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/integrationtests/DBusGeneralTests.cpp
+6 -5
View File
@@ -83,7 +83,7 @@ TYPED_TEST(AConnection, WillCallCallbackHandlerForIncomingMessageMatchingMatchRu
{
if(msg.getPath() == OBJECT_PATH)
matchingMessageReceived = true;
});
}, sdbus::return_slot);
this->m_adaptor->emitSimpleSignal();
@@ -104,7 +104,8 @@ TYPED_TEST(AConnection, CanInstallMatchRuleAsynchronously)
, [&](sdbus::Message /*msg*/)
{
matchRuleInstalled = true;
} );
}
, sdbus::return_slot );
EXPECT_TRUE(waitUntil(matchRuleInstalled));
@@ -121,7 +122,7 @@ TYPED_TEST(AConnection, WillUnsubscribeMatchRuleWhenClientDestroysTheAssociatedS
{
if(msg.getPath() == OBJECT_PATH)
matchingMessageReceived = true;
});
}, sdbus::return_slot);
slot.reset();
this->m_adaptor->emitSimpleSignal();
@@ -140,7 +141,7 @@ TYPED_TEST(AConnection, CanAddFloatingMatchRule)
if(msg.getPath() == OBJECT_PATH)
matchingMessageReceived = true;
};
con->addMatch(matchRule, std::move(callback), sdbus::floating_slot);
con->addMatch(matchRule, std::move(callback));
this->m_adaptor->emitSimpleSignal();
[[maybe_unused]] auto gotMessage = waitUntil(matchingMessageReceived, 2s);
assert(gotMessage);
@@ -160,7 +161,7 @@ TYPED_TEST(AConnection, WillNotPassToMatchCallbackMessagesThatDoNotMatchTheRule)
{
if(msg.getMemberName() == "simpleSignal"sv)
numberOfMatchingMessages++;
});
}, sdbus::return_slot);
auto adaptor2 = std::make_unique<TestAdaptor>(*this->s_adaptorConnection, OBJECT_PATH_2);
this->m_adaptor->emitSignalWithMap({});