Add self-testing to the custom checkers

Author: akukanov

test/parallel_api/ranges/std_ranges_remove_copy.pass.cpp

@@ -10,6 +10,8 @@
 #include "std_ranges_test.h"
 
 #if _ENABLE_STD_RANGES_TESTING
+#include <initializer_list>
+
 struct
 {
     template <std::ranges::random_access_range InRange, std::ranges::random_access_range OutRange,
@@ -33,6 +35,59 @@ struct
         }
         return ret_type{in + i, out + j};
     }
+    
+    void test_self()
+    {
+#if TEST_CPP20_SPAN_PRESENT
+        int input[10] = {0,0, 1, 2,2, 8, 1,1,1, 8};
+        int output[9] = {-9, -8, -7, -6, -5, -4, -3, -2, -1};
+
+        // Define test cases with expected outputs and expected end positions
+        struct TestCase {
+            int in_size;
+            int out_size;
+            std::initializer_list<int> expected_output;
+            int expected_in_end;
+            int expected_out_end;
+        } test_cases[] = {
+        // insz, outsz,  expected,  instop, outstop
+            {0,  0, {},                 0,  0}, // Empty ranges
+            {10, 0, {},                 0,  0}, // Empty output range
+            {1,  1, {0},                1,  1}, // One element ranges
+            {10, 1, {0},                1,  1}, // One element output range
+            {10, 5, {0, 0, 2, 2, 8},    9,  5}, // Output range is not big enough
+            {10, 6, {0, 0, 2, 2, 8, 8}, 10, 6}, // Output range is just enough
+            {10, 7, {0, 0, 2, 2, 8, 8}, 10, 6}, // Output range is bigger than needed
+        };
+
+        auto& self = *this;
+        for (const TestCase& test_case : test_cases) {
+            constexpr int shift = 1;
+            std::span<int> in_span(input, test_case.in_size);
+            std::span<int> out_span(output + shift, test_case.out_size);
+
+            auto result = self(in_span, out_span, 1);
+
+            // Verify the returned iterators point to the correct end positions
+            EXPECT_EQ(in_span.begin() + test_case.expected_in_end, result.in, "Checker problem: wrong input stop");
+            EXPECT_EQ(out_span.begin() + test_case.expected_out_end, result.out, "Checker problem: wrong output stop");
+
+            // Verify the output matches the expected result and nothing is overwritten
+            for (int i = 0; i < 9; ++i)
+            {
+                if (i < shift || i >= shift + test_case.expected_out_end)
+                {
+                    EXPECT_EQ(i - 9, output[i], "Checker problem: out of range modification");
+                }
+                else
+                {
+                    EXPECT_EQ(test_case.expected_output.begin()[i - shift], output[i], "Checker problem: wrong output");
+                    output[i] = i - 9; // Restore the original output data
+                }
+            }
+        }
+#endif // TEST_CPP20_SPAN_PRESENT
+    }
 } remove_copy_checker;
 #endif // _ENABLE_STD_RANGES_TESTING
 
@@ -50,6 +105,8 @@ main()
     };
     using many_twos = decltype(almost_always_two);
 
+    remove_copy_if_checker.test_self();
+
     test_range_algo<0, int, data_in_out_lim>{179}(dpl_ranges::remove_copy, remove_copy_checker, 0);
     test_range_algo<1, int, data_in_out_lim, many_twos>{1127}(dpl_ranges::remove_copy, remove_copy_checker, 2);
     test_range_algo<2, int, data_in_out_lim>{}(dpl_ranges::remove_copy, remove_copy_checker, 1, proj);

test/parallel_api/ranges/std_ranges_remove_copy_if.pass.cpp

@@ -10,6 +10,8 @@
 #include "std_ranges_test.h"
 
 #if _ENABLE_STD_RANGES_TESTING
+#include <initializer_list>
+
 struct
 {
     template <std::ranges::random_access_range InRange, std::ranges::random_access_range OutRange,
@@ -33,6 +35,59 @@ struct
         }
         return ret_type{in + i, out + j};
     }
