more test updates

Author: changkhothuychung

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

@@ -83,5 +83,6 @@ constexpr bool tests() {
 
 int main(int, char**) {
   tests();
+  static_assert(tests());
   return 0;
 }

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

@@ -0,0 +1,55 @@
+//===----------------------------------------------------------------------===//
+//
+// 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: has-unix-headers, std-at-least-c++26
+
+#include <ranges>
+#include <cassert>
+
+#include "../../range_adaptor_types.h"
+
+using ConstIterIncompatibleView = BasicView<forward_iterator<int*>, forward_iterator<int*>,
+                                            random_access_iterator<const int*>, random_access_iterator<const int*>>;
+static_assert(!std::convertible_to<std::ranges::iterator_t<ConstIterIncompatibleView>,
+                                   std::ranges::iterator_t<const ConstIterIncompatibleView>>);
+
+constexpr bool test() {
+  int buffer[3] = {1, 2, 3};
+
+  {
+    std::ranges::concat_view v(NonSimpleCommon{buffer});
+    auto iter1 = v.begin();
+    std::ranges::iterator_t<const decltype(v)> iter2 = iter1;
+    assert(iter1 == iter2);
+
+    static_assert(!std::is_same_v<decltype(iter1), decltype(iter2)>);
+
+    // We cannot create a non-const iterator from a const iterator.
+    static_assert(!std::constructible_from<decltype(iter1), decltype(iter2)>);
+  }
+
+  {
+    // underlying non-const to const not convertible
+    std::ranges::concat_view v(ConstIterIncompatibleView{buffer});
+    auto iter1 = v.begin();
+    auto iter2 = std::as_const(v).begin();
+
+    static_assert(!std::is_same_v<decltype(iter1), decltype(iter2)>);
+    static_assert(!std::constructible_from<decltype(iter1), decltype(iter2)>);
+    static_assert(!std::constructible_from<decltype(iter2), decltype(iter1)>);
+  }
+
+  return true;
+}
+
+int main(int, char**) {
+  test();
+  static_assert(test());
+
+  return 0;
+}

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

@@ -82,6 +82,5 @@ constexpr bool test() {
 int main(int, char**) {
   test();
   static_assert(test());
-
   return 0;
 }

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

@@ -113,7 +113,7 @@ constexpr bool test() {
   // non bidirectional
   {
     int buffer[3] = {4, 5, 6};
-    std::ranges::zip_view v(a, NonBidi{buffer});
+    std::ranges::concat_view v(a, NonBidi{buffer});
     using Iter = std::ranges::iterator_t<decltype(v)>;
     static_assert(!canDecrement<Iter>);
   }

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

@@ -60,7 +60,7 @@ struct ConstVeryDifferentRange {
   forward_iterator<double*> end() const;
 };
 
-void test() {
+constexpr bool test() {
   int buffer[] = {1, 2, 3, 4};
   {
     // random_access_iterator_tag
@@ -99,8 +99,6 @@ void test() {
     static_assert(std::is_same_v<Iter::value_type, int>);
   }
 
-
-
   {
     // forward_iterator_tag
     using Iter = std::ranges::iterator_t<std::ranges::concat_view<ForwardView<int>>>;
@@ -161,4 +159,12 @@ void test() {
     static_assert(std::is_same_v<ConstIter::value_type, double>);
   }
 
+  return true;
+}
+
+
+int main(int, char**) {
+  test();
+  static_assert(test());
+  return 0;
 }

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

@@ -17,7 +17,7 @@
 #include "test_macros.h"
 #include "../types.h"
 
-constexpr void test() {
+constexpr bool test() {
   // Test two iterators
   {
     std::array<int, 2> array1{0, 1};
@@ -40,9 +40,12 @@ constexpr void test() {
     auto res = std::default_sentinel_t{} - it1;
     assert(res == 4);
   }
+
+  return true;
 }
 
 int main(int, char**) {
   test();
+  static_assert(test());
   return 0;
 }