From 5e689c0a66ff3d9f0facf9f6dc1661a5ad8b38f7 Mon Sep 17 00:00:00 2001 From: John Wellbelove Date: Sun, 23 Feb 2025 11:54:38 +0000 Subject: [PATCH] Fix some sanitizer issues --- test/test_algorithm.cpp | 4 ++-- test/test_forward_list.cpp | 7 +++---- test/test_forward_list_shared_pool.cpp | 12 ++++++------ 3 files changed, 11 insertions(+), 12 deletions(-) diff --git a/test/test_algorithm.cpp b/test/test_algorithm.cpp index b1224614..f1242718 100644 --- a/test/test_algorithm.cpp +++ b/test/test_algorithm.cpp @@ -2010,10 +2010,10 @@ namespace { std::shuffle(data.begin(), data.end(), urng); - std::forward_list data1(data.begin(), data.end()); + std::vector data1(data.begin(), data.end()); std::forward_list data2(data.begin(), data.end()); - data1.sort(); + std::sort(data1.begin(), data1.end()); etl::selection_sort(data2.begin(), data2.end()); bool is_same = std::equal(data1.begin(), data1.end(), data2.begin()); diff --git a/test/test_forward_list.cpp b/test/test_forward_list.cpp index 4f46eefe..494b69c7 100644 --- a/test/test_forward_list.cpp +++ b/test/test_forward_list.cpp @@ -1075,14 +1075,13 @@ namespace //************************************************************************* TEST_FIXTURE(SetupFixture, test_reverse_empty) { - CompareDataNDC compare_data; DataNDC data; - compare_data.reverse(); data.reverse(); - are_equal = std::equal(data.begin(), data.end(), compare_data.begin()); - CHECK(are_equal); + CHECK_TRUE(data.empty()); + CHECK_FALSE(data.full()); + CHECK_EQUAL(0, data.size()); } //************************************************************************* diff --git a/test/test_forward_list_shared_pool.cpp b/test/test_forward_list_shared_pool.cpp index 82830124..6500805a 100644 --- a/test/test_forward_list_shared_pool.cpp +++ b/test/test_forward_list_shared_pool.cpp @@ -1478,20 +1478,20 @@ namespace //************************************************************************* TEST_FIXTURE(SetupFixture, test_reverse_empty) { - CompareDataNDC compare_data; PoolNDC2 pool; DataNDC data1(pool); DataNDC data2(pool); - compare_data.reverse(); data1.reverse(); data2.reverse(); - are_equal = std::equal(data1.begin(), data1.end(), compare_data.begin()); - CHECK(are_equal); + CHECK_TRUE(data1.empty()); + CHECK_FALSE(data1.full()); + CHECK_EQUAL(0, data1.size()); - are_equal = std::equal(data1.begin(), data1.end(), compare_data.begin()); - CHECK(are_equal); + CHECK_TRUE(data2.empty()); + CHECK_FALSE(data2.full()); + CHECK_EQUAL(0, data2.size()); } //*************************************************************************