This is an archive of the discontinued LLVM Phabricator instance.

Differential D26627

[libcxx] [test] Fix ordering assumptions in unordered container tests.
ClosedPublic

Authored by STL_MSFT on Nov 14 2016, 12:10 PM.

Details

Reviewers
mclow.lists
EricWF
Summary

[libcxx] [test] Fix ordering assumptions in unordered container tests.

Diff Detail

Event Timeline

STL_MSFT updated this revision to Diff 77859.Nov 14 2016, 12:10 PM
STL_MSFT retitled this revision from to [libcxx] [test] Fix ordering assumptions in unordered container tests..
STL_MSFT updated this object.
STL_MSFT added reviewers: EricWF, mclow.lists.
STL_MSFT added a subscriber: cfe-commits.
Herald edited edge metadata. · View Herald TranscriptNov 14 2016, 12:10 PM
mclow.lists accepted this revision.Nov 15 2016, 7:04 AM
mclow.lists edited edge metadata.

LGTM.

This revision is now accepted and ready to land.Nov 15 2016, 7:04 AM
STL_MSFT mentioned this in rL286984: [libcxx] [test] D26627: Fix ordering assumptions in unordered container tests..Nov 15 2016, 9:10 AM
STL_MSFT closed this revision.Nov 15 2016, 9:14 AM

r286984, thanks.

Revision Contents

PathSize
test/
std/
containers/
unord/
unord.multimap/
unord.multimap.modifiers/
17 lines
unord.multiset/
unord.multiset.cnstr/
16 lines
16 lines

Diff 77859

test/std/containers/unord/unord.multimap/unord.multimap.modifiers/emplace_hint.pass.cpp

