From f721b8b28c3b9b18903d02df56fdf2baf60e384a Mon Sep 17 00:00:00 2001 From: Stefan Slapeta Date: Thu, 3 Feb 2005 13:48:49 +0000 Subject: [PATCH] replaced BOOST_TEST [SVN r27054] --- addressof_test.cpp | 8 +- compressed_pair_test.cpp | 108 ++++++------- iterators_test.cpp | 22 +-- operators_test.cpp | 338 +++++++++++++++++++-------------------- ref_test.cpp | 8 +- value_init_test.cpp | 20 +-- 6 files changed, 252 insertions(+), 252 deletions(-) diff --git a/addressof_test.cpp b/addressof_test.cpp index 60f2e23..2630f27 100644 --- a/addressof_test.cpp +++ b/addressof_test.cpp @@ -26,16 +26,16 @@ int test_main(int, char*[]) nonaddressable* px = new nonaddressable(); nonaddressable& x = *px; - BOOST_TEST(boost::addressof(x) == px); + BOOST_CHECK(boost::addressof(x) == px); const nonaddressable& cx = *px; - BOOST_TEST(boost::addressof(cx) == static_cast(px)); + BOOST_CHECK(boost::addressof(cx) == static_cast(px)); volatile nonaddressable& vx = *px; - BOOST_TEST(boost::addressof(vx) == static_cast(px)); + BOOST_CHECK(boost::addressof(vx) == static_cast(px)); const volatile nonaddressable& cvx = *px; - BOOST_TEST(boost::addressof(cvx) == static_cast(px)); + BOOST_CHECK(boost::addressof(cvx) == static_cast(px)); return 0; } diff --git a/compressed_pair_test.cpp b/compressed_pair_test.cpp index 9044ace..5a7340c 100644 --- a/compressed_pair_test.cpp +++ b/compressed_pair_test.cpp @@ -85,47 +85,47 @@ void compressed_pair_tester::test(first_param_type p1, second_param_type // first param construct: boost::compressed_pair cp2(p1); cp2.second() = p2; - BOOST_TEST(cp2.first() == p1); - BOOST_TEST(cp2.second() == p2); + BOOST_CHECK(cp2.first() == p1); + BOOST_CHECK(cp2.second() == p2); // second param construct: boost::compressed_pair cp3(p2); cp3.first() = p1; - BOOST_TEST(cp3.second() == p2); - BOOST_TEST(cp3.first() == p1); + BOOST_CHECK(cp3.second() == p2); + BOOST_CHECK(cp3.first() == p1); // both param construct: boost::compressed_pair cp4(p1, p2); - BOOST_TEST(cp4.first() == p1); - BOOST_TEST(cp4.second() == p2); + BOOST_CHECK(cp4.first() == p1); + BOOST_CHECK(cp4.second() == p2); boost::compressed_pair cp5(p3, p4); - BOOST_TEST(cp5.first() == p3); - BOOST_TEST(cp5.second() == p4); + BOOST_CHECK(cp5.first() == p3); + BOOST_CHECK(cp5.second() == p4); // check const members: const boost::compressed_pair& cpr1 = cp4; - BOOST_TEST(cpr1.first() == p1); - BOOST_TEST(cpr1.second() == p2); + BOOST_CHECK(cpr1.first() == p1); + BOOST_CHECK(cpr1.second() == p2); // copy construct: boost::compressed_pair cp6(cp4); - BOOST_TEST(cp6.first() == p1); - BOOST_TEST(cp6.second() == p2); + BOOST_CHECK(cp6.first() == p1); + BOOST_CHECK(cp6.second() == p2); // assignment: cp1 = cp4; - BOOST_TEST(cp1.first() == p1); - BOOST_TEST(cp1.second() == p2); + BOOST_CHECK(cp1.first() == p1); + BOOST_CHECK(cp1.second() == p2); cp1 = cp5; - BOOST_TEST(cp1.first() == p3); - BOOST_TEST(cp1.second() == p4); + BOOST_CHECK(cp1.first() == p3); + BOOST_CHECK(cp1.second() == p4); // swap: cp4.swap(cp5); - BOOST_TEST(cp4.first() == p3); - BOOST_TEST(cp4.second() == p4); - BOOST_TEST(cp5.first() == p1); - BOOST_TEST(cp5.second() == p2); + BOOST_CHECK(cp4.first() == p3); + BOOST_CHECK(cp4.second() == p4); + BOOST_CHECK(cp5.first() == p1); + BOOST_CHECK(cp5.second() == p2); swap(cp4,cp5); - BOOST_TEST(cp4.first() == p1); - BOOST_TEST(cp4.second() == p2); - BOOST_TEST(cp5.first() == p3); - BOOST_TEST(cp5.second() == p4); + BOOST_CHECK(cp4.first() == p1); + BOOST_CHECK(cp4.second() == p2); + BOOST_CHECK(cp5.first() == p3); + BOOST_CHECK(cp5.second() == p4); } // @@ -154,20 +154,20 @@ void compressed_pair_reference_tester::test(first_param_type p1, second_ #endif // both param construct: boost::compressed_pair cp4(p1, p2); - BOOST_TEST(cp4.first() == p1); - BOOST_TEST(cp4.second() == p2); + BOOST_CHECK(cp4.first() == p1); + BOOST_CHECK(cp4.second() == p2); boost::compressed_pair cp5(p3, p4); - BOOST_TEST(cp5.first() == p3); - BOOST_TEST(cp5.second() == p4); + BOOST_CHECK(cp5.first() == p3); + BOOST_CHECK(cp5.second() == p4); // check const members: const boost::compressed_pair& cpr1 = cp4; - BOOST_TEST(cpr1.first() == p1); - BOOST_TEST(cpr1.second() == p2); + BOOST_CHECK(cpr1.first() == p1); + BOOST_CHECK(cpr1.second() == p2); // copy construct: boost::compressed_pair cp6(cp4); - BOOST_TEST(cp6.first() == p1); - BOOST_TEST(cp6.second() == p2); + BOOST_CHECK(cp6.first() == p1); + BOOST_CHECK(cp6.second() == p2); // assignment: // VC6 bug: // When second() is an empty class, VC6 performs the @@ -180,8 +180,8 @@ void compressed_pair_reference_tester::test(first_param_type p1, second_ // settings - some generate the problem others do not. cp4.first() = p3; cp4.second() = p4; - BOOST_TEST(cp4.first() == p3); - BOOST_TEST(cp4.second() == p4); + BOOST_CHECK(cp4.first() == p3); + BOOST_CHECK(cp4.second() == p4); } // // supplimentary tests for case where first arg only is a reference type: @@ -205,8 +205,8 @@ void compressed_pair_reference1_tester::test(first_param_type p1, second // first param construct: boost::compressed_pair cp2(p1); cp2.second() = p2; - BOOST_TEST(cp2.first() == p1); - BOOST_TEST(cp2.second() == p2); + BOOST_CHECK(cp2.first() == p1); + BOOST_CHECK(cp2.second() == p2); #endif } // @@ -231,8 +231,8 @@ void compressed_pair_reference2_tester::test(first_param_type p1, second // second param construct: boost::compressed_pair cp3(p2); cp3.first() = p1; - BOOST_TEST(cp3.second() == p2); - BOOST_TEST(cp3.first() == p1); + BOOST_CHECK(cp3.second() == p2); + BOOST_CHECK(cp3.first() == p1); #endif } @@ -259,14 +259,14 @@ void compressed_pair_array1_tester::test(first_param_type p1, second_par // second param construct: boost::compressed_pair cp3(p2); cp3.first()[0] = p1[0]; - BOOST_TEST(cp3.second() == p2); - BOOST_TEST(cp3.first()[0] == p1[0]); + BOOST_CHECK(cp3.second() == p2); + BOOST_CHECK(cp3.first()[0] == p1[0]); // check const members: const boost::compressed_pair& cpr1 = cp3; - BOOST_TEST(cpr1.first()[0] == p1[0]); - BOOST_TEST(cpr1.second() == p2); + BOOST_CHECK(cpr1.first()[0] == p1[0]); + BOOST_CHECK(cpr1.second() == p2); - BOOST_TEST(sizeof(T1) == sizeof(cp1.first())); + BOOST_CHECK(sizeof(T1) == sizeof(cp1.first())); } template @@ -289,14 +289,14 @@ void compressed_pair_array2_tester::test(first_param_type p1, second_par // first param construct: boost::compressed_pair cp2(p1); cp2.second()[0] = p2[0]; - BOOST_TEST(cp2.first() == p1); - BOOST_TEST(cp2.second()[0] == p2[0]); + BOOST_CHECK(cp2.first() == p1); + BOOST_CHECK(cp2.second()[0] == p2[0]); // check const members: const boost::compressed_pair& cpr1 = cp2; - BOOST_TEST(cpr1.first() == p1); - BOOST_TEST(cpr1.second()[0] == p2[0]); + BOOST_CHECK(cpr1.first() == p1); + BOOST_CHECK(cpr1.second()[0] == p2[0]); - BOOST_TEST(sizeof(T2) == sizeof(cp1.second())); + BOOST_CHECK(sizeof(T2) == sizeof(cp1.second())); } template @@ -318,15 +318,15 @@ void compressed_pair_array_tester::test(first_param_type p1, second_para boost::compressed_pair cp1; cp1.first()[0] = p1[0]; cp1.second()[0] = p2[0]; - BOOST_TEST(cp1.first()[0] == p1[0]); - BOOST_TEST(cp1.second()[0] == p2[0]); + BOOST_CHECK(cp1.first()[0] == p1[0]); + BOOST_CHECK(cp1.second()[0] == p2[0]); // check const members: const boost::compressed_pair& cpr1 = cp1; - BOOST_TEST(cpr1.first()[0] == p1[0]); - BOOST_TEST(cpr1.second()[0] == p2[0]); + BOOST_CHECK(cpr1.first()[0] == p1[0]); + BOOST_CHECK(cpr1.second()[0] == p2[0]); - BOOST_TEST(sizeof(T1) == sizeof(cp1.first())); - BOOST_TEST(sizeof(T2) == sizeof(cp1.second())); + BOOST_CHECK(sizeof(T1) == sizeof(cp1.first())); + BOOST_CHECK(sizeof(T2) == sizeof(cp1.second())); } int test_main(int, char *[]) diff --git a/iterators_test.cpp b/iterators_test.cpp index 87bd3e6..7ac1191 100644 --- a/iterators_test.cpp +++ b/iterators_test.cpp @@ -174,7 +174,7 @@ test_opr::post_increment_test oss << *i++ << ' '; } - BOOST_TEST( oss.str() == "apple orange pear peach grape plum "); + BOOST_CHECK( oss.str() == "apple orange pear peach grape plum "); } // Test post-decrement @@ -193,7 +193,7 @@ test_opr::post_decrement_test oss << *i << ' '; } - BOOST_TEST( oss.str() == "plum grape peach pear orange apple "); + BOOST_CHECK( oss.str() == "plum grape peach pear orange apple "); } // Test indirect structure referral @@ -211,7 +211,7 @@ test_opr::indirect_referral_test oss << i->size() << ' '; } - BOOST_TEST( oss.str() == "5 6 4 5 5 4 "); + BOOST_CHECK( oss.str() == "5 6 4 5 5 4 "); } // Test offset addition @@ -230,7 +230,7 @@ test_opr::offset_addition_test oss << *i << ' '; } - BOOST_TEST( oss.str() == "apple pear grape "); + BOOST_CHECK( oss.str() == "apple pear grape "); } // Test offset addition, in reverse order @@ -249,7 +249,7 @@ test_opr::reverse_offset_addition_test oss << *i << ' '; } - BOOST_TEST( oss.str() == "apple pear grape "); + BOOST_CHECK( oss.str() == "apple pear grape "); } // Test offset subtraction @@ -272,7 +272,7 @@ test_opr::offset_subtraction_test } } - BOOST_TEST( oss.str() == "grape pear apple "); + BOOST_CHECK( oss.str() == "grape pear apple "); } // Test comparisons @@ -296,10 +296,10 @@ test_opr::comparison_test { ptrdiff_t const j_offset = j - fruit_begin; - BOOST_TEST( (i != j) == (i_offset != j_offset) ); - BOOST_TEST( (i > j) == (i_offset > j_offset) ); - BOOST_TEST( (i <= j) == (i_offset <= j_offset) ); - BOOST_TEST( (i >= j) == (i_offset >= j_offset) ); + BOOST_CHECK( (i != j) == (i_offset != j_offset) ); + BOOST_CHECK( (i > j) == (i_offset > j_offset) ); + BOOST_CHECK( (i <= j) == (i_offset <= j_offset) ); + BOOST_CHECK( (i >= j) == (i_offset >= j_offset) ); } } cout << std::endl; @@ -320,5 +320,5 @@ test_opr::indexing_test oss << fruit_begin[ k ] << ' '; } - BOOST_TEST( oss.str() == "apple orange pear peach grape plum "); + BOOST_CHECK( oss.str() == "apple orange pear peach grape plum "); } diff --git a/operators_test.cpp b/operators_test.cpp index 9ed1bd3..d3c3811 100644 --- a/operators_test.cpp +++ b/operators_test.cpp @@ -269,17 +269,17 @@ namespace template void sanity_check(X1 x1, Y1 y1, X2 x2, Y2 y2) { - BOOST_TEST( true_value(y1) == true_value(y2) ); - BOOST_TEST( true_value(x1) == true_value(x2) ); + BOOST_CHECK( true_value(y1) == true_value(y2) ); + BOOST_CHECK( true_value(x1) == true_value(x2) ); } template void test_less_than_comparable_aux(X1 x1, Y1 y1, X2 x2, Y2 y2) { - BOOST_TEST( (x1 < y1) == (x2 < y2) ); - BOOST_TEST( (x1 <= y1) == (x2 <= y2) ); - BOOST_TEST( (x1 >= y1) == (x2 >= y2) ); - BOOST_TEST( (x1 > y1) == (x2 > y2) ); + BOOST_CHECK( (x1 < y1) == (x2 < y2) ); + BOOST_CHECK( (x1 <= y1) == (x2 <= y2) ); + BOOST_CHECK( (x1 >= y1) == (x2 >= y2) ); + BOOST_CHECK( (x1 > y1) == (x2 > y2) ); } template @@ -293,8 +293,8 @@ namespace template void test_equality_comparable_aux(X1 x1, Y1 y1, X2 x2, Y2 y2) { - BOOST_TEST( (x1 == y1) == (x2 == y2) ); - BOOST_TEST( (x1 != y1) == (x2 != y2) ); + BOOST_CHECK( (x1 == y1) == (x2 == y2) ); + BOOST_CHECK( (x1 != y1) == (x2 != y2) ); } template @@ -308,7 +308,7 @@ namespace template void test_multipliable_aux(X1 x1, Y1 y1, X2 x2, Y2 y2) { - BOOST_TEST( (x1 * y1).value() == (x2 * y2) ); + BOOST_CHECK( (x1 * y1).value() == (x2 * y2) ); } template @@ -322,7 +322,7 @@ namespace template void test_value_equality(A a, B b) { - BOOST_TEST(a.value() == b); + BOOST_CHECK(a.value() == b); } #define TEST_OP_R(op) test_value_equality(x1 op y1, x2 op y2) @@ -448,16 +448,16 @@ namespace void test_incrementable(X1 x1, X2 x2) { sanity_check( x1, x1, x2, x2 ); - BOOST_TEST( (x1++).value() == x2++ ); - BOOST_TEST( x1.value() == x2 ); + BOOST_CHECK( (x1++).value() == x2++ ); + BOOST_CHECK( x1.value() == x2 ); } template void test_decrementable(X1 x1, X2 x2) { sanity_check( x1, x1, x2, x2 ); - BOOST_TEST( (x1--).value() == x2-- ); - BOOST_TEST( x1.value() == x2 ); + BOOST_CHECK( (x1--).value() == x2-- ); + BOOST_CHECK( x1.value() == x2 ); } template @@ -561,7 +561,7 @@ template Wrapped6; template Wrapped6; #endif -#define PRIVATE_EXPR_TEST(e, t) BOOST_TEST( ((e), (t)) ) +#define PRIVATE_EXPR_TEST(e, t) BOOST_CHECK( ((e), (t)) ) int test_main( int , char * [] ) @@ -606,22 +606,22 @@ test_main( int , char * [] ) MyInt i2(2); MyInt i; - BOOST_TEST( i1.value() == 1 ); - BOOST_TEST( i2.value() == 2 ); - BOOST_TEST( i.value() == 0 ); + BOOST_CHECK( i1.value() == 1 ); + BOOST_CHECK( i2.value() == 2 ); + BOOST_CHECK( i.value() == 0 ); cout << "Created MyInt objects.\n"; PRIVATE_EXPR_TEST( (i = i2), (i.value() == 2) ); - BOOST_TEST( i2 == i ); - BOOST_TEST( i1 != i2 ); - BOOST_TEST( i1 < i2 ); - BOOST_TEST( i1 <= i2 ); - BOOST_TEST( i <= i2 ); - BOOST_TEST( i2 > i1 ); - BOOST_TEST( i2 >= i1 ); - BOOST_TEST( i2 >= i ); + BOOST_CHECK( i2 == i ); + BOOST_CHECK( i1 != i2 ); + BOOST_CHECK( i1 < i2 ); + BOOST_CHECK( i1 <= i2 ); + BOOST_CHECK( i <= i2 ); + BOOST_CHECK( i2 > i1 ); + BOOST_CHECK( i2 >= i1 ); + BOOST_CHECK( i2 >= i ); PRIVATE_EXPR_TEST( (i = i1 + i2), (i.value() == 3) ); PRIVATE_EXPR_TEST( (i = i + i2), (i.value() == 5) ); @@ -645,86 +645,86 @@ test_main( int , char * [] ) MyLong j2(2); MyLong j; - BOOST_TEST( j1.value() == 1 ); - BOOST_TEST( j2.value() == 2 ); - BOOST_TEST( j.value() == 0 ); + BOOST_CHECK( j1.value() == 1 ); + BOOST_CHECK( j2.value() == 2 ); + BOOST_CHECK( j.value() == 0 ); cout << "Created MyLong objects.\n"; PRIVATE_EXPR_TEST( (j = j2), (j.value() == 2) ); - BOOST_TEST( j2 == j ); - BOOST_TEST( 2 == j ); - BOOST_TEST( j2 == 2 ); - BOOST_TEST( j == j2 ); - BOOST_TEST( j1 != j2 ); - BOOST_TEST( j1 != 2 ); - BOOST_TEST( 1 != j2 ); - BOOST_TEST( j1 < j2 ); - BOOST_TEST( 1 < j2 ); - BOOST_TEST( j1 < 2 ); - BOOST_TEST( j1 <= j2 ); - BOOST_TEST( 1 <= j2 ); - BOOST_TEST( j1 <= j ); - BOOST_TEST( j <= j2 ); - BOOST_TEST( 2 <= j2 ); - BOOST_TEST( j <= 2 ); - BOOST_TEST( j2 > j1 ); - BOOST_TEST( 2 > j1 ); - BOOST_TEST( j2 > 1 ); - BOOST_TEST( j2 >= j1 ); - BOOST_TEST( 2 >= j1 ); - BOOST_TEST( j2 >= 1 ); - BOOST_TEST( j2 >= j ); - BOOST_TEST( 2 >= j ); - BOOST_TEST( j2 >= 2 ); + BOOST_CHECK( j2 == j ); + BOOST_CHECK( 2 == j ); + BOOST_CHECK( j2 == 2 ); + BOOST_CHECK( j == j2 ); + BOOST_CHECK( j1 != j2 ); + BOOST_CHECK( j1 != 2 ); + BOOST_CHECK( 1 != j2 ); + BOOST_CHECK( j1 < j2 ); + BOOST_CHECK( 1 < j2 ); + BOOST_CHECK( j1 < 2 ); + BOOST_CHECK( j1 <= j2 ); + BOOST_CHECK( 1 <= j2 ); + BOOST_CHECK( j1 <= j ); + BOOST_CHECK( j <= j2 ); + BOOST_CHECK( 2 <= j2 ); + BOOST_CHECK( j <= 2 ); + BOOST_CHECK( j2 > j1 ); + BOOST_CHECK( 2 > j1 ); + BOOST_CHECK( j2 > 1 ); + BOOST_CHECK( j2 >= j1 ); + BOOST_CHECK( 2 >= j1 ); + BOOST_CHECK( j2 >= 1 ); + BOOST_CHECK( j2 >= j ); + BOOST_CHECK( 2 >= j ); + BOOST_CHECK( j2 >= 2 ); - BOOST_TEST( (j1 + 2) == 3 ); - BOOST_TEST( (1 + j2) == 3 ); + BOOST_CHECK( (j1 + 2) == 3 ); + BOOST_CHECK( (1 + j2) == 3 ); PRIVATE_EXPR_TEST( (j = j1 + j2), (j.value() == 3) ); - BOOST_TEST( (j + 2) == 5 ); - BOOST_TEST( (3 + j2) == 5 ); + BOOST_CHECK( (j + 2) == 5 ); + BOOST_CHECK( (3 + j2) == 5 ); PRIVATE_EXPR_TEST( (j = j + j2), (j.value() == 5) ); - BOOST_TEST( (j - 1) == 4 ); + BOOST_CHECK( (j - 1) == 4 ); PRIVATE_EXPR_TEST( (j = j - j1), (j.value() == 4) ); - BOOST_TEST( (j * 2) == 8 ); - BOOST_TEST( (4 * j2) == 8 ); + BOOST_CHECK( (j * 2) == 8 ); + BOOST_CHECK( (4 * j2) == 8 ); PRIVATE_EXPR_TEST( (j = j * j2), (j.value() == 8) ); - BOOST_TEST( (j / 2) == 4 ); + BOOST_CHECK( (j / 2) == 4 ); PRIVATE_EXPR_TEST( (j = j / j2), (j.value() == 4) ); - BOOST_TEST( (j % 3) == 1 ); + BOOST_CHECK( (j % 3) == 1 ); PRIVATE_EXPR_TEST( (j = j % ( j - j1 )), (j.value() == 1) ); PRIVATE_EXPR_TEST( (j = j2 + j2), (j.value() == 4) ); - BOOST_TEST( (1 | j2 | j) == 7 ); - BOOST_TEST( (j1 | 2 | j) == 7 ); - BOOST_TEST( (j1 | j2 | 4) == 7 ); + BOOST_CHECK( (1 | j2 | j) == 7 ); + BOOST_CHECK( (j1 | 2 | j) == 7 ); + BOOST_CHECK( (j1 | j2 | 4) == 7 ); PRIVATE_EXPR_TEST( (j = j1 | j2 | j), (j.value() == 7) ); - BOOST_TEST( (7 & j2) == 2 ); - BOOST_TEST( (j & 2) == 2 ); + BOOST_CHECK( (7 & j2) == 2 ); + BOOST_CHECK( (j & 2) == 2 ); PRIVATE_EXPR_TEST( (j = j & j2), (j.value() == 2) ); PRIVATE_EXPR_TEST( (j = j | j1), (j.value() == 3) ); - BOOST_TEST( (3 ^ j1) == 2 ); - BOOST_TEST( (j ^ 1) == 2 ); + BOOST_CHECK( (3 ^ j1) == 2 ); + BOOST_CHECK( (j ^ 1) == 2 ); PRIVATE_EXPR_TEST( (j = j ^ j1), (j.value() == 2) ); PRIVATE_EXPR_TEST( (j = ( j + j1 ) * ( j2 | j1 )), (j.value() == 9) ); - BOOST_TEST( (j1 << 2) == 4 ); - BOOST_TEST( (j2 << 1) == 4 ); + BOOST_CHECK( (j1 << 2) == 4 ); + BOOST_CHECK( (j2 << 1) == 4 ); PRIVATE_EXPR_TEST( (j = j1 << j2), (j.value() == 4) ); - BOOST_TEST( (j >> 2) == 1 ); - BOOST_TEST( (j2 >> 1) == 1 ); + BOOST_CHECK( (j >> 2) == 1 ); + BOOST_CHECK( (j2 >> 1) == 1 ); PRIVATE_EXPR_TEST( (j = j2 >> j1), (j.value() == 1) ); cout << "Performed tests on MyLong objects.\n"; @@ -733,22 +733,22 @@ test_main( int , char * [] ) MyChar k2(2); MyChar k; - BOOST_TEST( k1.value() == 1 ); - BOOST_TEST( k2.value() == 2 ); - BOOST_TEST( k.value() == 0 ); + BOOST_CHECK( k1.value() == 1 ); + BOOST_CHECK( k2.value() == 2 ); + BOOST_CHECK( k.value() == 0 ); cout << "Created MyChar objects.\n"; PRIVATE_EXPR_TEST( (k = k2), (k.value() == 2) ); - BOOST_TEST( k2 == k ); - BOOST_TEST( k1 != k2 ); - BOOST_TEST( k1 < k2 ); - BOOST_TEST( k1 <= k2 ); - BOOST_TEST( k <= k2 ); - BOOST_TEST( k2 > k1 ); - BOOST_TEST( k2 >= k1 ); - BOOST_TEST( k2 >= k ); + BOOST_CHECK( k2 == k ); + BOOST_CHECK( k1 != k2 ); + BOOST_CHECK( k1 < k2 ); + BOOST_CHECK( k1 <= k2 ); + BOOST_CHECK( k <= k2 ); + BOOST_CHECK( k2 > k1 ); + BOOST_CHECK( k2 >= k1 ); + BOOST_CHECK( k2 >= k ); cout << "Performed tests on MyChar objects.\n"; @@ -756,39 +756,39 @@ test_main( int , char * [] ) MyShort l2(2); MyShort l; - BOOST_TEST( l1.value() == 1 ); - BOOST_TEST( l2.value() == 2 ); - BOOST_TEST( l.value() == 0 ); + BOOST_CHECK( l1.value() == 1 ); + BOOST_CHECK( l2.value() == 2 ); + BOOST_CHECK( l.value() == 0 ); cout << "Created MyShort objects.\n"; PRIVATE_EXPR_TEST( (l = l2), (l.value() == 2) ); - BOOST_TEST( l2 == l ); - BOOST_TEST( 2 == l ); - BOOST_TEST( l2 == 2 ); - BOOST_TEST( l == l2 ); - BOOST_TEST( l1 != l2 ); - BOOST_TEST( l1 != 2 ); - BOOST_TEST( 1 != l2 ); - BOOST_TEST( l1 < l2 ); - BOOST_TEST( 1 < l2 ); - BOOST_TEST( l1 < 2 ); - BOOST_TEST( l1 <= l2 ); - BOOST_TEST( 1 <= l2 ); - BOOST_TEST( l1 <= l ); - BOOST_TEST( l <= l2 ); - BOOST_TEST( 2 <= l2 ); - BOOST_TEST( l <= 2 ); - BOOST_TEST( l2 > l1 ); - BOOST_TEST( 2 > l1 ); - BOOST_TEST( l2 > 1 ); - BOOST_TEST( l2 >= l1 ); - BOOST_TEST( 2 >= l1 ); - BOOST_TEST( l2 >= 1 ); - BOOST_TEST( l2 >= l ); - BOOST_TEST( 2 >= l ); - BOOST_TEST( l2 >= 2 ); + BOOST_CHECK( l2 == l ); + BOOST_CHECK( 2 == l ); + BOOST_CHECK( l2 == 2 ); + BOOST_CHECK( l == l2 ); + BOOST_CHECK( l1 != l2 ); + BOOST_CHECK( l1 != 2 ); + BOOST_CHECK( 1 != l2 ); + BOOST_CHECK( l1 < l2 ); + BOOST_CHECK( 1 < l2 ); + BOOST_CHECK( l1 < 2 ); + BOOST_CHECK( l1 <= l2 ); + BOOST_CHECK( 1 <= l2 ); + BOOST_CHECK( l1 <= l ); + BOOST_CHECK( l <= l2 ); + BOOST_CHECK( 2 <= l2 ); + BOOST_CHECK( l <= 2 ); + BOOST_CHECK( l2 > l1 ); + BOOST_CHECK( 2 > l1 ); + BOOST_CHECK( l2 > 1 ); + BOOST_CHECK( l2 >= l1 ); + BOOST_CHECK( 2 >= l1 ); + BOOST_CHECK( l2 >= 1 ); + BOOST_CHECK( l2 >= l ); + BOOST_CHECK( 2 >= l ); + BOOST_CHECK( l2 >= 2 ); cout << "Performed tests on MyShort objects.\n"; @@ -798,44 +798,44 @@ test_main( int , char * [] ) MyDoubleInt di; MyDoubleInt tmp; - BOOST_TEST( di1.value() == 1 ); - BOOST_TEST( di2.value() == 2 ); - BOOST_TEST( di2.value() == 2 ); - BOOST_TEST( di.value() == 0 ); + BOOST_CHECK( di1.value() == 1 ); + BOOST_CHECK( di2.value() == 2 ); + BOOST_CHECK( di2.value() == 2 ); + BOOST_CHECK( di.value() == 0 ); cout << "Created MyDoubleInt objects.\n"; PRIVATE_EXPR_TEST( (di = di2), (di.value() == 2) ); - BOOST_TEST( di2 == di ); - BOOST_TEST( 2 == di ); - BOOST_TEST( di == 2 ); - BOOST_TEST( di1 < di2 ); - BOOST_TEST( 1 < di2 ); - BOOST_TEST( di1 <= di2 ); - BOOST_TEST( 1 <= di2 ); - BOOST_TEST( di2 > di1 ); - BOOST_TEST( di2 > 1 ); - BOOST_TEST( di2 >= di1 ); - BOOST_TEST( di2 >= 1 ); - BOOST_TEST( di1 / di2 == half ); - BOOST_TEST( di1 / 2 == half ); - BOOST_TEST( 1 / di2 == half ); + BOOST_CHECK( di2 == di ); + BOOST_CHECK( 2 == di ); + BOOST_CHECK( di == 2 ); + BOOST_CHECK( di1 < di2 ); + BOOST_CHECK( 1 < di2 ); + BOOST_CHECK( di1 <= di2 ); + BOOST_CHECK( 1 <= di2 ); + BOOST_CHECK( di2 > di1 ); + BOOST_CHECK( di2 > 1 ); + BOOST_CHECK( di2 >= di1 ); + BOOST_CHECK( di2 >= 1 ); + BOOST_CHECK( di1 / di2 == half ); + BOOST_CHECK( di1 / 2 == half ); + BOOST_CHECK( 1 / di2 == half ); PRIVATE_EXPR_TEST( (tmp=di1), ((tmp/=2) == half) ); PRIVATE_EXPR_TEST( (tmp=di1), ((tmp/=di2) == half) ); - BOOST_TEST( di1 * di2 == di2 ); - BOOST_TEST( di1 * 2 == di2 ); - BOOST_TEST( 1 * di2 == di2 ); + BOOST_CHECK( di1 * di2 == di2 ); + BOOST_CHECK( di1 * 2 == di2 ); + BOOST_CHECK( 1 * di2 == di2 ); PRIVATE_EXPR_TEST( (tmp=di1), ((tmp*=2) == di2) ); PRIVATE_EXPR_TEST( (tmp=di1), ((tmp*=di2) == di2) ); - BOOST_TEST( di2 - di1 == di1 ); - BOOST_TEST( di2 - 1 == di1 ); - BOOST_TEST( 2 - di1 == di1 ); + BOOST_CHECK( di2 - di1 == di1 ); + BOOST_CHECK( di2 - 1 == di1 ); + BOOST_CHECK( 2 - di1 == di1 ); PRIVATE_EXPR_TEST( (tmp=di2), ((tmp-=1) == di1) ); PRIVATE_EXPR_TEST( (tmp=di2), ((tmp-=di1) == di1) ); - BOOST_TEST( di1 + di1 == di2 ); - BOOST_TEST( di1 + 1 == di2 ); - BOOST_TEST( 1 + di1 == di2 ); + BOOST_CHECK( di1 + di1 == di2 ); + BOOST_CHECK( di1 + 1 == di2 ); + BOOST_CHECK( 1 + di1 == di2 ); PRIVATE_EXPR_TEST( (tmp=di1), ((tmp+=1) == di2) ); PRIVATE_EXPR_TEST( (tmp=di1), ((tmp+=di1) == di2) ); @@ -846,48 +846,48 @@ test_main( int , char * [] ) MyLongInt li; MyLongInt tmp2; - BOOST_TEST( li1.value() == 1 ); - BOOST_TEST( li2.value() == 2 ); - BOOST_TEST( li.value() == 0 ); + BOOST_CHECK( li1.value() == 1 ); + BOOST_CHECK( li2.value() == 2 ); + BOOST_CHECK( li.value() == 0 ); cout << "Created MyLongInt objects.\n"; PRIVATE_EXPR_TEST( (li = li2), (li.value() == 2) ); - BOOST_TEST( li2 == li ); - BOOST_TEST( 2 == li ); - BOOST_TEST( li == 2 ); - BOOST_TEST( li1 < li2 ); - BOOST_TEST( 1 < li2 ); - BOOST_TEST( li1 <= li2 ); - BOOST_TEST( 1 <= li2 ); - BOOST_TEST( li2 > li1 ); - BOOST_TEST( li2 > 1 ); - BOOST_TEST( li2 >= li1 ); - BOOST_TEST( li2 >= 1 ); - BOOST_TEST( li1 % li2 == li1 ); - BOOST_TEST( li1 % 2 == li1 ); - BOOST_TEST( 1 % li2 == li1 ); + BOOST_CHECK( li2 == li ); + BOOST_CHECK( 2 == li ); + BOOST_CHECK( li == 2 ); + BOOST_CHECK( li1 < li2 ); + BOOST_CHECK( 1 < li2 ); + BOOST_CHECK( li1 <= li2 ); + BOOST_CHECK( 1 <= li2 ); + BOOST_CHECK( li2 > li1 ); + BOOST_CHECK( li2 > 1 ); + BOOST_CHECK( li2 >= li1 ); + BOOST_CHECK( li2 >= 1 ); + BOOST_CHECK( li1 % li2 == li1 ); + BOOST_CHECK( li1 % 2 == li1 ); + BOOST_CHECK( 1 % li2 == li1 ); PRIVATE_EXPR_TEST( (tmp2=li1), ((tmp2%=2) == li1) ); PRIVATE_EXPR_TEST( (tmp2=li1), ((tmp2%=li2) == li1) ); - BOOST_TEST( li1 / li2 == 0 ); - BOOST_TEST( li1 / 2 == 0 ); - BOOST_TEST( 1 / li2 == 0 ); + BOOST_CHECK( li1 / li2 == 0 ); + BOOST_CHECK( li1 / 2 == 0 ); + BOOST_CHECK( 1 / li2 == 0 ); PRIVATE_EXPR_TEST( (tmp2=li1), ((tmp2/=2) == 0) ); PRIVATE_EXPR_TEST( (tmp2=li1), ((tmp2/=li2) == 0) ); - BOOST_TEST( li1 * li2 == li2 ); - BOOST_TEST( li1 * 2 == li2 ); - BOOST_TEST( 1 * li2 == li2 ); + BOOST_CHECK( li1 * li2 == li2 ); + BOOST_CHECK( li1 * 2 == li2 ); + BOOST_CHECK( 1 * li2 == li2 ); PRIVATE_EXPR_TEST( (tmp2=li1), ((tmp2*=2) == li2) ); PRIVATE_EXPR_TEST( (tmp2=li1), ((tmp2*=li2) == li2) ); - BOOST_TEST( li2 - li1 == li1 ); - BOOST_TEST( li2 - 1 == li1 ); - BOOST_TEST( 2 - li1 == li1 ); + BOOST_CHECK( li2 - li1 == li1 ); + BOOST_CHECK( li2 - 1 == li1 ); + BOOST_CHECK( 2 - li1 == li1 ); PRIVATE_EXPR_TEST( (tmp2=li2), ((tmp2-=1) == li1) ); PRIVATE_EXPR_TEST( (tmp2=li2), ((tmp2-=li1) == li1) ); - BOOST_TEST( li1 + li1 == li2 ); - BOOST_TEST( li1 + 1 == li2 ); - BOOST_TEST( 1 + li1 == li2 ); + BOOST_CHECK( li1 + li1 == li2 ); + BOOST_CHECK( li1 + 1 == li2 ); + BOOST_CHECK( 1 + li1 == li2 ); PRIVATE_EXPR_TEST( (tmp2=li1), ((tmp2+=1) == li2) ); PRIVATE_EXPR_TEST( (tmp2=li1), ((tmp2+=li1) == li2) ); diff --git a/ref_test.cpp b/ref_test.cpp index ef4775f..63fc9e5 100644 --- a/ref_test.cpp +++ b/ref_test.cpp @@ -60,11 +60,11 @@ struct ref_wrapper static void test(T x) { - BOOST_TEST(passthru(ref(x)) == &x); - BOOST_TEST(&ref(x).get() == &x); + BOOST_CHECK(passthru(ref(x)) == &x); + BOOST_CHECK(&ref(x).get() == &x); - BOOST_TEST(cref_passthru(cref(x)) == &x); - BOOST_TEST(&cref(x).get() == &x); + BOOST_CHECK(cref_passthru(cref(x)) == &x); + BOOST_CHECK(&cref(x).get() == &x); } }; diff --git a/value_init_test.cpp b/value_init_test.cpp index ecb1929..fe73cc1 100644 --- a/value_init_test.cpp +++ b/value_init_test.cpp @@ -64,27 +64,27 @@ template void test ( T const& y, T const& z ) { boost::value_initialized x ; - BOOST_TEST ( y == x ) ; - BOOST_TEST ( y == boost::get(x) ) ; + BOOST_CHECK ( y == x ) ; + BOOST_CHECK ( y == boost::get(x) ) ; static_cast(x) = z ; boost::get(x) = z ; - BOOST_TEST ( x == z ) ; + BOOST_CHECK ( x == z ) ; boost::value_initialized const x_c ; - BOOST_TEST ( y == x_c ) ; - BOOST_TEST ( y == boost::get(x_c) ) ; + BOOST_CHECK ( y == x_c ) ; + BOOST_CHECK ( y == boost::get(x_c) ) ; T& x_c_ref = x_c ; x_c_ref = z ; - BOOST_TEST ( x_c == z ) ; + BOOST_CHECK ( x_c == z ) ; #if !BOOST_WORKAROUND(BOOST_MSVC, < 1300) boost::value_initialized cx ; - BOOST_TEST ( y == cx ) ; - BOOST_TEST ( y == boost::get(cx) ) ; + BOOST_CHECK ( y == cx ) ; + BOOST_CHECK ( y == boost::get(cx) ) ; boost::value_initialized const cx_c ; - BOOST_TEST ( y == cx_c ) ; - BOOST_TEST ( y == boost::get(cx_c) ) ; + BOOST_CHECK ( y == cx_c ) ; + BOOST_CHECK ( y == boost::get(cx_c) ) ; #endif }