feedc0de/boost_container
1
0
Fork 0
forked from boostorg/container
Code Pull Requests Activity

Updated tests to avoid manual memory management. Replaced with unique_ptr and a reference. Normalized CheckEqualContainers to use references instead of pointers.

Browse Source
This commit is contained in:
Ion Gaztañaga
2014-09-23 17:30:31 +02:00
parent 4d5b9a80cf
commit e697122a2c
11 changed files with 1233 additions and 1381 deletions
Download Patch File Download Diff File Expand all files Collapse all files

138
test/deque_test.cpp
View File

@@ -70,58 +70,58 @@ template class boost::container::deque
//Function to check if both sets are equal
template<class V1, class V2>
bool deque_copyable_only(V1 *, V2 *, container_detail::false_type)
bool deque_copyable_only(V1 &, V2 &, container_detail::false_type)
{
return true;
}
//Function to check if both sets are equal
template<class V1, class V2>
bool deque_copyable_only(V1 *cntdeque, V2 *stddeque, container_detail::true_type)
bool deque_copyable_only(V1 &cntdeque, V2 &stddeque, container_detail::true_type)
{
typedef typename V1::value_type IntType;
std::size_t size = cntdeque->size();
stddeque->insert(stddeque->end(), 50, 1);
cntdeque->insert(cntdeque->end(), 50, IntType(1));
std::size_t size = cntdeque.size();
stddeque.insert(stddeque.end(), 50, 1);
cntdeque.insert(cntdeque.end(), 50, IntType(1));
if(!test::CheckEqualContainers(cntdeque, stddeque)) return false;
{
IntType move_me(1);
stddeque->insert(stddeque->begin()+size/2, 50, 1);
cntdeque->insert(cntdeque->begin()+size/2, 50, boost::move(move_me));
stddeque.insert(stddeque.begin()+size/2, 50, 1);
cntdeque.insert(cntdeque.begin()+size/2, 50, boost::move(move_me));
if(!test::CheckEqualContainers(cntdeque, stddeque)) return false;
}
{
IntType move_me(2);
cntdeque->assign(cntdeque->size()/2, boost::move(move_me));
stddeque->assign(stddeque->size()/2, 2);
cntdeque.assign(cntdeque.size()/2, boost::move(move_me));
stddeque.assign(stddeque.size()/2, 2);
if(!test::CheckEqualContainers(cntdeque, stddeque)) return false;
}
{
IntType move_me(1);
stddeque->clear();
cntdeque->clear();
stddeque->insert(stddeque->begin(), 50, 1);
cntdeque->insert(cntdeque->begin(), 50, boost::move(move_me));
stddeque.clear();
cntdeque.clear();
stddeque.insert(stddeque.begin(), 50, 1);
cntdeque.insert(cntdeque.begin(), 50, boost::move(move_me));
if(!test::CheckEqualContainers(cntdeque, stddeque)) return false;
stddeque->insert(stddeque->begin()+20, 50, 1);
cntdeque->insert(cntdeque->begin()+20, 50, boost::move(move_me));
stddeque.insert(stddeque.begin()+20, 50, 1);
cntdeque.insert(cntdeque.begin()+20, 50, boost::move(move_me));
if(!test::CheckEqualContainers(cntdeque, stddeque)) return false;
stddeque->insert(stddeque->begin()+20, 20, 1);
cntdeque->insert(cntdeque->begin()+20, 20, boost::move(move_me));
stddeque.insert(stddeque.begin()+20, 20, 1);
cntdeque.insert(cntdeque.begin()+20, 20, boost::move(move_me));
if(!test::CheckEqualContainers(cntdeque, stddeque)) return false;
}
{
IntType move_me(1);
stddeque->clear();
cntdeque->clear();
stddeque->insert(stddeque->end(), 50, 1);
cntdeque->insert(cntdeque->end(), 50, boost::move(move_me));
stddeque.clear();
cntdeque.clear();
stddeque.insert(stddeque.end(), 50, 1);
cntdeque.insert(cntdeque.end(), 50, boost::move(move_me));
if(!test::CheckEqualContainers(cntdeque, stddeque)) return false;
stddeque->insert(stddeque->end()-20, 50, 1);
cntdeque->insert(cntdeque->end()-20, 50, boost::move(move_me));
stddeque.insert(stddeque.end()-20, 50, 1);
cntdeque.insert(cntdeque.end()-20, 50, boost::move(move_me));
if(!test::CheckEqualContainers(cntdeque, stddeque)) return false;
stddeque->insert(stddeque->end()-20, 20, 1);
cntdeque->insert(cntdeque->end()-20, 20, boost::move(move_me));
stddeque.insert(stddeque.end()-20, 20, 1);
cntdeque.insert(cntdeque.end()-20, 20, boost::move(move_me));
if(!test::CheckEqualContainers(cntdeque, stddeque)) return false;
}
@@ -165,33 +165,35 @@ bool do_test()
typedef deque<IntType> MyCntDeque;
typedef std::deque<int> MyStdDeque;
const int max = 100;
BOOST_TRY{
MyCntDeque *cntdeque = new MyCntDeque;
MyStdDeque *stddeque = new MyStdDeque;
{
::boost::movelib::unique_ptr<MyCntDeque> const pcntdeque = ::boost::movelib::make_unique<MyCntDeque>();
::boost::movelib::unique_ptr<MyStdDeque> const pstddeque = ::boost::movelib::make_unique<MyStdDeque>();
MyCntDeque &cntdeque = *pcntdeque;
MyStdDeque &stddeque = *pstddeque;
for(int i = 0; i < max*100; ++i){
IntType move_me(i);
cntdeque->insert(cntdeque->end(), boost::move(move_me));
stddeque->insert(stddeque->end(), i);
cntdeque.insert(cntdeque.end(), boost::move(move_me));
stddeque.insert(stddeque.end(), i);
}
if(!test::CheckEqualContainers(cntdeque, stddeque)) return false;
cntdeque->clear();
stddeque->clear();
cntdeque.clear();
stddeque.clear();
for(int i = 0; i < max*100; ++i){
IntType move_me(i);
cntdeque->push_back(boost::move(move_me));
stddeque->push_back(i);
cntdeque.push_back(boost::move(move_me));
stddeque.push_back(i);
}
if(!test::CheckEqualContainers(cntdeque, stddeque)) return false;
cntdeque->clear();
stddeque->clear();
cntdeque.clear();
stddeque.clear();
for(int i = 0; i < max*100; ++i){
IntType move_me(i);
cntdeque->push_front(boost::move(move_me));
stddeque->push_front(i);
cntdeque.push_front(boost::move(move_me));
stddeque.push_front(i);
}
if(!test::CheckEqualContainers(cntdeque, stddeque)) return false;
@@ -199,12 +201,12 @@ bool do_test()
typename MyCntDeque::const_iterator cit = it;
(void)cit;
cntdeque->erase(cntdeque->begin()++);
stddeque->erase(stddeque->begin()++);
cntdeque.erase(cntdeque.begin()++);
stddeque.erase(stddeque.begin()++);
if(!test::CheckEqualContainers(cntdeque, stddeque)) return false;
cntdeque->erase(cntdeque->begin());
stddeque->erase(stddeque->begin());
cntdeque.erase(cntdeque.begin());
stddeque.erase(stddeque.begin());
if(!test::CheckEqualContainers(cntdeque, stddeque)) return false;
{
@@ -219,10 +221,10 @@ bool do_test()
aux_vect2[i] = -1;
}
cntdeque->insert(cntdeque->end()
cntdeque.insert(cntdeque.end()
,boost::make_move_iterator(&aux_vect[0])
,boost::make_move_iterator(aux_vect + 50));
stddeque->insert(stddeque->end(), aux_vect2, aux_vect2 + 50);
stddeque.insert(stddeque.end(), aux_vect2, aux_vect2 + 50);
if(!test::CheckEqualContainers(cntdeque, stddeque)) return false;
for(int i = 0; i < 50; ++i){
@@ -233,15 +235,15 @@ bool do_test()
aux_vect2[i] = i;
}
cntdeque->insert(cntdeque->begin()+cntdeque->size()
cntdeque.insert(cntdeque.begin()+cntdeque.size()
,boost::make_move_iterator(&aux_vect[0])
,boost::make_move_iterator(aux_vect + 50));
stddeque->insert(stddeque->begin()+stddeque->size(), aux_vect2, aux_vect2 + 50);
stddeque.insert(stddeque.begin()+stddeque.size(), aux_vect2, aux_vect2 + 50);
if(!test::CheckEqualContainers(cntdeque, stddeque)) return false;
for(int i = 0, j = static_cast<int>(cntdeque->size()); i < j; ++i){
cntdeque->erase(cntdeque->begin());
stddeque->erase(stddeque->begin());
for(int i = 0, j = static_cast<int>(cntdeque.size()); i < j; ++i){
cntdeque.erase(cntdeque.begin());
stddeque.erase(stddeque.begin());
}
if(!test::CheckEqualContainers(cntdeque, stddeque)) return false;
}
@@ -255,10 +257,10 @@ bool do_test()
for(int i = 0; i < 50; ++i){
aux_vect2[i] = -1;
}
cntdeque->insert(cntdeque->begin()
cntdeque.insert(cntdeque.begin()
,boost::make_move_iterator(&aux_vect[0])
,boost::make_move_iterator(aux_vect + 50));
stddeque->insert(stddeque->begin(), aux_vect2, aux_vect2 + 50);
stddeque.insert(stddeque.begin(), aux_vect2, aux_vect2 + 50);
if(!test::CheckEqualContainers(cntdeque, stddeque)) return false;
}
@@ -267,47 +269,37 @@ bool do_test()
return false;
}
cntdeque->erase(cntdeque->begin());
stddeque->erase(stddeque->begin());
cntdeque.erase(cntdeque.begin());
stddeque.erase(stddeque.begin());
if(!test::CheckEqualContainers(cntdeque, stddeque)) return false;
for(int i = 0; i < max; ++i){
IntType move_me(i);
cntdeque->insert(cntdeque->begin(), boost::move(move_me));
stddeque->insert(stddeque->begin(), i);
cntdeque.insert(cntdeque.begin(), boost::move(move_me));
stddeque.insert(stddeque.begin(), i);
}
if(!test::CheckEqualContainers(cntdeque, stddeque)) return false;
//Test insertion from list
{
std::list<int> l(50, int(1));
cntdeque->insert(cntdeque->begin(), l.begin(), l.end());
stddeque->insert(stddeque->begin(), l.begin(), l.end());
cntdeque.insert(cntdeque.begin(), l.begin(), l.end());
stddeque.insert(stddeque.begin(), l.begin(), l.end());
if(!test::CheckEqualContainers(cntdeque, stddeque)) return 1;
cntdeque->assign(l.begin(), l.end());
stddeque->assign(l.begin(), l.end());
cntdeque.assign(l.begin(), l.end());
stddeque.assign(l.begin(), l.end());
if(!test::CheckEqualContainers(cntdeque, stddeque)) return 1;
}
cntdeque->resize(100);
stddeque->resize(100);
cntdeque.resize(100);
stddeque.resize(100);
if(!test::CheckEqualContainers(cntdeque, stddeque)) return 1;
cntdeque->resize(200);
stddeque->resize(200);
cntdeque.resize(200);
stddeque.resize(200);
if(!test::CheckEqualContainers(cntdeque, stddeque)) return 1;
delete cntdeque;
delete stddeque;
}
BOOST_CATCH(std::exception &ex){
#ifndef BOOST_NO_EXCEPTIONS
std::cout << ex.what() << std::endl;
#endif
return false;
}
BOOST_CATCH_END
std::cout << std::endl << "Test OK!" << std::endl;
return true;