Skip to content

Commit

Permalink
iox-eclipse-iceoryx#1196 Remove extra ;
Browse files Browse the repository at this point in the history
Signed-off-by: Marika Lehmann <[email protected]>
  • Loading branch information
FerdinandSpitzschnueffler committed Jul 6, 2022
1 parent 1f53d4f commit 0eaad7a
Show file tree
Hide file tree
Showing 6 changed files with 29 additions and 29 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -345,7 +345,7 @@ TIMING_TEST_F(PortUser_IntegrationTest, SingleProducer, Repeat(5), [&] {

TIMING_TEST_EXPECT_TRUE(m_sendCounter.load(std::memory_order_relaxed) == m_receiveCounter);
TIMING_TEST_EXPECT_FALSE(PortUser_IntegrationTest::m_subscriberPortUserMultiProducer.hasLostChunksSinceLastCall());
});
})

TIMING_TEST_F(PortUser_IntegrationTest, MultiProducer, Repeat(5), [&] {
::testing::Test::RecordProperty("TEST_ID", "d27279d3-26c0-4489-9208-bd361120525a");
Expand Down Expand Up @@ -381,6 +381,6 @@ TIMING_TEST_F(PortUser_IntegrationTest, MultiProducer, Repeat(5), [&] {

TIMING_TEST_EXPECT_TRUE(m_sendCounter.load(std::memory_order_relaxed) == m_receiveCounter);
TIMING_TEST_EXPECT_FALSE(PortUser_IntegrationTest::m_subscriberPortUserMultiProducer.hasLostChunksSinceLastCall());
});
})

} // namespace
2 changes: 1 addition & 1 deletion iceoryx_posh/test/moduletests/test_popo_base_client.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ int resetCallsFromDtors<BaseClientWithMocks>()
{
// from base only
return 1;
};
}

template <typename Base>
class TestBaseClient : public Base
Expand Down
2 changes: 1 addition & 1 deletion iceoryx_posh/test/moduletests/test_popo_base_server.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ int resetCallsFromDtors<BaseServerWithMocks>()
{
// from base only
return 1;
};
}

template <typename Base>
class TestBaseServer : public Base
Expand Down
44 changes: 22 additions & 22 deletions iceoryx_posh/test/moduletests/test_popo_listener.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -667,7 +667,7 @@ TIMING_TEST_F(Listener_test, CallbackIsCalledAfterNotify, Repeat(5), [&] {

TIMING_TEST_EXPECT_TRUE(g_triggerCallbackArg[0U].m_source == &fuu);
TIMING_TEST_EXPECT_TRUE(g_triggerCallbackArg[0U].m_count == 1U);
});
})

TIMING_TEST_F(Listener_test, CallbackWithEventAndUserTypeIsCalledAfterNotify, Repeat(5), [&] {
::testing::Test::RecordProperty("TEST_ID", "6df97139-8c2e-42b1-bd9a-8770c295bf2e");
Expand All @@ -685,7 +685,7 @@ TIMING_TEST_F(Listener_test, CallbackWithEventAndUserTypeIsCalledAfterNotify, Re

TIMING_TEST_EXPECT_TRUE(g_triggerCallbackArg[0U].m_source == &fuu);
TIMING_TEST_EXPECT_TRUE(userType == 1U);
});
})

TIMING_TEST_F(Listener_test, CallbackWithUserTypeIsCalledAfterNotify, Repeat(5), [&] {
::testing::Test::RecordProperty("TEST_ID", "98ffc91c-cf17-4331-8b20-a84121090119");
Expand All @@ -701,7 +701,7 @@ TIMING_TEST_F(Listener_test, CallbackWithUserTypeIsCalledAfterNotify, Repeat(5),

TIMING_TEST_EXPECT_TRUE(g_triggerCallbackArg[0U].m_source == &fuu);
TIMING_TEST_EXPECT_TRUE(userType == 1U);
});
})

TIMING_TEST_F(Listener_test, CallbackIsCalledOnlyOnceWhenTriggered, Repeat(5), [&] {
::testing::Test::RecordProperty("TEST_ID", "ad1470d7-a683-4089-a548-93616278c772");
Expand All @@ -728,7 +728,7 @@ TIMING_TEST_F(Listener_test, CallbackIsCalledOnlyOnceWhenTriggered, Repeat(5), [
TIMING_TEST_EXPECT_TRUE(g_triggerCallbackArg[0U].m_count == 1U);
TIMING_TEST_EXPECT_TRUE(g_triggerCallbackArg[1U].m_source == &fuu2);
TIMING_TEST_EXPECT_TRUE(g_triggerCallbackArg[1U].m_count == 1U);
});
})

