fix tests

Author: changkhothuychung

libcxx/include/__ranges/concat_view.h

@@ -578,14 +578,15 @@ class concat_view<_Views...>::__iterator : public __concat_view_iterator_categor
         !__x.__it_.valueless_by_exception(),
         "Trying to subtract a valuess iterators of concat_view from the default sentinel.");
     return __x.__invoke_at_index([&]<std::size_t __index_x>() -> difference_type {
-      auto __dx           = ranges::distance(ranges::begin(std::get<__index_x>(__x.__parent_->__views_)), __x.__it_);
+      auto __dx =
+          ranges::distance(std::get<__index_x>(__x.__it_), ranges::end(std::get<__index_x>(__x.__parent_->__views_)));
       difference_type __s = [&]<std::size_t __start, std::size_t __end>(this auto&& self) -> difference_type {
         if constexpr (__start < __end) {
           return ranges::size(std::get<__start>(__x.__parent_->__views_)) +
                  self.template operator()<__start + 1, __end>();
         }
         return 0;
-      }.template operator()<0, __index_x>();
+      }.template operator()<__index_x + 1, sizeof...(_Views)>();
       return -(__dx + __s);
     });
   }
@@ -595,7 +596,7 @@ class concat_view<_Views...>::__iterator : public __concat_view_iterator_categor
              ...) &&
             (__apply_drop_first<_Const, _Views...>::value)
   {
-    -(__x - default_sentinel);
+    return -(__x - default_sentinel);
   }
 };
 

libcxx/test/std/ranges/range.adaptors/range.concat/adaptor.pass.cpp

@@ -9,13 +9,8 @@
 // REQUIRES: std-at-least-c++26
 
 #include <ranges>
-
 #include <cassert>
-#include <concepts>
 #include <initializer_list>
-#include <type_traits>
-#include <utility>
-#include <vector>
 
 #include "test_iterators.h"
 #include "test_range.h"

libcxx/test/std/ranges/range.adaptors/range.concat/begin.pass.cpp

@@ -20,8 +20,8 @@ constexpr void general_tests() {
   // Check the return type of `.begin()`
   {
     std::ranges::concat_view view(v1, v2);
-    using FilterIterator = std::ranges::iterator_t<decltype(view)>;
-    ASSERT_SAME_TYPE(FilterIterator, decltype(view.begin()));
+    using ConcatIterator = std::ranges::iterator_t<decltype(view)>;
+    ASSERT_SAME_TYPE(ConcatIterator, decltype(view.begin()));
   }
 }
 

libcxx/test/std/ranges/range.adaptors/range.concat/ctor.view.pass.cpp

@@ -10,9 +10,7 @@
 
 #include <cassert>
 #include <ranges>
-#include <utility>
 
-#include "test_convertible.h"
 #include "test_macros.h"
 #include "types.h"
 

libcxx/test/std/ranges/range.adaptors/range.concat/end.pass.cpp

@@ -11,9 +11,6 @@
 #include <ranges>
 
 #include <cassert>
-#include <concepts>
-#include <type_traits>
-#include <iterator>
 #include "test_iterators.h"
 
 struct Range : std::ranges::view_base {

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

@@ -12,11 +12,7 @@
 
 #include <array>
 #include <cassert>
-#include <concepts>
-#include <utility>
-#include <__type_traits/maybe_const.h>
 #include "test_iterators.h"
-#include "test_macros.h"
 #include "test_range.h"
 
 #include "../types.h"

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

@@ -12,14 +12,8 @@
 
 #include <array>
 #include <cassert>
-#include <concepts>
-#include <iterator>
-#include <utility>
-#include <vector>
-#include "test_iterators.h"
 #include "test_macros.h"
 #include "../types.h"
-#include <iostream>
 
 constexpr void test() {
   // Test with a single satisfied value
@@ -82,36 +76,6 @@ constexpr void test() {
     assert(result == view.end());
     assert(it == (result - 1));
   }
-
-  // Test two iterators
-  {
-    std::array<int, 5> array1{0, 1};
-    std::array<int, 5> array2{2, 3};
-    std::ranges::concat_view view(std::views::all(array1), std::views::all(array2));
-    auto it1 = view.begin();
-    it1++;
-    it1++;
-    auto it2 = view.begin();
-    auto res = it1 - it2;
-    std::cout << res << std::endl;
-    assert(res == 2);
-  }
-
-  // Test one iterator and one sentinel
-  {
-    std::array<int, 5> array1{0, 1};
-    std::array<int, 5> array2{2, 3};
-    std::ranges::concat_view view(std::views::all(array1), std::views::all(array2));
-    auto it1 = view.begin();
-    it1++;
-    it1++;
-    it1++;
-    it1++;
-    auto it2 = view.begin();
-    auto res = it1 - it2;
-    std::cout << res << std::endl;
-    assert(res == 4);
-  }
 }
 
 int main(int, char**) {

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

@@ -12,11 +12,7 @@
 
 #include <array>
 #include <cassert>
-#include <concepts>
-#include <cstddef>
-#include <utility>
 #include "test_iterators.h"
-#include "test_macros.h"
 #include "../types.h"
 
 template <class Iter, class ValueType = int, class Sent = sentinel_wrapper<Iter>>

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

@@ -10,14 +10,12 @@
 
 #include <ranges>
 
-#include <iostream>
 #include <array>
 #include <cassert>
 #include <concepts>
 #include <type_traits>
 #include <utility>
 #include "test_iterators.h"
-#include "test_macros.h"
 #include "../types.h"
 
 template <class Iterator>

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

@@ -0,0 +1,49 @@
+//===----------------------------------------------------------------------===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+// REQUIRES: std-at-least-c++26
+
+#include <ranges>
+
+#include <array>
+#include <cassert>
+#include <iterator>
+#include "test_iterators.h"
+#include "test_macros.h"
+#include "../types.h"
+
+constexpr void test() {
+
+  // Test two iterators
+  {
+    std::array<int, 2> array1{0, 1};
+    std::array<int, 2> array2{2, 3};
+    std::ranges::concat_view view(std::views::all(array1), std::views::all(array2));
+    auto it1 = view.begin();
+    it1++;
+    it1++;
+    auto it2 = view.begin();
+    auto res = it1 - it2;
+    assert(res == 2);
+  }
+
+  // Test one iterator and one sentinel
+  {
+    std::array<int, 2> array1{0, 1};
+    std::array<int, 2> array2{2, 3};
+    std::ranges::concat_view view(std::views::all(array1), std::views::all(array2));
+    auto it1 = view.begin();
+    auto res = std::default_sentinel_t{} - it1;
+    assert(res == 4);
+  }
+}
+
+int main(int, char**) {
+  test();
+  return 0;
+}