From b588755a9298389989fc376848ef62254980a7c6 Mon Sep 17 00:00:00 2001 From: Phil Nash Date: Thu, 17 Jan 2013 12:07:34 +0000 Subject: [PATCH] Tweaked console reporter some more --- README | 2 +- include/internal/catch_version.hpp | 2 +- include/reporters/catch_reporter_console.hpp | 34 +- .../SelfTest/Baselines/approvedResults.txt | 3181 ++++++++++------- .../CatchSelfTest/CatchSelfTest/BDDTests.cpp | 4 +- single_include/catch.hpp | 79 +- 6 files changed, 1941 insertions(+), 1361 deletions(-) diff --git a/README b/README index 24d5c31f..00d4728b 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -CATCH v0.9 build 13 (integration branch) +CATCH v0.9 build 14 (integration branch) --------------------------------------------- CATCH is an automated test framework for C, C++ and Objective-C. diff --git a/include/internal/catch_version.hpp b/include/internal/catch_version.hpp index 247f5afd..adc262b4 100644 --- a/include/internal/catch_version.hpp +++ b/include/internal/catch_version.hpp @@ -13,7 +13,7 @@ namespace Catch { // These numbers are maintained by a script - Version libraryVersion( 0, 9, 13, "integration" ); + Version libraryVersion( 0, 9, 14, "integration" ); } #endif // TWOBLUECUBES_CATCH_VERSION_HPP_INCLUDED diff --git a/include/reporters/catch_reporter_console.hpp b/include/reporters/catch_reporter_console.hpp index ac7030b9..dbb3b023 100644 --- a/include/reporters/catch_reporter_console.hpp +++ b/include/reporters/catch_reporter_console.hpp @@ -43,23 +43,25 @@ namespace Catch { lazyPrint(); - { - TextColour colour( TextColour::FileName ); - stream << result.getSourceInfo() << ":\n"; - } - ResultComponents components( result ); bool endsWithNewLine = false; if( _assertionStats.totals.assertions.total() > 0 ) { - printOriginalExpression( result ); printResultType( components ); + printOriginalExpression( result ); +// printResultType( components ); endsWithNewLine = printReconstructedExpression( result ); } endsWithNewLine |= printMessage( components ); - if( !endsWithNewLine ) - stream << "\n"; +// if( !endsWithNewLine ) +// stream << "\n"; + + printSourceInfo( result ); stream << std::endl; } + void printSourceInfo( AssertionResult const& _result ) { + TextColour colour( TextColour::FileName ); + stream << _result.getSourceInfo() << "\n"; + } struct ResultComponents { ResultComponents( AssertionResult const& _result ) @@ -69,18 +71,18 @@ namespace Catch { switch( _result.getResultType() ) { case ResultWas::Ok: colour = TextColour::Success; - passOrFail = "passed"; + passOrFail = "PASSED"; if( _result.hasMessage() ) messageLabel = "with message"; break; case ResultWas::ExpressionFailed: if( _result.isOk() ) { colour = TextColour::Success; - passOrFail = "failed - but was ok"; + passOrFail = "FAILED - but was ok"; } else { colour = TextColour::Error; - passOrFail = "failed"; + passOrFail = "FAILED"; } if( _result.hasMessage() ){ messageLabel = "with message"; @@ -88,12 +90,12 @@ namespace Catch { break; case ResultWas::ThrewException: colour = TextColour::Error; - passOrFail = "failed"; + passOrFail = "FAILED"; messageLabel = "due to unexpected exception with message"; break; case ResultWas::DidntThrowException: colour = TextColour::Error; - passOrFail = "failed"; + passOrFail = "FAILED"; messageLabel = "because no exception was thrown where one was expected"; break; case ResultWas::Info: @@ -103,12 +105,12 @@ namespace Catch { messageLabel = "warning"; break; case ResultWas::ExplicitFailure: - passOrFail = "failed"; + passOrFail = "FAILED"; colour = TextColour::Error; messageLabel = "explicitly with message"; break; case ResultWas::Exception: - passOrFail = "failed"; + passOrFail = "FAILED"; colour = TextColour::Error; if( _result.hasMessage() ) messageLabel = "with message"; @@ -132,7 +134,7 @@ namespace Catch { void printResultType( ResultComponents const& _components ) { if( !_components.passOrFail.empty() ) { TextColour colour( _components.colour ); - stream << _components.passOrFail << " "; + stream << _components.passOrFail << ":\n"; } } bool printOriginalExpression( AssertionResult const& _result ) { diff --git a/projects/SelfTest/Baselines/approvedResults.txt b/projects/SelfTest/Baselines/approvedResults.txt index 02b36ade..ecd718ea 100644 --- a/projects/SelfTest/Baselines/approvedResults.txt +++ b/projects/SelfTest/Baselines/approvedResults.txt @@ -6,909 +6,1059 @@ Run with -? for options ./succeeding/Approx/simple ----------------------------------------------------------------- -ApproxTests.cpp:20: +PASSED: REQUIRE( d == Approx( 1.23 ) ) -passed with expansion: +with expansion: 1.23 == Approx( 1.23 ) +ApproxTests.cpp:20 -ApproxTests.cpp:21: +PASSED: REQUIRE( d != Approx( 1.22 ) ) -passed with expansion: +with expansion: 1.23 != Approx( 1.22 ) +ApproxTests.cpp:21 -ApproxTests.cpp:22: +PASSED: REQUIRE( d != Approx( 1.24 ) ) -passed with expansion: +with expansion: 1.23 != Approx( 1.24 ) +ApproxTests.cpp:22 -ApproxTests.cpp:24: +PASSED: REQUIRE( Approx( d ) == 1.23 ) -passed with expansion: +with expansion: Approx( 1.23 ) == 1.23 +ApproxTests.cpp:24 -ApproxTests.cpp:25: +PASSED: REQUIRE( Approx( d ) != 1.22 ) -passed with expansion: +with expansion: Approx( 1.23 ) != 1.22 +ApproxTests.cpp:25 -ApproxTests.cpp:26: +PASSED: REQUIRE( Approx( d ) != 1.24 ) -passed with expansion: +with expansion: Approx( 1.23 ) != 1.24 +ApproxTests.cpp:26 ----------------------------------------------------------------- ./succeeding/Approx/epsilon ----------------------------------------------------------------- -ApproxTests.cpp:38: +PASSED: REQUIRE( d != Approx( 1.231 ) ) -passed with expansion: +with expansion: 1.23 != Approx( 1.231 ) +ApproxTests.cpp:38 -ApproxTests.cpp:39: +PASSED: REQUIRE( d == Approx( 1.231 ).epsilon( 0.1 ) ) -passed with expansion: +with expansion: 1.23 == Approx( 1.231 ) +ApproxTests.cpp:39 ----------------------------------------------------------------- ./succeeding/Approx/float ----------------------------------------------------------------- -ApproxTests.cpp:49: +PASSED: REQUIRE( 1.23f == Approx( 1.23f ) ) -passed with expansion: +with expansion: 1.23 == Approx( 1.23 ) +ApproxTests.cpp:49 -ApproxTests.cpp:50: +PASSED: REQUIRE( 0.0f == Approx( 0.0f ) ) -passed with expansion: +with expansion: 0 == Approx( 0 ) +ApproxTests.cpp:50 ----------------------------------------------------------------- ./succeeding/Approx/int ----------------------------------------------------------------- -ApproxTests.cpp:60: +PASSED: REQUIRE( 1 == Approx( 1 ) ) -passed +ApproxTests.cpp:60 -ApproxTests.cpp:61: +PASSED: REQUIRE( 0 == Approx( 0 ) ) -passed +ApproxTests.cpp:61 ----------------------------------------------------------------- ./succeeding/Approx/mixed ----------------------------------------------------------------- -ApproxTests.cpp:75: +PASSED: REQUIRE( 1.0f == Approx( 1 ) ) -passed with expansion: +with expansion: 1 == Approx( 1 ) +ApproxTests.cpp:75 -ApproxTests.cpp:76: +PASSED: REQUIRE( 0 == Approx( dZero) ) -passed with expansion: +with expansion: 0 == Approx( 0 ) +ApproxTests.cpp:76 -ApproxTests.cpp:77: +PASSED: REQUIRE( 0 == Approx( dSmall ).epsilon( 0.001 ) ) -passed with expansion: +with expansion: 0 == Approx( 1e-05 ) +ApproxTests.cpp:77 -ApproxTests.cpp:78: +PASSED: REQUIRE( 1.234f == Approx( dMedium ) ) -passed with expansion: +with expansion: 1.234 == Approx( 1.234 ) +ApproxTests.cpp:78 -ApproxTests.cpp:79: +PASSED: REQUIRE( dMedium == Approx( 1.234f ) ) -passed with expansion: +with expansion: 1.234 == Approx( 1.234 ) +ApproxTests.cpp:79 ----------------------------------------------------------------- ./succeeding/Approx/custom ----------------------------------------------------------------- -ApproxTests.cpp:93: +PASSED: REQUIRE( d == approx( 1.23 ) ) -passed with expansion: +with expansion: 1.23 == Approx( 1.23 ) +ApproxTests.cpp:93 -ApproxTests.cpp:94: +PASSED: REQUIRE( d == approx( 1.22 ) ) -passed with expansion: +with expansion: 1.23 == Approx( 1.22 ) +ApproxTests.cpp:94 -ApproxTests.cpp:95: +PASSED: REQUIRE( d == approx( 1.24 ) ) -passed with expansion: +with expansion: 1.23 == Approx( 1.24 ) +ApproxTests.cpp:95 -ApproxTests.cpp:96: +PASSED: REQUIRE( d != approx( 1.25 ) ) -passed with expansion: +with expansion: 1.23 != Approx( 1.25 ) +ApproxTests.cpp:96 -ApproxTests.cpp:98: +PASSED: REQUIRE( approx( d ) == 1.23 ) -passed with expansion: +with expansion: Approx( 1.23 ) == 1.23 +ApproxTests.cpp:98 -ApproxTests.cpp:99: +PASSED: REQUIRE( approx( d ) == 1.22 ) -passed with expansion: +with expansion: Approx( 1.23 ) == 1.22 +ApproxTests.cpp:99 -ApproxTests.cpp:100: +PASSED: REQUIRE( approx( d ) == 1.24 ) -passed with expansion: +with expansion: Approx( 1.23 ) == 1.24 +ApproxTests.cpp:100 -ApproxTests.cpp:101: +PASSED: REQUIRE( approx( d ) != 1.25 ) -passed with expansion: +with expansion: Approx( 1.23 ) != 1.25 +ApproxTests.cpp:101 ----------------------------------------------------------------- ./succeeding/TestClass/succeedingCase ----------------------------------------------------------------- -ClassTests.cpp:24: +PASSED: REQUIRE( s == "hello" ) -passed with expansion: +with expansion: "hello" == "hello" +ClassTests.cpp:24 ----------------------------------------------------------------- ./failing/TestClass/failingCase ----------------------------------------------------------------- -ClassTests.cpp:28: +FAILED: REQUIRE( s == "world" ) -failed with expansion: +with expansion: "hello" == "world" +ClassTests.cpp:28 ----------------------------------------------------------------- ./succeeding/Fixture/succeedingCase ----------------------------------------------------------------- -ClassTests.cpp:47: +PASSED: REQUIRE( m_a == 1 ) -passed with expansion: +with expansion: 1 == 1 +ClassTests.cpp:47 ----------------------------------------------------------------- ./failing/Fixture/failingCase ----------------------------------------------------------------- -ClassTests.cpp:55: +FAILED: REQUIRE( m_a == 2 ) -failed with expansion: +with expansion: 1 == 2 +ClassTests.cpp:55 ----------------------------------------------------------------- ./succeeding/conditions/equality ----------------------------------------------------------------- -ConditionTests.cpp:55: +PASSED: REQUIRE( data.int_seven == 7 ) -passed with expansion: +with expansion: 7 == 7 +ConditionTests.cpp:55 -ConditionTests.cpp:56: +PASSED: REQUIRE( data.float_nine_point_one == Approx( 9.1f ) ) -passed with expansion: +with expansion: 9.1 == Approx( 9.1 ) +ConditionTests.cpp:56 -ConditionTests.cpp:57: +PASSED: REQUIRE( data.double_pi == Approx( 3.1415926535 ) ) -passed with expansion: +with expansion: 3.14159 == Approx( 3.14159 ) +ConditionTests.cpp:57 -ConditionTests.cpp:58: +PASSED: REQUIRE( data.str_hello == "hello" ) -passed with expansion: +with expansion: "hello" == "hello" +ConditionTests.cpp:58 -ConditionTests.cpp:59: +PASSED: REQUIRE( "hello" == data.str_hello ) -passed with expansion: +with expansion: "hello" == "hello" +ConditionTests.cpp:59 -ConditionTests.cpp:60: +PASSED: REQUIRE( data.str_hello.size() == 5 ) -passed with expansion: +with expansion: 5 == 5 +ConditionTests.cpp:60 -ConditionTests.cpp:63: +PASSED: REQUIRE( x == Approx( 1.3 ) ) -passed with expansion: +with expansion: 1.3 == Approx( 1.3 ) +ConditionTests.cpp:63 ----------------------------------------------------------------- ./failing/conditions/equality ----------------------------------------------------------------- -ConditionTests.cpp:71: +FAILED: CHECK( data.int_seven == 6 ) -failed with expansion: +with expansion: 7 == 6 +ConditionTests.cpp:71 -ConditionTests.cpp:72: +FAILED: CHECK( data.int_seven == 8 ) -failed with expansion: +with expansion: 7 == 8 +ConditionTests.cpp:72 -ConditionTests.cpp:73: +FAILED: CHECK( data.int_seven == 0 ) -failed with expansion: +with expansion: 7 == 0 +ConditionTests.cpp:73 -ConditionTests.cpp:74: +FAILED: CHECK( data.float_nine_point_one == Approx( 9.11f ) ) -failed with expansion: +with expansion: 9.1 == Approx( 9.11 ) +ConditionTests.cpp:74 -ConditionTests.cpp:75: +FAILED: CHECK( data.float_nine_point_one == Approx( 9.0f ) ) -failed with expansion: +with expansion: 9.1 == Approx( 9 ) +ConditionTests.cpp:75 -ConditionTests.cpp:76: +FAILED: CHECK( data.float_nine_point_one == Approx( 1 ) ) -failed with expansion: +with expansion: 9.1 == Approx( 1 ) +ConditionTests.cpp:76 -ConditionTests.cpp:77: +FAILED: CHECK( data.float_nine_point_one == Approx( 0 ) ) -failed with expansion: +with expansion: 9.1 == Approx( 0 ) +ConditionTests.cpp:77 -ConditionTests.cpp:78: +FAILED: CHECK( data.double_pi == Approx( 3.1415 ) ) -failed with expansion: +with expansion: 3.14159 == Approx( 3.1415 ) +ConditionTests.cpp:78 -ConditionTests.cpp:79: +FAILED: CHECK( data.str_hello == "goodbye" ) -failed with expansion: +with expansion: "hello" == "goodbye" +ConditionTests.cpp:79 -ConditionTests.cpp:80: +FAILED: CHECK( data.str_hello == "hell" ) -failed with expansion: +with expansion: "hello" == "hell" +ConditionTests.cpp:80 -ConditionTests.cpp:81: +FAILED: CHECK( data.str_hello == "hello1" ) -failed with expansion: +with expansion: "hello" == "hello1" +ConditionTests.cpp:81 -ConditionTests.cpp:82: +FAILED: CHECK( data.str_hello.size() == 6 ) -failed with expansion: +with expansion: 5 == 6 +ConditionTests.cpp:82 -ConditionTests.cpp:85: +FAILED: CHECK( x == Approx( 1.301 ) ) -failed with expansion: +with expansion: 1.3 == Approx( 1.301 ) +ConditionTests.cpp:85 ----------------------------------------------------------------- ./succeeding/conditions/inequality ----------------------------------------------------------------- -ConditionTests.cpp:93: +PASSED: REQUIRE( data.int_seven != 6 ) -passed with expansion: +with expansion: 7 != 6 +ConditionTests.cpp:93 -ConditionTests.cpp:94: +PASSED: REQUIRE( data.int_seven != 8 ) -passed with expansion: +with expansion: 7 != 8 +ConditionTests.cpp:94 -ConditionTests.cpp:95: +PASSED: REQUIRE( data.float_nine_point_one != Approx( 9.11f ) ) -passed with expansion: +with expansion: 9.1 != Approx( 9.11 ) +ConditionTests.cpp:95 -ConditionTests.cpp:96: +PASSED: REQUIRE( data.float_nine_point_one != Approx( 9.0f ) ) -passed with expansion: +with expansion: 9.1 != Approx( 9 ) +ConditionTests.cpp:96 -ConditionTests.cpp:97: +PASSED: REQUIRE( data.float_nine_point_one != Approx( 1 ) ) -passed with expansion: +with expansion: 9.1 != Approx( 1 ) +ConditionTests.cpp:97 -ConditionTests.cpp:98: +PASSED: REQUIRE( data.float_nine_point_one != Approx( 0 ) ) -passed with expansion: +with expansion: 9.1 != Approx( 0 ) +ConditionTests.cpp:98 -ConditionTests.cpp:99: +PASSED: REQUIRE( data.double_pi != Approx( 3.1415 ) ) -passed with expansion: +with expansion: 3.14159 != Approx( 3.1415 ) +ConditionTests.cpp:99 -ConditionTests.cpp:100: +PASSED: REQUIRE( data.str_hello != "goodbye" ) -passed with expansion: +with expansion: "hello" != "goodbye" +ConditionTests.cpp:100 -ConditionTests.cpp:101: +PASSED: REQUIRE( data.str_hello != "hell" ) -passed with expansion: +with expansion: "hello" != "hell" +ConditionTests.cpp:101 -ConditionTests.cpp:102: +PASSED: REQUIRE( data.str_hello != "hello1" ) -passed with expansion: +with expansion: "hello" != "hello1" +ConditionTests.cpp:102 -ConditionTests.cpp:103: +PASSED: REQUIRE( data.str_hello.size() != 6 ) -passed with expansion: +with expansion: 5 != 6 +ConditionTests.cpp:103 ----------------------------------------------------------------- ./failing/conditions/inequality ----------------------------------------------------------------- -ConditionTests.cpp:111: +FAILED: CHECK( data.int_seven != 7 ) -failed with expansion: +with expansion: 7 != 7 +ConditionTests.cpp:111 -ConditionTests.cpp:112: +FAILED: CHECK( data.float_nine_point_one != Approx( 9.1f ) ) -failed with expansion: +with expansion: 9.1 != Approx( 9.1 ) +ConditionTests.cpp:112 -ConditionTests.cpp:113: +FAILED: CHECK( data.double_pi != Approx( 3.1415926535 ) ) -failed with expansion: +with expansion: 3.14159 != Approx( 3.14159 ) +ConditionTests.cpp:113 -ConditionTests.cpp:114: +FAILED: CHECK( data.str_hello != "hello" ) -failed with expansion: +with expansion: "hello" != "hello" +ConditionTests.cpp:114 -ConditionTests.cpp:115: +FAILED: CHECK( data.str_hello.size() != 5 ) -failed with expansion: +with expansion: 5 != 5 +ConditionTests.cpp:115 ----------------------------------------------------------------- ./succeeding/conditions/ordered ----------------------------------------------------------------- -ConditionTests.cpp:124: +PASSED: REQUIRE( data.int_seven < 8 ) -passed with expansion: +with expansion: 7 < 8 +ConditionTests.cpp:124 -ConditionTests.cpp:125: +PASSED: REQUIRE( data.int_seven > 6 ) -passed with expansion: +with expansion: 7 > 6 +ConditionTests.cpp:125 -ConditionTests.cpp:126: +PASSED: REQUIRE( data.int_seven > 0 ) -passed with expansion: +with expansion: 7 > 0 +ConditionTests.cpp:126 -ConditionTests.cpp:127: +PASSED: REQUIRE( data.int_seven > -1 ) -passed with expansion: +with expansion: 7 > -1 +ConditionTests.cpp:127 -ConditionTests.cpp:129: +PASSED: REQUIRE( data.int_seven >= 7 ) -passed with expansion: +with expansion: 7 >= 7 +ConditionTests.cpp:129 -ConditionTests.cpp:130: +PASSED: REQUIRE( data.int_seven >= 6 ) -passed with expansion: +with expansion: 7 >= 6 +ConditionTests.cpp:130 -ConditionTests.cpp:131: +PASSED: REQUIRE( data.int_seven <= 7 ) -passed with expansion: +with expansion: 7 <= 7 +ConditionTests.cpp:131 -ConditionTests.cpp:132: +PASSED: REQUIRE( data.int_seven <= 8 ) -passed with expansion: +with expansion: 7 <= 8 +ConditionTests.cpp:132 -ConditionTests.cpp:134: +PASSED: REQUIRE( data.float_nine_point_one > 9 ) -passed with expansion: +with expansion: 9.1 > 9 +ConditionTests.cpp:134 -ConditionTests.cpp:135: +PASSED: REQUIRE( data.float_nine_point_one < 10 ) -passed with expansion: +with expansion: 9.1 < 10 +ConditionTests.cpp:135 -ConditionTests.cpp:136: +PASSED: REQUIRE( data.float_nine_point_one < 9.2 ) -passed with expansion: +with expansion: 9.1 < 9.2 +ConditionTests.cpp:136 -ConditionTests.cpp:138: +PASSED: REQUIRE( data.str_hello <= "hello" ) -passed with expansion: +with expansion: "hello" <= "hello" +ConditionTests.cpp:138 -ConditionTests.cpp:139: +PASSED: REQUIRE( data.str_hello >= "hello" ) -passed with expansion: +with expansion: "hello" >= "hello" +ConditionTests.cpp:139 -ConditionTests.cpp:141: +PASSED: REQUIRE( data.str_hello < "hellp" ) -passed with expansion: +with expansion: "hello" < "hellp" +ConditionTests.cpp:141 -ConditionTests.cpp:142: +PASSED: REQUIRE( data.str_hello < "zebra" ) -passed with expansion: +with expansion: "hello" < "zebra" +ConditionTests.cpp:142 -ConditionTests.cpp:143: +PASSED: REQUIRE( data.str_hello > "hellm" ) -passed with expansion: +with expansion: "hello" > "hellm" +ConditionTests.cpp:143 -ConditionTests.cpp:144: +PASSED: REQUIRE( data.str_hello > "a" ) -passed with expansion: +with expansion: "hello" > "a" +ConditionTests.cpp:144 ----------------------------------------------------------------- ./failing/conditions/ordered ----------------------------------------------------------------- -ConditionTests.cpp:152: +FAILED: CHECK( data.int_seven > 7 ) -failed with expansion: +with expansion: 7 > 7 +ConditionTests.cpp:152 -ConditionTests.cpp:153: +FAILED: CHECK( data.int_seven < 7 ) -failed with expansion: +with expansion: 7 < 7 +ConditionTests.cpp:153 -ConditionTests.cpp:154: +FAILED: CHECK( data.int_seven > 8 ) -failed with expansion: +with expansion: 7 > 8 +ConditionTests.cpp:154 -ConditionTests.cpp:155: +FAILED: CHECK( data.int_seven < 6 ) -failed with expansion: +with expansion: 7 < 6 +ConditionTests.cpp:155 -ConditionTests.cpp:156: +FAILED: CHECK( data.int_seven < 0 ) -failed with expansion: +with expansion: 7 < 0 +ConditionTests.cpp:156 -ConditionTests.cpp:157: +FAILED: CHECK( data.int_seven < -1 ) -failed with expansion: +with expansion: 7 < -1 +ConditionTests.cpp:157 -ConditionTests.cpp:159: +FAILED: CHECK( data.int_seven >= 8 ) -failed with expansion: +with expansion: 7 >= 8 +ConditionTests.cpp:159 -ConditionTests.cpp:160: +FAILED: CHECK( data.int_seven <= 6 ) -failed with expansion: +with expansion: 7 <= 6 +ConditionTests.cpp:160 -ConditionTests.cpp:162: +FAILED: CHECK( data.float_nine_point_one < 9 ) -failed with expansion: +with expansion: 9.1 < 9 +ConditionTests.cpp:162 -ConditionTests.cpp:163: +FAILED: CHECK( data.float_nine_point_one > 10 ) -failed with expansion: +with expansion: 9.1 > 10 +ConditionTests.cpp:163 -ConditionTests.cpp:164: +FAILED: CHECK( data.float_nine_point_one > 9.2 ) -failed with expansion: +with expansion: 9.1 > 9.2 +ConditionTests.cpp:164 -ConditionTests.cpp:166: +FAILED: CHECK( data.str_hello > "hello" ) -failed with expansion: +with expansion: "hello" > "hello" +ConditionTests.cpp:166 -ConditionTests.cpp:167: +FAILED: CHECK( data.str_hello < "hello" ) -failed with expansion: +with expansion: "hello" < "hello" +ConditionTests.cpp:167 -ConditionTests.cpp:168: +FAILED: CHECK( data.str_hello > "hellp" ) -failed with expansion: +with expansion: "hello" > "hellp" +ConditionTests.cpp:168 -ConditionTests.cpp:169: +FAILED: CHECK( data.str_hello > "z" ) -failed with expansion: +with expansion: "hello" > "z" +ConditionTests.cpp:169 -ConditionTests.cpp:170: +FAILED: CHECK( data.str_hello < "hellm" ) -failed with expansion: +with expansion: "hello" < "hellm" +ConditionTests.cpp:170 -ConditionTests.cpp:171: +FAILED: CHECK( data.str_hello < "a" ) -failed with expansion: +with expansion: "hello" < "a" +ConditionTests.cpp:171 -ConditionTests.cpp:173: +FAILED: CHECK( data.str_hello >= "z" ) -failed with expansion: +with expansion: "hello" >= "z" +ConditionTests.cpp:173 -ConditionTests.cpp:174: +FAILED: CHECK( data.str_hello <= "a" ) -failed with expansion: +with expansion: "hello" <= "a" +ConditionTests.cpp:174 ----------------------------------------------------------------- ./succeeding/conditions/int literals ----------------------------------------------------------------- -ConditionTests.cpp:188: +PASSED: REQUIRE( i == 1 ) -passed with expansion: +with expansion: 1 == 1 +ConditionTests.cpp:188 -ConditionTests.cpp:189: +PASSED: REQUIRE( ui == 2 ) -passed with expansion: +with expansion: 2 == 2 +ConditionTests.cpp:189 -ConditionTests.cpp:190: +PASSED: REQUIRE( l == 3 ) -passed with expansion: +with expansion: 3 == 3 +ConditionTests.cpp:190 -ConditionTests.cpp:191: +PASSED: REQUIRE( ul == 4 ) -passed with expansion: +with expansion: 4 == 4 +ConditionTests.cpp:191 -ConditionTests.cpp:192: +PASSED: REQUIRE( c == 5 ) -passed with expansion: +with expansion: 5 == 5 +ConditionTests.cpp:192 -ConditionTests.cpp:193: +PASSED: REQUIRE( uc == 6 ) -passed with expansion: +with expansion: 6 == 6 +ConditionTests.cpp:193 -ConditionTests.cpp:195: +PASSED: REQUIRE( 1 == i ) -passed with expansion: +with expansion: 1 == 1 +ConditionTests.cpp:195 -ConditionTests.cpp:196: +PASSED: REQUIRE( 2 == ui ) -passed with expansion: +with expansion: 2 == 2 +ConditionTests.cpp:196 -ConditionTests.cpp:197: +PASSED: REQUIRE( 3 == l ) -passed with expansion: +with expansion: 3 == 3 +ConditionTests.cpp:197 -ConditionTests.cpp:198: +PASSED: REQUIRE( 4 == ul ) -passed with expansion: +with expansion: 4 == 4 +ConditionTests.cpp:198 -ConditionTests.cpp:199: +PASSED: REQUIRE( 5 == c ) -passed with expansion: +with expansion: 5 == 5 +ConditionTests.cpp:199 -ConditionTests.cpp:200: +PASSED: REQUIRE( 6 == uc ) -passed with expansion: +with expansion: 6 == 6 +ConditionTests.cpp:200 -ConditionTests.cpp:202: +PASSED: REQUIRE( (std::numeric_limits::max)() > ul ) -passed with expansion: +with expansion: 0x > 4 +ConditionTests.cpp:202 ----------------------------------------------------------------- ./succeeding/conditions//long_to_unsigned_x ----------------------------------------------------------------- -ConditionTests.cpp:223: +PASSED: REQUIRE( long_var == unsigned_char_var ) -passed with expansion: +with expansion: 1 == 1 +ConditionTests.cpp:223 -ConditionTests.cpp:224: +PASSED: REQUIRE( long_var == unsigned_short_var ) -passed with expansion: +with expansion: 1 == 1 +ConditionTests.cpp:224 -ConditionTests.cpp:225: +PASSED: REQUIRE( long_var == unsigned_int_var ) -passed with expansion: +with expansion: 1 == 1 +ConditionTests.cpp:225 -ConditionTests.cpp:226: +PASSED: REQUIRE( long_var == unsigned_long_var ) -passed with expansion: +with expansion: 1 == 1 +ConditionTests.cpp:226 ----------------------------------------------------------------- ./succeeding/conditions/const ints to int literal ----------------------------------------------------------------- -ConditionTests.cpp:237: +PASSED: REQUIRE( unsigned_char_var == 1 ) -passed with expansion: +with expansion: 1 == 1 +ConditionTests.cpp:237 -ConditionTests.cpp:238: +PASSED: REQUIRE( unsigned_short_var == 1 ) -passed with expansion: +with expansion: 1 == 1 +ConditionTests.cpp:238 -ConditionTests.cpp:239: +PASSED: REQUIRE( unsigned_int_var == 1 ) -passed with expansion: +with expansion: 1 == 1 +ConditionTests.cpp:239 -ConditionTests.cpp:240: +PASSED: REQUIRE( unsigned_long_var == 1 ) -passed with expansion: +with expansion: 1 == 1 +ConditionTests.cpp:240 ----------------------------------------------------------------- ./succeeding/conditions/negative ints ----------------------------------------------------------------- -ConditionTests.cpp:246: +PASSED: CHECK( ( -1 > 2u ) ) -passed with expansion: +with expansion: true +ConditionTests.cpp:246 -ConditionTests.cpp:247: +PASSED: CHECK( -1 > 2u ) -passed with expansion: +with expansion: -1 > 2 +ConditionTests.cpp:247 -ConditionTests.cpp:249: +PASSED: CHECK( ( 2u < -1 ) ) -passed with expansion: +with expansion: true +ConditionTests.cpp:249 -ConditionTests.cpp:250: +PASSED: CHECK( 2u < -1 ) -passed with expansion: +with expansion: 2 < -1 +ConditionTests.cpp:250 -ConditionTests.cpp:253: +PASSED: CHECK( ( minInt > 2u ) ) -passed with expansion: +with expansion: true +ConditionTests.cpp:253 -ConditionTests.cpp:254: +PASSED: CHECK( minInt > 2u ) -passed with expansion: +with expansion: -2147483648 > 2 +ConditionTests.cpp:254 ----------------------------------------------------------------- ./succeeding/conditions/computed ints ----------------------------------------------------------------- -ConditionTests.cpp:269: +PASSED: CHECK( 54 == 6*9 ) -passed with expansion: +with expansion: 54 == 54 +ConditionTests.cpp:269 ----------------------------------------------------------------- ./succeeding/conditions/ptr ----------------------------------------------------------------- -ConditionTests.cpp:285: +PASSED: REQUIRE( p == __null ) -passed with expansion: +with expansion: __null == 0 +ConditionTests.cpp:285 -ConditionTests.cpp:286: +PASSED: REQUIRE( p == pNULL ) -passed with expansion: +with expansion: __null == __null +ConditionTests.cpp:286 -ConditionTests.cpp:291: +PASSED: REQUIRE( p != __null ) -passed with expansion: +with expansion: 0x != 0 +ConditionTests.cpp:291 -ConditionTests.cpp:294: +PASSED: REQUIRE( cp != __null ) -passed with expansion: +with expansion: 0x != 0 +ConditionTests.cpp:294 -ConditionTests.cpp:297: +PASSED: REQUIRE( cpc != __null ) -passed with expansion: +with expansion: 0x != 0 +ConditionTests.cpp:297 -ConditionTests.cpp:299: +PASSED: REQUIRE( returnsNull() == __null ) -passed with expansion: +with expansion: {null string} == 0 +ConditionTests.cpp:299 -ConditionTests.cpp:300: +PASSED: REQUIRE( returnsConstNull() == __null ) -passed with expansion: +with expansion: {null string} == 0 +ConditionTests.cpp:300 -ConditionTests.cpp:302: +PASSED: REQUIRE( __null != p ) -passed with expansion: +with expansion: 0 != 0x +ConditionTests.cpp:302 ----------------------------------------------------------------- ./succeeding/conditions/not ----------------------------------------------------------------- -ConditionTests.cpp:317: +PASSED: REQUIRE( false == false ) -passed +ConditionTests.cpp:317 -ConditionTests.cpp:318: +PASSED: REQUIRE( true == true ) -passed +ConditionTests.cpp:318 -ConditionTests.cpp:319: +PASSED: REQUIRE( !false ) -passed with expansion: +with expansion: true +ConditionTests.cpp:319 -ConditionTests.cpp:320: +PASSED: REQUIRE_FALSE( !false ) -passed +ConditionTests.cpp:320 -ConditionTests.cpp:322: +PASSED: REQUIRE( !falseValue ) -passed with expansion: +with expansion: true +ConditionTests.cpp:322 -ConditionTests.cpp:323: +PASSED: REQUIRE_FALSE( !falseValue ) -passed with expansion: +with expansion: !false +ConditionTests.cpp:323 -ConditionTests.cpp:325: +PASSED: REQUIRE( !(1 == 2) ) -passed with expansion: +with expansion: true +ConditionTests.cpp:325 -ConditionTests.cpp:326: +PASSED: REQUIRE_FALSE( !1 == 2 ) -passed with expansion: +with expansion: !(1 == 2) +ConditionTests.cpp:326 ----------------------------------------------------------------- ./failing/conditions/not ----------------------------------------------------------------- -ConditionTests.cpp:334: +FAILED: CHECK( false != false ) -failed +ConditionTests.cpp:334 -ConditionTests.cpp:335: +FAILED: CHECK( true != true ) -failed +ConditionTests.cpp:335 -ConditionTests.cpp:336: +FAILED: CHECK( !true ) -failed with expansion: +with expansion: false +ConditionTests.cpp:336 -ConditionTests.cpp:337: +FAILED: CHECK_FALSE( !true ) -failed +ConditionTests.cpp:337 -ConditionTests.cpp:339: +FAILED: CHECK( !trueValue ) -failed with expansion: +with expansion: false +ConditionTests.cpp:339 -ConditionTests.cpp:340: +FAILED: CHECK_FALSE( !trueValue ) -failed with expansion: +with expansion: !true +ConditionTests.cpp:340 -ConditionTests.cpp:342: +FAILED: CHECK( !(1 == 1) ) -failed with expansion: +with expansion: false +ConditionTests.cpp:342 -ConditionTests.cpp:343: +FAILED: CHECK_FALSE( !1 == 1 ) -failed with expansion: +with expansion: !(1 == 1) +ConditionTests.cpp:343 ----------------------------------------------------------------- ./succeeding/exceptions/explicit ----------------------------------------------------------------- -ExceptionTests.cpp:39: +PASSED: REQUIRE_THROWS_AS( thisThrows() ) -passed +ExceptionTests.cpp:39 -ExceptionTests.cpp:40: +PASSED: REQUIRE_NOTHROW( thisDoesntThrow() ) -passed +ExceptionTests.cpp:40 -ExceptionTests.cpp:41: +PASSED: REQUIRE_THROWS( thisThrows() ) -passed +ExceptionTests.cpp:41 ----------------------------------------------------------------- ./failing/exceptions/explicit ----------------------------------------------------------------- -ExceptionTests.cpp:47: +FAILED: CHECK_THROWS_AS( thisThrows() ) -failed due to unexpected exception with message: +due to unexpected exception with message: expected exception +ExceptionTests.cpp:47 -ExceptionTests.cpp:48: +FAILED: CHECK_THROWS_AS( thisDoesntThrow() ) -failed because no exception was thrown where one was expected: +because no exception was thrown where one was expected: +ExceptionTests.cpp:48 -ExceptionTests.cpp:49: +FAILED: CHECK_NOTHROW( thisThrows() ) -failed due to unexpected exception with message: +due to unexpected exception with message: expected exception +ExceptionTests.cpp:49 ----------------------------------------------------------------- ./failing/exceptions/implicit ----------------------------------------------------------------- -ExceptionTests.cpp:52: -failed due to unexpected exception with message: +FAILED: +due to unexpected exception with message: unexpected exception +ExceptionTests.cpp:52 ----------------------------------------------------------------- ./failing/exceptions/implicit/2 ----------------------------------------------------------------- -ExceptionTests.cpp:60: +PASSED: CHECK( 1 == 1 ) -passed +ExceptionTests.cpp:60 -ExceptionTests.cpp:60: +FAILED: {Unknown expression after this line} -failed due to unexpected exception with message: +due to unexpected exception with message: unexpected exception +ExceptionTests.cpp:60 ----------------------------------------------------------------- ./succeeding/exceptions/implicit @@ -921,789 +1071,939 @@ No assertions in test case, './succeeding/exceptions/implicit' ./failing/exceptions/custom ----------------------------------------------------------------- -ExceptionTests.cpp:102: -failed due to unexpected exception with message: +FAILED: +due to unexpected exception with message: custom exception +ExceptionTests.cpp:102 ----------------------------------------------------------------- ./failing/exceptions/custom/nothrow ----------------------------------------------------------------- -ExceptionTests.cpp:109: +FAILED: REQUIRE_NOTHROW( throw CustomException( "unexpected custom exception" ) ) -failed due to unexpected exception with message: +due to unexpected exception with message: unexpected custom exception +ExceptionTests.cpp:109 ----------------------------------------------------------------- ./failing/exceptions/custom/throw ----------------------------------------------------------------- -ExceptionTests.cpp:114: +FAILED: REQUIRE_THROWS_AS( throw CustomException( "custom exception - not std" ) ) -failed due to unexpected exception with message: +due to unexpected exception with message: custom exception - not std +ExceptionTests.cpp:114 ----------------------------------------------------------------- ./failing/exceptions/custom/double ----------------------------------------------------------------- -ExceptionTests.cpp:118: -failed due to unexpected exception with message: +FAILED: +due to unexpected exception with message: 3.14 +ExceptionTests.cpp:118 ----------------------------------------------------------------- ./succeeding/exceptions/notimplemented ----------------------------------------------------------------- -ExceptionTests.cpp:129: +PASSED: REQUIRE_THROWS( thisFunctionNotImplemented( 7 ) ) -passed +ExceptionTests.cpp:129 ----------------------------------------------------------------- ./succeeding/generators/1 ----------------------------------------------------------------- -GeneratorTests.cpp:26: +PASSED: CATCH_REQUIRE( multiply( i, 2 ) == i*2 ) -passed with expansion: +with expansion: 2 == 2 +GeneratorTests.cpp:26 -GeneratorTests.cpp:27: +PASSED: CATCH_REQUIRE( multiply( j, 2 ) == j*2 ) -passed with expansion: +with expansion: 200 == 200 +GeneratorTests.cpp:27 -GeneratorTests.cpp:26: +PASSED: CATCH_REQUIRE( multiply( i, 2 ) == i*2 ) -passed with expansion: +with expansion: 4 == 4 +GeneratorTests.cpp:26 -GeneratorTests.cpp:27: +PASSED: CATCH_REQUIRE( multiply( j, 2 ) == j*2 ) -passed with expansion: +with expansion: 200 == 200 +GeneratorTests.cpp:27 -GeneratorTests.cpp:26: +PASSED: CATCH_REQUIRE( multiply( i, 2 ) == i*2 ) -passed with expansion: +with expansion: 6 == 6 +GeneratorTests.cpp:26 -GeneratorTests.cpp:27: +PASSED: CATCH_REQUIRE( multiply( j, 2 ) == j*2 ) -passed with expansion: +with expansion: 200 == 200 +GeneratorTests.cpp:27 -GeneratorTests.cpp:26: +PASSED: CATCH_REQUIRE( multiply( i, 2 ) == i*2 ) -passed with expansion: +with expansion: 8 == 8 +GeneratorTests.cpp:26 -GeneratorTests.cpp:27: +PASSED: CATCH_REQUIRE( multiply( j, 2 ) == j*2 ) -passed with expansion: +with expansion: 200 == 200 +GeneratorTests.cpp:27 -GeneratorTests.cpp:26: +PASSED: CATCH_REQUIRE( multiply( i, 2 ) == i*2 ) -passed with expansion: +with expansion: 10 == 10 +GeneratorTests.cpp:26 -GeneratorTests.cpp:27: +PASSED: CATCH_REQUIRE( multiply( j, 2 ) == j*2 ) -passed with expansion: +with expansion: 200 == 200 +GeneratorTests.cpp:27 -GeneratorTests.cpp:26: +PASSED: CATCH_REQUIRE( multiply( i, 2 ) == i*2 ) -passed with expansion: +with expansion: 30 == 30 +GeneratorTests.cpp:26 -GeneratorTests.cpp:27: +PASSED: CATCH_REQUIRE( multiply( j, 2 ) == j*2 ) -passed with expansion: +with expansion: 200 == 200 +GeneratorTests.cpp:27 -GeneratorTests.cpp:26: +PASSED: CATCH_REQUIRE( multiply( i, 2 ) == i*2 ) -passed with expansion: +with expansion: 40 == 40 +GeneratorTests.cpp:26 -GeneratorTests.cpp:27: +PASSED: CATCH_REQUIRE( multiply( j, 2 ) == j*2 ) -passed with expansion: +with expansion: 200 == 200 +GeneratorTests.cpp:27 -GeneratorTests.cpp:26: +PASSED: CATCH_REQUIRE( multiply( i, 2 ) == i*2 ) -passed with expansion: +with expansion: 42 == 42 +GeneratorTests.cpp:26 -GeneratorTests.cpp:27: +PASSED: CATCH_REQUIRE( multiply( j, 2 ) == j*2 ) -passed with expansion: +with expansion: 200 == 200 +GeneratorTests.cpp:27 -GeneratorTests.cpp:26: +PASSED: CATCH_REQUIRE( multiply( i, 2 ) == i*2 ) -passed with expansion: +with expansion: 72 == 72 +GeneratorTests.cpp:26 -GeneratorTests.cpp:27: +PASSED: CATCH_REQUIRE( multiply( j, 2 ) == j*2 ) -passed with expansion: +with expansion: 200 == 200 +GeneratorTests.cpp:27 -GeneratorTests.cpp:26: +PASSED: CATCH_REQUIRE( multiply( i, 2 ) == i*2 ) -passed with expansion: +with expansion: 2 == 2 +GeneratorTests.cpp:26 -GeneratorTests.cpp:27: +PASSED: CATCH_REQUIRE( multiply( j, 2 ) == j*2 ) -passed with expansion: +with expansion: 202 == 202 +GeneratorTests.cpp:27 -GeneratorTests.cpp:26: +PASSED: CATCH_REQUIRE( multiply( i, 2 ) == i*2 ) -passed with expansion: +with expansion: 4 == 4 +GeneratorTests.cpp:26 -GeneratorTests.cpp:27: +PASSED: CATCH_REQUIRE( multiply( j, 2 ) == j*2 ) -passed with expansion: +with expansion: 202 == 202 +GeneratorTests.cpp:27 -GeneratorTests.cpp:26: +PASSED: CATCH_REQUIRE( multiply( i, 2 ) == i*2 ) -passed with expansion: +with expansion: 6 == 6 +GeneratorTests.cpp:26 -GeneratorTests.cpp:27: +PASSED: CATCH_REQUIRE( multiply( j, 2 ) == j*2 ) -passed with expansion: +with expansion: 202 == 202 +GeneratorTests.cpp:27 -GeneratorTests.cpp:26: +PASSED: CATCH_REQUIRE( multiply( i, 2 ) == i*2 ) -passed with expansion: +with expansion: 8 == 8 +GeneratorTests.cpp:26 -GeneratorTests.cpp:27: +PASSED: CATCH_REQUIRE( multiply( j, 2 ) == j*2 ) -passed with expansion: +with expansion: 202 == 202 +GeneratorTests.cpp:27 -GeneratorTests.cpp:26: +PASSED: CATCH_REQUIRE( multiply( i, 2 ) == i*2 ) -passed with expansion: +with expansion: 10 == 10 +GeneratorTests.cpp:26 -GeneratorTests.cpp:27: +PASSED: CATCH_REQUIRE( multiply( j, 2 ) == j*2 ) -passed with expansion: +with expansion: 202 == 202 +GeneratorTests.cpp:27 -GeneratorTests.cpp:26: +PASSED: CATCH_REQUIRE( multiply( i, 2 ) == i*2 ) -passed with expansion: +with expansion: 30 == 30 +GeneratorTests.cpp:26 -GeneratorTests.cpp:27: +PASSED: CATCH_REQUIRE( multiply( j, 2 ) == j*2 ) -passed with expansion: +with expansion: 202 == 202 +GeneratorTests.cpp:27 -GeneratorTests.cpp:26: +PASSED: CATCH_REQUIRE( multiply( i, 2 ) == i*2 ) -passed with expansion: +with expansion: 40 == 40 +GeneratorTests.cpp:26 -GeneratorTests.cpp:27: +PASSED: CATCH_REQUIRE( multiply( j, 2 ) == j*2 ) -passed with expansion: +with expansion: 202 == 202 +GeneratorTests.cpp:27 -GeneratorTests.cpp:26: +PASSED: CATCH_REQUIRE( multiply( i, 2 ) == i*2 ) -passed with expansion: +with expansion: 42 == 42 +GeneratorTests.cpp:26 -GeneratorTests.cpp:27: +PASSED: CATCH_REQUIRE( multiply( j, 2 ) == j*2 ) -passed with expansion: +with expansion: 202 == 202 +GeneratorTests.cpp:27 -GeneratorTests.cpp:26: +PASSED: CATCH_REQUIRE( multiply( i, 2 ) == i*2 ) -passed with expansion: +with expansion: 72 == 72 +GeneratorTests.cpp:26 -GeneratorTests.cpp:27: +PASSED: CATCH_REQUIRE( multiply( j, 2 ) == j*2 ) -passed with expansion: +with expansion: 202 == 202 +GeneratorTests.cpp:27 -GeneratorTests.cpp:26: +PASSED: CATCH_REQUIRE( multiply( i, 2 ) == i*2 ) -passed with expansion: +with expansion: 2 == 2 +GeneratorTests.cpp:26 -GeneratorTests.cpp:27: +PASSED: CATCH_REQUIRE( multiply( j, 2 ) == j*2 ) -passed with expansion: +with expansion: 204 == 204 +GeneratorTests.cpp:27 -GeneratorTests.cpp:26: +PASSED: CATCH_REQUIRE( multiply( i, 2 ) == i*2 ) -passed with expansion: +with expansion: 4 == 4 +GeneratorTests.cpp:26 -GeneratorTests.cpp:27: +PASSED: CATCH_REQUIRE( multiply( j, 2 ) == j*2 ) -passed with expansion: +with expansion: 204 == 204 +GeneratorTests.cpp:27 -GeneratorTests.cpp:26: +PASSED: CATCH_REQUIRE( multiply( i, 2 ) == i*2 ) -passed with expansion: +with expansion: 6 == 6 +GeneratorTests.cpp:26 -GeneratorTests.cpp:27: +PASSED: CATCH_REQUIRE( multiply( j, 2 ) == j*2 ) -passed with expansion: +with expansion: 204 == 204 +GeneratorTests.cpp:27 -GeneratorTests.cpp:26: +PASSED: CATCH_REQUIRE( multiply( i, 2 ) == i*2 ) -passed with expansion: +with expansion: 8 == 8 +GeneratorTests.cpp:26 -GeneratorTests.cpp:27: +PASSED: CATCH_REQUIRE( multiply( j, 2 ) == j*2 ) -passed with expansion: +with expansion: 204 == 204 +GeneratorTests.cpp:27 -GeneratorTests.cpp:26: +PASSED: CATCH_REQUIRE( multiply( i, 2 ) == i*2 ) -passed with expansion: +with expansion: 10 == 10 +GeneratorTests.cpp:26 -GeneratorTests.cpp:27: +PASSED: CATCH_REQUIRE( multiply( j, 2 ) == j*2 ) -passed with expansion: +with expansion: 204 == 204 +GeneratorTests.cpp:27 -GeneratorTests.cpp:26: +PASSED: CATCH_REQUIRE( multiply( i, 2 ) == i*2 ) -passed with expansion: +with expansion: 30 == 30 +GeneratorTests.cpp:26 -GeneratorTests.cpp:27: +PASSED: CATCH_REQUIRE( multiply( j, 2 ) == j*2 ) -passed with expansion: +with expansion: 204 == 204 +GeneratorTests.cpp:27 -GeneratorTests.cpp:26: +PASSED: CATCH_REQUIRE( multiply( i, 2 ) == i*2 ) -passed with expansion: +with expansion: 40 == 40 +GeneratorTests.cpp:26 -GeneratorTests.cpp:27: +PASSED: CATCH_REQUIRE( multiply( j, 2 ) == j*2 ) -passed with expansion: +with expansion: 204 == 204 +GeneratorTests.cpp:27 -GeneratorTests.cpp:26: +PASSED: CATCH_REQUIRE( multiply( i, 2 ) == i*2 ) -passed with expansion: +with expansion: 42 == 42 +GeneratorTests.cpp:26 -GeneratorTests.cpp:27: +PASSED: CATCH_REQUIRE( multiply( j, 2 ) == j*2 ) -passed with expansion: +with expansion: 204 == 204 +GeneratorTests.cpp:27 -GeneratorTests.cpp:26: +PASSED: CATCH_REQUIRE( multiply( i, 2 ) == i*2 ) -passed with expansion: +with expansion: 72 == 72 +GeneratorTests.cpp:26 -GeneratorTests.cpp:27: +PASSED: CATCH_REQUIRE( multiply( j, 2 ) == j*2 ) -passed with expansion: +with expansion: 204 == 204 +GeneratorTests.cpp:27 -GeneratorTests.cpp:26: +PASSED: CATCH_REQUIRE( multiply( i, 2 ) == i*2 ) -passed with expansion: +with expansion: 2 == 2 +GeneratorTests.cpp:26 -GeneratorTests.cpp:27: +PASSED: CATCH_REQUIRE( multiply( j, 2 ) == j*2 ) -passed with expansion: +with expansion: 206 == 206 +GeneratorTests.cpp:27 -GeneratorTests.cpp:26: +PASSED: CATCH_REQUIRE( multiply( i, 2 ) == i*2 ) -passed with expansion: +with expansion: 4 == 4 +GeneratorTests.cpp:26 -GeneratorTests.cpp:27: +PASSED: CATCH_REQUIRE( multiply( j, 2 ) == j*2 ) -passed with expansion: +with expansion: 206 == 206 +GeneratorTests.cpp:27 -GeneratorTests.cpp:26: +PASSED: CATCH_REQUIRE( multiply( i, 2 ) == i*2 ) -passed with expansion: +with expansion: 6 == 6 +GeneratorTests.cpp:26 -GeneratorTests.cpp:27: +PASSED: CATCH_REQUIRE( multiply( j, 2 ) == j*2 ) -passed with expansion: +with expansion: 206 == 206 +GeneratorTests.cpp:27 -GeneratorTests.cpp:26: +PASSED: CATCH_REQUIRE( multiply( i, 2 ) == i*2 ) -passed with expansion: +with expansion: 8 == 8 +GeneratorTests.cpp:26 -GeneratorTests.cpp:27: +PASSED: CATCH_REQUIRE( multiply( j, 2 ) == j*2 ) -passed with expansion: +with expansion: 206 == 206 +GeneratorTests.cpp:27 -GeneratorTests.cpp:26: +PASSED: CATCH_REQUIRE( multiply( i, 2 ) == i*2 ) -passed with expansion: +with expansion: 10 == 10 +GeneratorTests.cpp:26 -GeneratorTests.cpp:27: +PASSED: CATCH_REQUIRE( multiply( j, 2 ) == j*2 ) -passed with expansion: +with expansion: 206 == 206 +GeneratorTests.cpp:27 -GeneratorTests.cpp:26: +PASSED: CATCH_REQUIRE( multiply( i, 2 ) == i*2 ) -passed with expansion: +with expansion: 30 == 30 +GeneratorTests.cpp:26 -GeneratorTests.cpp:27: +PASSED: CATCH_REQUIRE( multiply( j, 2 ) == j*2 ) -passed with expansion: +with expansion: 206 == 206 +GeneratorTests.cpp:27 -GeneratorTests.cpp:26: +PASSED: CATCH_REQUIRE( multiply( i, 2 ) == i*2 ) -passed with expansion: +with expansion: 40 == 40 +GeneratorTests.cpp:26 -GeneratorTests.cpp:27: +PASSED: CATCH_REQUIRE( multiply( j, 2 ) == j*2 ) -passed with expansion: +with expansion: 206 == 206 +GeneratorTests.cpp:27 -GeneratorTests.cpp:26: +PASSED: CATCH_REQUIRE( multiply( i, 2 ) == i*2 ) -passed with expansion: +with expansion: 42 == 42 +GeneratorTests.cpp:26 -GeneratorTests.cpp:27: +PASSED: CATCH_REQUIRE( multiply( j, 2 ) == j*2 ) -passed with expansion: +with expansion: 206 == 206 +GeneratorTests.cpp:27 -GeneratorTests.cpp:26: +PASSED: CATCH_REQUIRE( multiply( i, 2 ) == i*2 ) -passed with expansion: +with expansion: 72 == 72 +GeneratorTests.cpp:26 -GeneratorTests.cpp:27: +PASSED: CATCH_REQUIRE( multiply( j, 2 ) == j*2 ) -passed with expansion: +with expansion: 206 == 206 +GeneratorTests.cpp:27 -GeneratorTests.cpp:26: +PASSED: CATCH_REQUIRE( multiply( i, 2 ) == i*2 ) -passed with expansion: +with expansion: 2 == 2 +GeneratorTests.cpp:26 -GeneratorTests.cpp:27: +PASSED: CATCH_REQUIRE( multiply( j, 2 ) == j*2 ) -passed with expansion: +with expansion: 208 == 208 +GeneratorTests.cpp:27 -GeneratorTests.cpp:26: +PASSED: CATCH_REQUIRE( multiply( i, 2 ) == i*2 ) -passed with expansion: +with expansion: 4 == 4 +GeneratorTests.cpp:26 -GeneratorTests.cpp:27: +PASSED: CATCH_REQUIRE( multiply( j, 2 ) == j*2 ) -passed with expansion: +with expansion: 208 == 208 +GeneratorTests.cpp:27 -GeneratorTests.cpp:26: +PASSED: CATCH_REQUIRE( multiply( i, 2 ) == i*2 ) -passed with expansion: +with expansion: 6 == 6 +GeneratorTests.cpp:26 -GeneratorTests.cpp:27: +PASSED: CATCH_REQUIRE( multiply( j, 2 ) == j*2 ) -passed with expansion: +with expansion: 208 == 208 +GeneratorTests.cpp:27 -GeneratorTests.cpp:26: +PASSED: CATCH_REQUIRE( multiply( i, 2 ) == i*2 ) -passed with expansion: +with expansion: 8 == 8 +GeneratorTests.cpp:26 -GeneratorTests.cpp:27: +PASSED: CATCH_REQUIRE( multiply( j, 2 ) == j*2 ) -passed with expansion: +with expansion: 208 == 208 +GeneratorTests.cpp:27 -GeneratorTests.cpp:26: +PASSED: CATCH_REQUIRE( multiply( i, 2 ) == i*2 ) -passed with expansion: +with expansion: 10 == 10 +GeneratorTests.cpp:26 -GeneratorTests.cpp:27: +PASSED: CATCH_REQUIRE( multiply( j, 2 ) == j*2 ) -passed with expansion: +with expansion: 208 == 208 +GeneratorTests.cpp:27 -GeneratorTests.cpp:26: +PASSED: CATCH_REQUIRE( multiply( i, 2 ) == i*2 ) -passed with expansion: +with expansion: 30 == 30 +GeneratorTests.cpp:26 -GeneratorTests.cpp:27: +PASSED: CATCH_REQUIRE( multiply( j, 2 ) == j*2 ) -passed with expansion: +with expansion: 208 == 208 +GeneratorTests.cpp:27 -GeneratorTests.cpp:26: +PASSED: CATCH_REQUIRE( multiply( i, 2 ) == i*2 ) -passed with expansion: +with expansion: 40 == 40 +GeneratorTests.cpp:26 -GeneratorTests.cpp:27: +PASSED: CATCH_REQUIRE( multiply( j, 2 ) == j*2 ) -passed with expansion: +with expansion: 208 == 208 +GeneratorTests.cpp:27 -GeneratorTests.cpp:26: +PASSED: CATCH_REQUIRE( multiply( i, 2 ) == i*2 ) -passed with expansion: +with expansion: 42 == 42 +GeneratorTests.cpp:26 -GeneratorTests.cpp:27: +PASSED: CATCH_REQUIRE( multiply( j, 2 ) == j*2 ) -passed with expansion: +with expansion: 208 == 208 +GeneratorTests.cpp:27 -GeneratorTests.cpp:26: +PASSED: CATCH_REQUIRE( multiply( i, 2 ) == i*2 ) -passed with expansion: +with expansion: 72 == 72 +GeneratorTests.cpp:26 -GeneratorTests.cpp:27: +PASSED: CATCH_REQUIRE( multiply( j, 2 ) == j*2 ) -passed with expansion: +with expansion: 208 == 208 +GeneratorTests.cpp:27 -GeneratorTests.cpp:26: +PASSED: CATCH_REQUIRE( multiply( i, 2 ) == i*2 ) -passed with expansion: +with expansion: 2 == 2 +GeneratorTests.cpp:26 -GeneratorTests.cpp:27: +PASSED: CATCH_REQUIRE( multiply( j, 2 ) == j*2 ) -passed with expansion: +with expansion: 210 == 210 +GeneratorTests.cpp:27 -GeneratorTests.cpp:26: +PASSED: CATCH_REQUIRE( multiply( i, 2 ) == i*2 ) -passed with expansion: +with expansion: 4 == 4 +GeneratorTests.cpp:26 -GeneratorTests.cpp:27: +PASSED: CATCH_REQUIRE( multiply( j, 2 ) == j*2 ) -passed with expansion: +with expansion: 210 == 210 +GeneratorTests.cpp:27 -GeneratorTests.cpp:26: +PASSED: CATCH_REQUIRE( multiply( i, 2 ) == i*2 ) -passed with expansion: +with expansion: 6 == 6 +GeneratorTests.cpp:26 -GeneratorTests.cpp:27: +PASSED: CATCH_REQUIRE( multiply( j, 2 ) == j*2 ) -passed with expansion: +with expansion: 210 == 210 +GeneratorTests.cpp:27 -GeneratorTests.cpp:26: +PASSED: CATCH_REQUIRE( multiply( i, 2 ) == i*2 ) -passed with expansion: +with expansion: 8 == 8 +GeneratorTests.cpp:26 -GeneratorTests.cpp:27: +PASSED: CATCH_REQUIRE( multiply( j, 2 ) == j*2 ) -passed with expansion: +with expansion: 210 == 210 +GeneratorTests.cpp:27 -GeneratorTests.cpp:26: +PASSED: CATCH_REQUIRE( multiply( i, 2 ) == i*2 ) -passed with expansion: +with expansion: 10 == 10 +GeneratorTests.cpp:26 -GeneratorTests.cpp:27: +PASSED: CATCH_REQUIRE( multiply( j, 2 ) == j*2 ) -passed with expansion: +with expansion: 210 == 210 +GeneratorTests.cpp:27 -GeneratorTests.cpp:26: +PASSED: CATCH_REQUIRE( multiply( i, 2 ) == i*2 ) -passed with expansion: +with expansion: 30 == 30 +GeneratorTests.cpp:26 -GeneratorTests.cpp:27: +PASSED: CATCH_REQUIRE( multiply( j, 2 ) == j*2 ) -passed with expansion: +with expansion: 210 == 210 +GeneratorTests.cpp:27 -GeneratorTests.cpp:26: +PASSED: CATCH_REQUIRE( multiply( i, 2 ) == i*2 ) -passed with expansion: +with expansion: 40 == 40 +GeneratorTests.cpp:26 -GeneratorTests.cpp:27: +PASSED: CATCH_REQUIRE( multiply( j, 2 ) == j*2 ) -passed with expansion: +with expansion: 210 == 210 +GeneratorTests.cpp:27 -GeneratorTests.cpp:26: +PASSED: CATCH_REQUIRE( multiply( i, 2 ) == i*2 ) -passed with expansion: +with expansion: 42 == 42 +GeneratorTests.cpp:26 -GeneratorTests.cpp:27: +PASSED: CATCH_REQUIRE( multiply( j, 2 ) == j*2 ) -passed with expansion: +with expansion: 210 == 210 +GeneratorTests.cpp:27 -GeneratorTests.cpp:26: +PASSED: CATCH_REQUIRE( multiply( i, 2 ) == i*2 ) -passed with expansion: +with expansion: 72 == 72 +GeneratorTests.cpp:26 -GeneratorTests.cpp:27: +PASSED: CATCH_REQUIRE( multiply( j, 2 ) == j*2 ) -passed with expansion: +with expansion: 210 == 210 +GeneratorTests.cpp:27 -GeneratorTests.cpp:26: +PASSED: CATCH_REQUIRE( multiply( i, 2 ) == i*2 ) -passed with expansion: +with expansion: 2 == 2 +GeneratorTests.cpp:26 -GeneratorTests.cpp:27: +PASSED: CATCH_REQUIRE( multiply( j, 2 ) == j*2 ) -passed with expansion: +with expansion: 212 == 212 +GeneratorTests.cpp:27 -GeneratorTests.cpp:26: +PASSED: CATCH_REQUIRE( multiply( i, 2 ) == i*2 ) -passed with expansion: +with expansion: 4 == 4 +GeneratorTests.cpp:26 -GeneratorTests.cpp:27: +PASSED: CATCH_REQUIRE( multiply( j, 2 ) == j*2 ) -passed with expansion: +with expansion: 212 == 212 +GeneratorTests.cpp:27 -GeneratorTests.cpp:26: +PASSED: CATCH_REQUIRE( multiply( i, 2 ) == i*2 ) -passed with expansion: +with expansion: 6 == 6 +GeneratorTests.cpp:26 -GeneratorTests.cpp:27: +PASSED: CATCH_REQUIRE( multiply( j, 2 ) == j*2 ) -passed with expansion: +with expansion: 212 == 212 +GeneratorTests.cpp:27 -GeneratorTests.cpp:26: +PASSED: CATCH_REQUIRE( multiply( i, 2 ) == i*2 ) -passed with expansion: +with expansion: 8 == 8 +GeneratorTests.cpp:26 -GeneratorTests.cpp:27: +PASSED: CATCH_REQUIRE( multiply( j, 2 ) == j*2 ) -passed with expansion: +with expansion: 212 == 212 +GeneratorTests.cpp:27 -GeneratorTests.cpp:26: +PASSED: CATCH_REQUIRE( multiply( i, 2 ) == i*2 ) -passed with expansion: +with expansion: 10 == 10 +GeneratorTests.cpp:26 -GeneratorTests.cpp:27: +PASSED: CATCH_REQUIRE( multiply( j, 2 ) == j*2 ) -passed with expansion: +with expansion: 212 == 212 +GeneratorTests.cpp:27 -GeneratorTests.cpp:26: +PASSED: CATCH_REQUIRE( multiply( i, 2 ) == i*2 ) -passed with expansion: +with expansion: 30 == 30 +GeneratorTests.cpp:26 -GeneratorTests.cpp:27: +PASSED: CATCH_REQUIRE( multiply( j, 2 ) == j*2 ) -passed with expansion: +with expansion: 212 == 212 +GeneratorTests.cpp:27 -GeneratorTests.cpp:26: +PASSED: CATCH_REQUIRE( multiply( i, 2 ) == i*2 ) -passed with expansion: +with expansion: 40 == 40 +GeneratorTests.cpp:26 -GeneratorTests.cpp:27: +PASSED: CATCH_REQUIRE( multiply( j, 2 ) == j*2 ) -passed with expansion: +with expansion: 212 == 212 +GeneratorTests.cpp:27 -GeneratorTests.cpp:26: +PASSED: CATCH_REQUIRE( multiply( i, 2 ) == i*2 ) -passed with expansion: +with expansion: 42 == 42 +GeneratorTests.cpp:26 -GeneratorTests.cpp:27: +PASSED: CATCH_REQUIRE( multiply( j, 2 ) == j*2 ) -passed with expansion: +with expansion: 212 == 212 +GeneratorTests.cpp:27 -GeneratorTests.cpp:26: +PASSED: CATCH_REQUIRE( multiply( i, 2 ) == i*2 ) -passed with expansion: +with expansion: 72 == 72 +GeneratorTests.cpp:26 -GeneratorTests.cpp:27: +PASSED: CATCH_REQUIRE( multiply( j, 2 ) == j*2 ) -passed with expansion: +with expansion: 212 == 212 +GeneratorTests.cpp:27 -GeneratorTests.cpp:26: +PASSED: CATCH_REQUIRE( multiply( i, 2 ) == i*2 ) -passed with expansion: +with expansion: 2 == 2 +GeneratorTests.cpp:26 -GeneratorTests.cpp:27: +PASSED: CATCH_REQUIRE( multiply( j, 2 ) == j*2 ) -passed with expansion: +with expansion: 214 == 214 +GeneratorTests.cpp:27 -GeneratorTests.cpp:26: +PASSED: CATCH_REQUIRE( multiply( i, 2 ) == i*2 ) -passed with expansion: +with expansion: 4 == 4 +GeneratorTests.cpp:26 -GeneratorTests.cpp:27: +PASSED: CATCH_REQUIRE( multiply( j, 2 ) == j*2 ) -passed with expansion: +with expansion: 214 == 214 +GeneratorTests.cpp:27 -GeneratorTests.cpp:26: +PASSED: CATCH_REQUIRE( multiply( i, 2 ) == i*2 ) -passed with expansion: +with expansion: 6 == 6 +GeneratorTests.cpp:26 -GeneratorTests.cpp:27: +PASSED: CATCH_REQUIRE( multiply( j, 2 ) == j*2 ) -passed with expansion: +with expansion: 214 == 214 +GeneratorTests.cpp:27 -GeneratorTests.cpp:26: +PASSED: CATCH_REQUIRE( multiply( i, 2 ) == i*2 ) -passed with expansion: +with expansion: 8 == 8 +GeneratorTests.cpp:26 -GeneratorTests.cpp:27: +PASSED: CATCH_REQUIRE( multiply( j, 2 ) == j*2 ) -passed with expansion: +with expansion: 214 == 214 +GeneratorTests.cpp:27 -GeneratorTests.cpp:26: +PASSED: CATCH_REQUIRE( multiply( i, 2 ) == i*2 ) -passed with expansion: +with expansion: 10 == 10 +GeneratorTests.cpp:26 -GeneratorTests.cpp:27: +PASSED: CATCH_REQUIRE( multiply( j, 2 ) == j*2 ) -passed with expansion: +with expansion: 214 == 214 +GeneratorTests.cpp:27 -GeneratorTests.cpp:26: +PASSED: CATCH_REQUIRE( multiply( i, 2 ) == i*2 ) -passed with expansion: +with expansion: 30 == 30 +GeneratorTests.cpp:26 -GeneratorTests.cpp:27: +PASSED: CATCH_REQUIRE( multiply( j, 2 ) == j*2 ) -passed with expansion: +with expansion: 214 == 214 +GeneratorTests.cpp:27 -GeneratorTests.cpp:26: +PASSED: CATCH_REQUIRE( multiply( i, 2 ) == i*2 ) -passed with expansion: +with expansion: 40 == 40 +GeneratorTests.cpp:26 -GeneratorTests.cpp:27: +PASSED: CATCH_REQUIRE( multiply( j, 2 ) == j*2 ) -passed with expansion: +with expansion: 214 == 214 +GeneratorTests.cpp:27 -GeneratorTests.cpp:26: +PASSED: CATCH_REQUIRE( multiply( i, 2 ) == i*2 ) -passed with expansion: +with expansion: 42 == 42 +GeneratorTests.cpp:26 -GeneratorTests.cpp:27: +PASSED: CATCH_REQUIRE( multiply( j, 2 ) == j*2 ) -passed with expansion: +with expansion: 214 == 214 +GeneratorTests.cpp:27 -GeneratorTests.cpp:26: +PASSED: CATCH_REQUIRE( multiply( i, 2 ) == i*2 ) -passed with expansion: +with expansion: 72 == 72 +GeneratorTests.cpp:26 -GeneratorTests.cpp:27: +PASSED: CATCH_REQUIRE( multiply( j, 2 ) == j*2 ) -passed with expansion: +with expansion: 214 == 214 +GeneratorTests.cpp:27 ----------------------------------------------------------------- ./succeeding/generators/2 ----------------------------------------------------------------- -GeneratorTests.cpp:40: +PASSED: CATCH_REQUIRE( i->first == i->second-1 ) -passed with expansion: +with expansion: 0 == 0 +GeneratorTests.cpp:40 -GeneratorTests.cpp:40: +PASSED: CATCH_REQUIRE( i->first == i->second-1 ) -passed with expansion: +with expansion: 2 == 2 +GeneratorTests.cpp:40 ----------------------------------------------------------------- ./succeeding/message ----------------------------------------------------------------- -MessageTests.cpp:14: warning: this is a warning +MessageTests.cpp:14 No assertions in test case, './succeeding/message' @@ -1712,88 +2012,97 @@ No assertions in test case, './succeeding/message' ./succeeding/succeed ----------------------------------------------------------------- -MessageTests.cpp:18: -passed with message: +PASSED: +with message: this is a success +MessageTests.cpp:18 ----------------------------------------------------------------- ./failing/message/info/1 ----------------------------------------------------------------- -MessageTests.cpp:23: info: this message should be logged +MessageTests.cpp:23 -MessageTests.cpp:24: info: so should this +MessageTests.cpp:24 -MessageTests.cpp:26: +FAILED: REQUIRE( a == 1 ) -failed with expansion: +with expansion: 2 == 1 +MessageTests.cpp:26 ----------------------------------------------------------------- ./mixed/message/info/2 ----------------------------------------------------------------- -MessageTests.cpp:33: +PASSED: CHECK( a == 2 ) -passed with expansion: +with expansion: 2 == 2 +MessageTests.cpp:33 -MessageTests.cpp:31: info: this message should be logged +MessageTests.cpp:31 -MessageTests.cpp:35: info: this message should be logged, too +MessageTests.cpp:35 -MessageTests.cpp:37: +FAILED: CHECK( a == 1 ) -failed with expansion: +with expansion: 2 == 1 +MessageTests.cpp:37 -MessageTests.cpp:39: info: and this, but later +MessageTests.cpp:39 -MessageTests.cpp:41: +FAILED: CHECK( a == 0 ) -failed with expansion: +with expansion: 2 == 0 +MessageTests.cpp:41 -MessageTests.cpp:45: +PASSED: CHECK( a == 2 ) -passed with expansion: +with expansion: 2 == 2 +MessageTests.cpp:45 ----------------------------------------------------------------- ./failing/message/fail ----------------------------------------------------------------- -MessageTests.cpp:51: -failed explicitly with message: +FAILED: +explicitly with message: This is a failure +MessageTests.cpp:51 ----------------------------------------------------------------- ./failing/message/sections one ----------------------------------------------------------------- -MessageTests.cpp:58: -failed explicitly with message: +FAILED: +explicitly with message: Message from section one +MessageTests.cpp:58 ----------------------------------------------------------------- ./failing/message/sections two ----------------------------------------------------------------- -MessageTests.cpp:63: -failed explicitly with message: +FAILED: +explicitly with message: Message from section two +MessageTests.cpp:63 Message from section one ----------------------------------------------------------------- @@ -1817,78 +2126,89 @@ No assertions in section, 'two' ./mixed/message/scoped ----------------------------------------------------------------- -MessageTests.cpp:86: +PASSED: REQUIRE( i < 10 ) -passed with expansion: +with expansion: 0 < 10 +MessageTests.cpp:86 -MessageTests.cpp:86: +PASSED: REQUIRE( i < 10 ) -passed with expansion: +with expansion: 1 < 10 +MessageTests.cpp:86 -MessageTests.cpp:86: +PASSED: REQUIRE( i < 10 ) -passed with expansion: +with expansion: 2 < 10 +MessageTests.cpp:86 -MessageTests.cpp:86: +PASSED: REQUIRE( i < 10 ) -passed with expansion: +with expansion: 3 < 10 +MessageTests.cpp:86 -MessageTests.cpp:86: +PASSED: REQUIRE( i < 10 ) -passed with expansion: +with expansion: 4 < 10 +MessageTests.cpp:86 -MessageTests.cpp:86: +PASSED: REQUIRE( i < 10 ) -passed with expansion: +with expansion: 5 < 10 +MessageTests.cpp:86 -MessageTests.cpp:86: +PASSED: REQUIRE( i < 10 ) -passed with expansion: +with expansion: 6 < 10 +MessageTests.cpp:86 -MessageTests.cpp:86: +PASSED: REQUIRE( i < 10 ) -passed with expansion: +with expansion: 7 < 10 +MessageTests.cpp:86 -MessageTests.cpp:86: +PASSED: REQUIRE( i < 10 ) -passed with expansion: +with expansion: 8 < 10 +MessageTests.cpp:86 -MessageTests.cpp:86: +PASSED: REQUIRE( i < 10 ) -passed with expansion: +with expansion: 9 < 10 +MessageTests.cpp:86 -MessageTests.cpp:86: REQUIRE( i < 10 ) info: current counter 10 +MessageTests.cpp:86 -MessageTests.cpp:86: REQUIRE( i < 10 ) info: i := 10 +MessageTests.cpp:86 -MessageTests.cpp:86: +FAILED: REQUIRE( i < 10 ) -failed with expansion: +with expansion: 10 < 10 +MessageTests.cpp:86 ----------------------------------------------------------------- ./succeeding/nofail ----------------------------------------------------------------- -MessageTests.cpp:92: +FAILED - but was ok: CHECK_NOFAIL( 1 == 2 ) -failed - but was ok +MessageTests.cpp:92 No assertions in test case, './succeeding/nofail' @@ -1898,40 +2218,45 @@ No assertions in test case, './succeeding/nofail' s1 ----------------------------------------------------------------- -MiscTests.cpp:25: +PASSED: REQUIRE( a != b ) -passed with expansion: +with expansion: 1 != 2 +MiscTests.cpp:25 -MiscTests.cpp:26: +PASSED: REQUIRE( b != a ) -passed with expansion: +with expansion: 2 != 1 +MiscTests.cpp:26 ----------------------------------------------------------------- ./succeeding/Misc/Sections s2 ----------------------------------------------------------------- -MiscTests.cpp:31: +PASSED: REQUIRE( a != b ) -passed with expansion: +with expansion: 1 != 2 +MiscTests.cpp:31 ----------------------------------------------------------------- ./succeeding/Misc/Sections/nested s1 ----------------------------------------------------------------- -MiscTests.cpp:42: +PASSED: REQUIRE( a != b ) -passed with expansion: +with expansion: 1 != 2 +MiscTests.cpp:42 -MiscTests.cpp:43: +PASSED: REQUIRE( b != a ) -passed with expansion: +with expansion: 2 != 1 +MiscTests.cpp:43 ----------------------------------------------------------------- ./succeeding/Misc/Sections/nested @@ -1939,10 +2264,11 @@ passed with expansion: s2 ----------------------------------------------------------------- -MiscTests.cpp:47: +PASSED: REQUIRE( a != b ) -passed with expansion: +with expansion: 1 != 2 +MiscTests.cpp:47 ----------------------------------------------------------------- ./mixed/Misc/Sections/nested2 @@ -1950,10 +2276,11 @@ passed with expansion: s2 ----------------------------------------------------------------- -MiscTests.cpp:61: +FAILED: REQUIRE( a == b ) -failed with expansion: +with expansion: 1 == 2 +MiscTests.cpp:61 ----------------------------------------------------------------- ./mixed/Misc/Sections/nested2 @@ -1961,10 +2288,11 @@ failed with expansion: s3 ----------------------------------------------------------------- -MiscTests.cpp:66: +PASSED: REQUIRE( a != b ) -passed with expansion: +with expansion: 1 != 2 +MiscTests.cpp:66 ----------------------------------------------------------------- ./mixed/Misc/Sections/nested2 @@ -1972,10 +2300,11 @@ passed with expansion: s4 ----------------------------------------------------------------- -MiscTests.cpp:70: +PASSED: REQUIRE( a < b ) -passed with expansion: +with expansion: 1 < 2 +MiscTests.cpp:70 ----------------------------------------------------------------- ./Sections/nested/a/b @@ -2008,86 +2337,95 @@ No assertions in section, 'f (leaf)' s1 ----------------------------------------------------------------- -MiscTests.cpp:103: +FAILED: CHECK( b > a ) -failed with expansion: +with expansion: 0 > 1 +MiscTests.cpp:103 ----------------------------------------------------------------- ./mixed/Misc/loops ----------------------------------------------------------------- -MiscTests.cpp:114: info: Testing if fib[0] (1) is even +MiscTests.cpp:114 -MiscTests.cpp:115: +FAILED: CHECK( ( fib[i] % 2 ) == 0 ) -failed with expansion: +with expansion: 1 == 0 +MiscTests.cpp:115 -MiscTests.cpp:114: info: Testing if fib[1] (1) is even +MiscTests.cpp:114 -MiscTests.cpp:115: +FAILED: CHECK( ( fib[i] % 2 ) == 0 ) -failed with expansion: +with expansion: 1 == 0 +MiscTests.cpp:115 -MiscTests.cpp:115: +PASSED: CHECK( ( fib[i] % 2 ) == 0 ) -passed with expansion: +with expansion: 0 == 0 +MiscTests.cpp:115 -MiscTests.cpp:114: info: Testing if fib[2] (2) is even +MiscTests.cpp:114 -MiscTests.cpp:114: info: Testing if fib[3] (3) is even +MiscTests.cpp:114 -MiscTests.cpp:115: +FAILED: CHECK( ( fib[i] % 2 ) == 0 ) -failed with expansion: +with expansion: 1 == 0 +MiscTests.cpp:115 -MiscTests.cpp:114: info: Testing if fib[4] (5) is even +MiscTests.cpp:114 -MiscTests.cpp:115: +FAILED: CHECK( ( fib[i] % 2 ) == 0 ) -failed with expansion: +with expansion: 1 == 0 +MiscTests.cpp:115 -MiscTests.cpp:115: +PASSED: CHECK( ( fib[i] % 2 ) == 0 ) -passed with expansion: +with expansion: 0 == 0 +MiscTests.cpp:115 -MiscTests.cpp:114: info: Testing if fib[5] (8) is even +MiscTests.cpp:114 -MiscTests.cpp:114: info: Testing if fib[6] (13) is even +MiscTests.cpp:114 -MiscTests.cpp:115: +FAILED: CHECK( ( fib[i] % 2 ) == 0 ) -failed with expansion: +with expansion: 1 == 0 +MiscTests.cpp:115 -MiscTests.cpp:114: info: Testing if fib[7] (21) is even +MiscTests.cpp:114 -MiscTests.cpp:115: +FAILED: CHECK( ( fib[i] % 2 ) == 0 ) -failed with expansion: +with expansion: 1 == 0 +MiscTests.cpp:115 Some information An error @@ -2102,87 +2440,97 @@ No assertions in test case, './succeeding/Misc/stdout,stderr' ./succeeding/Misc/null strings ----------------------------------------------------------------- -MiscTests.cpp:133: +PASSED: REQUIRE( makeString( false ) != static_cast(__null) ) -passed with expansion: +with expansion: "valid string" != {null string} +MiscTests.cpp:133 -MiscTests.cpp:134: +PASSED: REQUIRE( makeString( true ) == static_cast(__null) ) -passed with expansion: +with expansion: {null string} == {null string} +MiscTests.cpp:134 ----------------------------------------------------------------- ./failing/info ----------------------------------------------------------------- -MiscTests.cpp:139: info: hi +MiscTests.cpp:139 -MiscTests.cpp:141: info: i := 7 +MiscTests.cpp:141 -MiscTests.cpp:142: +FAILED: REQUIRE( false ) -failed +MiscTests.cpp:142 ----------------------------------------------------------------- ./succeeding/checkedif ----------------------------------------------------------------- -MiscTests.cpp:147: +PASSED: CHECKED_IF( flag ) -passed with expansion: +with expansion: true +MiscTests.cpp:147 -MiscTests.cpp:155: +PASSED: REQUIRE( testCheckedIf( true ) ) -passed with expansion: +with expansion: true +MiscTests.cpp:155 ----------------------------------------------------------------- ./failing/checkedif ----------------------------------------------------------------- -MiscTests.cpp:147: +FAILED: CHECKED_IF( flag ) -failed with expansion: +with expansion: false +MiscTests.cpp:147 -MiscTests.cpp:160: +FAILED: REQUIRE( testCheckedIf( false ) ) -failed with expansion: +with expansion: false +MiscTests.cpp:160 ----------------------------------------------------------------- ./succeeding/checkedelse ----------------------------------------------------------------- -MiscTests.cpp:165: +PASSED: CHECKED_ELSE( flag ) -passed with expansion: +with expansion: true +MiscTests.cpp:165 -MiscTests.cpp:173: +PASSED: REQUIRE( testCheckedElse( true ) ) -passed with expansion: +with expansion: true +MiscTests.cpp:173 ----------------------------------------------------------------- ./failing/checkedelse ----------------------------------------------------------------- -MiscTests.cpp:165: +FAILED: CHECKED_ELSE( flag ) -failed with expansion: +with expansion: false +MiscTests.cpp:165 -MiscTests.cpp:178: +FAILED: REQUIRE( testCheckedElse( false ) ) -failed with expansion: +with expansion: false +MiscTests.cpp:178 ----------------------------------------------------------------- ./misc/xmlentitycheck @@ -2204,147 +2552,165 @@ No assertions in section, 'encoded chars' ./manual/onechar ----------------------------------------------------------------- -MiscTests.cpp:195: info: 3 +MiscTests.cpp:195 -MiscTests.cpp:196: +FAILED: REQUIRE( false ) -failed +MiscTests.cpp:196 ----------------------------------------------------------------- ./succeeding/atomic if ----------------------------------------------------------------- -MiscTests.cpp:206: +PASSED: REQUIRE( x == 0 ) -passed with expansion: +with expansion: 0 == 0 +MiscTests.cpp:206 ----------------------------------------------------------------- ./succeeding/matchers ----------------------------------------------------------------- -MiscTests.cpp:216: +PASSED: REQUIRE_THAT( testStringForMatching() Contains( "string" ) ) -passed with expansion: +with expansion: "this string contains 'abc' as a substring" contains: "string" +MiscTests.cpp:216 -MiscTests.cpp:217: +PASSED: CHECK_THAT( testStringForMatching() Contains( "abc" ) ) -passed with expansion: +with expansion: "this string contains 'abc' as a substring" contains: "abc" +MiscTests.cpp:217 -MiscTests.cpp:219: +PASSED: CHECK_THAT( testStringForMatching() StartsWith( "this" ) ) -passed with expansion: +with expansion: "this string contains 'abc' as a substring" starts with: "this" +MiscTests.cpp:219 -MiscTests.cpp:220: +PASSED: CHECK_THAT( testStringForMatching() EndsWith( "substring" ) ) -passed with expansion: +with expansion: "this string contains 'abc' as a substring" ends with: "substring" +MiscTests.cpp:220 ----------------------------------------------------------------- ./failing/matchers/Contains ----------------------------------------------------------------- -MiscTests.cpp:225: +FAILED: CHECK_THAT( testStringForMatching() Contains( "not there" ) ) -failed with expansion: +with expansion: "this string contains 'abc' as a substring" contains: "not there" +MiscTests.cpp:225 ----------------------------------------------------------------- ./failing/matchers/StartsWith ----------------------------------------------------------------- -MiscTests.cpp:230: +FAILED: CHECK_THAT( testStringForMatching() StartsWith( "string" ) ) -failed with expansion: +with expansion: "this string contains 'abc' as a substring" starts with: "string" +MiscTests.cpp:230 ----------------------------------------------------------------- ./failing/matchers/EndsWith ----------------------------------------------------------------- -MiscTests.cpp:235: +FAILED: CHECK_THAT( testStringForMatching() EndsWith( "this" ) ) -failed with expansion: +with expansion: "this string contains 'abc' as a substring" ends with: "this" +MiscTests.cpp:235 ----------------------------------------------------------------- ./failing/matchers/Equals ----------------------------------------------------------------- -MiscTests.cpp:240: +FAILED: CHECK_THAT( testStringForMatching() Equals( "something else" ) ) -failed with expansion: +with expansion: "this string contains 'abc' as a substring" equals: "something else" +MiscTests.cpp:240 ----------------------------------------------------------------- /succeeding/matchers/AllOf ----------------------------------------------------------------- -MiscTests.cpp:248: +PASSED: CHECK_THAT( testStringForMatching() AllOf( Catch::Contains( "string" ), Catch::Contains( "abc" ) ) ) -passed with expansion: +with expansion: "this string contains 'abc' as a substring" ( contains: "string" and contains: "abc" ) +MiscTests.cpp:248 ----------------------------------------------------------------- /succeeding/matchers/AnyOf ----------------------------------------------------------------- -MiscTests.cpp:252: +PASSED: CHECK_THAT( testStringForMatching() AnyOf( Catch::Contains( "string" ), Catch::Contains( "not there" ) ) ) -passed with expansion: +with expansion: "this string contains 'abc' as a substring" ( contains: "string" or contains: "not there" ) +MiscTests.cpp:252 -MiscTests.cpp:253: +PASSED: CHECK_THAT( testStringForMatching() AnyOf( Catch::Contains( "not there" ), Catch::Contains( "string" ) ) ) -passed with expansion: +with expansion: "this string contains 'abc' as a substring" ( contains: "not there" or contains: "string" ) +MiscTests.cpp:253 ----------------------------------------------------------------- ./succeeding/matchers/Equals ----------------------------------------------------------------- -MiscTests.cpp:258: +PASSED: CHECK_THAT( testStringForMatching() Equals( "this string contains 'abc' as a substring" ) ) -passed with expansion: +with expansion: "this string contains 'abc' as a substring" equals: "this string contains 'abc' as a substring" +MiscTests.cpp:258 ----------------------------------------------------------------- example/factorial ----------------------------------------------------------------- -MiscTests.cpp:269: +PASSED: REQUIRE( Factorial(0) == 1 ) -passed with expansion: +with expansion: 1 == 1 +MiscTests.cpp:269 -MiscTests.cpp:270: +PASSED: REQUIRE( Factorial(1) == 1 ) -passed with expansion: +with expansion: 1 == 1 +MiscTests.cpp:270 -MiscTests.cpp:271: +PASSED: REQUIRE( Factorial(2) == 2 ) -passed with expansion: +with expansion: 2 == 2 +MiscTests.cpp:271 -MiscTests.cpp:272: +PASSED: REQUIRE( Factorial(3) == 6 ) -passed with expansion: +with expansion: 6 == 6 +MiscTests.cpp:272 -MiscTests.cpp:273: +PASSED: REQUIRE( Factorial(10) == 3628800 ) -passed with expansion: +with expansion: 0x == 3628800 +MiscTests.cpp:273 ----------------------------------------------------------------- empty @@ -2357,9 +2723,9 @@ No assertions in test case, 'empty' Nice descriptive name ----------------------------------------------------------------- -MiscTests.cpp:282: warning: This one ran +MiscTests.cpp:282 No assertions in test case, 'Nice descriptive name' @@ -2384,105 +2750,130 @@ selftest/main selftest/expected result/failing tests ----------------------------------------------------------------- -catch_self_test.hpp:114: -passed with message: +PASSED: +with message: Tests failed, as expected +catch_self_test.hpp:114 -catch_self_test.hpp:114: -passed with message: +PASSED: +with message: Tests failed, as expected +catch_self_test.hpp:114 -catch_self_test.hpp:114: -passed with message: +PASSED: +with message: Tests failed, as expected +catch_self_test.hpp:114 -catch_self_test.hpp:114: -passed with message: +PASSED: +with message: Tests failed, as expected +catch_self_test.hpp:114 -catch_self_test.hpp:114: -passed with message: +PASSED: +with message: Tests failed, as expected +catch_self_test.hpp:114 -catch_self_test.hpp:114: -passed with message: +PASSED: +with message: Tests failed, as expected +catch_self_test.hpp:114 -catch_self_test.hpp:114: -passed with message: +PASSED: +with message: Tests failed, as expected +catch_self_test.hpp:114 -catch_self_test.hpp:114: -passed with message: +PASSED: +with message: Tests failed, as expected +catch_self_test.hpp:114 -catch_self_test.hpp:114: -passed with message: +PASSED: +with message: Tests failed, as expected +catch_self_test.hpp:114 -catch_self_test.hpp:114: -passed with message: +PASSED: +with message: Tests failed, as expected +catch_self_test.hpp:114 -catch_self_test.hpp:114: -passed with message: +PASSED: +with message: Tests failed, as expected +catch_self_test.hpp:114 -catch_self_test.hpp:114: -passed with message: +PASSED: +with message: Tests failed, as expected +catch_self_test.hpp:114 -catch_self_test.hpp:114: -passed with message: +PASSED: +with message: Tests failed, as expected +catch_self_test.hpp:114 -catch_self_test.hpp:114: -passed with message: +PASSED: +with message: Tests failed, as expected +catch_self_test.hpp:114 -catch_self_test.hpp:114: -passed with message: +PASSED: +with message: Tests failed, as expected +catch_self_test.hpp:114 -catch_self_test.hpp:114: -passed with message: +PASSED: +with message: Tests failed, as expected +catch_self_test.hpp:114 -catch_self_test.hpp:114: -passed with message: +PASSED: +with message: Tests failed, as expected +catch_self_test.hpp:114 -catch_self_test.hpp:114: -passed with message: +PASSED: +with message: Tests failed, as expected +catch_self_test.hpp:114 -catch_self_test.hpp:114: -passed with message: +PASSED: +with message: Tests failed, as expected +catch_self_test.hpp:114 -catch_self_test.hpp:114: -passed with message: +PASSED: +with message: Tests failed, as expected +catch_self_test.hpp:114 -catch_self_test.hpp:114: -passed with message: +PASSED: +with message: Tests failed, as expected +catch_self_test.hpp:114 -catch_self_test.hpp:114: -passed with message: +PASSED: +with message: Tests failed, as expected +catch_self_test.hpp:114 -catch_self_test.hpp:114: -passed with message: +PASSED: +with message: Tests failed, as expected +catch_self_test.hpp:114 -catch_self_test.hpp:114: -passed with message: +PASSED: +with message: Tests failed, as expected +catch_self_test.hpp:114 -catch_self_test.hpp:114: -passed with message: +PASSED: +with message: Tests failed, as expected +catch_self_test.hpp:114 ----------------------------------------------------------------- selftest/main @@ -2490,185 +2881,229 @@ selftest/main selftest/expected result/succeeding tests ----------------------------------------------------------------- -catch_self_test.hpp:103: -passed with message: +PASSED: +with message: Tests passed, as expected +catch_self_test.hpp:103 -catch_self_test.hpp:103: -passed with message: +PASSED: +with message: Tests passed, as expected +catch_self_test.hpp:103 -catch_self_test.hpp:103: -passed with message: +PASSED: +with message: Tests passed, as expected +catch_self_test.hpp:103 -catch_self_test.hpp:103: -passed with message: +PASSED: +with message: Tests passed, as expected +catch_self_test.hpp:103 -catch_self_test.hpp:103: -passed with message: +PASSED: +with message: Tests passed, as expected +catch_self_test.hpp:103 -catch_self_test.hpp:103: -passed with message: +PASSED: +with message: Tests passed, as expected +catch_self_test.hpp:103 -catch_self_test.hpp:103: -passed with message: +PASSED: +with message: Tests passed, as expected +catch_self_test.hpp:103 -catch_self_test.hpp:103: -passed with message: +PASSED: +with message: Tests passed, as expected +catch_self_test.hpp:103 -catch_self_test.hpp:103: -passed with message: +PASSED: +with message: Tests passed, as expected +catch_self_test.hpp:103 -catch_self_test.hpp:103: -passed with message: +PASSED: +with message: Tests passed, as expected +catch_self_test.hpp:103 -catch_self_test.hpp:103: -passed with message: +PASSED: +with message: Tests passed, as expected +catch_self_test.hpp:103 -catch_self_test.hpp:103: -passed with message: +PASSED: +with message: Tests passed, as expected +catch_self_test.hpp:103 -catch_self_test.hpp:103: -passed with message: +PASSED: +with message: Tests passed, as expected +catch_self_test.hpp:103 -catch_self_test.hpp:103: -passed with message: +PASSED: +with message: Tests passed, as expected +catch_self_test.hpp:103 -catch_self_test.hpp:103: -passed with message: +PASSED: +with message: Tests passed, as expected +catch_self_test.hpp:103 -catch_self_test.hpp:103: -passed with message: +PASSED: +with message: Tests passed, as expected +catch_self_test.hpp:103 -catch_self_test.hpp:103: -passed with message: +PASSED: +with message: Tests passed, as expected +catch_self_test.hpp:103 -catch_self_test.hpp:103: -passed with message: +PASSED: +with message: Tests passed, as expected +catch_self_test.hpp:103 -catch_self_test.hpp:103: -passed with message: +PASSED: +with message: Tests passed, as expected +catch_self_test.hpp:103 -catch_self_test.hpp:103: -passed with message: +PASSED: +with message: Tests passed, as expected +catch_self_test.hpp:103 -catch_self_test.hpp:103: -passed with message: +PASSED: +with message: Tests passed, as expected +catch_self_test.hpp:103 -catch_self_test.hpp:103: -passed with message: +PASSED: +with message: Tests passed, as expected +catch_self_test.hpp:103 -catch_self_test.hpp:103: -passed with message: +PASSED: +with message: Tests passed, as expected +catch_self_test.hpp:103 -catch_self_test.hpp:103: -passed with message: +PASSED: +with message: Tests passed, as expected +catch_self_test.hpp:103 -catch_self_test.hpp:103: -passed with message: +PASSED: +with message: Tests passed, as expected +catch_self_test.hpp:103 Message from section one Message from section two -catch_self_test.hpp:103: -passed with message: +PASSED: +with message: Tests passed, as expected +catch_self_test.hpp:103 -catch_self_test.hpp:103: -passed with message: +PASSED: +with message: Tests passed, as expected +catch_self_test.hpp:103 -catch_self_test.hpp:103: -passed with message: +PASSED: +with message: Tests passed, as expected +catch_self_test.hpp:103 -catch_self_test.hpp:103: -passed with message: +PASSED: +with message: Tests passed, as expected +catch_self_test.hpp:103 Some information An error -catch_self_test.hpp:103: -passed with message: +PASSED: +with message: Tests passed, as expected +catch_self_test.hpp:103 -catch_self_test.hpp:103: -passed with message: +PASSED: +with message: Tests passed, as expected +catch_self_test.hpp:103 -catch_self_test.hpp:103: -passed with message: +PASSED: +with message: Tests passed, as expected +catch_self_test.hpp:103 -catch_self_test.hpp:103: -passed with message: +PASSED: +with message: Tests passed, as expected +catch_self_test.hpp:103 -catch_self_test.hpp:103: -passed with message: +PASSED: +with message: Tests passed, as expected +catch_self_test.hpp:103 -catch_self_test.hpp:103: -passed with message: +PASSED: +with message: Tests passed, as expected +catch_self_test.hpp:103 -catch_self_test.hpp:103: -passed with message: +PASSED: +with message: Tests passed, as expected +catch_self_test.hpp:103 -catch_self_test.hpp:103: -passed with message: +PASSED: +with message: Tests passed, as expected +catch_self_test.hpp:103 -catch_self_test.hpp:103: -passed with message: +PASSED: +with message: Tests passed, as expected +catch_self_test.hpp:103 -catch_self_test.hpp:103: -passed with message: +PASSED: +with message: Tests passed, as expected +catch_self_test.hpp:103 -catch_self_test.hpp:103: -passed with message: +PASSED: +with message: Tests passed, as expected +catch_self_test.hpp:103 -catch_self_test.hpp:103: -passed with message: +PASSED: +with message: Tests passed, as expected +catch_self_test.hpp:103 -catch_self_test.hpp:103: -passed with message: +PASSED: +with message: Tests passed, as expected +catch_self_test.hpp:103 -catch_self_test.hpp:103: -passed with message: +PASSED: +with message: Tests passed, as expected +catch_self_test.hpp:103 -catch_self_test.hpp:103: -passed with message: +PASSED: +with message: Tests passed, as expected +catch_self_test.hpp:103 Message from section one Message from section two @@ -2680,15 +3115,17 @@ selftest/main selftest/test counts/succeeding tests ----------------------------------------------------------------- -TestMain.cpp:40: +FAILED: CHECK( totals.assertions.passed == 291 ) -failed with expansion: +with expansion: 293 == 291 +TestMain.cpp:40 -TestMain.cpp:41: +PASSED: CHECK( totals.assertions.failed == 0 ) -passed with expansion: +with expansion: 0 == 0 +TestMain.cpp:41 ----------------------------------------------------------------- selftest/main @@ -2696,58 +3133,66 @@ selftest/main selftest/test counts/failing tests ----------------------------------------------------------------- -TestMain.cpp:47: +PASSED: CHECK( totals.assertions.passed == 1 ) -passed with expansion: +with expansion: 1 == 1 +TestMain.cpp:47 -TestMain.cpp:48: +PASSED: CHECK( totals.assertions.failed == 72 ) -passed with expansion: +with expansion: 72 == 72 +TestMain.cpp:48 ----------------------------------------------------------------- meta/Misc/Sections ----------------------------------------------------------------- -TestMain.cpp:57: +PASSED: CHECK( totals.assertions.passed == 2 ) -passed with expansion: +with expansion: 2 == 2 +TestMain.cpp:57 -TestMain.cpp:58: +PASSED: CHECK( totals.assertions.failed == 1 ) -passed with expansion: +with expansion: 1 == 1 +TestMain.cpp:58 ----------------------------------------------------------------- selftest/parser/2 default ----------------------------------------------------------------- -TestMain.cpp:97: +PASSED: CHECK_NOTHROW( parseIntoConfig( argv, config ) ) -passed +TestMain.cpp:97 -TestMain.cpp:99: +PASSED: CHECK( config.shouldDebugBreak == false ) -passed with expansion: +with expansion: false == false +TestMain.cpp:99 -TestMain.cpp:100: +PASSED: CHECK( config.cutoff == -1 ) -passed with expansion: +with expansion: -1 == -1 +TestMain.cpp:100 -TestMain.cpp:101: +PASSED: CHECK( config.allowThrows == true ) -passed with expansion: +with expansion: true == true +TestMain.cpp:101 -TestMain.cpp:102: +PASSED: CHECK( config.reporter.empty() ) -passed with expansion: +with expansion: true +TestMain.cpp:102 ----------------------------------------------------------------- selftest/parser/2 @@ -2755,24 +3200,27 @@ selftest/parser/2 -t/1 ----------------------------------------------------------------- -TestMain.cpp:108: +PASSED: CHECK_NOTHROW( parseIntoConfig( argv, config ) ) -passed +TestMain.cpp:108 -TestMain.cpp:110: +PASSED: REQUIRE( config.filters.size() == 1 ) -passed with expansion: +with expansion: 1 == 1 +TestMain.cpp:110 -TestMain.cpp:111: +PASSED: REQUIRE( config.filters[0].shouldInclude( fakeTestCase( "notIncluded" ) ) == false ) -passed with expansion: +with expansion: false == false +TestMain.cpp:111 -TestMain.cpp:112: +PASSED: REQUIRE( config.filters[0].shouldInclude( fakeTestCase( "test1" ) ) ) -passed with expansion: +with expansion: true +TestMain.cpp:112 ----------------------------------------------------------------- selftest/parser/2 @@ -2780,24 +3228,27 @@ selftest/parser/2 -t/exclude:1 ----------------------------------------------------------------- -TestMain.cpp:116: +PASSED: CHECK_NOTHROW( parseIntoConfig( argv, config ) ) -passed +TestMain.cpp:116 -TestMain.cpp:118: +PASSED: REQUIRE( config.filters.size() == 1 ) -passed with expansion: +with expansion: 1 == 1 +TestMain.cpp:118 -TestMain.cpp:119: +PASSED: REQUIRE( config.filters[0].shouldInclude( fakeTestCase( "test1" ) ) == false ) -passed with expansion: +with expansion: false == false +TestMain.cpp:119 -TestMain.cpp:120: +PASSED: REQUIRE( config.filters[0].shouldInclude( fakeTestCase( "alwaysIncluded" ) ) ) -passed with expansion: +with expansion: true +TestMain.cpp:120 ----------------------------------------------------------------- selftest/parser/2 @@ -2805,24 +3256,27 @@ selftest/parser/2 --test/1 ----------------------------------------------------------------- -TestMain.cpp:125: +PASSED: CHECK_NOTHROW( parseIntoConfig( argv, config ) ) -passed +TestMain.cpp:125 -TestMain.cpp:127: +PASSED: REQUIRE( config.filters.size() == 1 ) -passed with expansion: +with expansion: 1 == 1 +TestMain.cpp:127 -TestMain.cpp:128: +PASSED: REQUIRE( config.filters[0].shouldInclude( fakeTestCase( "notIncluded" ) ) == false ) -passed with expansion: +with expansion: false == false +TestMain.cpp:128 -TestMain.cpp:129: +PASSED: REQUIRE( config.filters[0].shouldInclude( fakeTestCase( "test1" ) ) ) -passed with expansion: +with expansion: true +TestMain.cpp:129 ----------------------------------------------------------------- selftest/parser/2 @@ -2830,24 +3284,27 @@ selftest/parser/2 --test/exclude:1 ----------------------------------------------------------------- -TestMain.cpp:134: +PASSED: CHECK_NOTHROW( parseIntoConfig( argv, config ) ) -passed +TestMain.cpp:134 -TestMain.cpp:136: +PASSED: REQUIRE( config.filters.size() == 1 ) -passed with expansion: +with expansion: 1 == 1 +TestMain.cpp:136 -TestMain.cpp:137: +PASSED: REQUIRE( config.filters[0].shouldInclude( fakeTestCase( "test1" ) ) == false ) -passed with expansion: +with expansion: false == false +TestMain.cpp:137 -TestMain.cpp:138: +PASSED: REQUIRE( config.filters[0].shouldInclude( fakeTestCase( "alwaysIncluded" ) ) ) -passed with expansion: +with expansion: true +TestMain.cpp:138 ----------------------------------------------------------------- selftest/parser/2 @@ -2855,24 +3312,27 @@ selftest/parser/2 --test/exclude:2 ----------------------------------------------------------------- -TestMain.cpp:143: +PASSED: CHECK_NOTHROW( parseIntoConfig( argv, config ) ) -passed +TestMain.cpp:143 -TestMain.cpp:145: +PASSED: REQUIRE( config.filters.size() == 1 ) -passed with expansion: +with expansion: 1 == 1 +TestMain.cpp:145 -TestMain.cpp:146: +PASSED: REQUIRE( config.filters[0].shouldInclude( fakeTestCase( "test1" ) ) == false ) -passed with expansion: +with expansion: false == false +TestMain.cpp:146 -TestMain.cpp:147: +PASSED: REQUIRE( config.filters[0].shouldInclude( fakeTestCase( "alwaysIncluded" ) ) ) -passed with expansion: +with expansion: true +TestMain.cpp:147 ----------------------------------------------------------------- selftest/parser/2 @@ -2880,29 +3340,33 @@ selftest/parser/2 -t/2 ----------------------------------------------------------------- -TestMain.cpp:152: +PASSED: CHECK_NOTHROW( parseIntoConfig( argv, config ) ) -passed +TestMain.cpp:152 -TestMain.cpp:154: +PASSED: REQUIRE( config.filters.size() == 1 ) -passed with expansion: +with expansion: 1 == 1 +TestMain.cpp:154 -TestMain.cpp:155: +PASSED: REQUIRE( config.filters[0].shouldInclude( fakeTestCase( "notIncluded" ) ) == false ) -passed with expansion: +with expansion: false == false +TestMain.cpp:155 -TestMain.cpp:156: +PASSED: REQUIRE( config.filters[0].shouldInclude( fakeTestCase( "test1" ) ) ) -passed with expansion: +with expansion: true +TestMain.cpp:156 -TestMain.cpp:157: +PASSED: REQUIRE( config.filters[0].shouldInclude( fakeTestCase( "test2" ) ) ) -passed with expansion: +with expansion: true +TestMain.cpp:157 ----------------------------------------------------------------- selftest/parser/2 @@ -2910,11 +3374,12 @@ selftest/parser/2 -t/0 ----------------------------------------------------------------- -TestMain.cpp:162: +PASSED: REQUIRE_THAT( parseIntoConfigAndReturnError( argv, config ) Contains( "at least 1" ) ) -passed with expansion: +with expansion: "Error while parsing arguments. Expected at least 1 argument." contains: "at least 1" +TestMain.cpp:162 ----------------------------------------------------------------- selftest/parser/2 @@ -2922,14 +3387,15 @@ selftest/parser/2 -r/console ----------------------------------------------------------------- -TestMain.cpp:169: +PASSED: CHECK_NOTHROW( parseIntoConfig( argv, config ) ) -passed +TestMain.cpp:169 -TestMain.cpp:171: +PASSED: REQUIRE( config.reporter == "console" ) -passed with expansion: +with expansion: "console" == "console" +TestMain.cpp:171 ----------------------------------------------------------------- selftest/parser/2 @@ -2937,14 +3403,15 @@ selftest/parser/2 -r/xml ----------------------------------------------------------------- -TestMain.cpp:175: +PASSED: CHECK_NOTHROW( parseIntoConfig( argv, config ) ) -passed +TestMain.cpp:175 -TestMain.cpp:177: +PASSED: REQUIRE( config.reporter == "xml" ) -passed with expansion: +with expansion: "xml" == "xml" +TestMain.cpp:177 ----------------------------------------------------------------- selftest/parser/2 @@ -2952,14 +3419,15 @@ selftest/parser/2 --reporter/junit ----------------------------------------------------------------- -TestMain.cpp:181: +PASSED: CHECK_NOTHROW( parseIntoConfig( argv, config ) ) -passed +TestMain.cpp:181 -TestMain.cpp:183: +PASSED: REQUIRE( config.reporter == "junit" ) -passed with expansion: +with expansion: "junit" == "junit" +TestMain.cpp:183 ----------------------------------------------------------------- selftest/parser/2 @@ -2967,11 +3435,12 @@ selftest/parser/2 -r/error ----------------------------------------------------------------- -TestMain.cpp:187: +PASSED: REQUIRE_THAT( parseIntoConfigAndReturnError( argv, config ) Contains( "1 argument" ) ) -passed with expansion: +with expansion: "Error while parsing arguments. Expected 1 argument. Arguments were: one two" contains: "1 argument" +TestMain.cpp:187 ----------------------------------------------------------------- selftest/parser/2 @@ -2979,14 +3448,15 @@ selftest/parser/2 -b ----------------------------------------------------------------- -TestMain.cpp:194: +PASSED: CHECK_NOTHROW( parseIntoConfig( argv, config ) ) -passed +TestMain.cpp:194 -TestMain.cpp:196: +PASSED: REQUIRE( config.shouldDebugBreak == true ) -passed with expansion: +with expansion: true == true +TestMain.cpp:196 ----------------------------------------------------------------- selftest/parser/2 @@ -2994,14 +3464,15 @@ selftest/parser/2 --break ----------------------------------------------------------------- -TestMain.cpp:200: +PASSED: CHECK_NOTHROW( parseIntoConfig( argv, config ) ) -passed +TestMain.cpp:200 -TestMain.cpp:202: +PASSED: REQUIRE( config.shouldDebugBreak ) -passed with expansion: +with expansion: true +TestMain.cpp:202 ----------------------------------------------------------------- selftest/parser/2 @@ -3009,11 +3480,12 @@ selftest/parser/2 -b ----------------------------------------------------------------- -TestMain.cpp:206: +PASSED: REQUIRE_THAT( parseIntoConfigAndReturnError( argv, config ) Contains( "0 arguments" ) ) -passed with expansion: +with expansion: "Error while parsing arguments. Expected 0 arguments. Arguments were: unexpected" contains: "0 arguments" +TestMain.cpp:206 ----------------------------------------------------------------- selftest/parser/2 @@ -3021,14 +3493,15 @@ selftest/parser/2 -a ----------------------------------------------------------------- -TestMain.cpp:213: +PASSED: CHECK_NOTHROW( parseIntoConfig( argv, config ) ) -passed +TestMain.cpp:213 -TestMain.cpp:215: +PASSED: REQUIRE( config.cutoff == 1 ) -passed with expansion: +with expansion: 1 == 1 +TestMain.cpp:215 ----------------------------------------------------------------- selftest/parser/2 @@ -3036,14 +3509,15 @@ selftest/parser/2 -a/2 ----------------------------------------------------------------- -TestMain.cpp:219: +PASSED: CHECK_NOTHROW( parseIntoConfig( argv, config ) ) -passed +TestMain.cpp:219 -TestMain.cpp:221: +PASSED: REQUIRE( config.cutoff == 2 ) -passed with expansion: +with expansion: 2 == 2 +TestMain.cpp:221 ----------------------------------------------------------------- selftest/parser/2 @@ -3051,11 +3525,12 @@ selftest/parser/2 -a/error/0 ----------------------------------------------------------------- -TestMain.cpp:225: +PASSED: REQUIRE_THAT( parseIntoConfigAndReturnError( argv, config ) Contains( "greater than zero" ) ) -passed with expansion: +with expansion: "Error while parsing arguments. threshold must be a number greater than zero. Arguments were: 0" contains: "greater than zero" +TestMain.cpp:225 ----------------------------------------------------------------- selftest/parser/2 @@ -3063,11 +3538,12 @@ selftest/parser/2 -a/error/non numeric ----------------------------------------------------------------- -TestMain.cpp:229: +PASSED: REQUIRE_THAT( parseIntoConfigAndReturnError( argv, config ) Contains( "greater than zero" ) ) -passed with expansion: +with expansion: "Error while parsing arguments. threshold must be a number greater than zero. Arguments were: oops" contains: "greater than zero" +TestMain.cpp:229 ----------------------------------------------------------------- selftest/parser/2 @@ -3075,11 +3551,12 @@ selftest/parser/2 -a/error/two args ----------------------------------------------------------------- -TestMain.cpp:233: +PASSED: REQUIRE_THAT( parseIntoConfigAndReturnError( argv, config ) Contains( "0 and 1 argument" ) ) -passed with expansion: +with expansion: "Error while parsing arguments. Expected between 0 and 1 argument. Arguments were: 1 2" contains: "0 and 1 argument" +TestMain.cpp:233 ----------------------------------------------------------------- selftest/parser/2 @@ -3087,14 +3564,15 @@ selftest/parser/2 -nt ----------------------------------------------------------------- -TestMain.cpp:240: +PASSED: CHECK_NOTHROW( parseIntoConfig( argv, config ) ) -passed +TestMain.cpp:240 -TestMain.cpp:242: +PASSED: REQUIRE( config.allowThrows == false ) -passed with expansion: +with expansion: false == false +TestMain.cpp:242 ----------------------------------------------------------------- selftest/parser/2 @@ -3102,14 +3580,15 @@ selftest/parser/2 --nothrow ----------------------------------------------------------------- -TestMain.cpp:246: +PASSED: CHECK_NOTHROW( parseIntoConfig( argv, config ) ) -passed +TestMain.cpp:246 -TestMain.cpp:248: +PASSED: REQUIRE( config.allowThrows == false ) -passed with expansion: +with expansion: false == false +TestMain.cpp:248 ----------------------------------------------------------------- selftest/parser/2 @@ -3117,19 +3596,21 @@ selftest/parser/2 -o filename ----------------------------------------------------------------- -TestMain.cpp:255: +PASSED: CHECK_NOTHROW( parseIntoConfig( argv, config ) ) -passed +TestMain.cpp:255 -TestMain.cpp:257: +PASSED: REQUIRE( config.outputFilename == "filename.ext" ) -passed with expansion: +with expansion: "filename.ext" == "filename.ext" +TestMain.cpp:257 -TestMain.cpp:258: +PASSED: REQUIRE( config.stream.empty() ) -passed with expansion: +with expansion: true +TestMain.cpp:258 ----------------------------------------------------------------- selftest/parser/2 @@ -3137,19 +3618,21 @@ selftest/parser/2 -o %stdout ----------------------------------------------------------------- -TestMain.cpp:262: +PASSED: CHECK_NOTHROW( parseIntoConfig( argv, config ) ) -passed +TestMain.cpp:262 -TestMain.cpp:264: +PASSED: REQUIRE( config.stream == "stdout" ) -passed with expansion: +with expansion: "stdout" == "stdout" +TestMain.cpp:264 -TestMain.cpp:265: +PASSED: REQUIRE( config.outputFilename.empty() ) -passed with expansion: +with expansion: true +TestMain.cpp:265 ----------------------------------------------------------------- selftest/parser/2 @@ -3157,14 +3640,15 @@ selftest/parser/2 --out ----------------------------------------------------------------- -TestMain.cpp:269: +PASSED: CHECK_NOTHROW( parseIntoConfig( argv, config ) ) -passed +TestMain.cpp:269 -TestMain.cpp:271: +PASSED: REQUIRE( config.outputFilename == "filename.ext" ) -passed with expansion: +with expansion: "filename.ext" == "filename.ext" +TestMain.cpp:271 ----------------------------------------------------------------- selftest/parser/2 @@ -3172,334 +3656,386 @@ selftest/parser/2 -a -b ----------------------------------------------------------------- -TestMain.cpp:278: +PASSED: CHECK_NOTHROW( parseIntoConfig( argv, config ) ) -passed +TestMain.cpp:278 -TestMain.cpp:280: +PASSED: CHECK( config.cutoff == 1 ) -passed with expansion: +with expansion: 1 == 1 +TestMain.cpp:280 -TestMain.cpp:281: +PASSED: CHECK( config.shouldDebugBreak ) -passed with expansion: +with expansion: true +TestMain.cpp:281 -TestMain.cpp:282: +PASSED: CHECK( config.allowThrows == false ) -passed with expansion: +with expansion: false == false +TestMain.cpp:282 ----------------------------------------------------------------- selftest/test filter ----------------------------------------------------------------- -TestMain.cpp:291: +PASSED: CHECK( matchAny.shouldInclude( fakeTestCase( "any" ) ) ) -passed with expansion: +with expansion: true +TestMain.cpp:291 -TestMain.cpp:292: +PASSED: CHECK( matchNone.shouldInclude( fakeTestCase( "any" ) ) == false ) -passed with expansion: +with expansion: false == false +TestMain.cpp:292 -TestMain.cpp:297: +PASSED: CHECK( matchHidden.shouldInclude( fakeTestCase( "any" ) ) == false ) -passed with expansion: +with expansion: false == false +TestMain.cpp:297 -TestMain.cpp:298: +PASSED: CHECK( matchNonHidden.shouldInclude( fakeTestCase( "any" ) ) ) -passed with expansion: +with expansion: true +TestMain.cpp:298 -TestMain.cpp:300: +PASSED: CHECK( matchHidden.shouldInclude( fakeTestCase( "./any" ) ) ) -passed with expansion: +with expansion: true +TestMain.cpp:300 -TestMain.cpp:301: +PASSED: CHECK( matchNonHidden.shouldInclude( fakeTestCase( "./any" ) ) == false ) -passed with expansion: +with expansion: false == false +TestMain.cpp:301 ----------------------------------------------------------------- selftest/test filters ----------------------------------------------------------------- -TestMain.cpp:312: +PASSED: CHECK( matchHidden.shouldInclude( fakeTestCase( "./something" ) ) ) -passed with expansion: +with expansion: true +TestMain.cpp:312 -TestMain.cpp:314: +PASSED: CHECK( filters.shouldInclude( fakeTestCase( "any" ) ) == false ) -passed with expansion: +with expansion: false == false +TestMain.cpp:314 -TestMain.cpp:315: +PASSED: CHECK( filters.shouldInclude( fakeTestCase( "./something" ) ) ) -passed with expansion: +with expansion: true +TestMain.cpp:315 -TestMain.cpp:316: +PASSED: CHECK( filters.shouldInclude( fakeTestCase( "./anything" ) ) == false ) -passed with expansion: +with expansion: false == false +TestMain.cpp:316 ----------------------------------------------------------------- selftest/filter/prefix wildcard ----------------------------------------------------------------- -TestMain.cpp:322: +PASSED: CHECK( matchBadgers.shouldInclude( fakeTestCase( "big badger" ) ) ) -passed with expansion: +with expansion: true +TestMain.cpp:322 -TestMain.cpp:323: +PASSED: CHECK( matchBadgers.shouldInclude( fakeTestCase( "little badgers" ) ) == false ) -passed with expansion: +with expansion: false == false +TestMain.cpp:323 ----------------------------------------------------------------- selftest/filter/wildcard at both ends ----------------------------------------------------------------- -TestMain.cpp:328: +PASSED: CHECK( matchBadgers.shouldInclude( fakeTestCase( "big badger" ) ) ) -passed with expansion: +with expansion: true +TestMain.cpp:328 -TestMain.cpp:329: +PASSED: CHECK( matchBadgers.shouldInclude( fakeTestCase( "little badgers" ) ) ) -passed with expansion: +with expansion: true +TestMain.cpp:329 -TestMain.cpp:330: +PASSED: CHECK( matchBadgers.shouldInclude( fakeTestCase( "badgers are big" ) ) ) -passed with expansion: +with expansion: true +TestMain.cpp:330 -TestMain.cpp:331: +PASSED: CHECK( matchBadgers.shouldInclude( fakeTestCase( "hedgehogs" ) ) == false ) -passed with expansion: +with expansion: false == false +TestMain.cpp:331 ----------------------------------------------------------------- selftest/option parsers ----------------------------------------------------------------- -TestMain.cpp:351: +PASSED: CHECK_NOTHROW( opt.parseIntoConfig( parser, config ) ) -passed +TestMain.cpp:351 -TestMain.cpp:353: +PASSED: REQUIRE( config.filters.size() == 1 ) -passed with expansion: +with expansion: 1 == 1 +TestMain.cpp:353 -TestMain.cpp:354: +PASSED: REQUIRE( config.filters[0].shouldInclude( fakeTestCase( "notIncluded" ) ) == false ) -passed with expansion: +with expansion: false == false +TestMain.cpp:354 -TestMain.cpp:355: +PASSED: REQUIRE( config.filters[0].shouldInclude( fakeTestCase( "test1" ) ) ) -passed with expansion: +with expansion: true +TestMain.cpp:355 ----------------------------------------------------------------- selftest/tags one tag ----------------------------------------------------------------- -TestMain.cpp:369: +PASSED: CHECK( oneTag.getTestCaseInfo().description == "" ) -passed with expansion: +with expansion: "" == "" +TestMain.cpp:369 -TestMain.cpp:370: +PASSED: CHECK( oneTag.hasTag( "one" ) ) -passed with expansion: +with expansion: true +TestMain.cpp:370 -TestMain.cpp:371: +PASSED: CHECK( oneTag.getTags().size() == 1 ) -passed with expansion: +with expansion: 1 == 1 +TestMain.cpp:371 -TestMain.cpp:373: +PASSED: CHECK( oneTag.matchesTags( p1 ) == true ) -passed with expansion: +with expansion: true == true +TestMain.cpp:373 -TestMain.cpp:374: +PASSED: CHECK( oneTag.matchesTags( p2 ) == true ) -passed with expansion: +with expansion: true == true +TestMain.cpp:374 -TestMain.cpp:375: +PASSED: CHECK( oneTag.matchesTags( p3 ) == false ) -passed with expansion: +with expansion: false == false +TestMain.cpp:375 -TestMain.cpp:376: +PASSED: CHECK( oneTag.matchesTags( p4 ) == false ) -passed with expansion: +with expansion: false == false +TestMain.cpp:376 -TestMain.cpp:377: +PASSED: CHECK( oneTag.matchesTags( p5 ) == false ) -passed with expansion: +with expansion: false == false +TestMain.cpp:377 ----------------------------------------------------------------- selftest/tags two tags ----------------------------------------------------------------- -TestMain.cpp:383: +PASSED: CHECK( twoTags.getTestCaseInfo().description == "" ) -passed with expansion: +with expansion: "" == "" +TestMain.cpp:383 -TestMain.cpp:384: +PASSED: CHECK( twoTags.hasTag( "one" ) ) -passed with expansion: +with expansion: true +TestMain.cpp:384 -TestMain.cpp:385: +PASSED: CHECK( twoTags.hasTag( "two" ) ) -passed with expansion: +with expansion: true +TestMain.cpp:385 -TestMain.cpp:386: +PASSED: CHECK( twoTags.hasTag( "three" ) == false ) -passed with expansion: +with expansion: false == false +TestMain.cpp:386 -TestMain.cpp:387: +PASSED: CHECK( twoTags.getTags().size() == 2 ) -passed with expansion: +with expansion: 2 == 2 +TestMain.cpp:387 -TestMain.cpp:389: +PASSED: CHECK( twoTags.matchesTags( p1 ) == true ) -passed with expansion: +with expansion: true == true +TestMain.cpp:389 -TestMain.cpp:390: +PASSED: CHECK( twoTags.matchesTags( p2 ) == true ) -passed with expansion: +with expansion: true == true +TestMain.cpp:390 -TestMain.cpp:391: +PASSED: CHECK( twoTags.matchesTags( p3 ) == true ) -passed with expansion: +with expansion: true == true +TestMain.cpp:391 -TestMain.cpp:392: +PASSED: CHECK( twoTags.matchesTags( p4 ) == true ) -passed with expansion: +with expansion: true == true +TestMain.cpp:392 -TestMain.cpp:393: +PASSED: CHECK( twoTags.matchesTags( p5 ) == true ) -passed with expansion: +with expansion: true == true +TestMain.cpp:393 ----------------------------------------------------------------- selftest/tags one tag with characters either side ----------------------------------------------------------------- -TestMain.cpp:399: +PASSED: CHECK( oneTagWithExtras.getTestCaseInfo().description == "1234" ) -passed with expansion: +with expansion: "1234" == "1234" +TestMain.cpp:399 -TestMain.cpp:400: +PASSED: CHECK( oneTagWithExtras.hasTag( "one" ) ) -passed with expansion: +with expansion: true +TestMain.cpp:400 -TestMain.cpp:401: +PASSED: CHECK( oneTagWithExtras.hasTag( "two" ) == false ) -passed with expansion: +with expansion: false == false +TestMain.cpp:401 -TestMain.cpp:402: +PASSED: CHECK( oneTagWithExtras.getTags().size() == 1 ) -passed with expansion: +with expansion: 1 == 1 +TestMain.cpp:402 ----------------------------------------------------------------- selftest/tags start of a tag, but not closed ----------------------------------------------------------------- -TestMain.cpp:409: +PASSED: CHECK( oneTagOpen.getTestCaseInfo().description == "[one" ) -passed with expansion: +with expansion: "[one" == "[one" +TestMain.cpp:409 -TestMain.cpp:410: +PASSED: CHECK( oneTagOpen.hasTag( "one" ) == false ) -passed with expansion: +with expansion: false == false +TestMain.cpp:410 -TestMain.cpp:411: +PASSED: CHECK( oneTagOpen.getTags().size() == 0 ) -passed with expansion: +with expansion: 0 == 0 +TestMain.cpp:411 ----------------------------------------------------------------- selftest/tags hidden ----------------------------------------------------------------- -TestMain.cpp:417: +PASSED: CHECK( oneTag.getTestCaseInfo().description == "" ) -passed with expansion: +with expansion: "" == "" +TestMain.cpp:417 -TestMain.cpp:418: +PASSED: CHECK( oneTag.hasTag( "hide" ) ) -passed with expansion: +with expansion: true +TestMain.cpp:418 -TestMain.cpp:419: +PASSED: CHECK( oneTag.isHidden() ) -passed with expansion: +with expansion: true +TestMain.cpp:419 -TestMain.cpp:421: +PASSED: CHECK( oneTag.matchesTags( "~[hide]" ) == false ) -passed with expansion: +with expansion: false == false +TestMain.cpp:421 ----------------------------------------------------------------- ./succeeding/Tricky/std::pair ----------------------------------------------------------------- -TrickyTests.cpp:37: +PASSED: REQUIRE( (std::pair( 1, 2 )) == aNicePair ) -passed with expansion: +with expansion: std::pair( 1, 2 ) == std::pair( 1, 2 ) +TrickyTests.cpp:37 ----------------------------------------------------------------- ./inprogress/failing/Tricky/trailing expression ----------------------------------------------------------------- -TrickyTests.cpp:55: warning: Uncomment the code in this test to check that it gives a sensible compiler error +TrickyTests.cpp:55 No assertions in test case, './inprogress/failing/Tricky/trailing expression' @@ -3508,10 +4044,10 @@ No assertions in test case, './inprogress/failing/Tricky/trailing expression' ./inprogress/failing/Tricky/compound lhs ----------------------------------------------------------------- -TrickyTests.cpp:71: warning: Uncomment the code in this test to check that it gives a sensible compiler error +TrickyTests.cpp:71 No assertions in test case, './inprogress/failing/Tricky/compound lhs' @@ -3520,170 +4056,191 @@ No assertions in test case, './inprogress/failing/Tricky/compound lhs' ./failing/Tricky/non streamable type ----------------------------------------------------------------- -TrickyTests.cpp:95: +FAILED: CHECK( &o1 == &o2 ) -failed with expansion: +with expansion: 0x == 0x +TrickyTests.cpp:95 -TrickyTests.cpp:96: +FAILED: CHECK( o1 == o2 ) -failed with expansion: +with expansion: {?} == {?} +TrickyTests.cpp:96 ----------------------------------------------------------------- ./failing/string literals ----------------------------------------------------------------- -TrickyTests.cpp:106: +FAILED: REQUIRE( std::string( "first" ) == "second" ) -failed with expansion: +with expansion: "first" == "second" +TrickyTests.cpp:106 ----------------------------------------------------------------- ./succeeding/side-effects ----------------------------------------------------------------- -TrickyTests.cpp:119: +PASSED: REQUIRE( i++ == 7 ) -passed with expansion: +with expansion: 7 == 7 +TrickyTests.cpp:119 -TrickyTests.cpp:120: +PASSED: REQUIRE( i++ == 8 ) -passed with expansion: +with expansion: 8 == 8 +TrickyTests.cpp:120 ----------------------------------------------------------------- ./succeeding/koenig ----------------------------------------------------------------- -TrickyTests.cpp:186: +PASSED: REQUIRE( 0x == o ) -passed with expansion: +with expansion: 0x == {?} +TrickyTests.cpp:186 ----------------------------------------------------------------- ./succeeding/non-const== ----------------------------------------------------------------- -TrickyTests.cpp:212: +PASSED: REQUIRE( t == 1u ) -passed with expansion: +with expansion: {?} == 1 +TrickyTests.cpp:212 ----------------------------------------------------------------- ./succeeding/enum/bits ----------------------------------------------------------------- -TrickyTests.cpp:224: +PASSED: REQUIRE( 0x == bit30and31 ) -passed with expansion: +with expansion: 0x == 3221225472 +TrickyTests.cpp:224 ----------------------------------------------------------------- ./succeeding/boolean member ----------------------------------------------------------------- -TrickyTests.cpp:239: +PASSED: REQUIRE( obj.prop != __null ) -passed with expansion: +with expansion: 0x != 0 +TrickyTests.cpp:239 ----------------------------------------------------------------- ./succeeding/unimplemented static bool compare to true ----------------------------------------------------------------- -TrickyTests.cpp:259: +PASSED: REQUIRE( is_true::value == true ) -passed with expansion: +with expansion: true == true +TrickyTests.cpp:259 -TrickyTests.cpp:260: +PASSED: REQUIRE( true == is_true::value ) -passed with expansion: +with expansion: true == true +TrickyTests.cpp:260 ----------------------------------------------------------------- ./succeeding/unimplemented static bool compare to false ----------------------------------------------------------------- -TrickyTests.cpp:264: +PASSED: REQUIRE( is_true::value == false ) -passed with expansion: +with expansion: false == false +TrickyTests.cpp:264 -TrickyTests.cpp:265: +PASSED: REQUIRE( false == is_true::value ) -passed with expansion: +with expansion: false == false +TrickyTests.cpp:265 ----------------------------------------------------------------- ./succeeding/unimplemented static bool negation ----------------------------------------------------------------- -TrickyTests.cpp:270: +PASSED: REQUIRE( !is_true::value ) -passed with expansion: +with expansion: true +TrickyTests.cpp:270 ----------------------------------------------------------------- ./succeeding/unimplemented static bool double negation ----------------------------------------------------------------- -TrickyTests.cpp:275: +PASSED: REQUIRE( !!is_true::value ) -passed with expansion: +with expansion: true +TrickyTests.cpp:275 ----------------------------------------------------------------- ./succeeding/unimplemented static bool direct ----------------------------------------------------------------- -TrickyTests.cpp:280: +PASSED: REQUIRE( is_true::value ) -passed with expansion: +with expansion: true +TrickyTests.cpp:280 -TrickyTests.cpp:281: +PASSED: REQUIRE_FALSE( !is_true::value ) -passed with expansion: +with expansion: !false +TrickyTests.cpp:281 ----------------------------------------------------------------- ./succeeding/SafeBool ----------------------------------------------------------------- -TrickyTests.cpp:313: +PASSED: CHECK( True ) -passed with expansion: +with expansion: true +TrickyTests.cpp:313 -TrickyTests.cpp:314: +PASSED: CHECK( !False ) -passed with expansion: +with expansion: true +TrickyTests.cpp:314 -TrickyTests.cpp:315: +PASSED: CHECK_FALSE( !False ) -passed with expansion: +with expansion: !false +TrickyTests.cpp:315 ----------------------------------------------------------------- Scenario: Do that thing with the thing Given: This stuff exists - When: I do this - Then: it should do this + When: I do this + Then: it should do this ----------------------------------------------------------------- -BDDTests.cpp:29: +PASSED: REQUIRE( itDoesThis() ) -passed with expansion: +with expansion: true +BDDTests.cpp:29 ================================================================= 96 test cases - 45 failed (610 assertions - 102 failed) @@ -3696,237 +4253,273 @@ Run with -? for options ./succeeding/Approx/simple ----------------------------------------------------------------- -ApproxTests.cpp:20: +PASSED: REQUIRE( d == Approx( 1.23 ) ) -passed with expansion: +with expansion: 1.23 == Approx( 1.23 ) +ApproxTests.cpp:20 -ApproxTests.cpp:21: +PASSED: REQUIRE( d != Approx( 1.22 ) ) -passed with expansion: +with expansion: 1.23 != Approx( 1.22 ) +ApproxTests.cpp:21 -ApproxTests.cpp:22: +PASSED: REQUIRE( d != Approx( 1.24 ) ) -passed with expansion: +with expansion: 1.23 != Approx( 1.24 ) +ApproxTests.cpp:22 -ApproxTests.cpp:24: +PASSED: REQUIRE( Approx( d ) == 1.23 ) -passed with expansion: +with expansion: Approx( 1.23 ) == 1.23 +ApproxTests.cpp:24 -ApproxTests.cpp:25: +PASSED: REQUIRE( Approx( d ) != 1.22 ) -passed with expansion: +with expansion: Approx( 1.23 ) != 1.22 +ApproxTests.cpp:25 -ApproxTests.cpp:26: +PASSED: REQUIRE( Approx( d ) != 1.24 ) -passed with expansion: +with expansion: Approx( 1.23 ) != 1.24 +ApproxTests.cpp:26 ----------------------------------------------------------------- ./succeeding/Approx/epsilon ----------------------------------------------------------------- -ApproxTests.cpp:38: +PASSED: REQUIRE( d != Approx( 1.231 ) ) -passed with expansion: +with expansion: 1.23 != Approx( 1.231 ) +ApproxTests.cpp:38 -ApproxTests.cpp:39: +PASSED: REQUIRE( d == Approx( 1.231 ).epsilon( 0.1 ) ) -passed with expansion: +with expansion: 1.23 == Approx( 1.231 ) +ApproxTests.cpp:39 ----------------------------------------------------------------- ./succeeding/Approx/float ----------------------------------------------------------------- -ApproxTests.cpp:49: +PASSED: REQUIRE( 1.23f == Approx( 1.23f ) ) -passed with expansion: +with expansion: 1.23 == Approx( 1.23 ) +ApproxTests.cpp:49 -ApproxTests.cpp:50: +PASSED: REQUIRE( 0.0f == Approx( 0.0f ) ) -passed with expansion: +with expansion: 0 == Approx( 0 ) +ApproxTests.cpp:50 ----------------------------------------------------------------- ./succeeding/Approx/int ----------------------------------------------------------------- -ApproxTests.cpp:60: +PASSED: REQUIRE( 1 == Approx( 1 ) ) -passed +ApproxTests.cpp:60 -ApproxTests.cpp:61: +PASSED: REQUIRE( 0 == Approx( 0 ) ) -passed +ApproxTests.cpp:61 ----------------------------------------------------------------- ./succeeding/Approx/mixed ----------------------------------------------------------------- -ApproxTests.cpp:75: +PASSED: REQUIRE( 1.0f == Approx( 1 ) ) -passed with expansion: +with expansion: 1 == Approx( 1 ) +ApproxTests.cpp:75 -ApproxTests.cpp:76: +PASSED: REQUIRE( 0 == Approx( dZero) ) -passed with expansion: +with expansion: 0 == Approx( 0 ) +ApproxTests.cpp:76 -ApproxTests.cpp:77: +PASSED: REQUIRE( 0 == Approx( dSmall ).epsilon( 0.001 ) ) -passed with expansion: +with expansion: 0 == Approx( 1e-05 ) +ApproxTests.cpp:77 -ApproxTests.cpp:78: +PASSED: REQUIRE( 1.234f == Approx( dMedium ) ) -passed with expansion: +with expansion: 1.234 == Approx( 1.234 ) +ApproxTests.cpp:78 -ApproxTests.cpp:79: +PASSED: REQUIRE( dMedium == Approx( 1.234f ) ) -passed with expansion: +with expansion: 1.234 == Approx( 1.234 ) +ApproxTests.cpp:79 ----------------------------------------------------------------- ./succeeding/Approx/custom ----------------------------------------------------------------- -ApproxTests.cpp:93: +PASSED: REQUIRE( d == approx( 1.23 ) ) -passed with expansion: +with expansion: 1.23 == Approx( 1.23 ) +ApproxTests.cpp:93 -ApproxTests.cpp:94: +PASSED: REQUIRE( d == approx( 1.22 ) ) -passed with expansion: +with expansion: 1.23 == Approx( 1.22 ) +ApproxTests.cpp:94 -ApproxTests.cpp:95: +PASSED: REQUIRE( d == approx( 1.24 ) ) -passed with expansion: +with expansion: 1.23 == Approx( 1.24 ) +ApproxTests.cpp:95 -ApproxTests.cpp:96: +PASSED: REQUIRE( d != approx( 1.25 ) ) -passed with expansion: +with expansion: 1.23 != Approx( 1.25 ) +ApproxTests.cpp:96 -ApproxTests.cpp:98: +PASSED: REQUIRE( approx( d ) == 1.23 ) -passed with expansion: +with expansion: Approx( 1.23 ) == 1.23 +ApproxTests.cpp:98 -ApproxTests.cpp:99: +PASSED: REQUIRE( approx( d ) == 1.22 ) -passed with expansion: +with expansion: Approx( 1.23 ) == 1.22 +ApproxTests.cpp:99 -ApproxTests.cpp:100: +PASSED: REQUIRE( approx( d ) == 1.24 ) -passed with expansion: +with expansion: Approx( 1.23 ) == 1.24 +ApproxTests.cpp:100 -ApproxTests.cpp:101: +PASSED: REQUIRE( approx( d ) != 1.25 ) -passed with expansion: +with expansion: Approx( 1.23 ) != 1.25 +ApproxTests.cpp:101 ----------------------------------------------------------------- ./succeeding/TestClass/succeedingCase ----------------------------------------------------------------- -ClassTests.cpp:24: +PASSED: REQUIRE( s == "hello" ) -passed with expansion: +with expansion: "hello" == "hello" +ClassTests.cpp:24 ----------------------------------------------------------------- ./failing/TestClass/failingCase ----------------------------------------------------------------- -ClassTests.cpp:28: +FAILED: REQUIRE( s == "world" ) -failed with expansion: +with expansion: "hello" == "world" +ClassTests.cpp:28 ----------------------------------------------------------------- ./succeeding/Fixture/succeedingCase ----------------------------------------------------------------- -ClassTests.cpp:47: +PASSED: REQUIRE( m_a == 1 ) -passed with expansion: +with expansion: 1 == 1 +ClassTests.cpp:47 ----------------------------------------------------------------- ./failing/Fixture/failingCase ----------------------------------------------------------------- -ClassTests.cpp:55: +FAILED: REQUIRE( m_a == 2 ) -failed with expansion: +with expansion: 1 == 2 +ClassTests.cpp:55 ----------------------------------------------------------------- ./succeeding/conditions/equality ----------------------------------------------------------------- -ConditionTests.cpp:55: +PASSED: REQUIRE( data.int_seven == 7 ) -passed with expansion: +with expansion: 7 == 7 +ConditionTests.cpp:55 -ConditionTests.cpp:56: +PASSED: REQUIRE( data.float_nine_point_one == Approx( 9.1f ) ) -passed with expansion: +with expansion: 9.1 == Approx( 9.1 ) +ConditionTests.cpp:56 -ConditionTests.cpp:57: +PASSED: REQUIRE( data.double_pi == Approx( 3.1415926535 ) ) -passed with expansion: +with expansion: 3.14159 == Approx( 3.14159 ) +ConditionTests.cpp:57 -ConditionTests.cpp:58: +PASSED: REQUIRE( data.str_hello == "hello" ) -passed with expansion: +with expansion: "hello" == "hello" +ConditionTests.cpp:58 -ConditionTests.cpp:59: +PASSED: REQUIRE( "hello" == data.str_hello ) -passed with expansion: +with expansion: "hello" == "hello" +ConditionTests.cpp:59 -ConditionTests.cpp:60: +PASSED: REQUIRE( data.str_hello.size() == 5 ) -passed with expansion: +with expansion: 5 == 5 +ConditionTests.cpp:60 -ConditionTests.cpp:63: +PASSED: REQUIRE( x == Approx( 1.3 ) ) -passed with expansion: +with expansion: 1.3 == Approx( 1.3 ) +ConditionTests.cpp:63 ----------------------------------------------------------------- ./failing/conditions/equality ----------------------------------------------------------------- -ConditionTests.cpp:71: +FAILED: CHECK( data.int_seven == 6 ) -failed with expansion: +with expansion: 7 == 6 +ConditionTests.cpp:71 -ConditionTests.cpp:72: +FAILED: CHECK( data.int_seven == 8 ) -failed with expansion: +with expansion: 7 == 8 +ConditionTests.cpp:72 ================================================================= 12 test cases - 3 failed (38 assertions - 4 failed) @@ -9275,8 +9868,8 @@ TrickyTests.cpp" line="315">
-
-
+
+
BDDTests.cpp" line="29"> itDoesThis() @@ -10631,12 +11224,12 @@ TrickyTests.cpp:315: !False succeeded for: !false [Running: Scenario: Do that thing with the thing] [Started section: ' Given: This stuff exists'] -[Started section: ' When: I do this'] -[Started section: ' Then: it should do this'] +[Started section: ' When: I do this'] +[Started section: ' Then: it should do this'] BDDTests.cpp:29: itDoesThis() succeeded for: true -[End of section: ' Then: it should do this' 1 assertion passed] +[End of section: ' Then: it should do this' 1 assertion passed] -[End of section: ' When: I do this' 1 assertion passed] +[End of section: ' When: I do this' 1 assertion passed] [End of section: ' Given: This stuff exists' 1 assertion passed] diff --git a/projects/XCode4/CatchSelfTest/CatchSelfTest/BDDTests.cpp b/projects/XCode4/CatchSelfTest/CatchSelfTest/BDDTests.cpp index 1a8807f6..43d40068 100644 --- a/projects/XCode4/CatchSelfTest/CatchSelfTest/BDDTests.cpp +++ b/projects/XCode4/CatchSelfTest/CatchSelfTest/BDDTests.cpp @@ -15,8 +15,8 @@ // !TBD: story scenarios map to class based tests #define SCENARIO( name, tags ) TEST_CASE( "Scenario: " name, tags ) #define GIVEN( desc ) SECTION( " Given: " desc, "" ) -#define WHEN( desc ) SECTION( " When: " desc, "" ) -#define THEN( desc ) SECTION( " Then: " desc, "" ) +#define WHEN( desc ) SECTION( " When: " desc, "" ) +#define THEN( desc ) SECTION( " Then: " desc, "" ) inline bool itDoesThis(){ return true; } diff --git a/single_include/catch.hpp b/single_include/catch.hpp index 51dff101..cd017674 100644 --- a/single_include/catch.hpp +++ b/single_include/catch.hpp @@ -1,6 +1,6 @@ /* - * CATCH v0.9 build 13 (integration branch) - * Generated: 2013-01-16 09:43:42.849422 + * CATCH v0.9 build 14 (integration branch) + * Generated: 2013-01-17 12:06:33.338396 * ---------------------------------------------------------- * This file has been merged from multiple headers. Please don't edit it directly * Copyright (c) 2012 Two Blue Cubes Ltd. All rights reserved. @@ -5777,7 +5777,7 @@ namespace Catch { namespace Catch { // These numbers are maintained by a script - Version libraryVersion( 0, 9, 13, "integration" ); + Version libraryVersion( 0, 9, 14, "integration" ); } // #included from: catch_line_wrap.hpp @@ -6845,23 +6845,25 @@ namespace Catch { lazyPrint(); - { - TextColour colour( TextColour::FileName ); - stream << result.getSourceInfo() << ":\n"; - } - ResultComponents components( result ); bool endsWithNewLine = false; if( _assertionStats.totals.assertions.total() > 0 ) { - printOriginalExpression( result ); printResultType( components ); + printOriginalExpression( result ); +// printResultType( components ); endsWithNewLine = printReconstructedExpression( result ); } endsWithNewLine |= printMessage( components ); - if( !endsWithNewLine ) - stream << "\n"; +// if( !endsWithNewLine ) +// stream << "\n"; + + printSourceInfo( result ); stream << std::endl; } + void printSourceInfo( AssertionResult const& _result ) { + TextColour colour( TextColour::FileName ); + stream << _result.getSourceInfo() << "\n"; + } struct ResultComponents { ResultComponents( AssertionResult const& _result ) @@ -6871,18 +6873,18 @@ namespace Catch { switch( _result.getResultType() ) { case ResultWas::Ok: colour = TextColour::Success; - passOrFail = "passed"; + passOrFail = "PASSED"; if( _result.hasMessage() ) messageLabel = "with message"; break; case ResultWas::ExpressionFailed: if( _result.isOk() ) { colour = TextColour::Success; - passOrFail = "failed - but was ok"; + passOrFail = "FAILED - but was ok"; } else { colour = TextColour::Error; - passOrFail = "failed"; + passOrFail = "FAILED"; } if( _result.hasMessage() ){ messageLabel = "with message"; @@ -6890,12 +6892,12 @@ namespace Catch { break; case ResultWas::ThrewException: colour = TextColour::Error; - passOrFail = "failed"; + passOrFail = "FAILED"; messageLabel = "due to unexpected exception with message"; break; case ResultWas::DidntThrowException: colour = TextColour::Error; - passOrFail = "failed"; + passOrFail = "FAILED"; messageLabel = "because no exception was thrown where one was expected"; break; case ResultWas::Info: @@ -6905,12 +6907,12 @@ namespace Catch { messageLabel = "warning"; break; case ResultWas::ExplicitFailure: - passOrFail = "failed"; + passOrFail = "FAILED"; colour = TextColour::Error; messageLabel = "explicitly with message"; break; case ResultWas::Exception: - passOrFail = "failed"; + passOrFail = "FAILED"; colour = TextColour::Error; if( _result.hasMessage() ) messageLabel = "with message"; @@ -6934,7 +6936,7 @@ namespace Catch { void printResultType( ResultComponents const& _components ) { if( !_components.passOrFail.empty() ) { TextColour colour( _components.colour ); - stream << _components.passOrFail << " "; + stream << _components.passOrFail << ":\n"; } } bool printOriginalExpression( AssertionResult const& _result ) { @@ -7040,13 +7042,13 @@ namespace Catch { } void lazyPrintGroupInfo() { if( !unusedGroupInfo->name.empty() && unusedGroupInfo->groupsCounts > 1 ) { - printHeader( "Group", unusedGroupInfo->name ); + printHeader( "Group: " + unusedGroupInfo->name ); unusedGroupInfo.reset(); } } void lazyPrintTestCaseInfo() { if( !currentSectionInfo ) { - printTestCaseHeader(); + printHeader( unusedTestCaseInfo->name ); stream << std::endl; unusedTestCaseInfo.reset(); } @@ -7061,38 +7063,21 @@ namespace Catch { // Sections if( !sections.empty() ) { - printTestCaseHeader(); + printHeader( unusedTestCaseInfo->name, false ); - std::string firstInset; - std::string inset; - if( sections.size() > 1 ) { - firstInset = "Sections: "; - inset = " "; - } - else { - firstInset = "Section: "; - inset = " "; - } typedef std::vector::const_reverse_iterator It; - for( It it = sections.rbegin(), itEnd = sections.rend(); it != itEnd; ++it ) { - if( it == sections.rbegin() ) - stream << firstInset; - else - stream << inset; - stream << (*it)->name << "\n"; - } + for( It it = sections.rbegin(), itEnd = sections.rend(); it != itEnd; ++it ) + stream << " " << (*it)->name << "\n"; stream << getDashes() << "\n" << std::endl; unusedSectionInfo.reset(); } } - void printTestCaseHeader() { - printHeader( "Test case", unusedTestCaseInfo->name ); - } - void printHeader( std::string const& _type, std::string const& _name ) { + void printHeader( std::string const& _name, bool closed = true ) { stream << getDashes() << "\n" - << _type << ": '" << _name << "'\n" - << getDashes() << "\n"; + << _name << "\n"; + if( closed ) + stream << getDashes() << "\n"; } void printTotals( const Totals& totals ) { @@ -7150,12 +7135,12 @@ namespace Catch { } static std::string const& getDashes() { static const std::string dashes - = "----------------------------------------------------------------"; + = "-----------------------------------------------------------------"; return dashes; } static std::string const& getDoubleDashes() { static const std::string doubleDashes - = "================================================================"; + = "================================================================="; return doubleDashes; }