Skip to content

Commit

Permalink
iox-eclipse-iceoryx#932 Set callback function in waitset tests
Browse files Browse the repository at this point in the history 
Signed-off-by: Dietrich Krönke <[email protected]>
  • Loading branch information
@dkroenke
dkroenke committed Sep 30, 2021
1 parent 51d453d commit 17c2fc5
Show file tree
Hide file tree
Showing 5 changed files with 102 additions and 54 deletions.
8 changes: 3 additions & 5 deletions iceoryx_binding_c/source/c_wait_set.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -114,8 +114,7 @@ iox_WaitSetResult iox_ws_attach_subscriber_state(iox_ws_t const self,
const uint64_t eventId,
void (*callback)(iox_sub_t))
{
auto result = self->attachState(
*subscriber, c2cpp::subscriberState(subscriberState), eventId, createNotificationCallback(*callback));
auto result = self->attachState(*subscriber, c2cpp::subscriberState(subscriberState), eventId, {callback, nullptr});
return (result.has_error()) ? cpp2c::waitSetResult(result.get_error()) : iox_WaitSetResult::WaitSetResult_SUCCESS;
}

Expand All @@ -141,8 +140,7 @@ iox_WaitSetResult iox_ws_attach_subscriber_event(iox_ws_t const self,
const uint64_t eventId,
void (*callback)(iox_sub_t))
{
auto result = self->attachEvent(
*subscriber, c2cpp::subscriberEvent(subscriberEvent), eventId, createNotificationCallback(*callback));
auto result = self->attachEvent(*subscriber, c2cpp::subscriberEvent(subscriberEvent), eventId, {callback, nullptr});
return (result.has_error()) ? cpp2c::waitSetResult(result.get_error()) : iox_WaitSetResult::WaitSetResult_SUCCESS;
}

Expand All @@ -167,7 +165,7 @@ iox_WaitSetResult iox_ws_attach_user_trigger_event(iox_ws_t const self,
const uint64_t eventId,
void (*callback)(iox_user_trigger_t))
{
auto result = self->attachEvent(*userTrigger, eventId, createNotificationCallback(*callback));
auto result = self->attachEvent(*userTrigger, eventId, {callback, nullptr});
return (result.has_error()) ? cpp2c::waitSetResult(result.get_error()) : iox_WaitSetResult::WaitSetResult_SUCCESS;
}

Expand Down
13 changes: 9 additions & 4 deletions iceoryx_binding_c/test/moduletests/test_notification_info.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,9 @@ class iox_notification_info_test : public Test
return m_memoryManager.getChunk(chunkSettings);
}

static void triggerCallback(iox_sub_t sub IOX_MAYBE_UNUSED)
{
}

