From 1309da2b553d68dc13ee7d2a0556a24a7d6f7f35 Mon Sep 17 00:00:00 2001 From: Phil Nash Date: Wed, 24 Apr 2013 18:51:34 +0100 Subject: [PATCH] approved changes relating to no-return functions --- .../SelfTest/Baselines/approvedResults.txt | 190 +++++++++--------- 1 file changed, 95 insertions(+), 95 deletions(-) diff --git a/projects/SelfTest/Baselines/approvedResults.txt b/projects/SelfTest/Baselines/approvedResults.txt index b68f72f1..ccec55ce 100644 --- a/projects/SelfTest/Baselines/approvedResults.txt +++ b/projects/SelfTest/Baselines/approvedResults.txt @@ -1023,37 +1023,37 @@ with expansion: ------------------------------------------------------------------------------- ./succeeding/exceptions/explicit ------------------------------------------------------------------------------- -ExceptionTests.cpp:33 +ExceptionTests.cpp:31 ............................................................................... -ExceptionTests.cpp:35: +ExceptionTests.cpp:33: PASSED: REQUIRE_THROWS_AS( thisThrows() ) -ExceptionTests.cpp:36: +ExceptionTests.cpp:34: PASSED: REQUIRE_NOTHROW( thisDoesntThrow() ) -ExceptionTests.cpp:37: +ExceptionTests.cpp:35: PASSED: REQUIRE_THROWS( thisThrows() ) ------------------------------------------------------------------------------- ./failing/exceptions/explicit ------------------------------------------------------------------------------- -ExceptionTests.cpp:41 +ExceptionTests.cpp:38 ............................................................................... -ExceptionTests.cpp:43: FAILED: +ExceptionTests.cpp:40: FAILED: CHECK_THROWS_AS( thisThrows() ) due to unexpected exception with message: expected exception -ExceptionTests.cpp:44: FAILED: +ExceptionTests.cpp:41: FAILED: CHECK_THROWS_AS( thisDoesntThrow() ) because no exception was thrown where one was expected: -ExceptionTests.cpp:45: FAILED: +ExceptionTests.cpp:42: FAILED: CHECK_NOTHROW( thisThrows() ) due to unexpected exception with message: expected exception @@ -1061,24 +1061,24 @@ due to unexpected exception with message: ------------------------------------------------------------------------------- ./failing/exceptions/implicit ------------------------------------------------------------------------------- -ExceptionTests.cpp:48 +ExceptionTests.cpp:45 ............................................................................... -ExceptionTests.cpp:48: FAILED: +ExceptionTests.cpp:45: FAILED: due to unexpected exception with message: unexpected exception ------------------------------------------------------------------------------- ./failing/exceptions/implicit/2 ------------------------------------------------------------------------------- -ExceptionTests.cpp:54 +ExceptionTests.cpp:51 ............................................................................... -ExceptionTests.cpp:56: +ExceptionTests.cpp:53: PASSED: CHECK( 1 == 1 ) -ExceptionTests.cpp:56: FAILED: +ExceptionTests.cpp:53: FAILED: {Unknown expression after the reported line} due to unexpected exception with message: unexpected exception @@ -1087,20 +1087,20 @@ due to unexpected exception with message: ./failing/exceptions/implicit/3 section name ------------------------------------------------------------------------------- -ExceptionTests.cpp:62 +ExceptionTests.cpp:59 ............................................................................... -ExceptionTests.cpp:62: FAILED: +ExceptionTests.cpp:59: FAILED: due to unexpected exception with message: unexpected exception ------------------------------------------------------------------------------- ./failing/exceptions/implicit/4 ------------------------------------------------------------------------------- -ExceptionTests.cpp:69 +ExceptionTests.cpp:66 ............................................................................... -ExceptionTests.cpp:71: FAILED: +ExceptionTests.cpp:68: FAILED: CHECK( thisThrows() == 0 ) due to unexpected exception with message: expected exception @@ -1108,7 +1108,7 @@ due to unexpected exception with message: ------------------------------------------------------------------------------- ./succeeding/exceptions/implicit ------------------------------------------------------------------------------- -ExceptionTests.cpp:75 +ExceptionTests.cpp:71 ............................................................................... @@ -1117,42 +1117,42 @@ No assertions in test case, './succeeding/exceptions/implicit' ------------------------------------------------------------------------------- ./failing/exceptions/custom ------------------------------------------------------------------------------- -ExceptionTests.cpp:112 +ExceptionTests.cpp:108 ............................................................................... -ExceptionTests.cpp:112: FAILED: +ExceptionTests.cpp:108: FAILED: due to unexpected exception with message: custom exception ------------------------------------------------------------------------------- ./failing/exceptions/custom/nothrow ------------------------------------------------------------------------------- -ExceptionTests.cpp:120 +ExceptionTests.cpp:119 ............................................................................... -ExceptionTests.cpp:122: FAILED: - REQUIRE_NOTHROW( throw CustomException( "unexpected custom exception" ) ) +ExceptionTests.cpp:121: FAILED: + REQUIRE_NOTHROW( throwCustom() ) due to unexpected exception with message: - unexpected custom exception + custom exception - not std ------------------------------------------------------------------------------- ./failing/exceptions/custom/throw ------------------------------------------------------------------------------- -ExceptionTests.cpp:125 +ExceptionTests.cpp:124 ............................................................................... -ExceptionTests.cpp:127: FAILED: - REQUIRE_THROWS_AS( throw CustomException( "custom exception - not std" ) ) +ExceptionTests.cpp:126: FAILED: + REQUIRE_THROWS_AS( throwCustom() ) due to unexpected exception with message: custom exception - not std ------------------------------------------------------------------------------- ./failing/exceptions/custom/double ------------------------------------------------------------------------------- -ExceptionTests.cpp:131 +ExceptionTests.cpp:130 ............................................................................... -ExceptionTests.cpp:131: FAILED: +ExceptionTests.cpp:130: FAILED: due to unexpected exception with message: 3.14 @@ -6040,54 +6040,54 @@ ConditionTests.cpp:346 -ExceptionTests.cpp:43 +ExceptionTests.cpp:40 -ExceptionTests.cpp:44 +ExceptionTests.cpp:41 -ExceptionTests.cpp:45 +ExceptionTests.cpp:42 -ExceptionTests.cpp:48 +ExceptionTests.cpp:45 -ExceptionTests.cpp:56 +ExceptionTests.cpp:53 -ExceptionTests.cpp:62 +ExceptionTests.cpp:59 -ExceptionTests.cpp:71 +ExceptionTests.cpp:68 -ExceptionTests.cpp:112 +ExceptionTests.cpp:108 - -ExceptionTests.cpp:122 + +ExceptionTests.cpp:121 - -ExceptionTests.cpp:127 + +ExceptionTests.cpp:126 -ExceptionTests.cpp:131 +ExceptionTests.cpp:130 @@ -7713,6 +7713,22 @@ ConditionTests.cpp" line="346"> +ExceptionTests.cpp" line="33"> + + thisThrows() + + + thisThrows() + + +ExceptionTests.cpp" line="34"> + + thisDoesntThrow() + + + thisDoesntThrow() + + ExceptionTests.cpp" line="35"> thisThrows() @@ -7721,37 +7737,21 @@ ExceptionTests.cpp" line="35"> thisThrows() -ExceptionTests.cpp" line="36"> - - thisDoesntThrow() - - - thisDoesntThrow() - - -ExceptionTests.cpp" line="37"> - - thisThrows() - - - thisThrows() - - -ExceptionTests.cpp" line="43"> +ExceptionTests.cpp" line="40"> thisThrows() thisThrows() -ExceptionTests.cpp" line="43"> +ExceptionTests.cpp" line="40"> expected exception -ExceptionTests.cpp" line="44"> +ExceptionTests.cpp" line="41"> thisDoesntThrow() @@ -7759,27 +7759,27 @@ ExceptionTests.cpp" line="44"> thisDoesntThrow() -ExceptionTests.cpp" line="45"> +ExceptionTests.cpp" line="42"> thisThrows() thisThrows() -ExceptionTests.cpp" line="45"> +ExceptionTests.cpp" line="42"> expected exception -ExceptionTests.cpp" line="48"> +ExceptionTests.cpp" line="45"> unexpected exception -ExceptionTests.cpp" line="56"> +ExceptionTests.cpp" line="53"> 1 == 1 @@ -7787,14 +7787,14 @@ ExceptionTests.cpp" line="56"> 1 == 1 -ExceptionTests.cpp" line="56"> +ExceptionTests.cpp" line="53"> {Unknown expression after the reported line} {Unknown expression after the reported line} -ExceptionTests.cpp" line="56"> +ExceptionTests.cpp" line="53"> unexpected exception @@ -7802,7 +7802,7 @@ ExceptionTests.cpp" line="56">
-ExceptionTests.cpp" line="62"> +ExceptionTests.cpp" line="59"> unexpected exception @@ -7810,14 +7810,14 @@ ExceptionTests.cpp" line="62"> -ExceptionTests.cpp" line="71"> +ExceptionTests.cpp" line="68"> thisThrows() == 0 thisThrows() == 0 -ExceptionTests.cpp" line="71"> +ExceptionTests.cpp" line="68"> expected exception @@ -7827,41 +7827,41 @@ ExceptionTests.cpp" line="71"> -ExceptionTests.cpp" line="112"> +ExceptionTests.cpp" line="108"> custom exception -ExceptionTests.cpp" line="122"> +ExceptionTests.cpp" line="121"> - throw CustomException( "unexpected custom exception" ) + throwCustom() - throw CustomException( "unexpected custom exception" ) + throwCustom() -ExceptionTests.cpp" line="122"> - unexpected custom exception +ExceptionTests.cpp" line="121"> + custom exception - not std -ExceptionTests.cpp" line="127"> +ExceptionTests.cpp" line="126"> - throw CustomException( "custom exception - not std" ) + throwCustom() - throw CustomException( "custom exception - not std" ) + throwCustom() -ExceptionTests.cpp" line="127"> +ExceptionTests.cpp" line="126"> custom exception - not std -ExceptionTests.cpp" line="131"> +ExceptionTests.cpp" line="130"> 3.14 @@ -12538,36 +12538,36 @@ ConditionTests.cpp:346: !1 == 1 failed for: !(1 == 1) [Finished: './failing/conditions/not' 1 test case failed (All 8 assertions failed)] [Running: ./succeeding/exceptions/explicit] +ExceptionTests.cpp:33: thisThrows() succeeded +ExceptionTests.cpp:34: thisDoesntThrow() succeeded ExceptionTests.cpp:35: thisThrows() succeeded -ExceptionTests.cpp:36: thisDoesntThrow() succeeded -ExceptionTests.cpp:37: thisThrows() succeeded [Finished: './succeeding/exceptions/explicit' All tests passed (3 assertions in 1 test case)] [Running: ./failing/exceptions/explicit] -ExceptionTests.cpp:43: thisThrows() failed with unexpected exception with message: 'expected exception' -ExceptionTests.cpp:44: thisDoesntThrow() failed because no exception was thrown where one was expected -ExceptionTests.cpp:45: thisThrows() failed with unexpected exception with message: 'expected exception' +ExceptionTests.cpp:40: thisThrows() failed with unexpected exception with message: 'expected exception' +ExceptionTests.cpp:41: thisDoesntThrow() failed because no exception was thrown where one was expected +ExceptionTests.cpp:42: thisThrows() failed with unexpected exception with message: 'expected exception' [Finished: './failing/exceptions/explicit' 1 test case failed (All 3 assertions failed)] [Running: ./failing/exceptions/implicit] -ExceptionTests.cpp:48: Unexpected exception with message: 'unexpected exception' +ExceptionTests.cpp:45: Unexpected exception with message: 'unexpected exception' [Finished: './failing/exceptions/implicit' 1 test case failed (1 assertion failed)] [Running: ./failing/exceptions/implicit/2] -ExceptionTests.cpp:56: 1 == 1 succeeded -ExceptionTests.cpp:56: {Unknown expression after the reported line} failed with unexpected exception with message: 'unexpected exception' +ExceptionTests.cpp:53: 1 == 1 succeeded +ExceptionTests.cpp:53: {Unknown expression after the reported line} failed with unexpected exception with message: 'unexpected exception' [Finished: './failing/exceptions/implicit/2' 1 test case failed (1 of 2 assertions failed)] [Running: ./failing/exceptions/implicit/3] [Started section: 'section name'] -ExceptionTests.cpp:62: Unexpected exception with message: 'unexpected exception' +ExceptionTests.cpp:59: Unexpected exception with message: 'unexpected exception' [End of section: 'section name' 1 assertion failed] [Finished: './failing/exceptions/implicit/3' 1 test case failed (1 assertion failed)] [Running: ./failing/exceptions/implicit/4] -ExceptionTests.cpp:71: thisThrows() == 0 failed with unexpected exception with message: 'expected exception' +ExceptionTests.cpp:68: thisThrows() == 0 failed with unexpected exception with message: 'expected exception' [Finished: './failing/exceptions/implicit/4' 1 test case failed (1 assertion failed)] [Running: ./succeeding/exceptions/implicit] @@ -12577,19 +12577,19 @@ No assertions in test case, './succeeding/exceptions/implicit' [Finished: './succeeding/exceptions/implicit' 1 test case failed (1 assertion failed)] [Running: ./failing/exceptions/custom] -ExceptionTests.cpp:112: Unexpected exception with message: 'custom exception' +ExceptionTests.cpp:108: Unexpected exception with message: 'custom exception' [Finished: './failing/exceptions/custom' 1 test case failed (1 assertion failed)] [Running: ./failing/exceptions/custom/nothrow] -ExceptionTests.cpp:122: throw CustomException( "unexpected custom exception" ) failed with unexpected exception with message: 'unexpected custom exception' +ExceptionTests.cpp:121: throwCustom() failed with unexpected exception with message: 'custom exception - not std' [Finished: './failing/exceptions/custom/nothrow' 1 test case failed (1 assertion failed)] [Running: ./failing/exceptions/custom/throw] -ExceptionTests.cpp:127: throw CustomException( "custom exception - not std" ) failed with unexpected exception with message: 'custom exception - not std' +ExceptionTests.cpp:126: throwCustom() failed with unexpected exception with message: 'custom exception - not std' [Finished: './failing/exceptions/custom/throw' 1 test case failed (1 assertion failed)] [Running: ./failing/exceptions/custom/double] -ExceptionTests.cpp:131: Unexpected exception with message: '3.14' +ExceptionTests.cpp:130: Unexpected exception with message: '3.14' [Finished: './failing/exceptions/custom/double' 1 test case failed (1 assertion failed)] [Running: ./succeeding/exceptions/notimplemented]