diff --git a/iceoryx_dust/test/moduletests/test_cxx_forward_list.cpp b/iceoryx_dust/test/moduletests/test_cxx_forward_list.cpp index cc717f326c..ea86c47204 100644 --- a/iceoryx_dust/test/moduletests/test_cxx_forward_list.cpp +++ b/iceoryx_dust/test/moduletests/test_cxx_forward_list.cpp @@ -16,6 +16,7 @@ #include "iceoryx_dust/cxx/forward_list.hpp" #include "iceoryx_hoofs/error_handling/error_handling.hpp" +#include "iceoryx_hoofs/testing/ctor_and_assignment_operator_test_class.hpp" #include "iceoryx_hoofs/testing/fatal_failure.hpp" #include "iox/attributes.hpp" #include "test.hpp" @@ -32,118 +33,32 @@ constexpr int64_t TEST_LIST_ELEMENT_DEFAULT_VALUE{-99L}; class forward_list_test : public Test { public: - static uint64_t cTor; - static uint64_t customCTor; - static uint64_t copyCTor; - static uint64_t moveCTor; - static uint64_t moveAssignment; - static uint64_t copyAssignment; - static uint64_t dTor; - static int64_t classValue; - - class TestListElement - { - public: - TestListElement() - { - cTor++; - classValue = m_value; - } - - // NOLINTNEXTLINE(hicpp-explicit-conversions) only used for tests - TestListElement(const int64_t value) - : m_value(value) - { - customCTor++; - classValue = m_value; - } - - TestListElement(const TestListElement& rhs) - : m_value(rhs.m_value) - { - copyCTor++; - classValue = m_value; - } - - TestListElement(TestListElement&& rhs) noexcept - : m_value(rhs.m_value) - { - moveCTor++; - classValue = m_value; - } - - TestListElement& operator=(const TestListElement& rhs) - { - if (this != &rhs) - { - copyAssignment++; - m_value = rhs.m_value; - classValue = m_value; - } - return *this; - } - - TestListElement& operator=(TestListElement&& rhs) noexcept - { - moveAssignment++; - m_value = rhs.m_value; - classValue = m_value; - return *this; - } - - bool operator==(const TestListElement& rhs) const - { - return rhs.m_value == m_value; - } - - ~TestListElement() - { - dTor++; - classValue = m_value; - } - - int64_t m_value = TEST_LIST_ELEMENT_DEFAULT_VALUE; - }; - + using TestListElement = CTorAndAssignmentOperatorTestClass; void SetUp() override { - cTor = 0U; - customCTor = 0U; - copyCTor = 0U; - moveCTor = 0U; - moveAssignment = 0U; - copyAssignment = 0U; - dTor = 0U; - classValue = 0U; + stats.reset(); } + TestListElement::Statistics& stats = TestListElement::stats; + static bool isSetupState() { - return (cTor == 0U && customCTor == 0U && copyCTor == 0U && moveCTor == 0U && moveAssignment == 0U - && copyAssignment == 0U && dTor == 0U && classValue == 0); + TestListElement::Statistics& stats = TestListElement::stats; + return (stats.cTor == 0U && stats.customCTor == 0U && stats.copyCTor == 0U && stats.moveCTor == 0U + && stats.moveAssignment == 0U && stats.copyAssignment == 0U && stats.dTor == 0U + && stats.classValue == 0); } forward_list sut; }; -// forward_list_test statics -uint64_t forward_list_test::cTor; -uint64_t forward_list_test::customCTor; -uint64_t forward_list_test::copyCTor; -uint64_t forward_list_test::moveCTor; -uint64_t forward_list_test::moveAssignment; -uint64_t forward_list_test::copyAssignment; -uint64_t forward_list_test::dTor; -int64_t forward_list_test::classValue; - - template int64_t iteratorTraitReturnDoubleValue(IterType iter) { typedef typename std::iterator_traits::value_type IterValueType; - IterValueType m_value = *iter; - return (2 * m_value); // will only work for integer-convertible m_value types + IterValueType value = *iter; + return (2 * value); // will only work for integer-convertible value types } } // namespace @@ -227,7 +142,7 @@ TEST_F(forward_list_test, beforeBeginAndCbeginAreDifferentWhenEmpty) TEST_F(forward_list_test, CbeginCendAreDifferentWhenFilled) { ::testing::Test::RecordProperty("TEST_ID", "a8e9c012-6ee8-42fb-9851-cab9757bd987"); - EXPECT_THAT(sut.emplace_front().m_value, Eq(TEST_LIST_ELEMENT_DEFAULT_VALUE)); + EXPECT_THAT(sut.emplace_front().value, Eq(TEST_LIST_ELEMENT_DEFAULT_VALUE)); EXPECT_THAT(sut.cbegin() != sut.cend(), Eq(true)); } TEST_F(forward_list_test, BeginEndAreDifferentWhenFilled) @@ -273,7 +188,7 @@ TEST_F(forward_list_test, FullWhenFilledWithCapacityElements) ::testing::Test::RecordProperty("TEST_ID", "03487ca4-71f8-4e8c-abdc-ed2cd0867b06"); for (uint64_t i = 0U; i < sut.capacity(); ++i) { - EXPECT_THAT(sut.emplace_front().m_value, Eq(TEST_LIST_ELEMENT_DEFAULT_VALUE)); + EXPECT_THAT(sut.emplace_front().value, Eq(TEST_LIST_ELEMENT_DEFAULT_VALUE)); } EXPECT_THAT(sut.full(), Eq(true)); } @@ -338,14 +253,14 @@ TEST_F(forward_list_test, CTorWithOneElements) constexpr uint64_t ELEMENT_COUNT{1U}; forward_list sut1; - EXPECT_THAT(cTor, Eq(0U)); + EXPECT_THAT(stats.cTor, Eq(0U)); for (uint64_t i = 0U; i < ELEMENT_COUNT; ++i) { sut1.emplace_front(); } EXPECT_THAT(sut1.size(), Eq(ELEMENT_COUNT)); - EXPECT_THAT(cTor, Eq(ELEMENT_COUNT)); + EXPECT_THAT(stats.cTor, Eq(ELEMENT_COUNT)); } TEST_F(forward_list_test, CustomCTorWithOneElements) @@ -362,9 +277,9 @@ TEST_F(forward_list_test, CustomCTorWithOneElements) } EXPECT_THAT(sut1.size(), Eq(ELEMENT_COUNT)); - EXPECT_THAT(cTor, Eq(0U)); - EXPECT_THAT(customCTor, Eq(ELEMENT_COUNT)); - EXPECT_THAT(classValue, Eq(DEFAULT_VALUE)); + EXPECT_THAT(stats.cTor, Eq(0U)); + EXPECT_THAT(stats.customCTor, Eq(ELEMENT_COUNT)); + EXPECT_THAT(stats.classValue, Eq(DEFAULT_VALUE)); } TEST_F(forward_list_test, CTorWithSomeElements) @@ -380,7 +295,7 @@ TEST_F(forward_list_test, CTorWithSomeElements) } EXPECT_THAT(sut1.size(), Eq(ELEMENT_COUNT)); - EXPECT_THAT(cTor, Eq(ELEMENT_COUNT)); + EXPECT_THAT(stats.cTor, Eq(ELEMENT_COUNT)); } TEST_F(forward_list_test, CTorWithCapacityElements) @@ -396,7 +311,7 @@ TEST_F(forward_list_test, CTorWithCapacityElements) } EXPECT_THAT(sut1.size(), Eq(ELEMENT_COUNT)); - EXPECT_THAT(cTor, Eq(ELEMENT_COUNT)); + EXPECT_THAT(stats.cTor, Eq(ELEMENT_COUNT)); } TEST_F(forward_list_test, CTorWithMoreThanCapacityElements) @@ -413,8 +328,8 @@ TEST_F(forward_list_test, CTorWithMoreThanCapacityElements) sut1.emplace_after(sut1.cbefore_begin(), 2U); EXPECT_THAT(sut1.size(), Eq(CAPACITY)); - EXPECT_THAT(cTor, Eq(CAPACITY)); - EXPECT_THAT(customCTor, Eq(0U)); + EXPECT_THAT(stats.cTor, Eq(CAPACITY)); + EXPECT_THAT(stats.customCTor, Eq(0U)); } @@ -425,10 +340,10 @@ TEST_F(forward_list_test, EmplaceAfterWithOneElements) constexpr uint64_t ELEMENT_COUNT{1U}; forward_list sut1; auto iter = sut1.cbefore_begin(); - decltype(TestListElement::m_value) cnt = 0U; + decltype(TestListElement::value) cnt = 0U; - EXPECT_THAT(cTor, Eq(0U)); - EXPECT_THAT(customCTor, Eq(0U)); + EXPECT_THAT(stats.cTor, Eq(0U)); + EXPECT_THAT(stats.customCTor, Eq(0U)); for (uint64_t i = 0U; i < ELEMENT_COUNT; ++i) { @@ -439,13 +354,13 @@ TEST_F(forward_list_test, EmplaceAfterWithOneElements) cnt = 0U; for (auto& listElement : sut1) { - EXPECT_THAT(listElement.m_value, Eq(cnt)); + EXPECT_THAT(listElement.value, Eq(cnt)); ++cnt; } EXPECT_THAT(sut1.size(), Eq(ELEMENT_COUNT)); - EXPECT_THAT(cTor, Eq(0U)); - EXPECT_THAT(customCTor, Eq(ELEMENT_COUNT)); + EXPECT_THAT(stats.cTor, Eq(0U)); + EXPECT_THAT(stats.customCTor, Eq(ELEMENT_COUNT)); } TEST_F(forward_list_test, EmplaceAfterWithSomeElements) @@ -457,8 +372,8 @@ TEST_F(forward_list_test, EmplaceAfterWithSomeElements) auto iter = sut1.cbefore_begin(); int64_t cnt = 0; - EXPECT_THAT(cTor, Eq(0U)); - EXPECT_THAT(customCTor, Eq(0U)); + EXPECT_THAT(stats.cTor, Eq(0U)); + EXPECT_THAT(stats.customCTor, Eq(0U)); for (uint64_t i = 0U; i < ELEMENT_COUNT; ++i) { @@ -469,13 +384,13 @@ TEST_F(forward_list_test, EmplaceAfterWithSomeElements) cnt = 0; for (auto& listElement : sut1) { - EXPECT_THAT(listElement.m_value, Eq(cnt)); + EXPECT_THAT(listElement.value, Eq(cnt)); ++cnt; } EXPECT_THAT(sut1.size(), Eq(ELEMENT_COUNT)); - EXPECT_THAT(cTor, Eq(0U)); - EXPECT_THAT(customCTor, Eq(ELEMENT_COUNT)); + EXPECT_THAT(stats.cTor, Eq(0U)); + EXPECT_THAT(stats.customCTor, Eq(ELEMENT_COUNT)); } TEST_F(forward_list_test, EmplaceAfterWithCapacityElements) @@ -496,13 +411,13 @@ TEST_F(forward_list_test, EmplaceAfterWithCapacityElements) cnt = 0U; for (auto& listElement : sut1) { - EXPECT_THAT(listElement.m_value, Eq(cnt)); + EXPECT_THAT(listElement.value, Eq(cnt)); ++cnt; } EXPECT_THAT(sut1.size(), Eq(ELEMENT_COUNT)); - EXPECT_THAT(cTor, Eq(0U)); - EXPECT_THAT(customCTor, Eq(ELEMENT_COUNT)); + EXPECT_THAT(stats.cTor, Eq(0U)); + EXPECT_THAT(stats.customCTor, Eq(ELEMENT_COUNT)); } TEST_F(forward_list_test, EmplaceAfterWithMoreThanCapacityElements) @@ -523,13 +438,13 @@ TEST_F(forward_list_test, EmplaceAfterWithMoreThanCapacityElements) cnt = 0; for (auto& listElement : sut1) { - EXPECT_THAT(listElement.m_value, Eq(cnt)); + EXPECT_THAT(listElement.value, Eq(cnt)); ++cnt; } EXPECT_THAT(sut1.size(), Eq(CAPACITY)); - EXPECT_THAT(cTor, Eq(0U)); - EXPECT_THAT(customCTor, Eq(CAPACITY)); + EXPECT_THAT(stats.cTor, Eq(0U)); + EXPECT_THAT(stats.customCTor, Eq(CAPACITY)); } @@ -551,13 +466,13 @@ TEST_F(forward_list_test, EmplaceAfterReverseWithOneElements) --cnt; for (auto& listElement : sut1) { - EXPECT_THAT(listElement.m_value, Eq(cnt)); + EXPECT_THAT(listElement.value, Eq(cnt)); --cnt; } EXPECT_THAT(sut1.size(), Eq(ELEMENT_COUNT)); - EXPECT_THAT(cTor, Eq(0U)); - EXPECT_THAT(customCTor, Eq(ELEMENT_COUNT)); + EXPECT_THAT(stats.cTor, Eq(0U)); + EXPECT_THAT(stats.customCTor, Eq(ELEMENT_COUNT)); } TEST_F(forward_list_test, EmplaceAfterReverseWithSomeElements) @@ -578,13 +493,13 @@ TEST_F(forward_list_test, EmplaceAfterReverseWithSomeElements) --cnt; for (auto& listElement : sut1) { - EXPECT_THAT(listElement.m_value, Eq(cnt)); + EXPECT_THAT(listElement.value, Eq(cnt)); --cnt; } EXPECT_THAT(sut1.size(), Eq(ELEMENT_COUNT)); - EXPECT_THAT(cTor, Eq(0U)); - EXPECT_THAT(customCTor, Eq(ELEMENT_COUNT)); + EXPECT_THAT(stats.cTor, Eq(0U)); + EXPECT_THAT(stats.customCTor, Eq(ELEMENT_COUNT)); } TEST_F(forward_list_test, EmplaceAfterReverseWithCapacityElements) @@ -605,13 +520,13 @@ TEST_F(forward_list_test, EmplaceAfterReverseWithCapacityElements) cnt = CAPACITY - 1; for (auto& listElement : sut1) { - EXPECT_THAT(listElement.m_value, Eq(cnt)); + EXPECT_THAT(listElement.value, Eq(cnt)); --cnt; } EXPECT_THAT(sut1.size(), Eq(ELEMENT_COUNT)); - EXPECT_THAT(cTor, Eq(0U)); - EXPECT_THAT(customCTor, Eq(ELEMENT_COUNT)); + EXPECT_THAT(stats.cTor, Eq(0U)); + EXPECT_THAT(stats.customCTor, Eq(ELEMENT_COUNT)); } TEST_F(forward_list_test, EmplaceAfterReverseWithWithMoreThanCapacityElements) @@ -632,13 +547,13 @@ TEST_F(forward_list_test, EmplaceAfterReverseWithWithMoreThanCapacityElements) cnt = CAPACITY - 1; for (auto& listElement : sut1) { - EXPECT_THAT(listElement.m_value, Eq(cnt)); + EXPECT_THAT(listElement.value, Eq(cnt)); --cnt; } EXPECT_THAT(sut1.size(), Eq(CAPACITY)); - EXPECT_THAT(cTor, Eq(0U)); - EXPECT_THAT(customCTor, Eq(CAPACITY)); + EXPECT_THAT(stats.cTor, Eq(0U)); + EXPECT_THAT(stats.customCTor, Eq(CAPACITY)); } TEST_F(forward_list_test, EmplaceAfterWithWrongListIterator) @@ -669,9 +584,9 @@ TEST_F(forward_list_test, PushFrontConstCustomSuccessfullWhenSpaceAvailableLValu const TestListElement a{DEFAULT_VALUE}; EXPECT_TRUE(sut.push_front(a)); ASSERT_THAT(sut.size(), Eq(1U)); - EXPECT_THAT(cTor, Eq(0U)); - EXPECT_THAT(customCTor, Eq(1U)); - EXPECT_THAT((*sut.begin()).m_value, Eq(DEFAULT_VALUE)); + EXPECT_THAT(stats.cTor, Eq(0U)); + EXPECT_THAT(stats.customCTor, Eq(1U)); + EXPECT_THAT((*sut.begin()).value, Eq(DEFAULT_VALUE)); } TEST_F(forward_list_test, PushFrontConstSuccessfullWhenSpaceAvailableLValue) @@ -680,9 +595,9 @@ TEST_F(forward_list_test, PushFrontConstSuccessfullWhenSpaceAvailableLValue) const TestListElement a{}; EXPECT_TRUE(sut.push_front(a)); ASSERT_THAT(sut.size(), Eq(1U)); - EXPECT_THAT(cTor, Eq(1U)); - EXPECT_THAT(customCTor, Eq(0U)); - EXPECT_THAT((*sut.begin()).m_value, Eq(TEST_LIST_ELEMENT_DEFAULT_VALUE)); + EXPECT_THAT(stats.cTor, Eq(1U)); + EXPECT_THAT(stats.customCTor, Eq(0U)); + EXPECT_THAT((*sut.begin()).value, Eq(TEST_LIST_ELEMENT_DEFAULT_VALUE)); } TEST_F(forward_list_test, PushFrontFailsWhenSpaceNotAvailableLValue) @@ -708,9 +623,9 @@ TEST_F(forward_list_test, PushFrontSuccessfullWhenSpaceAvailableRValue) EXPECT_THAT(sut.size(), Eq(0U)); - sut.push_front(DEFAULT_VALUE); + sut.push_front(TestListElement{DEFAULT_VALUE}); EXPECT_THAT(sut.size(), Eq(1U)); - EXPECT_THAT((*sut.begin()).m_value, Eq(DEFAULT_VALUE)); + EXPECT_THAT((*sut.begin()).value, Eq(DEFAULT_VALUE)); } TEST_F(forward_list_test, PushFrontFailsWhenSpaceNotAvailableRValue) @@ -730,7 +645,7 @@ TEST_F(forward_list_test, PushFrontFailsWhenSpaceNotAvailableRValue) for (auto& listElement : sut) { - EXPECT_THAT(listElement.m_value, Eq(DEFAULT_VALUE)); + EXPECT_THAT(listElement.value, Eq(DEFAULT_VALUE)); } } @@ -746,8 +661,8 @@ TEST_F(forward_list_test, AccessFrontElement) TestListElement& b{sut.front()}; const TestListElement& c{sut.front()}; - EXPECT_THAT(b.m_value, Eq(DEFAULT_VALUE)); - EXPECT_THAT(c.m_value, Eq(DEFAULT_VALUE)); + EXPECT_THAT(b.value, Eq(DEFAULT_VALUE)); + EXPECT_THAT(c.value, Eq(DEFAULT_VALUE)); } TEST_F(forward_list_test, AccessFrontElementFromConstList) @@ -762,8 +677,8 @@ TEST_F(forward_list_test, AccessFrontElementFromConstList) const forward_list sut1{sut}; const TestListElement& c = sut1.front(); - EXPECT_THAT(c.m_value, Eq(DEFAULT_VALUE)); - EXPECT_THAT(sut1.front().m_value, Eq(DEFAULT_VALUE)); + EXPECT_THAT(c.value, Eq(DEFAULT_VALUE)); + EXPECT_THAT(sut1.front().value, Eq(DEFAULT_VALUE)); } @@ -785,9 +700,9 @@ TEST_F(forward_list_test, PopFrontNonEmptyList) EXPECT_TRUE(sut.pop_front()); ASSERT_THAT(sut.size(), Eq(0U)); - ASSERT_THAT(cTor, Eq(0U)); - EXPECT_THAT(customCTor, Eq(1U)); - ASSERT_THAT(dTor, Eq(1U)); + ASSERT_THAT(stats.cTor, Eq(0U)); + EXPECT_THAT(stats.customCTor, Eq(1U)); + ASSERT_THAT(stats.dTor, Eq(1U)); } TEST_F(forward_list_test, PopFrontFullToEmptyList) @@ -806,8 +721,8 @@ TEST_F(forward_list_test, PopFrontFullToEmptyList) } ASSERT_THAT(sut.size(), Eq(0U)); - ASSERT_THAT(cTor, Eq(TESTLISTCAPACITY)); - ASSERT_THAT(dTor, Eq(TESTLISTCAPACITY)); + ASSERT_THAT(stats.cTor, Eq(TESTLISTCAPACITY)); + ASSERT_THAT(stats.dTor, Eq(TESTLISTCAPACITY)); } TEST_F(forward_list_test, PopFrontFullPlusOneToEmptyList) @@ -828,9 +743,9 @@ TEST_F(forward_list_test, PopFrontFullPlusOneToEmptyList) EXPECT_FALSE(sut.pop_front()); ASSERT_THAT(sut.size(), Eq(0U)); - ASSERT_THAT(cTor, Eq(TESTLISTCAPACITY)); - ASSERT_THAT(customCTor, Eq(0U)); - ASSERT_THAT(dTor, Eq(TESTLISTCAPACITY)); + ASSERT_THAT(stats.cTor, Eq(TESTLISTCAPACITY)); + ASSERT_THAT(stats.customCTor, Eq(0U)); + ASSERT_THAT(stats.dTor, Eq(TESTLISTCAPACITY)); } @@ -843,12 +758,12 @@ TEST_F(forward_list_test, InsertAfterEmptyListAsLValue) sut.insert_after(sut.before_begin(), a); ASSERT_THAT(sut.size(), Eq(1U)); - ASSERT_THAT(cTor, Eq(0U)); - ASSERT_THAT(customCTor, Eq(1U)); - ASSERT_THAT(copyCTor, Eq(1U)); - ASSERT_THAT(moveCTor, Eq(0U)); - ASSERT_THAT(copyAssignment, Eq(0U)); - ASSERT_THAT(moveAssignment, Eq(0U)); + ASSERT_THAT(stats.cTor, Eq(0U)); + ASSERT_THAT(stats.customCTor, Eq(1U)); + ASSERT_THAT(stats.copyCTor, Eq(1U)); + ASSERT_THAT(stats.moveCTor, Eq(0U)); + ASSERT_THAT(stats.copyAssignment, Eq(0U)); + ASSERT_THAT(stats.moveAssignment, Eq(0U)); } TEST_F(forward_list_test, InsertAfterLValueCheckReturn) @@ -869,12 +784,12 @@ TEST_F(forward_list_test, InsertAfterEmptyListAsRValue) sut.insert_after(sut.before_begin(), {DATA}); ASSERT_THAT(sut.size(), Eq(1U)); - ASSERT_THAT(cTor, Eq(0U)); - ASSERT_THAT(customCTor, Eq(1U)); - ASSERT_THAT(copyCTor, Eq(0U)); - ASSERT_THAT(moveCTor, Eq(1U)); - ASSERT_THAT(copyAssignment, Eq(0U)); - ASSERT_THAT(moveAssignment, Eq(0U)); + ASSERT_THAT(stats.cTor, Eq(0U)); + ASSERT_THAT(stats.customCTor, Eq(1U)); + ASSERT_THAT(stats.copyCTor, Eq(0U)); + ASSERT_THAT(stats.moveCTor, Eq(1U)); + ASSERT_THAT(stats.copyAssignment, Eq(0U)); + ASSERT_THAT(stats.moveAssignment, Eq(0U)); } TEST_F(forward_list_test, InsertAfterRValueCheckReturn) @@ -884,7 +799,7 @@ TEST_F(forward_list_test, InsertAfterRValueCheckReturn) auto iter = sut.insert_after(sut.before_begin(), {DATA}); ASSERT_THAT(iter == sut.begin(), Eq(true)); - ASSERT_THAT((*iter).m_value, Eq(DATA)); + ASSERT_THAT((*iter).value, Eq(DATA)); } TEST_F(forward_list_test, InsertAfterBeginListLValue) @@ -897,11 +812,11 @@ TEST_F(forward_list_test, InsertAfterBeginListLValue) sut.insert_after(sut.begin(), a); ASSERT_THAT(sut.size(), Eq(2U)); - ASSERT_THAT(cTor, Eq(1U)); - ASSERT_THAT(customCTor, Eq(1U)); + ASSERT_THAT(stats.cTor, Eq(1U)); + ASSERT_THAT(stats.customCTor, Eq(1U)); auto iter = sut.begin(); - EXPECT_THAT(iter->m_value, Eq(TEST_LIST_ELEMENT_DEFAULT_VALUE)); - EXPECT_THAT((++iter)->m_value, Eq(DEFAULT_VALUE)); + EXPECT_THAT(iter->value, Eq(TEST_LIST_ELEMENT_DEFAULT_VALUE)); + EXPECT_THAT((++iter)->value, Eq(DEFAULT_VALUE)); } @@ -915,11 +830,11 @@ TEST_F(forward_list_test, InsertAfterBeforeBeginListLValue) sut.insert_after(sut.before_begin(), a); ASSERT_THAT(sut.size(), Eq(2U)); - ASSERT_THAT(cTor, Eq(1U)); - ASSERT_THAT(customCTor, Eq(1U)); + ASSERT_THAT(stats.cTor, Eq(1U)); + ASSERT_THAT(stats.customCTor, Eq(1U)); auto iter = sut.begin(); - EXPECT_THAT((*iter).m_value, Eq(DEFAULT_VALUE)); - EXPECT_THAT((++iter)->m_value, Eq(TEST_LIST_ELEMENT_DEFAULT_VALUE)); + EXPECT_THAT((*iter).value, Eq(DEFAULT_VALUE)); + EXPECT_THAT((++iter)->value, Eq(TEST_LIST_ELEMENT_DEFAULT_VALUE)); } TEST_F(forward_list_test, InsertAfterBeforeBeginListRValue) @@ -932,11 +847,11 @@ TEST_F(forward_list_test, InsertAfterBeforeBeginListRValue) sut.insert_after(sut.before_begin(), {}); ASSERT_THAT(sut.size(), Eq(2U)); - ASSERT_THAT(cTor, Eq(1U)); - ASSERT_THAT(customCTor, Eq(1U)); + ASSERT_THAT(stats.cTor, Eq(1U)); + ASSERT_THAT(stats.customCTor, Eq(1U)); auto iter = sut.begin(); - EXPECT_THAT((*iter).m_value, Eq(TEST_LIST_ELEMENT_DEFAULT_VALUE)); - EXPECT_THAT((++iter)->m_value, Eq(DEFAULT_VALUE)); + EXPECT_THAT((*iter).value, Eq(TEST_LIST_ELEMENT_DEFAULT_VALUE)); + EXPECT_THAT((++iter)->value, Eq(DEFAULT_VALUE)); } TEST_F(forward_list_test, InsertAfterSomeElementsListLValue) @@ -968,16 +883,16 @@ TEST_F(forward_list_test, InsertAfterSomeElementsListLValue) ASSERT_THAT(sut.size(), Eq(6U)); ASSERT_THAT(loopCounter, Eq(6U)); - ASSERT_THAT(cTor, Eq(0U)); - ASSERT_THAT(customCTor, Eq(6U)); + ASSERT_THAT(stats.cTor, Eq(0U)); + ASSERT_THAT(stats.customCTor, Eq(6U)); iter = sut.begin(); - EXPECT_THAT(iter->m_value, Eq(4U)); - EXPECT_THAT((++iter)->m_value, Eq(3U)); - EXPECT_THAT((++iter)->m_value, Eq(2U)); - EXPECT_THAT((++iter)->m_value, Eq(DEFAULT_VALUE)); - EXPECT_THAT((++iter)->m_value, Eq(1U)); - EXPECT_THAT((++iter)->m_value, Eq(0U)); + EXPECT_THAT(iter->value, Eq(4U)); + EXPECT_THAT((++iter)->value, Eq(3U)); + EXPECT_THAT((++iter)->value, Eq(2U)); + EXPECT_THAT((++iter)->value, Eq(DEFAULT_VALUE)); + EXPECT_THAT((++iter)->value, Eq(1U)); + EXPECT_THAT((++iter)->value, Eq(0U)); } TEST_F(forward_list_test, InsertAfterSomeElementsListRValue) @@ -1001,16 +916,16 @@ TEST_F(forward_list_test, InsertAfterSomeElementsListRValue) sut.insert_after(iter, DEFAULT_VALUE); ASSERT_THAT(sut.size(), Eq(6U)); - ASSERT_THAT(cTor, Eq(0U)); - ASSERT_THAT(customCTor, Eq(6U)); + ASSERT_THAT(stats.cTor, Eq(0U)); + ASSERT_THAT(stats.customCTor, Eq(6U)); iter = sut.begin(); - EXPECT_THAT(iter->m_value, Eq(4U)); - EXPECT_THAT((++iter)->m_value, Eq(3U)); - EXPECT_THAT((++iter)->m_value, Eq(2U)); - EXPECT_THAT((++iter)->m_value, Eq(DEFAULT_VALUE)); - EXPECT_THAT((++iter)->m_value, Eq(1U)); - EXPECT_THAT((++iter)->m_value, Eq(0U)); + EXPECT_THAT(iter->value, Eq(4U)); + EXPECT_THAT((++iter)->value, Eq(3U)); + EXPECT_THAT((++iter)->value, Eq(2U)); + EXPECT_THAT((++iter)->value, Eq(DEFAULT_VALUE)); + EXPECT_THAT((++iter)->value, Eq(1U)); + EXPECT_THAT((++iter)->value, Eq(0U)); } @@ -1033,16 +948,16 @@ TEST_F(forward_list_test, InsertAfterFullElementsListLValue) sut.insert_after(iter, a); ASSERT_THAT(sut.size(), Eq(TESTLISTCAPACITY)); - ASSERT_THAT(cTor, Eq(0U)); - ASSERT_THAT(customCTor, Eq(TESTLISTCAPACITY)); + ASSERT_THAT(stats.cTor, Eq(0U)); + ASSERT_THAT(stats.customCTor, Eq(TESTLISTCAPACITY)); for (auto& listElement : sut) { - EXPECT_THAT(listElement.m_value, Eq(cnt)); + EXPECT_THAT(listElement.value, Eq(cnt)); ++cnt; if (TESTLISTCAPACITY - 1L == cnt) { - // for the last element (insert_after) check for different m_value + // for the last element (insert_after) check for different value cnt = DEFAULT_VALUE; } } @@ -1066,16 +981,16 @@ TEST_F(forward_list_test, InsertAfterFullElementsListRValue) sut.insert_after(iter, DEFAULT_VALUE); ASSERT_THAT(sut.size(), Eq(TESTLISTCAPACITY)); - ASSERT_THAT(cTor, Eq(0U)); - ASSERT_THAT(customCTor, Eq(TESTLISTCAPACITY)); + ASSERT_THAT(stats.cTor, Eq(0U)); + ASSERT_THAT(stats.customCTor, Eq(TESTLISTCAPACITY)); for (auto& listElement : sut) { - EXPECT_THAT(listElement.m_value, Eq(cnt)); + EXPECT_THAT(listElement.value, Eq(cnt)); ++cnt; if (TESTLISTCAPACITY - 1L == cnt) { - // for the last element (insert_after) check for different m_value + // for the last element (insert_after) check for different value cnt = DEFAULT_VALUE; } } @@ -1102,16 +1017,16 @@ TEST_F(forward_list_test, IteratorArrowOperator) sut.insert_after(iter, DEFAULT_VALUE); ASSERT_THAT(sut.size(), Eq(6U)); - ASSERT_THAT(cTor, Eq(0U)); - ASSERT_THAT(customCTor, Eq(6U)); + ASSERT_THAT(stats.cTor, Eq(0U)); + ASSERT_THAT(stats.customCTor, Eq(6U)); iter = sut.cbefore_begin(); - EXPECT_THAT((++iter)->m_value, Eq(4U)); - EXPECT_THAT((++iter)->m_value, Eq(3U)); - EXPECT_THAT((++iter)->m_value, Eq(2U)); - EXPECT_THAT((++iter)->m_value, Eq(DEFAULT_VALUE)); - EXPECT_THAT((++iter)->m_value, Eq(1U)); - EXPECT_THAT((++iter)->m_value, Eq(0U)); + EXPECT_THAT((++iter)->value, Eq(4U)); + EXPECT_THAT((++iter)->value, Eq(3U)); + EXPECT_THAT((++iter)->value, Eq(2U)); + EXPECT_THAT((++iter)->value, Eq(DEFAULT_VALUE)); + EXPECT_THAT((++iter)->value, Eq(1U)); + EXPECT_THAT((++iter)->value, Eq(0U)); } TEST_F(forward_list_test, IteratorIncrementOperatorBeyondEnd) @@ -1122,7 +1037,7 @@ TEST_F(forward_list_test, IteratorIncrementOperatorBeyondEnd) sut.push_front(DEFAULT_VALUE); auto iter = sut.begin(); - EXPECT_THAT(iter->m_value, Eq(DEFAULT_VALUE)); + EXPECT_THAT(iter->value, Eq(DEFAULT_VALUE)); EXPECT_TRUE((++iter) == sut.cend()); EXPECT_TRUE((++iter) == sut.cend()); } @@ -1135,7 +1050,7 @@ TEST_F(forward_list_test, ConstIteratorIncrementOperatorBeyondEnd) sut.push_front(DEFAULT_VALUE); auto iter = sut.cbegin(); - EXPECT_THAT(iter->m_value, Eq(DEFAULT_VALUE)); + EXPECT_THAT(iter->value, Eq(DEFAULT_VALUE)); EXPECT_TRUE((++iter) == sut.cend()); EXPECT_TRUE((++iter) == sut.cend()); } @@ -1266,19 +1181,19 @@ TEST_F(forward_list_test, CopyConstructor) constexpr uint32_t ELEMENT2 = 102U; sut11.emplace_front(ELEMENT1); sut11.emplace_front(ELEMENT2); - EXPECT_THAT(customCTor, Eq(2U)); + EXPECT_THAT(stats.customCTor, Eq(2U)); forward_list sut12(sut11); - EXPECT_THAT(customCTor, Eq(2U)); - EXPECT_THAT(copyCTor, Eq(2U)); - EXPECT_THAT(moveCTor, Eq(0U)); - EXPECT_THAT(moveAssignment, Eq(0U)); - EXPECT_THAT(copyAssignment, Eq(0U)); + EXPECT_THAT(stats.customCTor, Eq(2U)); + EXPECT_THAT(stats.copyCTor, Eq(2U)); + EXPECT_THAT(stats.moveCTor, Eq(0U)); + EXPECT_THAT(stats.moveAssignment, Eq(0U)); + EXPECT_THAT(stats.copyAssignment, Eq(0U)); auto iter = sut12.begin(); - EXPECT_THAT(iter->m_value, Eq(ELEMENT2)); + EXPECT_THAT(iter->value, Eq(ELEMENT2)); ++iter; - EXPECT_THAT(iter->m_value, Eq(ELEMENT1)); + EXPECT_THAT(iter->value, Eq(ELEMENT1)); EXPECT_THAT(sut12.empty(), Eq(false)); EXPECT_THAT(sut12.size(), Eq(2U)); } @@ -1289,7 +1204,7 @@ TEST_F(forward_list_test, CopyConstructorWithEmptyForwardList) forward_list sut11; // NOLINTNEXTLINE(performance-unnecessary-copy-initialization) copy constructor shall be tested forward_list sut12(sut11); - EXPECT_THAT(copyCTor, Eq(0U)); + EXPECT_THAT(stats.copyCTor, Eq(0U)); EXPECT_THAT(sut12.size(), Eq(0U)); EXPECT_THAT(sut12.empty(), Eq(true)); } @@ -1298,7 +1213,7 @@ TEST_F(forward_list_test, CopyConstructorWithFullForwardList) { ::testing::Test::RecordProperty("TEST_ID", "60f40098-0565-4276-810c-86d7e1685f2d"); forward_list sut11; - decltype(TestListElement::m_value) i = 0U; + decltype(TestListElement::value) i = 0U; for (uint64_t i = 0U; i < TESTLISTCAPACITY; ++i) { @@ -1308,11 +1223,11 @@ TEST_F(forward_list_test, CopyConstructorWithFullForwardList) forward_list sut12(sut11); for (auto& listElement : sut12) { - listElement.m_value = i; + listElement.value = i; ++i; } - EXPECT_THAT(copyCTor, Eq(TESTLISTCAPACITY)); + EXPECT_THAT(stats.copyCTor, Eq(TESTLISTCAPACITY)); EXPECT_THAT(i, Eq(TESTLISTCAPACITY)); EXPECT_THAT(sut12.size(), Eq(TESTLISTCAPACITY)); EXPECT_THAT(sut12.empty(), Eq(false)); @@ -1329,16 +1244,16 @@ TEST_F(forward_list_test, MoveConstructor) forward_list sut12(std::move(sut11)); - EXPECT_THAT(cTor, Eq(0U)); - EXPECT_THAT(customCTor, Eq(2U)); - EXPECT_THAT(copyCTor, Eq(0U)); - EXPECT_THAT(moveCTor, Eq(2U)); - EXPECT_THAT(copyAssignment, Eq(0U)); - EXPECT_THAT(moveAssignment, Eq(0U)); - EXPECT_THAT(dTor, Eq(2U)); + EXPECT_THAT(stats.cTor, Eq(0U)); + EXPECT_THAT(stats.customCTor, Eq(2U)); + EXPECT_THAT(stats.copyCTor, Eq(0U)); + EXPECT_THAT(stats.moveCTor, Eq(2U)); + EXPECT_THAT(stats.copyAssignment, Eq(0U)); + EXPECT_THAT(stats.moveAssignment, Eq(0U)); + EXPECT_THAT(stats.dTor, Eq(2U)); auto iter = sut12.begin(); - EXPECT_THAT(iter->m_value, Eq(ELEMENT2)); - EXPECT_THAT((++iter)->m_value, Eq(ELEMENT1)); + EXPECT_THAT(iter->value, Eq(ELEMENT2)); + EXPECT_THAT((++iter)->value, Eq(ELEMENT1)); EXPECT_THAT(sut12.empty(), Eq(false)); EXPECT_THAT(sut12.size(), Eq(2U)); // NOLINTJUSTIFICATION we explicitly want to test the defined state of a moved object @@ -1351,9 +1266,9 @@ TEST_F(forward_list_test, MoveConstructorWithEmptyForwardList) ::testing::Test::RecordProperty("TEST_ID", "a4b0fa37-fd3d-424a-9564-6c13f4eb4593"); forward_list sut11; forward_list sut12(std::move(sut11)); - EXPECT_THAT(moveCTor, Eq(0U)); - EXPECT_THAT(cTor, Eq(0U)); - EXPECT_THAT(customCTor, Eq(0U)); + EXPECT_THAT(stats.moveCTor, Eq(0U)); + EXPECT_THAT(stats.cTor, Eq(0U)); + EXPECT_THAT(stats.customCTor, Eq(0U)); EXPECT_THAT(sut12.size(), Eq(0U)); EXPECT_THAT(sut12.empty(), Eq(true)); } @@ -1369,10 +1284,10 @@ TEST_F(forward_list_test, MoveConstructorWithFullForwardList) forward_list sut12(std::move(sut11)); - EXPECT_THAT(moveCTor, Eq(TESTLISTCAPACITY)); - EXPECT_THAT(copyCTor, Eq(0U)); - EXPECT_THAT(cTor, Eq(0U)); - EXPECT_THAT(customCTor, Eq(TESTLISTCAPACITY)); + EXPECT_THAT(stats.moveCTor, Eq(TESTLISTCAPACITY)); + EXPECT_THAT(stats.copyCTor, Eq(0U)); + EXPECT_THAT(stats.cTor, Eq(0U)); + EXPECT_THAT(stats.customCTor, Eq(TESTLISTCAPACITY)); EXPECT_THAT(sut12.size(), Eq(TESTLISTCAPACITY)); EXPECT_THAT(sut12.empty(), Eq(false)); } @@ -1383,7 +1298,7 @@ TEST_F(forward_list_test, DestructorWithEmptyForwardList) { forward_list sut11; } - EXPECT_THAT(dTor, Eq(0U)); + EXPECT_THAT(stats.dTor, Eq(0U)); } TEST_F(forward_list_test, DestructorSomeElements) @@ -1395,10 +1310,10 @@ TEST_F(forward_list_test, DestructorSomeElements) sut11.emplace_front(9191U); sut11.emplace_front(1U); } - EXPECT_THAT(cTor, Eq(0U)); + EXPECT_THAT(stats.cTor, Eq(0U)); - EXPECT_THAT(customCTor, Eq(3U)); - EXPECT_THAT(dTor, Eq(3U)); + EXPECT_THAT(stats.customCTor, Eq(3U)); + EXPECT_THAT(stats.dTor, Eq(3U)); } TEST_F(forward_list_test, DestructorWithFullForwardList) @@ -1412,9 +1327,9 @@ TEST_F(forward_list_test, DestructorWithFullForwardList) } } - EXPECT_THAT(dTor, Eq(TESTLISTCAPACITY)); - EXPECT_THAT(cTor, Eq(0U)); - EXPECT_THAT(customCTor, Eq(TESTLISTCAPACITY)); + EXPECT_THAT(stats.dTor, Eq(TESTLISTCAPACITY)); + EXPECT_THAT(stats.cTor, Eq(0U)); + EXPECT_THAT(stats.customCTor, Eq(TESTLISTCAPACITY)); } TEST_F(forward_list_test, CopyAssignmentWithEmptySource) @@ -1427,11 +1342,11 @@ TEST_F(forward_list_test, CopyAssignmentWithEmptySource) sut11.emplace_front(8132U); sut11 = sut12; - EXPECT_THAT(dTor, Eq(3U)); - EXPECT_THAT(copyAssignment, Eq(0U)); - EXPECT_THAT(copyCTor, Eq(0U)); - EXPECT_THAT(cTor, Eq(0U)); - EXPECT_THAT(customCTor, Eq(3U)); + EXPECT_THAT(stats.dTor, Eq(3U)); + EXPECT_THAT(stats.copyAssignment, Eq(0U)); + EXPECT_THAT(stats.copyCTor, Eq(0U)); + EXPECT_THAT(stats.cTor, Eq(0U)); + EXPECT_THAT(stats.customCTor, Eq(3U)); EXPECT_THAT(sut11.size(), Eq(0U)); EXPECT_THAT(sut11.empty(), Eq(true)); } @@ -1449,16 +1364,16 @@ TEST_F(forward_list_test, CopyAssignmentWithEmptyDestination) sut11.emplace_front(ELEMENT3); sut12 = sut11; - EXPECT_THAT(dTor, Eq(0U)); - EXPECT_THAT(copyAssignment, Eq(0U)); - EXPECT_THAT(copyCTor, Eq(3U)); + EXPECT_THAT(stats.dTor, Eq(0U)); + EXPECT_THAT(stats.copyAssignment, Eq(0U)); + EXPECT_THAT(stats.copyCTor, Eq(3U)); EXPECT_THAT(sut12.size(), Eq(3U)); EXPECT_THAT(sut12.empty(), Eq(false)); auto iter = sut12.cbefore_begin(); - EXPECT_THAT((++iter)->m_value, Eq(ELEMENT3)); - EXPECT_THAT((++iter)->m_value, Eq(ELEMENT2)); - EXPECT_THAT((++iter)->m_value, Eq(ELEMENT1)); + EXPECT_THAT((++iter)->value, Eq(ELEMENT3)); + EXPECT_THAT((++iter)->value, Eq(ELEMENT2)); + EXPECT_THAT((++iter)->value, Eq(ELEMENT1)); } @@ -1477,15 +1392,15 @@ TEST_F(forward_list_test, CopyAssignmentWithLargerDestination) sut11 = sut12; - EXPECT_THAT(dTor, Eq(2U)); - EXPECT_THAT(copyAssignment, Eq(2U)); - EXPECT_THAT(copyCTor, Eq(0U)); + EXPECT_THAT(stats.dTor, Eq(2U)); + EXPECT_THAT(stats.copyAssignment, Eq(2U)); + EXPECT_THAT(stats.copyCTor, Eq(0U)); EXPECT_THAT(sut11.size(), Eq(2U)); EXPECT_THAT(sut11.empty(), Eq(false)); auto iter = sut11.cbefore_begin(); - EXPECT_THAT((++iter)->m_value, Eq(3131U)); - EXPECT_THAT((++iter)->m_value, Eq(313U)); + EXPECT_THAT((++iter)->value, Eq(3131U)); + EXPECT_THAT((++iter)->value, Eq(313U)); } TEST_F(forward_list_test, CopyAssignmentWithLargerSource) @@ -1503,17 +1418,17 @@ TEST_F(forward_list_test, CopyAssignmentWithLargerSource) sut12 = sut11; - EXPECT_THAT(dTor, Eq(0U)); - EXPECT_THAT(copyAssignment, Eq(2U)); - EXPECT_THAT(copyCTor, Eq(2U)); + EXPECT_THAT(stats.dTor, Eq(0U)); + EXPECT_THAT(stats.copyAssignment, Eq(2U)); + EXPECT_THAT(stats.copyCTor, Eq(2U)); EXPECT_THAT(sut12.size(), Eq(4U)); EXPECT_THAT(sut12.empty(), Eq(false)); auto iter = sut12.cbefore_begin(); - EXPECT_THAT((++iter)->m_value, Eq(158432U)); - EXPECT_THAT((++iter)->m_value, Eq(158432U)); - EXPECT_THAT((++iter)->m_value, Eq(1584122U)); - EXPECT_THAT((++iter)->m_value, Eq(15842U)); + EXPECT_THAT((++iter)->value, Eq(158432U)); + EXPECT_THAT((++iter)->value, Eq(158432U)); + EXPECT_THAT((++iter)->value, Eq(1584122U)); + EXPECT_THAT((++iter)->value, Eq(15842U)); } @@ -1528,9 +1443,9 @@ TEST_F(forward_list_test, MoveAssignmentWithEmptySource) sut11 = std::move(sut12); - EXPECT_THAT(dTor, Eq(3U)); - EXPECT_THAT(moveAssignment, Eq(0U)); - EXPECT_THAT(moveCTor, Eq(0U)); + EXPECT_THAT(stats.dTor, Eq(3U)); + EXPECT_THAT(stats.moveAssignment, Eq(0U)); + EXPECT_THAT(stats.moveCTor, Eq(0U)); EXPECT_THAT(sut11.size(), Eq(0U)); EXPECT_THAT(sut11.empty(), Eq(true)); } @@ -1546,20 +1461,20 @@ TEST_F(forward_list_test, MoveAssignmentWithEmptyDestination) sut12 = std::move(sut11); - EXPECT_THAT(dTor, Eq(3U)); - EXPECT_THAT(moveAssignment, Eq(0U)); - EXPECT_THAT(copyCTor, Eq(0U)); - EXPECT_THAT(moveCTor, Eq(3U)); - EXPECT_THAT(cTor, Eq(0U)); - EXPECT_THAT(customCTor, Eq(3U)); + EXPECT_THAT(stats.dTor, Eq(3U)); + EXPECT_THAT(stats.moveAssignment, Eq(0U)); + EXPECT_THAT(stats.copyCTor, Eq(0U)); + EXPECT_THAT(stats.moveCTor, Eq(3U)); + EXPECT_THAT(stats.cTor, Eq(0U)); + EXPECT_THAT(stats.customCTor, Eq(3U)); EXPECT_THAT(sut12.size(), Eq(3U)); EXPECT_THAT(sut12.empty(), Eq(false)); auto iter = sut12.cbefore_begin(); - EXPECT_THAT((++iter)->m_value, Eq(58132U)); - EXPECT_THAT((++iter)->m_value, Eq(581122U)); - EXPECT_THAT((++iter)->m_value, Eq(5812U)); + EXPECT_THAT((++iter)->value, Eq(58132U)); + EXPECT_THAT((++iter)->value, Eq(581122U)); + EXPECT_THAT((++iter)->value, Eq(5812U)); } @@ -1578,15 +1493,15 @@ TEST_F(forward_list_test, MoveAssignmentWithLargerDestination) sut11 = std::move(sut12); - EXPECT_THAT(dTor, Eq(4U)); - EXPECT_THAT(moveAssignment, Eq(2U)); - EXPECT_THAT(moveCTor, Eq(0U)); + EXPECT_THAT(stats.dTor, Eq(4U)); + EXPECT_THAT(stats.moveAssignment, Eq(2U)); + EXPECT_THAT(stats.moveCTor, Eq(0U)); EXPECT_THAT(sut11.size(), Eq(2U)); EXPECT_THAT(sut11.empty(), Eq(false)); auto iter = sut11.cbefore_begin(); - EXPECT_THAT((++iter)->m_value, Eq(3131U)); - EXPECT_THAT((++iter)->m_value, Eq(313U)); + EXPECT_THAT((++iter)->value, Eq(3131U)); + EXPECT_THAT((++iter)->value, Eq(313U)); } TEST_F(forward_list_test, MoveAssignmentWithLargerSource) @@ -1604,18 +1519,18 @@ TEST_F(forward_list_test, MoveAssignmentWithLargerSource) sut12 = std::move(sut11); - EXPECT_THAT(dTor, Eq(4U)); - EXPECT_THAT(moveAssignment, Eq(2U)); - EXPECT_THAT(moveCTor, Eq(2U)); + EXPECT_THAT(stats.dTor, Eq(4U)); + EXPECT_THAT(stats.moveAssignment, Eq(2U)); + EXPECT_THAT(stats.moveCTor, Eq(2U)); EXPECT_THAT(sut12.size(), Eq(4U)); EXPECT_THAT(sut12.empty(), Eq(false)); auto iter = sut12.cbefore_begin(); - EXPECT_THAT((++iter)->m_value, Eq(158432U)); - EXPECT_THAT((++iter)->m_value, Eq(158432U)); - EXPECT_THAT((++iter)->m_value, Eq(1584122U)); - EXPECT_THAT((++iter)->m_value, Eq(15842U)); + EXPECT_THAT((++iter)->value, Eq(158432U)); + EXPECT_THAT((++iter)->value, Eq(158432U)); + EXPECT_THAT((++iter)->value, Eq(1584122U)); + EXPECT_THAT((++iter)->value, Eq(15842U)); } TEST_F(forward_list_test, RemoveDefaultElementFromEmptyList) @@ -1623,9 +1538,9 @@ TEST_F(forward_list_test, RemoveDefaultElementFromEmptyList) ::testing::Test::RecordProperty("TEST_ID", "ad425b66-2e2a-4ff7-b338-ae9d86b97ca9"); auto cnt = sut.remove({}); - EXPECT_THAT(cTor, Eq(1U)); - EXPECT_THAT(customCTor, Eq(0U)); - EXPECT_THAT(dTor, Eq(1U)); + EXPECT_THAT(stats.cTor, Eq(1U)); + EXPECT_THAT(stats.customCTor, Eq(0U)); + EXPECT_THAT(stats.dTor, Eq(1U)); EXPECT_THAT(sut.size(), Eq(0U)); EXPECT_THAT(cnt, Eq(0U)); } @@ -1634,9 +1549,9 @@ TEST_F(forward_list_test, RemoveCustomElementFromEmptyList) ::testing::Test::RecordProperty("TEST_ID", "43a46355-3fc5-42dd-ae88-db28f1e6dcba"); auto cnt = sut.remove({10U}); - EXPECT_THAT(cTor, Eq(0U)); - EXPECT_THAT(customCTor, Eq(1U)); - EXPECT_THAT(dTor, Eq(1U)); + EXPECT_THAT(stats.cTor, Eq(0U)); + EXPECT_THAT(stats.customCTor, Eq(1U)); + EXPECT_THAT(stats.dTor, Eq(1U)); EXPECT_THAT(sut.size(), Eq(0U)); EXPECT_THAT(cnt, Eq(0U)); } @@ -1653,17 +1568,17 @@ TEST_F(forward_list_test, RemoveOneDefaultElementFromList) auto cnt = sut11.remove({}); - EXPECT_THAT(cTor, Eq(3U)); - EXPECT_THAT(customCTor, Eq(4U)); - EXPECT_THAT(dTor, Eq(3U)); + EXPECT_THAT(stats.cTor, Eq(3U)); + EXPECT_THAT(stats.customCTor, Eq(4U)); + EXPECT_THAT(stats.dTor, Eq(3U)); EXPECT_THAT(sut11.size(), Eq(4U)); EXPECT_THAT(cnt, Eq(2U)); auto iter = sut11.cbefore_begin(); - EXPECT_THAT((++iter)->m_value, Eq(158432U)); - EXPECT_THAT((++iter)->m_value, Eq(158432U)); - EXPECT_THAT((++iter)->m_value, Eq(1584122U)); - EXPECT_THAT((++iter)->m_value, Eq(15842U)); + EXPECT_THAT((++iter)->value, Eq(158432U)); + EXPECT_THAT((++iter)->value, Eq(158432U)); + EXPECT_THAT((++iter)->value, Eq(1584122U)); + EXPECT_THAT((++iter)->value, Eq(15842U)); } TEST_F(forward_list_test, RemoveOneCustomElementFromList) { @@ -1678,18 +1593,18 @@ TEST_F(forward_list_test, RemoveOneCustomElementFromList) auto cnt = sut11.remove({1584122U}); - EXPECT_THAT(cTor, Eq(2U)); - EXPECT_THAT(customCTor, Eq(5U)); - EXPECT_THAT(dTor, Eq(2U)); + EXPECT_THAT(stats.cTor, Eq(2U)); + EXPECT_THAT(stats.customCTor, Eq(5U)); + EXPECT_THAT(stats.dTor, Eq(2U)); EXPECT_THAT(sut11.size(), Eq(5U)); EXPECT_THAT(cnt, Eq(1U)); auto iter = sut11.cbefore_begin(); - EXPECT_THAT((++iter)->m_value, Eq(158432U)); - EXPECT_THAT((++iter)->m_value, Eq(158432U)); - EXPECT_THAT((++iter)->m_value, Eq(TEST_LIST_ELEMENT_DEFAULT_VALUE)); - EXPECT_THAT((++iter)->m_value, Eq(TEST_LIST_ELEMENT_DEFAULT_VALUE)); - EXPECT_THAT((++iter)->m_value, Eq(15842U)); + EXPECT_THAT((++iter)->value, Eq(158432U)); + EXPECT_THAT((++iter)->value, Eq(158432U)); + EXPECT_THAT((++iter)->value, Eq(TEST_LIST_ELEMENT_DEFAULT_VALUE)); + EXPECT_THAT((++iter)->value, Eq(TEST_LIST_ELEMENT_DEFAULT_VALUE)); + EXPECT_THAT((++iter)->value, Eq(15842U)); } TEST_F(forward_list_test, RemoveNotExistentElementFromList) { @@ -1704,20 +1619,20 @@ TEST_F(forward_list_test, RemoveNotExistentElementFromList) auto cnt = sut11.remove({1243U}); - EXPECT_THAT(cTor, Eq(2U)); - EXPECT_THAT(customCTor, Eq(5U)); - EXPECT_THAT(dTor, Eq(1U)); - EXPECT_THAT(classValue, Eq(1243U)); + EXPECT_THAT(stats.cTor, Eq(2U)); + EXPECT_THAT(stats.customCTor, Eq(5U)); + EXPECT_THAT(stats.dTor, Eq(1U)); + EXPECT_THAT(stats.classValue, Eq(1243U)); EXPECT_THAT(sut11.size(), Eq(6U)); EXPECT_THAT(cnt, Eq(0U)); auto iter = sut11.cbefore_begin(); - EXPECT_THAT((++iter)->m_value, Eq(158432U)); - EXPECT_THAT((++iter)->m_value, Eq(158432U)); - EXPECT_THAT((++iter)->m_value, Eq(1584122U)); - EXPECT_THAT((++iter)->m_value, Eq(TEST_LIST_ELEMENT_DEFAULT_VALUE)); - EXPECT_THAT((++iter)->m_value, Eq(TEST_LIST_ELEMENT_DEFAULT_VALUE)); - EXPECT_THAT((++iter)->m_value, Eq(15842U)); + EXPECT_THAT((++iter)->value, Eq(158432U)); + EXPECT_THAT((++iter)->value, Eq(158432U)); + EXPECT_THAT((++iter)->value, Eq(1584122U)); + EXPECT_THAT((++iter)->value, Eq(TEST_LIST_ELEMENT_DEFAULT_VALUE)); + EXPECT_THAT((++iter)->value, Eq(TEST_LIST_ELEMENT_DEFAULT_VALUE)); + EXPECT_THAT((++iter)->value, Eq(15842U)); } TEST_F(forward_list_test, RemoveOnetoEmptyList) @@ -1728,9 +1643,9 @@ TEST_F(forward_list_test, RemoveOnetoEmptyList) auto cnt = sut11.remove({15842U}); - EXPECT_THAT(cTor, Eq(0U)); - EXPECT_THAT(customCTor, Eq(2U)); - EXPECT_THAT(dTor, Eq(2U)); + EXPECT_THAT(stats.cTor, Eq(0U)); + EXPECT_THAT(stats.customCTor, Eq(2U)); + EXPECT_THAT(stats.dTor, Eq(2U)); EXPECT_THAT(sut11.size(), Eq(0U)); EXPECT_THAT(cnt, Eq(1U)); } @@ -1745,9 +1660,9 @@ TEST_F(forward_list_test, RemoveWithFewMatches) auto cnt = sut11.remove({}); - EXPECT_THAT(cTor, Eq(3U)); - EXPECT_THAT(customCTor, Eq(1U)); - EXPECT_THAT(dTor, Eq(3U)); + EXPECT_THAT(stats.cTor, Eq(3U)); + EXPECT_THAT(stats.customCTor, Eq(1U)); + EXPECT_THAT(stats.dTor, Eq(3U)); EXPECT_THAT(sut11.size(), Eq(1U)); EXPECT_THAT(cnt, Eq(2U)); } @@ -1761,9 +1676,9 @@ TEST_F(forward_list_test, RemoveWithAllMatches) auto cnt = sut11.remove({}); - EXPECT_THAT(cTor, Eq(3U)); - EXPECT_THAT(customCTor, Eq(0U)); - EXPECT_THAT(dTor, Eq(3U)); + EXPECT_THAT(stats.cTor, Eq(3U)); + EXPECT_THAT(stats.customCTor, Eq(0U)); + EXPECT_THAT(stats.dTor, Eq(3U)); EXPECT_THAT(sut11.size(), Eq(0U)); EXPECT_THAT(cnt, Eq(2U)); } @@ -1780,9 +1695,9 @@ TEST_F(forward_list_test, RemoveAllFromList) auto cnt = sut11.remove({ELEMENT}); cnt += sut11.remove({}); - EXPECT_THAT(cTor, Eq(3U)); - EXPECT_THAT(customCTor, Eq(2U)); - EXPECT_THAT(dTor, Eq(5U)); + EXPECT_THAT(stats.cTor, Eq(3U)); + EXPECT_THAT(stats.customCTor, Eq(2U)); + EXPECT_THAT(stats.dTor, Eq(5U)); EXPECT_THAT(sut11.size(), Eq(0U)); EXPECT_THAT(cnt, Eq(3U)); } @@ -1811,20 +1726,20 @@ TEST_F(forward_list_test, RemoveIfOneDefaultElementFromList) sut11.emplace_front(158432U); auto cnt = - sut11.remove_if([](const TestListElement& sut1) { return sut1.m_value == TEST_LIST_ELEMENT_DEFAULT_VALUE; }); + sut11.remove_if([](const TestListElement& sut1) { return sut1.value == TEST_LIST_ELEMENT_DEFAULT_VALUE; }); - EXPECT_THAT(cTor, Eq(2U)); - EXPECT_THAT(customCTor, Eq(4U)); - EXPECT_THAT(dTor, Eq(2U)); - EXPECT_THAT(classValue, Eq(TEST_LIST_ELEMENT_DEFAULT_VALUE)); + EXPECT_THAT(stats.cTor, Eq(2U)); + EXPECT_THAT(stats.customCTor, Eq(4U)); + EXPECT_THAT(stats.dTor, Eq(2U)); + EXPECT_THAT(stats.classValue, Eq(TEST_LIST_ELEMENT_DEFAULT_VALUE)); EXPECT_THAT(sut11.size(), Eq(4U)); EXPECT_THAT(cnt, Eq(2U)); auto iter = sut11.cbefore_begin(); - EXPECT_THAT((++iter)->m_value, Eq(158432U)); - EXPECT_THAT((++iter)->m_value, Eq(158432U)); - EXPECT_THAT((++iter)->m_value, Eq(1584122U)); - EXPECT_THAT((++iter)->m_value, Eq(15842U)); + EXPECT_THAT((++iter)->value, Eq(158432U)); + EXPECT_THAT((++iter)->value, Eq(158432U)); + EXPECT_THAT((++iter)->value, Eq(1584122U)); + EXPECT_THAT((++iter)->value, Eq(15842U)); } TEST_F(forward_list_test, RemoveIfOneCustomElementFromList) @@ -1838,20 +1753,20 @@ TEST_F(forward_list_test, RemoveIfOneCustomElementFromList) sut11.emplace_front(158432U); sut11.emplace_front(158432U); - auto cnt = sut11.remove_if([](const TestListElement& sut1) { return sut1.m_value == 1584122U; }); + auto cnt = sut11.remove_if([](const TestListElement& sut1) { return sut1.value == 1584122U; }); - EXPECT_THAT(cTor, Eq(2U)); - EXPECT_THAT(customCTor, Eq(4U)); - EXPECT_THAT(dTor, Eq(1U)); + EXPECT_THAT(stats.cTor, Eq(2U)); + EXPECT_THAT(stats.customCTor, Eq(4U)); + EXPECT_THAT(stats.dTor, Eq(1U)); EXPECT_THAT(sut11.size(), Eq(5U)); EXPECT_THAT(cnt, Eq(1U)); auto iter = sut11.cbefore_begin(); - EXPECT_THAT((++iter)->m_value, Eq(158432U)); - EXPECT_THAT((++iter)->m_value, Eq(158432U)); - EXPECT_THAT((++iter)->m_value, Eq(TEST_LIST_ELEMENT_DEFAULT_VALUE)); - EXPECT_THAT((++iter)->m_value, Eq(TEST_LIST_ELEMENT_DEFAULT_VALUE)); - EXPECT_THAT((++iter)->m_value, Eq(15842U)); + EXPECT_THAT((++iter)->value, Eq(158432U)); + EXPECT_THAT((++iter)->value, Eq(158432U)); + EXPECT_THAT((++iter)->value, Eq(TEST_LIST_ELEMENT_DEFAULT_VALUE)); + EXPECT_THAT((++iter)->value, Eq(TEST_LIST_ELEMENT_DEFAULT_VALUE)); + EXPECT_THAT((++iter)->value, Eq(15842U)); } TEST_F(forward_list_test, RemoveIfNotExistentElementFromList) @@ -1865,21 +1780,21 @@ TEST_F(forward_list_test, RemoveIfNotExistentElementFromList) sut11.emplace_front(158432U); sut11.emplace_front(158432U); - auto cnt = sut11.remove_if([](const TestListElement& sut1) { return sut1.m_value == 1234U; }); + auto cnt = sut11.remove_if([](const TestListElement& sut1) { return sut1.value == 1234U; }); - EXPECT_THAT(cTor, Eq(2U)); - EXPECT_THAT(customCTor, Eq(4U)); - EXPECT_THAT(dTor, Eq(0U)); + EXPECT_THAT(stats.cTor, Eq(2U)); + EXPECT_THAT(stats.customCTor, Eq(4U)); + EXPECT_THAT(stats.dTor, Eq(0U)); EXPECT_THAT(sut11.size(), Eq(6U)); EXPECT_THAT(cnt, Eq(0U)); auto iter = sut11.cbefore_begin(); - EXPECT_THAT((++iter)->m_value, Eq(158432U)); - EXPECT_THAT((++iter)->m_value, Eq(158432U)); - EXPECT_THAT((++iter)->m_value, Eq(1584122U)); - EXPECT_THAT((++iter)->m_value, Eq(TEST_LIST_ELEMENT_DEFAULT_VALUE)); - EXPECT_THAT((++iter)->m_value, Eq(TEST_LIST_ELEMENT_DEFAULT_VALUE)); - EXPECT_THAT((++iter)->m_value, Eq(15842U)); + EXPECT_THAT((++iter)->value, Eq(158432U)); + EXPECT_THAT((++iter)->value, Eq(158432U)); + EXPECT_THAT((++iter)->value, Eq(1584122U)); + EXPECT_THAT((++iter)->value, Eq(TEST_LIST_ELEMENT_DEFAULT_VALUE)); + EXPECT_THAT((++iter)->value, Eq(TEST_LIST_ELEMENT_DEFAULT_VALUE)); + EXPECT_THAT((++iter)->value, Eq(15842U)); } TEST_F(forward_list_test, RemoveIfOnetoEmptyList) @@ -1888,11 +1803,11 @@ TEST_F(forward_list_test, RemoveIfOnetoEmptyList) forward_list sut11; sut11.emplace_front(15842U); - auto cnt = sut11.remove_if([](const TestListElement& sut1) { return sut1.m_value == 15842U; }); + auto cnt = sut11.remove_if([](const TestListElement& sut1) { return sut1.value == 15842U; }); - EXPECT_THAT(cTor, Eq(0U)); - EXPECT_THAT(customCTor, Eq(1U)); - EXPECT_THAT(dTor, Eq(1U)); + EXPECT_THAT(stats.cTor, Eq(0U)); + EXPECT_THAT(stats.customCTor, Eq(1U)); + EXPECT_THAT(stats.dTor, Eq(1U)); EXPECT_THAT(sut11.size(), Eq(0U)); EXPECT_THAT(cnt, Eq(1U)); } @@ -1906,11 +1821,11 @@ TEST_F(forward_list_test, RemoveIfWithFewMatches) sut11.emplace_front(); auto cnt = - sut11.remove_if([](const TestListElement& sut1) { return sut1.m_value == TEST_LIST_ELEMENT_DEFAULT_VALUE; }); + sut11.remove_if([](const TestListElement& sut1) { return sut1.value == TEST_LIST_ELEMENT_DEFAULT_VALUE; }); - EXPECT_THAT(cTor, Eq(2U)); - EXPECT_THAT(customCTor, Eq(1U)); - EXPECT_THAT(dTor, Eq(2U)); + EXPECT_THAT(stats.cTor, Eq(2U)); + EXPECT_THAT(stats.customCTor, Eq(1U)); + EXPECT_THAT(stats.dTor, Eq(2U)); EXPECT_THAT(sut11.size(), Eq(1U)); EXPECT_THAT(cnt, Eq(2U)); } @@ -1923,11 +1838,11 @@ TEST_F(forward_list_test, RemoveIfWithAllMatches) sut11.emplace_front(); auto cnt = - sut11.remove_if([](const TestListElement& sut1) { return sut1.m_value == TEST_LIST_ELEMENT_DEFAULT_VALUE; }); + sut11.remove_if([](const TestListElement& sut1) { return sut1.value == TEST_LIST_ELEMENT_DEFAULT_VALUE; }); - EXPECT_THAT(cTor, Eq(2U)); - EXPECT_THAT(customCTor, Eq(0U)); - EXPECT_THAT(dTor, Eq(2U)); + EXPECT_THAT(stats.cTor, Eq(2U)); + EXPECT_THAT(stats.customCTor, Eq(0U)); + EXPECT_THAT(stats.dTor, Eq(2U)); EXPECT_THAT(sut11.size(), Eq(0U)); EXPECT_THAT(cnt, Eq(2U)); } @@ -1940,12 +1855,12 @@ TEST_F(forward_list_test, RemoveIfAllFromList) sut11.emplace_front(); sut11.emplace_front(); - auto cnt = sut11.remove_if([](const TestListElement& sut1) { return sut1.m_value == 15842U; }); - cnt += sut11.remove_if([](const TestListElement& sut1) { return sut1.m_value == TEST_LIST_ELEMENT_DEFAULT_VALUE; }); + auto cnt = sut11.remove_if([](const TestListElement& sut1) { return sut1.value == 15842U; }); + cnt += sut11.remove_if([](const TestListElement& sut1) { return sut1.value == TEST_LIST_ELEMENT_DEFAULT_VALUE; }); - EXPECT_THAT(cTor, Eq(2U)); - EXPECT_THAT(customCTor, Eq(1U)); - EXPECT_THAT(dTor, Eq(3U)); + EXPECT_THAT(stats.cTor, Eq(2U)); + EXPECT_THAT(stats.customCTor, Eq(1U)); + EXPECT_THAT(stats.dTor, Eq(3U)); EXPECT_THAT(sut11.size(), Eq(0U)); EXPECT_THAT(cnt, Eq(3U)); } @@ -1964,7 +1879,7 @@ TEST_F(forward_list_test, writeContentViaDereferencedIterator) auto iter = sut1.begin(); TestListElement element{TEST_VALUE}; *iter = element; - EXPECT_THAT(sut1.front().m_value, Eq(TEST_VALUE)); + EXPECT_THAT(sut1.front().value, Eq(TEST_VALUE)); } TEST_F(forward_list_test, invalidIteratorErase) @@ -2056,7 +1971,7 @@ TEST_F(forward_list_test, invalidIteratorAddressOfOperator) auto iter = sut.cbegin(); sut.pop_front(); - IOX_EXPECT_FATAL_FAILURE([&] { IOX_DISCARD_RESULT(iter->m_value == 12U); }, + IOX_EXPECT_FATAL_FAILURE([&] { IOX_DISCARD_RESULT(iter->value == 12U); }, iox::HoofsError::EXPECTS_ENSURES_FAILED); } @@ -2096,6 +2011,6 @@ TEST_F(forward_list_test, ListIsCopyableViaMemcpy) for (auto& listElement : *reinterpret_cast(otherSutPtr)) { --i; - EXPECT_THAT(listElement.m_value, Eq(i)); + EXPECT_THAT(listElement.value, Eq(i)); } }