Show All 19 Lines
#define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0))
#endif #endif
#include <unordered_map> #include <unordered_map>
#include <cassert> #include <cassert>
#include "../../../Emplaceable.h" #include "../../../Emplaceable.h"
#include "min_allocator.h" #include "min_allocator.h"
#include "test_macros.h"
int main() int main()
{ {
#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES #ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
{ {
typedef std::unordered_multimap<int, Emplaceable> C; typedef std::unordered_multimap<int, Emplaceable> C;
typedef C::iterator R; typedef C::iterator R;
C c; C c;
C::const_iterator e = c.end(); C::const_iterator e = c.end();
R r = c.emplace_hint(e, std::piecewise_construct, std::forward_as_tuple(3), R r = c.emplace_hint(e, std::piecewise_construct, std::forward_as_tuple(3),
std::forward_as_tuple()); std::forward_as_tuple());
assert(c.size() == 1); assert(c.size() == 1);
assert(r->first == 3); assert(r->first == 3);
assert(r->second == Emplaceable()); assert(r->second == Emplaceable());
r = c.emplace_hint(c.end(), std::pair<const int, Emplaceable>(3, Emplaceable(5, 6))); r = c.emplace_hint(c.end(), std::pair<const int, Emplaceable>(3, Emplaceable(5, 6)));
assert(c.size() == 2); assert(c.size() == 2);
assert(r->first == 3); assert(r->first == 3);
assert(r->second == Emplaceable(5, 6)); assert(r->second == Emplaceable(5, 6));
assert(r == next(c.begin())); LIBCPP_ASSERT(r == next(c.begin()));
r = c.emplace_hint(r, std::piecewise_construct, std::forward_as_tuple(3), r = c.emplace_hint(r, std::piecewise_construct, std::forward_as_tuple(3),
std::forward_as_tuple(6, 7)); std::forward_as_tuple(6, 7));
assert(c.size() == 3); assert(c.size() == 3);
assert(r->first == 3); assert(r->first == 3);
assert(r->second == Emplaceable(6, 7)); assert(r->second == Emplaceable(6, 7));
assert(r == next(c.begin())); LIBCPP_ASSERT(r == next(c.begin()));
r = c.begin(); r = c.begin();
assert(r->first == 3); assert(r->first == 3);
assert(r->second == Emplaceable()); LIBCPP_ASSERT(r->second == Emplaceable());
r = next(r, 2); r = next(r, 2);
assert(r->first == 3); assert(r->first == 3);
assert(r->second == Emplaceable(5, 6)); LIBCPP_ASSERT(r->second == Emplaceable(5, 6));
} }
#if TEST_STD_VER >= 11 #if TEST_STD_VER >= 11
{ {
typedef std::unordered_multimap<int, Emplaceable, std::hash<int>, std::equal_to<int>, typedef std::unordered_multimap<int, Emplaceable, std::hash<int>, std::equal_to<int>,
min_allocator<std::pair<const int, Emplaceable>>> C; min_allocator<std::pair<const int, Emplaceable>>> C;
typedef C::iterator R; typedef C::iterator R;
C c; C c;
C::const_iterator e = c.end(); C::const_iterator e = c.end();
R r = c.emplace_hint(e, std::piecewise_construct, std::forward_as_tuple(3), R r = c.emplace_hint(e, std::piecewise_construct, std::forward_as_tuple(3),
std::forward_as_tuple()); std::forward_as_tuple());
assert(c.size() == 1); assert(c.size() == 1);
assert(r->first == 3); assert(r->first == 3);
assert(r->second == Emplaceable()); assert(r->second == Emplaceable());
r = c.emplace_hint(c.end(), std::pair<const int, Emplaceable>(3, Emplaceable(5, 6))); r = c.emplace_hint(c.end(), std::pair<const int, Emplaceable>(3, Emplaceable(5, 6)));
assert(c.size() == 2); assert(c.size() == 2);
assert(r->first == 3); assert(r->first == 3);
assert(r->second == Emplaceable(5, 6)); assert(r->second == Emplaceable(5, 6));
assert(r == next(c.begin())); LIBCPP_ASSERT(r == next(c.begin()));
r = c.emplace_hint(r, std::piecewise_construct, std::forward_as_tuple(3), r = c.emplace_hint(r, std::piecewise_construct, std::forward_as_tuple(3),
std::forward_as_tuple(6, 7)); std::forward_as_tuple(6, 7));
assert(c.size() == 3); assert(c.size() == 3);
assert(r->first == 3); assert(r->first == 3);
assert(r->second == Emplaceable(6, 7)); assert(r->second == Emplaceable(6, 7));
assert(r == next(c.begin())); LIBCPP_ASSERT(r == next(c.begin()));
r = c.begin(); r = c.begin();
assert(r->first == 3); assert(r->first == 3);
assert(r->second == Emplaceable()); LIBCPP_ASSERT(r->second == Emplaceable());
r = next(r, 2); r = next(r, 2);
assert(r->first == 3); assert(r->first == 3);
assert(r->second == Emplaceable(5, 6)); LIBCPP_ASSERT(r->second == Emplaceable(5, 6));
} }
#endif #endif
#if _LIBCPP_DEBUG >= 1 #if _LIBCPP_DEBUG >= 1
{ {
typedef std::unordered_multimap<int, Emplaceable> C; typedef std::unordered_multimap<int, Emplaceable> C;
typedef C::iterator R; typedef C::iterator R;
typedef C::value_type P; typedef C::value_type P;
C c; C c;
Show All 9 Lines

test/std/containers/unord/unord.multiset/unord.multiset.cnstr/assign_move.pass.cpp

Show First 20 Lines • Show All 198 Lines • ▼ Show 20 Lines#if TEST_STD_VER >= 11
7, 7,
test_hash<std::hash<int> >(2), test_hash<std::hash<int> >(2),
test_compare<std::equal_to<int> >(3), test_compare<std::equal_to<int> >(3),
A() A()
); );
c = std::move(c0); c = std::move(c0);
LIBCPP_ASSERT(c.bucket_count() == 7); LIBCPP_ASSERT(c.bucket_count() == 7);
assert(c.size() == 6); assert(c.size() == 6);
C::const_iterator i = c.cbegin(); assert(c.count(1) == 2);
assert(*i == 4); assert(c.count(2) == 2);
++i; assert(c.count(3) == 1);
assert(*i == 3); assert(c.count(4) == 1);
++i;
assert(*i == 2);
++i;
assert(*i == 2);
++i;
assert(*i == 1);
++i;
assert(*i == 1);
assert(c.hash_function() == test_hash<std::hash<int> >(8)); assert(c.hash_function() == test_hash<std::hash<int> >(8));
assert(c.key_eq() == test_compare<std::equal_to<int> >(9)); assert(c.key_eq() == test_compare<std::equal_to<int> >(9));
assert(c.get_allocator() == A()); assert(c.get_allocator() == A());
assert(!c.empty()); assert(!c.empty());
assert(std::distance(c.begin(), c.end()) == c.size()); assert(std::distance(c.begin(), c.end()) == c.size());
assert(std::distance(c.cbegin(), c.cend()) == c.size()); assert(std::distance(c.cbegin(), c.cend()) == c.size());
assert(fabs(c.load_factor() - (float)c.size()/c.bucket_count()) < FLT_EPSILON); assert(fabs(c.load_factor() - (float)c.size()/c.bucket_count()) < FLT_EPSILON);
assert(c.max_load_factor() == 1); assert(c.max_load_factor() == 1);
▲ Show 20 Lines • Show All 61 Lines • Show Last 20 Lines

test/std/containers/unord/unord.multiset/unord.multiset.cnstr/move_alloc.pass.cpp

Show First 20 Lines • Show All 140 Lines • ▼ Show 20 Lines#if TEST_STD_VER >= 11
7, 7,
test_hash<std::hash<int> >(8), test_hash<std::hash<int> >(8),
test_compare<std::equal_to<int> >(9), test_compare<std::equal_to<int> >(9),
A() A()
); );
C c(std::move(c0), A()); C c(std::move(c0), A());
assert(c.bucket_count() >= 7); assert(c.bucket_count() >= 7);
assert(c.size() == 6); assert(c.size() == 6);
C::const_iterator i = c.cbegin(); assert(c.count(1) == 2);
assert(*i == 4); assert(c.count(2) == 2);
++i; assert(c.count(3) == 1);
assert(*i == 3); assert(c.count(4) == 1);
++i;
assert(*i == 2);
++i;
assert(*i == 2);
++i;
assert(*i == 1);
++i;
assert(*i == 1);
assert(c.hash_function() == test_hash<std::hash<int> >(8)); assert(c.hash_function() == test_hash<std::hash<int> >(8));
assert(c.key_eq() == test_compare<std::equal_to<int> >(9)); assert(c.key_eq() == test_compare<std::equal_to<int> >(9));
assert(c.get_allocator() == A()); assert(c.get_allocator() == A());
assert(!c.empty()); assert(!c.empty());
assert(std::distance(c.begin(), c.end()) == c.size()); assert(std::distance(c.begin(), c.end()) == c.size());
assert(std::distance(c.cbegin(), c.cend()) == c.size()); assert(std::distance(c.cbegin(), c.cend()) == c.size());
assert(std::fabs(c.load_factor() - (float)c.size()/c.bucket_count()) < FLT_EPSILON); assert(std::fabs(c.load_factor() - (float)c.size()/c.bucket_count()) < FLT_EPSILON);
assert(c.max_load_factor() == 1); assert(c.max_load_factor() == 1);
▲ Show 20 Lines • Show All 47 Lines • Show Last 20 Lines