espressif/openthread
1
0
Fork 0
mirror of https://github.com/espressif/openthread.git synced 2026-08-05 18:37:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

[linked-list] fix OwningList::RemoveAllMatching() (#7231)

Browse Source 
This commit fixes the `OwningList::RemoveAllMatching()` to use the
`LinkedList` one. It also updates unit test `test_linked_list` to
cover this method.
This commit is contained in:
Abtin Keshavarzian
2021-12-14 18:37:22 -08:00
committed by GitHub
parent 54d848e11b
commit 686c0de5fa
2 changed files with 36 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/common/owning_list.hpp
+1 -1
View File
@@ -147,7 +147,7 @@ public:
*/
template <typename Indicator> void RemoveAllMatching(const Indicator &aIndicator, OwningList &aRemovedList)
{
RemoveAllMatching(aIndicator, aRemovedList);
LinkedList<Type>::RemoveAllMatching(aIndicator, aRemovedList);
}
};
tests/unit/test_linked_list.cpp
+35 -1
View File
@@ -298,8 +298,10 @@ void TestLinkedList(void)
void TestOwningList(void)
{
Entry a("a", 1), b("b", 2), c("c", 3), d("d", 4), e("e", 5);
Entry a("a", 1, kAlphaType), b("b", 2, kAlphaType), c("c", 3, kBetaType);
Entry d("d", 4, kBetaType), e("e", 5, kAlphaType), f("f", 6, kBetaType);
OwningList<Entry> list;
OwningList<Entry> removedList;
OwnedPtr<Entry> ptr;
printf("TestOwningList\n");
@@ -389,6 +391,38 @@ void TestOwningList(void)
VerifyOrQuit(!a.WasFreed());
a.Free();
VerifyOrQuit(a.WasFreed());
// Test `RemoveAllMatching()`
a.ResetTestFlags();
b.ResetTestFlags();
c.ResetTestFlags();
d.ResetTestFlags();
e.ResetTestFlags();
f.ResetTestFlags();
list.Push(a);
list.Push(b);
list.Push(c);
list.Push(d);
list.Push(e);
list.Push(f);
VerifyLinkedListContent(&list, &f, &e, &d, &c, &b, &a, nullptr);
list.RemoveAllMatching(kAlphaType, removedList);
VerifyLinkedListContent(&list, &f, &d, &c, nullptr);
VerifyLinkedListContent(&removedList, &a, &b, &e, nullptr);
VerifyOrQuit(!a.WasFreed());
VerifyOrQuit(!c.WasFreed());
removedList.Clear();
list.RemoveAllMatching(kAlphaType, removedList);
VerifyOrQuit(removedList.IsEmpty());
VerifyLinkedListContent(&list, &f, &d, &c, nullptr);
list.RemoveAllMatching(kBetaType, removedList);
VerifyOrQuit(list.IsEmpty());
VerifyLinkedListContent(&removedList, &c, &d, &f, nullptr);
VerifyOrQuit(!c.WasFreed());
}
} // namespace ot