From 0932691db9b9d4cd89fafdfa7eb22a85f632ddc7 Mon Sep 17 00:00:00 2001 From: Gennadiy Rozental Date: Sun, 17 Apr 2005 15:49:17 +0000 Subject: [PATCH] *** empty log message *** [SVN r28296] --- test/basic_cstring_test.cpp | 13 +- test/config_file_test.cpp | 4 + test/test_files/test_fp_comparisons.pattern | 60 +++++----- test/test_files/test_tools_test.pattern | 2 +- test/test_fp_comparisons.cpp | 38 ++++++ test/test_tools_test.cpp | 5 +- test/unit_test_suite_ex_test.cpp | 126 -------------------- 7 files changed, 85 insertions(+), 163 deletions(-) delete mode 100644 test/unit_test_suite_ex_test.cpp diff --git a/test/basic_cstring_test.cpp b/test/basic_cstring_test.cpp index 7dad8b70..964849c7 100644 --- a/test/basic_cstring_test.cpp +++ b/test/basic_cstring_test.cpp @@ -40,15 +40,15 @@ using utf::const_string; namespace mpl = boost::mpl; #if BOOST_WORKAROUND(__GNUC__, < 3) -typedef mpl::list base_const_char_types; -typedef mpl::list mutable_char_types; +typedef mpl::list1 base_const_char_types; +typedef mpl::list2 mutable_char_types; #else -typedef mpl::list base_const_char_types; -typedef mpl::list mutable_char_types; +typedef mpl::list2 base_const_char_types; +typedef mpl::list3 mutable_char_types; #endif typedef mpl::transform >::type const_char_types; typedef mpl::joint_view char_types; -typedef mpl::list io_test_types; +typedef mpl::list2 io_test_types; //____________________________________________________________________________// @@ -469,6 +469,9 @@ init_unit_test_suite( int /*argc*/, char* /*argv*/[] ) // History : // // $Log$ +// Revision 1.11 2005/04/17 15:49:17 rogeeff +// *** empty log message *** +// // Revision 1.10 2005/02/20 08:28:34 rogeeff // This a major update for Boost.Test framework. See release docs for complete list of fixes/updates // diff --git a/test/config_file_test.cpp b/test/config_file_test.cpp index 85e6fe04..4ce7daf8 100755 --- a/test/config_file_test.cpp +++ b/test/config_file_test.cpp @@ -5,6 +5,7 @@ namespace utf = boost::unit_test; // Boost.Runtime.Parameter #include +#include namespace rt = boost::runtime; namespace rtf = boost::runtime::file; @@ -243,6 +244,9 @@ test_multipart_value() // History : // // $Log$ +// Revision 1.2 2005/04/17 15:49:17 rogeeff +// *** empty log message *** +// // Revision 1.1 2005/04/12 06:19:23 rogeeff // runtime.param tests added // diff --git a/test/test_files/test_fp_comparisons.pattern b/test/test_files/test_fp_comparisons.pattern index f1031830..2279139d 100644 --- a/test/test_files/test_fp_comparisons.pattern +++ b/test/test_files/test_fp_comparisons.pattern @@ -1,30 +1,30 @@ -117: error in "test_BOOST_CHECK_CLOSE": difference between fp1{0} and fp2{1e-020} exceeds 1e-005% -118: error in "test_BOOST_CHECK_CLOSE": difference between fp1{0} and fp2{1e-030} exceeds 1e-005% -119: error in "test_BOOST_CHECK_CLOSE": difference between fp1{0} and fp2{-1e-010} exceeds 0.1% -120: error in "test_BOOST_CHECK_CLOSE": difference between fp1{0.123456} and fp2{0.123457} exceeds 0.0001% -124: error in "test_BOOST_CHECK_CLOSE": difference between fp1{0.123456} and fp2{-0.123457} exceeds 0.001% -128: error in "test_BOOST_CHECK_CLOSE": difference between fp1{1.23456e-010} and fp2{1.23457e-011} exceeds 0.001% -129: error in "test_BOOST_CHECK_CLOSE": difference between fp1{1.111e-010} and fp2{1.112e-010} exceeds 0.08999% -130: error in "test_BOOST_CHECK_CLOSE": difference between fp1{1.112e-010} and fp2{1.111e-010} exceeds 0.08999% -135: error in "test_BOOST_CHECK_CLOSE": difference between fp1{1} and fp2{1.0002} exceeds 0.011% -117: error in "test_BOOST_CHECK_CLOSE": difference between fp1{0} and fp2{1e-020} exceeds 1e-005% -118: error in "test_BOOST_CHECK_CLOSE": difference between fp1{0} and fp2{1e-030} exceeds 1e-005% -119: error in "test_BOOST_CHECK_CLOSE": difference between fp1{0} and fp2{-1e-010} exceeds 0.1% -120: error in "test_BOOST_CHECK_CLOSE": difference between fp1{0.123456} and fp2{0.123457} exceeds 0.0001% -124: error in "test_BOOST_CHECK_CLOSE": difference between fp1{0.123456} and fp2{-0.123457} exceeds 0.001% -128: error in "test_BOOST_CHECK_CLOSE": difference between fp1{1.23456e-010} and fp2{1.23457e-011} exceeds 0.001% -129: error in "test_BOOST_CHECK_CLOSE": difference between fp1{1.111e-010} and fp2{1.112e-010} exceeds 0.08999% -130: error in "test_BOOST_CHECK_CLOSE": difference between fp1{1.112e-010} and fp2{1.111e-010} exceeds 0.08999% -135: error in "test_BOOST_CHECK_CLOSE": difference between fp1{1} and fp2{1.0002} exceeds 0.011% -117: error in "test_BOOST_CHECK_CLOSE": difference between fp1{0} and fp2{1e-020} exceeds 1e-005% -118: error in "test_BOOST_CHECK_CLOSE": difference between fp1{0} and fp2{1e-030} exceeds 1e-005% -119: error in "test_BOOST_CHECK_CLOSE": difference between fp1{0} and fp2{-1e-010} exceeds 0.1% -120: error in "test_BOOST_CHECK_CLOSE": difference between fp1{0.123456} and fp2{0.123457} exceeds 0.0001% -124: error in "test_BOOST_CHECK_CLOSE": difference between fp1{0.123456} and fp2{-0.123457} exceeds 0.001% -128: error in "test_BOOST_CHECK_CLOSE": difference between fp1{1.23456e-010} and fp2{1.23457e-011} exceeds 0.001% -129: error in "test_BOOST_CHECK_CLOSE": difference between fp1{1.111e-010} and fp2{1.112e-010} exceeds 0.08999% -130: error in "test_BOOST_CHECK_CLOSE": difference between fp1{1.112e-010} and fp2{1.111e-010} exceeds 0.08999% -135: error in "test_BOOST_CHECK_CLOSE": difference between fp1{1} and fp2{1.0002} exceeds 0.011% -169: error in "test_CHECK_SMALL": absolute value of 1e-6{1e-006} exceeds 1e-007 -184: error in "test_close_at_tolerance": difference between fp1{1.00000001} and fp2{1.00000002} exceeds 1e-006% -191: error in "test_close_at_tolerance": check close_at_tolerance( epsilon )( fp1, fp2 ) failed for ( 1.23456e-010, 1.23457e-010 ) +152: error in "test_BOOST_CHECK_CLOSE": difference between fp1{0} and fp2{1e-20} exceeds 1e-05% +153: error in "test_BOOST_CHECK_CLOSE": difference between fp1{0} and fp2{1e-30} exceeds 1e-05% +154: error in "test_BOOST_CHECK_CLOSE": difference between fp1{0} and fp2{-1e-10} exceeds 0.1% +155: error in "test_BOOST_CHECK_CLOSE": difference between fp1{0.123456} and fp2{0.123457} exceeds 0.0001% +159: error in "test_BOOST_CHECK_CLOSE": difference between fp1{0.123456} and fp2{-0.123457} exceeds 0.001% +163: error in "test_BOOST_CHECK_CLOSE": difference between fp1{1.23456e-10} and fp2{1.23457e-11} exceeds 0.001% +164: error in "test_BOOST_CHECK_CLOSE": difference between fp1{1.111e-10} and fp2{1.112e-10} exceeds 0.08999% +165: error in "test_BOOST_CHECK_CLOSE": difference between fp1{1.112e-10} and fp2{1.111e-10} exceeds 0.08999% +170: error in "test_BOOST_CHECK_CLOSE": difference between fp1{1} and fp2{1.0002} exceeds 0.011% +152: error in "test_BOOST_CHECK_CLOSE": difference between fp1{0} and fp2{1e-20} exceeds 1e-05% +153: error in "test_BOOST_CHECK_CLOSE": difference between fp1{0} and fp2{1e-30} exceeds 1e-05% +154: error in "test_BOOST_CHECK_CLOSE": difference between fp1{0} and fp2{-1e-10} exceeds 0.1% +155: error in "test_BOOST_CHECK_CLOSE": difference between fp1{0.123456} and fp2{0.123457} exceeds 0.0001% +159: error in "test_BOOST_CHECK_CLOSE": difference between fp1{0.123456} and fp2{-0.123457} exceeds 0.001% +163: error in "test_BOOST_CHECK_CLOSE": difference between fp1{1.23456e-10} and fp2{1.23457e-11} exceeds 0.001% +164: error in "test_BOOST_CHECK_CLOSE": difference between fp1{1.111e-10} and fp2{1.112e-10} exceeds 0.08999% +165: error in "test_BOOST_CHECK_CLOSE": difference between fp1{1.112e-10} and fp2{1.111e-10} exceeds 0.08999% +170: error in "test_BOOST_CHECK_CLOSE": difference between fp1{1} and fp2{1.0002} exceeds 0.011% +152: error in "test_BOOST_CHECK_CLOSE": difference between fp1{0} and fp2{1e-20} exceeds 1e-05% +153: error in "test_BOOST_CHECK_CLOSE": difference between fp1{0} and fp2{1e-30} exceeds 1e-05% +154: error in "test_BOOST_CHECK_CLOSE": difference between fp1{0} and fp2{-1e-10} exceeds 0.1% +155: error in "test_BOOST_CHECK_CLOSE": difference between fp1{0.123456} and fp2{0.123457} exceeds 0.0001% +159: error in "test_BOOST_CHECK_CLOSE": difference between fp1{0.123456} and fp2{-0.123457} exceeds 0.001% +163: error in "test_BOOST_CHECK_CLOSE": difference between fp1{1.23456e-10} and fp2{1.23457e-11} exceeds 0.001% +164: error in "test_BOOST_CHECK_CLOSE": difference between fp1{1.111e-10} and fp2{1.112e-10} exceeds 0.08999% +165: error in "test_BOOST_CHECK_CLOSE": difference between fp1{1.112e-10} and fp2{1.111e-10} exceeds 0.08999% +170: error in "test_BOOST_CHECK_CLOSE": difference between fp1{1} and fp2{1.0002} exceeds 0.011% +204: error in "test_CHECK_SMALL": absolute value of 1e-6{1e-06} exceeds 1e-07 +219: error in "test_close_at_tolerance": difference between fp1{1.00000001} and fp2{1.00000002} exceeds 1e-06% +226: error in "test_close_at_tolerance": check close_at_tolerance( epsilon )( fp1, fp2 ) failed for ( 1.23456e-10, 1.23457e-10 ) diff --git a/test/test_files/test_tools_test.pattern b/test/test_files/test_tools_test.pattern index a5a7dba9..b1d1e868 100644 --- a/test/test_files/test_tools_test.pattern +++ b/test/test_files/test_tools_test.pattern @@ -10,7 +10,7 @@ 167: info: check j < 5 passed 167: error in "test_BOOST_REQUIRE": not aborted 181: info: check 'object size 33 is too small' passed -198: error in "test_BOOST_CHECK_MESSAGE": Well, may be that what I belive in +198: error in "test_BOOST_CHECK_MESSAGE": Well, may be that what I believe in 200: error in "test_BOOST_CHECK_MESSAGE": Checking predicate failed. Some explanation 203: info: check 'Could it fail?' passed 210: fatal error in "test_BOOST_REQUIRE_MESSAGE": Here we should stop diff --git a/test/test_fp_comparisons.cpp b/test/test_fp_comparisons.cpp index 62e91ec8..3abddb93 100644 --- a/test/test_fp_comparisons.cpp +++ b/test/test_fp_comparisons.cpp @@ -27,10 +27,45 @@ using namespace boost::test_tools; // STL #include +#include // Boost #include +namespace boost { namespace test_tools { namespace tt_detail { +template<> +struct print_log_value { + void operator()( std::ostream& ostr, float t ) + { + ostr.precision( 6 ); + + ostr << t; + } +}; +}}} + +namespace boost { namespace test_tools { namespace tt_detail { +template<> +struct print_log_value { + void operator()( std::ostream& ostr, double t ) + { + ostr.precision( 10 ); + ostr << t; + } +}; +}}} + +namespace boost { namespace test_tools { namespace tt_detail { +template<> +struct print_log_value { + void operator()( std::ostream& ostr, long double t ) + { + ostr.precision( 10 ); + ostr << t; + } +}; +}}} + //____________________________________________________________________________// struct shorten_lf : public boost::unit_test::output::compiler_log_formatter @@ -197,6 +232,9 @@ TEST_CASE( test_close_at_tolerance ) // Revision History : // // $Log$ +// Revision 1.20 2005/04/17 15:49:17 rogeeff +// *** empty log message *** +// // Revision 1.19 2005/03/22 07:14:44 rogeeff // no message // diff --git a/test/test_tools_test.cpp b/test/test_tools_test.cpp index ded3a6ee..d89f493f 100644 --- a/test/test_tools_test.cpp +++ b/test/test_tools_test.cpp @@ -195,7 +195,7 @@ test_pred1() TEST_CASE( test_BOOST_CHECK_MESSAGE ) { - BOOST_CHECK_MESSAGE( 2+2 == 5, "Well, may be that what I belive in" ); + BOOST_CHECK_MESSAGE( 2+2 == 5, "Well, may be that what I believe in" ); BOOST_CHECK_MESSAGE( test_pred1(), "Checking predicate failed" ); @@ -510,6 +510,9 @@ TEST_CASE( test_BOOST_IS_DEFINED ) // Revision History : // // $Log$ +// Revision 1.42 2005/04/17 15:49:17 rogeeff +// *** empty log message *** +// // Revision 1.41 2005/03/22 07:14:44 rogeeff // no message // diff --git a/test/unit_test_suite_ex_test.cpp b/test/unit_test_suite_ex_test.cpp deleted file mode 100644 index 3e8a18b1..00000000 --- a/test/unit_test_suite_ex_test.cpp +++ /dev/null @@ -1,126 +0,0 @@ -// (C) Copyright Gennadiy Rozental 2001-2004. -// Distributed under the Boost Software License, Version 1.0. -// (See accompanying file LICENSE_1_0.txt or copy at -// http://www.boost.org/LICENSE_1_0.txt) - -// See http://www.boost.org/libs/test for the library home page. -// -// File : $RCSfile$ -// -// Version : $Revision$ -// -// Description : tests an extentions to Unit Test Framework -// *************************************************************************** - -// Boost.Test -#include -#include - -using boost::unit_test::test_suite; - -#if !defined(BOOST_MSVC) && !defined(__SUNPRO_CC) -// BOOST -#include -#endif - -#include -using namespace boost; - -// STL -#include -#include - -//____________________________________________________________________________// - -void test0() -{ - BOOST_MESSAGE( "Hello there" ); -} - -//____________________________________________________________________________// - -void test1( int arg ) -{ - BOOST_CHECK( (arg & 0x80) == 0 ); -} - -//____________________________________________________________________________// - -void test2( int arg, int mask ) -{ - BOOST_CHECK( (arg & mask) != 0 ); -} - -//____________________________________________________________________________// - -struct sub_test_suite : public test_suite { - typedef std::list > mask_list_type; - sub_test_suite() - { - parameters_list.push_back( 1 ); - parameters_list.push_back( 5 ); - parameters_list.push_back( 6 ); - parameters_list.push_back( 7 ); - parameters_list.push_back( 15 ); - - masks_list.push_back( std::make_pair( 0x01, 1 ) ); - masks_list.push_back( std::make_pair( 0x04, 1 ) ); - masks_list.push_back( std::make_pair( 0x80, 5 ) ); - - -#if !defined(BOOST_MSVC) && !defined(__SUNPRO_CC) - for( mask_list_type::iterator it = masks_list.begin(); it != masks_list.end(); ++it ) { - function1 fct = bind( &test2, _1, it->first ); - add( BOOST_PARAM_TEST_CASE( fct, parameters_list.begin(), parameters_list.end() ), it->second ); - } -#endif - - function1 fct = &test1; - add( BOOST_PARAM_TEST_CASE( fct, parameters_list.begin(), parameters_list.end() ) ); - } - - - std::list parameters_list; - mask_list_type masks_list; // mask/"num of errors expected" list -}; - -//____________________________________________________________________________// - -test_suite* -init_unit_test_suite( int /*argc*/, char* /*argv*/[] ) { - test_suite* test = BOOST_TEST_SUITE("unit_test_suite extensions test"); - - function0 fct1 = &test0; - test->add( BOOST_TEST_CASE( fct1 ) ); - -#if !defined(BOOST_MSVC) && !defined(__SUNPRO_CC) - function0 fct2 = bind( &test2, 12345, 0xcdf ); - test->add( BOOST_TEST_CASE( fct2 ) ); -#endif - - test->add( new sub_test_suite ); - - return test; -} - -//____________________________________________________________________________// - -// *************************************************************************** -// Revision History : -// -// $Log$ -// Revision 1.15 2004/05/21 06:26:11 rogeeff -// licence update -// -// Revision 1.14 2004/05/11 11:05:06 rogeeff -// basic_cstring introduced and used everywhere -// class properties reworked -// namespace names shortened -// -// Revision 1.13 2003/12/01 00:42:38 rogeeff -// prerelease cleaning -// - -// *************************************************************************** - -// EOF