|
From: Jan G. <jan...@us...> - 2007-04-15 22:52:35
|
Update of /cvsroot/boost-sandbox/boost-sandbox/libs/circular_buffer/test In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv4782/libs/circular_buffer/test Modified Files: base_test.cpp soft_iterator_invalidation.cpp space_optimized_test.cpp Log Message: circular_buffer: updated srcdoc and test cases Index: space_optimized_test.cpp =================================================================== RCS file: /cvsroot/boost-sandbox/boost-sandbox/libs/circular_buffer/test/space_optimized_test.cpp,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- space_optimized_test.cpp 9 Apr 2007 22:06:14 -0000 1.14 +++ space_optimized_test.cpp 15 Apr 2007 22:52:34 -0000 1.15 @@ -152,7 +152,6 @@ BOOST_CHECK(!it2.is_valid(&cb1)); BOOST_CHECK(!it3.is_valid(&cb1)); - #endif // #if !defined(NDEBUG) && !defined(BOOST_CB_DISABLE_DEBUG) } Index: base_test.cpp =================================================================== RCS file: /cvsroot/boost-sandbox/boost-sandbox/libs/circular_buffer/test/base_test.cpp,v retrieving revision 1.19 retrieving revision 1.20 diff -u -d -r1.19 -r1.20 --- base_test.cpp 8 Apr 2007 22:10:24 -0000 1.19 +++ base_test.cpp 15 Apr 2007 22:52:34 -0000 1.20 @@ -234,6 +234,17 @@ BOOST_CHECK(it5.is_valid(0)); BOOST_CHECK(it6.is_valid(0)); + circular_buffer<MyInteger> cb(10, 0); + it1 = cb.end(); + cb.clear(); + BOOST_CHECK(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); + circular_buffer<MyInteger> cb1(10, 0); circular_buffer<MyInteger> cb2(20, 0); it1 = cb1.end(); @@ -440,6 +451,39 @@ BOOST_CHECK(!it3.is_valid(&cb8)); BOOST_CHECK(it4.is_valid(&cb8)); + circular_buffer<MyInteger> cb9(15, 1); + it1 = cb9.end(); + it2 = cb9.begin(); + 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)); + + circular_buffer<MyInteger> cb10(10, 1); + it1 = cb10.end(); + it2 = cb10.begin(); + 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)); + + circular_buffer<MyInteger> cb11(10, 1); + it1 = cb11.end(); + it2 = cb11.begin(); + 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)); + #endif // #if !defined(NDEBUG) && !defined(BOOST_CB_DISABLE_DEBUG) } @@ -472,6 +516,11 @@ circular_buffer<MyInteger> cb7(8, 3); MyInteger::set_exception_trigger(3); BOOST_CHECK_THROW(cb7 = cb6, exception); + BOOST_CHECK(cb7.size() == 8); + BOOST_CHECK(cb7.capacity() == 8); + BOOST_CHECK(cb7[0] == 3); + BOOST_CHECK(cb7[7] == 3); + generic_test(cb7); circular_buffer<MyInteger> cb8(5, 10); MyInteger::set_exception_trigger(2); Index: soft_iterator_invalidation.cpp =================================================================== RCS file: /cvsroot/boost-sandbox/boost-sandbox/libs/circular_buffer/test/soft_iterator_invalidation.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- soft_iterator_invalidation.cpp 8 Apr 2007 22:10:24 -0000 1.4 +++ soft_iterator_invalidation.cpp 15 Apr 2007 22:52:34 -0000 1.5 @@ -1,6 +1,6 @@ // Demonstration of rules when an iterator is considered to be valid if the soft // iterator invalidation definition is applied. -// Note: The soft iterator invalidation definition can not be applied +// Note: The soft iterator invalidation definition CAN NOT be applied // to the space optimized circular buffer. // Copyright (c) 2003-2007 Jan Gaspar |