TIMING_TEST_F(Listener_test, TriggerWhileInCallbackLeadsToAnotherCallback, Repeat(5), [&] {
::testing::Test::RecordProperty("TEST_ID", "b29c6689-35cf-4d2f-b719-5c928bf5e870");
Expand All @@ -753,7 +753,7 @@ TIMING_TEST_F(Listener_test, TriggerWhileInCallbackLeadsToAnotherCallback, Repea

TIMING_TEST_EXPECT_TRUE(g_triggerCallbackArg[0U].m_source == &fuu);
TIMING_TEST_EXPECT_TRUE(g_triggerCallbackArg[0U].m_count == 2U);
});
})

TIMING_TEST_F(Listener_test, TriggerWhileInCallbackLeadsToAnotherCallbackOnce, Repeat(5), [&] {
::testing::Test::RecordProperty("TEST_ID", "1dea4bbc-6f11-434c-845d-d2ae1104707e");
Expand Down Expand Up @@ -787,7 +787,7 @@ TIMING_TEST_F(Listener_test, TriggerWhileInCallbackLeadsToAnotherCallbackOnce, R
TIMING_TEST_EXPECT_TRUE(g_triggerCallbackArg[0U].m_count == 2U);
TIMING_TEST_EXPECT_TRUE(g_triggerCallbackArg[1U].m_source == &bar);
TIMING_TEST_EXPECT_TRUE(g_triggerCallbackArg[1U].m_count == 1U);
});
})

TIMING_TEST_F(Listener_test, TriggerMultipleTimesWhileInCallbackLeadsToAnotherCallback, Repeat(5), [&] {
::testing::Test::RecordProperty("TEST_ID", "9e1e5a70-e2e9-4ee9-85f9-f52cf475cb61");
Expand Down Expand Up @@ -815,7 +815,7 @@ TIMING_TEST_F(Listener_test, TriggerMultipleTimesWhileInCallbackLeadsToAnotherCa

TIMING_TEST_EXPECT_TRUE(g_triggerCallbackArg[0U].m_source == &fuu);
TIMING_TEST_EXPECT_TRUE(g_triggerCallbackArg[0U].m_count == 2U);
});
})

TIMING_TEST_F(Listener_test, TriggerMultipleTimesWhileInCallbackLeadsToAnotherCallbackOnce, Repeat(5), [&] {
::testing::Test::RecordProperty("TEST_ID", "51163b5c-01c9-426b-9f59-3fac62a2f10c");
Expand Down Expand Up @@ -852,7 +852,7 @@ TIMING_TEST_F(Listener_test, TriggerMultipleTimesWhileInCallbackLeadsToAnotherCa
TIMING_TEST_EXPECT_TRUE(g_triggerCallbackArg[0U].m_count == 2U);
TIMING_TEST_EXPECT_TRUE(g_triggerCallbackArg[1U].m_source == &bar);
TIMING_TEST_EXPECT_TRUE(g_triggerCallbackArg[1U].m_count == 1U);
});
})

TIMING_TEST_F(Listener_test, NoTriggerLeadsToNoCallback, Repeat(5), [&] {
::testing::Test::RecordProperty("TEST_ID", "6c11cc3f-d251-4e10-9c8e-cdc18c257227");
Expand All @@ -868,7 +868,7 @@ TIMING_TEST_F(Listener_test, NoTriggerLeadsToNoCallback, Repeat(5), [&] {

TIMING_TEST_EXPECT_TRUE(g_triggerCallbackArg[0U].m_source == nullptr);
TIMING_TEST_EXPECT_TRUE(g_triggerCallbackArg[0U].m_count == 0U);
});
})

TIMING_TEST_F(Listener_test, TriggeringAllEventsCallsAllCallbacks, Repeat(5), [&] {
::testing::Test::RecordProperty("TEST_ID", "9c0d0be4-7fdf-4b2d-8e40-992a975aa6cc");
Expand Down Expand Up @@ -898,7 +898,7 @@ TIMING_TEST_F(Listener_test, TriggeringAllEventsCallsAllCallbacks, Repeat(5), [&
TIMING_TEST_EXPECT_TRUE(g_triggerCallbackArg[i].m_source == &events[i]);
TIMING_TEST_EXPECT_TRUE(g_triggerCallbackArg[i].m_count == 1U);
}
});
})

