Update move tests

morzhovets · Oct 28, 2024 · d8d55b4 · d8d55b4
1 parent fb1df55
commit d8d55b4
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 16 deletions.
diff --git a/test/sources/libcxx/map/map.cons/move.pass.cpp b/test/sources/libcxx/map/map.cons/move.pass.cpp
@@ -32,7 +32,8 @@ int main(int, char**)
         assert(std::distance(m.begin(), m.end()) == 0);
 
 #ifdef LIBCPP_HAS_BAD_NEWS_FOR_MOMO
-        assert(mo.get_allocator() == A(test_alloc_base::moved_value));
+        assert(mo.get_allocator() == A(7));
+        assert(mo.get_allocator().get_id() == test_alloc_base::moved_value);
         assert(mo.key_comp() == C(5));
 #endif
         assert(mo.size() == 0);
@@ -64,7 +65,8 @@ int main(int, char**)
         assert(*std::next(m.begin(), 2) == V(3, 1));
 
 #ifdef LIBCPP_HAS_BAD_NEWS_FOR_MOMO
-        assert(mo.get_allocator() == A(test_alloc_base::moved_value));
+        assert(mo.get_allocator() == A(7));
+        assert(mo.get_allocator().get_id() == test_alloc_base::moved_value);
         assert(mo.key_comp() == C(5));
 #endif
         assert(mo.size() == 0);

diff --git a/test/sources/libcxx/multimap/multimap.cons/move.pass.cpp b/test/sources/libcxx/multimap/multimap.cons/move.pass.cpp
@@ -32,7 +32,8 @@ int main(int, char**)
         assert(std::distance(m.begin(), m.end()) == 0);
 
 #ifdef LIBCPP_HAS_BAD_NEWS_FOR_MOMO
-        assert(mo.get_allocator() == A(test_alloc_base::moved_value));
+        assert(mo.get_allocator() == A(7));
+        assert(mo.get_allocator().get_id() == test_alloc_base::moved_value);
         assert(mo.key_comp() == C(5));
 #endif
         assert(mo.size() == 0);
@@ -70,7 +71,8 @@ int main(int, char**)
         assert(*std::next(m.begin(), 8) == V(3, 2));
 
 #ifdef LIBCPP_HAS_BAD_NEWS_FOR_MOMO
-        assert(mo.get_allocator() == A(test_alloc_base::moved_value));
+        assert(mo.get_allocator() == A(7));
+        assert(mo.get_allocator().get_id() == test_alloc_base::moved_value);
         assert(mo.key_comp() == C(5));
 #endif
         assert(mo.size() == 0);

diff --git a/test/sources/libcxx/multiset/multiset.cons/move.pass.cpp b/test/sources/libcxx/multiset/multiset.cons/move.pass.cpp
@@ -32,7 +32,8 @@ int main(int, char**)
         assert(std::distance(m.begin(), m.end()) == 0);
 
 #ifdef LIBCPP_HAS_BAD_NEWS_FOR_MOMO
-        assert(mo.get_allocator() == A(test_alloc_base::moved_value));
+        assert(mo.get_allocator() == A(7));
+        assert(mo.get_allocator().get_id() == test_alloc_base::moved_value);
         assert(mo.key_comp() == C(5));
 #endif
         assert(mo.size() == 0);
@@ -71,7 +72,8 @@ int main(int, char**)
         assert(*std::next(m.begin(), 8) == 3);
 
 #ifdef LIBCPP_HAS_BAD_NEWS_FOR_MOMO
-        assert(mo.get_allocator() == A(test_alloc_base::moved_value));
+        assert(mo.get_allocator() == A(7));
+        assert(mo.get_allocator().get_id() == test_alloc_base::moved_value);
         assert(mo.key_comp() == C(5));
 #endif
         assert(mo.size() == 0);

diff --git a/test/sources/libcxx/set/set.cons/move.pass.cpp b/test/sources/libcxx/set/set.cons/move.pass.cpp
@@ -32,7 +32,8 @@ int main(int, char**)
         assert(std::distance(m.begin(), m.end()) == 0);
 
 #ifdef LIBCPP_HAS_BAD_NEWS_FOR_MOMO
-        assert(mo.get_allocator() == A(test_alloc_base::moved_value));
+        assert(mo.get_allocator() == A(7));
+        assert(mo.get_allocator().get_id() == test_alloc_base::moved_value);
         assert(mo.key_comp() == C(5));
 #endif
         assert(mo.size() == 0);
@@ -65,7 +66,8 @@ int main(int, char**)
         assert(*std::next(m.begin(), 2) == 3);
 
 #ifdef LIBCPP_HAS_BAD_NEWS_FOR_MOMO
-        assert(mo.get_allocator() == A(test_alloc_base::moved_value));
+        assert(mo.get_allocator() == A(7));
+        assert(mo.get_allocator().get_id() == test_alloc_base::moved_value);
         assert(mo.key_comp() == C(5));
 #endif
         assert(mo.size() == 0);

diff --git a/test/sources/libcxx/vector/vector.cons/move.pass.cpp b/test/sources/libcxx/vector/vector.cons/move.pass.cpp
@@ -151,14 +151,15 @@ TEST_CONSTEXPR_CXX20 bool tests()
       assert(alloc_stats.copied == 0);
       assert(alloc_stats.moved == 1);
       {
-        const test_allocator<int>& a = v.get_allocator();
-        assert(a.get_id() == test_alloc_base::moved_value);
-        assert(a.get_data() == test_alloc_base::moved_value);
-      }
-      {
-        const test_allocator<int>& a = v2.get_allocator();
-        assert(a.get_id() == 101);
-        assert(a.get_data() == 42);
+        const test_allocator<int>& a1 = v.get_allocator();
+        assert(a1.get_id() == test_alloc_base::moved_value);
+        assert(a1.get_data() == 42);
+
+        const test_allocator<int>& a2 = v2.get_allocator();
+        assert(a2.get_id() == 101);
+        assert(a2.get_data() == 42);
+
+        assert(a1 == a2);
       }
     }