diff --git a/projects/SelfTest/Baselines/results.txt b/projects/SelfTest/Baselines/results.txt index 8b19b879..e778487a 100644 --- a/projects/SelfTest/Baselines/results.txt +++ b/projects/SelfTest/Baselines/results.txt @@ -283,47 +283,8 @@ No assertions in section, 'the section2' ExceptionTests.cpp:132: Unexpected exception with message: 'Exception from section' [Finished: './failing/exceptions/in-section' 1 test case failed (All 2 assertions failed)] -[Running: ./succeeding/exceptions/error messages] -[Started section: 'custom, unexpected'] -ExceptionTests.cpp:152: runner.getLog() Contains( "custom exception" ) succeeded for: -"\[g] ./failing/exceptions/custom - \[tc] ./failing/exceptions/custom -ExceptionTests.cpp:102: ThrewException'custom exception' /[tc] ./failing/exceptions/custom -/[g] ./failing/exceptions/custom -" contains: "custom exception" -[End of section: 'custom, unexpected' 1 assertion passed] - -[Started section: 'in section'] -ExceptionTests.cpp:160: runner.getLog() Contains( "Exception from section" ) succeeded for: -"\[g] ./failing/exceptions/in-section - \[tc] ./failing/exceptions/in-section - \ [s] the section - \ [s] the section2 - / [s] the section2 - / [s] the section -ExceptionTests.cpp:132: ThrewException'Exception from section' \ [s] the section - / [s] the section - /[tc] ./failing/exceptions/in-section -/[g] ./failing/exceptions/in-section -" contains: "Exception from section" -ExceptionTests.cpp:161: runner.getLog() Contains( ::Catch::LineInfoRegistry::get().infoForName( "the section2" ) ) succeeded for: -"\[g] ./failing/exceptions/in-section - \[tc] ./failing/exceptions/in-section - \ [s] the section - \ [s] the section2 - / [s] the section2 - / [s] the section -ExceptionTests.cpp:132: ThrewException'Exception from section' \ [s] the section - / [s] the section - /[tc] ./failing/exceptions/in-section -/[g] ./failing/exceptions/in-section -ExceptionTests.cpp:132: " -[End of section: 'in section' All 2 assertions passed] - -[Finished: './succeeding/exceptions/error messages' All tests passed (3 assertions in 1 test case)] - [Running: ./succeeding/exceptions/notimplemented] -ExceptionTests.cpp:172: thisFunctionNotImplemented( 7 ) succeeded +ExceptionTests.cpp:149: thisFunctionNotImplemented( 7 ) succeeded [Finished: './succeeding/exceptions/notimplemented' All tests passed (1 assertion in 1 test case)] [Running: ./succeeding/generators/1] @@ -631,72 +592,30 @@ No assertions in section, 'f (leaf)' [Finished: './Sections/nested/a/b' 1 test case failed (All 3 assertions failed)] -[Running: Sections/nested3] -MiscTests.cpp:119: runner.getLog() == "\\[g] ./Sections/nested/a/b\n" " \\[tc] ./Sections/nested/a/b\n" " \\ [s] c\n" " \\ [s] d (leaf)\n" " / [s] d (leaf)\n" " / [s] c\n" " \\ [s] c\n" " \\ [s] e (leaf)\n" " / [s] e (leaf)\n" " / [s] c\n" " \\ [s] c\n" " / [s] c\n" " \\ [s] f (leaf)\n" " / [s] f (leaf)\n" " /[tc] ./Sections/nested/a/b\n" "/[g] ./Sections/nested/a/b\n" succeeded for: - -"\[g] ./Sections/nested/a/b - \[tc] ./Sections/nested/a/b - \ [s] c - \ [s] d (leaf) - / [s] d (leaf) - / [s] c - \ [s] c - \ [s] e (leaf) - / [s] e (leaf) - / [s] c - \ [s] c - / [s] c - \ [s] f (leaf) - / [s] f (leaf) - /[tc] ./Sections/nested/a/b -/[g] ./Sections/nested/a/b -" -== -"\[g] ./Sections/nested/a/b - \[tc] ./Sections/nested/a/b - \ [s] c - \ [s] d (leaf) - / [s] d (leaf) - / [s] c - \ [s] c - \ [s] e (leaf) - / [s] e (leaf) - / [s] c - \ [s] c - / [s] c - \ [s] f (leaf) - / [s] f (leaf) - /[tc] ./Sections/nested/a/b -/[g] ./Sections/nested/a/b -" - - -[Finished: 'Sections/nested3' All tests passed (1 assertion in 1 test case)] - [Running: ./mixed/Misc/Sections/loops] [Started section: 's1'] -MiscTests.cpp:133: b > a failed for: 0 > 1 +MiscTests.cpp:103: b > a failed for: 0 > 1 [End of section: 's1' 1 assertion failed] [Finished: './mixed/Misc/Sections/loops' 1 test case failed (1 assertion failed)] [Running: ./mixed/Misc/loops] -MiscTests.cpp:144: [info: Testing if fib[0] (1) is even] -MiscTests.cpp:145: ( fib[i] % 2 ) == 0 failed for: 1 == 0 -MiscTests.cpp:144: [info: Testing if fib[1] (1) is even] -MiscTests.cpp:145: ( fib[i] % 2 ) == 0 failed for: 1 == 0 -MiscTests.cpp:145: ( fib[i] % 2 ) == 0 succeeded for: 0 == 0 -MiscTests.cpp:144: [info: Testing if fib[2] (2) is even] -MiscTests.cpp:144: [info: Testing if fib[3] (3) is even] -MiscTests.cpp:145: ( fib[i] % 2 ) == 0 failed for: 1 == 0 -MiscTests.cpp:144: [info: Testing if fib[4] (5) is even] -MiscTests.cpp:145: ( fib[i] % 2 ) == 0 failed for: 1 == 0 -MiscTests.cpp:145: ( fib[i] % 2 ) == 0 succeeded for: 0 == 0 -MiscTests.cpp:144: [info: Testing if fib[5] (8) is even] -MiscTests.cpp:144: [info: Testing if fib[6] (13) is even] -MiscTests.cpp:145: ( fib[i] % 2 ) == 0 failed for: 1 == 0 -MiscTests.cpp:144: [info: Testing if fib[7] (21) is even] -MiscTests.cpp:145: ( fib[i] % 2 ) == 0 failed for: 1 == 0 +MiscTests.cpp:114: [info: Testing if fib[0] (1) is even] +MiscTests.cpp:115: ( fib[i] % 2 ) == 0 failed for: 1 == 0 +MiscTests.cpp:114: [info: Testing if fib[1] (1) is even] +MiscTests.cpp:115: ( fib[i] % 2 ) == 0 failed for: 1 == 0 +MiscTests.cpp:115: ( fib[i] % 2 ) == 0 succeeded for: 0 == 0 +MiscTests.cpp:114: [info: Testing if fib[2] (2) is even] +MiscTests.cpp:114: [info: Testing if fib[3] (3) is even] +MiscTests.cpp:115: ( fib[i] % 2 ) == 0 failed for: 1 == 0 +MiscTests.cpp:114: [info: Testing if fib[4] (5) is even] +MiscTests.cpp:115: ( fib[i] % 2 ) == 0 failed for: 1 == 0 +MiscTests.cpp:115: ( fib[i] % 2 ) == 0 succeeded for: 0 == 0 +MiscTests.cpp:114: [info: Testing if fib[5] (8) is even] +MiscTests.cpp:114: [info: Testing if fib[6] (13) is even] +MiscTests.cpp:115: ( fib[i] % 2 ) == 0 failed for: 1 == 0 +MiscTests.cpp:114: [info: Testing if fib[7] (21) is even] +MiscTests.cpp:115: ( fib[i] % 2 ) == 0 failed for: 1 == 0 [Finished: './mixed/Misc/loops' 1 test case failed (6 of 8 assertions failed)] Some information An error @@ -708,34 +627,34 @@ No assertions in test case, './succeeding/Misc/stdout,stderr' [Finished: './succeeding/Misc/stdout,stderr' 1 test case failed (1 assertion failed)] [Running: ./succeeding/Misc/null strings] -MiscTests.cpp:163: makeString( false ) != static_cast(__null) succeeded for: "valid string" != {null string} -MiscTests.cpp:164: makeString( true ) == static_cast(__null) succeeded for: {null string} == {null string} +MiscTests.cpp:133: makeString( false ) != static_cast(__null) succeeded for: "valid string" != {null string} +MiscTests.cpp:134: makeString( true ) == static_cast(__null) succeeded for: {null string} == {null string} [Finished: './succeeding/Misc/null strings' All tests passed (2 assertions in 1 test case)] [Running: ./failing/info] -MiscTests.cpp:169: [info: hi] -MiscTests.cpp:171: [info: i := 7] -MiscTests.cpp:172: false failed +MiscTests.cpp:139: [info: hi] +MiscTests.cpp:141: [info: i := 7] +MiscTests.cpp:142: false failed [Finished: './failing/info' 1 test case failed (1 assertion failed)] [Running: ./succeeding/checkedif] -MiscTests.cpp:177: flag succeeded for: true -MiscTests.cpp:185: testCheckedIf( true ) succeeded for: true +MiscTests.cpp:147: flag succeeded for: true +MiscTests.cpp:155: testCheckedIf( true ) succeeded for: true [Finished: './succeeding/checkedif' All tests passed (2 assertions in 1 test case)] [Running: ./failing/checkedif] -MiscTests.cpp:177: flag failed for: false -MiscTests.cpp:190: testCheckedIf( false ) failed for: false +MiscTests.cpp:147: flag failed for: false +MiscTests.cpp:160: testCheckedIf( false ) failed for: false [Finished: './failing/checkedif' 1 test case failed (All 2 assertions failed)] [Running: ./succeeding/checkedelse] -MiscTests.cpp:195: flag succeeded for: true -MiscTests.cpp:203: testCheckedElse( true ) succeeded for: true +MiscTests.cpp:165: flag succeeded for: true +MiscTests.cpp:173: testCheckedElse( true ) succeeded for: true [Finished: './succeeding/checkedelse' All tests passed (2 assertions in 1 test case)] [Running: ./failing/checkedelse] -MiscTests.cpp:195: flag failed for: false -MiscTests.cpp:208: testCheckedElse( false ) failed for: false +MiscTests.cpp:165: flag failed for: false +MiscTests.cpp:178: testCheckedElse( false ) failed for: false [Finished: './failing/checkedelse' 1 test case failed (All 2 assertions failed)] [Running: ./misc/xmlentitycheck] @@ -754,68 +673,68 @@ No assertions in section, 'encoded chars' [Finished: './misc/xmlentitycheck' 1 test case failed (All 2 assertions failed)] [Running: ./manual/onechar] -MiscTests.cpp:225: [info: 3] -MiscTests.cpp:226: false failed +MiscTests.cpp:195: [info: 3] +MiscTests.cpp:196: false failed [Finished: './manual/onechar' 1 test case failed (1 assertion failed)] [Running: ./succeeding/atomic if] -MiscTests.cpp:236: x == 0 succeeded for: 0 == 0 +MiscTests.cpp:206: x == 0 succeeded for: 0 == 0 [Finished: './succeeding/atomic if' All tests passed (1 assertion in 1 test case)] [Running: ./succeeding/matchers] -MiscTests.cpp:246: testStringForMatching() Contains( "string" ) succeeded for: +MiscTests.cpp:216: testStringForMatching() Contains( "string" ) succeeded for: "this string contains 'abc' as a substring" contains: "string" -MiscTests.cpp:247: testStringForMatching() Contains( "abc" ) succeeded for: +MiscTests.cpp:217: testStringForMatching() Contains( "abc" ) succeeded for: "this string contains 'abc' as a substring" contains: "abc" -MiscTests.cpp:249: testStringForMatching() StartsWith( "this" ) succeeded for: +MiscTests.cpp:219: testStringForMatching() StartsWith( "this" ) succeeded for: "this string contains 'abc' as a substring" starts with: "this" -MiscTests.cpp:250: testStringForMatching() EndsWith( "substring" ) succeeded for: +MiscTests.cpp:220: testStringForMatching() EndsWith( "substring" ) succeeded for: "this string contains 'abc' as a substring" ends with: "substring" [Finished: './succeeding/matchers' All tests passed (4 assertions in 1 test case)] [Running: ./failing/matchers/Contains] -MiscTests.cpp:255: testStringForMatching() Contains( "not there" ) failed for: +MiscTests.cpp:225: testStringForMatching() Contains( "not there" ) failed for: "this string contains 'abc' as a substring" contains: "not there" [Finished: './failing/matchers/Contains' 1 test case failed (1 assertion failed)] [Running: ./failing/matchers/StartsWith] -MiscTests.cpp:260: testStringForMatching() StartsWith( "string" ) failed for: +MiscTests.cpp:230: testStringForMatching() StartsWith( "string" ) failed for: "this string contains 'abc' as a substring" starts with: "string" [Finished: './failing/matchers/StartsWith' 1 test case failed (1 assertion failed)] [Running: ./failing/matchers/EndsWith] -MiscTests.cpp:265: testStringForMatching() EndsWith( "this" ) failed for: +MiscTests.cpp:235: testStringForMatching() EndsWith( "this" ) failed for: "this string contains 'abc' as a substring" ends with: "this" [Finished: './failing/matchers/EndsWith' 1 test case failed (1 assertion failed)] [Running: ./failing/matchers/Equals] -MiscTests.cpp:270: testStringForMatching() Equals( "something else" ) failed for: +MiscTests.cpp:240: testStringForMatching() Equals( "something else" ) failed for: "this string contains 'abc' as a substring" equals: "something else" [Finished: './failing/matchers/Equals' 1 test case failed (1 assertion failed)] [Running: /succeeding/matchers/AllOf] -MiscTests.cpp:275: testStringForMatching() AllOf( Catch::Contains( "string" ), Catch::Contains( "abc" ) ) succeeded for: +MiscTests.cpp:245: testStringForMatching() AllOf( Catch::Contains( "string" ), Catch::Contains( "abc" ) ) succeeded for: "this string contains 'abc' as a substring" ( contains: "string" and contains: "abc" ) [Finished: '/succeeding/matchers/AllOf' All tests passed (1 assertion in 1 test case)] [Running: /succeeding/matchers/AnyOf] -MiscTests.cpp:279: testStringForMatching() AnyOf( Catch::Contains( "string" ), Catch::Contains( "not there" ) ) succeeded for: +MiscTests.cpp:249: testStringForMatching() AnyOf( Catch::Contains( "string" ), Catch::Contains( "not there" ) ) succeeded for: "this string contains 'abc' as a substring" ( contains: "string" or contains: "not there" ) -MiscTests.cpp:280: testStringForMatching() AnyOf( Catch::Contains( "not there" ), Catch::Contains( "string" ) ) succeeded for: +MiscTests.cpp:250: testStringForMatching() AnyOf( Catch::Contains( "not there" ), Catch::Contains( "string" ) ) succeeded for: "this string contains 'abc' as a substring" ( contains: "not there" or contains: "string" ) [Finished: '/succeeding/matchers/AnyOf' All tests passed (2 assertions in 1 test case)] [Running: ./succeeding/matchers/Equals] -MiscTests.cpp:285: testStringForMatching() Equals( "this string contains 'abc' as a substring" ) succeeded for: +MiscTests.cpp:255: testStringForMatching() Equals( "this string contains 'abc' as a substring" ) succeeded for: "this string contains 'abc' as a substring" equals: "this string contains 'abc' as a substring" [Finished: './succeeding/matchers/Equals' All tests passed (1 assertion in 1 test case)] [Running: example/factorial] -MiscTests.cpp:296: Factorial(0) == 1 succeeded for: 1 == 1 -MiscTests.cpp:297: Factorial(1) == 1 succeeded for: 1 == 1 -MiscTests.cpp:298: Factorial(2) == 2 succeeded for: 2 == 2 -MiscTests.cpp:299: Factorial(3) == 6 succeeded for: 6 == 6 -MiscTests.cpp:300: Factorial(10) == 3628800 succeeded for: 0x == 3628800 +MiscTests.cpp:266: Factorial(0) == 1 succeeded for: 1 == 1 +MiscTests.cpp:267: Factorial(1) == 1 succeeded for: 1 == 1 +MiscTests.cpp:268: Factorial(2) == 2 succeeded for: 2 == 2 +MiscTests.cpp:269: Factorial(3) == 6 succeeded for: 6 == 6 +MiscTests.cpp:270: Factorial(10) == 3628800 succeeded for: 0x == 3628800 [Finished: 'example/factorial' All tests passed (5 assertions in 1 test case)] [Running: empty] @@ -825,7 +744,7 @@ No assertions in test case, 'empty' [Finished: 'empty' 1 test case failed (1 assertion failed)] [Running: Nice descriptive name] -MiscTests.cpp:309: [warning: This one ran] +MiscTests.cpp:279: [warning: This one ran] No assertions in test case, 'Nice descriptive name' @@ -846,57 +765,57 @@ No assertions in test case, 'second tag' [Running: selftest/main] [Started section: 'selftest/expected result'] [Started section: 'selftest/expected result/failing tests'] -/Users/Phil/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/catch_self_test.hpp:182: succeeded +/Users/Phil/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/catch_self_test.hpp:106: succeeded [with message: Tests failed, as expected] -/Users/Phil/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/catch_self_test.hpp:182: succeeded +/Users/Phil/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/catch_self_test.hpp:106: succeeded [with message: Tests failed, as expected] -/Users/Phil/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/catch_self_test.hpp:182: succeeded +/Users/Phil/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/catch_self_test.hpp:106: succeeded [with message: Tests failed, as expected] -/Users/Phil/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/catch_self_test.hpp:182: succeeded +/Users/Phil/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/catch_self_test.hpp:106: succeeded [with message: Tests failed, as expected] -/Users/Phil/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/catch_self_test.hpp:182: succeeded +/Users/Phil/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/catch_self_test.hpp:106: succeeded [with message: Tests failed, as expected] -/Users/Phil/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/catch_self_test.hpp:182: succeeded +/Users/Phil/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/catch_self_test.hpp:106: succeeded [with message: Tests failed, as expected] -/Users/Phil/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/catch_self_test.hpp:182: succeeded +/Users/Phil/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/catch_self_test.hpp:106: succeeded [with message: Tests failed, as expected] -/Users/Phil/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/catch_self_test.hpp:182: succeeded +/Users/Phil/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/catch_self_test.hpp:106: succeeded [with message: Tests failed, as expected] -/Users/Phil/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/catch_self_test.hpp:182: succeeded +/Users/Phil/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/catch_self_test.hpp:106: succeeded [with message: Tests failed, as expected] -/Users/Phil/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/catch_self_test.hpp:182: succeeded +/Users/Phil/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/catch_self_test.hpp:106: succeeded [with message: Tests failed, as expected] -/Users/Phil/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/catch_self_test.hpp:182: succeeded +/Users/Phil/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/catch_self_test.hpp:106: succeeded [with message: Tests failed, as expected] -/Users/Phil/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/catch_self_test.hpp:182: succeeded +/Users/Phil/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/catch_self_test.hpp:106: succeeded [with message: Tests failed, as expected] -/Users/Phil/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/catch_self_test.hpp:182: succeeded +/Users/Phil/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/catch_self_test.hpp:106: succeeded [with message: Tests failed, as expected] -/Users/Phil/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/catch_self_test.hpp:182: succeeded +/Users/Phil/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/catch_self_test.hpp:106: succeeded [with message: Tests failed, as expected] -/Users/Phil/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/catch_self_test.hpp:182: succeeded +/Users/Phil/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/catch_self_test.hpp:106: succeeded [with message: Tests failed, as expected] -/Users/Phil/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/catch_self_test.hpp:182: succeeded +/Users/Phil/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/catch_self_test.hpp:106: succeeded [with message: Tests failed, as expected] -/Users/Phil/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/catch_self_test.hpp:182: succeeded +/Users/Phil/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/catch_self_test.hpp:106: succeeded [with message: Tests failed, as expected] -/Users/Phil/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/catch_self_test.hpp:182: succeeded +/Users/Phil/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/catch_self_test.hpp:106: succeeded [with message: Tests failed, as expected] -/Users/Phil/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/catch_self_test.hpp:182: succeeded +/Users/Phil/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/catch_self_test.hpp:106: succeeded [with message: Tests failed, as expected] -/Users/Phil/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/catch_self_test.hpp:182: succeeded +/Users/Phil/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/catch_self_test.hpp:106: succeeded [with message: Tests failed, as expected] -/Users/Phil/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/catch_self_test.hpp:182: succeeded +/Users/Phil/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/catch_self_test.hpp:106: succeeded [with message: Tests failed, as expected] -/Users/Phil/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/catch_self_test.hpp:182: succeeded +/Users/Phil/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/catch_self_test.hpp:106: succeeded [with message: Tests failed, as expected] -/Users/Phil/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/catch_self_test.hpp:182: succeeded +/Users/Phil/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/catch_self_test.hpp:106: succeeded [with message: Tests failed, as expected] -/Users/Phil/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/catch_self_test.hpp:182: succeeded +/Users/Phil/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/catch_self_test.hpp:106: succeeded [with message: Tests failed, as expected] -/Users/Phil/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/catch_self_test.hpp:182: succeeded +/Users/Phil/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/catch_self_test.hpp:106: succeeded [with message: Tests failed, as expected] -/Users/Phil/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/catch_self_test.hpp:182: succeeded +/Users/Phil/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/catch_self_test.hpp:106: succeeded [with message: Tests failed, as expected] [End of section: 'selftest/expected result/failing tests' All 26 assertions passed] @@ -904,101 +823,99 @@ No assertions in test case, 'second tag' [Started section: 'selftest/expected result'] [Started section: 'selftest/expected result/succeeding tests'] -/Users/Phil/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/catch_self_test.hpp:170: succeeded +/Users/Phil/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/catch_self_test.hpp:95: succeeded [with message: Tests passed, as expected] -/Users/Phil/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/catch_self_test.hpp:170: succeeded +/Users/Phil/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/catch_self_test.hpp:95: succeeded [with message: Tests passed, as expected] -/Users/Phil/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/catch_self_test.hpp:170: succeeded +/Users/Phil/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/catch_self_test.hpp:95: succeeded [with message: Tests passed, as expected] -/Users/Phil/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/catch_self_test.hpp:170: succeeded +/Users/Phil/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/catch_self_test.hpp:95: succeeded [with message: Tests passed, as expected] -/Users/Phil/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/catch_self_test.hpp:170: succeeded +/Users/Phil/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/catch_self_test.hpp:95: succeeded [with message: Tests passed, as expected] -/Users/Phil/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/catch_self_test.hpp:170: succeeded +/Users/Phil/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/catch_self_test.hpp:95: succeeded [with message: Tests passed, as expected] -/Users/Phil/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/catch_self_test.hpp:170: succeeded +/Users/Phil/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/catch_self_test.hpp:95: succeeded [with message: Tests passed, as expected] -/Users/Phil/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/catch_self_test.hpp:170: succeeded +/Users/Phil/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/catch_self_test.hpp:95: succeeded [with message: Tests passed, as expected] -/Users/Phil/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/catch_self_test.hpp:170: succeeded +/Users/Phil/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/catch_self_test.hpp:95: succeeded [with message: Tests passed, as expected] -/Users/Phil/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/catch_self_test.hpp:170: succeeded +/Users/Phil/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/catch_self_test.hpp:95: succeeded [with message: Tests passed, as expected] -/Users/Phil/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/catch_self_test.hpp:170: succeeded +/Users/Phil/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/catch_self_test.hpp:95: succeeded [with message: Tests passed, as expected] -/Users/Phil/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/catch_self_test.hpp:170: succeeded +/Users/Phil/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/catch_self_test.hpp:95: succeeded [with message: Tests passed, as expected] -/Users/Phil/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/catch_self_test.hpp:170: succeeded +/Users/Phil/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/catch_self_test.hpp:95: succeeded [with message: Tests passed, as expected] -/Users/Phil/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/catch_self_test.hpp:170: succeeded +/Users/Phil/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/catch_self_test.hpp:95: succeeded [with message: Tests passed, as expected] -/Users/Phil/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/catch_self_test.hpp:170: succeeded +/Users/Phil/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/catch_self_test.hpp:95: succeeded [with message: Tests passed, as expected] -/Users/Phil/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/catch_self_test.hpp:170: succeeded +/Users/Phil/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/catch_self_test.hpp:95: succeeded [with message: Tests passed, as expected] -/Users/Phil/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/catch_self_test.hpp:170: succeeded +/Users/Phil/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/catch_self_test.hpp:95: succeeded [with message: Tests passed, as expected] -/Users/Phil/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/catch_self_test.hpp:170: succeeded +/Users/Phil/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/catch_self_test.hpp:95: succeeded [with message: Tests passed, as expected] -/Users/Phil/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/catch_self_test.hpp:170: succeeded +/Users/Phil/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/catch_self_test.hpp:95: succeeded [with message: Tests passed, as expected] -/Users/Phil/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/catch_self_test.hpp:170: succeeded +/Users/Phil/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/catch_self_test.hpp:95: succeeded [with message: Tests passed, as expected] -/Users/Phil/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/catch_self_test.hpp:170: succeeded +/Users/Phil/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/catch_self_test.hpp:95: succeeded [with message: Tests passed, as expected] -/Users/Phil/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/catch_self_test.hpp:170: succeeded +/Users/Phil/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/catch_self_test.hpp:95: succeeded [with message: Tests passed, as expected] -/Users/Phil/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/catch_self_test.hpp:170: succeeded +/Users/Phil/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/catch_self_test.hpp:95: succeeded [with message: Tests passed, as expected] -/Users/Phil/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/catch_self_test.hpp:170: succeeded -[with message: Tests passed, as expected] -/Users/Phil/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/catch_self_test.hpp:170: succeeded +/Users/Phil/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/catch_self_test.hpp:95: succeeded [with message: Tests passed, as expected] Message from section one Message from section two -/Users/Phil/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/catch_self_test.hpp:170: succeeded +/Users/Phil/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/catch_self_test.hpp:95: succeeded [with message: Tests passed, as expected] -/Users/Phil/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/catch_self_test.hpp:170: succeeded +/Users/Phil/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/catch_self_test.hpp:95: succeeded [with message: Tests passed, as expected] -/Users/Phil/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/catch_self_test.hpp:170: succeeded +/Users/Phil/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/catch_self_test.hpp:95: succeeded [with message: Tests passed, as expected] -/Users/Phil/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/catch_self_test.hpp:170: succeeded +/Users/Phil/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/catch_self_test.hpp:95: succeeded [with message: Tests passed, as expected] Some information An error -/Users/Phil/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/catch_self_test.hpp:170: succeeded +/Users/Phil/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/catch_self_test.hpp:95: succeeded [with message: Tests passed, as expected] -/Users/Phil/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/catch_self_test.hpp:170: succeeded +/Users/Phil/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/catch_self_test.hpp:95: succeeded [with message: Tests passed, as expected] -/Users/Phil/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/catch_self_test.hpp:170: succeeded +/Users/Phil/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/catch_self_test.hpp:95: succeeded [with message: Tests passed, as expected] -/Users/Phil/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/catch_self_test.hpp:170: succeeded +/Users/Phil/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/catch_self_test.hpp:95: succeeded [with message: Tests passed, as expected] -/Users/Phil/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/catch_self_test.hpp:170: succeeded +/Users/Phil/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/catch_self_test.hpp:95: succeeded [with message: Tests passed, as expected] -/Users/Phil/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/catch_self_test.hpp:170: succeeded +/Users/Phil/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/catch_self_test.hpp:95: succeeded [with message: Tests passed, as expected] -/Users/Phil/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/catch_self_test.hpp:170: succeeded +/Users/Phil/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/catch_self_test.hpp:95: succeeded [with message: Tests passed, as expected] -/Users/Phil/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/catch_self_test.hpp:170: succeeded +/Users/Phil/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/catch_self_test.hpp:95: succeeded [with message: Tests passed, as expected] -/Users/Phil/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/catch_self_test.hpp:170: succeeded +/Users/Phil/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/catch_self_test.hpp:95: succeeded [with message: Tests passed, as expected] -/Users/Phil/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/catch_self_test.hpp:170: succeeded +/Users/Phil/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/catch_self_test.hpp:95: succeeded [with message: Tests passed, as expected] -/Users/Phil/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/catch_self_test.hpp:170: succeeded +/Users/Phil/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/catch_self_test.hpp:95: succeeded [with message: Tests passed, as expected] -/Users/Phil/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/catch_self_test.hpp:170: succeeded +/Users/Phil/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/catch_self_test.hpp:95: succeeded [with message: Tests passed, as expected] -/Users/Phil/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/catch_self_test.hpp:170: succeeded +/Users/Phil/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/catch_self_test.hpp:95: succeeded [with message: Tests passed, as expected] -/Users/Phil/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/catch_self_test.hpp:170: succeeded +/Users/Phil/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/catch_self_test.hpp:95: succeeded [with message: Tests passed, as expected] -/Users/Phil/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/catch_self_test.hpp:170: succeeded +/Users/Phil/Dev/OSS/Catch/projects/XCode4/CatchSelfTest/CatchSelfTest/../../../SelfTest/catch_self_test.hpp:95: succeeded [with message: Tests passed, as expected] -[End of section: 'selftest/expected result/succeeding tests' All 44 assertions passed] +[End of section: 'selftest/expected result/succeeding tests' All 43 assertions passed] -[End of section: 'selftest/expected result' All 44 assertions passed] +[End of section: 'selftest/expected result' All 43 assertions passed] Message from section one Message from section two @@ -1006,7 +923,7 @@ Some information An error [Started section: 'selftest/test counts'] [Started section: 'selftest/test counts/succeeding tests'] -TestMain.cpp:40: totals.assertions.passed == 294 succeeded for: 294 == 294 +TestMain.cpp:40: totals.assertions.passed == 291 succeeded for: 291 == 291 TestMain.cpp:41: totals.assertions.failed == 0 succeeded for: 0 == 0 [End of section: 'selftest/test counts/succeeding tests' All 2 assertions passed] @@ -1020,7 +937,7 @@ TestMain.cpp:48: totals.assertions.failed == 73 succeeded for: 73 == 73 [End of section: 'selftest/test counts' All 2 assertions passed] -[Finished: 'selftest/main' All tests passed (74 assertions in 1 test case)] +[Finished: 'selftest/main' All tests passed (73 assertions in 1 test case)] [Running: meta/Misc/Sections] TestMain.cpp:57: totals.assertions.passed == 2 succeeded for: 2 == 2 @@ -1433,13 +1350,13 @@ BDDTests.cpp:37: itDoesThis() succeeded for: true [End of section: 'This stuff exists' 1 assertion passed] [Finished: 'scenario name' All tests passed (1 assertion in 1 test case)] -[End of group: '~dummy'. 45 of 98 test cases failed (103 of 615 assertions failed)] +[End of group: '~dummy'. 45 of 96 test cases failed (103 of 610 assertions failed)] -[Testing completed. 45 of 98 test cases failed (103 of 615 assertions failed)] +[Testing completed. 45 of 96 test cases failed (103 of 610 assertions failed)] - + @@ -1659,7 +1576,6 @@ ExceptionTests.cpp:118: ExceptionTests.cpp:132: - @@ -1739,54 +1655,53 @@ MiscTests.cpp:61: - -MiscTests.cpp:133: +MiscTests.cpp:103: -MiscTests.cpp:144: +MiscTests.cpp:114: -MiscTests.cpp:145: +MiscTests.cpp:115: -MiscTests.cpp:144: +MiscTests.cpp:114: -MiscTests.cpp:145: +MiscTests.cpp:115: -MiscTests.cpp:144: +MiscTests.cpp:114: -MiscTests.cpp:144: +MiscTests.cpp:114: -MiscTests.cpp:145: +MiscTests.cpp:115: -MiscTests.cpp:144: +MiscTests.cpp:114: -MiscTests.cpp:145: +MiscTests.cpp:115: -MiscTests.cpp:144: +MiscTests.cpp:114: -MiscTests.cpp:144: +MiscTests.cpp:114: -MiscTests.cpp:145: +MiscTests.cpp:115: -MiscTests.cpp:144: +MiscTests.cpp:114: -MiscTests.cpp:145: +MiscTests.cpp:115: @@ -1800,62 +1715,62 @@ An error -MiscTests.cpp:169: +MiscTests.cpp:139: -MiscTests.cpp:171: +MiscTests.cpp:141: -MiscTests.cpp:172: +MiscTests.cpp:142: -MiscTests.cpp:177: +MiscTests.cpp:147: -MiscTests.cpp:190: +MiscTests.cpp:160: -MiscTests.cpp:195: +MiscTests.cpp:165: -MiscTests.cpp:208: +MiscTests.cpp:178: -MiscTests.cpp:225: +MiscTests.cpp:195: -MiscTests.cpp:226: +MiscTests.cpp:196: -MiscTests.cpp:255: +MiscTests.cpp:225: -MiscTests.cpp:260: +MiscTests.cpp:230: -MiscTests.cpp:265: +MiscTests.cpp:235: -MiscTests.cpp:270: +MiscTests.cpp:240: @@ -1865,7 +1780,7 @@ MiscTests.cpp:270: -MiscTests.cpp:309: +MiscTests.cpp:279: @@ -3389,65 +3304,8 @@ ExceptionTests.cpp" line="132"> - -
-ExceptionTests.cpp" line="152"> - - runner.getLog() Contains( "custom exception" ) - - - "\[g] ./failing/exceptions/custom - \[tc] ./failing/exceptions/custom -ExceptionTests.cpp:102: ThrewException'custom exception' /[tc] ./failing/exceptions/custom -/[g] ./failing/exceptions/custom -" contains: "custom exception" - - - -
-
-ExceptionTests.cpp" line="160"> - - runner.getLog() Contains( "Exception from section" ) - - - "\[g] ./failing/exceptions/in-section - \[tc] ./failing/exceptions/in-section - \ [s] the section - \ [s] the section2 - / [s] the section2 - / [s] the section -ExceptionTests.cpp:132: ThrewException'Exception from section' \ [s] the section - / [s] the section - /[tc] ./failing/exceptions/in-section -/[g] ./failing/exceptions/in-section -" contains: "Exception from section" - - -ExceptionTests.cpp" line="161"> - - runner.getLog() Contains( ::Catch::LineInfoRegistry::get().infoForName( "the section2" ) ) - - - "\[g] ./failing/exceptions/in-section - \[tc] ./failing/exceptions/in-section - \ [s] the section - \ [s] the section2 - / [s] the section2 - / [s] the section -ExceptionTests.cpp:132: ThrewException'Exception from section' \ [s] the section - / [s] the section - /[tc] ./failing/exceptions/in-section -/[g] ./failing/exceptions/in-section -ExceptionTests.cpp:132: " - - - -
- - -ExceptionTests.cpp" line="172"> +ExceptionTests.cpp" line="149"> thisFunctionNotImplemented( 7 ) @@ -4968,57 +4826,9 @@ MiscTests.cpp" line="70"> - -MiscTests.cpp" line="119"> - - runner.getLog() == "\\[g] ./Sections/nested/a/b\n" " \\[tc] ./Sections/nested/a/b\n" " \\ [s] c\n" " \\ [s] d (leaf)\n" " / [s] d (leaf)\n" " / [s] c\n" " \\ [s] c\n" " \\ [s] e (leaf)\n" " / [s] e (leaf)\n" " / [s] c\n" " \\ [s] c\n" " / [s] c\n" " \\ [s] f (leaf)\n" " / [s] f (leaf)\n" " /[tc] ./Sections/nested/a/b\n" "/[g] ./Sections/nested/a/b\n" - - - -"\[g] ./Sections/nested/a/b - \[tc] ./Sections/nested/a/b - \ [s] c - \ [s] d (leaf) - / [s] d (leaf) - / [s] c - \ [s] c - \ [s] e (leaf) - / [s] e (leaf) - / [s] c - \ [s] c - / [s] c - \ [s] f (leaf) - / [s] f (leaf) - /[tc] ./Sections/nested/a/b -/[g] ./Sections/nested/a/b -" -== -"\[g] ./Sections/nested/a/b - \[tc] ./Sections/nested/a/b - \ [s] c - \ [s] d (leaf) - / [s] d (leaf) - / [s] c - \ [s] c - \ [s] e (leaf) - / [s] e (leaf) - / [s] c - \ [s] c - / [s] c - \ [s] f (leaf) - / [s] f (leaf) - /[tc] ./Sections/nested/a/b -/[g] ./Sections/nested/a/b -" - - - - - -
-MiscTests.cpp" line="133"> +MiscTests.cpp" line="103"> b > a @@ -5034,7 +4844,7 @@ MiscTests.cpp" line="133"> Testing if fib[0] (1) is even -MiscTests.cpp" line="145"> +MiscTests.cpp" line="115"> ( fib[i] % 2 ) == 0 @@ -5045,7 +4855,7 @@ MiscTests.cpp" line="145"> Testing if fib[1] (1) is even -MiscTests.cpp" line="145"> +MiscTests.cpp" line="115"> ( fib[i] % 2 ) == 0 @@ -5053,7 +4863,7 @@ MiscTests.cpp" line="145"> 1 == 0 -MiscTests.cpp" line="145"> +MiscTests.cpp" line="115"> ( fib[i] % 2 ) == 0 @@ -5067,7 +4877,7 @@ MiscTests.cpp" line="145"> Testing if fib[3] (3) is even -MiscTests.cpp" line="145"> +MiscTests.cpp" line="115"> ( fib[i] % 2 ) == 0 @@ -5078,7 +4888,7 @@ MiscTests.cpp" line="145"> Testing if fib[4] (5) is even -MiscTests.cpp" line="145"> +MiscTests.cpp" line="115"> ( fib[i] % 2 ) == 0 @@ -5086,7 +4896,7 @@ MiscTests.cpp" line="145"> 1 == 0 -MiscTests.cpp" line="145"> +MiscTests.cpp" line="115"> ( fib[i] % 2 ) == 0 @@ -5100,7 +4910,7 @@ MiscTests.cpp" line="145"> Testing if fib[6] (13) is even -MiscTests.cpp" line="145"> +MiscTests.cpp" line="115"> ( fib[i] % 2 ) == 0 @@ -5111,7 +4921,7 @@ MiscTests.cpp" line="145"> Testing if fib[7] (21) is even -MiscTests.cpp" line="145"> +MiscTests.cpp" line="115"> ( fib[i] % 2 ) == 0 @@ -5125,7 +4935,7 @@ MiscTests.cpp" line="145"> -MiscTests.cpp" line="163"> +MiscTests.cpp" line="133"> makeString( false ) != static_cast<char*>(__null) @@ -5133,7 +4943,7 @@ MiscTests.cpp" line="163"> "valid string" != {null string} -MiscTests.cpp" line="164"> +MiscTests.cpp" line="134"> makeString( true ) == static_cast<char*>(__null) @@ -5150,7 +4960,7 @@ MiscTests.cpp" line="164"> i := 7 -MiscTests.cpp" line="172"> +MiscTests.cpp" line="142"> false @@ -5161,7 +4971,7 @@ MiscTests.cpp" line="172"> -MiscTests.cpp" line="177"> +MiscTests.cpp" line="147"> flag @@ -5169,7 +4979,7 @@ MiscTests.cpp" line="177"> true -MiscTests.cpp" line="185"> +MiscTests.cpp" line="155"> testCheckedIf( true ) @@ -5180,7 +4990,7 @@ MiscTests.cpp" line="185"> -MiscTests.cpp" line="177"> +MiscTests.cpp" line="147"> flag @@ -5188,7 +4998,7 @@ MiscTests.cpp" line="177"> false -MiscTests.cpp" line="190"> +MiscTests.cpp" line="160"> testCheckedIf( false ) @@ -5199,7 +5009,7 @@ MiscTests.cpp" line="190"> -MiscTests.cpp" line="195"> +MiscTests.cpp" line="165"> flag @@ -5207,7 +5017,7 @@ MiscTests.cpp" line="195"> true -MiscTests.cpp" line="203"> +MiscTests.cpp" line="173"> testCheckedElse( true ) @@ -5218,7 +5028,7 @@ MiscTests.cpp" line="203"> -MiscTests.cpp" line="195"> +MiscTests.cpp" line="165"> flag @@ -5226,7 +5036,7 @@ MiscTests.cpp" line="195"> false -MiscTests.cpp" line="208"> +MiscTests.cpp" line="178"> testCheckedElse( false ) @@ -5249,7 +5059,7 @@ MiscTests.cpp" line="208"> 3 -MiscTests.cpp" line="226"> +MiscTests.cpp" line="196"> false @@ -5260,7 +5070,7 @@ MiscTests.cpp" line="226"> -MiscTests.cpp" line="236"> +MiscTests.cpp" line="206"> x == 0 @@ -5271,7 +5081,7 @@ MiscTests.cpp" line="236"> -MiscTests.cpp" line="246"> +MiscTests.cpp" line="216"> testStringForMatching() Contains( "string" ) @@ -5279,7 +5089,7 @@ MiscTests.cpp" line="246"> "this string contains 'abc' as a substring" contains: "string" -MiscTests.cpp" line="247"> +MiscTests.cpp" line="217"> testStringForMatching() Contains( "abc" ) @@ -5287,7 +5097,7 @@ MiscTests.cpp" line="247"> "this string contains 'abc' as a substring" contains: "abc" -MiscTests.cpp" line="249"> +MiscTests.cpp" line="219"> testStringForMatching() StartsWith( "this" ) @@ -5295,7 +5105,7 @@ MiscTests.cpp" line="249"> "this string contains 'abc' as a substring" starts with: "this" -MiscTests.cpp" line="250"> +MiscTests.cpp" line="220"> testStringForMatching() EndsWith( "substring" ) @@ -5306,7 +5116,7 @@ MiscTests.cpp" line="250"> -MiscTests.cpp" line="255"> +MiscTests.cpp" line="225"> testStringForMatching() Contains( "not there" ) @@ -5317,7 +5127,7 @@ MiscTests.cpp" line="255"> -MiscTests.cpp" line="260"> +MiscTests.cpp" line="230"> testStringForMatching() StartsWith( "string" ) @@ -5328,7 +5138,7 @@ MiscTests.cpp" line="260"> -MiscTests.cpp" line="265"> +MiscTests.cpp" line="235"> testStringForMatching() EndsWith( "this" ) @@ -5339,7 +5149,7 @@ MiscTests.cpp" line="265"> -MiscTests.cpp" line="270"> +MiscTests.cpp" line="240"> testStringForMatching() Equals( "something else" ) @@ -5350,7 +5160,7 @@ MiscTests.cpp" line="270"> -MiscTests.cpp" line="275"> +MiscTests.cpp" line="245"> testStringForMatching() AllOf( Catch::Contains( "string" ), Catch::Contains( "abc" ) ) @@ -5361,7 +5171,7 @@ MiscTests.cpp" line="275"> -MiscTests.cpp" line="279"> +MiscTests.cpp" line="249"> testStringForMatching() AnyOf( Catch::Contains( "string" ), Catch::Contains( "not there" ) ) @@ -5369,7 +5179,7 @@ MiscTests.cpp" line="279"> "this string contains 'abc' as a substring" ( contains: "string" or contains: "not there" ) -MiscTests.cpp" line="280"> +MiscTests.cpp" line="250"> testStringForMatching() AnyOf( Catch::Contains( "not there" ), Catch::Contains( "string" ) ) @@ -5380,7 +5190,7 @@ MiscTests.cpp" line="280"> -MiscTests.cpp" line="285"> +MiscTests.cpp" line="255"> testStringForMatching() Equals( "this string contains 'abc' as a substring" ) @@ -5391,7 +5201,7 @@ MiscTests.cpp" line="285"> -MiscTests.cpp" line="296"> +MiscTests.cpp" line="266"> Factorial(0) == 1 @@ -5399,7 +5209,7 @@ MiscTests.cpp" line="296"> 1 == 1 -MiscTests.cpp" line="297"> +MiscTests.cpp" line="267"> Factorial(1) == 1 @@ -5407,7 +5217,7 @@ MiscTests.cpp" line="297"> 1 == 1 -MiscTests.cpp" line="298"> +MiscTests.cpp" line="268"> Factorial(2) == 2 @@ -5415,7 +5225,7 @@ MiscTests.cpp" line="298"> 2 == 2 -MiscTests.cpp" line="299"> +MiscTests.cpp" line="269"> Factorial(3) == 6 @@ -5423,7 +5233,7 @@ MiscTests.cpp" line="299"> 6 == 6 -MiscTests.cpp" line="300"> +MiscTests.cpp" line="270"> Factorial(10) == 3628800 @@ -5457,9 +5267,9 @@ MiscTests.cpp" line="300">
- +
- +
@@ -5468,10 +5278,10 @@ MiscTests.cpp" line="300">
TestMain.cpp" line="40"> - totals.assertions.passed == 294 + totals.assertions.passed == 291 - 294 == 294 + 291 == 291 TestMain.cpp" line="41"> @@ -6904,7 +6714,7 @@ BDDTests.cpp" line="37">
- + - + diff --git a/projects/SelfTest/ExceptionTests.cpp b/projects/SelfTest/ExceptionTests.cpp index 7747eb73..eeab679b 100644 --- a/projects/SelfTest/ExceptionTests.cpp +++ b/projects/SelfTest/ExceptionTests.cpp @@ -140,29 +140,6 @@ TEST_CASE( "./failing/exceptions/in-section", "Exceptions thrown from sections r #pragma GCC diagnostic pop #endif -TEST_CASE( "./succeeding/exceptions/error messages", "The error messages produced by exceptions caught by Catch matched the expected form" ) -{ - Catch::EmbeddedRunner runner; - using namespace Catch::Matchers; - - SECTION( "custom, unexpected", "" ) - { - runner.runMatching( "./failing/exceptions/custom" ); -// CHECK_THAT( runner.getLog(), Contains( "Unexpected exception" ) ); // Mock reporter doesn't say this - CHECK_THAT( runner.getLog(), Contains( "custom exception" ) ); - } - - SECTION( "in section", "" ) - { - runner.runMatching( "./failing/exceptions/in-section" ); - INFO( runner.getLog() ); -// CHECK( runner.getLog().find( "Unexpected exception" ) != std::string::npos ); // Mock reporter doesn't say this - CHECK_THAT( runner.getLog(), Contains( "Exception from section" ) ); - CHECK_THAT( runner.getLog(), Contains( CATCH_GET_LINE_INFO( "the section2" ) ) ); - } - -} - inline int thisFunctionNotImplemented( int ) { CATCH_NOT_IMPLEMENTED; } diff --git a/projects/SelfTest/MiscTests.cpp b/projects/SelfTest/MiscTests.cpp index 34915069..b1cf90ff 100644 --- a/projects/SelfTest/MiscTests.cpp +++ b/projects/SelfTest/MiscTests.cpp @@ -90,36 +90,6 @@ TEST_CASE( "./Sections/nested/a/b", "nested SECTION tests" ) } } -TEST_CASE( "Sections/nested3", "nested SECTION tests" ) -{ - Catch::EmbeddedRunner runner; - - runner.runMatching( "./Sections/nested/a/b", "mock" ); - CHECK( runner.getLog() == - "\\[g] ./Sections/nested/a/b\n" - " \\[tc] ./Sections/nested/a/b\n" - - " \\ [s] c\n" - " \\ [s] d (leaf)\n" - " / [s] d (leaf)\n" - " / [s] c\n" - - " \\ [s] c\n" - " \\ [s] e (leaf)\n" - " / [s] e (leaf)\n" - " / [s] c\n" - - " \\ [s] c\n" - " / [s] c\n" - - " \\ [s] f (leaf)\n" - " / [s] f (leaf)\n" - - " /[tc] ./Sections/nested/a/b\n" - "/[g] ./Sections/nested/a/b\n" ); - -} - TEST_CASE( "./mixed/Misc/Sections/loops", "looped SECTION tests" ) { int a = 1; diff --git a/projects/SelfTest/TestMain.cpp b/projects/SelfTest/TestMain.cpp index 19fcbd48..e2eeebce 100644 --- a/projects/SelfTest/TestMain.cpp +++ b/projects/SelfTest/TestMain.cpp @@ -37,7 +37,7 @@ TEST_CASE( "selftest/main", "Runs all Catch self tests and checks their results" SECTION( "selftest/test counts/succeeding tests", "Number of 'succeeding' tests is fixed" ) { Totals totals = runner.runMatching( "./succeeding/*" ); - CHECK( totals.assertions.passed == 294 ); + CHECK( totals.assertions.passed == 291 ); CHECK( totals.assertions.failed == 0 ); } diff --git a/projects/SelfTest/catch_self_test.cpp b/projects/SelfTest/catch_self_test.cpp index f2bfb8db..81bc7e23 100644 --- a/projects/SelfTest/catch_self_test.cpp +++ b/projects/SelfTest/catch_self_test.cpp @@ -15,6 +15,8 @@ namespace Catch{ + NullStreamingReporter::~NullStreamingReporter() {} + Totals EmbeddedRunner::runMatching( const std::string& rawTestSpec, const std::string& ) { std::ostringstream oss; Config config; @@ -24,88 +26,10 @@ namespace Catch{ // Scoped because Runner doesn't report EndTesting until its destructor { - Runner runner( config, new LegacyReporterAdapter( m_reporter.get(), ReporterConfig( config.stream(), config.data() ) ) ); + Runner runner( config, m_reporter.get() ); totals = runner.runMatching( rawTestSpec ); } - m_output = oss.str(); return totals; } - - void MockReporter::Result( const AssertionResult& assertionResult ) { - if( assertionResult.getResultType() == ResultWas::Ok ) - return; - m_log << assertionResult.getSourceInfo() << " "; - - switch( assertionResult.getResultType() ) { - case ResultWas::Info: - m_log << "Info"; - break; - case ResultWas::Warning: - m_log << "Warning"; - break; - case ResultWas::ExplicitFailure: - m_log << "ExplicitFailure"; - break; - case ResultWas::ExpressionFailed: - m_log << "ExpressionFailed"; - break; - case ResultWas::Unknown: - m_log << "Unknown"; - break; - case ResultWas::ThrewException: - m_log << "ThrewException"; - break; - case ResultWas::DidntThrowException: - m_log << "DidntThrowException"; - break; - - // We shouldn't ever see these - case ResultWas::Ok: - m_log << "Ok"; - break; - case ResultWas::FailureBit: - m_log << "FailureBit"; - break; - case ResultWas::Exception: - m_log << "Exception"; - break; - } - - if( assertionResult.hasExpression() ) - m_log << assertionResult.getExpression(); - - if( assertionResult.hasMessage() ) - m_log << "'" << assertionResult.getMessage() << "'"; - - if( assertionResult.hasExpandedExpression() ) - m_log << assertionResult.getExpandedExpression(); - } - - void MockReporter::openLabel( const std::string& label, const std::string& arg ) { - if( shouldRecord( label ) ) { - m_log << m_indent << "\\" << label; - if( !arg.empty() ) - m_log << " " << arg; - m_log << "\n"; - m_indent += " "; - } - } - - void MockReporter::closeLabel( const std::string& label, const std::string& arg ) { - if( shouldRecord( label ) ) { - m_indent = m_indent.substr( 0, m_indent.size()-1 ); - m_log << m_indent << "/" << label; - if( !arg.empty() ) - m_log << " " << arg; - m_log << "\n"; - } - } - - const std::string MockReporter::recordGroups = "[g]"; - const std::string MockReporter::recordTestCases = "[tc]"; - const std::string MockReporter::recordSections =" [s]"; - - INTERNAL_CATCH_REGISTER_LEGACY_REPORTER( "mock", MockReporter ) - } diff --git a/projects/SelfTest/catch_self_test.hpp b/projects/SelfTest/catch_self_test.hpp index 6f926814..8c7dc67f 100644 --- a/projects/SelfTest/catch_self_test.hpp +++ b/projects/SelfTest/catch_self_test.hpp @@ -20,121 +20,43 @@ namespace Catch { - class MockReporter : public SharedImpl { + class NullStreamingReporter : public SharedImpl { public: - - static const std::string recordGroups; - static const std::string recordTestCases; - static const std::string recordSections; - - void recordAll() { - addRecorder( recordGroups ); - addRecorder( recordTestCases ); - addRecorder( recordSections ); - } - - MockReporter( const ReporterConfig& ) { - recordAll(); - } - - MockReporter() { - recordAll(); - } - - void addRecorder( const std::string& recorder ) { - m_recorders.insert( recorder ); - } - + + virtual ~NullStreamingReporter(); + static std::string getDescription() { - return "mock reporter"; + return "null reporter"; } - std::string getLog() const { - return m_log.str(); - } + private: // IStreamingReporter - private: // IReporter - - virtual bool shouldRedirectStdout() const { - return false; - } - - virtual void StartTesting() {} - - virtual void EndTesting( const Totals& ) {} - - virtual void StartGroup( const std::string& groupName ) { - openLabel( recordGroups, groupName ); - } - - virtual void EndGroup( const std::string& groupName, const Totals& ) { - closeLabel( recordGroups, groupName ); - } - - virtual void StartSection( const std::string& sectionName, const std::string& ) { - openLabel( recordSections, sectionName ); + virtual ReporterPreferences getPreferences() const { + return ReporterPreferences(); } - virtual void NoAssertionsInSection( const std::string& ) {} - virtual void NoAssertionsInTestCase( const std::string& ) {} - - virtual void EndSection( const std::string& sectionName, const Counts& ) { - closeLabel( recordSections, sectionName ); - } - - virtual void StartTestCase( const TestCaseInfo& testInfo ) { - openLabel( recordTestCases, testInfo.name ); - } - - virtual void Aborted(){} - - virtual void EndTestCase( const TestCaseInfo& testInfo, - const Totals&, - const std::string&, - const std::string& ) { - closeLabel( recordTestCases, testInfo.name ); - } - - virtual void Result( const AssertionResult& assertionResult ); - - - private: - - bool shouldRecord( const std::string& recorder ) const { - return m_recorders.find( recorder ) != m_recorders.end(); - } - - void openLabel( const std::string& label, const std::string& arg = "" ); - void closeLabel( const std::string& label, const std::string& arg = "" ); - - std::string m_indent; - std::ostringstream m_log; - std::set m_recorders; + virtual void testRunStarting( std::string const& ) {} + virtual void testGroupStarting( std::string const& ) {} + virtual void testCaseStarting( TestCaseInfo const& ) {} + virtual void sectionStarting( SectionInfo const& ) {} + virtual void assertionStarting( AssertionInfo const& ) {} + virtual void assertionEnded( Ptr const& ) {} + virtual void sectionEnded( Ptr const& ) {} + virtual void testCaseEnded( Ptr const& ) {} + virtual void testGroupEnded( Ptr const& ) {} + virtual void testRunEnded( Ptr const& ) {} }; - + class EmbeddedRunner { public: - EmbeddedRunner() : m_reporter( new MockReporter() ) {} + EmbeddedRunner() : m_reporter( new NullStreamingReporter() ) {} Totals runMatching( const std::string& rawTestSpec, const std::string& reporter = "basic" ); - std::string getOutput() { - return m_output; - } - - void addRecorder( const std::string& recorder ) { - m_reporter->addRecorder( recorder ); - } - - std::string getLog() const { - return m_reporter->getLog(); - } - private: - std::string m_output; - Ptr m_reporter; + Ptr m_reporter; }; class MetaTestRunner { @@ -154,14 +76,17 @@ namespace Catch { } void operator()( const TestCase& testCase ) { - EmbeddedRunner runner; - std::string name = testCase.getTestCaseInfo().name; - Totals totals = runner.runMatching( name ); + std::string name; + Totals totals; + { + EmbeddedRunner runner; + name = testCase.getTestCaseInfo().name; + totals = runner.runMatching( name ); + } switch( m_expectedResult ) { case Expected::ToSucceed: if( totals.assertions.failed > 0 ) { - INFO( runner.getOutput() ); - FAIL( "Expected test case '" + FAIL( "Expected test case '" << name << "' to succeed but there was/ were " << totals.assertions.failed << " failure(s)" ); @@ -172,8 +97,7 @@ namespace Catch { break; case Expected::ToFail: if( totals.assertions.failed == 0 ) { - INFO( runner.getOutput() ); - FAIL( "Expected test case '" + FAIL( "Expected test case '" << name << "' to fail but there was/ were " << totals.assertions.passed << " success(es)" );