diff --git a/appveyor.yml b/appveyor.yml index c723f48..e88af5b 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -12,13 +12,13 @@ branches: environment: matrix: - - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013 + - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 TOOLSET: msvc-9.0 - - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013 + - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 TOOLSET: msvc-10.0 - - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013 + - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 TOOLSET: msvc-11.0 - - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013 + - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 TOOLSET: msvc-12.0 - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 TOOLSET: msvc-14.0 diff --git a/example/bounded_buffer_comparison.cpp b/example/bounded_buffer_comparison.cpp index 4205c3a..9eba996 100644 --- a/example/bounded_buffer_comparison.cpp +++ b/example/bounded_buffer_comparison.cpp @@ -11,8 +11,8 @@ #include #include #include +#include #include -#include #include #include #include @@ -229,7 +229,7 @@ template void fifo_test(Buffer* buffer) { // Start of measurement - boost::progress_timer progress; + boost::timer::auto_cpu_timer progress; // Initialize the buffer with some values before launching producer and consumer threads. for (unsigned long i = QUEUE_SIZE / 2L; i > 0; --i) { diff --git a/example/circular_buffer_bound_example.cpp b/example/circular_buffer_bound_example.cpp index f55daa3..b5b7c12 100644 --- a/example/circular_buffer_bound_example.cpp +++ b/example/circular_buffer_bound_example.cpp @@ -19,6 +19,7 @@ as an underlying container of the bounded buffer. #include #include // for auto_cpu_timer +#include template class bounded_buffer diff --git a/example/jamfile.v2 b/example/jamfile.v2 index 36db161..9a6e9e0 100644 --- a/example/jamfile.v2 +++ b/example/jamfile.v2 @@ -35,7 +35,7 @@ project msvc:/wd4305 ; -run bounded_buffer_comparison.cpp ; +run bounded_buffer_comparison.cpp ../../timer/build//boost_timer ; run circular_buffer_iter_example.cpp ; run circular_buffer_sum_example.cpp ; run circular_buffer_bound_example.cpp ../../thread/build//boost_thread ../../timer/build//boost_timer ; diff --git a/test/base_test.cpp b/test/base_test.cpp index 0a318ed..6f51871 100644 --- a/test/base_test.cpp +++ b/test/base_test.cpp @@ -25,11 +25,11 @@ void iterator_constructor_and_assign_test() { circular_buffer::const_iterator end1 = cb.end(); circular_buffer::const_iterator end2 = end1; - BOOST_CHECK(itCopy == it); - BOOST_CHECK(cit == it); - BOOST_CHECK(end1 == end2); - BOOST_CHECK(it != end1); - BOOST_CHECK(cit != end2); + BOOST_TEST(itCopy == it); + BOOST_TEST(cit == it); + BOOST_TEST(end1 == end2); + BOOST_TEST(it != end1); + BOOST_TEST(cit != end2); } void iterator_reference_test() { @@ -38,14 +38,14 @@ void iterator_reference_test() { circular_buffer::iterator it = cb.begin(); circular_buffer::const_iterator cit = cb.begin() + 1; - BOOST_CHECK((*it).m_n == Dummy::eVar); - BOOST_CHECK((*it).fnc() == Dummy::eFnc); - BOOST_CHECK((*cit).const_fnc() == Dummy::eConst); - BOOST_CHECK((*it).virtual_fnc() == Dummy::eVirtual); - BOOST_CHECK(it->m_n == Dummy::eVar); - BOOST_CHECK(it->fnc() == Dummy::eFnc); - BOOST_CHECK(cit->const_fnc() == Dummy::eConst); - BOOST_CHECK(it->virtual_fnc() == Dummy::eVirtual); + BOOST_TEST((*it).m_n == Dummy::eVar); + BOOST_TEST((*it).fnc() == Dummy::eFnc); + BOOST_TEST((*cit).const_fnc() == Dummy::eConst); + BOOST_TEST((*it).virtual_fnc() == Dummy::eVirtual); + BOOST_TEST(it->m_n == Dummy::eVar); + BOOST_TEST(it->fnc() == Dummy::eFnc); + BOOST_TEST(cit->const_fnc() == Dummy::eConst); + BOOST_TEST(it->virtual_fnc() == Dummy::eVirtual); } void iterator_difference_test() { @@ -57,16 +57,16 @@ void iterator_difference_test() { circular_buffer::const_iterator begin = cb.begin(); circular_buffer::iterator end = cb.end(); - BOOST_CHECK(begin - begin == 0); - BOOST_CHECK(end - cb.begin() == 5); - BOOST_CHECK(end - end == 0); - BOOST_CHECK(begin - cb.end() == -5); - BOOST_CHECK(it1 - cb.begin() == 2); - BOOST_CHECK(it1 - begin == 2); - BOOST_CHECK(end - it1 == 3); - BOOST_CHECK(it2 - it1 == 1); - BOOST_CHECK(it1 - it2 == -1); - BOOST_CHECK(it2 - it2 == 0); + BOOST_TEST(begin - begin == 0); + BOOST_TEST(end - cb.begin() == 5); + BOOST_TEST(end - end == 0); + BOOST_TEST(begin - cb.end() == -5); + BOOST_TEST(it1 - cb.begin() == 2); + BOOST_TEST(it1 - begin == 2); + BOOST_TEST(end - it1 == 3); + BOOST_TEST(it2 - it1 == 1); + BOOST_TEST(it1 - it2 == -1); + BOOST_TEST(it2 - it2 == 0); } void iterator_increment_test() { @@ -80,9 +80,9 @@ void iterator_increment_test() { it2++; ++it3; - BOOST_CHECK(it1 == cb.begin() + 1); - BOOST_CHECK(it2 == cb.begin() + 6); - BOOST_CHECK(it3 == cb.end()); + BOOST_TEST(it1 == cb.begin() + 1); + BOOST_TEST(it2 == cb.begin() + 6); + BOOST_TEST(it3 == cb.end()); } void iterator_decrement_test() { @@ -96,9 +96,9 @@ void iterator_decrement_test() { it2--; --it3; - BOOST_CHECK(it1 == cb.end() - 1); - BOOST_CHECK(it2 == cb.end() - 6); - BOOST_CHECK(it3 == cb.begin()); + BOOST_TEST(it1 == cb.end() - 1); + BOOST_TEST(it2 == cb.end() - 6); + BOOST_TEST(it3 == cb.begin()); } void iterator_addition_test() { @@ -115,12 +115,12 @@ void iterator_addition_test() { it3 += 5; it4 += -2; - BOOST_CHECK(it1 == 5 + cb.begin()); - BOOST_CHECK(it2 == cb.end()); - BOOST_CHECK(it3 == cb.end()); - BOOST_CHECK(it4 + 3 == cb.end()); - BOOST_CHECK((-3) + it4 == cb.begin() + 4); - BOOST_CHECK(cb.begin() + 0 == cb.begin()); + BOOST_TEST(it1 == 5 + cb.begin()); + BOOST_TEST(it2 == cb.end()); + BOOST_TEST(it3 == cb.end()); + BOOST_TEST(it4 + 3 == cb.end()); + BOOST_TEST((-3) + it4 == cb.begin() + 4); + BOOST_TEST(cb.begin() + 0 == cb.begin()); } void iterator_subtraction_test() { @@ -137,12 +137,12 @@ void iterator_subtraction_test() { it2 -= 0; it3 -= 5; - BOOST_CHECK(it1 == cb.begin() + 2); - BOOST_CHECK(it2 == cb.end()); - BOOST_CHECK(it3 == cb.begin()); - BOOST_CHECK(it4 - 7 == cb.begin()); - BOOST_CHECK(it4 - (-3) == cb.end()); - BOOST_CHECK(cb.begin() - 0 == cb.begin()); + BOOST_TEST(it1 == cb.begin() + 2); + BOOST_TEST(it2 == cb.end()); + BOOST_TEST(it3 == cb.begin()); + BOOST_TEST(it4 - 7 == cb.begin()); + BOOST_TEST(it4 - (-3) == cb.end()); + BOOST_TEST(cb.begin() - 0 == cb.begin()); } void iterator_element_access_test() { @@ -156,9 +156,9 @@ void iterator_element_access_test() { cb.push_back(6); circular_buffer::iterator it = cb.begin() + 1; - BOOST_CHECK(it[0] == 2); - BOOST_CHECK(it[-1] == 1); - BOOST_CHECK(it[2] == 4); + BOOST_TEST(it[0] == 2); + BOOST_TEST(it[-1] == 1); + BOOST_TEST(it[2] == 4); } void iterator_comparison_test() { @@ -169,26 +169,26 @@ void iterator_comparison_test() { circular_buffer::const_iterator begin = cb.begin(); circular_buffer::iterator end = cb.end(); - BOOST_CHECK(begin == begin); - BOOST_CHECK(end > cb.begin()); - BOOST_CHECK(begin < end); - BOOST_CHECK(end > begin); - BOOST_CHECK(end == end); - BOOST_CHECK(begin < cb.end()); - BOOST_CHECK(!(begin + 1 > cb.end())); - BOOST_CHECK(it > cb.begin()); - BOOST_CHECK(end > it); - BOOST_CHECK(begin >= begin); - BOOST_CHECK(end >= cb.begin()); - BOOST_CHECK(end <= end); - BOOST_CHECK(begin <= cb.end()); - BOOST_CHECK(it >= cb.begin()); - BOOST_CHECK(end >= it); - BOOST_CHECK(!(begin + 4 < begin + 4)); - BOOST_CHECK(begin + 4 < begin + 5); - BOOST_CHECK(!(begin + 5 < begin + 4)); - BOOST_CHECK(it < end - 1); - BOOST_CHECK(!(end - 1 < it)); + BOOST_TEST(begin == begin); + BOOST_TEST(end > cb.begin()); + BOOST_TEST(begin < end); + BOOST_TEST(end > begin); + BOOST_TEST(end == end); + BOOST_TEST(begin < cb.end()); + BOOST_TEST(!(begin + 1 > cb.end())); + BOOST_TEST(it > cb.begin()); + BOOST_TEST(end > it); + BOOST_TEST(begin >= begin); + BOOST_TEST(end >= cb.begin()); + BOOST_TEST(end <= end); + BOOST_TEST(begin <= cb.end()); + BOOST_TEST(it >= cb.begin()); + BOOST_TEST(end >= it); + BOOST_TEST(!(begin + 4 < begin + 4)); + BOOST_TEST(begin + 4 < begin + 5); + BOOST_TEST(!(begin + 5 < begin + 4)); + BOOST_TEST(it < end - 1); + BOOST_TEST(!(end - 1 < it)); } void iterator_invalidation_test() { @@ -202,12 +202,12 @@ void iterator_invalidation_test() { circular_buffer::const_iterator it5; circular_buffer::const_iterator it6; - BOOST_CHECK(it1.is_valid(0)); - BOOST_CHECK(it2.is_valid(0)); - BOOST_CHECK(it3.is_valid(0)); - BOOST_CHECK(it4.is_valid(0)); - BOOST_CHECK(it5.is_valid(0)); - BOOST_CHECK(it6.is_valid(0)); + BOOST_TEST(it1.is_valid(0)); + BOOST_TEST(it2.is_valid(0)); + BOOST_TEST(it3.is_valid(0)); + BOOST_TEST(it4.is_valid(0)); + BOOST_TEST(it5.is_valid(0)); + BOOST_TEST(it6.is_valid(0)); { circular_buffer cb(5, 0); @@ -220,49 +220,49 @@ void iterator_invalidation_test() { it5 = it2; it6 = it1; - BOOST_CHECK(it1.is_valid(&cb)); - BOOST_CHECK(it2.is_valid(&ccb)); - BOOST_CHECK(it3.is_valid(&cb)); - BOOST_CHECK(it4.is_valid(&cb)); - BOOST_CHECK(it5.is_valid(&ccb)); - BOOST_CHECK(it6.is_valid(&cb)); + BOOST_TEST(it1.is_valid(&cb)); + BOOST_TEST(it2.is_valid(&ccb)); + BOOST_TEST(it3.is_valid(&cb)); + BOOST_TEST(it4.is_valid(&cb)); + BOOST_TEST(it5.is_valid(&ccb)); + BOOST_TEST(it6.is_valid(&cb)); } - BOOST_CHECK(it1.is_valid(0)); - BOOST_CHECK(it2.is_valid(0)); - BOOST_CHECK(it3.is_valid(0)); - BOOST_CHECK(it4.is_valid(0)); - BOOST_CHECK(it5.is_valid(0)); - BOOST_CHECK(it6.is_valid(0)); + BOOST_TEST(it1.is_valid(0)); + BOOST_TEST(it2.is_valid(0)); + BOOST_TEST(it3.is_valid(0)); + BOOST_TEST(it4.is_valid(0)); + BOOST_TEST(it5.is_valid(0)); + BOOST_TEST(it6.is_valid(0)); circular_buffer cb(10, 0); it1 = cb.end(); cb.clear(); - BOOST_CHECK(it1.is_valid(&cb)); + BOOST_TEST(it1.is_valid(&cb)); cb.push_back(1); cb.push_back(2); cb.push_back(3); int i = 0; for (it2 = cb.begin(); it2 != it1; it2++, i++); - BOOST_CHECK(i == 3); + BOOST_TEST(i == 3); circular_buffer cb1(10, 0); circular_buffer cb2(20, 0); it1 = cb1.end(); it2 = cb2.begin(); - BOOST_CHECK(it1.is_valid(&cb1)); - BOOST_CHECK(it2.is_valid(&cb2)); + BOOST_TEST(it1.is_valid(&cb1)); + BOOST_TEST(it2.is_valid(&cb2)); cb1.swap(cb2); - BOOST_CHECK(!it1.is_valid(&cb1)); - BOOST_CHECK(!it2.is_valid(&cb2)); + BOOST_TEST(!it1.is_valid(&cb1)); + BOOST_TEST(!it2.is_valid(&cb2)); it1 = cb1.begin() + 3; it2 = cb1.begin(); cb1.push_back(1); - BOOST_CHECK(it1.is_valid(&cb1)); - BOOST_CHECK(!it2.is_valid(&cb1)); - BOOST_CHECK(*it2.m_it == 1); + BOOST_TEST(it1.is_valid(&cb1)); + BOOST_TEST(!it2.is_valid(&cb1)); + BOOST_TEST(*it2.m_it == 1); circular_buffer cb3(5); cb3.push_back(1); @@ -273,16 +273,16 @@ void iterator_invalidation_test() { it1 = cb3.begin() + 2; it2 = cb3.begin(); cb3.insert(cb3.begin() + 3, 6); - BOOST_CHECK(it1.is_valid(&cb3)); - BOOST_CHECK(!it2.is_valid(&cb3)); - BOOST_CHECK(*it2.m_it == 5); + BOOST_TEST(it1.is_valid(&cb3)); + BOOST_TEST(!it2.is_valid(&cb3)); + BOOST_TEST(*it2.m_it == 5); it1 = cb3.begin() + 3; it2 = cb3.end() - 1; cb3.push_front(7); - BOOST_CHECK(it1.is_valid(&cb3)); - BOOST_CHECK(!it2.is_valid(&cb3)); - BOOST_CHECK(*it2.m_it == 7); + BOOST_TEST(it1.is_valid(&cb3)); + BOOST_TEST(!it2.is_valid(&cb3)); + BOOST_TEST(*it2.m_it == 7); circular_buffer cb4(5); cb4.push_back(1); @@ -293,51 +293,51 @@ void iterator_invalidation_test() { it1 = cb4.begin() + 3; it2 = cb4.begin(); cb4.rinsert(cb4.begin() + 2, 6); - BOOST_CHECK(it1.is_valid(&cb4)); - BOOST_CHECK(!it2.is_valid(&cb4)); - BOOST_CHECK(*it2.m_it == 2); + BOOST_TEST(it1.is_valid(&cb4)); + BOOST_TEST(!it2.is_valid(&cb4)); + BOOST_TEST(*it2.m_it == 2); it1 = cb1.begin() + 5; it2 = cb1.end() - 1; cb1.pop_back(); - BOOST_CHECK(it1.is_valid(&cb1)); - BOOST_CHECK(!it2.is_valid(&cb1)); + BOOST_TEST(it1.is_valid(&cb1)); + BOOST_TEST(!it2.is_valid(&cb1)); it1 = cb1.begin() + 5; it2 = cb1.begin(); cb1.pop_front(); - BOOST_CHECK(it1.is_valid(&cb1)); - BOOST_CHECK(!it2.is_valid(&cb1)); + BOOST_TEST(it1.is_valid(&cb1)); + BOOST_TEST(!it2.is_valid(&cb1)); circular_buffer cb5(20, 0); it1 = cb5.begin() + 5; it2 = it3 = cb5.begin() + 15; cb5.erase(cb5.begin() + 10); - BOOST_CHECK(it1.is_valid(&cb5)); - BOOST_CHECK(!it2.is_valid(&cb5)); - BOOST_CHECK(!it3.is_valid(&cb5)); + BOOST_TEST(it1.is_valid(&cb5)); + BOOST_TEST(!it2.is_valid(&cb5)); + BOOST_TEST(!it3.is_valid(&cb5)); it1 = cb5.begin() + 1; it2 = it3 = cb5.begin() + 8; cb5.erase(cb5.begin() + 3, cb5.begin() + 7); - BOOST_CHECK(it1.is_valid(&cb5)); - BOOST_CHECK(!it2.is_valid(&cb5)); - BOOST_CHECK(!it3.is_valid(&cb5)); + BOOST_TEST(it1.is_valid(&cb5)); + BOOST_TEST(!it2.is_valid(&cb5)); + BOOST_TEST(!it3.is_valid(&cb5)); circular_buffer cb6(20, 0); it4 = it1 = cb6.begin() + 5; it2 = cb6.begin() + 15; cb6.rerase(cb6.begin() + 10); - BOOST_CHECK(!it1.is_valid(&cb6)); - BOOST_CHECK(!it4.is_valid(&cb6)); - BOOST_CHECK(it2.is_valid(&cb6)); + BOOST_TEST(!it1.is_valid(&cb6)); + BOOST_TEST(!it4.is_valid(&cb6)); + BOOST_TEST(it2.is_valid(&cb6)); it4 = it1 = cb6.begin() + 1; it2 = cb6.begin() + 8; cb6.rerase(cb6.begin() + 3, cb6.begin() + 7); - BOOST_CHECK(!it1.is_valid(&cb6)); - BOOST_CHECK(!it4.is_valid(&cb6)); - BOOST_CHECK(it2.is_valid(&cb6)); + BOOST_TEST(!it1.is_valid(&cb6)); + BOOST_TEST(!it4.is_valid(&cb6)); + BOOST_TEST(it2.is_valid(&cb6)); circular_buffer cb7(10, 1); cb7.push_back(2); @@ -347,16 +347,16 @@ void iterator_invalidation_test() { it2 = cb7.begin(); it3 = cb7.begin() + 6; cb7.linearize(); - BOOST_CHECK(it1.is_valid(&cb7)); - BOOST_CHECK(!it2.is_valid(&cb7)); - BOOST_CHECK(!it3.is_valid(&cb7)); + BOOST_TEST(it1.is_valid(&cb7)); + BOOST_TEST(!it2.is_valid(&cb7)); + BOOST_TEST(!it3.is_valid(&cb7)); it1 = cb7.end(); it2 = cb7.begin(); it3 = cb7.begin() + 6; cb7.linearize(); - BOOST_CHECK(it1.is_valid(&cb7)); - BOOST_CHECK(it2.is_valid(&cb7)); - BOOST_CHECK(it3.is_valid(&cb7)); + BOOST_TEST(it1.is_valid(&cb7)); + BOOST_TEST(it2.is_valid(&cb7)); + BOOST_TEST(it3.is_valid(&cb7)); cb7.push_back(5); cb7.push_back(6); @@ -364,21 +364,21 @@ void iterator_invalidation_test() { it2 = cb7.begin(); it3 = cb7.begin() + 6; cb7.set_capacity(10); - BOOST_CHECK(it1.is_valid(&cb7)); - BOOST_CHECK(it2.is_valid(&cb7)); - BOOST_CHECK(it3.is_valid(&cb7)); + BOOST_TEST(it1.is_valid(&cb7)); + BOOST_TEST(it2.is_valid(&cb7)); + BOOST_TEST(it3.is_valid(&cb7)); cb7.set_capacity(20); - BOOST_CHECK(it1.is_valid(&cb7)); - BOOST_CHECK(!it2.is_valid(&cb7)); - BOOST_CHECK(!it3.is_valid(&cb7)); + BOOST_TEST(it1.is_valid(&cb7)); + BOOST_TEST(!it2.is_valid(&cb7)); + BOOST_TEST(!it3.is_valid(&cb7)); cb7.push_back(7); it1 = cb7.end(); it2 = cb7.begin(); it3 = cb7.begin() + 6; cb7.set_capacity(10); - BOOST_CHECK(it1.is_valid(&cb7)); - BOOST_CHECK(!it2.is_valid(&cb7)); - BOOST_CHECK(!it3.is_valid(&cb7)); + BOOST_TEST(it1.is_valid(&cb7)); + BOOST_TEST(!it2.is_valid(&cb7)); + BOOST_TEST(!it3.is_valid(&cb7)); cb7.push_back(8); cb7.push_back(9); @@ -386,21 +386,21 @@ void iterator_invalidation_test() { it2 = cb7.begin(); it3 = cb7.begin() + 6; cb7.rset_capacity(10); - BOOST_CHECK(it1.is_valid(&cb7)); - BOOST_CHECK(it2.is_valid(&cb7)); - BOOST_CHECK(it3.is_valid(&cb7)); + BOOST_TEST(it1.is_valid(&cb7)); + BOOST_TEST(it2.is_valid(&cb7)); + BOOST_TEST(it3.is_valid(&cb7)); cb7.rset_capacity(20); - BOOST_CHECK(it1.is_valid(&cb7)); - BOOST_CHECK(!it2.is_valid(&cb7)); - BOOST_CHECK(!it3.is_valid(&cb7)); + BOOST_TEST(it1.is_valid(&cb7)); + BOOST_TEST(!it2.is_valid(&cb7)); + BOOST_TEST(!it3.is_valid(&cb7)); cb7.push_back(10); it1 = cb7.end(); it2 = cb7.begin(); it3 = cb7.begin() + 6; cb7.rset_capacity(10); - BOOST_CHECK(it1.is_valid(&cb7)); - BOOST_CHECK(!it2.is_valid(&cb7)); - BOOST_CHECK(!it3.is_valid(&cb7)); + BOOST_TEST(it1.is_valid(&cb7)); + BOOST_TEST(!it2.is_valid(&cb7)); + BOOST_TEST(!it3.is_valid(&cb7)); circular_buffer cb8(10, 1); cb8.push_back(2); @@ -409,23 +409,23 @@ void iterator_invalidation_test() { it2 = cb8.begin(); it3 = cb8.begin() + 6; cb8.resize(10); - BOOST_CHECK(it1.is_valid(&cb8)); - BOOST_CHECK(it2.is_valid(&cb8)); - BOOST_CHECK(it3.is_valid(&cb8)); + BOOST_TEST(it1.is_valid(&cb8)); + BOOST_TEST(it2.is_valid(&cb8)); + BOOST_TEST(it3.is_valid(&cb8)); cb8.resize(20); - BOOST_CHECK(it1.is_valid(&cb8)); - BOOST_CHECK(!it2.is_valid(&cb8)); - BOOST_CHECK(!it3.is_valid(&cb8)); + BOOST_TEST(it1.is_valid(&cb8)); + BOOST_TEST(!it2.is_valid(&cb8)); + BOOST_TEST(!it3.is_valid(&cb8)); cb8.push_back(4); it1 = cb8.end(); it2 = cb8.begin(); it3 = cb8.begin() + 6; it4 = cb8.begin() + 12; cb8.resize(10); - BOOST_CHECK(it1.is_valid(&cb8)); - BOOST_CHECK(it2.is_valid(&cb8)); - BOOST_CHECK(it3.is_valid(&cb8)); - BOOST_CHECK(!it4.is_valid(&cb8)); + BOOST_TEST(it1.is_valid(&cb8)); + BOOST_TEST(it2.is_valid(&cb8)); + BOOST_TEST(it3.is_valid(&cb8)); + BOOST_TEST(!it4.is_valid(&cb8)); cb8.set_capacity(10); cb8.push_back(5); @@ -434,23 +434,23 @@ void iterator_invalidation_test() { it2 = cb8.begin(); it3 = cb8.begin() + 6; cb8.rresize(10); - BOOST_CHECK(it1.is_valid(&cb8)); - BOOST_CHECK(it2.is_valid(&cb8)); - BOOST_CHECK(it3.is_valid(&cb8)); + BOOST_TEST(it1.is_valid(&cb8)); + BOOST_TEST(it2.is_valid(&cb8)); + BOOST_TEST(it3.is_valid(&cb8)); cb8.rresize(20); - BOOST_CHECK(it1.is_valid(&cb8)); - BOOST_CHECK(!it2.is_valid(&cb8)); - BOOST_CHECK(!it3.is_valid(&cb8)); + BOOST_TEST(it1.is_valid(&cb8)); + BOOST_TEST(!it2.is_valid(&cb8)); + BOOST_TEST(!it3.is_valid(&cb8)); cb8.push_back(7); it1 = cb8.end(); it2 = cb8.begin(); it3 = cb8.begin() + 6; it4 = cb8.begin() + 12; cb8.rresize(10); - BOOST_CHECK(it1.is_valid(&cb8)); - BOOST_CHECK(!it2.is_valid(&cb8)); - BOOST_CHECK(!it3.is_valid(&cb8)); - BOOST_CHECK(it4.is_valid(&cb8)); + BOOST_TEST(it1.is_valid(&cb8)); + BOOST_TEST(!it2.is_valid(&cb8)); + BOOST_TEST(!it3.is_valid(&cb8)); + BOOST_TEST(it4.is_valid(&cb8)); circular_buffer cb9(15, 1); it1 = cb9.end(); @@ -458,10 +458,10 @@ void iterator_invalidation_test() { it3 = cb9.begin() + 6; it4 = cb9.begin() + 12; cb9 = cb8; - BOOST_CHECK(it1.is_valid(&cb9)); - BOOST_CHECK(!it2.is_valid(&cb9)); - BOOST_CHECK(!it3.is_valid(&cb9)); - BOOST_CHECK(!it4.is_valid(&cb9)); + BOOST_TEST(it1.is_valid(&cb9)); + BOOST_TEST(!it2.is_valid(&cb9)); + BOOST_TEST(!it3.is_valid(&cb9)); + BOOST_TEST(!it4.is_valid(&cb9)); circular_buffer cb10(10, 1); it1 = cb10.end(); @@ -469,10 +469,10 @@ void iterator_invalidation_test() { it3 = cb10.begin() + 3; it4 = cb10.begin() + 7; cb10.assign(5, 2); - BOOST_CHECK(it1.is_valid(&cb10)); - BOOST_CHECK(!it2.is_valid(&cb10)); - BOOST_CHECK(!it3.is_valid(&cb10)); - BOOST_CHECK(!it4.is_valid(&cb10)); + BOOST_TEST(it1.is_valid(&cb10)); + BOOST_TEST(!it2.is_valid(&cb10)); + BOOST_TEST(!it3.is_valid(&cb10)); + BOOST_TEST(!it4.is_valid(&cb10)); circular_buffer cb11(10, 1); it1 = cb11.end(); @@ -480,10 +480,10 @@ void iterator_invalidation_test() { it3 = cb11.begin() + 3; it4 = cb11.begin() + 7; cb11.assign(15, 5, 2); - BOOST_CHECK(it1.is_valid(&cb11)); - BOOST_CHECK(!it2.is_valid(&cb11)); - BOOST_CHECK(!it3.is_valid(&cb11)); - BOOST_CHECK(!it4.is_valid(&cb11)); + BOOST_TEST(it1.is_valid(&cb11)); + BOOST_TEST(!it2.is_valid(&cb11)); + BOOST_TEST(!it3.is_valid(&cb11)); + BOOST_TEST(!it4.is_valid(&cb11)); circular_buffer cb12(10, 1); it1 = cb12.end(); @@ -491,10 +491,10 @@ void iterator_invalidation_test() { it3 = cb12.begin() + 3; it4 = cb12.begin() + 7; cb12.assign(cb11.begin(), cb11.end()); - BOOST_CHECK(it1.is_valid(&cb12)); - BOOST_CHECK(!it2.is_valid(&cb12)); - BOOST_CHECK(!it3.is_valid(&cb12)); - BOOST_CHECK(!it4.is_valid(&cb12)); + BOOST_TEST(it1.is_valid(&cb12)); + BOOST_TEST(!it2.is_valid(&cb12)); + BOOST_TEST(!it3.is_valid(&cb12)); + BOOST_TEST(!it4.is_valid(&cb12)); circular_buffer cb13(10, 1); it1 = cb13.end(); @@ -502,10 +502,10 @@ void iterator_invalidation_test() { it3 = cb13.begin() + 3; it4 = cb13.begin() + 7; cb13.assign(15, cb11.begin(), cb11.end()); - BOOST_CHECK(it1.is_valid(&cb13)); - BOOST_CHECK(!it2.is_valid(&cb13)); - BOOST_CHECK(!it3.is_valid(&cb13)); - BOOST_CHECK(!it4.is_valid(&cb13)); + BOOST_TEST(it1.is_valid(&cb13)); + BOOST_TEST(!it2.is_valid(&cb13)); + BOOST_TEST(!it3.is_valid(&cb13)); + BOOST_TEST(!it4.is_valid(&cb13)); circular_buffer cb14(10); cb14.push_back(1); @@ -520,10 +520,10 @@ void iterator_invalidation_test() { it3 = cb14.begin() + 1; it4 = cb14.begin() + 5; cb14.rotate(it2); - BOOST_CHECK(it1.is_valid(&cb14)); - BOOST_CHECK(it2.is_valid(&cb14)); - BOOST_CHECK(!it3.is_valid(&cb14)); - BOOST_CHECK(it4.is_valid(&cb14)); + BOOST_TEST(it1.is_valid(&cb14)); + BOOST_TEST(it2.is_valid(&cb14)); + BOOST_TEST(!it3.is_valid(&cb14)); + BOOST_TEST(it4.is_valid(&cb14)); circular_buffer cb15(7); cb15.push_back(1); @@ -540,10 +540,10 @@ void iterator_invalidation_test() { it3 = cb15.begin() + 1; it4 = cb15.begin() + 5; cb15.rotate(it3); - BOOST_CHECK(it1.is_valid(&cb15)); - BOOST_CHECK(it2.is_valid(&cb15)); - BOOST_CHECK(it3.is_valid(&cb15)); - BOOST_CHECK(it4.is_valid(&cb15)); + BOOST_TEST(it1.is_valid(&cb15)); + BOOST_TEST(it2.is_valid(&cb15)); + BOOST_TEST(it3.is_valid(&cb15)); + BOOST_TEST(it4.is_valid(&cb15)); circular_buffer cb16(10); cb16.push_back(1); @@ -558,10 +558,10 @@ void iterator_invalidation_test() { it3 = cb16.begin(); it4 = cb16.begin() + 5; cb16.rotate(it4); - BOOST_CHECK(it1.is_valid(&cb16)); - BOOST_CHECK(!it2.is_valid(&cb16)); - BOOST_CHECK(it3.is_valid(&cb16)); - BOOST_CHECK(!it4.is_valid(&cb16)); + BOOST_TEST(it1.is_valid(&cb16)); + BOOST_TEST(!it2.is_valid(&cb16)); + BOOST_TEST(it3.is_valid(&cb16)); + BOOST_TEST(!it4.is_valid(&cb16)); #endif // #if BOOST_CB_ENABLE_DEBUG } @@ -573,168 +573,168 @@ void exception_safety_test() { circular_buffer cb1(3, 5); MyInteger::set_exception_trigger(3); - BOOST_CHECK_THROW(cb1.set_capacity(5), std::exception); - BOOST_CHECK(cb1.capacity() == 3); + BOOST_TEST_THROWS(cb1.set_capacity(5), std::exception); + BOOST_TEST(cb1.capacity() == 3); MyInteger::set_exception_trigger(3); - BOOST_CHECK_THROW(cb1.rset_capacity(5), std::exception); - BOOST_CHECK(cb1.capacity() == 3); + BOOST_TEST_THROWS(cb1.rset_capacity(5), std::exception); + BOOST_TEST(cb1.capacity() == 3); generic_test(cb1); MyInteger::set_exception_trigger(3); - BOOST_CHECK_THROW(circular_buffer cb2(5, 10), std::exception); + BOOST_TEST_THROWS(circular_buffer cb2(5, 10), std::exception); circular_buffer cb3(5, 10); MyInteger::set_exception_trigger(3); - BOOST_CHECK_THROW(circular_buffer cb4(cb3), std::exception); + BOOST_TEST_THROWS(circular_buffer cb4(cb3), std::exception); vector v(5, MyInteger(10)); MyInteger::set_exception_trigger(3); - BOOST_CHECK_THROW(circular_buffer cb5(8, v.begin(), v.end()), std::exception); + BOOST_TEST_THROWS(circular_buffer cb5(8, v.begin(), v.end()), std::exception); circular_buffer cb6(5, 10); circular_buffer cb7(8, 3); MyInteger::set_exception_trigger(3); - BOOST_CHECK_THROW(cb7 = cb6, std::exception); - BOOST_CHECK(cb7.size() == 8); - BOOST_CHECK(cb7.capacity() == 8); - BOOST_CHECK(cb7[0] == 3); - BOOST_CHECK(cb7[7] == 3); + BOOST_TEST_THROWS(cb7 = cb6, std::exception); + BOOST_TEST(cb7.size() == 8); + BOOST_TEST(cb7.capacity() == 8); + BOOST_TEST(cb7[0] == 3); + BOOST_TEST(cb7[7] == 3); generic_test(cb7); circular_buffer cb8(5, 10); MyInteger::set_exception_trigger(2); - BOOST_CHECK_THROW(cb8.push_front(1), std::exception); + BOOST_TEST_THROWS(cb8.push_front(1), std::exception); circular_buffer cb9(5); cb9.push_back(1); cb9.push_back(2); cb9.push_back(3); MyInteger::set_exception_trigger(3); - BOOST_CHECK_THROW(cb9.insert(cb9.begin() + 1, 4), std::exception); + BOOST_TEST_THROWS(cb9.insert(cb9.begin() + 1, 4), std::exception); circular_buffer cb10(5); cb10.push_back(1); cb10.push_back(2); cb10.push_back(3); MyInteger::set_exception_trigger(3); - BOOST_CHECK_THROW(cb10.rinsert(cb10.begin() + 1, 4), std::exception); + BOOST_TEST_THROWS(cb10.rinsert(cb10.begin() + 1, 4), std::exception); circular_buffer cb11(5); cb11.push_back(1); cb11.push_back(2); MyInteger::set_exception_trigger(2); - BOOST_CHECK_THROW(cb11.rinsert(cb11.begin(), 1), std::exception); + BOOST_TEST_THROWS(cb11.rinsert(cb11.begin(), 1), std::exception); circular_buffer cb12(5, 1); MyInteger::set_exception_trigger(3); - BOOST_CHECK_THROW(cb12.assign(4, 2), std::exception); + BOOST_TEST_THROWS(cb12.assign(4, 2), std::exception); circular_buffer cb13(5, 1); MyInteger::set_exception_trigger(3); - BOOST_CHECK_THROW(cb13.assign(6, 2), std::exception); + BOOST_TEST_THROWS(cb13.assign(6, 2), std::exception); circular_buffer cb14(5); cb14.push_back(1); cb14.push_back(2); MyInteger::set_exception_trigger(3); - BOOST_CHECK_THROW(cb14.insert(cb14.begin(), 10, 3), std::exception); + BOOST_TEST_THROWS(cb14.insert(cb14.begin(), 10, 3), std::exception); circular_buffer cb15(5); cb15.push_back(1); cb15.push_back(2); MyInteger::set_exception_trigger(3); - BOOST_CHECK_THROW(cb15.insert(cb15.end(), 10, 3), std::exception); + BOOST_TEST_THROWS(cb15.insert(cb15.end(), 10, 3), std::exception); circular_buffer cb16(5); cb16.push_back(1); cb16.push_back(2); MyInteger::set_exception_trigger(3); - BOOST_CHECK_THROW(cb16.rinsert(cb16.begin(), 10, 3), std::exception); + BOOST_TEST_THROWS(cb16.rinsert(cb16.begin(), 10, 3), std::exception); circular_buffer cb17(5); cb17.push_back(1); cb17.push_back(2); MyInteger::set_exception_trigger(3); - BOOST_CHECK_THROW(cb17.rinsert(cb17.end(), 10, 3), std::exception); + BOOST_TEST_THROWS(cb17.rinsert(cb17.end(), 10, 3), std::exception); circular_buffer cb18(5, 0); cb18.push_back(1); cb18.push_back(2); cb18.pop_front(); MyInteger::set_exception_trigger(4); - BOOST_CHECK_THROW(cb18.linearize(), std::exception); + BOOST_TEST_THROWS(cb18.linearize(), std::exception); circular_buffer cb19(5, 0); cb19.push_back(1); cb19.push_back(2); MyInteger::set_exception_trigger(5); - BOOST_CHECK_THROW(cb19.linearize(), std::exception); + BOOST_TEST_THROWS(cb19.linearize(), std::exception); circular_buffer cb20(5, 0); cb20.push_back(1); cb20.push_back(2); MyInteger::set_exception_trigger(6); - BOOST_CHECK_THROW(cb20.linearize(), std::exception); + BOOST_TEST_THROWS(cb20.linearize(), std::exception); circular_buffer cb21(5); cb21.push_back(1); cb21.push_back(2); cb21.push_back(3); MyInteger::set_exception_trigger(2); - BOOST_CHECK_THROW(cb21.insert(cb21.begin() + 1, 4), std::exception); + BOOST_TEST_THROWS(cb21.insert(cb21.begin() + 1, 4), std::exception); circular_buffer cb22(5); cb22.push_back(1); cb22.push_back(2); cb22.push_back(3); MyInteger::set_exception_trigger(2); - BOOST_CHECK_THROW(cb22.insert(cb22.end(), 4), std::exception); + BOOST_TEST_THROWS(cb22.insert(cb22.end(), 4), std::exception); circular_buffer cb23(5, 0); MyInteger::set_exception_trigger(2); - BOOST_CHECK_THROW(cb23.insert(cb23.begin() + 1, 4), std::exception); + BOOST_TEST_THROWS(cb23.insert(cb23.begin() + 1, 4), std::exception); circular_buffer cb24(5); cb24.push_back(1); cb24.push_back(2); cb24.push_back(3); MyInteger::set_exception_trigger(2); - BOOST_CHECK_THROW(cb24.rinsert(cb24.begin() + 1, 4), std::exception); + BOOST_TEST_THROWS(cb24.rinsert(cb24.begin() + 1, 4), std::exception); circular_buffer cb25(5, 0); MyInteger::set_exception_trigger(2); - BOOST_CHECK_THROW(cb25.rinsert(cb25.begin() + 3, 4), std::exception); + BOOST_TEST_THROWS(cb25.rinsert(cb25.begin() + 3, 4), std::exception); circular_buffer cb26(5); cb26.push_back(1); cb26.push_back(2); MyInteger::set_exception_trigger(5); - BOOST_CHECK_THROW(cb26.insert(cb26.begin(), 10, 3), std::exception); + BOOST_TEST_THROWS(cb26.insert(cb26.begin(), 10, 3), std::exception); circular_buffer cb27(5); cb27.push_back(1); cb27.push_back(2); MyInteger::set_exception_trigger(5); - BOOST_CHECK_THROW(cb27.insert(cb27.end(), 10, 3), std::exception); + BOOST_TEST_THROWS(cb27.insert(cb27.end(), 10, 3), std::exception); circular_buffer cb28(5); cb28.push_back(1); cb28.push_back(2); MyInteger::set_exception_trigger(5); - BOOST_CHECK_THROW(cb28.rinsert(cb28.begin(), 10, 3), std::exception); + BOOST_TEST_THROWS(cb28.rinsert(cb28.begin(), 10, 3), std::exception); circular_buffer cb29(5); cb29.push_back(1); cb29.push_back(2); MyInteger::set_exception_trigger(5); - BOOST_CHECK_THROW(cb29.rinsert(cb29.end(), 10, 3), std::exception); + BOOST_TEST_THROWS(cb29.rinsert(cb29.end(), 10, 3), std::exception); circular_buffer cb30(10); cb30.push_back(1); cb30.push_back(2); cb30.push_back(3); MyInteger::set_exception_trigger(2); - BOOST_CHECK_THROW(cb30.rinsert(cb30.begin(), 10, 3), std::exception); + BOOST_TEST_THROWS(cb30.rinsert(cb30.begin(), 10, 3), std::exception); #endif // #if !defined(BOOST_NO_EXCEPTIONS) } @@ -752,84 +752,84 @@ void move_container_values_resetting_impl() { cb1.push_back(); cb1.push_back(boost::move(var)); - BOOST_CHECK(!cb1.back().is_moved()); - BOOST_CHECK(var.is_moved()); - BOOST_CHECK(cb1.size() == 1); + BOOST_TEST(!cb1.back().is_moved()); + BOOST_TEST(var.is_moved()); + BOOST_TEST(cb1.size() == 1); var = boost::move(cb1.back()); - BOOST_CHECK(cb1.back().is_moved()); + BOOST_TEST(cb1.back().is_moved()); cb1.push_front(boost::move(var)); - BOOST_CHECK(!cb1.front().is_moved()); - BOOST_CHECK(var.is_moved()); - BOOST_CHECK(cb1.size() == 1); + BOOST_TEST(!cb1.front().is_moved()); + BOOST_TEST(var.is_moved()); + BOOST_TEST(cb1.size() == 1); var = boost::move(cb1.back()); - BOOST_CHECK(cb1.back().is_moved()); + BOOST_TEST(cb1.back().is_moved()); cb1.push_back(); - BOOST_CHECK(!cb1.back().is_moved()); - BOOST_CHECK(cb1.size() == 1); + BOOST_TEST(!cb1.back().is_moved()); + BOOST_TEST(cb1.size() == 1); var = boost::move(cb1.back()); - BOOST_CHECK(cb1.back().is_moved()); + BOOST_TEST(cb1.back().is_moved()); cb1.push_front(); - BOOST_CHECK(!cb1.front().is_moved()); - BOOST_CHECK(cb1.size() == 1); + BOOST_TEST(!cb1.front().is_moved()); + BOOST_TEST(cb1.size() == 1); var = boost::move(cb1.back()); - BOOST_CHECK(cb1.back().is_moved()); + BOOST_TEST(cb1.back().is_moved()); cb1.insert(cb1.begin()); // If the circular_buffer is full and the pos points to begin(), // then the item will not be inserted. - BOOST_CHECK(cb1.front().is_moved()); - BOOST_CHECK(cb1.size() == 1); + BOOST_TEST(cb1.front().is_moved()); + BOOST_TEST(cb1.size() == 1); var = boost::move(cb1.back()); - BOOST_CHECK(cb1.back().is_moved()); + BOOST_TEST(cb1.back().is_moved()); cb1.insert(cb1.begin(), boost::move(var)); // If the circular_buffer is full and the pos points to begin(), // then the item will not be inserted. - BOOST_CHECK(cb1.front().is_moved()); - BOOST_CHECK(cb1.size() == 1); + BOOST_TEST(cb1.front().is_moved()); + BOOST_TEST(cb1.size() == 1); var = boost::move(cb1.back()); - BOOST_CHECK(cb1.back().is_moved()); + BOOST_TEST(cb1.back().is_moved()); cb1.rinsert(cb1.begin()); - BOOST_CHECK(!cb1.back().is_moved()); - BOOST_CHECK(cb1.size() == 1); + BOOST_TEST(!cb1.back().is_moved()); + BOOST_TEST(cb1.size() == 1); var = boost::move(cb1.back()); - BOOST_CHECK(cb1.back().is_moved()); + BOOST_TEST(cb1.back().is_moved()); var.reinit(); cb1.rinsert(cb1.begin(), boost::move(var)); - BOOST_CHECK(!cb1.back().is_moved()); - BOOST_CHECK(cb1.size() == 1); + BOOST_TEST(!cb1.back().is_moved()); + BOOST_TEST(cb1.size() == 1); var = boost::move(cb1.back()); - BOOST_CHECK(cb1.back().is_moved()); + BOOST_TEST(cb1.back().is_moved()); cb1.rinsert(cb1.end()); - BOOST_CHECK(cb1.back().is_moved()); - BOOST_CHECK(cb1.size() == 1); + BOOST_TEST(cb1.back().is_moved()); + BOOST_TEST(cb1.size() == 1); var = boost::move(cb1.back()); - BOOST_CHECK(cb1.back().is_moved()); + BOOST_TEST(cb1.back().is_moved()); var.reinit(); cb1.rinsert(cb1.end(), boost::move(var)); - BOOST_CHECK(cb1.back().is_moved()); - BOOST_CHECK(cb1.size() == 1); + BOOST_TEST(cb1.back().is_moved()); + BOOST_TEST(cb1.size() == 1); var = boost::move(cb1.back()); - BOOST_CHECK(cb1.back().is_moved()); + BOOST_TEST(cb1.back().is_moved()); cb1.push_back(); - BOOST_CHECK(!cb1[0].is_moved()); + BOOST_TEST(!cb1[0].is_moved()); const int val = cb1[0].value(); cb1.linearize(); - BOOST_CHECK(!cb1[0].is_moved()); - BOOST_CHECK(cb1[0].value() == val); + BOOST_TEST(!cb1[0].is_moved()); + BOOST_TEST(cb1[0].value() == val); cb1.rotate(cb1.begin()); - BOOST_CHECK(!cb1[0].is_moved()); - BOOST_CHECK(cb1[0].value() == val); + BOOST_TEST(!cb1[0].is_moved()); + BOOST_TEST(cb1[0].value() == val); } void move_container_values_resetting_except() { @@ -841,25 +841,22 @@ void move_container_values_resetting_noexcept() { } // test main -test_suite* init_unit_test_suite(int /*argc*/, char* /*argv*/[]) { - - test_suite* tests = BOOST_TEST_SUITE("Unit tests for the circular_buffer."); - add_common_tests(tests); - - tests->add(BOOST_TEST_CASE(&iterator_constructor_and_assign_test)); - tests->add(BOOST_TEST_CASE(&iterator_reference_test)); - tests->add(BOOST_TEST_CASE(&iterator_difference_test)); - tests->add(BOOST_TEST_CASE(&iterator_increment_test)); - tests->add(BOOST_TEST_CASE(&iterator_decrement_test)); - tests->add(BOOST_TEST_CASE(&iterator_addition_test)); - tests->add(BOOST_TEST_CASE(&iterator_subtraction_test)); - tests->add(BOOST_TEST_CASE(&iterator_element_access_test)); - tests->add(BOOST_TEST_CASE(&iterator_comparison_test)); - tests->add(BOOST_TEST_CASE(&iterator_invalidation_test)); - tests->add(BOOST_TEST_CASE(&exception_safety_test)); - tests->add(BOOST_TEST_CASE(&move_container_values_except)); - tests->add(BOOST_TEST_CASE(&move_container_values_resetting_except)); - tests->add(BOOST_TEST_CASE(&move_container_values_resetting_noexcept)); - - return tests; +int main() +{ + run_common_tests(); + iterator_constructor_and_assign_test(); + iterator_reference_test(); + iterator_difference_test(); + iterator_increment_test(); + iterator_decrement_test(); + iterator_addition_test(); + iterator_subtraction_test(); + iterator_element_access_test(); + iterator_comparison_test(); + iterator_invalidation_test(); + exception_safety_test(); + move_container_values_except(); + move_container_values_resetting_except(); + move_container_values_resetting_noexcept(); + return boost::report_errors(); } diff --git a/test/bounded_buffer_comparison.cpp b/test/bounded_buffer_comparison.cpp index b31c8f8..c2bec05 100644 --- a/test/bounded_buffer_comparison.cpp +++ b/test/bounded_buffer_comparison.cpp @@ -11,8 +11,8 @@ #include #include #include +#include #include -#include #include #include #include @@ -229,7 +229,7 @@ template void fifo_test(Buffer* buffer) { // Start of measurement - boost::progress_timer progress; + boost::timer::auto_cpu_timer progress; // Initialize the buffer with some values before launching producer and consumer threads. for (unsigned long i = QUEUE_SIZE / 2L; i > 0; --i) { diff --git a/test/common.ipp b/test/common.ipp index 8db3386..1822cc8 100644 --- a/test/common.ipp +++ b/test/common.ipp @@ -36,63 +36,63 @@ void generic_test(CB_CONTAINER& cb) { cb.push_front(4); cb.linearize(); - BOOST_CHECK(cb.empty()); - BOOST_CHECK(cb.full()); + BOOST_TEST(cb.empty()); + BOOST_TEST(cb.full()); } else { cb.insert(cb.end(), 1); - BOOST_CHECK(!cb.empty()); - BOOST_CHECK(cb[cb.size() - 1] == 1); + BOOST_TEST(!cb.empty()); + BOOST_TEST(cb[cb.size() - 1] == 1); size_t size = cb.size(); cb.rerase(cb.end() - 1, cb.end()); - BOOST_CHECK(size == cb.size() + 1); + BOOST_TEST(size == cb.size() + 1); cb.insert(cb.end(), v.begin(), v.end()); - BOOST_CHECK(!cb.empty()); - BOOST_CHECK(cb[cb.size() - 1] == 17); + BOOST_TEST(!cb.empty()); + BOOST_TEST(cb[cb.size() - 1] == 17); size = cb.size(); cb.erase(cb.end() - 1, cb.end()); - BOOST_CHECK(size == cb.size() + 1); + BOOST_TEST(size == cb.size() + 1); size = cb.size(); cb.rinsert(cb.begin(), 2); - BOOST_CHECK(size + 1 == cb.size()); - BOOST_CHECK(cb[0] == 2); + BOOST_TEST(size + 1 == cb.size()); + BOOST_TEST(cb[0] == 2); size = cb.size(); cb.erase(cb.begin()); - BOOST_CHECK(size == cb.size() + 1); + BOOST_TEST(size == cb.size() + 1); cb.rinsert(cb.begin(), v.begin(), v.end()); - BOOST_CHECK(!cb.empty()); - BOOST_CHECK(cb[0] == 11); + BOOST_TEST(!cb.empty()); + BOOST_TEST(cb[0] == 11); size = cb.size(); cb.pop_front(); - BOOST_CHECK(size == cb.size() + 1); + BOOST_TEST(size == cb.size() + 1); cb.push_back(3); - BOOST_CHECK(!cb.empty()); - BOOST_CHECK(cb[cb.size() - 1] == 3); + BOOST_TEST(!cb.empty()); + BOOST_TEST(cb[cb.size() - 1] == 3); size = cb.size(); cb.pop_back(); - BOOST_CHECK(size == cb.size() + 1); + BOOST_TEST(size == cb.size() + 1); cb.push_front(4); - BOOST_CHECK(!cb.empty()); - BOOST_CHECK(cb[0] == 4); + BOOST_TEST(!cb.empty()); + BOOST_TEST(cb[0] == 4); cb.linearize(); - BOOST_CHECK(!cb.empty()); - BOOST_CHECK(cb[0] == 4); + BOOST_TEST(!cb.empty()); + BOOST_TEST(cb[0] == 4); size = cb.size(); cb.rerase(cb.begin()); - BOOST_CHECK(size == cb.size() + 1); + BOOST_TEST(size == cb.size() + 1); } } @@ -110,16 +110,16 @@ void basic_test() { CB_CONTAINER cb2(10, v.begin(), v.end()); CB_CONTAINER cb3(7, v.begin(), v.end()); - BOOST_CHECK(cb1.full()); - BOOST_CHECK(cb1.capacity() == 3); - BOOST_CHECK(cb1.size() == 3); - BOOST_CHECK(cb1[0] == 5); - BOOST_CHECK(cb1[2] == 7); - BOOST_CHECK(!cb2.full()); - BOOST_CHECK(cb2[2] == 3); - BOOST_CHECK(cb3.full()); - BOOST_CHECK(cb3[0] == 1); - BOOST_CHECK(cb3[6] == 7); + BOOST_TEST(cb1.full()); + BOOST_TEST(cb1.capacity() == 3); + BOOST_TEST(cb1.size() == 3); + BOOST_TEST(cb1[0] == 5); + BOOST_TEST(cb1[2] == 7); + BOOST_TEST(!cb2.full()); + BOOST_TEST(cb2[2] == 3); + BOOST_TEST(cb3.full()); + BOOST_TEST(cb3[0] == 1); + BOOST_TEST(cb3[6] == 7); generic_test(cb1); generic_test(cb2); @@ -131,9 +131,9 @@ void constructor_and_element_access_test() { CB_CONTAINER cb(5, 3); cb[1] = 10; - BOOST_CHECK(cb.full()); - BOOST_CHECK(cb[1] == 10); - BOOST_CHECK(cb[4] == 3); + BOOST_TEST(cb.full()); + BOOST_TEST(cb[1] == 10); + BOOST_TEST(cb[4] == 3); } void size_test() { @@ -145,9 +145,9 @@ void size_test() { cb1.push_back(4); CB_CONTAINER cb2(5); - BOOST_CHECK(cb1.size() == 3); - BOOST_CHECK(cb2.size() == 0); - BOOST_CHECK(cb1.max_size() == cb2.max_size()); + BOOST_TEST(cb1.size() == 3); + BOOST_TEST(cb2.size() == 0); + BOOST_TEST(cb1.max_size() == cb2.max_size()); generic_test(cb1); generic_test(cb2); @@ -304,11 +304,11 @@ void begin_and_end_test() { CB_CONTAINER cb4(20); const CB_CONTAINER cb5(20); - BOOST_CHECK(*cb1.begin() == 11); - BOOST_CHECK(*cb2.begin() == 11); - BOOST_CHECK(i == 6); - BOOST_CHECK(cb4.begin() == cb4.end()); - BOOST_CHECK(cb5.begin() == cb5.end()); + BOOST_TEST(*cb1.begin() == 11); + BOOST_TEST(*cb2.begin() == 11); + BOOST_TEST(i == 6); + BOOST_TEST(cb4.begin() == cb4.end()); + BOOST_TEST(cb5.begin() == cb5.end()); generic_test(cb1); generic_test(cb3); @@ -338,11 +338,11 @@ void rbegin_and_rend_test() { CB_CONTAINER cb4(20); const CB_CONTAINER cb5(20); - BOOST_CHECK(*cb1.rbegin() == 13); - BOOST_CHECK(*cb2.rbegin() == 13); - BOOST_CHECK(i == 4); - BOOST_CHECK(cb4.rbegin() == cb4.rend()); - BOOST_CHECK(cb5.rbegin() == cb5.rend()); + BOOST_TEST(*cb1.rbegin() == 13); + BOOST_TEST(*cb2.rbegin() == 13); + BOOST_TEST(i == 4); + BOOST_TEST(cb4.rbegin() == cb4.rend()); + BOOST_TEST(cb5.rbegin() == cb5.rend()); generic_test(cb1); generic_test(cb3); @@ -358,10 +358,10 @@ void element_access_and_insert_test() { cb.push_back(4); const CB_CONTAINER ccb = cb; - BOOST_CHECK(cb[0] == 1); - BOOST_CHECK(cb[1] == 2); - BOOST_CHECK(cb[2] == 4); - BOOST_CHECK(ccb[2] == 4); + BOOST_TEST(cb[0] == 1); + BOOST_TEST(cb[1] == 2); + BOOST_TEST(cb[2] == 4); + BOOST_TEST(ccb[2] == 4); generic_test(cb); } @@ -374,13 +374,13 @@ void at_test() { cb.push_back(1); try { - BOOST_CHECK(cb.at(0) == 1); + BOOST_TEST(cb.at(0) == 1); } catch (out_of_range&) { BOOST_ERROR("An unexpected exception has been thrown!"); } - BOOST_CHECK_THROW(cb.at(2), out_of_range); + BOOST_TEST_THROWS(cb.at(2), out_of_range); generic_test(cb); @@ -393,8 +393,8 @@ void front_and_back_test() { cb.push_back(2); cb.push_back(3); - BOOST_CHECK(cb.front() == cb.back()); - BOOST_CHECK(cb.back() == 3); + BOOST_TEST(cb.front() == cb.back()); + BOOST_TEST(cb.back() == 3); generic_test(cb); } @@ -461,11 +461,11 @@ void linearize_test() { cb7.push_back(3); cb7.push_back(4); - BOOST_CHECK(!cb1.is_linearized()); - BOOST_CHECK(*cb1.linearize() == 4); - BOOST_CHECK(cb1.is_linearized()); - BOOST_CHECK(cb1.linearize() == cb1.array_one().first); - BOOST_CHECK(&cb1[0] < &cb1[1] + BOOST_TEST(!cb1.is_linearized()); + BOOST_TEST(*cb1.linearize() == 4); + BOOST_TEST(cb1.is_linearized()); + BOOST_TEST(cb1.linearize() == cb1.array_one().first); + BOOST_TEST(&cb1[0] < &cb1[1] && &cb1[1] < &cb1[2] && &cb1[2] < &cb1[3] && &cb1[3] < &cb1[4] @@ -474,19 +474,19 @@ void linearize_test() { && &cb1[6] < &cb1[7] && &cb1[7] < &cb1[8] && &cb1[8] < &cb1[9]); - BOOST_CHECK(*(cb1.linearize() + 1) == 5); - BOOST_CHECK(*(cb1.linearize() + 2) == 6); - BOOST_CHECK(*(cb1.linearize() + 3) == 7); - BOOST_CHECK(*(cb1.linearize() + 4) == 8); - BOOST_CHECK(*(cb1.linearize() + 5) == 9); - BOOST_CHECK(*(cb1.linearize() + 6) == 10); - BOOST_CHECK(*(cb1.linearize() + 7) == 11); - BOOST_CHECK(*(cb1.linearize() + 8) == 12); - BOOST_CHECK(*(cb1.linearize() + 9) == 13); - BOOST_CHECK(!cb2.is_linearized()); - BOOST_CHECK(*cb2.linearize() == 8); - BOOST_CHECK(cb2.is_linearized()); - BOOST_CHECK(&cb2[0] < &cb2[1] + BOOST_TEST(*(cb1.linearize() + 1) == 5); + BOOST_TEST(*(cb1.linearize() + 2) == 6); + BOOST_TEST(*(cb1.linearize() + 3) == 7); + BOOST_TEST(*(cb1.linearize() + 4) == 8); + BOOST_TEST(*(cb1.linearize() + 5) == 9); + BOOST_TEST(*(cb1.linearize() + 6) == 10); + BOOST_TEST(*(cb1.linearize() + 7) == 11); + BOOST_TEST(*(cb1.linearize() + 8) == 12); + BOOST_TEST(*(cb1.linearize() + 9) == 13); + BOOST_TEST(!cb2.is_linearized()); + BOOST_TEST(*cb2.linearize() == 8); + BOOST_TEST(cb2.is_linearized()); + BOOST_TEST(&cb2[0] < &cb2[1] && &cb2[1] < &cb2[2] && &cb2[2] < &cb2[3] && &cb2[3] < &cb2[4] @@ -495,57 +495,57 @@ void linearize_test() { && &cb2[6] < &cb2[7] && &cb2[7] < &cb2[8] && &cb2[8] < &cb2[9]); - BOOST_CHECK(*(cb2.linearize() + 1) == 9); - BOOST_CHECK(*(cb2.linearize() + 2) == 10); - BOOST_CHECK(*(cb2.linearize() + 3) == 11); - BOOST_CHECK(*(cb2.linearize() + 4) == 12); - BOOST_CHECK(*(cb2.linearize() + 5) == 13); - BOOST_CHECK(*(cb2.linearize() + 6) == 14); - BOOST_CHECK(*(cb2.linearize() + 7) == 15); - BOOST_CHECK(*(cb2.linearize() + 8) == 16); - BOOST_CHECK(*(cb2.linearize() + 9) == 17); - BOOST_CHECK(cb2.is_linearized()); - BOOST_CHECK(*cb3.linearize() == 6); - BOOST_CHECK(cb3.is_linearized()); - BOOST_CHECK(&cb3[0] < &cb3[1] + BOOST_TEST(*(cb2.linearize() + 1) == 9); + BOOST_TEST(*(cb2.linearize() + 2) == 10); + BOOST_TEST(*(cb2.linearize() + 3) == 11); + BOOST_TEST(*(cb2.linearize() + 4) == 12); + BOOST_TEST(*(cb2.linearize() + 5) == 13); + BOOST_TEST(*(cb2.linearize() + 6) == 14); + BOOST_TEST(*(cb2.linearize() + 7) == 15); + BOOST_TEST(*(cb2.linearize() + 8) == 16); + BOOST_TEST(*(cb2.linearize() + 9) == 17); + BOOST_TEST(cb2.is_linearized()); + BOOST_TEST(*cb3.linearize() == 6); + BOOST_TEST(cb3.is_linearized()); + BOOST_TEST(&cb3[0] < &cb3[1] && &cb3[1] < &cb3[2] && &cb3[2] < &cb3[3] && &cb3[3] < &cb3[4] && &cb3[4] < &cb3[5] && &cb3[5] < &cb3[6] && &cb3[6] < &cb3[7]); - BOOST_CHECK(*(cb3.linearize() + 1) == 7); - BOOST_CHECK(*(cb3.linearize() + 2) == 8); - BOOST_CHECK(*(cb3.linearize() + 3) == 9); - BOOST_CHECK(*(cb3.linearize() + 4) == 10); - BOOST_CHECK(*(cb3.linearize() + 5) == 11); - BOOST_CHECK(*(cb3.linearize() + 6) == 12); - BOOST_CHECK(*(cb3.linearize() + 7) == 13); - BOOST_CHECK(cb4.linearize() == 0); - BOOST_CHECK(cb4.is_linearized()); - BOOST_CHECK(*cb5.linearize() == 10); - BOOST_CHECK(cb5.is_linearized()); - BOOST_CHECK(&cb5[0] < &cb5[1] + BOOST_TEST(*(cb3.linearize() + 1) == 7); + BOOST_TEST(*(cb3.linearize() + 2) == 8); + BOOST_TEST(*(cb3.linearize() + 3) == 9); + BOOST_TEST(*(cb3.linearize() + 4) == 10); + BOOST_TEST(*(cb3.linearize() + 5) == 11); + BOOST_TEST(*(cb3.linearize() + 6) == 12); + BOOST_TEST(*(cb3.linearize() + 7) == 13); + BOOST_TEST(cb4.linearize() == 0); + BOOST_TEST(cb4.is_linearized()); + BOOST_TEST(*cb5.linearize() == 10); + BOOST_TEST(cb5.is_linearized()); + BOOST_TEST(&cb5[0] < &cb5[1] && &cb5[1] < &cb5[2] && &cb5[2] < &cb5[3] && &cb5[3] < &cb5[4] && &cb5[4] < &cb5[5]); - BOOST_CHECK(*(cb5.linearize() + 1) == 11); - BOOST_CHECK(*(cb5.linearize() + 2) == 12); - BOOST_CHECK(*(cb5.linearize() + 3) == 13); - BOOST_CHECK(*(cb5.linearize() + 4) == 14); - BOOST_CHECK(*(cb5.linearize() + 5) == 15); - BOOST_CHECK(*cb6.linearize() == 1); - BOOST_CHECK(cb6.is_linearized()); - BOOST_CHECK(&cb6[0] < &cb6[1] + BOOST_TEST(*(cb5.linearize() + 1) == 11); + BOOST_TEST(*(cb5.linearize() + 2) == 12); + BOOST_TEST(*(cb5.linearize() + 3) == 13); + BOOST_TEST(*(cb5.linearize() + 4) == 14); + BOOST_TEST(*(cb5.linearize() + 5) == 15); + BOOST_TEST(*cb6.linearize() == 1); + BOOST_TEST(cb6.is_linearized()); + BOOST_TEST(&cb6[0] < &cb6[1] && &cb6[1] < &cb6[2] && &cb6[2] < &cb6[3] && &cb6[3] < &cb6[4]); - BOOST_CHECK(*(cb6.linearize() + 1) == 2); - BOOST_CHECK(*(cb6.linearize() + 2) == 3); - BOOST_CHECK(*(cb6.linearize() + 3) == 4); - BOOST_CHECK(*(cb6.linearize() + 4) == 5); - BOOST_CHECK(cb7.is_linearized()); + BOOST_TEST(*(cb6.linearize() + 1) == 2); + BOOST_TEST(*(cb6.linearize() + 2) == 3); + BOOST_TEST(*(cb6.linearize() + 3) == 4); + BOOST_TEST(*(cb6.linearize() + 4) == 5); + BOOST_TEST(cb7.is_linearized()); generic_test(cb1); generic_test(cb2); @@ -564,10 +564,10 @@ void array_range_test() { CB_CONTAINER::const_array_range ca1 = cb.array_one(); CB_CONTAINER::const_array_range ca2 = cb.array_two(); - BOOST_CHECK(a1.second == 0); - BOOST_CHECK(a2.second == 0); - BOOST_CHECK(ca1.second == 0); - BOOST_CHECK(ca2.second == 0); + BOOST_TEST(a1.second == 0); + BOOST_TEST(a2.second == 0); + BOOST_TEST(ca1.second == 0); + BOOST_TEST(ca2.second == 0); cb.push_back(1); cb.push_back(2); @@ -577,14 +577,14 @@ void array_range_test() { ca1 = cb.array_one(); ca2 = cb.array_two(); - BOOST_CHECK(a1.first[0] == 1); - BOOST_CHECK(a1.first[2] == 3); - BOOST_CHECK(ca1.first[0] == 1); - BOOST_CHECK(ca1.first[2] == 3); - BOOST_CHECK(a1.second == 3); - BOOST_CHECK(a2.second == 0); - BOOST_CHECK(ca1.second == 3); - BOOST_CHECK(ca2.second == 0); + BOOST_TEST(a1.first[0] == 1); + BOOST_TEST(a1.first[2] == 3); + BOOST_TEST(ca1.first[0] == 1); + BOOST_TEST(ca1.first[2] == 3); + BOOST_TEST(a1.second == 3); + BOOST_TEST(a2.second == 0); + BOOST_TEST(ca1.second == 3); + BOOST_TEST(ca2.second == 0); cb.push_back(4); cb.push_back(5); @@ -598,18 +598,18 @@ void array_range_test() { ca1 = cb.array_one(); ca2 = cb.array_two(); - BOOST_CHECK(a1.first[0] == 4); - BOOST_CHECK(a1.first[3] == 7); - BOOST_CHECK(a2.first[0] == 8); - BOOST_CHECK(a2.first[2] == 10); - BOOST_CHECK(ca1.first[0] == 4); - BOOST_CHECK(ca1.first[3] == 7); - BOOST_CHECK(ca2.first[0] == 8); - BOOST_CHECK(ca2.first[2] == 10); - BOOST_CHECK(a1.second == 4); - BOOST_CHECK(a2.second == 3); - BOOST_CHECK(ca1.second == 4); - BOOST_CHECK(ca2.second == 3); + BOOST_TEST(a1.first[0] == 4); + BOOST_TEST(a1.first[3] == 7); + BOOST_TEST(a2.first[0] == 8); + BOOST_TEST(a2.first[2] == 10); + BOOST_TEST(ca1.first[0] == 4); + BOOST_TEST(ca1.first[3] == 7); + BOOST_TEST(ca2.first[0] == 8); + BOOST_TEST(ca2.first[2] == 10); + BOOST_TEST(a1.second == 4); + BOOST_TEST(a2.second == 3); + BOOST_TEST(ca1.second == 4); + BOOST_TEST(ca2.second == 3); cb.pop_front(); cb.pop_back(); @@ -618,18 +618,18 @@ void array_range_test() { ca1 = cb.array_one(); ca2 = cb.array_two(); - BOOST_CHECK(a1.first[0] == 5); - BOOST_CHECK(a1.first[2] == 7); - BOOST_CHECK(a2.first[0] == 8); - BOOST_CHECK(a2.first[1] == 9); - BOOST_CHECK(ca1.first[0] == 5); - BOOST_CHECK(ca1.first[2] == 7); - BOOST_CHECK(ca2.first[0] == 8); - BOOST_CHECK(ca2.first[1] == 9); - BOOST_CHECK(a1.second == 3); - BOOST_CHECK(a2.second == 2); - BOOST_CHECK(ca1.second == 3); - BOOST_CHECK(ca2.second == 2); + BOOST_TEST(a1.first[0] == 5); + BOOST_TEST(a1.first[2] == 7); + BOOST_TEST(a2.first[0] == 8); + BOOST_TEST(a2.first[1] == 9); + BOOST_TEST(ca1.first[0] == 5); + BOOST_TEST(ca1.first[2] == 7); + BOOST_TEST(ca2.first[0] == 8); + BOOST_TEST(ca2.first[1] == 9); + BOOST_TEST(a1.second == 3); + BOOST_TEST(a2.second == 2); + BOOST_TEST(ca1.second == 3); + BOOST_TEST(ca2.second == 2); cb.pop_back(); cb.pop_back(); @@ -639,29 +639,29 @@ void array_range_test() { ca1 = cb.array_one(); ca2 = cb.array_two(); - BOOST_CHECK(a1.first[0] == 5); - BOOST_CHECK(a1.first[1] == 6); - BOOST_CHECK(ca1.first[0] == 5); - BOOST_CHECK(ca1.first[1] == 6); - BOOST_CHECK(a1.second == 2); - BOOST_CHECK(a2.second == 0); - BOOST_CHECK(ca1.second == 2); - BOOST_CHECK(ca2.second == 0); + BOOST_TEST(a1.first[0] == 5); + BOOST_TEST(a1.first[1] == 6); + BOOST_TEST(ca1.first[0] == 5); + BOOST_TEST(ca1.first[1] == 6); + BOOST_TEST(a1.second == 2); + BOOST_TEST(a2.second == 0); + BOOST_TEST(ca1.second == 2); + BOOST_TEST(ca2.second == 0); CB_CONTAINER cb0(0); a1 = cb0.array_one(); a2 = cb0.array_two(); - BOOST_CHECK(a1.second == 0); - BOOST_CHECK(a2.second == 0); + BOOST_TEST(a1.second == 0); + BOOST_TEST(a2.second == 0); const CB_CONTAINER ccb(10, 1); ca1 = ccb.array_one(); ca2 = ccb.array_two(); - BOOST_CHECK(ca1.second == 10); - BOOST_CHECK(*(ca1.first) == 1); - BOOST_CHECK(ca2.second == 0); + BOOST_TEST(ca1.second == 10); + BOOST_TEST(*(ca1.first) == 1); + BOOST_TEST(ca2.second == 0); generic_test(cb); generic_test(cb0); @@ -672,32 +672,32 @@ void capacity_and_reserve_test() { CB_CONTAINER cb1(0); CB_CONTAINER cb2(10); - BOOST_CHECK(cb1.capacity() == 0); - BOOST_CHECK(cb1.size() == 0); - BOOST_CHECK(cb1.reserve() == 0); - BOOST_CHECK(cb1.full()); - BOOST_CHECK(cb1.empty()); - BOOST_CHECK(cb1.reserve() == cb1.capacity() - cb1.size()); - BOOST_CHECK(cb2.capacity() == 10); - BOOST_CHECK(cb2.size() == 0); - BOOST_CHECK(cb2.reserve() == 10); - BOOST_CHECK(cb2.reserve() == cb2.capacity() - cb2.size()); + BOOST_TEST(cb1.capacity() == 0); + BOOST_TEST(cb1.size() == 0); + BOOST_TEST(cb1.reserve() == 0); + BOOST_TEST(cb1.full()); + BOOST_TEST(cb1.empty()); + BOOST_TEST(cb1.reserve() == cb1.capacity() - cb1.size()); + BOOST_TEST(cb2.capacity() == 10); + BOOST_TEST(cb2.size() == 0); + BOOST_TEST(cb2.reserve() == 10); + BOOST_TEST(cb2.reserve() == cb2.capacity() - cb2.size()); cb1.push_back(1); cb2.push_back(2); cb2.push_back(2); cb2.push_back(2); - BOOST_CHECK(cb1.capacity() == 0); - BOOST_CHECK(cb1.size() == 0); - BOOST_CHECK(cb1.reserve() == 0); - BOOST_CHECK(cb1.full()); - BOOST_CHECK(cb1.empty()); - BOOST_CHECK(cb1.reserve() == cb1.capacity() - cb1.size()); - BOOST_CHECK(cb2.capacity() == 10); - BOOST_CHECK(cb2.size() == 3); - BOOST_CHECK(cb2.reserve() == 7); - BOOST_CHECK(cb2.reserve() == cb2.capacity() - cb2.size()); + BOOST_TEST(cb1.capacity() == 0); + BOOST_TEST(cb1.size() == 0); + BOOST_TEST(cb1.reserve() == 0); + BOOST_TEST(cb1.full()); + BOOST_TEST(cb1.empty()); + BOOST_TEST(cb1.reserve() == cb1.capacity() - cb1.size()); + BOOST_TEST(cb2.capacity() == 10); + BOOST_TEST(cb2.size() == 3); + BOOST_TEST(cb2.reserve() == 7); + BOOST_TEST(cb2.reserve() == cb2.capacity() - cb2.size()); generic_test(cb1); generic_test(cb2); @@ -718,11 +718,11 @@ void full_and_empty_test() { cb3.push_back(1); cb4.push_back(1); - BOOST_CHECK(cb1.empty()); - BOOST_CHECK(cb2.full()); - BOOST_CHECK(cb3.full()); - BOOST_CHECK(!cb4.empty()); - BOOST_CHECK(!cb4.full()); + BOOST_TEST(cb1.empty()); + BOOST_TEST(cb2.full()); + BOOST_TEST(cb3.full()); + BOOST_TEST(!cb4.empty()); + BOOST_TEST(!cb4.full()); generic_test(cb1); generic_test(cb2); @@ -748,30 +748,30 @@ void set_capacity_test() { cb3.push_back(1); cb3.set_capacity(2); - BOOST_CHECK(cb1.size() == 3); - BOOST_CHECK(cb1[0] == 2); - BOOST_CHECK(cb1[2] == 1); - BOOST_CHECK(cb1.capacity() == 5); - BOOST_CHECK(cb2.size() == 3); - BOOST_CHECK(cb2[0] == 2); - BOOST_CHECK(cb2[2] == 1); - BOOST_CHECK(cb2.capacity() == 10); - BOOST_CHECK(cb3.size() == 2); - BOOST_CHECK(cb3[0] == 2); - BOOST_CHECK(cb3[1] == 3); - BOOST_CHECK(cb3.capacity() == 2); + BOOST_TEST(cb1.size() == 3); + BOOST_TEST(cb1[0] == 2); + BOOST_TEST(cb1[2] == 1); + BOOST_TEST(cb1.capacity() == 5); + BOOST_TEST(cb2.size() == 3); + BOOST_TEST(cb2[0] == 2); + BOOST_TEST(cb2[2] == 1); + BOOST_TEST(cb2.capacity() == 10); + BOOST_TEST(cb3.size() == 2); + BOOST_TEST(cb3[0] == 2); + BOOST_TEST(cb3[1] == 3); + BOOST_TEST(cb3.capacity() == 2); cb3.set_capacity(2); - BOOST_CHECK(cb3.size() == 2); - BOOST_CHECK(cb3[0] == 2); - BOOST_CHECK(cb3[1] == 3); - BOOST_CHECK(cb3.capacity() == 2); + BOOST_TEST(cb3.size() == 2); + BOOST_TEST(cb3[0] == 2); + BOOST_TEST(cb3[1] == 3); + BOOST_TEST(cb3.capacity() == 2); cb3.set_capacity(0); - BOOST_CHECK(cb3.size() == 0); - BOOST_CHECK(cb3.capacity() == 0); + BOOST_TEST(cb3.size() == 0); + BOOST_TEST(cb3.capacity() == 0); generic_test(cb1); generic_test(cb2); @@ -796,30 +796,30 @@ void rset_capacity_test() { cb3.push_back(1); cb3.rset_capacity(2); - BOOST_CHECK(cb1.size() == 3); - BOOST_CHECK(cb1[0] == 2); - BOOST_CHECK(cb1[2] == 1); - BOOST_CHECK(cb1.capacity() == 5); - BOOST_CHECK(cb2.size() == 3); - BOOST_CHECK(cb2[0] == 2); - BOOST_CHECK(cb2[2] == 1); - BOOST_CHECK(cb2.capacity() == 10); - BOOST_CHECK(cb3.size() == 2); - BOOST_CHECK(cb3[0] == 3); - BOOST_CHECK(cb3[1] == 1); - BOOST_CHECK(cb3.capacity() == 2); + BOOST_TEST(cb1.size() == 3); + BOOST_TEST(cb1[0] == 2); + BOOST_TEST(cb1[2] == 1); + BOOST_TEST(cb1.capacity() == 5); + BOOST_TEST(cb2.size() == 3); + BOOST_TEST(cb2[0] == 2); + BOOST_TEST(cb2[2] == 1); + BOOST_TEST(cb2.capacity() == 10); + BOOST_TEST(cb3.size() == 2); + BOOST_TEST(cb3[0] == 3); + BOOST_TEST(cb3[1] == 1); + BOOST_TEST(cb3.capacity() == 2); cb3.rset_capacity(2); - BOOST_CHECK(cb3.size() == 2); - BOOST_CHECK(cb3[0] == 3); - BOOST_CHECK(cb3[1] == 1); - BOOST_CHECK(cb3.capacity() == 2); + BOOST_TEST(cb3.size() == 2); + BOOST_TEST(cb3[0] == 3); + BOOST_TEST(cb3[1] == 1); + BOOST_TEST(cb3.capacity() == 2); cb3.rset_capacity(0); - BOOST_CHECK(cb3.size() == 0); - BOOST_CHECK(cb3.capacity() == 0); + BOOST_TEST(cb3.size() == 0); + BOOST_TEST(cb3.capacity() == 0); generic_test(cb1); generic_test(cb2); @@ -845,22 +845,22 @@ void resize_test() { CB_CONTAINER cb4(10, 1); cb4.resize(10); - BOOST_CHECK(cb1.size() == 20); - BOOST_CHECK(cb1.capacity() == 20); - BOOST_CHECK(cb1[0] == 1); - BOOST_CHECK(cb1[3] == 4); - BOOST_CHECK(cb1[4] == 5); - BOOST_CHECK(cb1[19] == 5); - BOOST_CHECK(cb2.size() == 2); - BOOST_CHECK(cb2.capacity() == 10); - BOOST_CHECK(cb2[0] == 1); - BOOST_CHECK(cb2[1] == 2); - BOOST_CHECK(cb3.size() == 0); - BOOST_CHECK(cb3.capacity() == 10); - BOOST_CHECK(cb4.size() == 10); - BOOST_CHECK(cb4.capacity() == 10); - BOOST_CHECK(cb4[0] == 1); - BOOST_CHECK(cb4[9] == 1); + BOOST_TEST(cb1.size() == 20); + BOOST_TEST(cb1.capacity() == 20); + BOOST_TEST(cb1[0] == 1); + BOOST_TEST(cb1[3] == 4); + BOOST_TEST(cb1[4] == 5); + BOOST_TEST(cb1[19] == 5); + BOOST_TEST(cb2.size() == 2); + BOOST_TEST(cb2.capacity() == 10); + BOOST_TEST(cb2[0] == 1); + BOOST_TEST(cb2[1] == 2); + BOOST_TEST(cb3.size() == 0); + BOOST_TEST(cb3.capacity() == 10); + BOOST_TEST(cb4.size() == 10); + BOOST_TEST(cb4.capacity() == 10); + BOOST_TEST(cb4[0] == 1); + BOOST_TEST(cb4[9] == 1); generic_test(cb1); generic_test(cb2); @@ -887,22 +887,22 @@ void rresize_test() { CB_CONTAINER cb4(10, 1); cb4.rresize(10); - BOOST_CHECK(cb1.size() == 20); - BOOST_CHECK(cb1.capacity() == 20); - BOOST_CHECK(cb1[0] == 5); - BOOST_CHECK(cb1[15] == 5); - BOOST_CHECK(cb1[16] == 1); - BOOST_CHECK(cb1[19] == 4); - BOOST_CHECK(cb2.size() == 2); - BOOST_CHECK(cb2.capacity() == 10); - BOOST_CHECK(cb2[0] == 3); - BOOST_CHECK(cb2[1] == 4); - BOOST_CHECK(cb3.size() == 0); - BOOST_CHECK(cb3.capacity() == 10); - BOOST_CHECK(cb4.size() == 10); - BOOST_CHECK(cb4.capacity() == 10); - BOOST_CHECK(cb4[0] == 1); - BOOST_CHECK(cb4[9] == 1); + BOOST_TEST(cb1.size() == 20); + BOOST_TEST(cb1.capacity() == 20); + BOOST_TEST(cb1[0] == 5); + BOOST_TEST(cb1[15] == 5); + BOOST_TEST(cb1[16] == 1); + BOOST_TEST(cb1[19] == 4); + BOOST_TEST(cb2.size() == 2); + BOOST_TEST(cb2.capacity() == 10); + BOOST_TEST(cb2[0] == 3); + BOOST_TEST(cb2[1] == 4); + BOOST_TEST(cb3.size() == 0); + BOOST_TEST(cb3.capacity() == 10); + BOOST_TEST(cb4.size() == 10); + BOOST_TEST(cb4.capacity() == 10); + BOOST_TEST(cb4[0] == 1); + BOOST_TEST(cb4[9] == 1); generic_test(cb1); generic_test(cb2); @@ -913,15 +913,15 @@ void rresize_test() { void constructor_test() { CB_CONTAINER cb0; - BOOST_CHECK(cb0.capacity() == 0); - BOOST_CHECK(cb0.size() == 0); + BOOST_TEST(cb0.capacity() == 0); + BOOST_TEST(cb0.size() == 0); cb0.push_back(1); cb0.push_back(2); cb0.push_back(3); - BOOST_CHECK(cb0.size() == 0); - BOOST_CHECK(cb0.capacity() == 0); + BOOST_TEST(cb0.size() == 0); + BOOST_TEST(cb0.capacity() == 0); CB_CONTAINER cb1(3); CB_CONTAINER cb2(3, 2); @@ -936,51 +936,51 @@ void constructor_test() { CB_CONTAINER cb5(10, v.begin(), v.end()); CB_CONTAINER cb6(10, 3, MyInteger(2)); - BOOST_CHECK(cb1.size() == 0); - BOOST_CHECK(cb1.capacity() == 3); - BOOST_CHECK(cb2[0] == 2); - BOOST_CHECK(cb2.full()); - BOOST_CHECK(cb2[0] == 2); - BOOST_CHECK(cb2[1] == 2); - BOOST_CHECK(cb2[2] == 2); - BOOST_CHECK(cb3.size() == 5); - BOOST_CHECK(cb3.capacity() == 5); - BOOST_CHECK(cb3.full()); - BOOST_CHECK(cb3[0] == 1); - BOOST_CHECK(cb3[4] == 5); - BOOST_CHECK(cb4.size() == 3); - BOOST_CHECK(cb4.capacity() == 3); - BOOST_CHECK(cb4.full()); - BOOST_CHECK(cb4[0] == 3); - BOOST_CHECK(cb4[2] == 5); - BOOST_CHECK(cb5.size() == 5); - BOOST_CHECK(cb5.capacity() == 10); - BOOST_CHECK(!cb5.full()); - BOOST_CHECK(cb5[0] == 1); - BOOST_CHECK(cb5[4] == 5); - BOOST_CHECK(cb6.size() == 3); - BOOST_CHECK(cb6.capacity() == 10); - BOOST_CHECK(!cb6.full()); - BOOST_CHECK(cb6[0] == 2); - BOOST_CHECK(cb6[2] == 2); + BOOST_TEST(cb1.size() == 0); + BOOST_TEST(cb1.capacity() == 3); + BOOST_TEST(cb2[0] == 2); + BOOST_TEST(cb2.full()); + BOOST_TEST(cb2[0] == 2); + BOOST_TEST(cb2[1] == 2); + BOOST_TEST(cb2[2] == 2); + BOOST_TEST(cb3.size() == 5); + BOOST_TEST(cb3.capacity() == 5); + BOOST_TEST(cb3.full()); + BOOST_TEST(cb3[0] == 1); + BOOST_TEST(cb3[4] == 5); + BOOST_TEST(cb4.size() == 3); + BOOST_TEST(cb4.capacity() == 3); + BOOST_TEST(cb4.full()); + BOOST_TEST(cb4[0] == 3); + BOOST_TEST(cb4[2] == 5); + BOOST_TEST(cb5.size() == 5); + BOOST_TEST(cb5.capacity() == 10); + BOOST_TEST(!cb5.full()); + BOOST_TEST(cb5[0] == 1); + BOOST_TEST(cb5[4] == 5); + BOOST_TEST(cb6.size() == 3); + BOOST_TEST(cb6.capacity() == 10); + BOOST_TEST(!cb6.full()); + BOOST_TEST(cb6[0] == 2); + BOOST_TEST(cb6[2] == 2); cb5.push_back(6); cb6.push_back(6); - BOOST_CHECK(cb5[5] == 6); - BOOST_CHECK(cb5[0] == 1); - BOOST_CHECK(cb5.size() == 6); - BOOST_CHECK(cb6[3] == 6); - BOOST_CHECK(cb6.size() == 4); - BOOST_CHECK(cb6[0] == 2); + BOOST_TEST(cb5[5] == 6); + BOOST_TEST(cb5[0] == 1); + BOOST_TEST(cb5.size() == 6); + BOOST_TEST(cb6[3] == 6); + BOOST_TEST(cb6.size() == 4); + BOOST_TEST(cb6[0] == 2); #if !defined(BOOST_NO_TEMPLATED_ITERATOR_CONSTRUCTORS) CB_CONTAINER cb7(MyInputIterator(v.begin()), MyInputIterator(v.end())); CB_CONTAINER cb8(3, MyInputIterator(v.begin()), MyInputIterator(v.end())); - BOOST_CHECK(cb7.capacity() == 5); - BOOST_CHECK(cb8.capacity() == 3); + BOOST_TEST(cb7.capacity() == 5); + BOOST_TEST(cb8.capacity() == 3); #endif // #if !defined(BOOST_NO_TEMPLATED_ITERATOR_CONSTRUCTORS) @@ -1001,30 +1001,30 @@ void assign_test() { cb1.push_back(4); cb1.push_back(5); cb1.assign(3, 8); - BOOST_CHECK(cb1.size() == 3); - BOOST_CHECK(cb1.capacity() == 3); - BOOST_CHECK(cb1[0] == 8); - BOOST_CHECK(cb1[2] == 8); + BOOST_TEST(cb1.size() == 3); + BOOST_TEST(cb1.capacity() == 3); + BOOST_TEST(cb1[0] == 8); + BOOST_TEST(cb1[2] == 8); cb1.assign(6, 7); - BOOST_CHECK(cb1.size() == 6); - BOOST_CHECK(cb1.capacity() == 6); - BOOST_CHECK(cb1[0] == 7); - BOOST_CHECK(cb1[5] == 7); + BOOST_TEST(cb1.size() == 6); + BOOST_TEST(cb1.capacity() == 6); + BOOST_TEST(cb1[0] == 7); + BOOST_TEST(cb1[5] == 7); CB_CONTAINER cb2(4); cb2.assign(3, 1.1f); - BOOST_CHECK(cb2[0] == 1.1f); + BOOST_TEST(cb2[0] == 1.1f); CB_CONTAINER cb3(5); cb3.push_back(1); cb3.push_back(2); cb3.push_back(3); cb3.assign((size_t)10, 1); // The size_t cast is not needed. It is present here just because of testing purposes. - BOOST_CHECK(cb3[0] == 1); - BOOST_CHECK(cb3[9] == 1); - BOOST_CHECK(cb3.size() == 10); - BOOST_CHECK(cb3.capacity() == 10); + BOOST_TEST(cb3[0] == 1); + BOOST_TEST(cb3[9] == 1); + BOOST_TEST(cb3.size() == 10); + BOOST_TEST(cb3.capacity() == 10); #if !defined(BOOST_NO_TEMPLATED_ITERATOR_CONSTRUCTORS) @@ -1040,8 +1040,8 @@ void assign_test() { CB_CONTAINER cb5(3); cb5.assign(4, MyInputIterator(v.begin()), MyInputIterator(v.end())); - BOOST_CHECK(cb4.capacity() == 5); - BOOST_CHECK(cb5.capacity() == 4); + BOOST_TEST(cb4.capacity() == 5); + BOOST_TEST(cb5.capacity() == 4); #endif // #if !defined(BOOST_NO_TEMPLATED_ITERATOR_CONSTRUCTORS) @@ -1059,10 +1059,10 @@ void copy_constructor_and_assign_test() { cb1.push_back(5); CB_CONTAINER cb2 = cb1; - BOOST_CHECK(cb1 == cb2); - BOOST_CHECK(cb2.capacity() == 4); - BOOST_CHECK(cb2[0] == 2); - BOOST_CHECK(cb2[3] == 5); + BOOST_TEST(cb1 == cb2); + BOOST_TEST(cb2.capacity() == 4); + BOOST_TEST(cb2[0] == 2); + BOOST_TEST(cb2[3] == 5); CB_CONTAINER cb3(20); cb1.pop_back(); @@ -1072,19 +1072,19 @@ void copy_constructor_and_assign_test() { cb4 = cb1; CB_CONTAINER cb5 = cb1; - BOOST_CHECK(cb3 == cb2); - BOOST_CHECK(cb4 == cb1); - BOOST_CHECK(cb2.full()); - BOOST_CHECK(cb2[0] == 2); - BOOST_CHECK(cb3.full()); - BOOST_CHECK(cb3.capacity() == 4); - BOOST_CHECK(cb4.capacity() == 4); - BOOST_CHECK(!cb4.full()); - BOOST_CHECK(*(cb4.end() - 1) == 4); - BOOST_CHECK(cb1 == cb5); - BOOST_CHECK(cb5.capacity() == 4); - BOOST_CHECK(cb2[0] == 2); - BOOST_CHECK(cb2[2] == 4); + BOOST_TEST(cb3 == cb2); + BOOST_TEST(cb4 == cb1); + BOOST_TEST(cb2.full()); + BOOST_TEST(cb2[0] == 2); + BOOST_TEST(cb3.full()); + BOOST_TEST(cb3.capacity() == 4); + BOOST_TEST(cb4.capacity() == 4); + BOOST_TEST(!cb4.full()); + BOOST_TEST(*(cb4.end() - 1) == 4); + BOOST_TEST(cb1 == cb5); + BOOST_TEST(cb5.capacity() == 4); + BOOST_TEST(cb2[0] == 2); + BOOST_TEST(cb2[2] == 4); generic_test(cb1); generic_test(cb2); @@ -1104,12 +1104,12 @@ void swap_test() { cb2.swap(cb1); cb2.swap(cb2); - BOOST_CHECK(cb2.capacity() == 2); - BOOST_CHECK(cb2[0] == 2); - BOOST_CHECK(cb2.full()); - BOOST_CHECK(cb1.capacity() == 5); - BOOST_CHECK(cb1[0] == 8); - BOOST_CHECK(cb1.size() == 1); + BOOST_TEST(cb2.capacity() == 2); + BOOST_TEST(cb2[0] == 2); + BOOST_TEST(cb2.full()); + BOOST_TEST(cb1.capacity() == 5); + BOOST_TEST(cb1[0] == 8); + BOOST_TEST(cb1.size() == 1); generic_test(cb1); generic_test(cb2); @@ -1120,15 +1120,15 @@ void push_back_test() { CB_CONTAINER cb1(5); cb1.push_back(); cb1.push_back(MyDefaultConstructible(2)); - BOOST_CHECK(cb1[0].m_n == 1); - BOOST_CHECK(cb1[1].m_n == 2); + BOOST_TEST(cb1[0].m_n == 1); + BOOST_TEST(cb1[1].m_n == 2); CB_CONTAINER cb2(5); cb2.push_back(); - BOOST_CHECK(cb2.back() == CB_CONTAINER::value_type()); + BOOST_TEST(cb2.back() == CB_CONTAINER::value_type()); cb2.push_back(1); - BOOST_CHECK(cb2.back() == 1); + BOOST_TEST(cb2.back() == 1); generic_test(cb2); } @@ -1143,9 +1143,9 @@ void pop_back_test() { cb.push_back(5); cb.pop_back(); - BOOST_CHECK(cb.size() == 3); - BOOST_CHECK(!cb.full()); - BOOST_CHECK(cb[0] == 2); + BOOST_TEST(cb.size() == 3); + BOOST_TEST(!cb.full()); + BOOST_TEST(cb[0] == 2); generic_test(cb); } @@ -1170,14 +1170,14 @@ void insert_test() { cb3.insert(cb3.begin(), 30); cb3.insert(cb3.end(), 40); - BOOST_CHECK(cb1[1] == 10); - BOOST_CHECK(*it1 == 10); - BOOST_CHECK(cb1.full()); - BOOST_CHECK(cb2[1] == 5); - BOOST_CHECK(*it2 == 5); - BOOST_CHECK(cb2.full()); - BOOST_CHECK(cb3[0] == 20); - BOOST_CHECK(cb3[1] == 40); + BOOST_TEST(cb1[1] == 10); + BOOST_TEST(*it1 == 10); + BOOST_TEST(cb1.full()); + BOOST_TEST(cb2[1] == 5); + BOOST_TEST(*it2 == 5); + BOOST_TEST(cb2.full()); + BOOST_TEST(cb3[0] == 20); + BOOST_TEST(cb3[1] == 40); generic_test(cb1); generic_test(cb2); @@ -1203,22 +1203,22 @@ void insert_n_test() { cb4.insert(cb4.begin() + 2, 5, 6); cb4.insert(cb4.begin() + 2, 0, 7); - BOOST_CHECK(cb1.full()); - BOOST_CHECK(cb1[0] == 10); - BOOST_CHECK(cb1[1] == 10); - BOOST_CHECK(cb1[2] == 2); - BOOST_CHECK(cb1[3] == 3); - BOOST_CHECK(cb2[0] == 3); - BOOST_CHECK(cb2[1] == 3); - BOOST_CHECK(cb3[0] == 6); - BOOST_CHECK(cb3.size() == 1); - BOOST_CHECK(cb4.size() == 6); - BOOST_CHECK(cb4[0] == 6); - BOOST_CHECK(cb4[1] == 6); - BOOST_CHECK(cb4[2] == 6); - BOOST_CHECK(cb4[3] == 6); - BOOST_CHECK(cb4[4] == 3); - BOOST_CHECK(cb4[5] == 4); + BOOST_TEST(cb1.full()); + BOOST_TEST(cb1[0] == 10); + BOOST_TEST(cb1[1] == 10); + BOOST_TEST(cb1[2] == 2); + BOOST_TEST(cb1[3] == 3); + BOOST_TEST(cb2[0] == 3); + BOOST_TEST(cb2[1] == 3); + BOOST_TEST(cb3[0] == 6); + BOOST_TEST(cb3.size() == 1); + BOOST_TEST(cb4.size() == 6); + BOOST_TEST(cb4[0] == 6); + BOOST_TEST(cb4[1] == 6); + BOOST_TEST(cb4[2] == 6); + BOOST_TEST(cb4[3] == 6); + BOOST_TEST(cb4[4] == 3); + BOOST_TEST(cb4[5] == 4); generic_test(cb1); generic_test(cb2); @@ -1252,23 +1252,23 @@ void insert_range_test() { cb5.insert(cb5.begin() + 2, array, array + 5); cb5.insert(cb5.begin(), array, array + 5); - BOOST_CHECK(cb1.full()); - BOOST_CHECK(cb1[0] == 12); - BOOST_CHECK(cb1[1] == 13); - BOOST_CHECK(cb1[2] == 2); - BOOST_CHECK(cb1[3] == 3); - BOOST_CHECK(cb2[0] == 12); - BOOST_CHECK(cb2[1] == 13); - BOOST_CHECK(cb3.empty()); - BOOST_CHECK(cb4[0] == 11); - BOOST_CHECK(cb4.size() == 1); - BOOST_CHECK(cb5.size() == 6); - BOOST_CHECK(cb5[0] == 6); - BOOST_CHECK(cb5[1] == 7); - BOOST_CHECK(cb5[2] == 8); - BOOST_CHECK(cb5[3] == 9); - BOOST_CHECK(cb5[4] == 3); - BOOST_CHECK(cb5[5] == 4); + BOOST_TEST(cb1.full()); + BOOST_TEST(cb1[0] == 12); + BOOST_TEST(cb1[1] == 13); + BOOST_TEST(cb1[2] == 2); + BOOST_TEST(cb1[3] == 3); + BOOST_TEST(cb2[0] == 12); + BOOST_TEST(cb2[1] == 13); + BOOST_TEST(cb3.empty()); + BOOST_TEST(cb4[0] == 11); + BOOST_TEST(cb4.size() == 1); + BOOST_TEST(cb5.size() == 6); + BOOST_TEST(cb5[0] == 6); + BOOST_TEST(cb5[1] == 7); + BOOST_TEST(cb5[2] == 8); + BOOST_TEST(cb5[3] == 9); + BOOST_TEST(cb5[4] == 3); + BOOST_TEST(cb5[5] == 4); #if !defined(BOOST_NO_TEMPLATED_ITERATOR_CONSTRUCTORS) @@ -1313,26 +1313,26 @@ void insert_range_test() { cb11.insert(cb11.begin() + 2, MyInputIterator(v.begin()), MyInputIterator(v.begin() + 5)); cb11.insert(cb11.begin(), MyInputIterator(v.begin()), MyInputIterator(v.begin() + 5)); - BOOST_CHECK(cb6.capacity() == 4); - BOOST_CHECK(cb6[0] == 4); - BOOST_CHECK(cb6[3] == -2); - BOOST_CHECK(cb7.full()); - BOOST_CHECK(cb7[0] == 12); - BOOST_CHECK(cb7[1] == 13); - BOOST_CHECK(cb7[2] == 2); - BOOST_CHECK(cb7[3] == 3); - BOOST_CHECK(cb8[0] == 12); - BOOST_CHECK(cb8[1] == 13); - BOOST_CHECK(cb9.empty()); - BOOST_CHECK(cb10[0] == 11); - BOOST_CHECK(cb10.size() == 1); - BOOST_CHECK(cb11.size() == 6); - BOOST_CHECK(cb11[0] == 6); - BOOST_CHECK(cb11[1] == 7); - BOOST_CHECK(cb11[2] == 8); - BOOST_CHECK(cb11[3] == 9); - BOOST_CHECK(cb11[4] == 3); - BOOST_CHECK(cb11[5] == 4); + BOOST_TEST(cb6.capacity() == 4); + BOOST_TEST(cb6[0] == 4); + BOOST_TEST(cb6[3] == -2); + BOOST_TEST(cb7.full()); + BOOST_TEST(cb7[0] == 12); + BOOST_TEST(cb7[1] == 13); + BOOST_TEST(cb7[2] == 2); + BOOST_TEST(cb7[3] == 3); + BOOST_TEST(cb8[0] == 12); + BOOST_TEST(cb8[1] == 13); + BOOST_TEST(cb9.empty()); + BOOST_TEST(cb10[0] == 11); + BOOST_TEST(cb10.size() == 1); + BOOST_TEST(cb11.size() == 6); + BOOST_TEST(cb11[0] == 6); + BOOST_TEST(cb11[1] == 7); + BOOST_TEST(cb11[2] == 8); + BOOST_TEST(cb11[3] == 9); + BOOST_TEST(cb11[4] == 3); + BOOST_TEST(cb11[5] == 4); #endif // #if !defined(BOOST_NO_TEMPLATED_ITERATOR_CONSTRUCTORS) @@ -1348,19 +1348,19 @@ void push_front_test() { CB_CONTAINER cb1(5); cb1.push_front(); cb1.push_front(MyDefaultConstructible(2)); - BOOST_CHECK(cb1[0].m_n == 2); - BOOST_CHECK(cb1[1].m_n == 1); + BOOST_TEST(cb1[0].m_n == 2); + BOOST_TEST(cb1[1].m_n == 1); CB_CONTAINER cb2(5); cb2.push_front(); - BOOST_CHECK(cb2.front() == CB_CONTAINER::value_type()); + BOOST_TEST(cb2.front() == CB_CONTAINER::value_type()); cb2.push_front(1); - BOOST_CHECK(cb2.front() == 1); + BOOST_TEST(cb2.front() == 1); CB_CONTAINER cb3(0); cb3.push_front(10); - BOOST_CHECK(cb3.empty()); + BOOST_TEST(cb3.empty()); generic_test(cb2); generic_test(cb3); @@ -1376,9 +1376,9 @@ void pop_front_test() { cb.push_front(5); cb.pop_front(); - BOOST_CHECK(cb.size() == 3); - BOOST_CHECK(!cb.full()); - BOOST_CHECK(cb[0] == 4); + BOOST_TEST(cb.size() == 3); + BOOST_TEST(!cb.full()); + BOOST_TEST(cb[0] == 4); generic_test(cb); } @@ -1426,30 +1426,30 @@ void rinsert_test() { cb7.push_back(4); cb7.rinsert(cb7.begin() + 2, 5, 6); - BOOST_CHECK(cb1[1] == 10); - BOOST_CHECK(*it1 == 10); - BOOST_CHECK(cb1.full()); - BOOST_CHECK(cb2[1] == 5); - BOOST_CHECK(*it2 == 5); - BOOST_CHECK(cb2.full()); - BOOST_CHECK(cb2[3] == 1); - BOOST_CHECK(cb3[0] == 40); - BOOST_CHECK(cb3[1] == 20); - BOOST_CHECK(cb4[1] == 10); - BOOST_CHECK(*it3 == 10); - BOOST_CHECK(cb4.full()); - BOOST_CHECK(cb5[1] == 5); - BOOST_CHECK(*it4 == 5); - BOOST_CHECK(cb5.full()); - BOOST_CHECK(cb6[0] == 30); - BOOST_CHECK(cb6[1] == 10); - BOOST_CHECK(cb7.size() == 6); - BOOST_CHECK(cb7[0] == 1); - BOOST_CHECK(cb7[1] == 2); - BOOST_CHECK(cb7[2] == 6); - BOOST_CHECK(cb7[3] == 6); - BOOST_CHECK(cb7[4] == 6); - BOOST_CHECK(cb7[5] == 6); + BOOST_TEST(cb1[1] == 10); + BOOST_TEST(*it1 == 10); + BOOST_TEST(cb1.full()); + BOOST_TEST(cb2[1] == 5); + BOOST_TEST(*it2 == 5); + BOOST_TEST(cb2.full()); + BOOST_TEST(cb2[3] == 1); + BOOST_TEST(cb3[0] == 40); + BOOST_TEST(cb3[1] == 20); + BOOST_TEST(cb4[1] == 10); + BOOST_TEST(*it3 == 10); + BOOST_TEST(cb4.full()); + BOOST_TEST(cb5[1] == 5); + BOOST_TEST(*it4 == 5); + BOOST_TEST(cb5.full()); + BOOST_TEST(cb6[0] == 30); + BOOST_TEST(cb6[1] == 10); + BOOST_TEST(cb7.size() == 6); + BOOST_TEST(cb7[0] == 1); + BOOST_TEST(cb7[1] == 2); + BOOST_TEST(cb7[2] == 6); + BOOST_TEST(cb7[3] == 6); + BOOST_TEST(cb7[4] == 6); + BOOST_TEST(cb7[5] == 6); generic_test(cb1); generic_test(cb2); @@ -1485,27 +1485,27 @@ void rinsert_n_test() { cb5.rinsert(cb5.begin() + 2, array, array + 5); cb5.rinsert(cb5.end(), array, array + 5); - BOOST_CHECK(cb1.full()); - BOOST_CHECK(cb1[0] == 3); - BOOST_CHECK(cb1[1] == 10); - BOOST_CHECK(cb1[2] == 10); - BOOST_CHECK(cb1[3] == 2); - BOOST_CHECK(cb2[0] == 5); - BOOST_CHECK(cb2[1] == 5); - BOOST_CHECK(cb3[0] == 6); - BOOST_CHECK(cb3.size() == 1); - BOOST_CHECK(cb4.full()); - BOOST_CHECK(cb4[0] == 1); - BOOST_CHECK(cb4[1] == 10); - BOOST_CHECK(cb4[2] == 10); - BOOST_CHECK(cb4[3] == 2); - BOOST_CHECK(cb5.size() == 6); - BOOST_CHECK(cb5[0] == 1); - BOOST_CHECK(cb5[1] == 2); - BOOST_CHECK(cb5[2] == 5); - BOOST_CHECK(cb5[3] == 6); - BOOST_CHECK(cb5[4] == 7); - BOOST_CHECK(cb5[5] == 8); + BOOST_TEST(cb1.full()); + BOOST_TEST(cb1[0] == 3); + BOOST_TEST(cb1[1] == 10); + BOOST_TEST(cb1[2] == 10); + BOOST_TEST(cb1[3] == 2); + BOOST_TEST(cb2[0] == 5); + BOOST_TEST(cb2[1] == 5); + BOOST_TEST(cb3[0] == 6); + BOOST_TEST(cb3.size() == 1); + BOOST_TEST(cb4.full()); + BOOST_TEST(cb4[0] == 1); + BOOST_TEST(cb4[1] == 10); + BOOST_TEST(cb4[2] == 10); + BOOST_TEST(cb4[3] == 2); + BOOST_TEST(cb5.size() == 6); + BOOST_TEST(cb5[0] == 1); + BOOST_TEST(cb5[1] == 2); + BOOST_TEST(cb5[2] == 5); + BOOST_TEST(cb5[3] == 6); + BOOST_TEST(cb5[4] == 7); + BOOST_TEST(cb5[5] == 8); generic_test(cb1); generic_test(cb2); @@ -1533,16 +1533,16 @@ void rinsert_range_test() { CB_CONTAINER cb4(5); cb4.rinsert(cb4.begin(), v.begin(), v.begin() + 1); - BOOST_CHECK(cb1.full()); - BOOST_CHECK(cb1[0] == 1); - BOOST_CHECK(cb1[1] == 11); - BOOST_CHECK(cb1[2] == 12); - BOOST_CHECK(cb1[3] == 13); - BOOST_CHECK(cb2[0] == 11); - BOOST_CHECK(cb2[1] == 12); - BOOST_CHECK(cb3.empty()); - BOOST_CHECK(cb4[0] == 11); - BOOST_CHECK(cb4.size() == 1); + BOOST_TEST(cb1.full()); + BOOST_TEST(cb1[0] == 1); + BOOST_TEST(cb1[1] == 11); + BOOST_TEST(cb1[2] == 12); + BOOST_TEST(cb1[3] == 13); + BOOST_TEST(cb2[0] == 11); + BOOST_TEST(cb2[1] == 12); + BOOST_TEST(cb3.empty()); + BOOST_TEST(cb4[0] == 11); + BOOST_TEST(cb4.size() == 1); #if !defined(BOOST_NO_TEMPLATED_ITERATOR_CONSTRUCTORS) @@ -1575,19 +1575,19 @@ void rinsert_range_test() { CB_CONTAINER cb14(5); cb14.rinsert(cb14.begin(), MyInputIterator(v.begin()), MyInputIterator(v.begin() + 1)); - BOOST_CHECK(cb10.capacity() == 4); - BOOST_CHECK(cb10[0] == 0); - BOOST_CHECK(cb10[3] == 3); - BOOST_CHECK(cb11.full()); - BOOST_CHECK(cb11[0] == 1); - BOOST_CHECK(cb11[1] == 11); - BOOST_CHECK(cb11[2] == 12); - BOOST_CHECK(cb11[3] == 13); - BOOST_CHECK(cb12[0] == 11); - BOOST_CHECK(cb12[1] == 12); - BOOST_CHECK(cb13.empty()); - BOOST_CHECK(cb14[0] == 11); - BOOST_CHECK(cb14.size() == 1); + BOOST_TEST(cb10.capacity() == 4); + BOOST_TEST(cb10[0] == 0); + BOOST_TEST(cb10[3] == 3); + BOOST_TEST(cb11.full()); + BOOST_TEST(cb11[0] == 1); + BOOST_TEST(cb11[1] == 11); + BOOST_TEST(cb11[2] == 12); + BOOST_TEST(cb11[3] == 13); + BOOST_TEST(cb12[0] == 11); + BOOST_TEST(cb12[1] == 12); + BOOST_TEST(cb13.empty()); + BOOST_TEST(cb14[0] == 11); + BOOST_TEST(cb14.size() == 1); #endif // #if !defined(BOOST_NO_TEMPLATED_ITERATOR_CONSTRUCTORS) @@ -1614,19 +1614,19 @@ void erase_test() { cb3.push_back(3); CB_CONTAINER::iterator it3 = cb3.erase(cb3.begin() + 2); - BOOST_CHECK(cb1.size() == 2); - BOOST_CHECK(cb1.capacity() == 4); - BOOST_CHECK(*it1 == 3); - BOOST_CHECK(cb1[0] == 1); - BOOST_CHECK(cb1[1] == 3); - BOOST_CHECK(cb2.size() == 0); - BOOST_CHECK(cb2.capacity() == 1); - BOOST_CHECK(it2 == cb2.end()); - BOOST_CHECK(cb3.size() == 2); - BOOST_CHECK(cb3.capacity() == 4); - BOOST_CHECK(it3 == cb3.end()); - BOOST_CHECK(cb3[0] == 1); - BOOST_CHECK(cb3[1] == 2); + BOOST_TEST(cb1.size() == 2); + BOOST_TEST(cb1.capacity() == 4); + BOOST_TEST(*it1 == 3); + BOOST_TEST(cb1[0] == 1); + BOOST_TEST(cb1[1] == 3); + BOOST_TEST(cb2.size() == 0); + BOOST_TEST(cb2.capacity() == 1); + BOOST_TEST(it2 == cb2.end()); + BOOST_TEST(cb3.size() == 2); + BOOST_TEST(cb3.capacity() == 4); + BOOST_TEST(it3 == cb3.end()); + BOOST_TEST(cb3[0] == 1); + BOOST_TEST(cb3[1] == 2); generic_test(cb1); generic_test(cb2); @@ -1659,23 +1659,23 @@ void erase_range_test() { CB_CONTAINER cb4(10, 1); CB_CONTAINER::iterator it4 = cb4.erase(cb4.begin(), cb4.end()); - BOOST_CHECK(cb1.size() == 2); - BOOST_CHECK(cb1.capacity() == 4); - BOOST_CHECK(cb1[0] == 1); - BOOST_CHECK(cb1[1] == 4); - BOOST_CHECK(*it1 == 4); - BOOST_CHECK(cb2.size() == 4); - BOOST_CHECK(cb2[0] == 1); - BOOST_CHECK(cb2[3] == 4); - BOOST_CHECK(*it2 == 1); - BOOST_CHECK(cb3.size() == 2); - BOOST_CHECK(cb3.capacity() == 4); - BOOST_CHECK(cb3[0] == 1); - BOOST_CHECK(cb3[1] == 2); - BOOST_CHECK(it3 == cb3.end()); - BOOST_CHECK(cb4.size() == 0); - BOOST_CHECK(cb4.capacity() == 10); - BOOST_CHECK(it4 == cb4.end()); + BOOST_TEST(cb1.size() == 2); + BOOST_TEST(cb1.capacity() == 4); + BOOST_TEST(cb1[0] == 1); + BOOST_TEST(cb1[1] == 4); + BOOST_TEST(*it1 == 4); + BOOST_TEST(cb2.size() == 4); + BOOST_TEST(cb2[0] == 1); + BOOST_TEST(cb2[3] == 4); + BOOST_TEST(*it2 == 1); + BOOST_TEST(cb3.size() == 2); + BOOST_TEST(cb3.capacity() == 4); + BOOST_TEST(cb3[0] == 1); + BOOST_TEST(cb3[1] == 2); + BOOST_TEST(it3 == cb3.end()); + BOOST_TEST(cb4.size() == 0); + BOOST_TEST(cb4.capacity() == 10); + BOOST_TEST(it4 == cb4.end()); generic_test(cb1); generic_test(cb2); @@ -1700,20 +1700,20 @@ void rerase_test() { cb3.push_back(3); CB_CONTAINER::iterator it3 = cb3.rerase(cb3.begin()); - BOOST_CHECK(cb1.size() == 2); - BOOST_CHECK(cb1.capacity() == 4); - BOOST_CHECK(*it1 == 1); - BOOST_CHECK(cb1[0] == 1); - BOOST_CHECK(cb1[1] == 3); - BOOST_CHECK(cb2.size() == 0); - BOOST_CHECK(cb2.capacity() == 1); - BOOST_CHECK(it2 == cb2.begin()); - BOOST_CHECK(cb3.size() == 2); - BOOST_CHECK(cb3.capacity() == 4); - BOOST_CHECK(it3 == cb3.begin()); - BOOST_CHECK(*it3 == 2); - BOOST_CHECK(cb3[0] == 2); - BOOST_CHECK(cb3[1] == 3); + BOOST_TEST(cb1.size() == 2); + BOOST_TEST(cb1.capacity() == 4); + BOOST_TEST(*it1 == 1); + BOOST_TEST(cb1[0] == 1); + BOOST_TEST(cb1[1] == 3); + BOOST_TEST(cb2.size() == 0); + BOOST_TEST(cb2.capacity() == 1); + BOOST_TEST(it2 == cb2.begin()); + BOOST_TEST(cb3.size() == 2); + BOOST_TEST(cb3.capacity() == 4); + BOOST_TEST(it3 == cb3.begin()); + BOOST_TEST(*it3 == 2); + BOOST_TEST(cb3[0] == 2); + BOOST_TEST(cb3[1] == 3); generic_test(cb1); generic_test(cb2); @@ -1746,23 +1746,23 @@ void rerase_range_test() { CB_CONTAINER cb4(10, 1); CB_CONTAINER::iterator it4 = cb4.rerase(cb4.begin(), cb4.end()); - BOOST_CHECK(cb1.size() == 2); - BOOST_CHECK(cb1.capacity() == 4); - BOOST_CHECK(cb1[0] == 1); - BOOST_CHECK(cb1[1] == 4); - BOOST_CHECK(*it1 == 1); - BOOST_CHECK(cb2.size() == 4); - BOOST_CHECK(cb2[0] == 1); - BOOST_CHECK(cb2[3] == 4); - BOOST_CHECK(*it2 == 1); - BOOST_CHECK(cb3.size() == 2); - BOOST_CHECK(cb3.capacity() == 4); - BOOST_CHECK(cb3[0] == 3); - BOOST_CHECK(cb3[1] == 4); - BOOST_CHECK(it3 == cb3.begin()); - BOOST_CHECK(cb4.size() == 0); - BOOST_CHECK(cb4.capacity() == 10); - BOOST_CHECK(it4 == cb4.begin()); + BOOST_TEST(cb1.size() == 2); + BOOST_TEST(cb1.capacity() == 4); + BOOST_TEST(cb1[0] == 1); + BOOST_TEST(cb1[1] == 4); + BOOST_TEST(*it1 == 1); + BOOST_TEST(cb2.size() == 4); + BOOST_TEST(cb2[0] == 1); + BOOST_TEST(cb2[3] == 4); + BOOST_TEST(*it2 == 1); + BOOST_TEST(cb3.size() == 2); + BOOST_TEST(cb3.capacity() == 4); + BOOST_TEST(cb3[0] == 3); + BOOST_TEST(cb3[1] == 4); + BOOST_TEST(it3 == cb3.begin()); + BOOST_TEST(cb4.size() == 0); + BOOST_TEST(cb4.capacity() == 10); + BOOST_TEST(it4 == cb4.begin()); generic_test(cb1); generic_test(cb2); @@ -1779,7 +1779,7 @@ void clear_test() { cb.push_back(4); cb.clear(); - BOOST_CHECK(cb.empty()); + BOOST_TEST(cb.empty()); generic_test(cb); } @@ -1797,8 +1797,8 @@ void equality_test() { cb2.push_back(3); cb2.push_back(4); - BOOST_CHECK(cb1 == cb2); - BOOST_CHECK(!(cb2 != cb1)); + BOOST_TEST(cb1 == cb2); + BOOST_TEST(!(cb2 != cb1)); generic_test(cb1); generic_test(cb2); @@ -1817,8 +1817,8 @@ void lexicographical_comparison_test() { cb2.push_back('h'); cb2.push_back('n'); - BOOST_CHECK(cb2 > cb1); - BOOST_CHECK(cb1 < cb2); + BOOST_TEST(cb2 > cb1); + BOOST_TEST(cb1 < cb2); } void assign_range_test() { @@ -1837,15 +1837,15 @@ void assign_range_test() { cb2.push_back(2); cb2.assign(v.begin(), v.end()); - BOOST_CHECK(cb1.capacity() == 2); - BOOST_CHECK(cb1[0] == 12); - BOOST_CHECK(cb1[1] == 13); - BOOST_CHECK(cb2.full()); - BOOST_CHECK(cb2.capacity() == 3); - BOOST_CHECK(cb2[0] == 11); - BOOST_CHECK(cb2[1] == 12); - BOOST_CHECK(cb2[2] == 13); - BOOST_CHECK(cb2.size() == (size_t)distance(v.begin(), v.end())); + BOOST_TEST(cb1.capacity() == 2); + BOOST_TEST(cb1[0] == 12); + BOOST_TEST(cb1[1] == 13); + BOOST_TEST(cb2.full()); + BOOST_TEST(cb2.capacity() == 3); + BOOST_TEST(cb2[0] == 11); + BOOST_TEST(cb2[1] == 12); + BOOST_TEST(cb2[2] == 13); + BOOST_TEST(cb2.size() == (size_t)distance(v.begin(), v.end())); generic_test(cb1); generic_test(cb2); @@ -1858,35 +1858,35 @@ void example_test() { cb1.push_back(1); cb1.push_back(2); - BOOST_CHECK(cb1[0] == 1); - BOOST_CHECK(cb1[1] == 2); - BOOST_CHECK(!cb1.full()); - BOOST_CHECK(cb1.size() == 2); - BOOST_CHECK(cb1.capacity() == 3); + BOOST_TEST(cb1[0] == 1); + BOOST_TEST(cb1[1] == 2); + BOOST_TEST(!cb1.full()); + BOOST_TEST(cb1.size() == 2); + BOOST_TEST(cb1.capacity() == 3); cb1.push_back(3); cb1.push_back(4); int sum = accumulate(cb1.begin(), cb1.end(), 0); - BOOST_CHECK(cb1[0] == 2); - BOOST_CHECK(cb1[1] == 3); - BOOST_CHECK(cb1[2] == 4); - BOOST_CHECK(*cb1.begin() == 2); - BOOST_CHECK(cb1.front() == 2); - BOOST_CHECK(cb1.back() == 4); - BOOST_CHECK(sum == 9); - BOOST_CHECK(cb1.full()); - BOOST_CHECK(cb1.size() == 3); - BOOST_CHECK(cb1.capacity() == 3); + BOOST_TEST(cb1[0] == 2); + BOOST_TEST(cb1[1] == 3); + BOOST_TEST(cb1[2] == 4); + BOOST_TEST(*cb1.begin() == 2); + BOOST_TEST(cb1.front() == 2); + BOOST_TEST(cb1.back() == 4); + BOOST_TEST(sum == 9); + BOOST_TEST(cb1.full()); + BOOST_TEST(cb1.size() == 3); + BOOST_TEST(cb1.capacity() == 3); CB_CONTAINER cb2(5, 1); cb2.insert(cb2.begin(), 2); - BOOST_CHECK(cb2[0] == 1); - BOOST_CHECK(cb2[1] == 1); - BOOST_CHECK(cb2[2] == 1); - BOOST_CHECK(cb2[3] == 1); - BOOST_CHECK(cb2[4] == 1); + BOOST_TEST(cb2[0] == 1); + BOOST_TEST(cb2[1] == 1); + BOOST_TEST(cb2[2] == 1); + BOOST_TEST(cb2[3] == 1); + BOOST_TEST(cb2[4] == 1); vector v; v.push_back(100); @@ -1894,32 +1894,32 @@ void example_test() { v.push_back(300); cb2.insert(cb2.begin() + 1, v.begin(), v.end()); - BOOST_CHECK(cb2[0] == 300); - BOOST_CHECK(cb2[1] == 1); - BOOST_CHECK(cb2[2] == 1); - BOOST_CHECK(cb2[3] == 1); - BOOST_CHECK(cb2[4] == 1); + BOOST_TEST(cb2[0] == 300); + BOOST_TEST(cb2[1] == 1); + BOOST_TEST(cb2[2] == 1); + BOOST_TEST(cb2[3] == 1); + BOOST_TEST(cb2[4] == 1); CB_CONTAINER cb3(3); cb3.push_back(1); cb3.push_back(2); cb3.push_back(3); - BOOST_CHECK(cb3[0] == 1); - BOOST_CHECK(cb3[1] == 2); - BOOST_CHECK(cb3[2] == 3); + BOOST_TEST(cb3[0] == 1); + BOOST_TEST(cb3[1] == 2); + BOOST_TEST(cb3[2] == 3); cb3.push_back(4); cb3.push_back(5); - BOOST_CHECK(cb3[0] == 3); - BOOST_CHECK(cb3[1] == 4); - BOOST_CHECK(cb3[2] == 5); + BOOST_TEST(cb3[0] == 3); + BOOST_TEST(cb3[1] == 4); + BOOST_TEST(cb3[2] == 5); cb3.pop_back(); cb3.pop_front(); - BOOST_CHECK(cb3[0] == 4); + BOOST_TEST(cb3[0] == 4); } void element_destruction_test() { @@ -1931,9 +1931,9 @@ void element_destruction_test() { int prevCount = InstanceCounter::count(); cb.clear(); - BOOST_CHECK(cb.empty()); - BOOST_CHECK(prevCount == 3); - BOOST_CHECK(InstanceCounter::count() == 0); + BOOST_TEST(cb.empty()); + BOOST_TEST(prevCount == 3); + BOOST_TEST(InstanceCounter::count() == 0); } void const_methods_test() { @@ -1946,14 +1946,14 @@ void const_methods_test() { v.push_back(5); const CB_CONTAINER cb(5, v.begin(), v.end()); - BOOST_CHECK(*cb.begin() == 1); - BOOST_CHECK(*(cb.end() - 1) == 5); - BOOST_CHECK(*cb.rbegin() == 5); - BOOST_CHECK(*(cb.rend() - 1) == 1); - BOOST_CHECK(cb[0] == 1); - BOOST_CHECK(cb.at(1) == 2); - BOOST_CHECK(cb.front() == 1); - BOOST_CHECK(cb.back() == 5); + BOOST_TEST(*cb.begin() == 1); + BOOST_TEST(*(cb.end() - 1) == 5); + BOOST_TEST(*cb.rbegin() == 5); + BOOST_TEST(*(cb.rend() - 1) == 1); + BOOST_TEST(cb[0] == 1); + BOOST_TEST(cb.at(1) == 2); + BOOST_TEST(cb.front() == 1); + BOOST_TEST(cb.back() == 5); } void rotate_test() { @@ -2020,49 +2020,49 @@ void rotate_test() { cb5.rotate(it3); rotate(cb6.begin(), cb6.begin() + 5, cb6.end()); - BOOST_CHECK(!cb1.full()); - BOOST_CHECK(cb1 == cb2); - BOOST_CHECK(v1_0 == *it1); - BOOST_CHECK(v1_1 == *(it1 + 1)); - BOOST_CHECK(v1_2 == *(it1 + 2)); - BOOST_CHECK(v1_3 == *(it1 + 3)); - BOOST_CHECK(v1_4 == *(it1 + 4)); - BOOST_CHECK(v1_r1 == *(it1 + 6)); - BOOST_CHECK(v1_r2 == *(it1 + 5)); - BOOST_CHECK(cb1.begin() == it1); - BOOST_CHECK(v1_0 == cb1[0]); - BOOST_CHECK(v1_1 == cb1[1]); - BOOST_CHECK(v1_2 == cb1[2]); - BOOST_CHECK(v1_3 == cb1[3]); - BOOST_CHECK(v1_4 == cb1[4]); - BOOST_CHECK(v1_r1 == cb1[6]); - BOOST_CHECK(v1_r2 == cb1[5]); - BOOST_CHECK(cb3.full()); - BOOST_CHECK(cb3 == cb4); - BOOST_CHECK(v2_0 == *it2); - BOOST_CHECK(v2_1 == *(it2 + 1)); - BOOST_CHECK(v2_2 == *(it2 + 2)); - BOOST_CHECK(v2_3 == *(it2 + 3)); - BOOST_CHECK(v2_4 == *(it2 + 4)); - BOOST_CHECK(v2_5 == *(it2 + 5)); - BOOST_CHECK(v2_r1 == *(it2 + 6)); - BOOST_CHECK(cb3.begin() == it2); - BOOST_CHECK(v2_0 == cb3[0]); - BOOST_CHECK(v2_1 == cb3[1]); - BOOST_CHECK(v2_2 == cb3[2]); - BOOST_CHECK(v2_3 == cb3[3]); - BOOST_CHECK(v2_4 == cb3[4]); - BOOST_CHECK(v2_5 == cb3[5]); - BOOST_CHECK(v2_r1 == cb3[6]); - BOOST_CHECK(!cb5.full()); - BOOST_CHECK(cb5 == cb6); - BOOST_CHECK(v3_0 == cb5[0]); - BOOST_CHECK(v3_1 == cb5[1]); - BOOST_CHECK(v3_r1 == cb5[6]); - BOOST_CHECK(v3_r2 == cb5[5]); - BOOST_CHECK(v3_r3 == cb5[4]); - BOOST_CHECK(v3_r4 == cb5[3]); - BOOST_CHECK(v3_r5 == cb5[2]); + BOOST_TEST(!cb1.full()); + BOOST_TEST(cb1 == cb2); + BOOST_TEST(v1_0 == *it1); + BOOST_TEST(v1_1 == *(it1 + 1)); + BOOST_TEST(v1_2 == *(it1 + 2)); + BOOST_TEST(v1_3 == *(it1 + 3)); + BOOST_TEST(v1_4 == *(it1 + 4)); + BOOST_TEST(v1_r1 == *(it1 + 6)); + BOOST_TEST(v1_r2 == *(it1 + 5)); + BOOST_TEST(cb1.begin() == it1); + BOOST_TEST(v1_0 == cb1[0]); + BOOST_TEST(v1_1 == cb1[1]); + BOOST_TEST(v1_2 == cb1[2]); + BOOST_TEST(v1_3 == cb1[3]); + BOOST_TEST(v1_4 == cb1[4]); + BOOST_TEST(v1_r1 == cb1[6]); + BOOST_TEST(v1_r2 == cb1[5]); + BOOST_TEST(cb3.full()); + BOOST_TEST(cb3 == cb4); + BOOST_TEST(v2_0 == *it2); + BOOST_TEST(v2_1 == *(it2 + 1)); + BOOST_TEST(v2_2 == *(it2 + 2)); + BOOST_TEST(v2_3 == *(it2 + 3)); + BOOST_TEST(v2_4 == *(it2 + 4)); + BOOST_TEST(v2_5 == *(it2 + 5)); + BOOST_TEST(v2_r1 == *(it2 + 6)); + BOOST_TEST(cb3.begin() == it2); + BOOST_TEST(v2_0 == cb3[0]); + BOOST_TEST(v2_1 == cb3[1]); + BOOST_TEST(v2_2 == cb3[2]); + BOOST_TEST(v2_3 == cb3[3]); + BOOST_TEST(v2_4 == cb3[4]); + BOOST_TEST(v2_5 == cb3[5]); + BOOST_TEST(v2_r1 == cb3[6]); + BOOST_TEST(!cb5.full()); + BOOST_TEST(cb5 == cb6); + BOOST_TEST(v3_0 == cb5[0]); + BOOST_TEST(v3_1 == cb5[1]); + BOOST_TEST(v3_r1 == cb5[6]); + BOOST_TEST(v3_r2 == cb5[5]); + BOOST_TEST(v3_r3 == cb5[4]); + BOOST_TEST(v3_r4 == cb5[3]); + BOOST_TEST(v3_r5 == cb5[2]); generic_test(cb1); generic_test(cb2); @@ -2089,21 +2089,21 @@ void move_container_on_cpp11() { CB_CONTAINER cb2(static_cast&& >(cb1)); CB_CONTAINER::iterator it2 = cb2.begin() + 1; - BOOST_CHECK(cb1.empty()); - BOOST_CHECK(!cb2.empty()); - BOOST_CHECK(it2[0] == 2); - BOOST_CHECK(it2[-1] == 1); - BOOST_CHECK(it2[2] == 4); + BOOST_TEST(cb1.empty()); + BOOST_TEST(!cb2.empty()); + BOOST_TEST(it2[0] == 2); + BOOST_TEST(it2[-1] == 1); + BOOST_TEST(it2[2] == 4); // Checking move assignment cb1 = static_cast&& >(cb2); CB_CONTAINER::iterator it1 = cb1.begin() + 1; - BOOST_CHECK(!cb1.empty()); - BOOST_CHECK(cb2.empty()); - BOOST_CHECK(it1[0] == 2); - BOOST_CHECK(it1[-1] == 1); - BOOST_CHECK(it1[2] == 4); + BOOST_TEST(!cb1.empty()); + BOOST_TEST(cb2.empty()); + BOOST_TEST(it1[0] == 2); + BOOST_TEST(it1[-1] == 1); + BOOST_TEST(it1[2] == 4); #endif } @@ -2204,147 +2204,147 @@ void move_container_values_impl() { CB_CONTAINER cb1(40); noncopyable_movable_test_t var; cb1.push_back(boost::move(var)); - BOOST_CHECK(!cb1.back().is_moved()); - BOOST_CHECK(cb1.back().value() == 1); - BOOST_CHECK(var.is_moved()); - BOOST_CHECK(cb1.size() == 1); + BOOST_TEST(!cb1.back().is_moved()); + BOOST_TEST(cb1.back().value() == 1); + BOOST_TEST(var.is_moved()); + BOOST_TEST(cb1.size() == 1); var.reinit(); cb1.push_front(boost::move(var)); - BOOST_CHECK(!cb1.front().is_moved()); - BOOST_CHECK(cb1.front().value() == 2); - BOOST_CHECK(var.is_moved()); - BOOST_CHECK(cb1.size() == 2); + BOOST_TEST(!cb1.front().is_moved()); + BOOST_TEST(cb1.front().value() == 2); + BOOST_TEST(var.is_moved()); + BOOST_TEST(cb1.size() == 2); cb1.push_back(); - BOOST_CHECK(!cb1.back().is_moved()); - BOOST_CHECK(cb1.back().value() == 3); - BOOST_CHECK(cb1.size() == 3); + BOOST_TEST(!cb1.back().is_moved()); + BOOST_TEST(cb1.back().value() == 3); + BOOST_TEST(cb1.size() == 3); cb1.push_front(); - BOOST_CHECK(!cb1.front().is_moved()); - BOOST_CHECK(cb1.front().value() == 4); - BOOST_CHECK(cb1.size() == 4); + BOOST_TEST(!cb1.front().is_moved()); + BOOST_TEST(cb1.front().value() == 4); + BOOST_TEST(cb1.size() == 4); cb1.insert(cb1.begin()); - BOOST_CHECK(!cb1.front().is_moved()); - BOOST_CHECK(cb1.front().value() == 5); - BOOST_CHECK(cb1.size() == 5); + BOOST_TEST(!cb1.front().is_moved()); + BOOST_TEST(cb1.front().value() == 5); + BOOST_TEST(cb1.size() == 5); var.reinit(); cb1.insert(cb1.begin(), boost::move(var)); - BOOST_CHECK(!cb1.front().is_moved()); - BOOST_CHECK(cb1.front().value() == 6); - BOOST_CHECK(cb1.size() == 6); + BOOST_TEST(!cb1.front().is_moved()); + BOOST_TEST(cb1.front().value() == 6); + BOOST_TEST(cb1.size() == 6); cb1.rinsert(cb1.begin()); - BOOST_CHECK(!cb1.front().is_moved()); - BOOST_CHECK(cb1.front().value() == 7); - BOOST_CHECK(cb1.size() == 7); + BOOST_TEST(!cb1.front().is_moved()); + BOOST_TEST(cb1.front().value() == 7); + BOOST_TEST(cb1.size() == 7); var.reinit(); cb1.rinsert(cb1.begin(), boost::move(var)); - BOOST_CHECK(!cb1.front().is_moved()); - BOOST_CHECK(cb1.front().value() == 8); - BOOST_CHECK(cb1.size() == 8); + BOOST_TEST(!cb1.front().is_moved()); + BOOST_TEST(cb1.front().value() == 8); + BOOST_TEST(cb1.size() == 8); - BOOST_CHECK(cb1[0].value() == 8); - BOOST_CHECK(cb1[1].value() == 7); - BOOST_CHECK(cb1[2].value() == 6); - BOOST_CHECK(cb1[3].value() == 5); - BOOST_CHECK(cb1[4].value() == 4); - BOOST_CHECK(cb1[5].value() == 2); - BOOST_CHECK(cb1[6].value() == 1); - BOOST_CHECK(cb1[7].value() == 3); + BOOST_TEST(cb1[0].value() == 8); + BOOST_TEST(cb1[1].value() == 7); + BOOST_TEST(cb1[2].value() == 6); + BOOST_TEST(cb1[3].value() == 5); + BOOST_TEST(cb1[4].value() == 4); + BOOST_TEST(cb1[5].value() == 2); + BOOST_TEST(cb1[6].value() == 1); + BOOST_TEST(cb1[7].value() == 3); cb1.rotate(cb1.begin() + 2); - BOOST_CHECK(cb1[0].value() == 6); - BOOST_CHECK(cb1[1].value() == 5); - BOOST_CHECK(cb1[2].value() == 4); - BOOST_CHECK(cb1[3].value() == 2); - BOOST_CHECK(cb1[4].value() == 1); - BOOST_CHECK(cb1[5].value() == 3); - BOOST_CHECK(cb1[6].value() == 8); - BOOST_CHECK(cb1[7].value() == 7); + BOOST_TEST(cb1[0].value() == 6); + BOOST_TEST(cb1[1].value() == 5); + BOOST_TEST(cb1[2].value() == 4); + BOOST_TEST(cb1[3].value() == 2); + BOOST_TEST(cb1[4].value() == 1); + BOOST_TEST(cb1[5].value() == 3); + BOOST_TEST(cb1[6].value() == 8); + BOOST_TEST(cb1[7].value() == 7); - BOOST_CHECK(!cb1[0].is_moved()); - BOOST_CHECK(!cb1[1].is_moved()); - BOOST_CHECK(!cb1[2].is_moved()); - BOOST_CHECK(!cb1[3].is_moved()); - BOOST_CHECK(!cb1[4].is_moved()); - BOOST_CHECK(!cb1[5].is_moved()); - BOOST_CHECK(!cb1[6].is_moved()); - BOOST_CHECK(!cb1[7].is_moved()); + BOOST_TEST(!cb1[0].is_moved()); + BOOST_TEST(!cb1[1].is_moved()); + BOOST_TEST(!cb1[2].is_moved()); + BOOST_TEST(!cb1[3].is_moved()); + BOOST_TEST(!cb1[4].is_moved()); + BOOST_TEST(!cb1[5].is_moved()); + BOOST_TEST(!cb1[6].is_moved()); + BOOST_TEST(!cb1[7].is_moved()); cb1.linearize(); - BOOST_CHECK(!cb1[0].is_moved()); - BOOST_CHECK(!cb1[1].is_moved()); - BOOST_CHECK(!cb1[2].is_moved()); - BOOST_CHECK(!cb1[3].is_moved()); - BOOST_CHECK(!cb1[4].is_moved()); - BOOST_CHECK(!cb1[5].is_moved()); - BOOST_CHECK(!cb1[6].is_moved()); - BOOST_CHECK(!cb1[7].is_moved()); - BOOST_CHECK(cb1[0].value() == 6); - BOOST_CHECK(cb1[1].value() == 5); - BOOST_CHECK(cb1[2].value() == 4); - BOOST_CHECK(cb1[3].value() == 2); - BOOST_CHECK(cb1[4].value() == 1); - BOOST_CHECK(cb1[5].value() == 3); - BOOST_CHECK(cb1[6].value() == 8); - BOOST_CHECK(cb1[7].value() == 7); + BOOST_TEST(!cb1[0].is_moved()); + BOOST_TEST(!cb1[1].is_moved()); + BOOST_TEST(!cb1[2].is_moved()); + BOOST_TEST(!cb1[3].is_moved()); + BOOST_TEST(!cb1[4].is_moved()); + BOOST_TEST(!cb1[5].is_moved()); + BOOST_TEST(!cb1[6].is_moved()); + BOOST_TEST(!cb1[7].is_moved()); + BOOST_TEST(cb1[0].value() == 6); + BOOST_TEST(cb1[1].value() == 5); + BOOST_TEST(cb1[2].value() == 4); + BOOST_TEST(cb1[3].value() == 2); + BOOST_TEST(cb1[4].value() == 1); + BOOST_TEST(cb1[5].value() == 3); + BOOST_TEST(cb1[6].value() == 8); + BOOST_TEST(cb1[7].value() == 7); cb1.erase(cb1.begin()); - BOOST_CHECK(!cb1[0].is_moved()); - BOOST_CHECK(!cb1[1].is_moved()); - BOOST_CHECK(!cb1[2].is_moved()); - BOOST_CHECK(!cb1[3].is_moved()); - BOOST_CHECK(!cb1[4].is_moved()); - BOOST_CHECK(!cb1[5].is_moved()); - BOOST_CHECK(!cb1[6].is_moved()); - BOOST_CHECK(cb1[0].value() == 5); - BOOST_CHECK(cb1[1].value() == 4); - BOOST_CHECK(cb1[2].value() == 2); - BOOST_CHECK(cb1[3].value() == 1); - BOOST_CHECK(cb1[4].value() == 3); - BOOST_CHECK(cb1[5].value() == 8); - BOOST_CHECK(cb1[6].value() == 7); + BOOST_TEST(!cb1[0].is_moved()); + BOOST_TEST(!cb1[1].is_moved()); + BOOST_TEST(!cb1[2].is_moved()); + BOOST_TEST(!cb1[3].is_moved()); + BOOST_TEST(!cb1[4].is_moved()); + BOOST_TEST(!cb1[5].is_moved()); + BOOST_TEST(!cb1[6].is_moved()); + BOOST_TEST(cb1[0].value() == 5); + BOOST_TEST(cb1[1].value() == 4); + BOOST_TEST(cb1[2].value() == 2); + BOOST_TEST(cb1[3].value() == 1); + BOOST_TEST(cb1[4].value() == 3); + BOOST_TEST(cb1[5].value() == 8); + BOOST_TEST(cb1[6].value() == 7); cb1.rerase(cb1.begin()); - BOOST_CHECK(!cb1[0].is_moved()); - BOOST_CHECK(!cb1[1].is_moved()); - BOOST_CHECK(!cb1[2].is_moved()); - BOOST_CHECK(!cb1[3].is_moved()); - BOOST_CHECK(!cb1[4].is_moved()); - BOOST_CHECK(!cb1[5].is_moved()); - BOOST_CHECK(cb1[0].value() == 4); - BOOST_CHECK(cb1[1].value() == 2); - BOOST_CHECK(cb1[2].value() == 1); - BOOST_CHECK(cb1[3].value() == 3); - BOOST_CHECK(cb1[4].value() == 8); - BOOST_CHECK(cb1[5].value() == 7); + BOOST_TEST(!cb1[0].is_moved()); + BOOST_TEST(!cb1[1].is_moved()); + BOOST_TEST(!cb1[2].is_moved()); + BOOST_TEST(!cb1[3].is_moved()); + BOOST_TEST(!cb1[4].is_moved()); + BOOST_TEST(!cb1[5].is_moved()); + BOOST_TEST(cb1[0].value() == 4); + BOOST_TEST(cb1[1].value() == 2); + BOOST_TEST(cb1[2].value() == 1); + BOOST_TEST(cb1[3].value() == 3); + BOOST_TEST(cb1[4].value() == 8); + BOOST_TEST(cb1[5].value() == 7); cb1.erase(cb1.begin(), cb1.begin() + 1); - BOOST_CHECK(!cb1[0].is_moved()); - BOOST_CHECK(!cb1[1].is_moved()); - BOOST_CHECK(!cb1[2].is_moved()); - BOOST_CHECK(!cb1[3].is_moved()); - BOOST_CHECK(!cb1[4].is_moved()); - BOOST_CHECK(cb1[0].value() == 2); - BOOST_CHECK(cb1[1].value() == 1); - BOOST_CHECK(cb1[2].value() == 3); - BOOST_CHECK(cb1[3].value() == 8); - BOOST_CHECK(cb1[4].value() == 7); + BOOST_TEST(!cb1[0].is_moved()); + BOOST_TEST(!cb1[1].is_moved()); + BOOST_TEST(!cb1[2].is_moved()); + BOOST_TEST(!cb1[3].is_moved()); + BOOST_TEST(!cb1[4].is_moved()); + BOOST_TEST(cb1[0].value() == 2); + BOOST_TEST(cb1[1].value() == 1); + BOOST_TEST(cb1[2].value() == 3); + BOOST_TEST(cb1[3].value() == 8); + BOOST_TEST(cb1[4].value() == 7); cb1.rerase(cb1.begin(), cb1.begin() + 1); - BOOST_CHECK(!cb1[0].is_moved()); - BOOST_CHECK(!cb1[1].is_moved()); - BOOST_CHECK(!cb1[2].is_moved()); - BOOST_CHECK(!cb1[3].is_moved()); - BOOST_CHECK(cb1[0].value() == 1); - BOOST_CHECK(cb1[1].value() == 3); - BOOST_CHECK(cb1[2].value() == 8); - BOOST_CHECK(cb1[3].value() == 7); + BOOST_TEST(!cb1[0].is_moved()); + BOOST_TEST(!cb1[1].is_moved()); + BOOST_TEST(!cb1[2].is_moved()); + BOOST_TEST(!cb1[3].is_moved()); + BOOST_TEST(cb1[0].value() == 1); + BOOST_TEST(cb1[1].value() == 3); + BOOST_TEST(cb1[2].value() == 8); + BOOST_TEST(cb1[3].value() == 7); } void move_container_values_noexcept() { @@ -2363,50 +2363,50 @@ void move_container_values_noexcept() { cb1.push_back(); cb1.set_capacity(100); - BOOST_CHECK(!cb1[0].is_moved()); - BOOST_CHECK(!cb1[1].is_moved()); - BOOST_CHECK(!cb1[2].is_moved()); - BOOST_CHECK(!cb1[3].is_moved()); - BOOST_CHECK(!cb1[4].is_moved()); - BOOST_CHECK(!cb1[5].is_moved()); - BOOST_CHECK(!cb1[6].is_moved()); - BOOST_CHECK(!cb1[7].is_moved()); - BOOST_CHECK(cb1[0].value() == 1); - BOOST_CHECK(cb1[1].value() == 2); - BOOST_CHECK(cb1[2].value() == 3); - BOOST_CHECK(cb1[3].value() == 4); - BOOST_CHECK(cb1[4].value() == 5); - BOOST_CHECK(cb1[5].value() == 6); - BOOST_CHECK(cb1[6].value() == 7); - BOOST_CHECK(cb1[7].value() == 8); + BOOST_TEST(!cb1[0].is_moved()); + BOOST_TEST(!cb1[1].is_moved()); + BOOST_TEST(!cb1[2].is_moved()); + BOOST_TEST(!cb1[3].is_moved()); + BOOST_TEST(!cb1[4].is_moved()); + BOOST_TEST(!cb1[5].is_moved()); + BOOST_TEST(!cb1[6].is_moved()); + BOOST_TEST(!cb1[7].is_moved()); + BOOST_TEST(cb1[0].value() == 1); + BOOST_TEST(cb1[1].value() == 2); + BOOST_TEST(cb1[2].value() == 3); + BOOST_TEST(cb1[3].value() == 4); + BOOST_TEST(cb1[4].value() == 5); + BOOST_TEST(cb1[5].value() == 6); + BOOST_TEST(cb1[6].value() == 7); + BOOST_TEST(cb1[7].value() == 8); cb1.rset_capacity(101); - BOOST_CHECK(!cb1[0].is_moved()); - BOOST_CHECK(!cb1[1].is_moved()); - BOOST_CHECK(!cb1[2].is_moved()); - BOOST_CHECK(!cb1[3].is_moved()); - BOOST_CHECK(!cb1[4].is_moved()); - BOOST_CHECK(!cb1[5].is_moved()); - BOOST_CHECK(!cb1[6].is_moved()); - BOOST_CHECK(!cb1[7].is_moved()); - BOOST_CHECK(cb1[0].value() == 1); - BOOST_CHECK(cb1[1].value() == 2); - BOOST_CHECK(cb1[2].value() == 3); - BOOST_CHECK(cb1[3].value() == 4); - BOOST_CHECK(cb1[4].value() == 5); - BOOST_CHECK(cb1[5].value() == 6); - BOOST_CHECK(cb1[6].value() == 7); - BOOST_CHECK(cb1[7].value() == 8); + BOOST_TEST(!cb1[0].is_moved()); + BOOST_TEST(!cb1[1].is_moved()); + BOOST_TEST(!cb1[2].is_moved()); + BOOST_TEST(!cb1[3].is_moved()); + BOOST_TEST(!cb1[4].is_moved()); + BOOST_TEST(!cb1[5].is_moved()); + BOOST_TEST(!cb1[6].is_moved()); + BOOST_TEST(!cb1[7].is_moved()); + BOOST_TEST(cb1[0].value() == 1); + BOOST_TEST(cb1[1].value() == 2); + BOOST_TEST(cb1[2].value() == 3); + BOOST_TEST(cb1[3].value() == 4); + BOOST_TEST(cb1[4].value() == 5); + BOOST_TEST(cb1[5].value() == 6); + BOOST_TEST(cb1[6].value() == 7); + BOOST_TEST(cb1[7].value() == 8); cb1.set_capacity(2); - BOOST_CHECK(!cb1[0].is_moved()); - BOOST_CHECK(!cb1[1].is_moved()); - BOOST_CHECK(cb1[0].value() == 1); - BOOST_CHECK(cb1[1].value() == 2); + BOOST_TEST(!cb1[0].is_moved()); + BOOST_TEST(!cb1[1].is_moved()); + BOOST_TEST(cb1[0].value() == 1); + BOOST_TEST(cb1[1].value() == 2); cb1.rset_capacity(1); - BOOST_CHECK(!cb1[0].is_moved()); - BOOST_CHECK(cb1[0].value() == 2); + BOOST_TEST(!cb1[0].is_moved()); + BOOST_TEST(cb1[0].value() == 2); } void check_containers_exception_specifications() { @@ -2414,70 +2414,71 @@ void check_containers_exception_specifications() { #ifndef BOOST_CLANG // Clang has an error in __has_nothrow_constructor implementation: // http://llvm.org/bugs/show_bug.cgi?id=16627 - BOOST_CHECK(boost::has_nothrow_constructor >::value); + BOOST_TEST(boost::has_nothrow_constructor >::value); #endif #ifndef BOOST_NO_CXX11_RVALUE_REFERENCES #ifdef BOOST_IS_NOTHROW_MOVE_ASSIGN - BOOST_CHECK(boost::is_nothrow_move_assignable >::value); + BOOST_TEST(boost::is_nothrow_move_assignable >::value); #endif #ifdef BOOST_IS_NOTHROW_MOVE_CONSTRUCT - BOOST_CHECK(boost::is_nothrow_move_constructible >::value); + BOOST_TEST(boost::is_nothrow_move_constructible >::value); #endif #endif #endif // BOOST_NO_CXX11_NOEXCEPT } // add common tests into a test suite -void add_common_tests(test_suite* tests) { - tests->add(BOOST_TEST_CASE(&basic_test)); - tests->add(BOOST_TEST_CASE(&constructor_and_element_access_test)); - tests->add(BOOST_TEST_CASE(&size_test)); - tests->add(BOOST_TEST_CASE(&allocator_test)); - tests->add(BOOST_TEST_CASE(&begin_and_end_test)); - tests->add(BOOST_TEST_CASE(&rbegin_and_rend_test)); - tests->add(BOOST_TEST_CASE(&element_access_and_insert_test)); - tests->add(BOOST_TEST_CASE(&at_test)); - tests->add(BOOST_TEST_CASE(&front_and_back_test)); - tests->add(BOOST_TEST_CASE(&linearize_test)); - tests->add(BOOST_TEST_CASE(&array_range_test)); - tests->add(BOOST_TEST_CASE(&capacity_and_reserve_test)); - tests->add(BOOST_TEST_CASE(&full_and_empty_test)); - tests->add(BOOST_TEST_CASE(&set_capacity_test)); - tests->add(BOOST_TEST_CASE(&rset_capacity_test)); - tests->add(BOOST_TEST_CASE(&resize_test)); - tests->add(BOOST_TEST_CASE(&rresize_test)); - tests->add(BOOST_TEST_CASE(&constructor_test)); - tests->add(BOOST_TEST_CASE(&assign_test)); - tests->add(BOOST_TEST_CASE(©_constructor_and_assign_test)); - tests->add(BOOST_TEST_CASE(&swap_test)); - tests->add(BOOST_TEST_CASE(&push_back_test)); - tests->add(BOOST_TEST_CASE(&pop_back_test)); - tests->add(BOOST_TEST_CASE(&insert_test)); - tests->add(BOOST_TEST_CASE(&insert_n_test)); - tests->add(BOOST_TEST_CASE(&insert_range_test)); - tests->add(BOOST_TEST_CASE(&push_front_test)); - tests->add(BOOST_TEST_CASE(&pop_front_test)); - tests->add(BOOST_TEST_CASE(&rinsert_test)); - tests->add(BOOST_TEST_CASE(&rinsert_n_test)); - tests->add(BOOST_TEST_CASE(&rinsert_range_test)); - tests->add(BOOST_TEST_CASE(&erase_test)); - tests->add(BOOST_TEST_CASE(&erase_range_test)); - tests->add(BOOST_TEST_CASE(&rerase_test)); - tests->add(BOOST_TEST_CASE(&rerase_range_test)); - tests->add(BOOST_TEST_CASE(&clear_test)); - tests->add(BOOST_TEST_CASE(&equality_test)); - tests->add(BOOST_TEST_CASE(&lexicographical_comparison_test)); - tests->add(BOOST_TEST_CASE(&assign_range_test)); - tests->add(BOOST_TEST_CASE(&example_test)); - tests->add(BOOST_TEST_CASE(&element_destruction_test)); - tests->add(BOOST_TEST_CASE(&const_methods_test)); - tests->add(BOOST_TEST_CASE(&rotate_test)); - tests->add(BOOST_TEST_CASE(&move_container_on_cpp11)); - tests->add(BOOST_TEST_CASE(&move_container_values_noexcept)); - tests->add(BOOST_TEST_CASE(&check_containers_exception_specifications)); +void run_common_tests() +{ + basic_test(); + constructor_and_element_access_test(); + size_test(); + allocator_test(); + begin_and_end_test(); + rbegin_and_rend_test(); + element_access_and_insert_test(); + at_test(); + front_and_back_test(); + linearize_test(); + array_range_test(); + capacity_and_reserve_test(); + full_and_empty_test(); + set_capacity_test(); + rset_capacity_test(); + resize_test(); + rresize_test(); + constructor_test(); + assign_test(); + copy_constructor_and_assign_test(); + swap_test(); + push_back_test(); + pop_back_test(); + insert_test(); + insert_n_test(); + insert_range_test(); + push_front_test(); + pop_front_test(); + rinsert_test(); + rinsert_n_test(); + rinsert_range_test(); + erase_test(); + erase_range_test(); + rerase_test(); + rerase_range_test(); + clear_test(); + equality_test(); + lexicographical_comparison_test(); + assign_range_test(); + example_test(); + element_destruction_test(); + const_methods_test(); + rotate_test(); + move_container_on_cpp11(); + move_container_values_noexcept(); + check_containers_exception_specifications(); #if !defined(BOOST_CB_NO_CXX11_ALLOCATOR) - tests->add(BOOST_TEST_CASE(&cxx11_allocator_test)); + cxx11_allocator_test(); #endif } diff --git a/test/constant_erase_test.cpp b/test/constant_erase_test.cpp index ba41f6c..e2431be 100644 --- a/test/constant_erase_test.cpp +++ b/test/constant_erase_test.cpp @@ -25,35 +25,35 @@ void erase_begin_test() { cb1.erase_begin(2); - BOOST_CHECK(cb1.size() == 3); - BOOST_CHECK(cb1[0] == 4); - BOOST_CHECK(cb1[1] == 5); - BOOST_CHECK(cb1[2] == 6); + BOOST_TEST(cb1.size() == 3); + BOOST_TEST(cb1[0] == 4); + BOOST_TEST(cb1[1] == 5); + BOOST_TEST(cb1[2] == 6); cb1.erase_begin(3); - BOOST_CHECK(cb1.empty()); - BOOST_CHECK(*p == 2); - BOOST_CHECK(*(p + 1) == 3); - BOOST_CHECK(*(p + 2) == 4); + BOOST_TEST(cb1.empty()); + BOOST_TEST(*p == 2); + BOOST_TEST(*(p + 1) == 3); + BOOST_TEST(*(p + 2) == 4); cb1.push_back(10); cb1.push_back(11); cb1.push_back(12); - BOOST_CHECK(cb1.size() == 3); - BOOST_CHECK(cb1[0] == 10); - BOOST_CHECK(cb1[1] == 11); - BOOST_CHECK(cb1[2] == 12); + BOOST_TEST(cb1.size() == 3); + BOOST_TEST(cb1[0] == 10); + BOOST_TEST(cb1[1] == 11); + BOOST_TEST(cb1[2] == 12); circular_buffer cb2(5, InstanceCounter()); - BOOST_CHECK(cb2.size() == 5); - BOOST_CHECK(InstanceCounter::count() == 5); + BOOST_TEST(cb2.size() == 5); + BOOST_TEST(InstanceCounter::count() == 5); cb2.erase_begin(2); - BOOST_CHECK(cb2.size() == 3); - BOOST_CHECK(InstanceCounter::count() == 3); + BOOST_TEST(cb2.size() == 3); + BOOST_TEST(InstanceCounter::count() == 3); circular_buffer cb3(5); cb3.push_back(1); @@ -64,10 +64,10 @@ void erase_begin_test() { cb3.push_back(6); cb3.erase_begin(2); - BOOST_CHECK(cb3.size() == 3); - BOOST_CHECK(cb3[0] == 4); - BOOST_CHECK(cb3[1] == 5); - BOOST_CHECK(cb3[2] == 6); + BOOST_TEST(cb3.size() == 3); + BOOST_TEST(cb3[0] == 4); + BOOST_TEST(cb3[1] == 5); + BOOST_TEST(cb3[2] == 6); } void erase_end_test() { @@ -84,35 +84,35 @@ void erase_end_test() { cb1.erase_end(2); - BOOST_CHECK(cb1.size() == 3); - BOOST_CHECK(cb1[0] == 2); - BOOST_CHECK(cb1[1] == 3); - BOOST_CHECK(cb1[2] ==4); + BOOST_TEST(cb1.size() == 3); + BOOST_TEST(cb1[0] == 2); + BOOST_TEST(cb1[1] == 3); + BOOST_TEST(cb1[2] ==4); cb1.erase_end(3); - BOOST_CHECK(cb1.empty()); - BOOST_CHECK(*p == 5); - BOOST_CHECK(*(p - 1) == 4); - BOOST_CHECK(*(p - 2) == 3); + BOOST_TEST(cb1.empty()); + BOOST_TEST(*p == 5); + BOOST_TEST(*(p - 1) == 4); + BOOST_TEST(*(p - 2) == 3); cb1.push_back(10); cb1.push_back(11); cb1.push_back(12); - BOOST_CHECK(cb1.size() == 3); - BOOST_CHECK(cb1[0] == 10); - BOOST_CHECK(cb1[1] == 11); - BOOST_CHECK(cb1[2] == 12); + BOOST_TEST(cb1.size() == 3); + BOOST_TEST(cb1[0] == 10); + BOOST_TEST(cb1[1] == 11); + BOOST_TEST(cb1[2] == 12); circular_buffer cb2(5, InstanceCounter()); - BOOST_CHECK(cb2.size() == 5); - BOOST_CHECK(InstanceCounter::count() == 5); + BOOST_TEST(cb2.size() == 5); + BOOST_TEST(InstanceCounter::count() == 5); cb2.erase_end(2); - BOOST_CHECK(cb2.size() == 3); - BOOST_CHECK(InstanceCounter::count() == 3); + BOOST_TEST(cb2.size() == 3); + BOOST_TEST(InstanceCounter::count() == 3); circular_buffer cb3(5); cb3.push_back(1); @@ -123,10 +123,10 @@ void erase_end_test() { cb3.push_back(6); cb3.erase_end(2); - BOOST_CHECK(cb3.size() == 3); - BOOST_CHECK(cb3[0] == 2); - BOOST_CHECK(cb3[1] == 3); - BOOST_CHECK(cb3[2] == 4); + BOOST_TEST(cb3.size() == 3); + BOOST_TEST(cb3[0] == 2); + BOOST_TEST(cb3[1] == 3); + BOOST_TEST(cb3[2] == 4); } void clear_test() { @@ -143,22 +143,22 @@ void clear_test() { cb1.clear(); - BOOST_CHECK(cb1.empty()); - BOOST_CHECK(*p == 2); - BOOST_CHECK(*(p + 1) == 3); - BOOST_CHECK(*(p + 2) == 4); - BOOST_CHECK(*(p + 3) == 5); - BOOST_CHECK(*(p - 1) == 6); + BOOST_TEST(cb1.empty()); + BOOST_TEST(*p == 2); + BOOST_TEST(*(p + 1) == 3); + BOOST_TEST(*(p + 2) == 4); + BOOST_TEST(*(p + 3) == 5); + BOOST_TEST(*(p - 1) == 6); circular_buffer cb2(5, InstanceCounter()); - BOOST_CHECK(cb2.size() == 5); - BOOST_CHECK(InstanceCounter::count() == 5); + BOOST_TEST(cb2.size() == 5); + BOOST_TEST(InstanceCounter::count() == 5); cb2.clear(); - BOOST_CHECK(cb2.empty()); - BOOST_CHECK(InstanceCounter::count() == 0); + BOOST_TEST(cb2.empty()); + BOOST_TEST(InstanceCounter::count() == 0); circular_buffer cb3(5); cb3.push_back(1); @@ -169,17 +169,14 @@ void clear_test() { cb3.push_back(6); cb3.clear(); - BOOST_CHECK(cb3.empty()); + BOOST_TEST(cb3.empty()); } // test main -test_suite* init_unit_test_suite(int /*argc*/, char* /*argv*/[]) { - - test_suite* tests = BOOST_TEST_SUITE("Unit tests for erase_begin/end and clear methods of the circular_buffer."); - - tests->add(BOOST_TEST_CASE(&erase_begin_test)); - tests->add(BOOST_TEST_CASE(&erase_end_test)); - tests->add(BOOST_TEST_CASE(&clear_test)); - - return tests; +int main() +{ + erase_begin_test(); + erase_end_test(); + clear_test(); + return boost::report_errors(); } diff --git a/test/soft_iterator_invalidation.cpp b/test/soft_iterator_invalidation.cpp index 9c27173..c266c9c 100644 --- a/test/soft_iterator_invalidation.cpp +++ b/test/soft_iterator_invalidation.cpp @@ -22,11 +22,11 @@ void validity_example_test() { circular_buffer::iterator it = cb.begin(); - BOOST_CHECK(*it == 1); + BOOST_TEST(*it == 1); cb.push_back(4); - BOOST_CHECK(*it == 4); + BOOST_TEST(*it == 4); } void validity_insert_test() { @@ -46,13 +46,13 @@ void validity_insert_test() { // memory placement: { 1, 4, 2, 3 } // circular buffer: { 1, 4, 2, 3 } - BOOST_CHECK(*it1 == 1); - BOOST_CHECK(*it2 == 4); - BOOST_CHECK(*it3 == 2); - BOOST_CHECK(cb[0] == 1); - BOOST_CHECK(cb[1] == 4); - BOOST_CHECK(cb[2] == 2); - BOOST_CHECK(cb[3] == 3); + BOOST_TEST(*it1 == 1); + BOOST_TEST(*it2 == 4); + BOOST_TEST(*it3 == 2); + BOOST_TEST(cb[0] == 1); + BOOST_TEST(cb[1] == 4); + BOOST_TEST(cb[2] == 2); + BOOST_TEST(cb[3] == 3); // it4 -> 3 circular_buffer::iterator it4 = it1 + 3; @@ -61,14 +61,14 @@ void validity_insert_test() { // memory placement: { 3, 5, 4, 2 } // circular buffer: { 5, 4, 2, 3 } - BOOST_CHECK(*it1 == 3); - BOOST_CHECK(*it2 == 5); - BOOST_CHECK(*it3 == 4); - BOOST_CHECK(*it4 == 2); - BOOST_CHECK(cb[0] == 5); - BOOST_CHECK(cb[1] == 4); - BOOST_CHECK(cb[2] == 2); - BOOST_CHECK(cb[3] == 3); + BOOST_TEST(*it1 == 3); + BOOST_TEST(*it2 == 5); + BOOST_TEST(*it3 == 4); + BOOST_TEST(*it4 == 2); + BOOST_TEST(cb[0] == 5); + BOOST_TEST(cb[1] == 4); + BOOST_TEST(cb[2] == 2); + BOOST_TEST(cb[3] == 3); } void validity_insert_n_test() { @@ -89,14 +89,14 @@ void validity_insert_n_test() { // memory placement: { 1, 4, 4, 2, 3 } // circular buffer: { 1, 4, 4, 2, 3 } - BOOST_CHECK(*it1 == 1); - BOOST_CHECK(*it2 == 4); - BOOST_CHECK(*it3 == 4); - BOOST_CHECK(cb[0] == 1); - BOOST_CHECK(cb[1] == 4); - BOOST_CHECK(cb[2] == 4); - BOOST_CHECK(cb[3] == 2); - BOOST_CHECK(cb[4] == 3); + BOOST_TEST(*it1 == 1); + BOOST_TEST(*it2 == 4); + BOOST_TEST(*it3 == 4); + BOOST_TEST(cb[0] == 1); + BOOST_TEST(cb[1] == 4); + BOOST_TEST(cb[2] == 4); + BOOST_TEST(cb[3] == 2); + BOOST_TEST(cb[4] == 3); // it4 -> 2, it5 -> 3 circular_buffer::iterator it4 = it1 + 3; @@ -106,16 +106,16 @@ void validity_insert_n_test() { // memory placement: { 3, 5, 4, 4, 2 } - 5 inserted only once // circular buffer: { 5, 4, 4, 2, 3 } - BOOST_CHECK(*it1 == 3); - BOOST_CHECK(*it2 == 5); - BOOST_CHECK(*it3 == 4); - BOOST_CHECK(*it4 == 4); - BOOST_CHECK(*it5 == 2); - BOOST_CHECK(cb[0] == 5); - BOOST_CHECK(cb[1] == 4); - BOOST_CHECK(cb[2] == 4); - BOOST_CHECK(cb[3] == 2); - BOOST_CHECK(cb[4] == 3); + BOOST_TEST(*it1 == 3); + BOOST_TEST(*it2 == 5); + BOOST_TEST(*it3 == 4); + BOOST_TEST(*it4 == 4); + BOOST_TEST(*it5 == 2); + BOOST_TEST(cb[0] == 5); + BOOST_TEST(cb[1] == 4); + BOOST_TEST(cb[2] == 4); + BOOST_TEST(cb[3] == 2); + BOOST_TEST(cb[4] == 3); } void validity_insert_range_test() { @@ -145,14 +145,14 @@ void validity_insert_range_test() { // memory placement: { 1, 4, 5, 2, 3 } // circular buffer: { 1, 4, 5, 2, 3 } - BOOST_CHECK(*it11 == 1); - BOOST_CHECK(*it12 == 4); - BOOST_CHECK(*it13 == 5); - BOOST_CHECK(cb1[0] == 1); - BOOST_CHECK(cb1[1] == 4); - BOOST_CHECK(cb1[2] == 5); - BOOST_CHECK(cb1[3] == 2); - BOOST_CHECK(cb1[4] == 3); + BOOST_TEST(*it11 == 1); + BOOST_TEST(*it12 == 4); + BOOST_TEST(*it13 == 5); + BOOST_TEST(cb1[0] == 1); + BOOST_TEST(cb1[1] == 4); + BOOST_TEST(cb1[2] == 5); + BOOST_TEST(cb1[3] == 2); + BOOST_TEST(cb1[4] == 3); // it14 -> 2, it15 -> 3 circular_buffer::iterator it14 = it11 + 3; @@ -162,16 +162,16 @@ void validity_insert_range_test() { // memory placement: { 3, 7, 4, 5, 2 } - 7 inserted only // circular buffer: { 7, 4, 5, 2, 3 } - BOOST_CHECK(*it11 == 3); - BOOST_CHECK(*it12 == 7); - BOOST_CHECK(*it13 == 4); - BOOST_CHECK(*it14 == 5); - BOOST_CHECK(*it15 == 2); - BOOST_CHECK(cb1[0] == 7); - BOOST_CHECK(cb1[1] == 4); - BOOST_CHECK(cb1[2] == 5); - BOOST_CHECK(cb1[3] == 2); - BOOST_CHECK(cb1[4] == 3); + BOOST_TEST(*it11 == 3); + BOOST_TEST(*it12 == 7); + BOOST_TEST(*it13 == 4); + BOOST_TEST(*it14 == 5); + BOOST_TEST(*it15 == 2); + BOOST_TEST(cb1[0] == 7); + BOOST_TEST(cb1[1] == 4); + BOOST_TEST(cb1[2] == 5); + BOOST_TEST(cb1[3] == 2); + BOOST_TEST(cb1[4] == 3); // memory placement: { 1, 2, 3 } // circular buffer: { 1, 2, 3 } @@ -189,14 +189,14 @@ void validity_insert_range_test() { // memory placement: { 1, 4, 5, 2, 3 } // circular buffer: { 1, 4, 5, 2, 3 } - BOOST_CHECK(*it21 == 1); - BOOST_CHECK(*it22 == 4); - BOOST_CHECK(*it23 == 5); - BOOST_CHECK(cb2[0] == 1); - BOOST_CHECK(cb2[1] == 4); - BOOST_CHECK(cb2[2] == 5); - BOOST_CHECK(cb2[3] == 2); - BOOST_CHECK(cb2[4] == 3); + BOOST_TEST(*it21 == 1); + BOOST_TEST(*it22 == 4); + BOOST_TEST(*it23 == 5); + BOOST_TEST(cb2[0] == 1); + BOOST_TEST(cb2[1] == 4); + BOOST_TEST(cb2[2] == 5); + BOOST_TEST(cb2[3] == 2); + BOOST_TEST(cb2[4] == 3); // it24 -> 2, it25 -> 3 circular_buffer::iterator it24 = it21 + 3; @@ -206,16 +206,16 @@ void validity_insert_range_test() { // memory placement: { 2, 3, 7, 4, 5 } - using input iterator inserts all items even if they are later replaced // circular buffer: { 7, 4, 5, 2, 3 } - BOOST_CHECK(*it21 == 2); - BOOST_CHECK(*it22 == 3); - BOOST_CHECK(*it23 == 7); - BOOST_CHECK(*it24 == 4); - BOOST_CHECK(*it25 == 5); - BOOST_CHECK(cb2[0] == 7); - BOOST_CHECK(cb2[1] == 4); - BOOST_CHECK(cb2[2] == 5); - BOOST_CHECK(cb2[3] == 2); - BOOST_CHECK(cb2[4] == 3); + BOOST_TEST(*it21 == 2); + BOOST_TEST(*it22 == 3); + BOOST_TEST(*it23 == 7); + BOOST_TEST(*it24 == 4); + BOOST_TEST(*it25 == 5); + BOOST_TEST(cb2[0] == 7); + BOOST_TEST(cb2[1] == 4); + BOOST_TEST(cb2[2] == 5); + BOOST_TEST(cb2[3] == 2); + BOOST_TEST(cb2[4] == 3); } void validity_rinsert_test() { @@ -235,13 +235,13 @@ void validity_rinsert_test() { // memory placement: { 2, 4, 3, 1 } // circular buffer: { 1, 2, 4, 3 } - BOOST_CHECK(*it1 == 2); - BOOST_CHECK(*it2 == 4); - BOOST_CHECK(*it3 == 3); - BOOST_CHECK(cb[0] == 1); - BOOST_CHECK(cb[1] == 2); - BOOST_CHECK(cb[2] == 4); - BOOST_CHECK(cb[3] == 3); + BOOST_TEST(*it1 == 2); + BOOST_TEST(*it2 == 4); + BOOST_TEST(*it3 == 3); + BOOST_TEST(cb[0] == 1); + BOOST_TEST(cb[1] == 2); + BOOST_TEST(cb[2] == 4); + BOOST_TEST(cb[3] == 3); // it4 -> 1 circular_buffer::iterator it4 = it1 - 1; @@ -250,14 +250,14 @@ void validity_rinsert_test() { // memory placement: { 5, 4, 1, 2 } // circular buffer: { 1, 2, 5, 4 } - BOOST_CHECK(*it1 == 5); - BOOST_CHECK(*it2 == 4); - BOOST_CHECK(*it3 == 1); - BOOST_CHECK(*it4 == 2); - BOOST_CHECK(cb[0] == 1); - BOOST_CHECK(cb[1] == 2); - BOOST_CHECK(cb[2] == 5); - BOOST_CHECK(cb[3] == 4); + BOOST_TEST(*it1 == 5); + BOOST_TEST(*it2 == 4); + BOOST_TEST(*it3 == 1); + BOOST_TEST(*it4 == 2); + BOOST_TEST(cb[0] == 1); + BOOST_TEST(cb[1] == 2); + BOOST_TEST(cb[2] == 5); + BOOST_TEST(cb[3] == 4); } void validity_rinsert_n_test() { @@ -278,14 +278,14 @@ void validity_rinsert_n_test() { // memory placement: { 4, 4, 3, 1, 2 } // circular buffer: { 1, 2, 4, 4, 3 } - BOOST_CHECK(*it1 == 4); - BOOST_CHECK(*it2 == 4); - BOOST_CHECK(*it3 == 3); - BOOST_CHECK(cb[0] == 1); - BOOST_CHECK(cb[1] == 2); - BOOST_CHECK(cb[2] == 4); - BOOST_CHECK(cb[3] == 4); - BOOST_CHECK(cb[4] == 3); + BOOST_TEST(*it1 == 4); + BOOST_TEST(*it2 == 4); + BOOST_TEST(*it3 == 3); + BOOST_TEST(cb[0] == 1); + BOOST_TEST(cb[1] == 2); + BOOST_TEST(cb[2] == 4); + BOOST_TEST(cb[3] == 4); + BOOST_TEST(cb[4] == 3); // it4 -> 1, it5 -> 2 circular_buffer::iterator it4 = it1 - 2; @@ -295,16 +295,16 @@ void validity_rinsert_n_test() { // memory placement: { 4, 5, 1, 2, 4 } - 5 inserted only once // circular buffer: { 1, 2, 4, 4, 5 } - BOOST_CHECK(*it1 == 4); - BOOST_CHECK(*it2 == 5); - BOOST_CHECK(*it3 == 1); - BOOST_CHECK(*it4 == 2); - BOOST_CHECK(*it5 == 4); - BOOST_CHECK(cb[0] == 1); - BOOST_CHECK(cb[1] == 2); - BOOST_CHECK(cb[2] == 4); - BOOST_CHECK(cb[3] == 4); - BOOST_CHECK(cb[4] == 5); + BOOST_TEST(*it1 == 4); + BOOST_TEST(*it2 == 5); + BOOST_TEST(*it3 == 1); + BOOST_TEST(*it4 == 2); + BOOST_TEST(*it5 == 4); + BOOST_TEST(cb[0] == 1); + BOOST_TEST(cb[1] == 2); + BOOST_TEST(cb[2] == 4); + BOOST_TEST(cb[3] == 4); + BOOST_TEST(cb[4] == 5); } void validity_rinsert_range_test() { @@ -334,14 +334,14 @@ void validity_rinsert_range_test() { // memory placement: { 4, 5, 3, 1, 2 } // circular buffer: { 1, 2, 4, 5, 3 } - BOOST_CHECK(*it11 == 4); - BOOST_CHECK(*it12 == 5); - BOOST_CHECK(*it13 == 3); - BOOST_CHECK(cb1[0] == 1); - BOOST_CHECK(cb1[1] == 2); - BOOST_CHECK(cb1[2] == 4); - BOOST_CHECK(cb1[3] == 5); - BOOST_CHECK(cb1[4] == 3); + BOOST_TEST(*it11 == 4); + BOOST_TEST(*it12 == 5); + BOOST_TEST(*it13 == 3); + BOOST_TEST(cb1[0] == 1); + BOOST_TEST(cb1[1] == 2); + BOOST_TEST(cb1[2] == 4); + BOOST_TEST(cb1[3] == 5); + BOOST_TEST(cb1[4] == 3); // it14 -> 1, it15 -> 2 circular_buffer::iterator it14 = it11 - 2; @@ -351,16 +351,16 @@ void validity_rinsert_range_test() { // memory placement: { 5, 6, 1, 2, 4 } - 6 inserted only // circular buffer: { 1, 2, 4, 5, 6 } - BOOST_CHECK(*it11 == 5); - BOOST_CHECK(*it12 == 6); - BOOST_CHECK(*it13 == 1); - BOOST_CHECK(*it14 == 2); - BOOST_CHECK(*it15 == 4); - BOOST_CHECK(cb1[0] == 1); - BOOST_CHECK(cb1[1] == 2); - BOOST_CHECK(cb1[2] == 4); - BOOST_CHECK(cb1[3] == 5); - BOOST_CHECK(cb1[4] == 6); + BOOST_TEST(*it11 == 5); + BOOST_TEST(*it12 == 6); + BOOST_TEST(*it13 == 1); + BOOST_TEST(*it14 == 2); + BOOST_TEST(*it15 == 4); + BOOST_TEST(cb1[0] == 1); + BOOST_TEST(cb1[1] == 2); + BOOST_TEST(cb1[2] == 4); + BOOST_TEST(cb1[3] == 5); + BOOST_TEST(cb1[4] == 6); // memory placement: { 1, 2, 3 } // circular buffer: { 1, 2, 3 } @@ -378,14 +378,14 @@ void validity_rinsert_range_test() { // memory placement: { 4, 5, 3, 1, 2 } // circular buffer: { 1, 2, 4, 5, 3 } - BOOST_CHECK(*it21 == 4); - BOOST_CHECK(*it22 == 5); - BOOST_CHECK(*it23 == 3); - BOOST_CHECK(cb2[0] == 1); - BOOST_CHECK(cb2[1] == 2); - BOOST_CHECK(cb2[2] == 4); - BOOST_CHECK(cb2[3] == 5); - BOOST_CHECK(cb2[4] == 3); + BOOST_TEST(*it21 == 4); + BOOST_TEST(*it22 == 5); + BOOST_TEST(*it23 == 3); + BOOST_TEST(cb2[0] == 1); + BOOST_TEST(cb2[1] == 2); + BOOST_TEST(cb2[2] == 4); + BOOST_TEST(cb2[3] == 5); + BOOST_TEST(cb2[4] == 3); // it24 -> 1, it25 -> 2 circular_buffer::iterator it24 = it21 - 2; @@ -395,16 +395,16 @@ void validity_rinsert_range_test() { // memory placement: { 5, 6, 1, 2, 4 } // circular buffer: { 1, 2, 4, 5, 6 } - BOOST_CHECK(*it21 == 5); - BOOST_CHECK(*it22 == 6); - BOOST_CHECK(*it23 == 1); - BOOST_CHECK(*it24 == 2); - BOOST_CHECK(*it25 == 4); - BOOST_CHECK(cb2[0] == 1); - BOOST_CHECK(cb2[1] == 2); - BOOST_CHECK(cb2[2] == 4); - BOOST_CHECK(cb2[3] == 5); - BOOST_CHECK(cb2[4] == 6); + BOOST_TEST(*it21 == 5); + BOOST_TEST(*it22 == 6); + BOOST_TEST(*it23 == 1); + BOOST_TEST(*it24 == 2); + BOOST_TEST(*it25 == 4); + BOOST_TEST(cb2[0] == 1); + BOOST_TEST(cb2[1] == 2); + BOOST_TEST(cb2[2] == 4); + BOOST_TEST(cb2[3] == 5); + BOOST_TEST(cb2[4] == 6); } void validity_erase_test() { @@ -430,14 +430,14 @@ void validity_erase_test() { // memory placement: { 5, X, 1, 3, 4 } // circular buffer: { 1, 3, 4, 5 } - BOOST_CHECK(*it1 == 1); - BOOST_CHECK(*it2 == 3); - BOOST_CHECK(*it3 == 4); - BOOST_CHECK(*it4 == 5); - BOOST_CHECK(cb[0] == 1); - BOOST_CHECK(cb[1] == 3); - BOOST_CHECK(cb[2] == 4); - BOOST_CHECK(cb[3] == 5); + BOOST_TEST(*it1 == 1); + BOOST_TEST(*it2 == 3); + BOOST_TEST(*it3 == 4); + BOOST_TEST(*it4 == 5); + BOOST_TEST(cb[0] == 1); + BOOST_TEST(cb[1] == 3); + BOOST_TEST(cb[2] == 4); + BOOST_TEST(cb[3] == 5); } void validity_erase_range_test() { @@ -465,14 +465,14 @@ void validity_erase_range_test() { // memory placement: { 6, X, X, 1, 2, 5 } // circular buffer: { 1, 2, 5, 6 } - BOOST_CHECK(*it1 == 1); - BOOST_CHECK(*it2 == 2); - BOOST_CHECK(*it3 == 5); - BOOST_CHECK(*it4 == 6); - BOOST_CHECK(cb[0] == 1); - BOOST_CHECK(cb[1] == 2); - BOOST_CHECK(cb[2] == 5); - BOOST_CHECK(cb[3] == 6); + BOOST_TEST(*it1 == 1); + BOOST_TEST(*it2 == 2); + BOOST_TEST(*it3 == 5); + BOOST_TEST(*it4 == 6); + BOOST_TEST(cb[0] == 1); + BOOST_TEST(cb[1] == 2); + BOOST_TEST(cb[2] == 5); + BOOST_TEST(cb[3] == 6); } void validity_rerase_test() { @@ -498,14 +498,14 @@ void validity_rerase_test() { // memory placement: { 4, 5, X, 1, 3 } // circular buffer: { 1, 3, 4, 5 } - BOOST_CHECK(*it1 == 1); - BOOST_CHECK(*it2 == 3); - BOOST_CHECK(*it3 == 4); - BOOST_CHECK(*it4 == 5); - BOOST_CHECK(cb[0] == 1); - BOOST_CHECK(cb[1] == 3); - BOOST_CHECK(cb[2] == 4); - BOOST_CHECK(cb[3] == 5); + BOOST_TEST(*it1 == 1); + BOOST_TEST(*it2 == 3); + BOOST_TEST(*it3 == 4); + BOOST_TEST(*it4 == 5); + BOOST_TEST(cb[0] == 1); + BOOST_TEST(cb[1] == 3); + BOOST_TEST(cb[2] == 4); + BOOST_TEST(cb[3] == 5); } void validity_rerase_range_test() { @@ -533,14 +533,14 @@ void validity_rerase_range_test() { // memory placement: { 2, 5, 6, X, X, 1 } // circular buffer: { 1, 2, 5, 6 } - BOOST_CHECK(*it1 == 1); - BOOST_CHECK(*it2 == 2); - BOOST_CHECK(*it3 == 5); - BOOST_CHECK(*it4 == 6); - BOOST_CHECK(cb[0] == 1); - BOOST_CHECK(cb[1] == 2); - BOOST_CHECK(cb[2] == 5); - BOOST_CHECK(cb[3] == 6); + BOOST_TEST(*it1 == 1); + BOOST_TEST(*it2 == 2); + BOOST_TEST(*it3 == 5); + BOOST_TEST(*it4 == 6); + BOOST_TEST(cb[0] == 1); + BOOST_TEST(cb[1] == 2); + BOOST_TEST(cb[2] == 5); + BOOST_TEST(cb[3] == 6); } void validity_linearize_test() { @@ -562,12 +562,12 @@ void validity_linearize_test() { // memory placement: { 1, 2, 3 } // circular buffer: { 1, 2, 3 } - BOOST_CHECK(*it1 == 2); - BOOST_CHECK(*it2 == 3); - BOOST_CHECK(*it3 == 1); - BOOST_CHECK(cb[0] == 1); - BOOST_CHECK(cb[1] == 2); - BOOST_CHECK(cb[2] == 3); + BOOST_TEST(*it1 == 2); + BOOST_TEST(*it2 == 3); + BOOST_TEST(*it3 == 1); + BOOST_TEST(cb[0] == 1); + BOOST_TEST(cb[1] == 2); + BOOST_TEST(cb[2] == 3); } void validity_swap_test() { @@ -602,18 +602,18 @@ void validity_swap_test() { // Although iterators refer to the original elements, // their internal state is inconsistent and no other operation // (except dereferencing) can be invoked on them any more. - BOOST_CHECK(*it11 == 1); - BOOST_CHECK(*it12 == 2); - BOOST_CHECK(*it13 == 3); - BOOST_CHECK(*it21 == 4); - BOOST_CHECK(*it22 == 5); - BOOST_CHECK(*it23 == 6); - BOOST_CHECK(cb1[0] == 4); - BOOST_CHECK(cb1[1] == 5); - BOOST_CHECK(cb1[2] == 6); - BOOST_CHECK(cb2[0] == 1); - BOOST_CHECK(cb2[1] == 2); - BOOST_CHECK(cb2[2] == 3); + BOOST_TEST(*it11 == 1); + BOOST_TEST(*it12 == 2); + BOOST_TEST(*it13 == 3); + BOOST_TEST(*it21 == 4); + BOOST_TEST(*it22 == 5); + BOOST_TEST(*it23 == 6); + BOOST_TEST(cb1[0] == 4); + BOOST_TEST(cb1[1] == 5); + BOOST_TEST(cb1[2] == 6); + BOOST_TEST(cb2[0] == 1); + BOOST_TEST(cb2[1] == 2); + BOOST_TEST(cb2[2] == 3); } void validity_push_back_test() { @@ -635,12 +635,12 @@ void validity_push_back_test() { // memory placement: { 3, 4, 2 } // circular buffer: { 2, 3, 4 } - BOOST_CHECK(*it1 == 4); - BOOST_CHECK(*it2 == 2); - BOOST_CHECK(*it3 == 3); - BOOST_CHECK(cb[0] == 2); - BOOST_CHECK(cb[1] == 3); - BOOST_CHECK(cb[2] == 4); + BOOST_TEST(*it1 == 4); + BOOST_TEST(*it2 == 2); + BOOST_TEST(*it3 == 3); + BOOST_TEST(cb[0] == 2); + BOOST_TEST(cb[1] == 3); + BOOST_TEST(cb[2] == 4); } void validity_push_front_test() { @@ -662,12 +662,12 @@ void validity_push_front_test() { // memory placement: { 4, 1, 2 } // circular buffer: { 4, 1, 2 } - BOOST_CHECK(*it1 == 1); - BOOST_CHECK(*it2 == 2); - BOOST_CHECK(*it3 == 4); - BOOST_CHECK(cb[0] == 4); - BOOST_CHECK(cb[1] == 1); - BOOST_CHECK(cb[2] == 2); + BOOST_TEST(*it1 == 1); + BOOST_TEST(*it2 == 2); + BOOST_TEST(*it3 == 4); + BOOST_TEST(cb[0] == 4); + BOOST_TEST(cb[1] == 1); + BOOST_TEST(cb[2] == 2); } void validity_pop_back_test() { @@ -688,10 +688,10 @@ void validity_pop_back_test() { // memory placement: { X, 1, 2 } // circular buffer: { 1, 2 } - BOOST_CHECK(*it1 == 1); - BOOST_CHECK(*it2 == 2); - BOOST_CHECK(cb[0] == 1); - BOOST_CHECK(cb[1] == 2); + BOOST_TEST(*it1 == 1); + BOOST_TEST(*it2 == 2); + BOOST_TEST(cb[0] == 1); + BOOST_TEST(cb[1] == 2); } void validity_pop_front_test() { @@ -712,34 +712,31 @@ void validity_pop_front_test() { // memory placement: { 3, X, 2 } // circular buffer: { 2, 3 } - BOOST_CHECK(*it1 == 2); - BOOST_CHECK(*it2 == 3); - BOOST_CHECK(cb[0] == 2); - BOOST_CHECK(cb[1] == 3); + BOOST_TEST(*it1 == 2); + BOOST_TEST(*it2 == 3); + BOOST_TEST(cb[0] == 2); + BOOST_TEST(cb[1] == 3); } // test main -test_suite* init_unit_test_suite(int /*argc*/, char* /*argv*/[]) { - - test_suite* tests = BOOST_TEST_SUITE("Unit tests for the iterator of the circular_buffer."); - - tests->add(BOOST_TEST_CASE(&validity_example_test)); - tests->add(BOOST_TEST_CASE(&validity_insert_test)); - tests->add(BOOST_TEST_CASE(&validity_insert_n_test)); - tests->add(BOOST_TEST_CASE(&validity_insert_range_test)); - tests->add(BOOST_TEST_CASE(&validity_rinsert_test)); - tests->add(BOOST_TEST_CASE(&validity_rinsert_n_test)); - tests->add(BOOST_TEST_CASE(&validity_rinsert_range_test)); - tests->add(BOOST_TEST_CASE(&validity_erase_test)); - tests->add(BOOST_TEST_CASE(&validity_erase_range_test)); - tests->add(BOOST_TEST_CASE(&validity_rerase_test)); - tests->add(BOOST_TEST_CASE(&validity_rerase_range_test)); - tests->add(BOOST_TEST_CASE(&validity_linearize_test)); - tests->add(BOOST_TEST_CASE(&validity_swap_test)); - tests->add(BOOST_TEST_CASE(&validity_push_back_test)); - tests->add(BOOST_TEST_CASE(&validity_push_front_test)); - tests->add(BOOST_TEST_CASE(&validity_pop_back_test)); - tests->add(BOOST_TEST_CASE(&validity_pop_front_test)); - - return tests; +int main() +{ + validity_example_test(); + validity_insert_test(); + validity_insert_n_test(); + validity_insert_range_test(); + validity_rinsert_test(); + validity_rinsert_n_test(); + validity_rinsert_range_test(); + validity_erase_test(); + validity_erase_range_test(); + validity_rerase_test(); + validity_rerase_range_test(); + validity_linearize_test(); + validity_swap_test(); + validity_push_back_test(); + validity_push_front_test(); + validity_pop_back_test(); + validity_pop_front_test(); + return boost::report_errors(); } diff --git a/test/space_optimized_test.cpp b/test/space_optimized_test.cpp index 3c708c9..8694fcd 100644 --- a/test/space_optimized_test.cpp +++ b/test/space_optimized_test.cpp @@ -29,33 +29,33 @@ void min_capacity_test() { cb_space_optimized cb2(capacity_ctrl(10, 5), 1); cb_space_optimized cb3(capacity_ctrl(20, 10), v.begin(), v.end()); - BOOST_CHECK(cb1.size() == 0); - BOOST_CHECK(cb1.capacity().capacity() == 10); - BOOST_CHECK(cb1.capacity().min_capacity() == 10); - BOOST_CHECK(cb2[0] == 1); - BOOST_CHECK(cb2.size() == 10); - BOOST_CHECK(cb2.capacity() == 10); - BOOST_CHECK(cb2.capacity().min_capacity() == 5); - BOOST_CHECK(cb3[0] == 1); - BOOST_CHECK(cb3.size() == 5); - BOOST_CHECK(cb3.capacity() == 20); - BOOST_CHECK(cb3.capacity().min_capacity() == 10); - BOOST_CHECK(cb1.capacity().min_capacity() <= cb1.internal_capacity()); - BOOST_CHECK(cb2.capacity().min_capacity() <= cb2.internal_capacity()); - BOOST_CHECK(cb3.capacity().min_capacity() <= cb3.internal_capacity()); + BOOST_TEST(cb1.size() == 0); + BOOST_TEST(cb1.capacity().capacity() == 10); + BOOST_TEST(cb1.capacity().min_capacity() == 10); + BOOST_TEST(cb2[0] == 1); + BOOST_TEST(cb2.size() == 10); + BOOST_TEST(cb2.capacity() == 10); + BOOST_TEST(cb2.capacity().min_capacity() == 5); + BOOST_TEST(cb3[0] == 1); + BOOST_TEST(cb3.size() == 5); + BOOST_TEST(cb3.capacity() == 20); + BOOST_TEST(cb3.capacity().min_capacity() == 10); + BOOST_TEST(cb1.capacity().min_capacity() <= cb1.internal_capacity()); + BOOST_TEST(cb2.capacity().min_capacity() <= cb2.internal_capacity()); + BOOST_TEST(cb3.capacity().min_capacity() <= cb3.internal_capacity()); cb2.erase(cb2.begin() + 2, cb2.end()); - BOOST_CHECK(cb2.size() == 2); - BOOST_CHECK(cb2.capacity().min_capacity() <= cb2.internal_capacity()); + BOOST_TEST(cb2.size() == 2); + BOOST_TEST(cb2.capacity().min_capacity() <= cb2.internal_capacity()); cb2.clear(); cb3.clear(); - BOOST_CHECK(cb2.empty()); - BOOST_CHECK(cb3.empty()); - BOOST_CHECK(cb2.capacity().min_capacity() <= cb2.internal_capacity()); - BOOST_CHECK(cb3.capacity().min_capacity() <= cb3.internal_capacity()); + BOOST_TEST(cb2.empty()); + BOOST_TEST(cb3.empty()); + BOOST_TEST(cb2.capacity().min_capacity() <= cb2.internal_capacity()); + BOOST_TEST(cb3.capacity().min_capacity() <= cb3.internal_capacity()); } void capacity_control_test() { @@ -65,33 +65,33 @@ void capacity_control_test() { circular_buffer_space_optimized::capacity_type(20, 5); circular_buffer_space_optimized::capacity_type c3 = c2; - BOOST_CHECK(c1.capacity() == 10); - BOOST_CHECK(c1.min_capacity() == 0); - BOOST_CHECK(c2.capacity() == 20); - BOOST_CHECK(c2.min_capacity() == 5); - BOOST_CHECK(c3.capacity() == 20); - BOOST_CHECK(c3.min_capacity() == 5); + BOOST_TEST(c1.capacity() == 10); + BOOST_TEST(c1.min_capacity() == 0); + BOOST_TEST(c2.capacity() == 20); + BOOST_TEST(c2.min_capacity() == 5); + BOOST_TEST(c3.capacity() == 20); + BOOST_TEST(c3.min_capacity() == 5); c1 = c2; - BOOST_CHECK(c1.capacity() == 20); - BOOST_CHECK(c1.min_capacity() == 5); + BOOST_TEST(c1.capacity() == 20); + BOOST_TEST(c1.min_capacity() == 5); } void specific_constructors_test() { cb_space_optimized cb1; - BOOST_CHECK(cb1.capacity() == 0); - BOOST_CHECK(cb1.capacity().min_capacity() == 0); - BOOST_CHECK(cb1.internal_capacity() == 0); - BOOST_CHECK(cb1.size() == 0); + BOOST_TEST(cb1.capacity() == 0); + BOOST_TEST(cb1.capacity().min_capacity() == 0); + BOOST_TEST(cb1.internal_capacity() == 0); + BOOST_TEST(cb1.size() == 0); cb1.push_back(1); cb1.push_back(2); cb1.push_back(3); - BOOST_CHECK(cb1.size() == 0); - BOOST_CHECK(cb1.capacity() == 0); + BOOST_TEST(cb1.size() == 0); + BOOST_TEST(cb1.capacity() == 0); vector v; v.push_back(1); @@ -100,9 +100,9 @@ void specific_constructors_test() { cb_space_optimized cb2(v.begin(), v.end()); - BOOST_CHECK(cb2.capacity() == 3); - BOOST_CHECK(cb2.capacity().min_capacity() == 0); - BOOST_CHECK(cb2.size() == 3); + BOOST_TEST(cb2.capacity() == 3); + BOOST_TEST(cb2.capacity().min_capacity() == 0); + BOOST_TEST(cb2.size() == 3); } void shrink_to_fit_test() { @@ -112,15 +112,15 @@ void shrink_to_fit_test() { cb.push_back(2); cb.push_back(3); - BOOST_CHECK(cb.size() == 3); - BOOST_CHECK(cb.capacity() == 1000); + BOOST_TEST(cb.size() == 3); + BOOST_TEST(cb.capacity() == 1000); size_t internal_capacity = cb.internal_capacity(); cb_space_optimized(cb).swap(cb); - BOOST_CHECK(cb.size() == 3); - BOOST_CHECK(cb.capacity() == 1000); - BOOST_CHECK(internal_capacity >= cb.internal_capacity()); + BOOST_TEST(cb.size() == 3); + BOOST_TEST(cb.capacity() == 1000); + BOOST_TEST(internal_capacity >= cb.internal_capacity()); } void iterator_invalidation_test() { @@ -136,33 +136,33 @@ void iterator_invalidation_test() { cb_space_optimized::iterator it3 = cb1.begin() + 6; cb1.set_capacity(10); - BOOST_CHECK(it1.is_valid(&cb1)); - BOOST_CHECK(!it2.is_valid(&cb1)); - BOOST_CHECK(!it3.is_valid(&cb1)); + BOOST_TEST(it1.is_valid(&cb1)); + BOOST_TEST(!it2.is_valid(&cb1)); + BOOST_TEST(!it3.is_valid(&cb1)); it1 = cb1.end(); it2 = cb1.begin(); it3 = cb1.begin() + 6; cb1.rset_capacity(10); - BOOST_CHECK(it1.is_valid(&cb1)); - BOOST_CHECK(!it2.is_valid(&cb1)); - BOOST_CHECK(!it3.is_valid(&cb1)); + BOOST_TEST(it1.is_valid(&cb1)); + BOOST_TEST(!it2.is_valid(&cb1)); + BOOST_TEST(!it3.is_valid(&cb1)); it1 = cb1.end(); it2 = cb1.begin(); it3 = cb1.begin() + 6; cb1.resize(10); - BOOST_CHECK(it1.is_valid(&cb1)); - BOOST_CHECK(!it2.is_valid(&cb1)); - BOOST_CHECK(!it3.is_valid(&cb1)); + BOOST_TEST(it1.is_valid(&cb1)); + BOOST_TEST(!it2.is_valid(&cb1)); + BOOST_TEST(!it3.is_valid(&cb1)); it1 = cb1.end(); it2 = cb1.begin(); it3 = cb1.begin() + 6; cb1.rresize(10); - BOOST_CHECK(it1.is_valid(&cb1)); - BOOST_CHECK(!it2.is_valid(&cb1)); - BOOST_CHECK(!it3.is_valid(&cb1)); + BOOST_TEST(it1.is_valid(&cb1)); + BOOST_TEST(!it2.is_valid(&cb1)); + BOOST_TEST(!it3.is_valid(&cb1)); { cb_space_optimized cb2(10, 1); @@ -173,24 +173,21 @@ void iterator_invalidation_test() { it2 = cb2.begin(); it3 = cb2.begin() + 6; } - BOOST_CHECK(!it1.is_valid(&cb1)); - BOOST_CHECK(!it2.is_valid(&cb1)); - BOOST_CHECK(!it3.is_valid(&cb1)); + BOOST_TEST(!it1.is_valid(&cb1)); + BOOST_TEST(!it2.is_valid(&cb1)); + BOOST_TEST(!it3.is_valid(&cb1)); #endif // #if BOOST_CB_ENABLE_DEBUG } // test main -test_suite* init_unit_test_suite(int /*argc*/, char* /*argv*/[]) { - - test_suite* tests = BOOST_TEST_SUITE("Unit tests for the circular_buffer_space_optimized."); - add_common_tests(tests); - - tests->add(BOOST_TEST_CASE(&min_capacity_test)); - tests->add(BOOST_TEST_CASE(&capacity_control_test)); - tests->add(BOOST_TEST_CASE(&specific_constructors_test)); - tests->add(BOOST_TEST_CASE(&shrink_to_fit_test)); - tests->add(BOOST_TEST_CASE(&iterator_invalidation_test)); - - return tests; +int main() +{ + run_common_tests(); + min_capacity_test(); + capacity_control_test(); + specific_constructors_test(); + shrink_to_fit_test(); + iterator_invalidation_test(); + return boost::report_errors(); } diff --git a/test/test.hpp b/test/test.hpp index 54a0845..bbcc770 100644 --- a/test/test.hpp +++ b/test/test.hpp @@ -16,7 +16,7 @@ #define BOOST_CB_TEST #include -#include +#include #include #include #include @@ -139,7 +139,6 @@ inline ptrdiff_t* distance_type(const MyInputIterator&) { return 0; } #endif // #if defined(BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION) && !defined(BOOST_MSVC_STD_ITERATOR) -using boost::unit_test::test_suite; using namespace boost; using namespace std;