From 6348908c73938f4f0068a616cd7a05b7b9616152 Mon Sep 17 00:00:00 2001 From: Gennadiy Rozental Date: Mon, 17 Oct 2011 11:15:55 +0000 Subject: [PATCH] test tests [SVN r75008] --- test/test_assertion_construction.cpp | 2 +- test/test_files/test_tools_test.pattern | 82 ++++++++++++------------- test/test_tools_test.cpp | 16 ++++- 3 files changed, 56 insertions(+), 44 deletions(-) diff --git a/test/test_assertion_construction.cpp b/test/test_assertion_construction.cpp index 053c0d01..ecc3429d 100644 --- a/test/test_assertion_construction.cpp +++ b/test/test_assertion_construction.cpp @@ -25,7 +25,7 @@ BOOST_AUTO_TEST_CASE( test_basic_value_expression_construction ) assertion::seed seed; { - assertion::expression const& E = seed->*1; + assertion::expression const& E = assertion::seed()->*1; predicate_result const& res = E.evaluate(); BOOST_CHECK( res ); BOOST_CHECK( res.message().is_empty() ); diff --git a/test/test_files/test_tools_test.pattern b/test/test_files/test_tools_test.pattern index abd3c0f8..46da13c1 100644 --- a/test/test_files/test_tools_test.pattern +++ b/test/test_files/test_tools_test.pattern @@ -22,42 +22,42 @@ 263: error in "test_BOOST_CHECK_THROW": exception my_exception is expected 266: warning in "test_BOOST_CHECK_THROW": exception my_exception is expected 269: fatal error in "test_BOOST_CHECK_THROW": exception my_exception is expected -272: info: check 'exception my_exception is caught' passed -279: error in "test_BOOST_CHECK_EXCEPTION": incorrect exception my_exception is caught -282: info: check 'incorrect exception my_exception is caught' passed -292: error in "test_BOOST_CHECK_NO_THROW": exception thrown by throw my_exception() -338: error in "test_BOOST_CHECK_EQUAL": check i == j failed [1 != 2] -344: error in "test_BOOST_CHECK_EQUAL": check str1 == str2 failed [test1 != test12] -347: error in "test_BOOST_CHECK_EQUAL": check i+1 == j failed [4 != 2] -350: info: check str1 == str3+1 passed -359: fatal error in "test_BOOST_CHECK_EQUAL": critical check str1 == str2 failed [test != null string] -365: warning in "test_BOOST_CHECK_EQUAL": condition b1 == b2 is not satisfied [B(1) != B(2)] -371: error in "test_BOOST_CHECK_EQUAL": check c1 == c3 failed [C(0,100) != C(1,102)]. Index mismatch -372: error in "test_BOOST_CHECK_EQUAL": check c1 == c2 failed [C(0,100) != C(0,101)]. Id mismatch -376: error in "test_BOOST_CHECK_EQUAL": check ch1 == ch2 failed [0xfffffffe != 0xfffffffd] -387: error in "test_BOOST_CHECK_LOGICAL_EXPR": check ++i != j failed [2 == 2] -389: error in "test_BOOST_CHECK_LOGICAL_EXPR": check i < j failed [2 >= 2] -390: error in "test_BOOST_CHECK_LOGICAL_EXPR": check i > j failed [2 <= 2] -397: error in "test_BOOST_CHECK_LOGICAL_EXPR": check i <= j failed [3 > 2] -398: error in "test_BOOST_CHECK_LOGICAL_EXPR": check j >= i failed [2 < 3] -403: error in "test_BOOST_CHECK_LOGICAL_EXPR": check str1 != str2 failed [test1 == test1] -433: error in "test_BOOST_CHECK_PREDICATE": check is_even( i ) failed for ( 17 ) -436: error in "test_BOOST_CHECK_PREDICATE": check not_equal_to()( i, 17 ) failed for ( 17, 17 ) -442: warning in "test_BOOST_CHECK_PREDICATE": condition moo( 12, i, j ) is not satisfied for ( 12, 17, 15 ) -450: error in "test_BOOST_CHECK_PREDICATE": check compare_lists( l1, l2 ) failed for ( , ). Different sizes [2!=0] -461: error in "test_BOOST_REQUIRE_PREDICATE": not aborted -463: fatal error in "test_BOOST_REQUIRE_PREDICATE": critical check less_equal()( arg2, arg1 ) failed for ( 2, 1 ) -484: error in "test_BOOST_CHECK_EQUAL_COLLECTIONS": check { testlist.begin(), testlist.end() } == { pattern, pattern+7 } failed. +275: info: check 'exception my_exception is caught' passed +282: error in "test_BOOST_CHECK_EXCEPTION": incorrect exception my_exception is caught +285: info: check 'incorrect exception my_exception is caught' passed +297: error in "test_BOOST_CHECK_NO_THROW": exception thrown by throw my_exception() +343: error in "test_BOOST_CHECK_EQUAL": check i == j failed [1 != 2] +349: error in "test_BOOST_CHECK_EQUAL": check str1 == str2 failed [test1 != test12] +352: error in "test_BOOST_CHECK_EQUAL": check i+1 == j failed [4 != 2] +355: info: check str1 == str3+1 passed +364: fatal error in "test_BOOST_CHECK_EQUAL": critical check str1 == str2 failed [test != null string] +370: warning in "test_BOOST_CHECK_EQUAL": condition b1 == b2 is not satisfied [B(1) != B(2)] +376: error in "test_BOOST_CHECK_EQUAL": check c1 == c3 failed [C(0,100) != C(1,102)]. Index mismatch +377: error in "test_BOOST_CHECK_EQUAL": check c1 == c2 failed [C(0,100) != C(0,101)]. Id mismatch +381: error in "test_BOOST_CHECK_EQUAL": check ch1 == ch2 failed [0xfffffffe != 0xfffffffd] +392: error in "test_BOOST_CHECK_LOGICAL_EXPR": check ++i != j failed [2 == 2] +394: error in "test_BOOST_CHECK_LOGICAL_EXPR": check i < j failed [2 >= 2] +395: error in "test_BOOST_CHECK_LOGICAL_EXPR": check i > j failed [2 <= 2] +402: error in "test_BOOST_CHECK_LOGICAL_EXPR": check i <= j failed [3 > 2] +403: error in "test_BOOST_CHECK_LOGICAL_EXPR": check j >= i failed [2 < 3] +408: error in "test_BOOST_CHECK_LOGICAL_EXPR": check str1 != str2 failed [test1 == test1] +438: error in "test_BOOST_CHECK_PREDICATE": check is_even( i ) failed for ( 17 ) +441: error in "test_BOOST_CHECK_PREDICATE": check not_equal_to()( i, 17 ) failed for ( 17, 17 ) +447: warning in "test_BOOST_CHECK_PREDICATE": condition moo( 12, i, j ) is not satisfied for ( 12, 17, 15 ) +455: error in "test_BOOST_CHECK_PREDICATE": check compare_lists( l1, l2 ) failed for ( , ). Different sizes [2!=0] +466: error in "test_BOOST_REQUIRE_PREDICATE": not aborted +468: fatal error in "test_BOOST_REQUIRE_PREDICATE": critical check less_equal()( arg2, arg1 ) failed for ( 2, 1 ) +489: error in "test_BOOST_CHECK_EQUAL_COLLECTIONS": check { testlist.begin(), testlist.end() } == { pattern, pattern+7 } failed. Mismatch in a position 2: 4 != 3 Mismatch in a position 5: 7 != 6 -485: error in "test_BOOST_CHECK_EQUAL_COLLECTIONS": check { testlist.begin(), testlist.end() } == { pattern, pattern+2 } failed. +490: error in "test_BOOST_CHECK_EQUAL_COLLECTIONS": check { testlist.begin(), testlist.end() } == { pattern, pattern+2 } failed. Collections size mismatch: 7 != 2 -494: error in "test_BOOST_CHECK_BITWISE_EQUAL": check (char)0x06 =.= (char)0x16 failed. +499: error in "test_BOOST_CHECK_BITWISE_EQUAL": check (char)0x06 =.= (char)0x16 failed. Mismatch in a position 4 -497: warning in "test_BOOST_CHECK_BITWISE_EQUAL": condition (char)0x26 =.= (char)0x04 is not satisfied. +502: warning in "test_BOOST_CHECK_BITWISE_EQUAL": condition (char)0x26 =.= (char)0x04 is not satisfied. Mismatch in a position 1 Mismatch in a position 5 -500: fatal error in "test_BOOST_CHECK_BITWISE_EQUAL": critical check (char)0x26 =.= (int)0x26 failed. +505: fatal error in "test_BOOST_CHECK_BITWISE_EQUAL": critical check (char)0x26 =.= (int)0x26 failed. Operands bit sizes mismatch: 8 != 32 still testing 1+1=2 @@ -66,38 +66,38 @@ struct A 0x14 20 0: fatal error in "test_BOOST_TEST_CHECKPOINT": C string: some error -535: last checkpoint: Going to do a silly things +540: last checkpoint: Going to do a silly things 0: fatal error in "test_BOOST_TEST_PASSPOINT": unknown type -546: last checkpoint -603: error in "test_context_logging": check false failed +551: last checkpoint +608: error in "test_context_logging": check false failed Failure occurred in a following context: some context -607: error in "test_context_logging": check false failed +612: error in "test_context_logging": check false failed Failure occurred in a following context: some more context: 12 -612: error in "test_context_logging": check false failed +617: error in "test_context_logging": check false failed Failure occurred in a following context: info 1 info 2 info 3 -615: error in "test_context_logging": check false failed +620: error in "test_context_logging": check false failed Failure occurred in a following context: some sticky context -618: error in "test_context_logging": check false failed +623: error in "test_context_logging": check false failed Failure occurred in a following context: some sticky context more context -621: error in "test_context_logging": check false failed +626: error in "test_context_logging": check false failed Failure occurred in a following context: some sticky context different subcontext -625: error in "test_context_logging": check false failed +630: error in "test_context_logging": check false failed Failure occurred in a following context: outer context -628: error in "test_context_logging": check false failed +633: error in "test_context_logging": check false failed Failure occurred in a following context: outer context inner context -631: error in "test_context_logging": check false failed +636: error in "test_context_logging": check false failed Failure occurred in a following context: outer context diff --git a/test/test_tools_test.cpp b/test/test_tools_test.cpp index 5f8de28d..24ad6f45 100644 --- a/test/test_tools_test.cpp +++ b/test/test_tools_test.cpp @@ -269,7 +269,10 @@ TEST_CASE( test_BOOST_CHECK_THROW ) CHECK_CRITICAL_TOOL_USAGE( BOOST_REQUIRE_THROW( i++, my_exception ) ); unit_test_log.set_threshold_level( log_successful_tests ); - BOOST_CHECK_THROW( throw my_exception(), my_exception ); // unreachable code warning is expected + if( i/10 > 10 ) + {} + else + BOOST_CHECK_THROW( throw my_exception(), my_exception ); // unreachable code warning is expected } //____________________________________________________________________________// @@ -287,7 +290,9 @@ TEST_CASE( test_BOOST_CHECK_EXCEPTION ) TEST_CASE( test_BOOST_CHECK_NO_THROW ) { int i=0; - BOOST_CHECK_NO_THROW( i++ ); + if( i*10 == 0 ) + BOOST_CHECK_NO_THROW( i++ ); + else {} BOOST_CHECK_NO_THROW( throw my_exception() ); // unreachable code warning is expected } @@ -634,6 +639,13 @@ TEST_CASE( test_context_logging ) //____________________________________________________________________________// +TEST_CASE( test_BOOST_CHECKA ) +{ + BOOST_CHECKA( true ); +} + +//____________________________________________________________________________// + // !! CHECK_SMALL // EOF