static UserTrigger* m_lastNotificationCallbackArgument;
ConditionVariableData m_condVar{"myApp"};
Expand Down Expand Up @@ -142,7 +145,7 @@ TEST_F(iox_notification_info_test, notificationOriginIsUserTriggerPointerWhenIts

TEST_F(iox_notification_info_test, notificationOriginIsSubscriberPointerWhenItsOriginatingFromThemStateBased)
{
iox_ws_attach_subscriber_state(&m_waitSet, m_subscriberHandle, SubscriberState_HAS_DATA, 587U, NULL);
iox_ws_attach_subscriber_state(&m_waitSet, m_subscriberHandle, SubscriberState_HAS_DATA, 587U, triggerCallback);
this->Subscribe(&m_portPtr);
m_chunkPusher.push(getChunkFromMemoryManager());

Expand All @@ -154,7 +157,8 @@ TEST_F(iox_notification_info_test, notificationOriginIsSubscriberPointerWhenItsO

TEST_F(iox_notification_info_test, notificationOriginIsSubscriberPointerWhenItsOriginatingFromThemEventBased)
{
iox_ws_attach_subscriber_event(&m_waitSet, m_subscriberHandle, SubscriberEvent_DATA_RECEIVED, 587U, NULL);
iox_ws_attach_subscriber_event(
&m_waitSet, m_subscriberHandle, SubscriberEvent_DATA_RECEIVED, 587U, triggerCallback);
this->Subscribe(&m_portPtr);
m_chunkPusher.push(getChunkFromMemoryManager());

Expand All @@ -178,7 +182,7 @@ TEST_F(iox_notification_info_test, getOriginReturnsPointerToUserTriggerWhenOrigi

TEST_F(iox_notification_info_test, getOriginReturnsPointerToSubscriberWhenOriginatingFromThemStateBased)
{
iox_ws_attach_subscriber_state(&m_waitSet, m_subscriberHandle, SubscriberState_HAS_DATA, 587U, NULL);
iox_ws_attach_subscriber_state(&m_waitSet, m_subscriberHandle, SubscriberState_HAS_DATA, 587U, triggerCallback);
this->Subscribe(&m_portPtr);
m_chunkPusher.push(getChunkFromMemoryManager());

Expand All @@ -190,7 +194,8 @@ TEST_F(iox_notification_info_test, getOriginReturnsPointerToSubscriberWhenOrigin

TEST_F(iox_notification_info_test, getOriginReturnsPointerToSubscriberWhenOriginatingFromThemEventBased)
{
iox_ws_attach_subscriber_event(&m_waitSet, m_subscriberHandle, SubscriberEvent_DATA_RECEIVED, 587U, NULL);
iox_ws_attach_subscriber_event(
&m_waitSet, m_subscriberHandle, SubscriberEvent_DATA_RECEIVED, 587U, triggerCallback);
this->Subscribe(&m_portPtr);
m_chunkPusher.push(getChunkFromMemoryManager());

Expand Down
10 changes: 5 additions & 5 deletions iceoryx_binding_c/test/moduletests/test_subscriber.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -327,32 +327,32 @@ TEST_F(iox_sub_test, sendingTooMuchLeadsToOverflow)

TEST_F(iox_sub_test, attachingToWaitSetWorks)
{
EXPECT_EQ(iox_ws_attach_subscriber_state(m_waitSet.get(), m_sut, SubscriberState_HAS_DATA, 0U, NULL),
EXPECT_EQ(iox_ws_attach_subscriber_state(m_waitSet.get(), m_sut, SubscriberState_HAS_DATA, 0U, triggerCallback),
WaitSetResult_SUCCESS);
EXPECT_EQ(m_waitSet->size(), 1U);
}

TEST_F(iox_sub_test, attachingToAnotherWaitsetCleansupAtOriginalWaitset)
{
WaitSetMock m_waitSet2{m_condVar};
iox_ws_attach_subscriber_state(m_waitSet.get(), m_sut, SubscriberState_HAS_DATA, 0U, NULL);
iox_ws_attach_subscriber_state(m_waitSet.get(), m_sut, SubscriberState_HAS_DATA, 0U, triggerCallback);

EXPECT_EQ(iox_ws_attach_subscriber_state(&m_waitSet2, m_sut, SubscriberState_HAS_DATA, 0U, NULL),
EXPECT_EQ(iox_ws_attach_subscriber_state(&m_waitSet2, m_sut, SubscriberState_HAS_DATA, 0U, triggerCallback),
WaitSetResult_SUCCESS);
EXPECT_EQ(m_waitSet->size(), 0U);
EXPECT_EQ(m_waitSet2.size(), 1U);
}

TEST_F(iox_sub_test, detachingFromWaitSetWorks)
{
iox_ws_attach_subscriber_state(m_waitSet.get(), m_sut, SubscriberState_HAS_DATA, 0U, NULL);
iox_ws_attach_subscriber_state(m_waitSet.get(), m_sut, SubscriberState_HAS_DATA, 0U, triggerCallback);
iox_ws_detach_subscriber_state(m_waitSet.get(), m_sut, SubscriberState_HAS_DATA);
EXPECT_EQ(m_waitSet->size(), 0U);
}

TEST_F(iox_sub_test, hasDataTriggersWaitSetWithCorrectNotificationId)
{
iox_ws_attach_subscriber_state(m_waitSet.get(), m_sut, SubscriberState_HAS_DATA, 587U, NULL);
iox_ws_attach_subscriber_state(m_waitSet.get(), m_sut, SubscriberState_HAS_DATA, 587U, triggerCallback);
this->Subscribe(&m_portPtr);
m_chunkPusher.push(getChunkFromMemoryManager());

Expand Down
10 changes: 5 additions & 5 deletions iceoryx_binding_c/test/moduletests/test_user_trigger.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,14 +79,14 @@ TEST_F(iox_user_trigger_test, cannotBeTriggeredWhenNotAttached)

TEST_F(iox_user_trigger_test, canBeTriggeredWhenAttached)
{
iox_ws_attach_user_trigger_event(&m_waitSet, m_sut, 0U, NULL);
iox_ws_attach_user_trigger_event(&m_waitSet, m_sut, 0U, triggerCallback);
iox_user_trigger_trigger(m_sut);
EXPECT_TRUE(iox_user_trigger_has_triggered(m_sut));
}

TEST_F(iox_user_trigger_test, triggeringWaitSetResultsInCorrectNotificationId)
{
iox_ws_attach_user_trigger_event(&m_waitSet, m_sut, 88191U, NULL);
iox_ws_attach_user_trigger_event(&m_waitSet, m_sut, 88191U, triggerCallback);
iox_user_trigger_trigger(m_sut);

auto eventVector = m_waitSet.wait();
Expand All @@ -111,9 +111,9 @@ TEST_F(iox_user_trigger_test, triggeringWaitSetResultsInCorrectCallback)
TEST_F(iox_user_trigger_test, attachingToAnotherWaitSetCleansupFirstWaitset)
{
WaitSetMock m_waitSet2{m_condVar};
iox_ws_attach_user_trigger_event(&m_waitSet, m_sut, 0U, NULL);
iox_ws_attach_user_trigger_event(&m_waitSet, m_sut, 0U, triggerCallback);

iox_ws_attach_user_trigger_event(&m_waitSet2, m_sut, 0U, NULL);
iox_ws_attach_user_trigger_event(&m_waitSet2, m_sut, 0U, triggerCallback);

EXPECT_EQ(m_waitSet.size(), 0U);
EXPECT_EQ(m_waitSet2.size(), 1U);
Expand All @@ -122,7 +122,7 @@ TEST_F(iox_user_trigger_test, attachingToAnotherWaitSetCleansupFirstWaitset)
TEST_F(iox_user_trigger_test, disable_trigger_eventingItFromWaitsetCleansup)
{
WaitSetMock m_waitSet2{m_condVar};
iox_ws_attach_user_trigger_event(&m_waitSet, m_sut, 0U, NULL);
iox_ws_attach_user_trigger_event(&m_waitSet, m_sut, 0U, triggerCallback);

iox_ws_detach_user_trigger_event(&m_waitSet, m_sut);

Expand Down
Loading

0 comments on commit 17c2fc5

Please sign in to comment.