TIMING_TEST_F(Listener_test, TriggeringAllEventsCallsAllCallbacksOnce, Repeat(5), [&] {
::testing::Test::RecordProperty("TEST_ID", "6840b748-adcc-40c3-ac39-24870540a58f");
Expand Down Expand Up @@ -931,7 +931,7 @@ TIMING_TEST_F(Listener_test, TriggeringAllEventsCallsAllCallbacksOnce, Repeat(5)
TIMING_TEST_EXPECT_TRUE(g_triggerCallbackArg[i].m_source == &events[i]);
TIMING_TEST_EXPECT_TRUE(g_triggerCallbackArg[i].m_count == 1U);
}
});
})
//////////////////////////////////
// END
//////////////////////////////////
Expand Down Expand Up @@ -964,7 +964,7 @@ TIMING_TEST_F(Listener_test, AttachingWhileCallbackIsRunningWorks, Repeat(5), [&

TIMING_TEST_EXPECT_TRUE(g_triggerCallbackArg[1U].m_source == &events[1U]);
TIMING_TEST_EXPECT_TRUE(g_triggerCallbackArg[1U].m_count == 1U);
});
})

TIMING_TEST_F(Listener_test, AttachingMultipleWhileCallbackIsRunningWorks, Repeat(5), [&] {
::testing::Test::RecordProperty("TEST_ID", "9ff36b35-0396-4f57-831a-dfc9dd0fdd46");
Expand Down Expand Up @@ -996,7 +996,7 @@ TIMING_TEST_F(Listener_test, AttachingMultipleWhileCallbackIsRunningWorks, Repea
TIMING_TEST_EXPECT_TRUE(g_triggerCallbackArg[i].m_source == &events[i]);
TIMING_TEST_EXPECT_TRUE(g_triggerCallbackArg[i].m_count == 1U);
}
});
})

TIMING_TEST_F(Listener_test, DetachingWhileCallbackIsRunningWorks, Repeat(5), [&] {
::testing::Test::RecordProperty("TEST_ID", "f93b89e9-4bc9-432c-9808-cdb6f46ebff2");
Expand All @@ -1020,7 +1020,7 @@ TIMING_TEST_F(Listener_test, DetachingWhileCallbackIsRunningWorks, Repeat(5), [&

TIMING_TEST_EXPECT_TRUE(g_triggerCallbackArg[0U].m_count == 1U);
TIMING_TEST_EXPECT_TRUE(g_triggerCallbackArg[0U].m_source == nullptr);
});
})

TIMING_TEST_F(Listener_test, DetachingWhileCallbackIsRunningBlocksDetach, Repeat(5), [&] {
::testing::Test::RecordProperty("TEST_ID", "0a2b5a79-1ff6-4171-9318-52c593828cfb");
Expand All @@ -1041,7 +1041,7 @@ TIMING_TEST_F(Listener_test, DetachingWhileCallbackIsRunningBlocksDetach, Repeat

auto elapsed = std::chrono::duration_cast<std::chrono::milliseconds>(end - begin);
TIMING_TEST_EXPECT_TRUE(static_cast<uint64_t>(elapsed.count()) > CALLBACK_WAIT_IN_MS / 2U);
});
})

TIMING_TEST_F(Listener_test, EventDestructorBlocksWhenCallbackIsRunning, Repeat(5), [&] {
::testing::Test::RecordProperty("TEST_ID", "0a7fc0d7-aa69-4812-837a-f1497401d3b6");
Expand All @@ -1060,7 +1060,7 @@ TIMING_TEST_F(Listener_test, EventDestructorBlocksWhenCallbackIsRunning, Repeat(

auto elapsed = std::chrono::duration_cast<std::chrono::milliseconds>(end - begin);
TIMING_TEST_EXPECT_TRUE(static_cast<uint64_t>(elapsed.count()) > CALLBACK_WAIT_IN_MS / 2U);
});
})


TIMING_TEST_F(Listener_test, DetachingMultipleWhileCallbackIsRunningWorks, Repeat(5), [&] {
Expand Down Expand Up @@ -1094,7 +1094,7 @@ TIMING_TEST_F(Listener_test, DetachingMultipleWhileCallbackIsRunningWorks, Repea
{
TIMING_TEST_EXPECT_TRUE(g_triggerCallbackArg[i].m_source == nullptr);
}
});
})

TIMING_TEST_F(Listener_test, AttachingDetachingRunsIndependentOfCallback, Repeat(5), [&] {
::testing::Test::RecordProperty("TEST_ID", "f5a15344-a2d7-44dd-9a12-a65b70976f46");
Expand All @@ -1120,7 +1120,7 @@ TIMING_TEST_F(Listener_test, AttachingDetachingRunsIndependentOfCallback, Repeat
// EXPECT_* (assert step) is inside of doIt call. We expect that every event can
// be attached
AttachEvent<iox::MAX_NUMBER_OF_EVENTS_PER_LISTENER - 2U>::doIt(*m_sut, events, SimpleEvent::StoepselBachelorParty);
});
})
//////////////////////////////////
// END
//////////////////////////////////
Expand All @@ -1144,7 +1144,7 @@ TIMING_TEST_F(Listener_test, DetachingSelfInCallbackWorks, Repeat(5), [&] {
std::this_thread::sleep_for(std::chrono::milliseconds(CALLBACK_WAIT_IN_MS));

TIMING_TEST_EXPECT_TRUE(m_sut->size() == 0U);
});
})

