feedc0de/boost_intrusive
1
0
Fork 0
forked from boostorg/intrusive
Code Pull Requests Activity

Changes to correct regression tests for intel-win-9.1 & cw-9.4

Browse Source 
[SVN r37675]
This commit is contained in:
Ion Gaztañaga
2007-05-12 12:34:55 +00:00
parent b039088719
commit 4c784f8c28
32 changed files with 861 additions and 1005 deletions
Download Patch File Download Diff File Expand all files Collapse all files

151
test/unordered_set_test.cpp
View File

@@ -1,7 +1,7 @@
/////////////////////////////////////////////////////////////////////////////
//
// (C) Copyright Olaf Krzikalla 2004-2006.
// (C) Copyright Ion Gazta<EFBFBD>aga 2006-2007.
// (C) Copyright Ion Gaztanaga 2006-2007.
//
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
@@ -18,9 +18,8 @@
#include "common_functors.hpp"
#include <vector>
#include <set>
// Boost.Test
#include "boost/test/included/test_exec_monitor.hpp"
#include <boost/detail/lightweight_test.hpp>
#include "test_macros.hpp"
using namespace boost::intrusive;
@@ -75,7 +74,6 @@ void test_unordered_set<ValueTraits>::test_impl()
testset.erase (testset.iterator_to (values[0]));
testset.erase (testset.iterator_to (values[1]));
testset.insert (values[1]);
testset.erase (testset.iterator_to (values[2]));
testset.erase (testset.iterator_to (values[3]));
}
@@ -84,9 +82,7 @@ void test_unordered_set<ValueTraits>::test_impl()
template<class ValueTraits>
void test_unordered_set<ValueTraits>::test_sort(std::vector<typename ValueTraits::value_type>& values)
{
typedef typename ValueTraits::value_type testvalue_t;
boost::test_tools::output_test_stream test_seq;
typedef boost::intrusive::unordered_set
<ValueTraits
,boost::hash<typename ValueTraits::value_type>
@@ -96,14 +92,12 @@ void test_unordered_set<ValueTraits>::test_sort(std::vector<typename ValueTraits
typename unordered_set_type::bucket_type buckets [BucketSize];
unordered_set_type testset1(buckets, BucketSize, values.begin(), values.end());
BOOST_CHECK (5 == std::distance(testset1.begin(), testset1.end()));
std::copy (testset1.begin(), testset1.end(),
std::ostream_iterator<testvalue_t> (test_seq));
BOOST_CHECK (test_seq.is_equal ("12345"));
BOOST_TEST (5 == std::distance(testset1.begin(), testset1.end()));
{ int init_values [] = { 1, 2, 3, 4, 5 };
TEST_INTRUSIVE_SEQUENCE( init_values, testset1.begin() ); }
testset1.clear();
BOOST_CHECK (testset1.empty());
BOOST_TEST (testset1.empty());
}
//test: insert, const_iterator, const_reverse_iterator, erase, iterator_to:
@@ -111,7 +105,6 @@ template<class ValueTraits>
void test_unordered_set<ValueTraits>::test_insert(std::vector<typename ValueTraits::value_type>& values)
{
typedef typename ValueTraits::value_type testvalue_t;
boost::test_tools::output_test_stream test_seq;
typedef boost::intrusive::unordered_set
<ValueTraits
,boost::hash<typename ValueTraits::value_type>
@@ -123,25 +116,22 @@ void test_unordered_set<ValueTraits>::test_insert(std::vector<typename ValueTrai
testset.insert(&values[0] + 2, &values[0] + 5);
const unordered_set_type& const_testset = testset;
std::copy (const_testset.begin(), const_testset.end(),
std::ostream_iterator<testvalue_t> (test_seq));
BOOST_CHECK (test_seq.is_equal ("145"));
{ int init_values [] = { 1, 4, 5 };
TEST_INTRUSIVE_SEQUENCE( init_values, const_testset.begin() ); }
BOOST_DEDUCED_TYPENAME unordered_set_type::iterator i = testset.begin();
BOOST_CHECK (i->value_ == 1);
typename unordered_set_type::iterator i = testset.begin();
BOOST_TEST (i->value_ == 1);
i = testset.insert(values[0]).first;
BOOST_CHECK (&*i == &values[0]);
BOOST_TEST (&*i == &values[0]);
i = testset.iterator_to (values[2]);
BOOST_CHECK (&*i == &values[2]);
BOOST_TEST (&*i == &values[2]);
testset.erase (i);
//test post-increment:
for (BOOST_DEDUCED_TYPENAME unordered_set_type::const_iterator i = const_testset.begin(),
e = const_testset.end(); i != e; i++)
test_seq << *i;
BOOST_CHECK (test_seq.is_equal ("135"));
{ int init_values [] = { 1, 3, 5 };
TEST_INTRUSIVE_SEQUENCE( init_values, const_testset.begin() ); }
}
//test: insert (seq-version), swap, erase (seq-version), size:
@@ -149,8 +139,6 @@ template<class ValueTraits>
void test_unordered_set<ValueTraits>::test_swap(std::vector<typename ValueTraits::value_type>& values)
{
typedef typename ValueTraits::value_type testvalue_t;
boost::test_tools::output_test_stream test_seq;
typedef boost::intrusive::unordered_set
<ValueTraits
,boost::hash<typename ValueTraits::value_type>
@@ -166,20 +154,16 @@ void test_unordered_set<ValueTraits>::test_swap(std::vector<typename ValueTraits
testset2.insert (&values[0] + 2, &values[0] + 6);
testset1.swap (testset2);
std::copy (testset1.begin(), testset1.end(),
std::ostream_iterator<testvalue_t> (test_seq));
BOOST_CHECK (test_seq.is_equal ("1245"));
//test post-increment:
for (BOOST_DEDUCED_TYPENAME unordered_set_type::iterator i = testset2.begin(),
e = testset2.end(); i != e; i++)
test_seq << *i;
BOOST_CHECK (test_seq.is_equal ("23"));
{ int init_values [] = { 1, 2, 4, 5 };
TEST_INTRUSIVE_SEQUENCE( init_values, testset1.begin() ); }
{ int init_values [] = { 2, 3 };
TEST_INTRUSIVE_SEQUENCE( init_values, testset2.begin() ); }
testset1.erase (testset1.iterator_to(values[5]), testset1.end());
BOOST_CHECK (testset1.size() == 1);
// BOOST_CHECK (&testset1.front() == &values[3]);
BOOST_CHECK (&*testset1.begin() == &values[3]);
BOOST_TEST (testset1.size() == 1);
// BOOST_TEST (&testset1.front() == &values[3]);
BOOST_TEST (&*testset1.begin() == &values[3]);
}
//test: rehash:
@@ -187,8 +171,6 @@ template<class ValueTraits>
void test_unordered_set<ValueTraits>::test_rehash(std::vector<typename ValueTraits::value_type>& values)
{
typedef typename ValueTraits::value_type testvalue_t;
boost::test_tools::output_test_stream test_seq;
typedef boost::intrusive::unordered_set
<ValueTraits
,boost::hash<typename ValueTraits::value_type>
@@ -198,38 +180,33 @@ void test_unordered_set<ValueTraits>::test_rehash(std::vector<typename ValueTrai
typename unordered_set_type::bucket_type buckets1 [BucketSize];
unordered_set_type testset1(buckets1, BucketSize, &values[0], &values[0] + 6);
BOOST_CHECK (testset1.size() == 5);
std::copy (testset1.begin(), testset1.end(),
std::ostream_iterator<testvalue_t> (test_seq));
BOOST_CHECK (test_seq.is_equal ("12345"));
BOOST_TEST (testset1.size() == 5);
{ int init_values [] = { 1, 2, 3, 4, 5 };
TEST_INTRUSIVE_SEQUENCE( init_values, testset1.begin() ); }
typename unordered_set_type::bucket_type buckets2 [2];
testset1.rehash(buckets2, 2);
BOOST_CHECK (testset1.size() == 5);
std::copy (testset1.begin(), testset1.end(),
std::ostream_iterator<testvalue_t> (test_seq));
BOOST_CHECK (test_seq.is_equal ("42531"));
BOOST_TEST (testset1.size() == 5);
{ int init_values [] = { 4, 2, 5, 3, 1 };
TEST_INTRUSIVE_SEQUENCE( init_values, testset1.begin() ); }
typename unordered_set_type::bucket_type buckets3 [BucketSize*2];
testset1.rehash(buckets3, BucketSize*2);
BOOST_CHECK (testset1.size() == 5);
std::copy (testset1.begin(), testset1.end(),
std::ostream_iterator<testvalue_t> (test_seq));
BOOST_CHECK (test_seq.is_equal ("12345"));
BOOST_TEST (testset1.size() == 5);
{ int init_values [] = { 1, 2, 3, 4, 5 };
TEST_INTRUSIVE_SEQUENCE( init_values, testset1.begin() ); }
//Now rehash reducing the buckets
testset1.rehash(buckets3, 2);
BOOST_CHECK (testset1.size() == 5);
std::copy (testset1.begin(), testset1.end(),
std::ostream_iterator<testvalue_t> (test_seq));
BOOST_CHECK (test_seq.is_equal ("42531"));
BOOST_TEST (testset1.size() == 5);
{ int init_values [] = { 4, 2, 5, 3, 1 };
TEST_INTRUSIVE_SEQUENCE( init_values, testset1.begin() ); }
//Now rehash increasing the buckets
testset1.rehash(buckets3, BucketSize*2);
BOOST_CHECK (testset1.size() == 5);
std::copy (testset1.begin(), testset1.end(),
std::ostream_iterator<testvalue_t> (test_seq));
BOOST_CHECK (test_seq.is_equal ("12345"));
BOOST_TEST (testset1.size() == 5);
{ int init_values [] = { 1, 2, 3, 4, 5 };
TEST_INTRUSIVE_SEQUENCE( init_values, testset1.begin() ); }
}
@@ -238,8 +215,6 @@ template<class ValueTraits>
void test_unordered_set<ValueTraits>::test_find(std::vector<typename ValueTraits::value_type>& values)
{
typedef typename ValueTraits::value_type testvalue_t;
boost::test_tools::output_test_stream test_seq;
typedef boost::intrusive::unordered_set
<ValueTraits
,boost::hash<typename ValueTraits::value_type>
@@ -248,21 +223,21 @@ void test_unordered_set<ValueTraits>::test_find(std::vector<typename ValueTraits
> unordered_set_type;
typename unordered_set_type::bucket_type buckets [BucketSize];
unordered_set_type testset (buckets, BucketSize, values.begin(), values.end());
typedef BOOST_DEDUCED_TYPENAME unordered_set_type::iterator iterator;
typedef typename unordered_set_type::iterator iterator;
testvalue_t cmp_val;
cmp_val.value_ = 2;
iterator i = testset.find (cmp_val);
BOOST_CHECK (i->value_ == 2);
BOOST_CHECK ((++i)->value_ != 2);
BOOST_TEST (i->value_ == 2);
BOOST_TEST ((++i)->value_ != 2);
std::pair<iterator,iterator> range = testset.equal_range (cmp_val);
BOOST_CHECK (range.first->value_ == 2);
BOOST_CHECK (range.second->value_ == 3);
BOOST_CHECK (std::distance (range.first, range.second) == 1);
BOOST_TEST (range.first->value_ == 2);
BOOST_TEST (range.second->value_ == 3);
BOOST_TEST (std::distance (range.first, range.second) == 1);
cmp_val.value_ = 7;
BOOST_CHECK (testset.find (cmp_val) == testset.end());
BOOST_TEST (testset.find (cmp_val) == testset.end());
}
template<class ValueTraits>
@@ -288,9 +263,9 @@ void test_unordered_set<ValueTraits>
src(testset1.begin(), testset1.end());
std::set<typename ValueTraits::value_type>
dst(testset2.begin(), testset2.end());
BOOST_CHECK (src == dst );
BOOST_TEST (src == dst );
testset2.clear_and_destroy(test::delete_destroyer());
BOOST_CHECK (testset2.empty());
BOOST_TEST (testset2.empty());
}
{
//Test with bigger source bucket arrays
@@ -305,9 +280,9 @@ void test_unordered_set<ValueTraits>
src(testset1.begin(), testset1.end());
std::set<typename ValueTraits::value_type>
dst(testset2.begin(), testset2.end());
BOOST_CHECK (src == dst );
BOOST_TEST (src == dst );
testset2.clear_and_destroy(test::delete_destroyer());
BOOST_CHECK (testset2.empty());
BOOST_TEST (testset2.empty());
}
{
//Test with smaller source bucket arrays
@@ -322,9 +297,9 @@ void test_unordered_set<ValueTraits>
src(testset1.begin(), testset1.end());
std::set<typename ValueTraits::value_type>
dst(testset2.begin(), testset2.end());
BOOST_CHECK (src == dst );
BOOST_TEST (src == dst );
testset2.clear_and_destroy(test::delete_destroyer());
BOOST_CHECK (testset2.empty());
BOOST_TEST (testset2.empty());
}
}
@@ -340,10 +315,10 @@ class test_main_template
for (int i = 0; i < 6; ++i)
data[i].value_ = random_init[i];
test_unordered_set <typename testvalue_t::unordered_set_base_hook::template
test_unordered_set <typename testvalue_t::unordered_set_base_hook_t::template
value_traits<testvalue_t> >::test_all(data);
test_unordered_set <typename testvalue_t::unordered_set_member_hook::template
test_unordered_set <typename testvalue_t::unordered_set_member_hook_t::template
value_traits<testvalue_t, &testvalue_t::unordered_set_node_> >::test_all(data);
return 0;
@@ -362,21 +337,21 @@ class test_main_template<VoidPointer, false>
for (int i = 0; i < 6; ++i)
data[i].value_ = random_init[i];
test_unordered_set <typename testvalue_t::unordered_set_base_hook::template
test_unordered_set <typename testvalue_t::unordered_set_base_hook_t::template
value_traits<testvalue_t> >::test_all(data);
test_unordered_set <typename testvalue_t::unordered_set_member_hook::template
test_unordered_set <typename testvalue_t::unordered_set_member_hook_t::template
value_traits<testvalue_t, &testvalue_t::unordered_set_node_> >::test_all(data);
test_unordered_set <typename testvalue_t::unordered_set_auto_base_hook::template
test_unordered_set <typename testvalue_t::unordered_set_auto_base_hook_t::template
value_traits<testvalue_t> >::test_all(data);
test_unordered_set <typename testvalue_t::unordered_set_auto_member_hook::template
test_unordered_set <typename testvalue_t::unordered_set_auto_member_hook_t::template
value_traits<testvalue_t, &testvalue_t::unordered_set_auto_node_> >::test_all(data);
return 0;
}
};
/*
template class boost::intrusive::unordered_set
< unordered_set_base_raw_t
, boost::hash<unordered_set_base_raw_t::value_type>
@@ -427,12 +402,12 @@ template class boost::intrusive::unordered_set
< unordered_set_member_smart_t
, boost::hash<unordered_set_member_smart_t::value_type>
, std::equal_to<unordered_set_member_smart_t::value_type>, true>;
int test_main( int, char* [] )
*/
int main( int, char* [] )
{
test_main_template<void*, false>()();
test_main_template<boost::intrusive::smart_ptr<void>, false>()();
test_main_template<void*, true>()();
test_main_template<boost::intrusive::smart_ptr<void>, true>()();
return 0;
return boost::report_errors();
}