fix test

Author: changkhothuychung

libcxx/test/std/ranges/range.adaptors/range.concat/iterator/arithmetic.pass.cpp

@@ -20,8 +20,6 @@
 // operator>=(x, y)
 // operator>(x, y)
 // operator<=>(x, y)
-// operator==(x, y)
-// operator==(x, sentinel)
 
 #include <array>
 #include <concepts>
@@ -219,33 +217,6 @@ constexpr bool test() {
     assert((ci <=> cj) < 0);
   }
 
-  {
-    // operator==(x, sentinel)
-    std::array<int, 2> arr_a{1, 2};
-    std::array<int, 2> arr_b{3, 4};
-    std::span<const int> s1{arr_a};
-    std::span<const int> s2{arr_b};
-    auto v = std::views::concat(s1, s2);
-
-    auto it = v.begin();
-    assert(!(it == std::default_sentinel_t{}));
-
-    it++;
-    it++;
-    it++;
-    it++;
-    assert(it == std::default_sentinel_t{});
-
-    // const-iterator
-    const auto& cv = v;
-    auto cit       = cv.begin();
-    ++cit;
-    ++cit;
-    ++cit;
-    ++cit;
-    assert(cit == std::default_sentinel_t{});
-  }
-
   {
     // operator+(x, n) and operator+(n, x), where n is negative
     std::array<int, 4> arr_a{1, 2, 3, 4};

libcxx/test/std/ranges/range.adaptors/range.concat/iterator/compare.pass.cpp

@@ -8,6 +8,9 @@
 
 // REQUIRES: std-at-least-c++26
 
+// operator==(x,y)
+// operator==(x, sentinel)
+
 #include <array>
 #include <cassert>
 #include <ranges>
@@ -59,9 +62,9 @@ constexpr void test() {
 
   {
     // test with more than one view and iterators are in different range
-    constexpr static std::array<int, 3> array1{0, 1, 2};
-    constexpr static std::array<int, 3> array2{4, 5, 6};
-    constexpr static std::ranges::concat_view view(std::views::all(array1), std::views::all(array2));
+    std::array<int, 3> array1{0, 1, 2};
+    std::array<int, 3> array2{4, 5, 6};
+    std::ranges::concat_view view(std::views::all(array1), std::views::all(array2));
     decltype(auto) it1 = view.begin();
     decltype(auto) it2 = view.begin() + 3;
 
@@ -79,10 +82,34 @@ constexpr void test() {
     ConcatView view = make_concat_view(array.data(), array.data() + array.size());
     assert(!(view.begin() == view.end()));
   }
+
+  {
+    // operator==(x, sentinel)
+    std::array<int, 2> array1{1, 2};
+    std::array<int, 2> array2{3, 4};
+    std::ranges::concat_view v(std::views::all(array1), std::views::all(array2));
+
+    auto it = v.begin();
+    assert(!(it == std::default_sentinel_t{}));
+
+    it++;
+    it++;
+    it++;
+    it++;
+    assert(it == std::default_sentinel_t{});
+
+    // const-iterator
+    const auto& cv = v;
+    auto cit       = cv.begin();
+    ++cit;
+    ++cit;
+    ++cit;
+    ++cit;
+    assert(cit == std::default_sentinel_t{});
+  }
 }
 
 constexpr bool tests() {
-  test<cpp17_input_iterator<int*>>();
   test<forward_iterator<int*>>();
   test<bidirectional_iterator<int*>>();
   test<random_access_iterator<int*>>();