TIMING_TEST_F(Listener_test, DetachingNonSelfEventInCallbackWorks, Repeat(5), [&] {
::testing::Test::RecordProperty("TEST_ID", "78d646d0-9899-4563-91cf-3740221fbca1");
Expand All @@ -1167,7 +1167,7 @@ TIMING_TEST_F(Listener_test, DetachingNonSelfEventInCallbackWorks, Repeat(5), [&
std::this_thread::sleep_for(std::chrono::milliseconds(CALLBACK_WAIT_IN_MS));

TIMING_TEST_EXPECT_TRUE(m_sut->size() == 1U);
});
})

TIMING_TEST_F(Listener_test, DetachedCallbacksAreNotBeingCalledWhenTriggeredBefore, Repeat(5), [&] {
::testing::Test::RecordProperty("TEST_ID", "7581bb34-802e-4241-a42e-e72c990936ab");
Expand Down Expand Up @@ -1212,7 +1212,7 @@ TIMING_TEST_F(Listener_test, DetachedCallbacksAreNotBeingCalledWhenTriggeredBefo
TIMING_TEST_EXPECT_TRUE(g_triggerCallbackArg[1U].m_source == nullptr);
TIMING_TEST_EXPECT_TRUE(g_triggerCallbackArg[0U].m_count == 0U);
TIMING_TEST_EXPECT_TRUE(g_triggerCallbackArg[1U].m_count == 1U);
});
})

TIMING_TEST_F(Listener_test, AttachingInCallbackWorks, Repeat(5), [&] {
::testing::Test::RecordProperty("TEST_ID", "58734e7f-2d3f-49ac-9f37-8052016def8c");
Expand All @@ -1233,7 +1233,7 @@ TIMING_TEST_F(Listener_test, AttachingInCallbackWorks, Repeat(5), [&] {

TIMING_TEST_EXPECT_TRUE(g_triggerCallbackArg[0U].m_source == &events[1U]);
TIMING_TEST_EXPECT_TRUE(g_triggerCallbackArg[0U].m_count == 1U);
});
})
//////////////////////////////////
// END
//////////////////////////////////
Expand Down
4 changes: 2 additions & 2 deletions iceoryx_posh/test/moduletests/test_popo_publisher.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ TEST_F(PublisherTest, CanLoanSamplesAndPublishTheResultOfACallableStructWithAddi
.WillOnce(Return(ByMove(iox::cxx::success<iox::mepoo::ChunkHeader*>(chunkMock.chunkHeader()))));
EXPECT_CALL(portMock, sendChunk(chunkMock.chunkHeader()));
// ===== Test ===== //
auto result = sut.publishResultOf(CallableStruct{}, 42U, 77.77f);
auto result = sut.publishResultOf(CallableStruct{}, 42U, 77.77F);
// ===== Verify ===== //
EXPECT_FALSE(result.has_error());
// ===== Cleanup ===== //
Expand Down Expand Up @@ -214,7 +214,7 @@ TEST_F(PublisherTest, CanLoanSamplesAndPublishTheResultOfFunctionPointerWithAddi
.WillOnce(Return(ByMove(iox::cxx::success<iox::mepoo::ChunkHeader*>(chunkMock.chunkHeader()))));
EXPECT_CALL(portMock, sendChunk(chunkMock.chunkHeader()));
// ===== Test ===== //
auto result = sut.publishResultOf(freeFunctionWithAdditionalArgs, 42U, 77.77f);
auto result = sut.publishResultOf(freeFunctionWithAdditionalArgs, 42U, 77.77F);
// ===== Verify ===== //
EXPECT_FALSE(result.has_error());
// ===== Cleanup ===== //
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ namespace
{
using ParseErrorInputFile_t = std::pair<iox::config::TomlGatewayConfigParseError, iox::roudi::ConfigFilePathString_t>;
using CheckCharactersValidity_t = std::pair<std::string, bool>;
}; // namespace
} // namespace

// ======================================== Fixture ======================================== //
class TomlGatewayConfigParserTest : public TestWithParam<ParseErrorInputFile_t>
Expand Down

0 comments on commit 0eaad7a

Please sign in to comment.