Update tests

Author: smallp-o-p

libcxx/test/std/utilities/expected/expected.expected/assign/assign.U.pass.cpp

@@ -349,14 +349,17 @@ constexpr bool test() {
     {
       MoveOnlyMulti t{};
       std::expected<MoveOnlyMulti, int> e1(std::unexpect);
-      e1 = std::move(t);
+      static_assert(std::is_same_v<decltype(std::move(t)), MoveOnlyMulti&&>);
+      e1 = {std::move(t)};
       assert(e1.value().used_move1);
     }
     {
       const MoveOnlyMulti t{};
       std::expected<MoveOnlyMulti, int> e1(std::unexpect);
-      e1 = std::move(t);
-      assert(e1.value().used_move2);
+      static_assert(std::is_same_v<decltype(std::move(t)), const MoveOnlyMulti&&>);
+      // _Up = remove_cv_t<const MoveOnlyMulti&&> --> should use MoveOnlyMulti(MoveOnlyMulti&&)
+      e1 = {std::move(t)};
+      assert(e1.value().used_move1);
     }
   }
 

libcxx/test/std/utilities/optional/optional.object/optional.object.ctor/U.pass.cpp

@@ -84,6 +84,11 @@ void test_implicit()
         using T = TestTypes::TestType;
         assert(implicit_conversion<T>(3, T(3)));
     }
+    {
+      using T = TestTypes::TestType;
+      optional<T> opt({3});
+      assert(opt && *opt == static_cast<T>(3));
+    }
   {
     using O = optional<ImplicitAny>;
     static_assert(!test_convertible<O, std::in_place_t>(), "");
@@ -132,15 +137,6 @@ void test_explicit() {
             assert(T::copy_constructed == 0);
             assert(t.value().value == 42);
         }
-        T::reset();
-        {
-          optional<T> t{43};
-          assert(T::alive == 1);
-          assert(T::value_constructed == 1);
-          assert(T::move_constructed == 0);
-          assert(T::copy_constructed == 0);
-          assert(t.value().value == 43);
-        }
         assert(T::alive == 0);
     }
 #ifndef TEST_HAS_NO_EXCEPTIONS

libcxx/test/std/utilities/optional/optional.object/optional.object.observe/value_or.pass.cpp

@@ -40,6 +40,12 @@ struct X
         {return x.i_ == y.i_;}
 };
 
+struct Z {
+  int i_, j_;
+  constexpr Z(int i, int j) : i_(i), j_(j) {}
+  friend constexpr bool operator==(const Z& z1, const Z& z2) { return z1.i_ == z2.i_ && z1.j_ == z2.j_; }
+};
+
 constexpr int test()
 {
     {
@@ -69,6 +75,11 @@ constexpr int test()
       assert(std::move(opt).value_or({Y(3)}) == 4);
       assert(!opt);
     }
+    {
+      optional<Z> opt;
+      assert((std::move(opt).value_or({2, 3}) == Z{2, 3}));
+      assert(!opt);
+    }
     return 0;
 }