diff options
Diffstat (limited to 'libcxx/test/std/containers/associative')
4 files changed, 28 insertions, 24 deletions
diff --git a/libcxx/test/std/containers/associative/map/map.cons/move_alloc.pass.cpp b/libcxx/test/std/containers/associative/map/map.cons/move_alloc.pass.cpp index 728f14c42b8..cec9253561a 100644 --- a/libcxx/test/std/containers/associative/map/map.cons/move_alloc.pass.cpp +++ b/libcxx/test/std/containers/associative/map/map.cons/move_alloc.pass.cpp @@ -17,6 +17,7 @@ #include <map> #include <cassert> +#include "test_macros.h" #include "MoveOnly.h" #include "../../../test_compare.h" #include "test_allocator.h" @@ -62,7 +63,7 @@ int main() assert(m3 == m2); assert(m3.get_allocator() == A(7)); assert(m3.key_comp() == C(5)); - assert(m1.empty()); + LIBCPP_ASSERT(m1.empty()); } { typedef std::pair<MoveOnly, MoveOnly> V; @@ -101,7 +102,7 @@ int main() assert(m3 == m2); assert(m3.get_allocator() == A(5)); assert(m3.key_comp() == C(5)); - assert(m1.empty()); + LIBCPP_ASSERT(m1.empty()); } { typedef std::pair<MoveOnly, MoveOnly> V; @@ -140,7 +141,7 @@ int main() assert(m3 == m2); assert(m3.get_allocator() == A(5)); assert(m3.key_comp() == C(5)); - assert(m1.empty()); + LIBCPP_ASSERT(m1.empty()); } { typedef Counter<int> T; @@ -176,14 +177,14 @@ int main() M m3(std::move(m1), A()); assert(m3 == m2); - assert(m1.empty()); + LIBCPP_ASSERT(m1.empty()); assert(Counter_base::gConstructed == num+6); { M m4(std::move(m2), A(5)); assert(Counter_base::gConstructed == num+6); assert(m4 == m3); - assert(m2.empty()); + LIBCPP_ASSERT(m2.empty()); } assert(Counter_base::gConstructed == num+3); } @@ -226,7 +227,7 @@ int main() assert(m3 == m2); assert(m3.get_allocator() == A()); assert(m3.key_comp() == C(5)); - assert(m1.empty()); + LIBCPP_ASSERT(m1.empty()); } { typedef std::pair<MoveOnly, MoveOnly> V; @@ -265,6 +266,6 @@ int main() assert(m3 == m2); assert(m3.get_allocator() == A{}); assert(m3.key_comp() == C(5)); - assert(m1.empty()); + LIBCPP_ASSERT(m1.empty()); } } diff --git a/libcxx/test/std/containers/associative/multimap/multimap.cons/move_alloc.pass.cpp b/libcxx/test/std/containers/associative/multimap/multimap.cons/move_alloc.pass.cpp index c0159165811..3342a4edaab 100644 --- a/libcxx/test/std/containers/associative/multimap/multimap.cons/move_alloc.pass.cpp +++ b/libcxx/test/std/containers/associative/multimap/multimap.cons/move_alloc.pass.cpp @@ -17,6 +17,7 @@ #include <map> #include <cassert> +#include "test_macros.h" #include "MoveOnly.h" #include "../../../test_compare.h" #include "test_allocator.h" @@ -62,7 +63,7 @@ int main() assert(m3 == m2); assert(m3.get_allocator() == A(7)); assert(m3.key_comp() == C(5)); - assert(m1.empty()); + LIBCPP_ASSERT(m1.empty()); } { typedef std::pair<MoveOnly, MoveOnly> V; @@ -101,7 +102,7 @@ int main() assert(m3 == m2); assert(m3.get_allocator() == A(5)); assert(m3.key_comp() == C(5)); - assert(m1.empty()); + LIBCPP_ASSERT(m1.empty()); } { typedef std::pair<MoveOnly, MoveOnly> V; @@ -140,7 +141,7 @@ int main() assert(m3 == m2); assert(m3.get_allocator() == A(5)); assert(m3.key_comp() == C(5)); - assert(m1.empty()); + LIBCPP_ASSERT(m1.empty()); } { typedef Counter<int> T; @@ -176,14 +177,14 @@ int main() M m3(std::move(m1), A()); assert(m3 == m2); - assert(m1.empty()); + LIBCPP_ASSERT(m1.empty()); assert(Counter_base::gConstructed == 3*num); { M m4(std::move(m2), A(5)); assert(Counter_base::gConstructed == 3*num); assert(m4 == m3); - assert(m2.empty()); + LIBCPP_ASSERT(m2.empty()); } assert(Counter_base::gConstructed == 2*num); } @@ -226,7 +227,7 @@ int main() assert(m3 == m2); assert(m3.get_allocator() == A()); assert(m3.key_comp() == C(5)); - assert(m1.empty()); + LIBCPP_ASSERT(m1.empty()); } { typedef std::pair<MoveOnly, MoveOnly> V; @@ -265,6 +266,6 @@ int main() assert(m3 == m2); assert(m3.get_allocator() == A{}); assert(m3.key_comp() == C(5)); - assert(m1.empty()); + LIBCPP_ASSERT(m1.empty()); } } diff --git a/libcxx/test/std/containers/associative/multiset/multiset.cons/move_alloc.pass.cpp b/libcxx/test/std/containers/associative/multiset/multiset.cons/move_alloc.pass.cpp index f8e12ddcacb..c91a97b490f 100644 --- a/libcxx/test/std/containers/associative/multiset/multiset.cons/move_alloc.pass.cpp +++ b/libcxx/test/std/containers/associative/multiset/multiset.cons/move_alloc.pass.cpp @@ -17,6 +17,7 @@ #include <set> #include <cassert> +#include "test_macros.h" #include "MoveOnly.h" #include "../../../test_compare.h" #include "test_allocator.h" @@ -60,7 +61,7 @@ int main() assert(m3 == m2); assert(m3.get_allocator() == A(7)); assert(m3.key_comp() == C(5)); - assert(m1.empty()); + LIBCPP_ASSERT(m1.empty()); } { typedef MoveOnly V; @@ -98,7 +99,7 @@ int main() assert(m3 == m2); assert(m3.get_allocator() == A(5)); assert(m3.key_comp() == C(5)); - assert(m1.empty()); + LIBCPP_ASSERT(m1.empty()); } { typedef MoveOnly V; @@ -136,7 +137,7 @@ int main() assert(m3 == m2); assert(m3.get_allocator() == A(5)); assert(m3.key_comp() == C(5)); - assert(m1.empty()); + LIBCPP_ASSERT(m1.empty()); } { typedef Counter<int> V; @@ -170,14 +171,14 @@ int main() M m3(std::move(m1), A()); assert(m3 == m2); - assert(m1.empty()); + LIBCPP_ASSERT(m1.empty()); assert(Counter_base::gConstructed == 3*num); { M m4(std::move(m2), A(5)); assert(Counter_base::gConstructed == 3*num); assert(m4 == m3); - assert(m2.empty()); + LIBCPP_ASSERT(m2.empty()); } assert(Counter_base::gConstructed == 2*num); } diff --git a/libcxx/test/std/containers/associative/set/set.cons/move_alloc.pass.cpp b/libcxx/test/std/containers/associative/set/set.cons/move_alloc.pass.cpp index 7690234453f..7bae3ed210e 100644 --- a/libcxx/test/std/containers/associative/set/set.cons/move_alloc.pass.cpp +++ b/libcxx/test/std/containers/associative/set/set.cons/move_alloc.pass.cpp @@ -17,6 +17,7 @@ #include <set> #include <cassert> +#include "test_macros.h" #include "MoveOnly.h" #include "../../../test_compare.h" #include "test_allocator.h" @@ -60,7 +61,7 @@ int main() assert(m3 == m2); assert(m3.get_allocator() == A(7)); assert(m3.key_comp() == C(5)); - assert(m1.empty()); + LIBCPP_ASSERT(m1.empty()); } { typedef MoveOnly V; @@ -98,7 +99,7 @@ int main() assert(m3 == m2); assert(m3.get_allocator() == A(5)); assert(m3.key_comp() == C(5)); - assert(m1.empty()); + LIBCPP_ASSERT(m1.empty()); } { typedef MoveOnly V; @@ -136,7 +137,7 @@ int main() assert(m3 == m2); assert(m3.get_allocator() == A(5)); assert(m3.key_comp() == C(5)); - assert(m1.empty()); + LIBCPP_ASSERT(m1.empty()); } { typedef Counter<int> V; @@ -170,14 +171,14 @@ int main() M m3(std::move(m1), A()); assert(m3 == m2); - assert(m1.empty()); + LIBCPP_ASSERT(m1.empty()); assert(Counter_base::gConstructed == 6+num); { M m4(std::move(m2), A(5)); assert(Counter_base::gConstructed == 6+num); assert(m4 == m3); - assert(m2.empty()); + LIBCPP_ASSERT(m2.empty()); } assert(Counter_base::gConstructed == 3+num); } |
