forked from boostorg/unordered
Merged revisions 55470,55877-55878,55901-55902,55921-55922,55990-55992,56009-56010,56329,56346-56349,56362-56363,56374 via svnmerge from https://svn.boost.org/svn/boost/trunk ........ r55470 | danieljames | 2009-08-08 19:50:00 +0100 (Sat, 08 Aug 2009) | 1 line Remove empty svn:mergeinfo properties. This should reduce the amount of differences between trunk and release. ........ r55877 | danieljames | 2009-08-30 17:33:42 +0100 (Sun, 30 Aug 2009) | 1 line Remove allocator_constructor since it's never used. ........ r55878 | danieljames | 2009-08-30 17:42:28 +0100 (Sun, 30 Aug 2009) | 6 lines Initial checkin of new version of Boost.Unordered. - More template use, less preprocessor use. - Removed some of the Visual C++ 6 workarounds. - Reduced memory use of the main object. - Split into smaller headers. ........ r55901 | danieljames | 2009-08-31 11:39:25 +0100 (Mon, 31 Aug 2009) | 1 line Detab. ........ r55902 | danieljames | 2009-08-31 11:39:40 +0100 (Mon, 31 Aug 2009) | 1 line Remove unnecessary BOOST_DEDUCED_TYPENAMEs ........ r55921 | danieljames | 2009-08-31 16:33:28 +0100 (Mon, 31 Aug 2009) | 1 line Remove a few unused parameters. ........ r55922 | danieljames | 2009-08-31 16:33:49 +0100 (Mon, 31 Aug 2009) | 1 line Remove 'static' from next_node and node_count. Will hopefully make vacpp happy. ........ r55990 | danieljames | 2009-09-03 08:36:21 +0100 (Thu, 03 Sep 2009) | 1 line Combine hash_structure and hash_table_manager. ........ r55991 | danieljames | 2009-09-03 08:37:14 +0100 (Thu, 03 Sep 2009) | 1 line Remove some old Visual C++ workarounds. ........ r55992 | danieljames | 2009-09-03 08:37:30 +0100 (Thu, 03 Sep 2009) | 1 line Add a small test to see if the tested compilers support out of line template methods. ........ r56009 | danieljames | 2009-09-04 08:02:28 +0100 (Fri, 04 Sep 2009) | 1 line Fix link to n2691. ........ r56010 | danieljames | 2009-09-04 08:03:04 +0100 (Fri, 04 Sep 2009) | 1 line Move size_ and cached_begin_bucket_ into table, rename hash_table_manager hash_buckets. ........ r56329 | danieljames | 2009-09-20 22:55:15 +0100 (Sun, 20 Sep 2009) | 2 lines Since all the compilers support out of line template members use them and lots of other things. ........ r56346 | danieljames | 2009-09-21 22:17:19 +0100 (Mon, 21 Sep 2009) | 1 line Slightly more consistent variable names. In detail 'n' is now always a node pointer. ........ r56347 | danieljames | 2009-09-21 22:17:40 +0100 (Mon, 21 Sep 2009) | 1 line Fix bug where container was reducing the number of buckets. ........ r56348 | danieljames | 2009-09-21 22:18:01 +0100 (Mon, 21 Sep 2009) | 1 line Fix a bug that was causing unnecessary rehahes. ........ r56349 | danieljames | 2009-09-21 22:18:21 +0100 (Mon, 21 Sep 2009) | 1 line Use std::max. ........ r56362 | danieljames | 2009-09-22 23:39:00 +0100 (Tue, 22 Sep 2009) | 1 line Another std::max. ........ r56363 | danieljames | 2009-09-22 23:39:17 +0100 (Tue, 22 Sep 2009) | 1 line Remove the emplace_hint implementation for unique containers as it isn't really used and seems to be causing sun 5.7 problems. ........ r56374 | danieljames | 2009-09-24 21:42:19 +0100 (Thu, 24 Sep 2009) | 1 line Remove temporary test. ........ [SVN r56375]
163 lines
5.8 KiB
C++
163 lines
5.8 KiB
C++
|
|
// Copyright 2008-2009 Daniel James.
|
|
// Distributed under the Boost Software License, Version 1.0. (See accompanying
|
|
// file LICENSE_1_0.txt or move at http://www.boost.org/LICENSE_1_0.txt)
|
|
|
|
#include <boost/unordered_set.hpp>
|
|
#include <boost/unordered_map.hpp>
|
|
#include "../helpers/test.hpp"
|
|
#include "../objects/test.hpp"
|
|
#include "../helpers/random_values.hpp"
|
|
#include "../helpers/tracker.hpp"
|
|
#include "../helpers/equivalent.hpp"
|
|
#include "../helpers/invariants.hpp"
|
|
|
|
namespace move_tests
|
|
{
|
|
test::seed_t seed(98624);
|
|
|
|
template<class T>
|
|
T empty(T*) {
|
|
return T();
|
|
}
|
|
|
|
template<class T>
|
|
T create(test::random_values<T> const& v,
|
|
test::object_count& count) {
|
|
T x(v.begin(), v.end());
|
|
count = test::global_object_count;
|
|
return x;
|
|
}
|
|
|
|
template<class T>
|
|
T create(test::random_values<T> const& v,
|
|
test::object_count& count,
|
|
BOOST_DEDUCED_TYPENAME T::hasher hf,
|
|
BOOST_DEDUCED_TYPENAME T::key_equal eq,
|
|
BOOST_DEDUCED_TYPENAME T::allocator_type al,
|
|
float mlf) {
|
|
T x(0, hf, eq, al);
|
|
x.max_load_factor(mlf);
|
|
x.insert(v.begin(), v.end());
|
|
count = test::global_object_count;
|
|
return x;
|
|
}
|
|
|
|
template <class T>
|
|
void move_construct_tests1(T* ptr, test::random_generator const& generator = test::default_generator)
|
|
{
|
|
BOOST_DEDUCED_TYPENAME T::hasher hf;
|
|
BOOST_DEDUCED_TYPENAME T::key_equal eq;
|
|
BOOST_DEDUCED_TYPENAME T::allocator_type al;
|
|
|
|
{
|
|
T y(empty(ptr));
|
|
BOOST_TEST(y.empty());
|
|
BOOST_TEST(test::equivalent(y.hash_function(), hf));
|
|
BOOST_TEST(test::equivalent(y.key_eq(), eq));
|
|
BOOST_TEST(test::equivalent(y.get_allocator(), al));
|
|
BOOST_TEST(y.max_load_factor() == 1.0);
|
|
test::check_equivalent_keys(y);
|
|
}
|
|
|
|
{
|
|
test::random_values<T> v(1000, generator);
|
|
test::object_count count;
|
|
T y(create(v, count));
|
|
BOOST_TEST(count == test::global_object_count);
|
|
test::check_container(y, v);
|
|
test::check_equivalent_keys(y);
|
|
}
|
|
}
|
|
|
|
template <class T>
|
|
void move_assign_tests1(T*, test::random_generator const& generator = test::default_generator)
|
|
{
|
|
{
|
|
test::random_values<T> v(500, generator);
|
|
test::object_count count;
|
|
T y;
|
|
y = create(v, count);
|
|
BOOST_TEST(count == test::global_object_count);
|
|
test::check_container(y, v);
|
|
test::check_equivalent_keys(y);
|
|
}
|
|
}
|
|
|
|
template <class T>
|
|
void move_construct_tests2(T*,
|
|
test::random_generator const& generator = test::default_generator)
|
|
{
|
|
BOOST_DEDUCED_TYPENAME T::hasher hf(1);
|
|
BOOST_DEDUCED_TYPENAME T::key_equal eq(1);
|
|
BOOST_DEDUCED_TYPENAME T::allocator_type al(1);
|
|
BOOST_DEDUCED_TYPENAME T::allocator_type al2(2);
|
|
|
|
test::object_count count;
|
|
|
|
{
|
|
test::random_values<T> v(500, generator);
|
|
T y(create(v, count, hf, eq, al, 0.5));
|
|
BOOST_TEST(count == test::global_object_count);
|
|
test::check_container(y, v);
|
|
BOOST_TEST(test::equivalent(y.hash_function(), hf));
|
|
BOOST_TEST(test::equivalent(y.key_eq(), eq));
|
|
BOOST_TEST(test::equivalent(y.get_allocator(), al));
|
|
BOOST_TEST(y.max_load_factor() == 0.5); // Not necessarily required.
|
|
test::check_equivalent_keys(y);
|
|
}
|
|
|
|
{
|
|
// TODO: To do this correctly requires the fancy new allocator stuff.
|
|
test::random_values<T> v(500, generator);
|
|
T y(create(v, count, hf, eq, al, 2.0), al2);
|
|
BOOST_TEST(count != test::global_object_count);
|
|
test::check_container(y, v);
|
|
BOOST_TEST(test::equivalent(y.hash_function(), hf));
|
|
BOOST_TEST(test::equivalent(y.key_eq(), eq));
|
|
BOOST_TEST(test::equivalent(y.get_allocator(), al2));
|
|
BOOST_TEST(y.max_load_factor() == 2.0); // Not necessarily required.
|
|
test::check_equivalent_keys(y);
|
|
}
|
|
/*
|
|
{
|
|
test::random_values<T> v(25, generator);
|
|
T y(create(v, count, hf, eq, al, 1.0), al);
|
|
#if defined(BOOST_HAS_RVALUE_REFS)
|
|
BOOST_TEST(count == test::global_object_count);
|
|
#else
|
|
BOOST_TEST(test::global_object_count.constructions - count.constructions <=
|
|
(test::is_map<T>::value ? 50 : 25));
|
|
BOOST_TEST(count.instances == test::global_object_count.instances);
|
|
#endif
|
|
test::check_container(y, v);
|
|
BOOST_TEST(test::equivalent(y.hash_function(), hf));
|
|
BOOST_TEST(test::equivalent(y.key_eq(), eq));
|
|
BOOST_TEST(test::equivalent(y.get_allocator(), al));
|
|
BOOST_TEST(y.max_load_factor() == 1.0); // Not necessarily required.
|
|
test::check_equivalent_keys(y);
|
|
}
|
|
*/ }
|
|
|
|
boost::unordered_set<test::object, test::hash, test::equal_to, test::allocator<test::object> >* test_set;
|
|
boost::unordered_multiset<test::object, test::hash, test::equal_to, test::allocator<test::object> >* test_multiset;
|
|
boost::unordered_map<test::object, test::object, test::hash, test::equal_to, test::allocator<test::object> >* test_map;
|
|
boost::unordered_multimap<test::object, test::object, test::hash, test::equal_to, test::allocator<test::object> >* test_multimap;
|
|
|
|
using test::default_generator;
|
|
using test::generate_collisions;
|
|
|
|
UNORDERED_TEST(move_construct_tests1,
|
|
((test_set)(test_multiset)(test_map)(test_multimap))
|
|
)
|
|
UNORDERED_TEST(move_assign_tests1,
|
|
((test_set)(test_multiset)(test_map)(test_multimap))
|
|
)
|
|
UNORDERED_TEST(move_construct_tests2,
|
|
((test_set)(test_multiset)(test_map)(test_multimap))
|
|
((default_generator)(generate_collisions))
|
|
)
|
|
}
|
|
|
|
RUN_TESTS()
|