diff --git a/test/Jamfile.v2 b/test/Jamfile.v2 index c65bed2..35619b1 100644 --- a/test/Jamfile.v2 +++ b/test/Jamfile.v2 @@ -8,11 +8,6 @@ # bring in rules for testing import testing ; -alias unit_test_framework - : # sources - /boost//unit_test_framework - ; - run base_from_member_test.cpp ; run base_from_member_ref_test.cpp ; @@ -20,25 +15,25 @@ run binary_test.cpp ; run call_traits_test.cpp : -u ; -run compressed_pair_test.cpp ../../test/build//boost_test_exec_monitor/static ; +run compressed_pair_test.cpp ; -run iterators_test.cpp ../../test/build//boost_test_exec_monitor/static ; +run iterators_test.cpp ; -run operators_test.cpp ../../test/build//boost_test_exec_monitor/static ; +run operators_test.cpp ; compile result_of_test.cpp ; run shared_iterator_test.cpp ; # compile-fail string_ref_from_rvalue.cpp ; -run string_ref_test1.cpp unit_test_framework ; -run string_ref_test2.cpp unit_test_framework ; -run string_ref_test_io.cpp unit_test_framework ; +run string_ref_test1.cpp ; +run string_ref_test2.cpp ; +run string_ref_test_io.cpp ; # compile-fail string_view_from_rvalue.cpp ; compile string_view_constexpr_test1.cpp ; -run string_view_test1.cpp unit_test_framework ; -run string_view_test2.cpp unit_test_framework ; -run string_view_test_io.cpp unit_test_framework ; +run string_view_test1.cpp ; +run string_view_test2.cpp ; +run string_view_test_io.cpp ; run value_init_test.cpp ; run value_init_workaround_test.cpp ; diff --git a/test/base_from_member_ref_test.cpp b/test/base_from_member_ref_test.cpp index fc6f249..52f9b87 100644 --- a/test/base_from_member_ref_test.cpp +++ b/test/base_from_member_ref_test.cpp @@ -10,7 +10,7 @@ #include -#include +#include struct foo : boost::base_from_member { diff --git a/test/base_from_member_test.cpp b/test/base_from_member_test.cpp index 538e807..685c638 100644 --- a/test/base_from_member_test.cpp +++ b/test/base_from_member_test.cpp @@ -10,10 +10,9 @@ // 14 Jun 2003 Adjusted code for Boost.Test changes (Daryle Walker) // 29 Aug 2001 Initial Version (Daryle Walker) -#include // for BOOST_CHECK, main +#include #include // for BOOST_NO_MEMBER_TEMPLATES -#include // for boost::exit_success #include // for boost::noncopyable #include // for boost::base_from_member @@ -172,13 +171,13 @@ object_registrar obj_reg; // Main functionality int -test_main( int , char * [] ) +main() { - BOOST_CHECK( obj_reg.db_.empty() ); - BOOST_CHECK( obj_reg.defrauders_in_.empty() ); - BOOST_CHECK( obj_reg.defrauders_out_.empty() ); - BOOST_CHECK( obj_reg.overeager_.empty() ); - BOOST_CHECK( obj_reg.overkilled_.empty() ); + BOOST_TEST( obj_reg.db_.empty() ); + BOOST_TEST( obj_reg.defrauders_in_.empty() ); + BOOST_TEST( obj_reg.defrauders_out_.empty() ); + BOOST_TEST( obj_reg.overeager_.empty() ); + BOOST_TEST( obj_reg.overkilled_.empty() ); // Make a separate block to examine pre- and post-effects { @@ -186,20 +185,20 @@ test_main( int , char * [] ) using std::endl; bad_class bc; - BOOST_CHECK( obj_reg.db_.size() == 3 ); - BOOST_CHECK( obj_reg.defrauders_in_.size() == 1 ); + BOOST_TEST( obj_reg.db_.size() == 3 ); + BOOST_TEST( obj_reg.defrauders_in_.size() == 1 ); good_class_1 gc1; - BOOST_CHECK( obj_reg.db_.size() == 6 ); - BOOST_CHECK( obj_reg.defrauders_in_.size() == 1 ); + BOOST_TEST( obj_reg.db_.size() == 6 ); + BOOST_TEST( obj_reg.defrauders_in_.size() == 1 ); good_class_2 gc2; - BOOST_CHECK( obj_reg.db_.size() == 11 ); - BOOST_CHECK( obj_reg.defrauders_in_.size() == 1 ); + BOOST_TEST( obj_reg.db_.size() == 11 ); + BOOST_TEST( obj_reg.defrauders_in_.size() == 1 ); - BOOST_CHECK( obj_reg.defrauders_out_.empty() ); - BOOST_CHECK( obj_reg.overeager_.empty() ); - BOOST_CHECK( obj_reg.overkilled_.empty() ); + BOOST_TEST( obj_reg.defrauders_out_.empty() ); + BOOST_TEST( obj_reg.overeager_.empty() ); + BOOST_TEST( obj_reg.overkilled_.empty() ); // Getting the addresses of the objects ensure // that they're used, and not optimized away. @@ -208,13 +207,13 @@ test_main( int , char * [] ) cout << "Object 'gc2' is at " << &gc2 << '.' << endl; } - BOOST_CHECK( obj_reg.db_.empty() ); - BOOST_CHECK( obj_reg.defrauders_in_.size() == 1 ); - BOOST_CHECK( obj_reg.defrauders_out_.size() == 1 ); - BOOST_CHECK( obj_reg.overeager_.empty() ); - BOOST_CHECK( obj_reg.overkilled_.empty() ); + BOOST_TEST( obj_reg.db_.empty() ); + BOOST_TEST( obj_reg.defrauders_in_.size() == 1 ); + BOOST_TEST( obj_reg.defrauders_out_.size() == 1 ); + BOOST_TEST( obj_reg.overeager_.empty() ); + BOOST_TEST( obj_reg.overkilled_.empty() ); - return boost::exit_success; + return boost::report_errors(); } diff --git a/test/binary_test.cpp b/test/binary_test.cpp index aacfab9..f39dc08 100644 --- a/test/binary_test.cpp +++ b/test/binary_test.cpp @@ -6,7 +6,7 @@ http://www.boost.org/LICENSE_1_0.txt) ==============================================================================*/ -#include +#include #include #include #include @@ -614,34 +614,34 @@ typedef char (&unsigned_long_int_id_type)[unsigned_long_int_id]; unsigned_int_id_type binary_type_checker( unsigned int ); unsigned_long_int_id_type binary_type_checker( unsigned long int ); -int test_main( int, char *[] ) +int main() { - BOOST_CHECK( is_ascending_from_0_array( unsigned_ints_1_bit ) ); - BOOST_CHECK( is_ascending_from_0_array( unsigned_ints_2_bits ) ); - BOOST_CHECK( is_ascending_from_0_array( unsigned_ints_3_bits ) ); - BOOST_CHECK( is_ascending_from_0_array( unsigned_ints_4_bits ) ); - BOOST_CHECK( is_ascending_from_0_array( unsigned_ints_5_bits ) ); - BOOST_CHECK( is_ascending_from_0_array( unsigned_ints_6_bits ) ); - BOOST_CHECK( is_ascending_from_0_array( unsigned_ints_7_bits ) ); - BOOST_CHECK( is_ascending_from_0_array( unsigned_ints_8_bits ) ); + BOOST_TEST( is_ascending_from_0_array( unsigned_ints_1_bit ) ); + BOOST_TEST( is_ascending_from_0_array( unsigned_ints_2_bits ) ); + BOOST_TEST( is_ascending_from_0_array( unsigned_ints_3_bits ) ); + BOOST_TEST( is_ascending_from_0_array( unsigned_ints_4_bits ) ); + BOOST_TEST( is_ascending_from_0_array( unsigned_ints_5_bits ) ); + BOOST_TEST( is_ascending_from_0_array( unsigned_ints_6_bits ) ); + BOOST_TEST( is_ascending_from_0_array( unsigned_ints_7_bits ) ); + BOOST_TEST( is_ascending_from_0_array( unsigned_ints_8_bits ) ); - BOOST_CHECK( std::equal( &random_unsigned_ints_hex[0] + BOOST_TEST( std::equal( &random_unsigned_ints_hex[0] , random_unsigned_ints_hex + num_random_test_values , &random_unsigned_ints_binary[0] ) ); - BOOST_CHECK( sizeof( binary_type_checker( BOOST_BINARY_U( 110100 1010 ) ) ) + BOOST_TEST( sizeof( binary_type_checker( BOOST_BINARY_U( 110100 1010 ) ) ) == unsigned_int_id ); - BOOST_CHECK( sizeof( binary_type_checker( BOOST_BINARY_UL( 11110 ) ) ) + BOOST_TEST( sizeof( binary_type_checker( BOOST_BINARY_UL( 11110 ) ) ) == unsigned_long_int_id ); - BOOST_CHECK( sizeof( binary_type_checker( BOOST_BINARY_LU( 10 0001 ) ) ) + BOOST_TEST( sizeof( binary_type_checker( BOOST_BINARY_LU( 10 0001 ) ) ) == unsigned_long_int_id ); - return 0; + return boost::report_errors(); } diff --git a/test/compressed_pair_test.cpp b/test/compressed_pair_test.cpp index 7687f0a..ea10b2c 100644 --- a/test/compressed_pair_test.cpp +++ b/test/compressed_pair_test.cpp @@ -14,7 +14,7 @@ #include #include -#include +#include using namespace boost; @@ -79,47 +79,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_CHECK(cp2.first() == p1); - BOOST_CHECK(cp2.second() == p2); + BOOST_TEST(cp2.first() == p1); + BOOST_TEST(cp2.second() == p2); // second param construct: boost::compressed_pair cp3(p2); cp3.first() = p1; - BOOST_CHECK(cp3.second() == p2); - BOOST_CHECK(cp3.first() == p1); + BOOST_TEST(cp3.second() == p2); + BOOST_TEST(cp3.first() == p1); // both param construct: boost::compressed_pair cp4(p1, p2); - BOOST_CHECK(cp4.first() == p1); - BOOST_CHECK(cp4.second() == p2); + BOOST_TEST(cp4.first() == p1); + BOOST_TEST(cp4.second() == p2); boost::compressed_pair cp5(p3, p4); - BOOST_CHECK(cp5.first() == p3); - BOOST_CHECK(cp5.second() == p4); + BOOST_TEST(cp5.first() == p3); + BOOST_TEST(cp5.second() == p4); // check const members: const boost::compressed_pair& cpr1 = cp4; - BOOST_CHECK(cpr1.first() == p1); - BOOST_CHECK(cpr1.second() == p2); + BOOST_TEST(cpr1.first() == p1); + BOOST_TEST(cpr1.second() == p2); // copy construct: boost::compressed_pair cp6(cp4); - BOOST_CHECK(cp6.first() == p1); - BOOST_CHECK(cp6.second() == p2); + BOOST_TEST(cp6.first() == p1); + BOOST_TEST(cp6.second() == p2); // assignment: cp1 = cp4; - BOOST_CHECK(cp1.first() == p1); - BOOST_CHECK(cp1.second() == p2); + BOOST_TEST(cp1.first() == p1); + BOOST_TEST(cp1.second() == p2); cp1 = cp5; - BOOST_CHECK(cp1.first() == p3); - BOOST_CHECK(cp1.second() == p4); + BOOST_TEST(cp1.first() == p3); + BOOST_TEST(cp1.second() == p4); // swap: cp4.swap(cp5); - BOOST_CHECK(cp4.first() == p3); - BOOST_CHECK(cp4.second() == p4); - BOOST_CHECK(cp5.first() == p1); - BOOST_CHECK(cp5.second() == p2); + BOOST_TEST(cp4.first() == p3); + BOOST_TEST(cp4.second() == p4); + BOOST_TEST(cp5.first() == p1); + BOOST_TEST(cp5.second() == p2); swap(cp4,cp5); - BOOST_CHECK(cp4.first() == p1); - BOOST_CHECK(cp4.second() == p2); - BOOST_CHECK(cp5.first() == p3); - BOOST_CHECK(cp5.second() == p4); + BOOST_TEST(cp4.first() == p1); + BOOST_TEST(cp4.second() == p2); + BOOST_TEST(cp5.first() == p3); + BOOST_TEST(cp5.second() == p4); } // @@ -148,20 +148,20 @@ void compressed_pair_reference_tester::test(first_param_type p1, second_ #endif // both param construct: boost::compressed_pair cp4(p1, p2); - BOOST_CHECK(cp4.first() == p1); - BOOST_CHECK(cp4.second() == p2); + BOOST_TEST(cp4.first() == p1); + BOOST_TEST(cp4.second() == p2); boost::compressed_pair cp5(p3, p4); - BOOST_CHECK(cp5.first() == p3); - BOOST_CHECK(cp5.second() == p4); + BOOST_TEST(cp5.first() == p3); + BOOST_TEST(cp5.second() == p4); // check const members: const boost::compressed_pair& cpr1 = cp4; - BOOST_CHECK(cpr1.first() == p1); - BOOST_CHECK(cpr1.second() == p2); + BOOST_TEST(cpr1.first() == p1); + BOOST_TEST(cpr1.second() == p2); // copy construct: boost::compressed_pair cp6(cp4); - BOOST_CHECK(cp6.first() == p1); - BOOST_CHECK(cp6.second() == p2); + BOOST_TEST(cp6.first() == p1); + BOOST_TEST(cp6.second() == p2); // assignment: // VC6 bug: // When second() is an empty class, VC6 performs the @@ -174,8 +174,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_CHECK(cp4.first() == p3); - BOOST_CHECK(cp4.second() == p4); + BOOST_TEST(cp4.first() == p3); + BOOST_TEST(cp4.second() == p4); } // // supplimentary tests for case where first arg only is a reference type: @@ -199,8 +199,8 @@ void compressed_pair_reference1_tester::test(first_param_type p1, second // first param construct: boost::compressed_pair cp2(p1); cp2.second() = p2; - BOOST_CHECK(cp2.first() == p1); - BOOST_CHECK(cp2.second() == p2); + BOOST_TEST(cp2.first() == p1); + BOOST_TEST(cp2.second() == p2); #endif } // @@ -225,8 +225,8 @@ void compressed_pair_reference2_tester::test(first_param_type p1, second // second param construct: boost::compressed_pair cp3(p2); cp3.first() = p1; - BOOST_CHECK(cp3.second() == p2); - BOOST_CHECK(cp3.first() == p1); + BOOST_TEST(cp3.second() == p2); + BOOST_TEST(cp3.first() == p1); #endif } @@ -253,14 +253,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_CHECK(cp3.second() == p2); - BOOST_CHECK(cp3.first()[0] == p1[0]); + BOOST_TEST(cp3.second() == p2); + BOOST_TEST(cp3.first()[0] == p1[0]); // check const members: const boost::compressed_pair& cpr1 = cp3; - BOOST_CHECK(cpr1.first()[0] == p1[0]); - BOOST_CHECK(cpr1.second() == p2); + BOOST_TEST(cpr1.first()[0] == p1[0]); + BOOST_TEST(cpr1.second() == p2); - BOOST_CHECK(sizeof(T1) == sizeof(cp1.first())); + BOOST_TEST(sizeof(T1) == sizeof(cp1.first())); } template @@ -283,14 +283,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_CHECK(cp2.first() == p1); - BOOST_CHECK(cp2.second()[0] == p2[0]); + BOOST_TEST(cp2.first() == p1); + BOOST_TEST(cp2.second()[0] == p2[0]); // check const members: const boost::compressed_pair& cpr1 = cp2; - BOOST_CHECK(cpr1.first() == p1); - BOOST_CHECK(cpr1.second()[0] == p2[0]); + BOOST_TEST(cpr1.first() == p1); + BOOST_TEST(cpr1.second()[0] == p2[0]); - BOOST_CHECK(sizeof(T2) == sizeof(cp1.second())); + BOOST_TEST(sizeof(T2) == sizeof(cp1.second())); } template @@ -312,18 +312,18 @@ 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_CHECK(cp1.first()[0] == p1[0]); - BOOST_CHECK(cp1.second()[0] == p2[0]); + BOOST_TEST(cp1.first()[0] == p1[0]); + BOOST_TEST(cp1.second()[0] == p2[0]); // check const members: const boost::compressed_pair& cpr1 = cp1; - BOOST_CHECK(cpr1.first()[0] == p1[0]); - BOOST_CHECK(cpr1.second()[0] == p2[0]); + BOOST_TEST(cpr1.first()[0] == p1[0]); + BOOST_TEST(cpr1.second()[0] == p2[0]); - BOOST_CHECK(sizeof(T1) == sizeof(cp1.first())); - BOOST_CHECK(sizeof(T2) == sizeof(cp1.second())); + BOOST_TEST(sizeof(T1) == sizeof(cp1.first())); + BOOST_TEST(sizeof(T2) == sizeof(cp1.second())); } -int test_main(int, char *[]) +int main() { // declare some variables to pass to the tester: non_empty1 ne1(2); @@ -383,13 +383,5 @@ int test_main(int, char *[]) compressed_pair_array2_tester::test(e1, nea3, e1, nea4); // T1 == T2, both non-empty compressed_pair_array_tester::test(nea1, nea1, nea2, nea2); - return 0; + return boost::report_errors(); } - - -unsigned int expected_failures = 0; - - - - - diff --git a/test/initialized_test.cpp b/test/initialized_test.cpp index 9380957..0b8852f 100644 --- a/test/initialized_test.cpp +++ b/test/initialized_test.cpp @@ -9,7 +9,7 @@ // 2 May 2010 (Created) Niels Dekker #include -#include +#include #include diff --git a/test/iterators_test.cpp b/test/iterators_test.cpp index 7ac1191..8f2d04d 100644 --- a/test/iterators_test.cpp +++ b/test/iterators_test.cpp @@ -12,11 +12,9 @@ // library (Daryle Walker) // 12 Dec 99 Initial version with iterator operators (Jeremy Siek) -#define BOOST_INCLUDE_MAIN -#include // for main +#include #include // for BOOST_STATIC_CONSTANT -#include // for boost::exit_success #include // for boost::random_access_iterator_helper #include // for std::ptrdiff_t, std::size_t @@ -126,7 +124,7 @@ typename test_opr::iter_type const // Main testing function int -test_main( int , char * [] ) +main() { using std::string; @@ -136,7 +134,7 @@ test_main( int , char * [] ) test1_type::master_test( "non-const string" ); test2_type::master_test( "const string" ); - return boost::exit_success; + return boost::report_errors(); } // Tests for all of the operators added by random_access_iterator_helper @@ -174,7 +172,7 @@ test_opr::post_increment_test oss << *i++ << ' '; } - BOOST_CHECK( oss.str() == "apple orange pear peach grape plum "); + BOOST_TEST( oss.str() == "apple orange pear peach grape plum "); } // Test post-decrement @@ -193,7 +191,7 @@ test_opr::post_decrement_test oss << *i << ' '; } - BOOST_CHECK( oss.str() == "plum grape peach pear orange apple "); + BOOST_TEST( oss.str() == "plum grape peach pear orange apple "); } // Test indirect structure referral @@ -211,7 +209,7 @@ test_opr::indirect_referral_test oss << i->size() << ' '; } - BOOST_CHECK( oss.str() == "5 6 4 5 5 4 "); + BOOST_TEST( oss.str() == "5 6 4 5 5 4 "); } // Test offset addition @@ -230,7 +228,7 @@ test_opr::offset_addition_test oss << *i << ' '; } - BOOST_CHECK( oss.str() == "apple pear grape "); + BOOST_TEST( oss.str() == "apple pear grape "); } // Test offset addition, in reverse order @@ -249,7 +247,7 @@ test_opr::reverse_offset_addition_test oss << *i << ' '; } - BOOST_CHECK( oss.str() == "apple pear grape "); + BOOST_TEST( oss.str() == "apple pear grape "); } // Test offset subtraction @@ -272,7 +270,7 @@ test_opr::offset_subtraction_test } } - BOOST_CHECK( oss.str() == "grape pear apple "); + BOOST_TEST( oss.str() == "grape pear apple "); } // Test comparisons @@ -296,10 +294,10 @@ test_opr::comparison_test { ptrdiff_t const j_offset = j - fruit_begin; - 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) ); + 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) ); } } cout << std::endl; @@ -320,5 +318,5 @@ test_opr::indexing_test oss << fruit_begin[ k ] << ' '; } - BOOST_CHECK( oss.str() == "apple orange pear peach grape plum "); + BOOST_TEST( oss.str() == "apple orange pear peach grape plum "); } diff --git a/test/operators_test.cpp b/test/operators_test.cpp index b279677..6cf7a76 100644 --- a/test/operators_test.cpp +++ b/test/operators_test.cpp @@ -21,13 +21,10 @@ // 12 Dec 99 Minor update, output confirmation message. // 15 Nov 99 Initial version -#define BOOST_INCLUDE_MAIN - #include // for BOOST_MSVC -#include // for boost::exit_success #include // for the tested items #include // for boost::detail::minstd_rand -#include // for main +#include #include // for std::cout (std::endl indirectly) @@ -311,17 +308,17 @@ namespace template void sanity_check(X1 x1, Y1 y1, X2 x2, Y2 y2) { - BOOST_CHECK( true_value(y1) == true_value(y2) ); - BOOST_CHECK( true_value(x1) == true_value(x2) ); + BOOST_TEST( true_value(y1) == true_value(y2) ); + BOOST_TEST( true_value(x1) == true_value(x2) ); } template void test_less_than_comparable_aux(X1 x1, Y1 y1, X2 x2, Y2 y2) { - BOOST_CHECK( static_cast(x1 < y1) == static_cast(x2 < y2) ); - BOOST_CHECK( static_cast(x1 <= y1) == static_cast(x2 <= y2) ); - BOOST_CHECK( static_cast(x1 >= y1) == static_cast(x2 >= y2) ); - BOOST_CHECK( static_cast(x1 > y1) == static_cast(x2 > y2) ); + BOOST_TEST( static_cast(x1 < y1) == static_cast(x2 < y2) ); + BOOST_TEST( static_cast(x1 <= y1) == static_cast(x2 <= y2) ); + BOOST_TEST( static_cast(x1 >= y1) == static_cast(x2 >= y2) ); + BOOST_TEST( static_cast(x1 > y1) == static_cast(x2 > y2) ); } template @@ -335,8 +332,8 @@ namespace template void test_equality_comparable_aux(X1 x1, Y1 y1, X2 x2, Y2 y2) { - BOOST_CHECK( static_cast(x1 == y1) == static_cast(x2 == y2) ); - BOOST_CHECK( static_cast(x1 != y1) == static_cast(x2 != y2) ); + BOOST_TEST( static_cast(x1 == y1) == static_cast(x2 == y2) ); + BOOST_TEST( static_cast(x1 != y1) == static_cast(x2 != y2) ); } template @@ -350,7 +347,7 @@ namespace template void test_multipliable_aux(X1 x1, Y1 y1, X2 x2, Y2 y2) { - BOOST_CHECK( (x1 * y1).value() == (x2 * y2) ); + BOOST_TEST( (x1 * y1).value() == (x2 * y2) ); } template @@ -364,7 +361,7 @@ namespace template void test_value_equality(A a, B b) { - BOOST_CHECK(a.value() == b); + BOOST_TEST(a.value() == b); } #define TEST_OP_R(op) test_value_equality(x1 op y1, x2 op y2) @@ -490,16 +487,16 @@ namespace void test_incrementable(X1 x1, X2 x2) { sanity_check( x1, x1, x2, x2 ); - BOOST_CHECK( (x1++).value() == x2++ ); - BOOST_CHECK( x1.value() == x2 ); + BOOST_TEST( (x1++).value() == x2++ ); + BOOST_TEST( x1.value() == x2 ); } template void test_decrementable(X1 x1, X2 x2) { sanity_check( x1, x1, x2, x2 ); - BOOST_CHECK( (x1--).value() == x2-- ); - BOOST_CHECK( x1.value() == x2 ); + BOOST_TEST( (x1--).value() == x2-- ); + BOOST_TEST( x1.value() == x2 ); } template @@ -603,10 +600,10 @@ template Wrapped6; template Wrapped6; #endif -#define PRIVATE_EXPR_TEST(e, t) BOOST_CHECK( ((e), (t)) ) +#define PRIVATE_EXPR_TEST(e, t) BOOST_TEST( ((e), (t)) ) int -test_main( int , char * [] ) +main() { using std::cout; using std::endl; @@ -648,22 +645,22 @@ test_main( int , char * [] ) MyInt i2(2); MyInt i; - BOOST_CHECK( i1.value() == 1 ); - BOOST_CHECK( i2.value() == 2 ); - BOOST_CHECK( i.value() == 0 ); + BOOST_TEST( i1.value() == 1 ); + BOOST_TEST( i2.value() == 2 ); + BOOST_TEST( i.value() == 0 ); cout << "Created MyInt objects.\n"; PRIVATE_EXPR_TEST( (i = i2), (i.value() == 2) ); - BOOST_CHECK( static_cast(i2 == i) ); - BOOST_CHECK( static_cast(i1 != i2) ); - BOOST_CHECK( static_cast(i1 < i2) ); - BOOST_CHECK( static_cast(i1 <= i2) ); - BOOST_CHECK( static_cast(i <= i2) ); - BOOST_CHECK( static_cast(i2 > i1) ); - BOOST_CHECK( static_cast(i2 >= i1) ); - BOOST_CHECK( static_cast(i2 >= i) ); + BOOST_TEST( static_cast(i2 == i) ); + BOOST_TEST( static_cast(i1 != i2) ); + BOOST_TEST( static_cast(i1 < i2) ); + BOOST_TEST( static_cast(i1 <= i2) ); + BOOST_TEST( static_cast(i <= i2) ); + BOOST_TEST( static_cast(i2 > i1) ); + BOOST_TEST( static_cast(i2 >= i1) ); + BOOST_TEST( static_cast(i2 >= i) ); PRIVATE_EXPR_TEST( (i = i1 + i2), (i.value() == 3) ); PRIVATE_EXPR_TEST( (i = i + i2), (i.value() == 5) ); @@ -687,86 +684,86 @@ test_main( int , char * [] ) MyLong j2(2); MyLong j; - BOOST_CHECK( j1.value() == 1 ); - BOOST_CHECK( j2.value() == 2 ); - BOOST_CHECK( j.value() == 0 ); + BOOST_TEST( j1.value() == 1 ); + BOOST_TEST( j2.value() == 2 ); + BOOST_TEST( j.value() == 0 ); cout << "Created MyLong objects.\n"; PRIVATE_EXPR_TEST( (j = j2), (j.value() == 2) ); - BOOST_CHECK( static_cast(j2 == j) ); - BOOST_CHECK( static_cast(2 == j) ); - BOOST_CHECK( static_cast(j2 == 2) ); - BOOST_CHECK( static_cast(j == j2) ); - BOOST_CHECK( static_cast(j1 != j2) ); - BOOST_CHECK( static_cast(j1 != 2) ); - BOOST_CHECK( static_cast(1 != j2) ); - BOOST_CHECK( static_cast(j1 < j2) ); - BOOST_CHECK( static_cast(1 < j2) ); - BOOST_CHECK( static_cast(j1 < 2) ); - BOOST_CHECK( static_cast(j1 <= j2) ); - BOOST_CHECK( static_cast(1 <= j2) ); - BOOST_CHECK( static_cast(j1 <= j) ); - BOOST_CHECK( static_cast(j <= j2) ); - BOOST_CHECK( static_cast(2 <= j2) ); - BOOST_CHECK( static_cast(j <= 2) ); - BOOST_CHECK( static_cast(j2 > j1) ); - BOOST_CHECK( static_cast(2 > j1) ); - BOOST_CHECK( static_cast(j2 > 1) ); - BOOST_CHECK( static_cast(j2 >= j1) ); - BOOST_CHECK( static_cast(2 >= j1) ); - BOOST_CHECK( static_cast(j2 >= 1) ); - BOOST_CHECK( static_cast(j2 >= j) ); - BOOST_CHECK( static_cast(2 >= j) ); - BOOST_CHECK( static_cast(j2 >= 2) ); + BOOST_TEST( static_cast(j2 == j) ); + BOOST_TEST( static_cast(2 == j) ); + BOOST_TEST( static_cast(j2 == 2) ); + BOOST_TEST( static_cast(j == j2) ); + BOOST_TEST( static_cast(j1 != j2) ); + BOOST_TEST( static_cast(j1 != 2) ); + BOOST_TEST( static_cast(1 != j2) ); + BOOST_TEST( static_cast(j1 < j2) ); + BOOST_TEST( static_cast(1 < j2) ); + BOOST_TEST( static_cast(j1 < 2) ); + BOOST_TEST( static_cast(j1 <= j2) ); + BOOST_TEST( static_cast(1 <= j2) ); + BOOST_TEST( static_cast(j1 <= j) ); + BOOST_TEST( static_cast(j <= j2) ); + BOOST_TEST( static_cast(2 <= j2) ); + BOOST_TEST( static_cast(j <= 2) ); + BOOST_TEST( static_cast(j2 > j1) ); + BOOST_TEST( static_cast(2 > j1) ); + BOOST_TEST( static_cast(j2 > 1) ); + BOOST_TEST( static_cast(j2 >= j1) ); + BOOST_TEST( static_cast(2 >= j1) ); + BOOST_TEST( static_cast(j2 >= 1) ); + BOOST_TEST( static_cast(j2 >= j) ); + BOOST_TEST( static_cast(2 >= j) ); + BOOST_TEST( static_cast(j2 >= 2) ); - BOOST_CHECK( static_cast((j1 + 2) == 3) ); - BOOST_CHECK( static_cast((1 + j2) == 3) ); + BOOST_TEST( static_cast((j1 + 2) == 3) ); + BOOST_TEST( static_cast((1 + j2) == 3) ); PRIVATE_EXPR_TEST( (j = j1 + j2), (j.value() == 3) ); - BOOST_CHECK( static_cast((j + 2) == 5) ); - BOOST_CHECK( static_cast((3 + j2) == 5) ); + BOOST_TEST( static_cast((j + 2) == 5) ); + BOOST_TEST( static_cast((3 + j2) == 5) ); PRIVATE_EXPR_TEST( (j = j + j2), (j.value() == 5) ); - BOOST_CHECK( static_cast((j - 1) == 4) ); + BOOST_TEST( static_cast((j - 1) == 4) ); PRIVATE_EXPR_TEST( (j = j - j1), (j.value() == 4) ); - BOOST_CHECK( static_cast((j * 2) == 8) ); - BOOST_CHECK( static_cast((4 * j2) == 8) ); + BOOST_TEST( static_cast((j * 2) == 8) ); + BOOST_TEST( static_cast((4 * j2) == 8) ); PRIVATE_EXPR_TEST( (j = j * j2), (j.value() == 8) ); - BOOST_CHECK( static_cast((j / 2) == 4) ); + BOOST_TEST( static_cast((j / 2) == 4) ); PRIVATE_EXPR_TEST( (j = j / j2), (j.value() == 4) ); - BOOST_CHECK( static_cast((j % 3) == 1) ); + BOOST_TEST( static_cast((j % 3) == 1) ); PRIVATE_EXPR_TEST( (j = j % ( j - j1 )), (j.value() == 1) ); PRIVATE_EXPR_TEST( (j = j2 + j2), (j.value() == 4) ); - BOOST_CHECK( static_cast((1 | j2 | j) == 7) ); - BOOST_CHECK( static_cast((j1 | 2 | j) == 7) ); - BOOST_CHECK( static_cast((j1 | j2 | 4) == 7) ); + BOOST_TEST( static_cast((1 | j2 | j) == 7) ); + BOOST_TEST( static_cast((j1 | 2 | j) == 7) ); + BOOST_TEST( static_cast((j1 | j2 | 4) == 7) ); PRIVATE_EXPR_TEST( (j = j1 | j2 | j), (j.value() == 7) ); - BOOST_CHECK( static_cast((7 & j2) == 2) ); - BOOST_CHECK( static_cast((j & 2) == 2) ); + BOOST_TEST( static_cast((7 & j2) == 2) ); + BOOST_TEST( static_cast((j & 2) == 2) ); PRIVATE_EXPR_TEST( (j = j & j2), (j.value() == 2) ); PRIVATE_EXPR_TEST( (j = j | j1), (j.value() == 3) ); - BOOST_CHECK( static_cast((3 ^ j1) == 2) ); - BOOST_CHECK( static_cast((j ^ 1) == 2) ); + BOOST_TEST( static_cast((3 ^ j1) == 2) ); + BOOST_TEST( static_cast((j ^ 1) == 2) ); PRIVATE_EXPR_TEST( (j = j ^ j1), (j.value() == 2) ); PRIVATE_EXPR_TEST( (j = ( j + j1 ) * ( j2 | j1 )), (j.value() == 9) ); - BOOST_CHECK( static_cast((j1 << 2) == 4) ); - BOOST_CHECK( static_cast((j2 << 1) == 4) ); + BOOST_TEST( static_cast((j1 << 2) == 4) ); + BOOST_TEST( static_cast((j2 << 1) == 4) ); PRIVATE_EXPR_TEST( (j = j1 << j2), (j.value() == 4) ); - BOOST_CHECK( static_cast((j >> 2) == 1) ); - BOOST_CHECK( static_cast((j2 >> 1) == 1) ); + BOOST_TEST( static_cast((j >> 2) == 1) ); + BOOST_TEST( static_cast((j2 >> 1) == 1) ); PRIVATE_EXPR_TEST( (j = j2 >> j1), (j.value() == 1) ); cout << "Performed tests on MyLong objects.\n"; @@ -775,22 +772,22 @@ test_main( int , char * [] ) MyChar k2(2); MyChar k; - BOOST_CHECK( k1.value() == 1 ); - BOOST_CHECK( k2.value() == 2 ); - BOOST_CHECK( k.value() == 0 ); + BOOST_TEST( k1.value() == 1 ); + BOOST_TEST( k2.value() == 2 ); + BOOST_TEST( k.value() == 0 ); cout << "Created MyChar objects.\n"; PRIVATE_EXPR_TEST( (k = k2), (k.value() == 2) ); - BOOST_CHECK( static_cast(k2 == k) ); - BOOST_CHECK( static_cast(k1 != k2) ); - BOOST_CHECK( static_cast(k1 < k2) ); - BOOST_CHECK( static_cast(k1 <= k2) ); - BOOST_CHECK( static_cast(k <= k2) ); - BOOST_CHECK( static_cast(k2 > k1) ); - BOOST_CHECK( static_cast(k2 >= k1) ); - BOOST_CHECK( static_cast(k2 >= k) ); + BOOST_TEST( static_cast(k2 == k) ); + BOOST_TEST( static_cast(k1 != k2) ); + BOOST_TEST( static_cast(k1 < k2) ); + BOOST_TEST( static_cast(k1 <= k2) ); + BOOST_TEST( static_cast(k <= k2) ); + BOOST_TEST( static_cast(k2 > k1) ); + BOOST_TEST( static_cast(k2 >= k1) ); + BOOST_TEST( static_cast(k2 >= k) ); cout << "Performed tests on MyChar objects.\n"; @@ -798,39 +795,39 @@ test_main( int , char * [] ) MyShort l2(2); MyShort l; - BOOST_CHECK( l1.value() == 1 ); - BOOST_CHECK( l2.value() == 2 ); - BOOST_CHECK( l.value() == 0 ); + BOOST_TEST( l1.value() == 1 ); + BOOST_TEST( l2.value() == 2 ); + BOOST_TEST( l.value() == 0 ); cout << "Created MyShort objects.\n"; PRIVATE_EXPR_TEST( (l = l2), (l.value() == 2) ); - BOOST_CHECK( static_cast(l2 == l) ); - BOOST_CHECK( static_cast(2 == l) ); - BOOST_CHECK( static_cast(l2 == 2) ); - BOOST_CHECK( static_cast(l == l2) ); - BOOST_CHECK( static_cast(l1 != l2) ); - BOOST_CHECK( static_cast(l1 != 2) ); - BOOST_CHECK( static_cast(1 != l2) ); - BOOST_CHECK( static_cast(l1 < l2) ); - BOOST_CHECK( static_cast(1 < l2) ); - BOOST_CHECK( static_cast(l1 < 2) ); - BOOST_CHECK( static_cast(l1 <= l2) ); - BOOST_CHECK( static_cast(1 <= l2) ); - BOOST_CHECK( static_cast(l1 <= l) ); - BOOST_CHECK( static_cast(l <= l2) ); - BOOST_CHECK( static_cast(2 <= l2) ); - BOOST_CHECK( static_cast(l <= 2) ); - BOOST_CHECK( static_cast(l2 > l1) ); - BOOST_CHECK( static_cast(2 > l1) ); - BOOST_CHECK( static_cast(l2 > 1) ); - BOOST_CHECK( static_cast(l2 >= l1) ); - BOOST_CHECK( static_cast(2 >= l1) ); - BOOST_CHECK( static_cast(l2 >= 1) ); - BOOST_CHECK( static_cast(l2 >= l) ); - BOOST_CHECK( static_cast(2 >= l) ); - BOOST_CHECK( static_cast(l2 >= 2) ); + BOOST_TEST( static_cast(l2 == l) ); + BOOST_TEST( static_cast(2 == l) ); + BOOST_TEST( static_cast(l2 == 2) ); + BOOST_TEST( static_cast(l == l2) ); + BOOST_TEST( static_cast(l1 != l2) ); + BOOST_TEST( static_cast(l1 != 2) ); + BOOST_TEST( static_cast(1 != l2) ); + BOOST_TEST( static_cast(l1 < l2) ); + BOOST_TEST( static_cast(1 < l2) ); + BOOST_TEST( static_cast(l1 < 2) ); + BOOST_TEST( static_cast(l1 <= l2) ); + BOOST_TEST( static_cast(1 <= l2) ); + BOOST_TEST( static_cast(l1 <= l) ); + BOOST_TEST( static_cast(l <= l2) ); + BOOST_TEST( static_cast(2 <= l2) ); + BOOST_TEST( static_cast(l <= 2) ); + BOOST_TEST( static_cast(l2 > l1) ); + BOOST_TEST( static_cast(2 > l1) ); + BOOST_TEST( static_cast(l2 > 1) ); + BOOST_TEST( static_cast(l2 >= l1) ); + BOOST_TEST( static_cast(2 >= l1) ); + BOOST_TEST( static_cast(l2 >= 1) ); + BOOST_TEST( static_cast(l2 >= l) ); + BOOST_TEST( static_cast(2 >= l) ); + BOOST_TEST( static_cast(l2 >= 2) ); cout << "Performed tests on MyShort objects.\n"; @@ -840,44 +837,44 @@ test_main( int , char * [] ) MyDoubleInt di; MyDoubleInt tmp; - BOOST_CHECK( di1.value() == 1 ); - BOOST_CHECK( di2.value() == 2 ); - BOOST_CHECK( di2.value() == 2 ); - BOOST_CHECK( di.value() == 0 ); + BOOST_TEST( di1.value() == 1 ); + BOOST_TEST( di2.value() == 2 ); + BOOST_TEST( di2.value() == 2 ); + BOOST_TEST( di.value() == 0 ); cout << "Created MyDoubleInt objects.\n"; PRIVATE_EXPR_TEST( (di = di2), (di.value() == 2) ); - BOOST_CHECK( static_cast(di2 == di) ); - BOOST_CHECK( static_cast(2 == di) ); - BOOST_CHECK( static_cast(di == 2) ); - BOOST_CHECK( static_cast(di1 < di2) ); - BOOST_CHECK( static_cast(1 < di2) ); - BOOST_CHECK( static_cast(di1 <= di2) ); - BOOST_CHECK( static_cast(1 <= di2) ); - BOOST_CHECK( static_cast(di2 > di1) ); - BOOST_CHECK( static_cast(di2 > 1) ); - BOOST_CHECK( static_cast(di2 >= di1) ); - BOOST_CHECK( static_cast(di2 >= 1) ); - BOOST_CHECK( static_cast(di1 / di2 == half) ); - BOOST_CHECK( static_cast(di1 / 2 == half) ); - BOOST_CHECK( static_cast(1 / di2 == half) ); + BOOST_TEST( static_cast(di2 == di) ); + BOOST_TEST( static_cast(2 == di) ); + BOOST_TEST( static_cast(di == 2) ); + BOOST_TEST( static_cast(di1 < di2) ); + BOOST_TEST( static_cast(1 < di2) ); + BOOST_TEST( static_cast(di1 <= di2) ); + BOOST_TEST( static_cast(1 <= di2) ); + BOOST_TEST( static_cast(di2 > di1) ); + BOOST_TEST( static_cast(di2 > 1) ); + BOOST_TEST( static_cast(di2 >= di1) ); + BOOST_TEST( static_cast(di2 >= 1) ); + BOOST_TEST( static_cast(di1 / di2 == half) ); + BOOST_TEST( static_cast(di1 / 2 == half) ); + BOOST_TEST( static_cast(1 / di2 == half) ); PRIVATE_EXPR_TEST( (tmp=di1), static_cast((tmp/=2) == half) ); PRIVATE_EXPR_TEST( (tmp=di1), static_cast((tmp/=di2) == half) ); - BOOST_CHECK( static_cast(di1 * di2 == di2) ); - BOOST_CHECK( static_cast(di1 * 2 == di2) ); - BOOST_CHECK( static_cast(1 * di2 == di2) ); + BOOST_TEST( static_cast(di1 * di2 == di2) ); + BOOST_TEST( static_cast(di1 * 2 == di2) ); + BOOST_TEST( static_cast(1 * di2 == di2) ); PRIVATE_EXPR_TEST( (tmp=di1), static_cast((tmp*=2) == di2) ); PRIVATE_EXPR_TEST( (tmp=di1), static_cast((tmp*=di2) == di2) ); - BOOST_CHECK( static_cast(di2 - di1 == di1) ); - BOOST_CHECK( static_cast(di2 - 1 == di1) ); - BOOST_CHECK( static_cast(2 - di1 == di1) ); + BOOST_TEST( static_cast(di2 - di1 == di1) ); + BOOST_TEST( static_cast(di2 - 1 == di1) ); + BOOST_TEST( static_cast(2 - di1 == di1) ); PRIVATE_EXPR_TEST( (tmp=di2), static_cast((tmp-=1) == di1) ); PRIVATE_EXPR_TEST( (tmp=di2), static_cast((tmp-=di1) == di1) ); - BOOST_CHECK( static_cast(di1 + di1 == di2) ); - BOOST_CHECK( static_cast(di1 + 1 == di2) ); - BOOST_CHECK( static_cast(1 + di1 == di2) ); + BOOST_TEST( static_cast(di1 + di1 == di2) ); + BOOST_TEST( static_cast(di1 + 1 == di2) ); + BOOST_TEST( static_cast(1 + di1 == di2) ); PRIVATE_EXPR_TEST( (tmp=di1), static_cast((tmp+=1) == di2) ); PRIVATE_EXPR_TEST( (tmp=di1), static_cast((tmp+=di1) == di2) ); @@ -888,52 +885,52 @@ test_main( int , char * [] ) MyLongInt li; MyLongInt tmp2; - BOOST_CHECK( li1.value() == 1 ); - BOOST_CHECK( li2.value() == 2 ); - BOOST_CHECK( li.value() == 0 ); + BOOST_TEST( li1.value() == 1 ); + BOOST_TEST( li2.value() == 2 ); + BOOST_TEST( li.value() == 0 ); cout << "Created MyLongInt objects.\n"; PRIVATE_EXPR_TEST( (li = li2), (li.value() == 2) ); - BOOST_CHECK( static_cast(li2 == li) ); - BOOST_CHECK( static_cast(2 == li) ); - BOOST_CHECK( static_cast(li == 2) ); - BOOST_CHECK( static_cast(li1 < li2) ); - BOOST_CHECK( static_cast(1 < li2) ); - BOOST_CHECK( static_cast(li1 <= li2) ); - BOOST_CHECK( static_cast(1 <= li2) ); - BOOST_CHECK( static_cast(li2 > li1) ); - BOOST_CHECK( static_cast(li2 > 1) ); - BOOST_CHECK( static_cast(li2 >= li1) ); - BOOST_CHECK( static_cast(li2 >= 1) ); - BOOST_CHECK( static_cast(li1 % li2 == li1) ); - BOOST_CHECK( static_cast(li1 % 2 == li1) ); - BOOST_CHECK( static_cast(1 % li2 == li1) ); + BOOST_TEST( static_cast(li2 == li) ); + BOOST_TEST( static_cast(2 == li) ); + BOOST_TEST( static_cast(li == 2) ); + BOOST_TEST( static_cast(li1 < li2) ); + BOOST_TEST( static_cast(1 < li2) ); + BOOST_TEST( static_cast(li1 <= li2) ); + BOOST_TEST( static_cast(1 <= li2) ); + BOOST_TEST( static_cast(li2 > li1) ); + BOOST_TEST( static_cast(li2 > 1) ); + BOOST_TEST( static_cast(li2 >= li1) ); + BOOST_TEST( static_cast(li2 >= 1) ); + BOOST_TEST( static_cast(li1 % li2 == li1) ); + BOOST_TEST( static_cast(li1 % 2 == li1) ); + BOOST_TEST( static_cast(1 % li2 == li1) ); PRIVATE_EXPR_TEST( (tmp2=li1), static_cast((tmp2%=2) == li1) ); PRIVATE_EXPR_TEST( (tmp2=li1), static_cast((tmp2%=li2) == li1) ); - BOOST_CHECK( static_cast(li1 / li2 == 0) ); - BOOST_CHECK( static_cast(li1 / 2 == 0) ); - BOOST_CHECK( static_cast(1 / li2 == 0) ); + BOOST_TEST( static_cast(li1 / li2 == 0) ); + BOOST_TEST( static_cast(li1 / 2 == 0) ); + BOOST_TEST( static_cast(1 / li2 == 0) ); PRIVATE_EXPR_TEST( (tmp2=li1), static_cast((tmp2/=2) == 0) ); PRIVATE_EXPR_TEST( (tmp2=li1), static_cast((tmp2/=li2) == 0) ); - BOOST_CHECK( static_cast(li1 * li2 == li2) ); - BOOST_CHECK( static_cast(li1 * 2 == li2) ); - BOOST_CHECK( static_cast(1 * li2 == li2) ); + BOOST_TEST( static_cast(li1 * li2 == li2) ); + BOOST_TEST( static_cast(li1 * 2 == li2) ); + BOOST_TEST( static_cast(1 * li2 == li2) ); PRIVATE_EXPR_TEST( (tmp2=li1), static_cast((tmp2*=2) == li2) ); PRIVATE_EXPR_TEST( (tmp2=li1), static_cast((tmp2*=li2) == li2) ); - BOOST_CHECK( static_cast(li2 - li1 == li1) ); - BOOST_CHECK( static_cast(li2 - 1 == li1) ); - BOOST_CHECK( static_cast(2 - li1 == li1) ); + BOOST_TEST( static_cast(li2 - li1 == li1) ); + BOOST_TEST( static_cast(li2 - 1 == li1) ); + BOOST_TEST( static_cast(2 - li1 == li1) ); PRIVATE_EXPR_TEST( (tmp2=li2), static_cast((tmp2-=1) == li1) ); PRIVATE_EXPR_TEST( (tmp2=li2), static_cast((tmp2-=li1) == li1) ); - BOOST_CHECK( static_cast(li1 + li1 == li2) ); - BOOST_CHECK( static_cast(li1 + 1 == li2) ); - BOOST_CHECK( static_cast(1 + li1 == li2) ); + BOOST_TEST( static_cast(li1 + li1 == li2) ); + BOOST_TEST( static_cast(li1 + 1 == li2) ); + BOOST_TEST( static_cast(1 + li1 == li2) ); PRIVATE_EXPR_TEST( (tmp2=li1), static_cast((tmp2+=1) == li2) ); PRIVATE_EXPR_TEST( (tmp2=li1), static_cast((tmp2+=li1) == li2) ); cout << "Performed tests on MyLongInt objects.\n"; - return boost::exit_success; + return boost::report_errors(); } diff --git a/test/string_ref_from_rvalue.cpp b/test/string_ref_from_rvalue.cpp index a109f17..6ec8a5a 100644 --- a/test/string_ref_from_rvalue.cpp +++ b/test/string_ref_from_rvalue.cpp @@ -17,11 +17,9 @@ #error "Unsupported test" #endif -#include "boost/test/minimal.hpp" - std::string makeatemp() { return "abc"; } -int test_main(int, char **) +int main() { boost::basic_string_ref sv(makeatemp()); return 0; diff --git a/test/string_ref_test1.cpp b/test/string_ref_test1.cpp index f1d4df2..fc88905 100644 --- a/test/string_ref_test1.cpp +++ b/test/string_ref_test1.cpp @@ -13,17 +13,16 @@ #include -#define BOOST_TEST_MAIN -#include +#include typedef boost::string_ref string_ref; // Should be equal void interop ( const std::string &str, string_ref ref ) { -// BOOST_CHECK ( str == ref ); - BOOST_CHECK ( str.size () == ref.size ()); - BOOST_CHECK ( std::equal ( str.begin (), str.end (), ref.begin ())); - BOOST_CHECK ( std::equal ( str.rbegin (), str.rend (), ref.rbegin ())); +// BOOST_TEST ( str == ref ); + BOOST_TEST ( str.size () == ref.size ()); + BOOST_TEST ( std::equal ( str.begin (), str.end (), ref.begin ())); + BOOST_TEST ( std::equal ( str.rbegin (), str.rend (), ref.rbegin ())); } void null_tests ( const char *p ) { @@ -34,10 +33,10 @@ void null_tests ( const char *p ) { string_ref sr4 ( p ); sr4.clear (); - BOOST_CHECK ( sr1 == sr2 ); - BOOST_CHECK ( sr1 == sr3 ); - BOOST_CHECK ( sr2 == sr3 ); - BOOST_CHECK ( sr1 == sr4 ); + BOOST_TEST ( sr1 == sr2 ); + BOOST_TEST ( sr1 == sr3 ); + BOOST_TEST ( sr2 == sr3 ); + BOOST_TEST ( sr1 == sr4 ); } // make sure that substrings work just like strings @@ -94,7 +93,7 @@ const char *test_strings [] = { NULL }; -BOOST_AUTO_TEST_CASE( test_main ) +int main() { const char **p = &test_strings[0]; @@ -106,4 +105,6 @@ BOOST_AUTO_TEST_CASE( test_main ) p++; } + + return boost::report_errors(); } diff --git a/test/string_ref_test2.cpp b/test/string_ref_test2.cpp index 081af54..ccb5d6d 100644 --- a/test/string_ref_test2.cpp +++ b/test/string_ref_test2.cpp @@ -12,8 +12,7 @@ #include -#define BOOST_TEST_MAIN -#include +#include typedef boost::string_ref string_ref; @@ -24,27 +23,27 @@ void ends_with ( const char *arg ) { const char *p = arg; while ( *p ) { - BOOST_CHECK ( sr.ends_with ( p )); + BOOST_TEST ( sr.ends_with ( p )); ++p; } while ( !sr2.empty ()) { - BOOST_CHECK ( sr.ends_with ( sr2 )); + BOOST_TEST ( sr.ends_with ( sr2 )); sr2.remove_prefix (1); } sr2 = arg; while ( !sr2.empty ()) { - BOOST_CHECK ( sr.ends_with ( sr2 )); + BOOST_TEST ( sr.ends_with ( sr2 )); sr2.remove_prefix (1); } char ch = sz == 0 ? '\0' : arg [ sz - 1 ]; sr2 = arg; if ( sz > 0 ) - BOOST_CHECK ( sr2.ends_with ( ch )); - BOOST_CHECK ( !sr2.ends_with ( ++ch )); - BOOST_CHECK ( sr2.ends_with ( string_ref ())); + BOOST_TEST ( sr2.ends_with ( ch )); + BOOST_TEST ( !sr2.ends_with ( ++ch )); + BOOST_TEST ( sr2.ends_with ( string_ref ())); } void starts_with ( const char *arg ) { @@ -54,21 +53,21 @@ void starts_with ( const char *arg ) { const char *p = arg + std::strlen ( arg ) - 1; while ( p >= arg ) { std::string foo ( arg, p + 1 ); - BOOST_CHECK ( sr.starts_with ( foo )); + BOOST_TEST ( sr.starts_with ( foo )); --p; } while ( !sr2.empty ()) { - BOOST_CHECK ( sr.starts_with ( sr2 )); + BOOST_TEST ( sr.starts_with ( sr2 )); sr2.remove_suffix (1); } char ch = *arg; sr2 = arg; if ( sz > 0 ) - BOOST_CHECK ( sr2.starts_with ( ch )); - BOOST_CHECK ( !sr2.starts_with ( ++ch )); - BOOST_CHECK ( sr2.starts_with ( string_ref ())); + BOOST_TEST ( sr2.starts_with ( ch )); + BOOST_TEST ( !sr2.starts_with ( ++ch )); + BOOST_TEST ( sr2.starts_with ( string_ref ())); } void reverse ( const char *arg ) { @@ -78,14 +77,14 @@ void reverse ( const char *arg ) { string_ref sr2 ( string1 ); std::string string2 ( sr2.rbegin (), sr2.rend ()); - BOOST_CHECK ( std::equal ( sr2.rbegin (), sr2.rend (), arg )); - BOOST_CHECK ( string2 == arg ); - BOOST_CHECK ( std::equal ( sr1.begin (), sr1.end (), string2.begin ())); + BOOST_TEST ( std::equal ( sr2.rbegin (), sr2.rend (), arg )); + BOOST_TEST ( string2 == arg ); + BOOST_TEST ( std::equal ( sr1.begin (), sr1.end (), string2.begin ())); } // This helper function eliminates signed vs. unsigned warnings string_ref::size_type ptr_diff ( const char *res, const char *base ) { - BOOST_CHECK ( res >= base ); + BOOST_TEST ( res >= base ); return static_cast ( res - base ); } @@ -99,7 +98,7 @@ void find ( const char *arg ) { sr1 = arg; while ( *p ) { string_ref::size_type pos = sr1.find(*p); - BOOST_CHECK ( pos != string_ref::npos && ( pos <= ptr_diff ( p, arg ))); + BOOST_TEST ( pos != string_ref::npos && ( pos <= ptr_diff ( p, arg ))); ++p; } @@ -108,7 +107,7 @@ void find ( const char *arg ) { sr1 = arg; while ( *p ) { string_ref::size_type pos = sr1.rfind(*p); - BOOST_CHECK ( pos != string_ref::npos && pos < sr1.size () && ( pos >= ptr_diff ( p, arg ))); + BOOST_TEST ( pos != string_ref::npos && pos < sr1.size () && ( pos >= ptr_diff ( p, arg ))); ++p; } @@ -118,7 +117,7 @@ void find ( const char *arg ) { while ( *p && *(p+1)) { string_ref sr3 ( p, 2 ); string_ref::size_type pos = sr1.find ( sr3 ); - BOOST_CHECK ( pos != string_ref::npos && pos <= static_cast( p - arg )); + BOOST_TEST ( pos != string_ref::npos && pos <= static_cast( p - arg )); p++; } @@ -129,9 +128,9 @@ void find ( const char *arg ) { for ( int ch = 1; ch < 256; ++ch ) { string_ref::size_type pos = sr1.find(ch); const char *strp = std::strchr ( arg, ch ); - BOOST_CHECK (( strp == NULL ) == ( pos == string_ref::npos )); + BOOST_TEST (( strp == NULL ) == ( pos == string_ref::npos )); if ( strp != NULL ) - BOOST_CHECK ( ptr_diff ( strp, arg ) == pos ); + BOOST_TEST ( ptr_diff ( strp, arg ) == pos ); } sr1 = arg; @@ -141,9 +140,9 @@ void find ( const char *arg ) { for ( int ch = 1; ch < 256; ++ch ) { string_ref::size_type pos = sr1.rfind(ch); const char *strp = std::strrchr ( arg, ch ); - BOOST_CHECK (( strp == NULL ) == ( pos == string_ref::npos )); + BOOST_TEST (( strp == NULL ) == ( pos == string_ref::npos )); if ( strp != NULL ) - BOOST_CHECK ( ptr_diff ( strp, arg ) == pos ); + BOOST_TEST ( ptr_diff ( strp, arg ) == pos ); } @@ -152,7 +151,7 @@ void find ( const char *arg ) { sr1 = arg; while ( !sr1.empty ()) { string_ref::size_type pos = sr1.find(*p); - BOOST_CHECK ( pos == 0 ); + BOOST_TEST ( pos == 0 ); sr1.remove_prefix (1); ++p; } @@ -162,7 +161,7 @@ void find ( const char *arg ) { p = arg + std::strlen ( arg ) - 1; while ( !sr1.empty ()) { string_ref::size_type pos = sr1.rfind(*p); - BOOST_CHECK ( pos == sr1.size () - 1 ); + BOOST_TEST ( pos == sr1.size () - 1 ); sr1.remove_suffix (1); --p; } @@ -172,7 +171,7 @@ void find ( const char *arg ) { p = arg; while ( !sr1.empty ()) { string_ref::size_type pos = sr1.find_first_of(*p); - BOOST_CHECK ( pos == 0 ); + BOOST_TEST ( pos == 0 ); sr1.remove_prefix (1); ++p; } @@ -183,7 +182,7 @@ void find ( const char *arg ) { p = arg + std::strlen ( arg ) - 1; while ( !sr1.empty ()) { string_ref::size_type pos = sr1.find_last_of(*p); - BOOST_CHECK ( pos == sr1.size () - 1 ); + BOOST_TEST ( pos == sr1.size () - 1 ); sr1.remove_suffix (1); --p; } @@ -192,8 +191,8 @@ void find ( const char *arg ) { sr1 = arg; sr2 = arg; while ( !sr1.empty() ) { - BOOST_CHECK ( sr1.find_first_of ( sr2 ) == 0 ); - BOOST_CHECK ( sr1.find_first_not_of ( sr2 ) == string_ref::npos ); + BOOST_TEST ( sr1.find_first_of ( sr2 ) == 0 ); + BOOST_TEST ( sr1.find_first_not_of ( sr2 ) == string_ref::npos ); sr1.remove_prefix ( 1 ); } @@ -202,14 +201,14 @@ void find ( const char *arg ) { while ( *p ) { string_ref::size_type pos1 = sr1.find_first_of(*p); string_ref::size_type pos2 = sr1.find_first_not_of(*p); - BOOST_CHECK ( pos1 != string_ref::npos && pos1 < sr1.size () && pos1 <= ptr_diff ( p, arg )); + BOOST_TEST ( pos1 != string_ref::npos && pos1 < sr1.size () && pos1 <= ptr_diff ( p, arg )); if ( pos2 != string_ref::npos ) { for ( size_t i = 0 ; i < pos2; ++i ) - BOOST_CHECK ( sr1[i] == *p ); - BOOST_CHECK ( sr1 [ pos2 ] != *p ); + BOOST_TEST ( sr1[i] == *p ); + BOOST_TEST ( sr1 [ pos2 ] != *p ); } - BOOST_CHECK ( pos2 != pos1 ); + BOOST_TEST ( pos2 != pos1 ); ++p; } @@ -217,8 +216,8 @@ void find ( const char *arg ) { sr1 = arg; sr2 = arg; while ( !sr1.empty() ) { - BOOST_CHECK ( sr1.find_last_of ( sr2 ) == ( sr1.size () - 1 )); - BOOST_CHECK ( sr1.find_last_not_of ( sr2 ) == string_ref::npos ); + BOOST_TEST ( sr1.find_last_of ( sr2 ) == ( sr1.size () - 1 )); + BOOST_TEST ( sr1.find_last_not_of ( sr2 ) == string_ref::npos ); sr1.remove_suffix ( 1 ); } @@ -227,15 +226,15 @@ void find ( const char *arg ) { while ( *p ) { string_ref::size_type pos1 = sr1.find_last_of(*p); string_ref::size_type pos2 = sr1.find_last_not_of(*p); - BOOST_CHECK ( pos1 != string_ref::npos && pos1 < sr1.size () && pos1 >= ptr_diff ( p, arg )); - BOOST_CHECK ( pos2 == string_ref::npos || pos1 < sr1.size ()); + BOOST_TEST ( pos1 != string_ref::npos && pos1 < sr1.size () && pos1 >= ptr_diff ( p, arg )); + BOOST_TEST ( pos2 == string_ref::npos || pos1 < sr1.size ()); if ( pos2 != string_ref::npos ) { for ( size_t i = sr1.size () -1 ; i > pos2; --i ) - BOOST_CHECK ( sr1[i] == *p ); - BOOST_CHECK ( sr1 [ pos2 ] != *p ); + BOOST_TEST ( sr1[i] == *p ); + BOOST_TEST ( sr1 [ pos2 ] != *p ); } - BOOST_CHECK ( pos2 != pos1 ); + BOOST_TEST ( pos2 != pos1 ); ++p; } @@ -251,11 +250,11 @@ void to_string ( const char *arg ) { sr1 = arg; // str2 = sr1.to_string > (); str2 = sr1.to_string (); - BOOST_CHECK ( str1 == str2 ); + BOOST_TEST ( str1 == str2 ); #ifndef BOOST_NO_CXX11_EXPLICIT_CONVERSION_OPERATORS std::string str3 = static_cast ( sr1 ); - BOOST_CHECK ( str1 == str3 ); + BOOST_TEST ( str1 == str3 ); #endif } @@ -266,28 +265,28 @@ void compare ( const char *arg ) { str1.assign ( arg ); sr1 = arg; - BOOST_CHECK ( sr1 == sr1); // compare string_ref and string_ref - BOOST_CHECK ( sr1 == str1); // compare string and string_ref - BOOST_CHECK ( str1 == sr1 ); // compare string_ref and string - BOOST_CHECK ( sr1 == arg ); // compare string_ref and pointer - BOOST_CHECK ( arg == sr1 ); // compare pointer and string_ref + BOOST_TEST ( sr1 == sr1); // compare string_ref and string_ref + BOOST_TEST ( sr1 == str1); // compare string and string_ref + BOOST_TEST ( str1 == sr1 ); // compare string_ref and string + BOOST_TEST ( sr1 == arg ); // compare string_ref and pointer + BOOST_TEST ( arg == sr1 ); // compare pointer and string_ref if ( sr1.size () > 0 ) { (*str1.rbegin())++; - BOOST_CHECK ( sr1 != str1 ); - BOOST_CHECK ( str1 != sr1 ); - BOOST_CHECK ( sr1 < str1 ); - BOOST_CHECK ( sr1 <= str1 ); - BOOST_CHECK ( str1 > sr1 ); - BOOST_CHECK ( str1 >= sr1 ); + BOOST_TEST ( sr1 != str1 ); + BOOST_TEST ( str1 != sr1 ); + BOOST_TEST ( sr1 < str1 ); + BOOST_TEST ( sr1 <= str1 ); + BOOST_TEST ( str1 > sr1 ); + BOOST_TEST ( str1 >= sr1 ); (*str1.rbegin()) -= 2; - BOOST_CHECK ( sr1 != str1 ); - BOOST_CHECK ( str1 != sr1 ); - BOOST_CHECK ( sr1 > str1 ); - BOOST_CHECK ( sr1 >= str1 ); - BOOST_CHECK ( str1 < sr1 ); - BOOST_CHECK ( str1 <= sr1 ); + BOOST_TEST ( sr1 != str1 ); + BOOST_TEST ( str1 != sr1 ); + BOOST_TEST ( sr1 > str1 ); + BOOST_TEST ( sr1 >= str1 ); + BOOST_TEST ( str1 < sr1 ); + BOOST_TEST ( str1 <= sr1 ); } } @@ -301,7 +300,7 @@ const char *test_strings [] = { NULL }; -BOOST_AUTO_TEST_CASE( test_main ) +int main() { const char **p = &test_strings[0]; @@ -315,4 +314,6 @@ BOOST_AUTO_TEST_CASE( test_main ) p++; } + + return boost::report_errors(); } diff --git a/test/string_ref_test_io.cpp b/test/string_ref_test_io.cpp index 72f5837..3609f91 100644 --- a/test/string_ref_test_io.cpp +++ b/test/string_ref_test_io.cpp @@ -12,8 +12,6 @@ * \brief This header contains tests for stream operations of \c basic_string_ref. */ -#define BOOST_TEST_MODULE string_ref_test_io - #include #include @@ -23,23 +21,10 @@ #include #include -#include -#include +#include -typedef boost::mpl::vector< - char -#if !defined(BOOST_NO_STD_WSTRING) && !defined(BOOST_NO_STD_WSTREAMBUF) && !defined(BOOST_NO_INTRINSIC_WCHAR_T) - , wchar_t -#endif /* Current implementations seem to be missing codecvt facets to convert chars to char16_t and char32_t even though the types are available. -#if !defined(BOOST_NO_CXX11_CHAR16_T) - , char16_t -#endif -#if !defined(BOOST_NO_CXX11_CHAR32_T) - , char32_t -#endif */ ->::type char_types; static const char* test_strings[] = { @@ -72,7 +57,8 @@ struct context }; // Test regular output -BOOST_AUTO_TEST_CASE_TEMPLATE(string_ref_output, CharT, char_types) +template +void test_string_ref_output() { typedef CharT char_type; typedef std::basic_ostringstream< char_type > ostream_type; @@ -82,11 +68,12 @@ BOOST_AUTO_TEST_CASE_TEMPLATE(string_ref_output, CharT, char_types) ostream_type strm; strm << string_ref_type(ctx.abcd); - BOOST_CHECK(strm.str() == ctx.abcd); + BOOST_TEST(strm.str() == ctx.abcd); } // Test support for padding -BOOST_AUTO_TEST_CASE_TEMPLATE(padding, CharT, char_types) +template +void test_padding() { typedef CharT char_type; typedef std::basic_ostringstream< char_type > ostream_type; @@ -102,7 +89,7 @@ BOOST_AUTO_TEST_CASE_TEMPLATE(padding, CharT, char_types) ostream_type strm_correct; strm_correct << ctx.begin << std::setw(8) << ctx.abcd << ctx.end; - BOOST_CHECK(strm_ref.str() == strm_correct.str()); + BOOST_TEST(strm_ref.str() == strm_correct.str()); } // Test for long padding @@ -113,7 +100,7 @@ BOOST_AUTO_TEST_CASE_TEMPLATE(padding, CharT, char_types) ostream_type strm_correct; strm_correct << ctx.begin << std::setw(100) << ctx.abcd << ctx.end; - BOOST_CHECK(strm_ref.str() == strm_correct.str()); + BOOST_TEST(strm_ref.str() == strm_correct.str()); } // Test that short width does not truncate the string @@ -124,12 +111,13 @@ BOOST_AUTO_TEST_CASE_TEMPLATE(padding, CharT, char_types) ostream_type strm_correct; strm_correct << ctx.begin << std::setw(1) << ctx.abcd << ctx.end; - BOOST_CHECK(strm_ref.str() == strm_correct.str()); + BOOST_TEST(strm_ref.str() == strm_correct.str()); } } // Test support for padding fill -BOOST_AUTO_TEST_CASE_TEMPLATE(padding_fill, CharT, char_types) +template +void test_padding_fill() { typedef CharT char_type; typedef std::basic_ostringstream< char_type > ostream_type; @@ -143,11 +131,12 @@ BOOST_AUTO_TEST_CASE_TEMPLATE(padding_fill, CharT, char_types) ostream_type strm_correct; strm_correct << ctx.begin << std::setfill(static_cast< char_type >('x')) << std::setw(8) << ctx.abcd << ctx.end; - BOOST_CHECK(strm_ref.str() == strm_correct.str()); + BOOST_TEST(strm_ref.str() == strm_correct.str()); } // Test support for alignment -BOOST_AUTO_TEST_CASE_TEMPLATE(alignment, CharT, char_types) +template +void test_alignment() { typedef CharT char_type; typedef std::basic_ostringstream< char_type > ostream_type; @@ -163,7 +152,7 @@ BOOST_AUTO_TEST_CASE_TEMPLATE(alignment, CharT, char_types) ostream_type strm_correct; strm_correct << ctx.begin << std::left << std::setw(8) << ctx.abcd << ctx.end; - BOOST_CHECK(strm_ref.str() == strm_correct.str()); + BOOST_TEST(strm_ref.str() == strm_correct.str()); } // Right alignment @@ -174,6 +163,22 @@ BOOST_AUTO_TEST_CASE_TEMPLATE(alignment, CharT, char_types) ostream_type strm_correct; strm_correct << ctx.begin << std::right << std::setw(8) << ctx.abcd << ctx.end; - BOOST_CHECK(strm_ref.str() == strm_correct.str()); + BOOST_TEST(strm_ref.str() == strm_correct.str()); } } + +template +void test() +{ + test_string_ref_output(); + test_padding(); + test_padding_fill(); + test_alignment(); +} + +int main() +{ + test(); + test(); + return boost::report_errors(); +} diff --git a/test/string_view_constexpr_test1.cpp b/test/string_view_constexpr_test1.cpp index 014ef1e..615d600 100644 --- a/test/string_view_constexpr_test1.cpp +++ b/test/string_view_constexpr_test1.cpp @@ -16,14 +16,7 @@ #include #include -#define BOOST_TEST_MAIN -#include - - -#if __cplusplus < 201402L -BOOST_AUTO_TEST_CASE( test_main ) {} -#else - +#if __cplusplus >= 201402L struct constexpr_char_traits { typedef char char_type; @@ -78,7 +71,7 @@ constexpr size_t constexpr_char_traits::length(const char_type* s) noexcept typedef boost::basic_string_view string_view; -BOOST_AUTO_TEST_CASE( test_main ) +int main() { constexpr string_view sv1; constexpr string_view sv2{"abc", 3}; // ptr, len diff --git a/test/string_view_from_rvalue.cpp b/test/string_view_from_rvalue.cpp index 3402a08..a764939 100644 --- a/test/string_view_from_rvalue.cpp +++ b/test/string_view_from_rvalue.cpp @@ -17,11 +17,9 @@ #error "Unsupported test" #endif -#include "boost/test/minimal.hpp" - std::string makeatemp() { return "abc"; } -int test_main(int, char **) +int main() { boost::basic_string_view sv(makeatemp()); return 0; diff --git a/test/string_view_test1.cpp b/test/string_view_test1.cpp index a8b0cd0..9b70a7e 100644 --- a/test/string_view_test1.cpp +++ b/test/string_view_test1.cpp @@ -13,17 +13,16 @@ #include -#define BOOST_TEST_MAIN -#include +#include typedef boost::string_view string_view; // Should be equal void interop ( const std::string &str, string_view ref ) { -// BOOST_CHECK ( str == ref ); - BOOST_CHECK ( str.size () == ref.size ()); - BOOST_CHECK ( std::equal ( str.begin (), str.end (), ref.begin ())); - BOOST_CHECK ( std::equal ( str.rbegin (), str.rend (), ref.rbegin ())); +// BOOST_TEST ( str == ref ); + BOOST_TEST ( str.size () == ref.size ()); + BOOST_TEST ( std::equal ( str.begin (), str.end (), ref.begin ())); + BOOST_TEST ( std::equal ( str.rbegin (), str.rend (), ref.rbegin ())); } void null_tests ( const char *p ) { @@ -34,10 +33,10 @@ void null_tests ( const char *p ) { string_view sr4 ( p ); sr4.clear (); - BOOST_CHECK ( sr1 == sr2 ); - BOOST_CHECK ( sr1 == sr3 ); - BOOST_CHECK ( sr2 == sr3 ); - BOOST_CHECK ( sr1 == sr4 ); + BOOST_TEST ( sr1 == sr2 ); + BOOST_TEST ( sr1 == sr3 ); + BOOST_TEST ( sr2 == sr3 ); + BOOST_TEST ( sr1 == sr4 ); } // make sure that substrings work just like strings @@ -94,7 +93,7 @@ const char *test_strings [] = { NULL }; -BOOST_AUTO_TEST_CASE( test_main ) +int main() { const char **p = &test_strings[0]; @@ -106,4 +105,6 @@ BOOST_AUTO_TEST_CASE( test_main ) p++; } + + return boost::report_errors(); } diff --git a/test/string_view_test2.cpp b/test/string_view_test2.cpp index b9675d2..2549e64 100644 --- a/test/string_view_test2.cpp +++ b/test/string_view_test2.cpp @@ -16,8 +16,7 @@ #include #include -#define BOOST_TEST_MAIN -#include +#include typedef boost::string_view string_view; @@ -28,27 +27,27 @@ void ends_with ( const char *arg ) { const char *p = arg; while ( *p ) { - BOOST_CHECK ( sr.ends_with ( p )); + BOOST_TEST ( sr.ends_with ( p )); ++p; } while ( !sr2.empty ()) { - BOOST_CHECK ( sr.ends_with ( sr2 )); + BOOST_TEST ( sr.ends_with ( sr2 )); sr2.remove_prefix (1); } sr2 = arg; while ( !sr2.empty ()) { - BOOST_CHECK ( sr.ends_with ( sr2 )); + BOOST_TEST ( sr.ends_with ( sr2 )); sr2.remove_prefix (1); } char ch = sz == 0 ? '\0' : arg [ sz - 1 ]; sr2 = arg; if ( sz > 0 ) - BOOST_CHECK ( sr2.ends_with ( ch )); - BOOST_CHECK ( !sr2.ends_with ( ++ch )); - BOOST_CHECK ( sr2.ends_with ( string_view())); + BOOST_TEST ( sr2.ends_with ( ch )); + BOOST_TEST ( !sr2.ends_with ( ++ch )); + BOOST_TEST ( sr2.ends_with ( string_view())); } void starts_with ( const char *arg ) { @@ -58,21 +57,21 @@ void starts_with ( const char *arg ) { const char *p = arg + std::strlen ( arg ) - 1; while ( p >= arg ) { std::string foo ( arg, p + 1 ); - BOOST_CHECK ( sr.starts_with ( foo )); + BOOST_TEST ( sr.starts_with ( foo )); --p; } while ( !sr2.empty ()) { - BOOST_CHECK ( sr.starts_with ( sr2 )); + BOOST_TEST ( sr.starts_with ( sr2 )); sr2.remove_suffix (1); } char ch = *arg; sr2 = arg; if ( sz > 0 ) - BOOST_CHECK ( sr2.starts_with ( ch )); - BOOST_CHECK ( !sr2.starts_with ( ++ch )); - BOOST_CHECK ( sr2.starts_with ( string_view ())); + BOOST_TEST ( sr2.starts_with ( ch )); + BOOST_TEST ( !sr2.starts_with ( ++ch )); + BOOST_TEST ( sr2.starts_with ( string_view ())); } void reverse ( const char *arg ) { @@ -82,14 +81,14 @@ void reverse ( const char *arg ) { string_view sr2 ( string1 ); std::string string2 ( sr2.rbegin (), sr2.rend ()); - BOOST_CHECK ( std::equal ( sr2.rbegin (), sr2.rend (), arg )); - BOOST_CHECK ( string2 == arg ); - BOOST_CHECK ( std::equal ( sr1.begin (), sr1.end (), string2.begin ())); + BOOST_TEST ( std::equal ( sr2.rbegin (), sr2.rend (), arg )); + BOOST_TEST ( string2 == arg ); + BOOST_TEST ( std::equal ( sr1.begin (), sr1.end (), string2.begin ())); } // This helper function eliminates signed vs. unsigned warnings string_view::size_type ptr_diff ( const char *res, const char *base ) { - BOOST_CHECK ( res >= base ); + BOOST_TEST ( res >= base ); return static_cast ( res - base ); } @@ -103,7 +102,7 @@ void find ( const char *arg ) { sr1 = arg; while ( *p ) { string_view::size_type pos = sr1.find(*p); - BOOST_CHECK ( pos != string_view::npos && ( pos <= ptr_diff ( p, arg ))); + BOOST_TEST ( pos != string_view::npos && ( pos <= ptr_diff ( p, arg ))); ++p; } @@ -112,7 +111,7 @@ void find ( const char *arg ) { sr1 = arg; while ( *p ) { string_view::size_type pos = sr1.rfind(*p); - BOOST_CHECK ( pos != string_view::npos && pos < sr1.size () && ( pos >= ptr_diff ( p, arg ))); + BOOST_TEST ( pos != string_view::npos && pos < sr1.size () && ( pos >= ptr_diff ( p, arg ))); ++p; } @@ -122,7 +121,7 @@ void find ( const char *arg ) { while ( *p && *(p+1)) { string_view sr3 ( p, 2 ); string_view::size_type pos = sr1.find ( sr3 ); - BOOST_CHECK ( pos != string_view::npos && pos <= static_cast( p - arg )); + BOOST_TEST ( pos != string_view::npos && pos <= static_cast( p - arg )); p++; } @@ -133,9 +132,9 @@ void find ( const char *arg ) { for ( int ch = 1; ch < 256; ++ch ) { string_view::size_type pos = sr1.find(ch); const char *strp = std::strchr ( arg, ch ); - BOOST_CHECK (( strp == NULL ) == ( pos == string_view::npos )); + BOOST_TEST (( strp == NULL ) == ( pos == string_view::npos )); if ( strp != NULL ) - BOOST_CHECK ( ptr_diff ( strp, arg ) == pos ); + BOOST_TEST ( ptr_diff ( strp, arg ) == pos ); } sr1 = arg; @@ -145,9 +144,9 @@ void find ( const char *arg ) { for ( int ch = 1; ch < 256; ++ch ) { string_view::size_type pos = sr1.rfind(ch); const char *strp = std::strrchr ( arg, ch ); - BOOST_CHECK (( strp == NULL ) == ( pos == string_view::npos )); + BOOST_TEST (( strp == NULL ) == ( pos == string_view::npos )); if ( strp != NULL ) - BOOST_CHECK ( ptr_diff ( strp, arg ) == pos ); + BOOST_TEST ( ptr_diff ( strp, arg ) == pos ); } @@ -156,7 +155,7 @@ void find ( const char *arg ) { sr1 = arg; while ( !sr1.empty ()) { string_view::size_type pos = sr1.find(*p); - BOOST_CHECK ( pos == 0 ); + BOOST_TEST ( pos == 0 ); sr1.remove_prefix (1); ++p; } @@ -166,7 +165,7 @@ void find ( const char *arg ) { p = arg + std::strlen ( arg ) - 1; while ( !sr1.empty ()) { string_view::size_type pos = sr1.rfind(*p); - BOOST_CHECK ( pos == sr1.size () - 1 ); + BOOST_TEST ( pos == sr1.size () - 1 ); sr1.remove_suffix (1); --p; } @@ -176,7 +175,7 @@ void find ( const char *arg ) { p = arg; while ( !sr1.empty ()) { string_view::size_type pos = sr1.find_first_of(*p); - BOOST_CHECK ( pos == 0 ); + BOOST_TEST ( pos == 0 ); sr1.remove_prefix (1); ++p; } @@ -187,7 +186,7 @@ void find ( const char *arg ) { p = arg + std::strlen ( arg ) - 1; while ( !sr1.empty ()) { string_view::size_type pos = sr1.find_last_of(*p); - BOOST_CHECK ( pos == sr1.size () - 1 ); + BOOST_TEST ( pos == sr1.size () - 1 ); sr1.remove_suffix (1); --p; } @@ -196,8 +195,8 @@ void find ( const char *arg ) { sr1 = arg; sr2 = arg; while ( !sr1.empty() ) { - BOOST_CHECK ( sr1.find_first_of ( sr2 ) == 0 ); - BOOST_CHECK ( sr1.find_first_not_of ( sr2 ) == string_view::npos ); + BOOST_TEST ( sr1.find_first_of ( sr2 ) == 0 ); + BOOST_TEST ( sr1.find_first_not_of ( sr2 ) == string_view::npos ); sr1.remove_prefix ( 1 ); } @@ -206,14 +205,14 @@ void find ( const char *arg ) { while ( *p ) { string_view::size_type pos1 = sr1.find_first_of(*p); string_view::size_type pos2 = sr1.find_first_not_of(*p); - BOOST_CHECK ( pos1 != string_view::npos && pos1 < sr1.size () && pos1 <= ptr_diff ( p, arg )); + BOOST_TEST ( pos1 != string_view::npos && pos1 < sr1.size () && pos1 <= ptr_diff ( p, arg )); if ( pos2 != string_view::npos ) { for ( size_t i = 0 ; i < pos2; ++i ) - BOOST_CHECK ( sr1[i] == *p ); - BOOST_CHECK ( sr1 [ pos2 ] != *p ); + BOOST_TEST ( sr1[i] == *p ); + BOOST_TEST ( sr1 [ pos2 ] != *p ); } - BOOST_CHECK ( pos2 != pos1 ); + BOOST_TEST ( pos2 != pos1 ); ++p; } @@ -221,8 +220,8 @@ void find ( const char *arg ) { sr1 = arg; sr2 = arg; while ( !sr1.empty() ) { - BOOST_CHECK ( sr1.find_last_of ( sr2 ) == ( sr1.size () - 1 )); - BOOST_CHECK ( sr1.find_last_not_of ( sr2 ) == string_view::npos ); + BOOST_TEST ( sr1.find_last_of ( sr2 ) == ( sr1.size () - 1 )); + BOOST_TEST ( sr1.find_last_not_of ( sr2 ) == string_view::npos ); sr1.remove_suffix ( 1 ); } @@ -231,15 +230,15 @@ void find ( const char *arg ) { while ( *p ) { string_view::size_type pos1 = sr1.find_last_of(*p); string_view::size_type pos2 = sr1.find_last_not_of(*p); - BOOST_CHECK ( pos1 != string_view::npos && pos1 < sr1.size () && pos1 >= ptr_diff ( p, arg )); - BOOST_CHECK ( pos2 == string_view::npos || pos1 < sr1.size ()); + BOOST_TEST ( pos1 != string_view::npos && pos1 < sr1.size () && pos1 >= ptr_diff ( p, arg )); + BOOST_TEST ( pos2 == string_view::npos || pos1 < sr1.size ()); if ( pos2 != string_view::npos ) { for ( size_t i = sr1.size () -1 ; i > pos2; --i ) - BOOST_CHECK ( sr1[i] == *p ); - BOOST_CHECK ( sr1 [ pos2 ] != *p ); + BOOST_TEST ( sr1[i] == *p ); + BOOST_TEST ( sr1 [ pos2 ] != *p ); } - BOOST_CHECK ( pos2 != pos1 ); + BOOST_TEST ( pos2 != pos1 ); ++p; } @@ -335,14 +334,14 @@ void to_string ( const char *arg ) { sr1 = arg; // str2 = sr1.to_string > (); str2 = sr1.to_string (); - BOOST_CHECK ( str1 == str2 ); + BOOST_TEST ( str1 == str2 ); std::basic_string, custom_allocator > str3 = sr1.to_string(custom_allocator()); - BOOST_CHECK ( std::strcmp(str1.c_str(), str3.c_str()) == 0 ); + BOOST_TEST ( std::strcmp(str1.c_str(), str3.c_str()) == 0 ); #ifndef BOOST_NO_CXX11_EXPLICIT_CONVERSION_OPERATORS std::string str4 = static_cast ( sr1 ); - BOOST_CHECK ( str1 == str4 ); + BOOST_TEST ( str1 == str4 ); #endif } @@ -353,28 +352,28 @@ void compare ( const char *arg ) { str1.assign ( arg ); sr1 = arg; - BOOST_CHECK ( sr1 == sr1); // compare string_view and string_view - BOOST_CHECK ( sr1 == str1); // compare string and string_view - BOOST_CHECK ( str1 == sr1 ); // compare string_view and string - BOOST_CHECK ( sr1 == arg ); // compare string_view and pointer - BOOST_CHECK ( arg == sr1 ); // compare pointer and string_view + BOOST_TEST ( sr1 == sr1); // compare string_view and string_view + BOOST_TEST ( sr1 == str1); // compare string and string_view + BOOST_TEST ( str1 == sr1 ); // compare string_view and string + BOOST_TEST ( sr1 == arg ); // compare string_view and pointer + BOOST_TEST ( arg == sr1 ); // compare pointer and string_view if ( sr1.size () > 0 ) { (*str1.rbegin())++; - BOOST_CHECK ( sr1 != str1 ); - BOOST_CHECK ( str1 != sr1 ); - BOOST_CHECK ( sr1 < str1 ); - BOOST_CHECK ( sr1 <= str1 ); - BOOST_CHECK ( str1 > sr1 ); - BOOST_CHECK ( str1 >= sr1 ); + BOOST_TEST ( sr1 != str1 ); + BOOST_TEST ( str1 != sr1 ); + BOOST_TEST ( sr1 < str1 ); + BOOST_TEST ( sr1 <= str1 ); + BOOST_TEST ( str1 > sr1 ); + BOOST_TEST ( str1 >= sr1 ); (*str1.rbegin()) -= 2; - BOOST_CHECK ( sr1 != str1 ); - BOOST_CHECK ( str1 != sr1 ); - BOOST_CHECK ( sr1 > str1 ); - BOOST_CHECK ( sr1 >= str1 ); - BOOST_CHECK ( str1 < sr1 ); - BOOST_CHECK ( str1 <= sr1 ); + BOOST_TEST ( sr1 != str1 ); + BOOST_TEST ( str1 != sr1 ); + BOOST_TEST ( sr1 > str1 ); + BOOST_TEST ( sr1 >= str1 ); + BOOST_TEST ( str1 < sr1 ); + BOOST_TEST ( str1 <= sr1 ); } } @@ -388,7 +387,7 @@ const char *test_strings [] = { NULL }; -BOOST_AUTO_TEST_CASE( test_main ) +int main() { const char **p = &test_strings[0]; @@ -402,4 +401,6 @@ BOOST_AUTO_TEST_CASE( test_main ) p++; } + + return boost::report_errors(); } diff --git a/test/string_view_test_io.cpp b/test/string_view_test_io.cpp index d8dc8eb..416ff33 100644 --- a/test/string_view_test_io.cpp +++ b/test/string_view_test_io.cpp @@ -12,8 +12,6 @@ * \brief This header contains tests for stream operations of \c basic_string_ref. */ -#define BOOST_TEST_MODULE string_ref_test_io - #include #include @@ -23,23 +21,10 @@ #include #include -#include -#include +#include -typedef boost::mpl::vector< - char -#if !defined(BOOST_NO_STD_WSTRING) && !defined(BOOST_NO_STD_WSTREAMBUF) && !defined(BOOST_NO_INTRINSIC_WCHAR_T) - , wchar_t -#endif /* Current implementations seem to be missing codecvt facets to convert chars to char16_t and char32_t even though the types are available. -#if !defined(BOOST_NO_CXX11_CHAR16_T) - , char16_t -#endif -#if !defined(BOOST_NO_CXX11_CHAR32_T) - , char32_t -#endif */ ->::type char_types; static const char* test_strings[] = { @@ -72,7 +57,8 @@ struct context }; // Test regular output -BOOST_AUTO_TEST_CASE_TEMPLATE(string_view_output, CharT, char_types) +template +void test_string_view_output() { typedef CharT char_type; typedef std::basic_ostringstream< char_type > ostream_type; @@ -82,11 +68,12 @@ BOOST_AUTO_TEST_CASE_TEMPLATE(string_view_output, CharT, char_types) ostream_type strm; strm << string_view_type(ctx.abcd); - BOOST_CHECK(strm.str() == ctx.abcd); + BOOST_TEST(strm.str() == ctx.abcd); } // Test support for padding -BOOST_AUTO_TEST_CASE_TEMPLATE(padding, CharT, char_types) +template +void test_padding() { typedef CharT char_type; typedef std::basic_ostringstream< char_type > ostream_type; @@ -102,7 +89,7 @@ BOOST_AUTO_TEST_CASE_TEMPLATE(padding, CharT, char_types) ostream_type strm_correct; strm_correct << ctx.begin << std::setw(8) << ctx.abcd << ctx.end; - BOOST_CHECK(strm_ref.str() == strm_correct.str()); + BOOST_TEST(strm_ref.str() == strm_correct.str()); } // Test for long padding @@ -113,7 +100,7 @@ BOOST_AUTO_TEST_CASE_TEMPLATE(padding, CharT, char_types) ostream_type strm_correct; strm_correct << ctx.begin << std::setw(100) << ctx.abcd << ctx.end; - BOOST_CHECK(strm_ref.str() == strm_correct.str()); + BOOST_TEST(strm_ref.str() == strm_correct.str()); } // Test that short width does not truncate the string @@ -124,12 +111,13 @@ BOOST_AUTO_TEST_CASE_TEMPLATE(padding, CharT, char_types) ostream_type strm_correct; strm_correct << ctx.begin << std::setw(1) << ctx.abcd << ctx.end; - BOOST_CHECK(strm_ref.str() == strm_correct.str()); + BOOST_TEST(strm_ref.str() == strm_correct.str()); } } // Test support for padding fill -BOOST_AUTO_TEST_CASE_TEMPLATE(padding_fill, CharT, char_types) +template +void test_padding_fill() { typedef CharT char_type; typedef std::basic_ostringstream< char_type > ostream_type; @@ -143,11 +131,12 @@ BOOST_AUTO_TEST_CASE_TEMPLATE(padding_fill, CharT, char_types) ostream_type strm_correct; strm_correct << ctx.begin << std::setfill(static_cast< char_type >('x')) << std::setw(8) << ctx.abcd << ctx.end; - BOOST_CHECK(strm_ref.str() == strm_correct.str()); + BOOST_TEST(strm_ref.str() == strm_correct.str()); } // Test support for alignment -BOOST_AUTO_TEST_CASE_TEMPLATE(alignment, CharT, char_types) +template +void test_alignment() { typedef CharT char_type; typedef std::basic_ostringstream< char_type > ostream_type; @@ -163,7 +152,7 @@ BOOST_AUTO_TEST_CASE_TEMPLATE(alignment, CharT, char_types) ostream_type strm_correct; strm_correct << ctx.begin << std::left << std::setw(8) << ctx.abcd << ctx.end; - BOOST_CHECK(strm_ref.str() == strm_correct.str()); + BOOST_TEST(strm_ref.str() == strm_correct.str()); } // Right alignment @@ -174,6 +163,22 @@ BOOST_AUTO_TEST_CASE_TEMPLATE(alignment, CharT, char_types) ostream_type strm_correct; strm_correct << ctx.begin << std::right << std::setw(8) << ctx.abcd << ctx.end; - BOOST_CHECK(strm_ref.str() == strm_correct.str()); + BOOST_TEST(strm_ref.str() == strm_correct.str()); } } + +template +void test() +{ + test_string_view_output(); + test_padding(); + test_padding_fill(); + test_alignment(); +} + +int main() +{ + test(); + test(); + return boost::report_errors(); +} diff --git a/test/value_init_test.cpp b/test/value_init_test.cpp index ff5f13d..ed7ec3d 100644 --- a/test/value_init_test.cpp +++ b/test/value_init_test.cpp @@ -21,7 +21,7 @@ #pragma hdrstop #endif -#include +#include // // Sample POD type @@ -289,7 +289,7 @@ bool test ( T const& y, T const& z ) return boost::detail::test_errors() == errors_before_test ; } -int main(int, char **) +int main() { BOOST_TEST ( test( 0,1234 ) ) ; BOOST_TEST ( test( 0.0,12.34 ) ) ; diff --git a/test/value_init_test_fail1.cpp b/test/value_init_test_fail1.cpp index e3f6f1a..789e6b3 100644 --- a/test/value_init_test_fail1.cpp +++ b/test/value_init_test_fail1.cpp @@ -17,9 +17,7 @@ #pragma hdrstop #endif -#include "boost/test/minimal.hpp" - -int test_main(int, char **) +int main() { boost::value_initialized const x_c ; @@ -27,11 +25,3 @@ int test_main(int, char **) return 0; } - - -unsigned int expected_failures = 0; - - - - - diff --git a/test/value_init_test_fail2.cpp b/test/value_init_test_fail2.cpp index bbc7c90..052a2bd 100644 --- a/test/value_init_test_fail2.cpp +++ b/test/value_init_test_fail2.cpp @@ -17,9 +17,7 @@ #pragma hdrstop #endif -#include "boost/test/minimal.hpp" - -int test_main(int, char **) +int main() { boost::value_initialized cx ; @@ -27,10 +25,3 @@ int test_main(int, char **) return 0; } - -unsigned int expected_failures = 0; - - - - - diff --git a/test/value_init_test_fail3.cpp b/test/value_init_test_fail3.cpp index 9bea5ba..1801f82 100644 --- a/test/value_init_test_fail3.cpp +++ b/test/value_init_test_fail3.cpp @@ -17,9 +17,7 @@ #pragma hdrstop #endif -#include "boost/test/minimal.hpp" - -int test_main(int, char **) +int main() { boost::value_initialized const cx_c ; @@ -27,11 +25,3 @@ int test_main(int, char **) return 0; } - - -unsigned int expected_failures = 0; - - - - -