From 463524de3fa905cd45a5ee9ee9d0e072d739e6f1 Mon Sep 17 00:00:00 2001 From: Marika Lehmann Date: Wed, 6 Jul 2022 15:11:31 +0200 Subject: [PATCH] iox-#1196 Remove extra ; Signed-off-by: Marika Lehmann --- .../moduletests/test_popo_base_client.cpp | 2 +- .../moduletests/test_popo_base_server.cpp | 2 +- .../test/moduletests/test_popo_listener.cpp | 44 +++++++++---------- 3 files changed, 24 insertions(+), 24 deletions(-) diff --git a/iceoryx_posh/test/moduletests/test_popo_base_client.cpp b/iceoryx_posh/test/moduletests/test_popo_base_client.cpp index 600633827e9..f13cc144e20 100644 --- a/iceoryx_posh/test/moduletests/test_popo_base_client.cpp +++ b/iceoryx_posh/test/moduletests/test_popo_base_client.cpp @@ -51,7 +51,7 @@ int resetCallsFromDtors() { // from base only return 1; -}; +} template class TestBaseClient : public Base diff --git a/iceoryx_posh/test/moduletests/test_popo_base_server.cpp b/iceoryx_posh/test/moduletests/test_popo_base_server.cpp index 0efa8b10b41..2b3c8e42e5d 100644 --- a/iceoryx_posh/test/moduletests/test_popo_base_server.cpp +++ b/iceoryx_posh/test/moduletests/test_popo_base_server.cpp @@ -51,7 +51,7 @@ int resetCallsFromDtors() { // from base only return 1; -}; +} template class TestBaseServer : public Base diff --git a/iceoryx_posh/test/moduletests/test_popo_listener.cpp b/iceoryx_posh/test/moduletests/test_popo_listener.cpp index 855c38b1bbd..dcbd7e6fdd6 100644 --- a/iceoryx_posh/test/moduletests/test_popo_listener.cpp +++ b/iceoryx_posh/test/moduletests/test_popo_listener.cpp @@ -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"); @@ -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"); @@ -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"); @@ -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"); @@ -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"); @@ -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"); @@ -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"); @@ -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"); @@ -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"); @@ -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"); @@ -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 ////////////////////////////////// @@ -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"); @@ -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"); @@ -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"); @@ -1041,7 +1041,7 @@ TIMING_TEST_F(Listener_test, DetachingWhileCallbackIsRunningBlocksDetach, Repeat auto elapsed = std::chrono::duration_cast(end - begin); TIMING_TEST_EXPECT_TRUE(static_cast(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"); @@ -1060,7 +1060,7 @@ TIMING_TEST_F(Listener_test, EventDestructorBlocksWhenCallbackIsRunning, Repeat( auto elapsed = std::chrono::duration_cast(end - begin); TIMING_TEST_EXPECT_TRUE(static_cast(elapsed.count()) > CALLBACK_WAIT_IN_MS / 2U); -}); +}) TIMING_TEST_F(Listener_test, DetachingMultipleWhileCallbackIsRunningWorks, Repeat(5), [&] { @@ -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"); @@ -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::doIt(*m_sut, events, SimpleEvent::StoepselBachelorParty); -}); +}) ////////////////////////////////// // END ////////////////////////////////// @@ -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"); @@ -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"); @@ -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"); @@ -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 //////////////////////////////////