+    
+    void test_self()
+    {
+#if TEST_CPP20_SPAN_PRESENT
+        int input[10] = {0,0, 1, 2,2, 8, 1,1,1, 8};
+        int output[9] = {-9, -8, -7, -6, -5, -4, -3, -2, -1};
+
+        // Define test cases with expected outputs and expected end positions
+        struct TestCase {
+            int in_size;
+            int out_size;
+            std::initializer_list<int> expected_output;
+            int expected_in_end;
+            int expected_out_end;
+        } test_cases[] = {
+        // insz, outsz,  expected,  instop, outstop
+            {0,  0, {},                 0,  0}, // Empty ranges
+            {10, 0, {},                 0,  0}, // Empty output range
+            {1,  1, {0},                1,  1}, // One element ranges
+            {10, 1, {0},                1,  1}, // One element output range
+            {10, 5, {0, 0, 2, 2, 8},    9,  5}, // Output range is not big enough
+            {10, 6, {0, 0, 2, 2, 8, 8}, 10, 6}, // Output range is just enough
+            {10, 7, {0, 0, 2, 2, 8, 8}, 10, 6}, // Output range is bigger than needed
+        };
+
+        auto& self = *this;
+        for (const TestCase& test_case : test_cases) {
+            constexpr int shift = 1;
+            std::span<int> in_span(input, test_case.in_size);
+            std::span<int> out_span(output + shift, test_case.out_size);
+
+            auto result = self(in_span, out_span, [](int v){ return v == 1; });
+
+            // Verify the returned iterators point to the correct end positions
+            EXPECT_EQ(in_span.begin() + test_case.expected_in_end, result.in, "Checker problem: wrong input stop");
+            EXPECT_EQ(out_span.begin() + test_case.expected_out_end, result.out, "Checker problem: wrong output stop");
+
+            // Verify the output matches the expected result and nothing is overwritten
+            for (int i = 0; i < 9; ++i)
+            {
+                if (i < shift || i >= shift + test_case.expected_out_end)
+                {
+                    EXPECT_EQ(i - 9, output[i], "Checker problem: out of range modification");
+                }
+                else
+                {
+                    EXPECT_EQ(test_case.expected_output.begin()[i - shift], output[i], "Checker problem: wrong output");
+                    output[i] = i - 9; // Restore the original output data
+                }
+            }
+        }
+#endif // TEST_CPP20_SPAN_PRESENT
+    }
 } remove_copy_if_checker;
 #endif // _ENABLE_STD_RANGES_TESTING
 
@@ -55,6 +110,8 @@ main()
     using repeating_gen = decltype(repeat_sometimes);
     auto modulo_3_is_1 = [](int val) { return (val % 3) == 1; };
 
+    remove_copy_if_checker.test_self();
+
     test_range_algo<0, int, data_in_out_lim>{239}(dpl_ranges::remove_copy_if, remove_copy_if_checker, pred);
     test_range_algo<1, int, data_in_out_lim>{1471}(dpl_ranges::remove_copy_if, remove_copy_if_checker, select_many);
     test_range_algo<2, int, data_in_out_lim>{}(dpl_ranges::remove_copy_if, remove_copy_if_checker, select_many, proj);

test/parallel_api/ranges/std_ranges_unique_copy.pass.cpp

@@ -16,7 +16,6 @@
 #include "std_ranges_test.h"
 
 #if _ENABLE_STD_RANGES_TESTING
-#include <span>
 #include <initializer_list>
 
 struct
@@ -45,6 +44,7 @@ struct
 
     void test_self()
     {
+#if TEST_CPP20_SPAN_PRESENT
         int input[10] = {0,0, 1, 2,2, 8, 1,1,1, 8};
         int output[9] = {-9, -8, -7, -6, -5, -4, -3, -2, -1};
 
@@ -92,6 +92,7 @@ struct
                 }
             }
         }
+#endif // TEST_CPP20_SPAN_PRESENT
     }
 } unique_copy_checker;
 #endif // _ENABLE_STD_RANGES_TESTING