From 90b2bfec3ddd89dd8b5ae550c3edfc05b23ba0f3 Mon Sep 17 00:00:00 2001 From: Phil Nash Date: Mon, 4 Mar 2013 15:06:31 +0100 Subject: [PATCH] Patched issue where an assert before the first section can cause a set-fault (needs a better fix, though) --- include/reporters/catch_reporter_console.hpp | 2 +- .../SelfTest/Baselines/approvedResults.txt | 1456 +++++++++++++++++ single_include/catch.hpp | 4 +- 3 files changed, 1459 insertions(+), 3 deletions(-) diff --git a/include/reporters/catch_reporter_console.hpp b/include/reporters/catch_reporter_console.hpp index bb7fc23..44abbb6 100644 --- a/include/reporters/catch_reporter_console.hpp +++ b/include/reporters/catch_reporter_console.hpp @@ -279,7 +279,7 @@ namespace Catch { if( !currentSectionInfo ) { printHeader( unusedTestCaseInfo->name ); stream << std::endl; - unusedTestCaseInfo.reset(); +// unusedTestCaseInfo.reset(); } } void lazyPrintSectionInfo() { diff --git a/projects/SelfTest/Baselines/approvedResults.txt b/projects/SelfTest/Baselines/approvedResults.txt index 6e83e3b..833e209 100644 --- a/projects/SelfTest/Baselines/approvedResults.txt +++ b/projects/SelfTest/Baselines/approvedResults.txt @@ -12,30 +12,50 @@ PASSED: with expansion: 1.23 == Approx( 1.23 ) +------------------------------------------------------------------------------- +./succeeding/Approx/simple +............................................................................... + ApproxTests.cpp:21: PASSED: REQUIRE( d != Approx( 1.22 ) ) with expansion: 1.23 != Approx( 1.22 ) +------------------------------------------------------------------------------- +./succeeding/Approx/simple +............................................................................... + ApproxTests.cpp:22: PASSED: REQUIRE( d != Approx( 1.24 ) ) with expansion: 1.23 != Approx( 1.24 ) +------------------------------------------------------------------------------- +./succeeding/Approx/simple +............................................................................... + ApproxTests.cpp:24: PASSED: REQUIRE( Approx( d ) == 1.23 ) with expansion: Approx( 1.23 ) == 1.23 +------------------------------------------------------------------------------- +./succeeding/Approx/simple +............................................................................... + ApproxTests.cpp:25: PASSED: REQUIRE( Approx( d ) != 1.22 ) with expansion: Approx( 1.23 ) != 1.22 +------------------------------------------------------------------------------- +./succeeding/Approx/simple +............................................................................... + ApproxTests.cpp:26: PASSED: REQUIRE( Approx( d ) != 1.24 ) @@ -52,6 +72,10 @@ PASSED: with expansion: 1.23 != Approx( 1.231 ) +------------------------------------------------------------------------------- +./succeeding/Approx/epsilon +............................................................................... + ApproxTests.cpp:39: PASSED: REQUIRE( d == Approx( 1.231 ).epsilon( 0.1 ) ) @@ -68,6 +92,10 @@ PASSED: with expansion: 1.23 == Approx( 1.23 ) +------------------------------------------------------------------------------- +./succeeding/Approx/float +............................................................................... + ApproxTests.cpp:50: PASSED: REQUIRE( 0.0f == Approx( 0.0f ) ) @@ -82,6 +110,10 @@ ApproxTests.cpp:60: PASSED: REQUIRE( 1 == Approx( 1 ) ) +------------------------------------------------------------------------------- +./succeeding/Approx/int +............................................................................... + ApproxTests.cpp:61: PASSED: REQUIRE( 0 == Approx( 0 ) ) @@ -96,24 +128,40 @@ PASSED: with expansion: 1 == Approx( 1 ) +------------------------------------------------------------------------------- +./succeeding/Approx/mixed +............................................................................... + ApproxTests.cpp:76: PASSED: REQUIRE( 0 == Approx( dZero) ) with expansion: 0 == Approx( 0 ) +------------------------------------------------------------------------------- +./succeeding/Approx/mixed +............................................................................... + ApproxTests.cpp:77: PASSED: REQUIRE( 0 == Approx( dSmall ).epsilon( 0.001 ) ) with expansion: 0 == Approx( 1e-05 ) +------------------------------------------------------------------------------- +./succeeding/Approx/mixed +............................................................................... + ApproxTests.cpp:78: PASSED: REQUIRE( 1.234f == Approx( dMedium ) ) with expansion: 1.234 == Approx( 1.234 ) +------------------------------------------------------------------------------- +./succeeding/Approx/mixed +............................................................................... + ApproxTests.cpp:79: PASSED: REQUIRE( dMedium == Approx( 1.234f ) ) @@ -130,42 +178,70 @@ PASSED: with expansion: 1.23 == Approx( 1.23 ) +------------------------------------------------------------------------------- +./succeeding/Approx/custom +............................................................................... + ApproxTests.cpp:94: PASSED: REQUIRE( d == approx( 1.22 ) ) with expansion: 1.23 == Approx( 1.22 ) +------------------------------------------------------------------------------- +./succeeding/Approx/custom +............................................................................... + ApproxTests.cpp:95: PASSED: REQUIRE( d == approx( 1.24 ) ) with expansion: 1.23 == Approx( 1.24 ) +------------------------------------------------------------------------------- +./succeeding/Approx/custom +............................................................................... + ApproxTests.cpp:96: PASSED: REQUIRE( d != approx( 1.25 ) ) with expansion: 1.23 != Approx( 1.25 ) +------------------------------------------------------------------------------- +./succeeding/Approx/custom +............................................................................... + ApproxTests.cpp:98: PASSED: REQUIRE( approx( d ) == 1.23 ) with expansion: Approx( 1.23 ) == 1.23 +------------------------------------------------------------------------------- +./succeeding/Approx/custom +............................................................................... + ApproxTests.cpp:99: PASSED: REQUIRE( approx( d ) == 1.22 ) with expansion: Approx( 1.23 ) == 1.22 +------------------------------------------------------------------------------- +./succeeding/Approx/custom +............................................................................... + ApproxTests.cpp:100: PASSED: REQUIRE( approx( d ) == 1.24 ) with expansion: Approx( 1.23 ) == 1.24 +------------------------------------------------------------------------------- +./succeeding/Approx/custom +............................................................................... + ApproxTests.cpp:101: PASSED: REQUIRE( approx( d ) != 1.25 ) @@ -182,6 +258,10 @@ PASSED: with expansion: 3.142857142857143 == Approx( 3.141 ) +------------------------------------------------------------------------------- +Approximate PI +............................................................................... + ApproxTests.cpp:111: PASSED: REQUIRE( divide( 22, 7 ) != Approx( 3.141 ).epsilon( 0.0001 ) ) @@ -236,36 +316,60 @@ PASSED: with expansion: 7 == 7 +------------------------------------------------------------------------------- +./succeeding/conditions/equality +............................................................................... + ConditionTests.cpp:56: PASSED: REQUIRE( data.float_nine_point_one == Approx( 9.1f ) ) with expansion: 9.1 == Approx( 9.1 ) +------------------------------------------------------------------------------- +./succeeding/conditions/equality +............................................................................... + ConditionTests.cpp:57: PASSED: REQUIRE( data.double_pi == Approx( 3.1415926535 ) ) with expansion: 3.1415926535 == Approx( 3.14159 ) +------------------------------------------------------------------------------- +./succeeding/conditions/equality +............................................................................... + ConditionTests.cpp:58: PASSED: REQUIRE( data.str_hello == "hello" ) with expansion: "hello" == "hello" +------------------------------------------------------------------------------- +./succeeding/conditions/equality +............................................................................... + ConditionTests.cpp:59: PASSED: REQUIRE( "hello" == data.str_hello ) with expansion: "hello" == "hello" +------------------------------------------------------------------------------- +./succeeding/conditions/equality +............................................................................... + ConditionTests.cpp:60: PASSED: REQUIRE( data.str_hello.size() == 5 ) with expansion: 5 == 5 +------------------------------------------------------------------------------- +./succeeding/conditions/equality +............................................................................... + ConditionTests.cpp:63: PASSED: REQUIRE( x == Approx( 1.3 ) ) @@ -281,61 +385,109 @@ ConditionTests.cpp:71: FAILED: with expansion: 7 == 6 +------------------------------------------------------------------------------- +./failing/conditions/equality +............................................................................... + ConditionTests.cpp:72: FAILED: CHECK( data.int_seven == 8 ) with expansion: 7 == 8 +------------------------------------------------------------------------------- +./failing/conditions/equality +............................................................................... + ConditionTests.cpp:73: FAILED: CHECK( data.int_seven == 0 ) with expansion: 7 == 0 +------------------------------------------------------------------------------- +./failing/conditions/equality +............................................................................... + ConditionTests.cpp:74: FAILED: CHECK( data.float_nine_point_one == Approx( 9.11f ) ) with expansion: 9.1 == Approx( 9.11 ) +------------------------------------------------------------------------------- +./failing/conditions/equality +............................................................................... + ConditionTests.cpp:75: FAILED: CHECK( data.float_nine_point_one == Approx( 9.0f ) ) with expansion: 9.1 == Approx( 9 ) +------------------------------------------------------------------------------- +./failing/conditions/equality +............................................................................... + ConditionTests.cpp:76: FAILED: CHECK( data.float_nine_point_one == Approx( 1 ) ) with expansion: 9.1 == Approx( 1 ) +------------------------------------------------------------------------------- +./failing/conditions/equality +............................................................................... + ConditionTests.cpp:77: FAILED: CHECK( data.float_nine_point_one == Approx( 0 ) ) with expansion: 9.1 == Approx( 0 ) +------------------------------------------------------------------------------- +./failing/conditions/equality +............................................................................... + ConditionTests.cpp:78: FAILED: CHECK( data.double_pi == Approx( 3.1415 ) ) with expansion: 3.1415926535 == Approx( 3.1415 ) +------------------------------------------------------------------------------- +./failing/conditions/equality +............................................................................... + ConditionTests.cpp:79: FAILED: CHECK( data.str_hello == "goodbye" ) with expansion: "hello" == "goodbye" +------------------------------------------------------------------------------- +./failing/conditions/equality +............................................................................... + ConditionTests.cpp:80: FAILED: CHECK( data.str_hello == "hell" ) with expansion: "hello" == "hell" +------------------------------------------------------------------------------- +./failing/conditions/equality +............................................................................... + ConditionTests.cpp:81: FAILED: CHECK( data.str_hello == "hello1" ) with expansion: "hello" == "hello1" +------------------------------------------------------------------------------- +./failing/conditions/equality +............................................................................... + ConditionTests.cpp:82: FAILED: CHECK( data.str_hello.size() == 6 ) with expansion: 5 == 6 +------------------------------------------------------------------------------- +./failing/conditions/equality +............................................................................... + ConditionTests.cpp:85: FAILED: CHECK( x == Approx( 1.301 ) ) with expansion: @@ -351,60 +503,100 @@ PASSED: with expansion: 7 != 6 +------------------------------------------------------------------------------- +./succeeding/conditions/inequality +............................................................................... + ConditionTests.cpp:94: PASSED: REQUIRE( data.int_seven != 8 ) with expansion: 7 != 8 +------------------------------------------------------------------------------- +./succeeding/conditions/inequality +............................................................................... + ConditionTests.cpp:95: PASSED: REQUIRE( data.float_nine_point_one != Approx( 9.11f ) ) with expansion: 9.1 != Approx( 9.11 ) +------------------------------------------------------------------------------- +./succeeding/conditions/inequality +............................................................................... + ConditionTests.cpp:96: PASSED: REQUIRE( data.float_nine_point_one != Approx( 9.0f ) ) with expansion: 9.1 != Approx( 9 ) +------------------------------------------------------------------------------- +./succeeding/conditions/inequality +............................................................................... + ConditionTests.cpp:97: PASSED: REQUIRE( data.float_nine_point_one != Approx( 1 ) ) with expansion: 9.1 != Approx( 1 ) +------------------------------------------------------------------------------- +./succeeding/conditions/inequality +............................................................................... + ConditionTests.cpp:98: PASSED: REQUIRE( data.float_nine_point_one != Approx( 0 ) ) with expansion: 9.1 != Approx( 0 ) +------------------------------------------------------------------------------- +./succeeding/conditions/inequality +............................................................................... + ConditionTests.cpp:99: PASSED: REQUIRE( data.double_pi != Approx( 3.1415 ) ) with expansion: 3.1415926535 != Approx( 3.1415 ) +------------------------------------------------------------------------------- +./succeeding/conditions/inequality +............................................................................... + ConditionTests.cpp:100: PASSED: REQUIRE( data.str_hello != "goodbye" ) with expansion: "hello" != "goodbye" +------------------------------------------------------------------------------- +./succeeding/conditions/inequality +............................................................................... + ConditionTests.cpp:101: PASSED: REQUIRE( data.str_hello != "hell" ) with expansion: "hello" != "hell" +------------------------------------------------------------------------------- +./succeeding/conditions/inequality +............................................................................... + ConditionTests.cpp:102: PASSED: REQUIRE( data.str_hello != "hello1" ) with expansion: "hello" != "hello1" +------------------------------------------------------------------------------- +./succeeding/conditions/inequality +............................................................................... + ConditionTests.cpp:103: PASSED: REQUIRE( data.str_hello.size() != 6 ) @@ -420,21 +612,37 @@ ConditionTests.cpp:111: FAILED: with expansion: 7 != 7 +------------------------------------------------------------------------------- +./failing/conditions/inequality +............................................................................... + ConditionTests.cpp:112: FAILED: CHECK( data.float_nine_point_one != Approx( 9.1f ) ) with expansion: 9.1 != Approx( 9.1 ) +------------------------------------------------------------------------------- +./failing/conditions/inequality +............................................................................... + ConditionTests.cpp:113: FAILED: CHECK( data.double_pi != Approx( 3.1415926535 ) ) with expansion: 3.1415926535 != Approx( 3.14159 ) +------------------------------------------------------------------------------- +./failing/conditions/inequality +............................................................................... + ConditionTests.cpp:114: FAILED: CHECK( data.str_hello != "hello" ) with expansion: "hello" != "hello" +------------------------------------------------------------------------------- +./failing/conditions/inequality +............................................................................... + ConditionTests.cpp:115: FAILED: CHECK( data.str_hello.size() != 5 ) with expansion: @@ -450,96 +658,160 @@ PASSED: with expansion: 7 < 8 +------------------------------------------------------------------------------- +./succeeding/conditions/ordered +............................................................................... + ConditionTests.cpp:125: PASSED: REQUIRE( data.int_seven > 6 ) with expansion: 7 > 6 +------------------------------------------------------------------------------- +./succeeding/conditions/ordered +............................................................................... + ConditionTests.cpp:126: PASSED: REQUIRE( data.int_seven > 0 ) with expansion: 7 > 0 +------------------------------------------------------------------------------- +./succeeding/conditions/ordered +............................................................................... + ConditionTests.cpp:127: PASSED: REQUIRE( data.int_seven > -1 ) with expansion: 7 > -1 +------------------------------------------------------------------------------- +./succeeding/conditions/ordered +............................................................................... + ConditionTests.cpp:129: PASSED: REQUIRE( data.int_seven >= 7 ) with expansion: 7 >= 7 +------------------------------------------------------------------------------- +./succeeding/conditions/ordered +............................................................................... + ConditionTests.cpp:130: PASSED: REQUIRE( data.int_seven >= 6 ) with expansion: 7 >= 6 +------------------------------------------------------------------------------- +./succeeding/conditions/ordered +............................................................................... + ConditionTests.cpp:131: PASSED: REQUIRE( data.int_seven <= 7 ) with expansion: 7 <= 7 +------------------------------------------------------------------------------- +./succeeding/conditions/ordered +............................................................................... + ConditionTests.cpp:132: PASSED: REQUIRE( data.int_seven <= 8 ) with expansion: 7 <= 8 +------------------------------------------------------------------------------- +./succeeding/conditions/ordered +............................................................................... + ConditionTests.cpp:134: PASSED: REQUIRE( data.float_nine_point_one > 9 ) with expansion: 9.1 > 9 +------------------------------------------------------------------------------- +./succeeding/conditions/ordered +............................................................................... + ConditionTests.cpp:135: PASSED: REQUIRE( data.float_nine_point_one < 10 ) with expansion: 9.1 < 10 +------------------------------------------------------------------------------- +./succeeding/conditions/ordered +............................................................................... + ConditionTests.cpp:136: PASSED: REQUIRE( data.float_nine_point_one < 9.2 ) with expansion: 9.1 < 9.199999999999999 +------------------------------------------------------------------------------- +./succeeding/conditions/ordered +............................................................................... + ConditionTests.cpp:138: PASSED: REQUIRE( data.str_hello <= "hello" ) with expansion: "hello" <= "hello" +------------------------------------------------------------------------------- +./succeeding/conditions/ordered +............................................................................... + ConditionTests.cpp:139: PASSED: REQUIRE( data.str_hello >= "hello" ) with expansion: "hello" >= "hello" +------------------------------------------------------------------------------- +./succeeding/conditions/ordered +............................................................................... + ConditionTests.cpp:141: PASSED: REQUIRE( data.str_hello < "hellp" ) with expansion: "hello" < "hellp" +------------------------------------------------------------------------------- +./succeeding/conditions/ordered +............................................................................... + ConditionTests.cpp:142: PASSED: REQUIRE( data.str_hello < "zebra" ) with expansion: "hello" < "zebra" +------------------------------------------------------------------------------- +./succeeding/conditions/ordered +............................................................................... + ConditionTests.cpp:143: PASSED: REQUIRE( data.str_hello > "hellm" ) with expansion: "hello" > "hellm" +------------------------------------------------------------------------------- +./succeeding/conditions/ordered +............................................................................... + ConditionTests.cpp:144: PASSED: REQUIRE( data.str_hello > "a" ) @@ -555,91 +827,163 @@ ConditionTests.cpp:152: FAILED: with expansion: 7 > 7 +------------------------------------------------------------------------------- +./failing/conditions/ordered +............................................................................... + ConditionTests.cpp:153: FAILED: CHECK( data.int_seven < 7 ) with expansion: 7 < 7 +------------------------------------------------------------------------------- +./failing/conditions/ordered +............................................................................... + ConditionTests.cpp:154: FAILED: CHECK( data.int_seven > 8 ) with expansion: 7 > 8 +------------------------------------------------------------------------------- +./failing/conditions/ordered +............................................................................... + ConditionTests.cpp:155: FAILED: CHECK( data.int_seven < 6 ) with expansion: 7 < 6 +------------------------------------------------------------------------------- +./failing/conditions/ordered +............................................................................... + ConditionTests.cpp:156: FAILED: CHECK( data.int_seven < 0 ) with expansion: 7 < 0 +------------------------------------------------------------------------------- +./failing/conditions/ordered +............................................................................... + ConditionTests.cpp:157: FAILED: CHECK( data.int_seven < -1 ) with expansion: 7 < -1 +------------------------------------------------------------------------------- +./failing/conditions/ordered +............................................................................... + ConditionTests.cpp:159: FAILED: CHECK( data.int_seven >= 8 ) with expansion: 7 >= 8 +------------------------------------------------------------------------------- +./failing/conditions/ordered +............................................................................... + ConditionTests.cpp:160: FAILED: CHECK( data.int_seven <= 6 ) with expansion: 7 <= 6 +------------------------------------------------------------------------------- +./failing/conditions/ordered +............................................................................... + ConditionTests.cpp:162: FAILED: CHECK( data.float_nine_point_one < 9 ) with expansion: 9.1 < 9 +------------------------------------------------------------------------------- +./failing/conditions/ordered +............................................................................... + ConditionTests.cpp:163: FAILED: CHECK( data.float_nine_point_one > 10 ) with expansion: 9.1 > 10 +------------------------------------------------------------------------------- +./failing/conditions/ordered +............................................................................... + ConditionTests.cpp:164: FAILED: CHECK( data.float_nine_point_one > 9.2 ) with expansion: 9.1 > 9.199999999999999 +------------------------------------------------------------------------------- +./failing/conditions/ordered +............................................................................... + ConditionTests.cpp:166: FAILED: CHECK( data.str_hello > "hello" ) with expansion: "hello" > "hello" +------------------------------------------------------------------------------- +./failing/conditions/ordered +............................................................................... + ConditionTests.cpp:167: FAILED: CHECK( data.str_hello < "hello" ) with expansion: "hello" < "hello" +------------------------------------------------------------------------------- +./failing/conditions/ordered +............................................................................... + ConditionTests.cpp:168: FAILED: CHECK( data.str_hello > "hellp" ) with expansion: "hello" > "hellp" +------------------------------------------------------------------------------- +./failing/conditions/ordered +............................................................................... + ConditionTests.cpp:169: FAILED: CHECK( data.str_hello > "z" ) with expansion: "hello" > "z" +------------------------------------------------------------------------------- +./failing/conditions/ordered +............................................................................... + ConditionTests.cpp:170: FAILED: CHECK( data.str_hello < "hellm" ) with expansion: "hello" < "hellm" +------------------------------------------------------------------------------- +./failing/conditions/ordered +............................................................................... + ConditionTests.cpp:171: FAILED: CHECK( data.str_hello < "a" ) with expansion: "hello" < "a" +------------------------------------------------------------------------------- +./failing/conditions/ordered +............................................................................... + ConditionTests.cpp:173: FAILED: CHECK( data.str_hello >= "z" ) with expansion: "hello" >= "z" +------------------------------------------------------------------------------- +./failing/conditions/ordered +............................................................................... + ConditionTests.cpp:174: FAILED: CHECK( data.str_hello <= "a" ) with expansion: @@ -655,72 +999,120 @@ PASSED: with expansion: 1 == 1 +------------------------------------------------------------------------------- +./succeeding/conditions/int literals +............................................................................... + ConditionTests.cpp:189: PASSED: REQUIRE( ui == 2 ) with expansion: 2 == 2 +------------------------------------------------------------------------------- +./succeeding/conditions/int literals +............................................................................... + ConditionTests.cpp:190: PASSED: REQUIRE( l == 3 ) with expansion: 3 == 3 +------------------------------------------------------------------------------- +./succeeding/conditions/int literals +............................................................................... + ConditionTests.cpp:191: PASSED: REQUIRE( ul == 4 ) with expansion: 4 == 4 +------------------------------------------------------------------------------- +./succeeding/conditions/int literals +............................................................................... + ConditionTests.cpp:192: PASSED: REQUIRE( c == 5 ) with expansion: 5 == 5 +------------------------------------------------------------------------------- +./succeeding/conditions/int literals +............................................................................... + ConditionTests.cpp:193: PASSED: REQUIRE( uc == 6 ) with expansion: 6 == 6 +------------------------------------------------------------------------------- +./succeeding/conditions/int literals +............................................................................... + ConditionTests.cpp:195: PASSED: REQUIRE( 1 == i ) with expansion: 1 == 1 +------------------------------------------------------------------------------- +./succeeding/conditions/int literals +............................................................................... + ConditionTests.cpp:196: PASSED: REQUIRE( 2 == ui ) with expansion: 2 == 2 +------------------------------------------------------------------------------- +./succeeding/conditions/int literals +............................................................................... + ConditionTests.cpp:197: PASSED: REQUIRE( 3 == l ) with expansion: 3 == 3 +------------------------------------------------------------------------------- +./succeeding/conditions/int literals +............................................................................... + ConditionTests.cpp:198: PASSED: REQUIRE( 4 == ul ) with expansion: 4 == 4 +------------------------------------------------------------------------------- +./succeeding/conditions/int literals +............................................................................... + ConditionTests.cpp:199: PASSED: REQUIRE( 5 == c ) with expansion: 5 == 5 +------------------------------------------------------------------------------- +./succeeding/conditions/int literals +............................................................................... + ConditionTests.cpp:200: PASSED: REQUIRE( 6 == uc ) with expansion: 6 == 6 +------------------------------------------------------------------------------- +./succeeding/conditions/int literals +............................................................................... + ConditionTests.cpp:202: PASSED: REQUIRE( (std::numeric_limits::max)() > ul ) @@ -737,18 +1129,30 @@ PASSED: with expansion: 1 == 1 +------------------------------------------------------------------------------- +./succeeding/conditions//long_to_unsigned_x +............................................................................... + ConditionTests.cpp:224: PASSED: REQUIRE( long_var == unsigned_short_var ) with expansion: 1 == 1 +------------------------------------------------------------------------------- +./succeeding/conditions//long_to_unsigned_x +............................................................................... + ConditionTests.cpp:225: PASSED: REQUIRE( long_var == unsigned_int_var ) with expansion: 1 == 1 +------------------------------------------------------------------------------- +./succeeding/conditions//long_to_unsigned_x +............................................................................... + ConditionTests.cpp:226: PASSED: REQUIRE( long_var == unsigned_long_var ) @@ -765,18 +1169,30 @@ PASSED: with expansion: 1 == 1 +------------------------------------------------------------------------------- +./succeeding/conditions/const ints to int literal +............................................................................... + ConditionTests.cpp:238: PASSED: REQUIRE( unsigned_short_var == 1 ) with expansion: 1 == 1 +------------------------------------------------------------------------------- +./succeeding/conditions/const ints to int literal +............................................................................... + ConditionTests.cpp:239: PASSED: REQUIRE( unsigned_int_var == 1 ) with expansion: 1 == 1 +------------------------------------------------------------------------------- +./succeeding/conditions/const ints to int literal +............................................................................... + ConditionTests.cpp:240: PASSED: REQUIRE( unsigned_long_var == 1 ) @@ -793,30 +1209,50 @@ PASSED: with expansion: true +------------------------------------------------------------------------------- +./succeeding/conditions/negative ints +............................................................................... + ConditionTests.cpp:247: PASSED: CHECK( -1 > 2u ) with expansion: -1 > 2 +------------------------------------------------------------------------------- +./succeeding/conditions/negative ints +............................................................................... + ConditionTests.cpp:249: PASSED: CHECK( ( 2u < -1 ) ) with expansion: true +------------------------------------------------------------------------------- +./succeeding/conditions/negative ints +............................................................................... + ConditionTests.cpp:250: PASSED: CHECK( 2u < -1 ) with expansion: 2 < -1 +------------------------------------------------------------------------------- +./succeeding/conditions/negative ints +............................................................................... + ConditionTests.cpp:253: PASSED: CHECK( ( minInt > 2u ) ) with expansion: true +------------------------------------------------------------------------------- +./succeeding/conditions/negative ints +............................................................................... + ConditionTests.cpp:254: PASSED: CHECK( minInt > 2u ) @@ -843,42 +1279,70 @@ PASSED: with expansion: __null == 0 +------------------------------------------------------------------------------- +./succeeding/conditions/ptr +............................................................................... + ConditionTests.cpp:286: PASSED: REQUIRE( p == pNULL ) with expansion: __null == __null +------------------------------------------------------------------------------- +./succeeding/conditions/ptr +............................................................................... + ConditionTests.cpp:291: PASSED: REQUIRE( p != __null ) with expansion: 0x != 0 +------------------------------------------------------------------------------- +./succeeding/conditions/ptr +............................................................................... + ConditionTests.cpp:294: PASSED: REQUIRE( cp != __null ) with expansion: 0x != 0 +------------------------------------------------------------------------------- +./succeeding/conditions/ptr +............................................................................... + ConditionTests.cpp:297: PASSED: REQUIRE( cpc != __null ) with expansion: 0x != 0 +------------------------------------------------------------------------------- +./succeeding/conditions/ptr +............................................................................... + ConditionTests.cpp:299: PASSED: REQUIRE( returnsNull() == __null ) with expansion: {null string} == 0 +------------------------------------------------------------------------------- +./succeeding/conditions/ptr +............................................................................... + ConditionTests.cpp:300: PASSED: REQUIRE( returnsConstNull() == __null ) with expansion: {null string} == 0 +------------------------------------------------------------------------------- +./succeeding/conditions/ptr +............................................................................... + ConditionTests.cpp:302: PASSED: REQUIRE( __null != p ) @@ -893,38 +1357,66 @@ ConditionTests.cpp:317: PASSED: REQUIRE( false == false ) +------------------------------------------------------------------------------- +./succeeding/conditions/not +............................................................................... + ConditionTests.cpp:318: PASSED: REQUIRE( true == true ) +------------------------------------------------------------------------------- +./succeeding/conditions/not +............................................................................... + ConditionTests.cpp:319: PASSED: REQUIRE( !false ) with expansion: true +------------------------------------------------------------------------------- +./succeeding/conditions/not +............................................................................... + ConditionTests.cpp:320: PASSED: REQUIRE_FALSE( !false ) +------------------------------------------------------------------------------- +./succeeding/conditions/not +............................................................................... + ConditionTests.cpp:322: PASSED: REQUIRE( !falseValue ) with expansion: true +------------------------------------------------------------------------------- +./succeeding/conditions/not +............................................................................... + ConditionTests.cpp:323: PASSED: REQUIRE_FALSE( !falseValue ) with expansion: !false +------------------------------------------------------------------------------- +./succeeding/conditions/not +............................................................................... + ConditionTests.cpp:325: PASSED: REQUIRE( !(1 == 2) ) with expansion: true +------------------------------------------------------------------------------- +./succeeding/conditions/not +............................................................................... + ConditionTests.cpp:326: PASSED: REQUIRE_FALSE( !1 == 2 ) @@ -938,32 +1430,60 @@ with expansion: ConditionTests.cpp:334: FAILED: CHECK( false != false ) +------------------------------------------------------------------------------- +./failing/conditions/not +............................................................................... + ConditionTests.cpp:335: FAILED: CHECK( true != true ) +------------------------------------------------------------------------------- +./failing/conditions/not +............................................................................... + ConditionTests.cpp:336: FAILED: CHECK( !true ) with expansion: false +------------------------------------------------------------------------------- +./failing/conditions/not +............................................................................... + ConditionTests.cpp:337: FAILED: CHECK_FALSE( !true ) +------------------------------------------------------------------------------- +./failing/conditions/not +............................................................................... + ConditionTests.cpp:339: FAILED: CHECK( !trueValue ) with expansion: false +------------------------------------------------------------------------------- +./failing/conditions/not +............................................................................... + ConditionTests.cpp:340: FAILED: CHECK_FALSE( !trueValue ) with expansion: !true +------------------------------------------------------------------------------- +./failing/conditions/not +............................................................................... + ConditionTests.cpp:342: FAILED: CHECK( !(1 == 1) ) with expansion: false +------------------------------------------------------------------------------- +./failing/conditions/not +............................................................................... + ConditionTests.cpp:343: FAILED: CHECK_FALSE( !1 == 1 ) with expansion: @@ -977,10 +1497,18 @@ ExceptionTests.cpp:39: PASSED: REQUIRE_THROWS_AS( thisThrows() ) +------------------------------------------------------------------------------- +./succeeding/exceptions/explicit +............................................................................... + ExceptionTests.cpp:40: PASSED: REQUIRE_NOTHROW( thisDoesntThrow() ) +------------------------------------------------------------------------------- +./succeeding/exceptions/explicit +............................................................................... + ExceptionTests.cpp:41: PASSED: REQUIRE_THROWS( thisThrows() ) @@ -994,10 +1522,18 @@ ExceptionTests.cpp:47: FAILED: due to unexpected exception with message: expected exception +------------------------------------------------------------------------------- +./failing/exceptions/explicit +............................................................................... + ExceptionTests.cpp:48: FAILED: CHECK_THROWS_AS( thisDoesntThrow() ) because no exception was thrown where one was expected: +------------------------------------------------------------------------------- +./failing/exceptions/explicit +............................................................................... + ExceptionTests.cpp:49: FAILED: CHECK_NOTHROW( thisThrows() ) due to unexpected exception with message: @@ -1019,6 +1555,10 @@ ExceptionTests.cpp:60: PASSED: CHECK( 1 == 1 ) +------------------------------------------------------------------------------- +./failing/exceptions/implicit/2 +............................................................................... + ExceptionTests.cpp:60: FAILED: {Unknown expression after the reported line} due to unexpected exception with message: @@ -1092,858 +1632,1430 @@ PASSED: with expansion: 2 == 2 +------------------------------------------------------------------------------- +./succeeding/generators/1 +............................................................................... + GeneratorTests.cpp:27: PASSED: CATCH_REQUIRE( multiply( j, 2 ) == j*2 ) with expansion: 200 == 200 +------------------------------------------------------------------------------- +./succeeding/generators/1 +............................................................................... + GeneratorTests.cpp:26: PASSED: CATCH_REQUIRE( multiply( i, 2 ) == i*2 ) with expansion: 4 == 4 +------------------------------------------------------------------------------- +./succeeding/generators/1 +............................................................................... + GeneratorTests.cpp:27: PASSED: CATCH_REQUIRE( multiply( j, 2 ) == j*2 ) with expansion: 200 == 200 +------------------------------------------------------------------------------- +./succeeding/generators/1 +............................................................................... + GeneratorTests.cpp:26: PASSED: CATCH_REQUIRE( multiply( i, 2 ) == i*2 ) with expansion: 6 == 6 +------------------------------------------------------------------------------- +./succeeding/generators/1 +............................................................................... + GeneratorTests.cpp:27: PASSED: CATCH_REQUIRE( multiply( j, 2 ) == j*2 ) with expansion: 200 == 200 +------------------------------------------------------------------------------- +./succeeding/generators/1 +............................................................................... + GeneratorTests.cpp:26: PASSED: CATCH_REQUIRE( multiply( i, 2 ) == i*2 ) with expansion: 8 == 8 +------------------------------------------------------------------------------- +./succeeding/generators/1 +............................................................................... + GeneratorTests.cpp:27: PASSED: CATCH_REQUIRE( multiply( j, 2 ) == j*2 ) with expansion: 200 == 200 +------------------------------------------------------------------------------- +./succeeding/generators/1 +............................................................................... + GeneratorTests.cpp:26: PASSED: CATCH_REQUIRE( multiply( i, 2 ) == i*2 ) with expansion: 10 == 10 +------------------------------------------------------------------------------- +./succeeding/generators/1 +............................................................................... + GeneratorTests.cpp:27: PASSED: CATCH_REQUIRE( multiply( j, 2 ) == j*2 ) with expansion: 200 == 200 +------------------------------------------------------------------------------- +./succeeding/generators/1 +............................................................................... + GeneratorTests.cpp:26: PASSED: CATCH_REQUIRE( multiply( i, 2 ) == i*2 ) with expansion: 30 == 30 +------------------------------------------------------------------------------- +./succeeding/generators/1 +............................................................................... + GeneratorTests.cpp:27: PASSED: CATCH_REQUIRE( multiply( j, 2 ) == j*2 ) with expansion: 200 == 200 +------------------------------------------------------------------------------- +./succeeding/generators/1 +............................................................................... + GeneratorTests.cpp:26: PASSED: CATCH_REQUIRE( multiply( i, 2 ) == i*2 ) with expansion: 40 == 40 +------------------------------------------------------------------------------- +./succeeding/generators/1 +............................................................................... + GeneratorTests.cpp:27: PASSED: CATCH_REQUIRE( multiply( j, 2 ) == j*2 ) with expansion: 200 == 200 +------------------------------------------------------------------------------- +./succeeding/generators/1 +............................................................................... + GeneratorTests.cpp:26: PASSED: CATCH_REQUIRE( multiply( i, 2 ) == i*2 ) with expansion: 42 == 42 +------------------------------------------------------------------------------- +./succeeding/generators/1 +............................................................................... + GeneratorTests.cpp:27: PASSED: CATCH_REQUIRE( multiply( j, 2 ) == j*2 ) with expansion: 200 == 200 +------------------------------------------------------------------------------- +./succeeding/generators/1 +............................................................................... + GeneratorTests.cpp:26: PASSED: CATCH_REQUIRE( multiply( i, 2 ) == i*2 ) with expansion: 72 == 72 +------------------------------------------------------------------------------- +./succeeding/generators/1 +............................................................................... + GeneratorTests.cpp:27: PASSED: CATCH_REQUIRE( multiply( j, 2 ) == j*2 ) with expansion: 200 == 200 +------------------------------------------------------------------------------- +./succeeding/generators/1 +............................................................................... + GeneratorTests.cpp:26: PASSED: CATCH_REQUIRE( multiply( i, 2 ) == i*2 ) with expansion: 2 == 2 +------------------------------------------------------------------------------- +./succeeding/generators/1 +............................................................................... + GeneratorTests.cpp:27: PASSED: CATCH_REQUIRE( multiply( j, 2 ) == j*2 ) with expansion: 202 == 202 +------------------------------------------------------------------------------- +./succeeding/generators/1 +............................................................................... + GeneratorTests.cpp:26: PASSED: CATCH_REQUIRE( multiply( i, 2 ) == i*2 ) with expansion: 4 == 4 +------------------------------------------------------------------------------- +./succeeding/generators/1 +............................................................................... + GeneratorTests.cpp:27: PASSED: CATCH_REQUIRE( multiply( j, 2 ) == j*2 ) with expansion: 202 == 202 +------------------------------------------------------------------------------- +./succeeding/generators/1 +............................................................................... + GeneratorTests.cpp:26: PASSED: CATCH_REQUIRE( multiply( i, 2 ) == i*2 ) with expansion: 6 == 6 +------------------------------------------------------------------------------- +./succeeding/generators/1 +............................................................................... + GeneratorTests.cpp:27: PASSED: CATCH_REQUIRE( multiply( j, 2 ) == j*2 ) with expansion: 202 == 202 +------------------------------------------------------------------------------- +./succeeding/generators/1 +............................................................................... + GeneratorTests.cpp:26: PASSED: CATCH_REQUIRE( multiply( i, 2 ) == i*2 ) with expansion: 8 == 8 +------------------------------------------------------------------------------- +./succeeding/generators/1 +............................................................................... + GeneratorTests.cpp:27: PASSED: CATCH_REQUIRE( multiply( j, 2 ) == j*2 ) with expansion: 202 == 202 +------------------------------------------------------------------------------- +./succeeding/generators/1 +............................................................................... + GeneratorTests.cpp:26: PASSED: CATCH_REQUIRE( multiply( i, 2 ) == i*2 ) with expansion: 10 == 10 +------------------------------------------------------------------------------- +./succeeding/generators/1 +............................................................................... + GeneratorTests.cpp:27: PASSED: CATCH_REQUIRE( multiply( j, 2 ) == j*2 ) with expansion: 202 == 202 +------------------------------------------------------------------------------- +./succeeding/generators/1 +............................................................................... + GeneratorTests.cpp:26: PASSED: CATCH_REQUIRE( multiply( i, 2 ) == i*2 ) with expansion: 30 == 30 +------------------------------------------------------------------------------- +./succeeding/generators/1 +............................................................................... + GeneratorTests.cpp:27: PASSED: CATCH_REQUIRE( multiply( j, 2 ) == j*2 ) with expansion: 202 == 202 +------------------------------------------------------------------------------- +./succeeding/generators/1 +............................................................................... + GeneratorTests.cpp:26: PASSED: CATCH_REQUIRE( multiply( i, 2 ) == i*2 ) with expansion: 40 == 40 +------------------------------------------------------------------------------- +./succeeding/generators/1 +............................................................................... + GeneratorTests.cpp:27: PASSED: CATCH_REQUIRE( multiply( j, 2 ) == j*2 ) with expansion: 202 == 202 +------------------------------------------------------------------------------- +./succeeding/generators/1 +............................................................................... + GeneratorTests.cpp:26: PASSED: CATCH_REQUIRE( multiply( i, 2 ) == i*2 ) with expansion: 42 == 42 +------------------------------------------------------------------------------- +./succeeding/generators/1 +............................................................................... + GeneratorTests.cpp:27: PASSED: CATCH_REQUIRE( multiply( j, 2 ) == j*2 ) with expansion: 202 == 202 +------------------------------------------------------------------------------- +./succeeding/generators/1 +............................................................................... + GeneratorTests.cpp:26: PASSED: CATCH_REQUIRE( multiply( i, 2 ) == i*2 ) with expansion: 72 == 72 +------------------------------------------------------------------------------- +./succeeding/generators/1 +............................................................................... + GeneratorTests.cpp:27: PASSED: CATCH_REQUIRE( multiply( j, 2 ) == j*2 ) with expansion: 202 == 202 +------------------------------------------------------------------------------- +./succeeding/generators/1 +............................................................................... + GeneratorTests.cpp:26: PASSED: CATCH_REQUIRE( multiply( i, 2 ) == i*2 ) with expansion: 2 == 2 +------------------------------------------------------------------------------- +./succeeding/generators/1 +............................................................................... + GeneratorTests.cpp:27: PASSED: CATCH_REQUIRE( multiply( j, 2 ) == j*2 ) with expansion: 204 == 204 +------------------------------------------------------------------------------- +./succeeding/generators/1 +............................................................................... + GeneratorTests.cpp:26: PASSED: CATCH_REQUIRE( multiply( i, 2 ) == i*2 ) with expansion: 4 == 4 +------------------------------------------------------------------------------- +./succeeding/generators/1 +............................................................................... + GeneratorTests.cpp:27: PASSED: CATCH_REQUIRE( multiply( j, 2 ) == j*2 ) with expansion: 204 == 204 +------------------------------------------------------------------------------- +./succeeding/generators/1 +............................................................................... + GeneratorTests.cpp:26: PASSED: CATCH_REQUIRE( multiply( i, 2 ) == i*2 ) with expansion: 6 == 6 +------------------------------------------------------------------------------- +./succeeding/generators/1 +............................................................................... + GeneratorTests.cpp:27: PASSED: CATCH_REQUIRE( multiply( j, 2 ) == j*2 ) with expansion: 204 == 204 +------------------------------------------------------------------------------- +./succeeding/generators/1 +............................................................................... + GeneratorTests.cpp:26: PASSED: CATCH_REQUIRE( multiply( i, 2 ) == i*2 ) with expansion: 8 == 8 +------------------------------------------------------------------------------- +./succeeding/generators/1 +............................................................................... + GeneratorTests.cpp:27: PASSED: CATCH_REQUIRE( multiply( j, 2 ) == j*2 ) with expansion: 204 == 204 +------------------------------------------------------------------------------- +./succeeding/generators/1 +............................................................................... + GeneratorTests.cpp:26: PASSED: CATCH_REQUIRE( multiply( i, 2 ) == i*2 ) with expansion: 10 == 10 +------------------------------------------------------------------------------- +./succeeding/generators/1 +............................................................................... + GeneratorTests.cpp:27: PASSED: CATCH_REQUIRE( multiply( j, 2 ) == j*2 ) with expansion: 204 == 204 +------------------------------------------------------------------------------- +./succeeding/generators/1 +............................................................................... + GeneratorTests.cpp:26: PASSED: CATCH_REQUIRE( multiply( i, 2 ) == i*2 ) with expansion: 30 == 30 +------------------------------------------------------------------------------- +./succeeding/generators/1 +............................................................................... + GeneratorTests.cpp:27: PASSED: CATCH_REQUIRE( multiply( j, 2 ) == j*2 ) with expansion: 204 == 204 +------------------------------------------------------------------------------- +./succeeding/generators/1 +............................................................................... + GeneratorTests.cpp:26: PASSED: CATCH_REQUIRE( multiply( i, 2 ) == i*2 ) with expansion: 40 == 40 +------------------------------------------------------------------------------- +./succeeding/generators/1 +............................................................................... + GeneratorTests.cpp:27: PASSED: CATCH_REQUIRE( multiply( j, 2 ) == j*2 ) with expansion: 204 == 204 +------------------------------------------------------------------------------- +./succeeding/generators/1 +............................................................................... + GeneratorTests.cpp:26: PASSED: CATCH_REQUIRE( multiply( i, 2 ) == i*2 ) with expansion: 42 == 42 +------------------------------------------------------------------------------- +./succeeding/generators/1 +............................................................................... + GeneratorTests.cpp:27: PASSED: CATCH_REQUIRE( multiply( j, 2 ) == j*2 ) with expansion: 204 == 204 +------------------------------------------------------------------------------- +./succeeding/generators/1 +............................................................................... + GeneratorTests.cpp:26: PASSED: CATCH_REQUIRE( multiply( i, 2 ) == i*2 ) with expansion: 72 == 72 +------------------------------------------------------------------------------- +./succeeding/generators/1 +............................................................................... + GeneratorTests.cpp:27: PASSED: CATCH_REQUIRE( multiply( j, 2 ) == j*2 ) with expansion: 204 == 204 +------------------------------------------------------------------------------- +./succeeding/generators/1 +............................................................................... + GeneratorTests.cpp:26: PASSED: CATCH_REQUIRE( multiply( i, 2 ) == i*2 ) with expansion: 2 == 2 +------------------------------------------------------------------------------- +./succeeding/generators/1 +............................................................................... + GeneratorTests.cpp:27: PASSED: CATCH_REQUIRE( multiply( j, 2 ) == j*2 ) with expansion: 206 == 206 +------------------------------------------------------------------------------- +./succeeding/generators/1 +............................................................................... + GeneratorTests.cpp:26: PASSED: CATCH_REQUIRE( multiply( i, 2 ) == i*2 ) with expansion: 4 == 4 +------------------------------------------------------------------------------- +./succeeding/generators/1 +............................................................................... + GeneratorTests.cpp:27: PASSED: CATCH_REQUIRE( multiply( j, 2 ) == j*2 ) with expansion: 206 == 206 +------------------------------------------------------------------------------- +./succeeding/generators/1 +............................................................................... + GeneratorTests.cpp:26: PASSED: CATCH_REQUIRE( multiply( i, 2 ) == i*2 ) with expansion: 6 == 6 +------------------------------------------------------------------------------- +./succeeding/generators/1 +............................................................................... + GeneratorTests.cpp:27: PASSED: CATCH_REQUIRE( multiply( j, 2 ) == j*2 ) with expansion: 206 == 206 +------------------------------------------------------------------------------- +./succeeding/generators/1 +............................................................................... + GeneratorTests.cpp:26: PASSED: CATCH_REQUIRE( multiply( i, 2 ) == i*2 ) with expansion: 8 == 8 +------------------------------------------------------------------------------- +./succeeding/generators/1 +............................................................................... + GeneratorTests.cpp:27: PASSED: CATCH_REQUIRE( multiply( j, 2 ) == j*2 ) with expansion: 206 == 206 +------------------------------------------------------------------------------- +./succeeding/generators/1 +............................................................................... + GeneratorTests.cpp:26: PASSED: CATCH_REQUIRE( multiply( i, 2 ) == i*2 ) with expansion: 10 == 10 +------------------------------------------------------------------------------- +./succeeding/generators/1 +............................................................................... + GeneratorTests.cpp:27: PASSED: CATCH_REQUIRE( multiply( j, 2 ) == j*2 ) with expansion: 206 == 206 +------------------------------------------------------------------------------- +./succeeding/generators/1 +............................................................................... + GeneratorTests.cpp:26: PASSED: CATCH_REQUIRE( multiply( i, 2 ) == i*2 ) with expansion: 30 == 30 +------------------------------------------------------------------------------- +./succeeding/generators/1 +............................................................................... + GeneratorTests.cpp:27: PASSED: CATCH_REQUIRE( multiply( j, 2 ) == j*2 ) with expansion: 206 == 206 +------------------------------------------------------------------------------- +./succeeding/generators/1 +............................................................................... + GeneratorTests.cpp:26: PASSED: CATCH_REQUIRE( multiply( i, 2 ) == i*2 ) with expansion: 40 == 40 +------------------------------------------------------------------------------- +./succeeding/generators/1 +............................................................................... + GeneratorTests.cpp:27: PASSED: CATCH_REQUIRE( multiply( j, 2 ) == j*2 ) with expansion: 206 == 206 +------------------------------------------------------------------------------- +./succeeding/generators/1 +............................................................................... + GeneratorTests.cpp:26: PASSED: CATCH_REQUIRE( multiply( i, 2 ) == i*2 ) with expansion: 42 == 42 +------------------------------------------------------------------------------- +./succeeding/generators/1 +............................................................................... + GeneratorTests.cpp:27: PASSED: CATCH_REQUIRE( multiply( j, 2 ) == j*2 ) with expansion: 206 == 206 +------------------------------------------------------------------------------- +./succeeding/generators/1 +............................................................................... + GeneratorTests.cpp:26: PASSED: CATCH_REQUIRE( multiply( i, 2 ) == i*2 ) with expansion: 72 == 72 +------------------------------------------------------------------------------- +./succeeding/generators/1 +............................................................................... + GeneratorTests.cpp:27: PASSED: CATCH_REQUIRE( multiply( j, 2 ) == j*2 ) with expansion: 206 == 206 +------------------------------------------------------------------------------- +./succeeding/generators/1 +............................................................................... + GeneratorTests.cpp:26: PASSED: CATCH_REQUIRE( multiply( i, 2 ) == i*2 ) with expansion: 2 == 2 +------------------------------------------------------------------------------- +./succeeding/generators/1 +............................................................................... + GeneratorTests.cpp:27: PASSED: CATCH_REQUIRE( multiply( j, 2 ) == j*2 ) with expansion: 208 == 208 +------------------------------------------------------------------------------- +./succeeding/generators/1 +............................................................................... + GeneratorTests.cpp:26: PASSED: CATCH_REQUIRE( multiply( i, 2 ) == i*2 ) with expansion: 4 == 4 +------------------------------------------------------------------------------- +./succeeding/generators/1 +............................................................................... + GeneratorTests.cpp:27: PASSED: CATCH_REQUIRE( multiply( j, 2 ) == j*2 ) with expansion: 208 == 208 +------------------------------------------------------------------------------- +./succeeding/generators/1 +............................................................................... + GeneratorTests.cpp:26: PASSED: CATCH_REQUIRE( multiply( i, 2 ) == i*2 ) with expansion: 6 == 6 +------------------------------------------------------------------------------- +./succeeding/generators/1 +............................................................................... + GeneratorTests.cpp:27: PASSED: CATCH_REQUIRE( multiply( j, 2 ) == j*2 ) with expansion: 208 == 208 +------------------------------------------------------------------------------- +./succeeding/generators/1 +............................................................................... + GeneratorTests.cpp:26: PASSED: CATCH_REQUIRE( multiply( i, 2 ) == i*2 ) with expansion: 8 == 8 +------------------------------------------------------------------------------- +./succeeding/generators/1 +............................................................................... + GeneratorTests.cpp:27: PASSED: CATCH_REQUIRE( multiply( j, 2 ) == j*2 ) with expansion: 208 == 208 +------------------------------------------------------------------------------- +./succeeding/generators/1 +............................................................................... + GeneratorTests.cpp:26: PASSED: CATCH_REQUIRE( multiply( i, 2 ) == i*2 ) with expansion: 10 == 10 +------------------------------------------------------------------------------- +./succeeding/generators/1 +............................................................................... + GeneratorTests.cpp:27: PASSED: CATCH_REQUIRE( multiply( j, 2 ) == j*2 ) with expansion: 208 == 208 +------------------------------------------------------------------------------- +./succeeding/generators/1 +............................................................................... + GeneratorTests.cpp:26: PASSED: CATCH_REQUIRE( multiply( i, 2 ) == i*2 ) with expansion: 30 == 30 +------------------------------------------------------------------------------- +./succeeding/generators/1 +............................................................................... + GeneratorTests.cpp:27: PASSED: CATCH_REQUIRE( multiply( j, 2 ) == j*2 ) with expansion: 208 == 208 +------------------------------------------------------------------------------- +./succeeding/generators/1 +............................................................................... + GeneratorTests.cpp:26: PASSED: CATCH_REQUIRE( multiply( i, 2 ) == i*2 ) with expansion: 40 == 40 +------------------------------------------------------------------------------- +./succeeding/generators/1 +............................................................................... + GeneratorTests.cpp:27: PASSED: CATCH_REQUIRE( multiply( j, 2 ) == j*2 ) with expansion: 208 == 208 +------------------------------------------------------------------------------- +./succeeding/generators/1 +............................................................................... + GeneratorTests.cpp:26: PASSED: CATCH_REQUIRE( multiply( i, 2 ) == i*2 ) with expansion: 42 == 42 +------------------------------------------------------------------------------- +./succeeding/generators/1 +............................................................................... + GeneratorTests.cpp:27: PASSED: CATCH_REQUIRE( multiply( j, 2 ) == j*2 ) with expansion: 208 == 208 +------------------------------------------------------------------------------- +./succeeding/generators/1 +............................................................................... + GeneratorTests.cpp:26: PASSED: CATCH_REQUIRE( multiply( i, 2 ) == i*2 ) with expansion: 72 == 72 +------------------------------------------------------------------------------- +./succeeding/generators/1 +............................................................................... + GeneratorTests.cpp:27: PASSED: CATCH_REQUIRE( multiply( j, 2 ) == j*2 ) with expansion: 208 == 208 +------------------------------------------------------------------------------- +./succeeding/generators/1 +............................................................................... + GeneratorTests.cpp:26: PASSED: CATCH_REQUIRE( multiply( i, 2 ) == i*2 ) with expansion: 2 == 2 +------------------------------------------------------------------------------- +./succeeding/generators/1 +............................................................................... + GeneratorTests.cpp:27: PASSED: CATCH_REQUIRE( multiply( j, 2 ) == j*2 ) with expansion: 210 == 210 +------------------------------------------------------------------------------- +./succeeding/generators/1 +............................................................................... + GeneratorTests.cpp:26: PASSED: CATCH_REQUIRE( multiply( i, 2 ) == i*2 ) with expansion: 4 == 4 +------------------------------------------------------------------------------- +./succeeding/generators/1 +............................................................................... + GeneratorTests.cpp:27: PASSED: CATCH_REQUIRE( multiply( j, 2 ) == j*2 ) with expansion: 210 == 210 +------------------------------------------------------------------------------- +./succeeding/generators/1 +............................................................................... + GeneratorTests.cpp:26: PASSED: CATCH_REQUIRE( multiply( i, 2 ) == i*2 ) with expansion: 6 == 6 +------------------------------------------------------------------------------- +./succeeding/generators/1 +............................................................................... + GeneratorTests.cpp:27: PASSED: CATCH_REQUIRE( multiply( j, 2 ) == j*2 ) with expansion: 210 == 210 +------------------------------------------------------------------------------- +./succeeding/generators/1 +............................................................................... + GeneratorTests.cpp:26: PASSED: CATCH_REQUIRE( multiply( i, 2 ) == i*2 ) with expansion: 8 == 8 +------------------------------------------------------------------------------- +./succeeding/generators/1 +............................................................................... + GeneratorTests.cpp:27: PASSED: CATCH_REQUIRE( multiply( j, 2 ) == j*2 ) with expansion: 210 == 210 +------------------------------------------------------------------------------- +./succeeding/generators/1 +............................................................................... + GeneratorTests.cpp:26: PASSED: CATCH_REQUIRE( multiply( i, 2 ) == i*2 ) with expansion: 10 == 10 +------------------------------------------------------------------------------- +./succeeding/generators/1 +............................................................................... + GeneratorTests.cpp:27: PASSED: CATCH_REQUIRE( multiply( j, 2 ) == j*2 ) with expansion: 210 == 210 +------------------------------------------------------------------------------- +./succeeding/generators/1 +............................................................................... + GeneratorTests.cpp:26: PASSED: CATCH_REQUIRE( multiply( i, 2 ) == i*2 ) with expansion: 30 == 30 +------------------------------------------------------------------------------- +./succeeding/generators/1 +............................................................................... + GeneratorTests.cpp:27: PASSED: CATCH_REQUIRE( multiply( j, 2 ) == j*2 ) with expansion: 210 == 210 +------------------------------------------------------------------------------- +./succeeding/generators/1 +............................................................................... + GeneratorTests.cpp:26: PASSED: CATCH_REQUIRE( multiply( i, 2 ) == i*2 ) with expansion: 40 == 40 +------------------------------------------------------------------------------- +./succeeding/generators/1 +............................................................................... + GeneratorTests.cpp:27: PASSED: CATCH_REQUIRE( multiply( j, 2 ) == j*2 ) with expansion: 210 == 210 +------------------------------------------------------------------------------- +./succeeding/generators/1 +............................................................................... + GeneratorTests.cpp:26: PASSED: CATCH_REQUIRE( multiply( i, 2 ) == i*2 ) with expansion: 42 == 42 +------------------------------------------------------------------------------- +./succeeding/generators/1 +............................................................................... + GeneratorTests.cpp:27: PASSED: CATCH_REQUIRE( multiply( j, 2 ) == j*2 ) with expansion: 210 == 210 +------------------------------------------------------------------------------- +./succeeding/generators/1 +............................................................................... + GeneratorTests.cpp:26: PASSED: CATCH_REQUIRE( multiply( i, 2 ) == i*2 ) with expansion: 72 == 72 +------------------------------------------------------------------------------- +./succeeding/generators/1 +............................................................................... + GeneratorTests.cpp:27: PASSED: CATCH_REQUIRE( multiply( j, 2 ) == j*2 ) with expansion: 210 == 210 +------------------------------------------------------------------------------- +./succeeding/generators/1 +............................................................................... + GeneratorTests.cpp:26: PASSED: CATCH_REQUIRE( multiply( i, 2 ) == i*2 ) with expansion: 2 == 2 +------------------------------------------------------------------------------- +./succeeding/generators/1 +............................................................................... + GeneratorTests.cpp:27: PASSED: CATCH_REQUIRE( multiply( j, 2 ) == j*2 ) with expansion: 212 == 212 +------------------------------------------------------------------------------- +./succeeding/generators/1 +............................................................................... + GeneratorTests.cpp:26: PASSED: CATCH_REQUIRE( multiply( i, 2 ) == i*2 ) with expansion: 4 == 4 +------------------------------------------------------------------------------- +./succeeding/generators/1 +............................................................................... + GeneratorTests.cpp:27: PASSED: CATCH_REQUIRE( multiply( j, 2 ) == j*2 ) with expansion: 212 == 212 +------------------------------------------------------------------------------- +./succeeding/generators/1 +............................................................................... + GeneratorTests.cpp:26: PASSED: CATCH_REQUIRE( multiply( i, 2 ) == i*2 ) with expansion: 6 == 6 +------------------------------------------------------------------------------- +./succeeding/generators/1 +............................................................................... + GeneratorTests.cpp:27: PASSED: CATCH_REQUIRE( multiply( j, 2 ) == j*2 ) with expansion: 212 == 212 +------------------------------------------------------------------------------- +./succeeding/generators/1 +............................................................................... + GeneratorTests.cpp:26: PASSED: CATCH_REQUIRE( multiply( i, 2 ) == i*2 ) with expansion: 8 == 8 +------------------------------------------------------------------------------- +./succeeding/generators/1 +............................................................................... + GeneratorTests.cpp:27: PASSED: CATCH_REQUIRE( multiply( j, 2 ) == j*2 ) with expansion: 212 == 212 +------------------------------------------------------------------------------- +./succeeding/generators/1 +............................................................................... + GeneratorTests.cpp:26: PASSED: CATCH_REQUIRE( multiply( i, 2 ) == i*2 ) with expansion: 10 == 10 +------------------------------------------------------------------------------- +./succeeding/generators/1 +............................................................................... + GeneratorTests.cpp:27: PASSED: CATCH_REQUIRE( multiply( j, 2 ) == j*2 ) with expansion: 212 == 212 +------------------------------------------------------------------------------- +./succeeding/generators/1 +............................................................................... + GeneratorTests.cpp:26: PASSED: CATCH_REQUIRE( multiply( i, 2 ) == i*2 ) with expansion: 30 == 30 +------------------------------------------------------------------------------- +./succeeding/generators/1 +............................................................................... + GeneratorTests.cpp:27: PASSED: CATCH_REQUIRE( multiply( j, 2 ) == j*2 ) with expansion: 212 == 212 +------------------------------------------------------------------------------- +./succeeding/generators/1 +............................................................................... + GeneratorTests.cpp:26: PASSED: CATCH_REQUIRE( multiply( i, 2 ) == i*2 ) with expansion: 40 == 40 +------------------------------------------------------------------------------- +./succeeding/generators/1 +............................................................................... + GeneratorTests.cpp:27: PASSED: CATCH_REQUIRE( multiply( j, 2 ) == j*2 ) with expansion: 212 == 212 +------------------------------------------------------------------------------- +./succeeding/generators/1 +............................................................................... + GeneratorTests.cpp:26: PASSED: CATCH_REQUIRE( multiply( i, 2 ) == i*2 ) with expansion: 42 == 42 +------------------------------------------------------------------------------- +./succeeding/generators/1 +............................................................................... + GeneratorTests.cpp:27: PASSED: CATCH_REQUIRE( multiply( j, 2 ) == j*2 ) with expansion: 212 == 212 +------------------------------------------------------------------------------- +./succeeding/generators/1 +............................................................................... + GeneratorTests.cpp:26: PASSED: CATCH_REQUIRE( multiply( i, 2 ) == i*2 ) with expansion: 72 == 72 +------------------------------------------------------------------------------- +./succeeding/generators/1 +............................................................................... + GeneratorTests.cpp:27: PASSED: CATCH_REQUIRE( multiply( j, 2 ) == j*2 ) with expansion: 212 == 212 +------------------------------------------------------------------------------- +./succeeding/generators/1 +............................................................................... + GeneratorTests.cpp:26: PASSED: CATCH_REQUIRE( multiply( i, 2 ) == i*2 ) with expansion: 2 == 2 +------------------------------------------------------------------------------- +./succeeding/generators/1 +............................................................................... + GeneratorTests.cpp:27: PASSED: CATCH_REQUIRE( multiply( j, 2 ) == j*2 ) with expansion: 214 == 214 +------------------------------------------------------------------------------- +./succeeding/generators/1 +............................................................................... + GeneratorTests.cpp:26: PASSED: CATCH_REQUIRE( multiply( i, 2 ) == i*2 ) with expansion: 4 == 4 +------------------------------------------------------------------------------- +./succeeding/generators/1 +............................................................................... + GeneratorTests.cpp:27: PASSED: CATCH_REQUIRE( multiply( j, 2 ) == j*2 ) with expansion: 214 == 214 +------------------------------------------------------------------------------- +./succeeding/generators/1 +............................................................................... + GeneratorTests.cpp:26: PASSED: CATCH_REQUIRE( multiply( i, 2 ) == i*2 ) with expansion: 6 == 6 +------------------------------------------------------------------------------- +./succeeding/generators/1 +............................................................................... + GeneratorTests.cpp:27: PASSED: CATCH_REQUIRE( multiply( j, 2 ) == j*2 ) with expansion: 214 == 214 +------------------------------------------------------------------------------- +./succeeding/generators/1 +............................................................................... + GeneratorTests.cpp:26: PASSED: CATCH_REQUIRE( multiply( i, 2 ) == i*2 ) with expansion: 8 == 8 +------------------------------------------------------------------------------- +./succeeding/generators/1 +............................................................................... + GeneratorTests.cpp:27: PASSED: CATCH_REQUIRE( multiply( j, 2 ) == j*2 ) with expansion: 214 == 214 +------------------------------------------------------------------------------- +./succeeding/generators/1 +............................................................................... + GeneratorTests.cpp:26: PASSED: CATCH_REQUIRE( multiply( i, 2 ) == i*2 ) with expansion: 10 == 10 +------------------------------------------------------------------------------- +./succeeding/generators/1 +............................................................................... + GeneratorTests.cpp:27: PASSED: CATCH_REQUIRE( multiply( j, 2 ) == j*2 ) with expansion: 214 == 214 +------------------------------------------------------------------------------- +./succeeding/generators/1 +............................................................................... + GeneratorTests.cpp:26: PASSED: CATCH_REQUIRE( multiply( i, 2 ) == i*2 ) with expansion: 30 == 30 +------------------------------------------------------------------------------- +./succeeding/generators/1 +............................................................................... + GeneratorTests.cpp:27: PASSED: CATCH_REQUIRE( multiply( j, 2 ) == j*2 ) with expansion: 214 == 214 +------------------------------------------------------------------------------- +./succeeding/generators/1 +............................................................................... + GeneratorTests.cpp:26: PASSED: CATCH_REQUIRE( multiply( i, 2 ) == i*2 ) with expansion: 40 == 40 +------------------------------------------------------------------------------- +./succeeding/generators/1 +............................................................................... + GeneratorTests.cpp:27: PASSED: CATCH_REQUIRE( multiply( j, 2 ) == j*2 ) with expansion: 214 == 214 +------------------------------------------------------------------------------- +./succeeding/generators/1 +............................................................................... + GeneratorTests.cpp:26: PASSED: CATCH_REQUIRE( multiply( i, 2 ) == i*2 ) with expansion: 42 == 42 +------------------------------------------------------------------------------- +./succeeding/generators/1 +............................................................................... + GeneratorTests.cpp:27: PASSED: CATCH_REQUIRE( multiply( j, 2 ) == j*2 ) with expansion: 214 == 214 +------------------------------------------------------------------------------- +./succeeding/generators/1 +............................................................................... + GeneratorTests.cpp:26: PASSED: CATCH_REQUIRE( multiply( i, 2 ) == i*2 ) with expansion: 72 == 72 +------------------------------------------------------------------------------- +./succeeding/generators/1 +............................................................................... + GeneratorTests.cpp:27: PASSED: CATCH_REQUIRE( multiply( j, 2 ) == j*2 ) @@ -1960,6 +3072,10 @@ PASSED: with expansion: 0 == 0 +------------------------------------------------------------------------------- +./succeeding/generators/2 +............................................................................... + GeneratorTests.cpp:40: PASSED: CATCH_REQUIRE( i->first == i->second-1 ) @@ -1975,6 +3091,10 @@ warning: this is a message this is a warning +------------------------------------------------------------------------------- +./succeeding/message +............................................................................... + No assertions in test case, './succeeding/message' @@ -2011,6 +3131,10 @@ with expansion: with message: this message should not be logged +------------------------------------------------------------------------------- +./mixed/message/info/2 +............................................................................... + MessageTests.cpp:37: FAILED: CHECK( a == 1 ) with expansion: @@ -2018,6 +3142,10 @@ with expansion: with message: this message should be logged +------------------------------------------------------------------------------- +./mixed/message/info/2 +............................................................................... + MessageTests.cpp:41: FAILED: CHECK( a == 0 ) with expansion: @@ -2025,6 +3153,10 @@ with expansion: with message: and this, but later +------------------------------------------------------------------------------- +./mixed/message/info/2 +............................................................................... + MessageTests.cpp:45: PASSED: CHECK( a == 2 ) @@ -2090,6 +3222,10 @@ with messages: current counter 0 i := 0 +------------------------------------------------------------------------------- +./mixed/message/scoped +............................................................................... + MessageTests.cpp:86: PASSED: REQUIRE( i < 10 ) @@ -2099,6 +3235,10 @@ with messages: current counter 1 i := 1 +------------------------------------------------------------------------------- +./mixed/message/scoped +............................................................................... + MessageTests.cpp:86: PASSED: REQUIRE( i < 10 ) @@ -2108,6 +3248,10 @@ with messages: current counter 2 i := 2 +------------------------------------------------------------------------------- +./mixed/message/scoped +............................................................................... + MessageTests.cpp:86: PASSED: REQUIRE( i < 10 ) @@ -2117,6 +3261,10 @@ with messages: current counter 3 i := 3 +------------------------------------------------------------------------------- +./mixed/message/scoped +............................................................................... + MessageTests.cpp:86: PASSED: REQUIRE( i < 10 ) @@ -2126,6 +3274,10 @@ with messages: current counter 4 i := 4 +------------------------------------------------------------------------------- +./mixed/message/scoped +............................................................................... + MessageTests.cpp:86: PASSED: REQUIRE( i < 10 ) @@ -2135,6 +3287,10 @@ with messages: current counter 5 i := 5 +------------------------------------------------------------------------------- +./mixed/message/scoped +............................................................................... + MessageTests.cpp:86: PASSED: REQUIRE( i < 10 ) @@ -2144,6 +3300,10 @@ with messages: current counter 6 i := 6 +------------------------------------------------------------------------------- +./mixed/message/scoped +............................................................................... + MessageTests.cpp:86: PASSED: REQUIRE( i < 10 ) @@ -2153,6 +3313,10 @@ with messages: current counter 7 i := 7 +------------------------------------------------------------------------------- +./mixed/message/scoped +............................................................................... + MessageTests.cpp:86: PASSED: REQUIRE( i < 10 ) @@ -2162,6 +3326,10 @@ with messages: current counter 8 i := 8 +------------------------------------------------------------------------------- +./mixed/message/scoped +............................................................................... + MessageTests.cpp:86: PASSED: REQUIRE( i < 10 ) @@ -2171,6 +3339,10 @@ with messages: current counter 9 i := 9 +------------------------------------------------------------------------------- +./mixed/message/scoped +............................................................................... + MessageTests.cpp:86: FAILED: REQUIRE( i < 10 ) with expansion: @@ -2187,6 +3359,10 @@ MessageTests.cpp:92: FAILED - but was ok: CHECK_NOFAIL( 1 == 2 ) +------------------------------------------------------------------------------- +./succeeding/nofail +............................................................................... + No assertions in test case, './succeeding/nofail' @@ -2344,6 +3520,10 @@ with expansion: with message: Testing if fib[0] (1) is even +------------------------------------------------------------------------------- +./mixed/Misc/loops +............................................................................... + MiscTests.cpp:115: FAILED: CHECK( ( fib[i] % 2 ) == 0 ) with expansion: @@ -2351,6 +3531,10 @@ with expansion: with message: Testing if fib[1] (1) is even +------------------------------------------------------------------------------- +./mixed/Misc/loops +............................................................................... + MiscTests.cpp:115: PASSED: CHECK( ( fib[i] % 2 ) == 0 ) @@ -2359,6 +3543,10 @@ with expansion: with message: Testing if fib[2] (2) is even +------------------------------------------------------------------------------- +./mixed/Misc/loops +............................................................................... + MiscTests.cpp:115: FAILED: CHECK( ( fib[i] % 2 ) == 0 ) with expansion: @@ -2366,6 +3554,10 @@ with expansion: with message: Testing if fib[3] (3) is even +------------------------------------------------------------------------------- +./mixed/Misc/loops +............................................................................... + MiscTests.cpp:115: FAILED: CHECK( ( fib[i] % 2 ) == 0 ) with expansion: @@ -2373,6 +3565,10 @@ with expansion: with message: Testing if fib[4] (5) is even +------------------------------------------------------------------------------- +./mixed/Misc/loops +............................................................................... + MiscTests.cpp:115: PASSED: CHECK( ( fib[i] % 2 ) == 0 ) @@ -2381,6 +3577,10 @@ with expansion: with message: Testing if fib[5] (8) is even +------------------------------------------------------------------------------- +./mixed/Misc/loops +............................................................................... + MiscTests.cpp:115: FAILED: CHECK( ( fib[i] % 2 ) == 0 ) with expansion: @@ -2388,6 +3588,10 @@ with expansion: with message: Testing if fib[6] (13) is even +------------------------------------------------------------------------------- +./mixed/Misc/loops +............................................................................... + MiscTests.cpp:115: FAILED: CHECK( ( fib[i] % 2 ) == 0 ) with expansion: @@ -2414,6 +3618,10 @@ PASSED: with expansion: "valid string" != {null string} +------------------------------------------------------------------------------- +./succeeding/Misc/null strings +............................................................................... + MiscTests.cpp:134: PASSED: REQUIRE( makeString( true ) == static_cast(__null) ) @@ -2440,6 +3648,10 @@ PASSED: with expansion: true +------------------------------------------------------------------------------- +./succeeding/checkedif +............................................................................... + MiscTests.cpp:155: PASSED: REQUIRE( testCheckedIf( true ) ) @@ -2455,6 +3667,10 @@ MiscTests.cpp:147: FAILED: with expansion: false +------------------------------------------------------------------------------- +./failing/checkedif +............................................................................... + MiscTests.cpp:160: FAILED: REQUIRE( testCheckedIf( false ) ) with expansion: @@ -2470,6 +3686,10 @@ PASSED: with expansion: true +------------------------------------------------------------------------------- +./succeeding/checkedelse +............................................................................... + MiscTests.cpp:173: PASSED: REQUIRE( testCheckedElse( true ) ) @@ -2485,6 +3705,10 @@ MiscTests.cpp:165: FAILED: with expansion: false +------------------------------------------------------------------------------- +./failing/checkedelse +............................................................................... + MiscTests.cpp:178: FAILED: REQUIRE( testCheckedElse( false ) ) with expansion: @@ -2535,18 +3759,30 @@ PASSED: with expansion: "this string contains 'abc' as a substring" contains: "string" +------------------------------------------------------------------------------- +./succeeding/matchers +............................................................................... + MiscTests.cpp:217: PASSED: CHECK_THAT( testStringForMatching() Contains( "abc" ) ) with expansion: "this string contains 'abc' as a substring" contains: "abc" +------------------------------------------------------------------------------- +./succeeding/matchers +............................................................................... + MiscTests.cpp:219: PASSED: CHECK_THAT( testStringForMatching() StartsWith( "this" ) ) with expansion: "this string contains 'abc' as a substring" starts with: "this" +------------------------------------------------------------------------------- +./succeeding/matchers +............................................................................... + MiscTests.cpp:220: PASSED: CHECK_THAT( testStringForMatching() EndsWith( "substring" ) ) @@ -2611,6 +3847,10 @@ with expansion: "this string contains 'abc' as a substring" ( contains: "string" or contains: "not there" ) +------------------------------------------------------------------------------- +./succeeding/matchers/AnyOf +............................................................................... + MiscTests.cpp:253: PASSED: CHECK_THAT( testStringForMatching() AnyOf( Catch::Contains( "not there" ), Catch::Contains( "string" ) ) ) @@ -2639,24 +3879,40 @@ PASSED: with expansion: 1 == 1 +------------------------------------------------------------------------------- +example/factorial +............................................................................... + MiscTests.cpp:270: PASSED: REQUIRE( Factorial(1) == 1 ) with expansion: 1 == 1 +------------------------------------------------------------------------------- +example/factorial +............................................................................... + MiscTests.cpp:271: PASSED: REQUIRE( Factorial(2) == 2 ) with expansion: 2 == 2 +------------------------------------------------------------------------------- +example/factorial +............................................................................... + MiscTests.cpp:272: PASSED: REQUIRE( Factorial(3) == 6 ) with expansion: 6 == 6 +------------------------------------------------------------------------------- +example/factorial +............................................................................... + MiscTests.cpp:273: PASSED: REQUIRE( Factorial(10) == 3628800 ) @@ -2678,6 +3934,10 @@ MiscTests.cpp:282: warning: This one ran +------------------------------------------------------------------------------- +Nice descriptive name +............................................................................... + No assertions in test case, 'Nice descriptive name' @@ -3121,6 +4381,10 @@ PASSED: with expansion: 2 == 2 +------------------------------------------------------------------------------- +meta/Misc/Sections +............................................................................... + TestMain.cpp:58: PASSED: CHECK( totals.assertions.failed == 1 ) @@ -3654,30 +4918,50 @@ PASSED: with expansion: true +------------------------------------------------------------------------------- +selftest/test filter +............................................................................... + TestMain.cpp:292: PASSED: CHECK( matchNone.shouldInclude( fakeTestCase( "any" ) ) == false ) with expansion: false == false +------------------------------------------------------------------------------- +selftest/test filter +............................................................................... + TestMain.cpp:297: PASSED: CHECK( matchHidden.shouldInclude( fakeTestCase( "any" ) ) == false ) with expansion: false == false +------------------------------------------------------------------------------- +selftest/test filter +............................................................................... + TestMain.cpp:298: PASSED: CHECK( matchNonHidden.shouldInclude( fakeTestCase( "any" ) ) ) with expansion: true +------------------------------------------------------------------------------- +selftest/test filter +............................................................................... + TestMain.cpp:300: PASSED: CHECK( matchHidden.shouldInclude( fakeTestCase( "./any" ) ) ) with expansion: true +------------------------------------------------------------------------------- +selftest/test filter +............................................................................... + TestMain.cpp:301: PASSED: CHECK( matchNonHidden.shouldInclude( fakeTestCase( "./any" ) ) == false ) @@ -3694,18 +4978,30 @@ PASSED: with expansion: true +------------------------------------------------------------------------------- +selftest/test filters +............................................................................... + TestMain.cpp:314: PASSED: CHECK( filters.shouldInclude( fakeTestCase( "any" ) ) == false ) with expansion: false == false +------------------------------------------------------------------------------- +selftest/test filters +............................................................................... + TestMain.cpp:315: PASSED: CHECK( filters.shouldInclude( fakeTestCase( "./something" ) ) ) with expansion: true +------------------------------------------------------------------------------- +selftest/test filters +............................................................................... + TestMain.cpp:316: PASSED: CHECK( filters.shouldInclude( fakeTestCase( "./anything" ) ) == false ) @@ -3722,6 +5018,10 @@ PASSED: with expansion: true +------------------------------------------------------------------------------- +selftest/filter/prefix wildcard +............................................................................... + TestMain.cpp:323: PASSED: CHECK( matchBadgers.shouldInclude( fakeTestCase( "little badgers" ) ) == false ) @@ -3738,18 +5038,30 @@ PASSED: with expansion: true +------------------------------------------------------------------------------- +selftest/filter/wildcard at both ends +............................................................................... + TestMain.cpp:329: PASSED: CHECK( matchBadgers.shouldInclude( fakeTestCase( "little badgers" ) ) ) with expansion: true +------------------------------------------------------------------------------- +selftest/filter/wildcard at both ends +............................................................................... + TestMain.cpp:330: PASSED: CHECK( matchBadgers.shouldInclude( fakeTestCase( "badgers are big" ) ) ) with expansion: true +------------------------------------------------------------------------------- +selftest/filter/wildcard at both ends +............................................................................... + TestMain.cpp:331: PASSED: CHECK( matchBadgers.shouldInclude( fakeTestCase( "hedgehogs" ) ) == false ) @@ -3764,18 +5076,30 @@ TestMain.cpp:351: PASSED: CHECK_NOTHROW( opt.parseIntoConfig( parser, config ) ) +------------------------------------------------------------------------------- +selftest/option parsers +............................................................................... + TestMain.cpp:353: PASSED: REQUIRE( config.filters.size() == 1 ) with expansion: 1 == 1 +------------------------------------------------------------------------------- +selftest/option parsers +............................................................................... + TestMain.cpp:354: PASSED: REQUIRE( config.filters[0].shouldInclude( fakeTestCase( "notIncluded" ) ) == false ) with expansion: false == false +------------------------------------------------------------------------------- +selftest/option parsers +............................................................................... + TestMain.cpp:355: PASSED: REQUIRE( config.filters[0].shouldInclude( fakeTestCase( "test1" ) ) ) @@ -4000,6 +5324,10 @@ warning: Uncomment the code in this test to check that it gives a sensible compiler error +------------------------------------------------------------------------------- +./inprogress/failing/Tricky/trailing expression +............................................................................... + No assertions in test case, './inprogress/failing/Tricky/trailing expression' @@ -4012,6 +5340,10 @@ warning: Uncomment the code in this test to check that it gives a sensible compiler error +------------------------------------------------------------------------------- +./inprogress/failing/Tricky/compound lhs +............................................................................... + No assertions in test case, './inprogress/failing/Tricky/compound lhs' @@ -4024,6 +5356,10 @@ TrickyTests.cpp:95: FAILED: with expansion: 0x == 0x +------------------------------------------------------------------------------- +./failing/Tricky/non streamable type +............................................................................... + TrickyTests.cpp:96: FAILED: CHECK( o1 == o2 ) with expansion: @@ -4048,6 +5384,10 @@ PASSED: with expansion: 7 == 7 +------------------------------------------------------------------------------- +./succeeding/side-effects +............................................................................... + TrickyTests.cpp:120: PASSED: REQUIRE( i++ == 8 ) @@ -4177,12 +5517,20 @@ PASSED: with expansion: true +------------------------------------------------------------------------------- +./succeeding/SafeBool +............................................................................... + TrickyTests.cpp:314: PASSED: CHECK( !False ) with expansion: true +------------------------------------------------------------------------------- +./succeeding/SafeBool +............................................................................... + TrickyTests.cpp:315: PASSED: CHECK_FALSE( !False ) @@ -4233,30 +5581,50 @@ PASSED: with expansion: 1.23 == Approx( 1.23 ) +------------------------------------------------------------------------------- +./succeeding/Approx/simple +............................................................................... + ApproxTests.cpp:21: PASSED: REQUIRE( d != Approx( 1.22 ) ) with expansion: 1.23 != Approx( 1.22 ) +------------------------------------------------------------------------------- +./succeeding/Approx/simple +............................................................................... + ApproxTests.cpp:22: PASSED: REQUIRE( d != Approx( 1.24 ) ) with expansion: 1.23 != Approx( 1.24 ) +------------------------------------------------------------------------------- +./succeeding/Approx/simple +............................................................................... + ApproxTests.cpp:24: PASSED: REQUIRE( Approx( d ) == 1.23 ) with expansion: Approx( 1.23 ) == 1.23 +------------------------------------------------------------------------------- +./succeeding/Approx/simple +............................................................................... + ApproxTests.cpp:25: PASSED: REQUIRE( Approx( d ) != 1.22 ) with expansion: Approx( 1.23 ) != 1.22 +------------------------------------------------------------------------------- +./succeeding/Approx/simple +............................................................................... + ApproxTests.cpp:26: PASSED: REQUIRE( Approx( d ) != 1.24 ) @@ -4273,6 +5641,10 @@ PASSED: with expansion: 1.23 != Approx( 1.231 ) +------------------------------------------------------------------------------- +./succeeding/Approx/epsilon +............................................................................... + ApproxTests.cpp:39: PASSED: REQUIRE( d == Approx( 1.231 ).epsilon( 0.1 ) ) @@ -4289,6 +5661,10 @@ PASSED: with expansion: 1.23 == Approx( 1.23 ) +------------------------------------------------------------------------------- +./succeeding/Approx/float +............................................................................... + ApproxTests.cpp:50: PASSED: REQUIRE( 0.0f == Approx( 0.0f ) ) @@ -4303,6 +5679,10 @@ ApproxTests.cpp:60: PASSED: REQUIRE( 1 == Approx( 1 ) ) +------------------------------------------------------------------------------- +./succeeding/Approx/int +............................................................................... + ApproxTests.cpp:61: PASSED: REQUIRE( 0 == Approx( 0 ) ) @@ -4317,24 +5697,40 @@ PASSED: with expansion: 1 == Approx( 1 ) +------------------------------------------------------------------------------- +./succeeding/Approx/mixed +............................................................................... + ApproxTests.cpp:76: PASSED: REQUIRE( 0 == Approx( dZero) ) with expansion: 0 == Approx( 0 ) +------------------------------------------------------------------------------- +./succeeding/Approx/mixed +............................................................................... + ApproxTests.cpp:77: PASSED: REQUIRE( 0 == Approx( dSmall ).epsilon( 0.001 ) ) with expansion: 0 == Approx( 1e-05 ) +------------------------------------------------------------------------------- +./succeeding/Approx/mixed +............................................................................... + ApproxTests.cpp:78: PASSED: REQUIRE( 1.234f == Approx( dMedium ) ) with expansion: 1.234 == Approx( 1.234 ) +------------------------------------------------------------------------------- +./succeeding/Approx/mixed +............................................................................... + ApproxTests.cpp:79: PASSED: REQUIRE( dMedium == Approx( 1.234f ) ) @@ -4351,42 +5747,70 @@ PASSED: with expansion: 1.23 == Approx( 1.23 ) +------------------------------------------------------------------------------- +./succeeding/Approx/custom +............................................................................... + ApproxTests.cpp:94: PASSED: REQUIRE( d == approx( 1.22 ) ) with expansion: 1.23 == Approx( 1.22 ) +------------------------------------------------------------------------------- +./succeeding/Approx/custom +............................................................................... + ApproxTests.cpp:95: PASSED: REQUIRE( d == approx( 1.24 ) ) with expansion: 1.23 == Approx( 1.24 ) +------------------------------------------------------------------------------- +./succeeding/Approx/custom +............................................................................... + ApproxTests.cpp:96: PASSED: REQUIRE( d != approx( 1.25 ) ) with expansion: 1.23 != Approx( 1.25 ) +------------------------------------------------------------------------------- +./succeeding/Approx/custom +............................................................................... + ApproxTests.cpp:98: PASSED: REQUIRE( approx( d ) == 1.23 ) with expansion: Approx( 1.23 ) == 1.23 +------------------------------------------------------------------------------- +./succeeding/Approx/custom +............................................................................... + ApproxTests.cpp:99: PASSED: REQUIRE( approx( d ) == 1.22 ) with expansion: Approx( 1.23 ) == 1.22 +------------------------------------------------------------------------------- +./succeeding/Approx/custom +............................................................................... + ApproxTests.cpp:100: PASSED: REQUIRE( approx( d ) == 1.24 ) with expansion: Approx( 1.23 ) == 1.24 +------------------------------------------------------------------------------- +./succeeding/Approx/custom +............................................................................... + ApproxTests.cpp:101: PASSED: REQUIRE( approx( d ) != 1.25 ) @@ -4403,6 +5827,10 @@ PASSED: with expansion: 3.142857142857143 == Approx( 3.141 ) +------------------------------------------------------------------------------- +Approximate PI +............................................................................... + ApproxTests.cpp:111: PASSED: REQUIRE( divide( 22, 7 ) != Approx( 3.141 ).epsilon( 0.0001 ) ) @@ -4457,36 +5885,60 @@ PASSED: with expansion: 7 == 7 +------------------------------------------------------------------------------- +./succeeding/conditions/equality +............................................................................... + ConditionTests.cpp:56: PASSED: REQUIRE( data.float_nine_point_one == Approx( 9.1f ) ) with expansion: 9.1 == Approx( 9.1 ) +------------------------------------------------------------------------------- +./succeeding/conditions/equality +............................................................................... + ConditionTests.cpp:57: PASSED: REQUIRE( data.double_pi == Approx( 3.1415926535 ) ) with expansion: 3.1415926535 == Approx( 3.14159 ) +------------------------------------------------------------------------------- +./succeeding/conditions/equality +............................................................................... + ConditionTests.cpp:58: PASSED: REQUIRE( data.str_hello == "hello" ) with expansion: "hello" == "hello" +------------------------------------------------------------------------------- +./succeeding/conditions/equality +............................................................................... + ConditionTests.cpp:59: PASSED: REQUIRE( "hello" == data.str_hello ) with expansion: "hello" == "hello" +------------------------------------------------------------------------------- +./succeeding/conditions/equality +............................................................................... + ConditionTests.cpp:60: PASSED: REQUIRE( data.str_hello.size() == 5 ) with expansion: 5 == 5 +------------------------------------------------------------------------------- +./succeeding/conditions/equality +............................................................................... + ConditionTests.cpp:63: PASSED: REQUIRE( x == Approx( 1.3 ) ) @@ -4502,6 +5954,10 @@ ConditionTests.cpp:71: FAILED: with expansion: 7 == 6 +------------------------------------------------------------------------------- +./failing/conditions/equality +............................................................................... + ConditionTests.cpp:72: FAILED: CHECK( data.int_seven == 8 ) with expansion: diff --git a/single_include/catch.hpp b/single_include/catch.hpp index 49f8afc..30e6d66 100644 --- a/single_include/catch.hpp +++ b/single_include/catch.hpp @@ -1,6 +1,6 @@ /* * CATCH v0.9 build 21 (integration branch) - * Generated: 2013-03-04 12:17:59.865403 + * Generated: 2013-03-04 15:05:07.210014 * ---------------------------------------------------------- * This file has been merged from multiple headers. Please don't edit it directly * Copyright (c) 2012 Two Blue Cubes Ltd. All rights reserved. @@ -7219,7 +7219,7 @@ namespace Catch { if( !currentSectionInfo ) { printHeader( unusedTestCaseInfo->name ); stream << std::endl; - unusedTestCaseInfo.reset(); +// unusedTestCaseInfo.reset(); } } void lazyPrintSectionInfo() {