From 6d8bba986c49bcd97de2069ffaa20be21a65d52d Mon Sep 17 00:00:00 2001 From: John Wellbelove Date: Sun, 1 Mar 2026 12:14:10 +0000 Subject: [PATCH] Updated with coderabbit suggestions --- test/test_map.cpp | 11 +++-------- test/test_multimap.cpp | 9 ++------- test/test_multiset.cpp | 1 + test/test_set.cpp | 1 + 4 files changed, 7 insertions(+), 15 deletions(-) diff --git a/test/test_map.cpp b/test/test_map.cpp index b596f305..610aa146 100644 --- a/test/test_map.cpp +++ b/test/test_map.cpp @@ -350,7 +350,7 @@ namespace CHECK(isEqual); - CHECK_TRUE(std::is_sorted(otherData.begin(), otherData.end(), data.value_comp())); + CHECK_TRUE(std::is_sorted(otherData.begin(), otherData.end(), otherData.value_comp())); } //************************************************************************* @@ -1705,13 +1705,8 @@ namespace const std::vector actual(data.begin(), data.end()); CHECK_TRUE(std::is_sorted(data.begin(), data.end(), data.value_comp())); - - auto compare = [](const etl::map::value_type& lhs, const etl::map::value_type& rhs) - { - return (lhs.first == rhs.first) && (lhs.second == rhs.second); - }; - - CHECK_TRUE((std::equal(data.begin(), data.end(), expected.begin(), compare))); + CHECK_EQUAL(expected.size(), actual.size()); + CHECK_TRUE(actual == expected); } while (std::next_permutation(permutation.begin(), permutation.end())); } diff --git a/test/test_multimap.cpp b/test/test_multimap.cpp index 56642957..b44a2aed 100644 --- a/test/test_multimap.cpp +++ b/test/test_multimap.cpp @@ -1742,13 +1742,8 @@ namespace const std::vector actual(data.begin(), data.end()); CHECK_TRUE(std::is_sorted(data.begin(), data.end(), data.value_comp())); - - auto compare = [](const etl::multimap::value_type& lhs, const etl::multimap::value_type& rhs) - { - return (lhs.first == rhs.first) && (lhs.second == rhs.second); - }; - - CHECK_TRUE((std::equal(data.begin(), data.end(), expected.begin(), compare))); + CHECK_EQUAL(expected.size(), actual.size()); + CHECK_TRUE(actual == expected); } while (std::next_permutation(permutation.begin(), permutation.end())); } diff --git a/test/test_multiset.cpp b/test/test_multiset.cpp index d4652f46..f4e47cc0 100644 --- a/test/test_multiset.cpp +++ b/test/test_multiset.cpp @@ -1665,6 +1665,7 @@ namespace data.erase(it); CHECK_TRUE(std::is_sorted(data.begin(), data.end(), data.key_comp())); + CHECK_EQUAL(expected.size(), data.size()); CHECK_TRUE((std::equal(data.begin(), data.end(), expected.begin()))); } while (std::next_permutation(permutation.begin(), permutation.end())); diff --git a/test/test_set.cpp b/test/test_set.cpp index 719998a8..708996a8 100644 --- a/test/test_set.cpp +++ b/test/test_set.cpp @@ -1502,6 +1502,7 @@ namespace data.erase(it); CHECK_TRUE(std::is_sorted(data.begin(), data.end(), data.key_comp())); + CHECK_EQUAL(expected.size(), data.size()); CHECK_TRUE((std::equal(data.begin(), data.end(), expected.begin()))); } while (std::next_permutation(permutation.begin(), permutation.end()));