catch3
Progmasoft Catch3: an independently maintained C++17 test framework with a parallel runner, property checks, snapshots and structured results.
Clonegit clone https://git.progmasoft.com/catch3
Added type attribute to xml reporter output
- Commit
c6635a7b7933250a76f4eeb3e10b6a7e373b6026- Author
- Phil Nash ·
- Parents
6817bb099db4
Changes
include/reporters/catch_reporter_xml.hpp | 2 +- projects/SelfTest/Baselines/xml.sw.approved.txt | 1462 +++++++++++------------ 2 files changed, 732 insertions(+), 732 deletions(-) diff --git a/include/reporters/catch_reporter_xml.hpp b/include/reporters/catch_reporter_xml.hpp index 08971d1f..d8cb1dd1 100644 --- a/include/reporters/catch_reporter_xml.hpp +++ b/include/reporters/catch_reporter_xml.hpp @@ -99,7 +99,7 @@ namespace Catch { if( assertionResult.hasExpression() ) { m_xml.startElement( "Expression" ) .writeAttribute( "success", assertionResult.succeeded() ) -// .writeAttribute( "type", assertionResult.getTestMacroName() ) + .writeAttribute( "type", assertionResult.getTestMacroName() ) .writeAttribute( "filename", assertionResult.getSourceInfo().file ) .writeAttribute( "line", assertionResult.getSourceInfo().line ); diff --git a/projects/SelfTest/Baselines/xml.sw.approved.txt b/projects/SelfTest/Baselines/xml.sw.approved.txt index f05a2726..1dcfec76 100644 --- a/projects/SelfTest/Baselines/xml.sw.approved.txt +++ b/projects/SelfTest/Baselines/xml.sw.approved.txt @@ -1,7 +1,7 @@ <Catch name="CatchSelfTest"> <Group name="all tests"> <TestCase name="toString(enum)"> - <Expression success="true" filename="projects/SelfTest/EnumToString.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/EnumToString.cpp" > <Original> Catch::toString(e0) == "0" </Original> @@ -9,7 +9,7 @@ "0" == "0" </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/EnumToString.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/EnumToString.cpp" > <Original> Catch::toString(e1) == "1" </Original> @@ -20,7 +20,7 @@ <OverallResult success="true"/> </TestCase> <TestCase name="toString(enum w/operator<<)"> - <Expression success="true" filename="projects/SelfTest/EnumToString.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/EnumToString.cpp" > <Original> Catch::toString(e0) == "E2{0}" </Original> @@ -28,7 +28,7 @@ "E2{0}" == "E2{0}" </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/EnumToString.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/EnumToString.cpp" > <Original> Catch::toString(e1) == "E2{1}" </Original> @@ -39,7 +39,7 @@ <OverallResult success="true"/> </TestCase> <TestCase name="toString(enum class)"> - <Expression success="true" filename="projects/SelfTest/EnumToString.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/EnumToString.cpp" > <Original> Catch::toString(e0) == "0" </Original> @@ -47,7 +47,7 @@ "0" == "0" </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/EnumToString.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/EnumToString.cpp" > <Original> Catch::toString(e1) == "1" </Original> @@ -58,7 +58,7 @@ <OverallResult success="true"/> </TestCase> <TestCase name="toString(enum class w/operator<<)"> - <Expression success="true" filename="projects/SelfTest/EnumToString.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/EnumToString.cpp" > <Original> Catch::toString(e0) == "E2/V0" </Original> @@ -66,7 +66,7 @@ "E2/V0" == "E2/V0" </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/EnumToString.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/EnumToString.cpp" > <Original> Catch::toString(e1) == "E2/V1" </Original> @@ -74,7 +74,7 @@ "E2/V1" == "E2/V1" </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/EnumToString.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/EnumToString.cpp" > <Original> Catch::toString(e3) == "Unknown enum value 10" </Original> @@ -87,7 +87,7 @@ <OverallResult success="true"/> </TestCase> <TestCase name="Some simple comparisons between doubles"> - <Expression success="true" filename="projects/SelfTest/ApproxTests.cpp" > + <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ApproxTests.cpp" > <Original> d == Approx( 1.23 ) </Original> @@ -95,7 +95,7 @@ 1.23 == Approx( 1.23 ) </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/ApproxTests.cpp" > + <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ApproxTests.cpp" > <Original> d != Approx( 1.22 ) </Original> @@ -103,7 +103,7 @@ 1.23 != Approx( 1.22 ) </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/ApproxTests.cpp" > + <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ApproxTests.cpp" > <Original> d != Approx( 1.24 ) </Original> @@ -111,7 +111,7 @@ 1.23 != Approx( 1.24 ) </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/ApproxTests.cpp" > + <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ApproxTests.cpp" > <Original> Approx( d ) == 1.23 </Original> @@ -119,7 +119,7 @@ Approx( 1.23 ) == 1.23 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/ApproxTests.cpp" > + <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ApproxTests.cpp" > <Original> Approx( d ) != 1.22 </Original> @@ -127,7 +127,7 @@ Approx( 1.23 ) != 1.22 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/ApproxTests.cpp" > + <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ApproxTests.cpp" > <Original> Approx( d ) != 1.24 </Original> @@ -138,7 +138,7 @@ <OverallResult success="true"/> </TestCase> <TestCase name="Approximate comparisons with different epsilons"> - <Expression success="true" filename="projects/SelfTest/ApproxTests.cpp" > + <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ApproxTests.cpp" > <Original> d != Approx( 1.231 ) </Original> @@ -146,7 +146,7 @@ 1.23 != Approx( 1.231 ) </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/ApproxTests.cpp" > + <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ApproxTests.cpp" > <Original> d == Approx( 1.231 ).epsilon( 0.1 ) </Original> @@ -157,7 +157,7 @@ <OverallResult success="true"/> </TestCase> <TestCase name="Approximate comparisons with floats"> - <Expression success="true" filename="projects/SelfTest/ApproxTests.cpp" > + <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ApproxTests.cpp" > <Original> 1.23f == Approx( 1.23f ) </Original> @@ -165,7 +165,7 @@ 1.23f == Approx( 1.2300000191 ) </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/ApproxTests.cpp" > + <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ApproxTests.cpp" > <Original> 0.0f == Approx( 0.0f ) </Original> @@ -176,7 +176,7 @@ <OverallResult success="true"/> </TestCase> <TestCase name="Approximate comparisons with ints"> - <Expression success="true" filename="projects/SelfTest/ApproxTests.cpp" > + <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ApproxTests.cpp" > <Original> 1 == Approx( 1 ) </Original> @@ -184,7 +184,7 @@ 1 == Approx( 1.0 ) </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/ApproxTests.cpp" > + <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ApproxTests.cpp" > <Original> 0 == Approx( 0 ) </Original> @@ -195,7 +195,7 @@ <OverallResult success="true"/> </TestCase> <TestCase name="Approximate comparisons with mixed numeric types"> - <Expression success="true" filename="projects/SelfTest/ApproxTests.cpp" > + <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ApproxTests.cpp" > <Original> 1.0f == Approx( 1 ) </Original> @@ -203,7 +203,7 @@ 1.0f == Approx( 1.0 ) </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/ApproxTests.cpp" > + <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ApproxTests.cpp" > <Original> 0 == Approx( dZero) </Original> @@ -211,7 +211,7 @@ 0 == Approx( 0.0 ) </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/ApproxTests.cpp" > + <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ApproxTests.cpp" > <Original> 0 == Approx( dSmall ).epsilon( 0.001 ) </Original> @@ -219,7 +219,7 @@ 0 == Approx( 0.00001 ) </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/ApproxTests.cpp" > + <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ApproxTests.cpp" > <Original> 1.234f == Approx( dMedium ) </Original> @@ -227,7 +227,7 @@ 1.234f == Approx( 1.234 ) </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/ApproxTests.cpp" > + <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ApproxTests.cpp" > <Original> dMedium == Approx( 1.234f ) </Original> @@ -238,7 +238,7 @@ <OverallResult success="true"/> </TestCase> <TestCase name="Use a custom approx"> - <Expression success="true" filename="projects/SelfTest/ApproxTests.cpp" > + <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ApproxTests.cpp" > <Original> d == approx( 1.23 ) </Original> @@ -246,7 +246,7 @@ 1.23 == Approx( 1.23 ) </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/ApproxTests.cpp" > + <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ApproxTests.cpp" > <Original> d == approx( 1.22 ) </Original> @@ -254,7 +254,7 @@ 1.23 == Approx( 1.22 ) </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/ApproxTests.cpp" > + <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ApproxTests.cpp" > <Original> d == approx( 1.24 ) </Original> @@ -262,7 +262,7 @@ 1.23 == Approx( 1.24 ) </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/ApproxTests.cpp" > + <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ApproxTests.cpp" > <Original> d != approx( 1.25 ) </Original> @@ -270,7 +270,7 @@ 1.23 != Approx( 1.25 ) </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/ApproxTests.cpp" > + <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ApproxTests.cpp" > <Original> approx( d ) == 1.23 </Original> @@ -278,7 +278,7 @@ Approx( 1.23 ) == 1.23 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/ApproxTests.cpp" > + <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ApproxTests.cpp" > <Original> approx( d ) == 1.22 </Original> @@ -286,7 +286,7 @@ Approx( 1.23 ) == 1.22 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/ApproxTests.cpp" > + <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ApproxTests.cpp" > <Original> approx( d ) == 1.24 </Original> @@ -294,7 +294,7 @@ Approx( 1.23 ) == 1.24 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/ApproxTests.cpp" > + <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ApproxTests.cpp" > <Original> approx( d ) != 1.25 </Original> @@ -305,7 +305,7 @@ <OverallResult success="true"/> </TestCase> <TestCase name="Approximate PI"> - <Expression success="true" filename="projects/SelfTest/ApproxTests.cpp" > + <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ApproxTests.cpp" > <Original> divide( 22, 7 ) == Approx( 3.141 ).epsilon( 0.001 ) </Original> @@ -313,7 +313,7 @@ 3.1428571429 == Approx( 3.141 ) </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/ApproxTests.cpp" > + <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ApproxTests.cpp" > <Original> divide( 22, 7 ) != Approx( 3.141 ).epsilon( 0.0001 ) </Original> @@ -324,7 +324,7 @@ <OverallResult success="true"/> </TestCase> <TestCase name="A METHOD_AS_TEST_CASE based test run that succeeds"> - <Expression success="true" filename="projects/SelfTest/ClassTests.cpp" > + <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ClassTests.cpp" > <Original> s == "hello" </Original> @@ -335,7 +335,7 @@ <OverallResult success="true"/> </TestCase> <TestCase name="A METHOD_AS_TEST_CASE based test run that fails"> - <Expression success="false" filename="projects/SelfTest/ClassTests.cpp" > + <Expression success="false" type="REQUIRE" filename="projects/SelfTest/ClassTests.cpp" > <Original> s == "world" </Original> @@ -346,7 +346,7 @@ <OverallResult success="false"/> </TestCase> <TestCase name="A TEST_CASE_METHOD based test run that succeeds"> - <Expression success="true" filename="projects/SelfTest/ClassTests.cpp" > + <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ClassTests.cpp" > <Original> m_a == 1 </Original> @@ -357,7 +357,7 @@ <OverallResult success="true"/> </TestCase> <TestCase name="A TEST_CASE_METHOD based test run that fails"> - <Expression success="false" filename="projects/SelfTest/ClassTests.cpp" > + <Expression success="false" type="REQUIRE" filename="projects/SelfTest/ClassTests.cpp" > <Original> m_a == 2 </Original> @@ -368,7 +368,7 @@ <OverallResult success="false"/> </TestCase> <TestCase name="Equality checks that should succeed"> - <Expression success="true" filename="projects/SelfTest/ConditionTests.cpp" > + <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ConditionTests.cpp" > <Original> data.int_seven == 7 </Original> @@ -376,7 +376,7 @@ 7 == 7 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/ConditionTests.cpp" > + <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ConditionTests.cpp" > <Original> data.float_nine_point_one == Approx( 9.1f ) </Original> @@ -384,7 +384,7 @@ 9.1f == Approx( 9.1000003815 ) </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/ConditionTests.cpp" > + <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ConditionTests.cpp" > <Original> data.double_pi == Approx( 3.1415926535 ) </Original> @@ -392,7 +392,7 @@ 3.1415926535 == Approx( 3.1415926535 ) </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/ConditionTests.cpp" > + <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ConditionTests.cpp" > <Original> data.str_hello == "hello" </Original> @@ -400,7 +400,7 @@ "hello" == "hello" </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/ConditionTests.cpp" > + <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ConditionTests.cpp" > <Original> "hello" == data.str_hello </Original> @@ -408,7 +408,7 @@ "hello" == "hello" </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/ConditionTests.cpp" > + <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ConditionTests.cpp" > <Original> data.str_hello.size() == 5 </Original> @@ -416,7 +416,7 @@ 5 == 5 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/ConditionTests.cpp" > + <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ConditionTests.cpp" > <Original> x == Approx( 1.3 ) </Original> @@ -427,7 +427,7 @@ <OverallResult success="true"/> </TestCase> <TestCase name="Equality checks that should fail"> - <Expression success="false" filename="projects/SelfTest/ConditionTests.cpp" > + <Expression success="false" type="CHECK" filename="projects/SelfTest/ConditionTests.cpp" > <Original> data.int_seven == 6 </Original> @@ -435,7 +435,7 @@ 7 == 6 </Expanded> </Expression> - <Expression success="false" filename="projects/SelfTest/ConditionTests.cpp" > + <Expression success="false" type="CHECK" filename="projects/SelfTest/ConditionTests.cpp" > <Original> data.int_seven == 8 </Original> @@ -443,7 +443,7 @@ 7 == 8 </Expanded> </Expression> - <Expression success="false" filename="projects/SelfTest/ConditionTests.cpp" > + <Expression success="false" type="CHECK" filename="projects/SelfTest/ConditionTests.cpp" > <Original> data.int_seven == 0 </Original> @@ -451,7 +451,7 @@ 7 == 0 </Expanded> </Expression> - <Expression success="false" filename="projects/SelfTest/ConditionTests.cpp" > + <Expression success="false" type="CHECK" filename="projects/SelfTest/ConditionTests.cpp" > <Original> data.float_nine_point_one == Approx( 9.11f ) </Original> @@ -459,7 +459,7 @@ 9.1f == Approx( 9.1099996567 ) </Expanded> </Expression> - <Expression success="false" filename="projects/SelfTest/ConditionTests.cpp" > + <Expression success="false" type="CHECK" filename="projects/SelfTest/ConditionTests.cpp" > <Original> data.float_nine_point_one == Approx( 9.0f ) </Original> @@ -467,7 +467,7 @@ 9.1f == Approx( 9.0 ) </Expanded> </Expression> - <Expression success="false" filename="projects/SelfTest/ConditionTests.cpp" > + <Expression success="false" type="CHECK" filename="projects/SelfTest/ConditionTests.cpp" > <Original> data.float_nine_point_one == Approx( 1 ) </Original> @@ -475,7 +475,7 @@ 9.1f == Approx( 1.0 ) </Expanded> </Expression> - <Expression success="false" filename="projects/SelfTest/ConditionTests.cpp" > + <Expression success="false" type="CHECK" filename="projects/SelfTest/ConditionTests.cpp" > <Original> data.float_nine_point_one == Approx( 0 ) </Original> @@ -483,7 +483,7 @@ 9.1f == Approx( 0.0 ) </Expanded> </Expression> - <Expression success="false" filename="projects/SelfTest/ConditionTests.cpp" > + <Expression success="false" type="CHECK" filename="projects/SelfTest/ConditionTests.cpp" > <Original> data.double_pi == Approx( 3.1415 ) </Original> @@ -491,7 +491,7 @@ 3.1415926535 == Approx( 3.1415 ) </Expanded> </Expression> - <Expression success="false" filename="projects/SelfTest/ConditionTests.cpp" > + <Expression success="false" type="CHECK" filename="projects/SelfTest/ConditionTests.cpp" > <Original> data.str_hello == "goodbye" </Original> @@ -499,7 +499,7 @@ "hello" == "goodbye" </Expanded> </Expression> - <Expression success="false" filename="projects/SelfTest/ConditionTests.cpp" > + <Expression success="false" type="CHECK" filename="projects/SelfTest/ConditionTests.cpp" > <Original> data.str_hello == "hell" </Original> @@ -507,7 +507,7 @@ "hello" == "hell" </Expanded> </Expression> - <Expression success="false" filename="projects/SelfTest/ConditionTests.cpp" > + <Expression success="false" type="CHECK" filename="projects/SelfTest/ConditionTests.cpp" > <Original> data.str_hello == "hello1" </Original> @@ -515,7 +515,7 @@ "hello" == "hello1" </Expanded> </Expression> - <Expression success="false" filename="projects/SelfTest/ConditionTests.cpp" > + <Expression success="false" type="CHECK" filename="projects/SelfTest/ConditionTests.cpp" > <Original> data.str_hello.size() == 6 </Original> @@ -523,7 +523,7 @@ 5 == 6 </Expanded> </Expression> - <Expression success="false" filename="projects/SelfTest/ConditionTests.cpp" > + <Expression success="false" type="CHECK" filename="projects/SelfTest/ConditionTests.cpp" > <Original> x == Approx( 1.301 ) </Original> @@ -534,7 +534,7 @@ <OverallResult success="true"/> </TestCase> <TestCase name="Inequality checks that should succeed"> - <Expression success="true" filename="projects/SelfTest/ConditionTests.cpp" > + <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ConditionTests.cpp" > <Original> data.int_seven != 6 </Original> @@ -542,7 +542,7 @@ 7 != 6 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/ConditionTests.cpp" > + <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ConditionTests.cpp" > <Original> data.int_seven != 8 </Original> @@ -550,7 +550,7 @@ 7 != 8 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/ConditionTests.cpp" > + <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ConditionTests.cpp" > <Original> data.float_nine_point_one != Approx( 9.11f ) </Original> @@ -558,7 +558,7 @@ 9.1f != Approx( 9.1099996567 ) </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/ConditionTests.cpp" > + <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ConditionTests.cpp" > <Original> data.float_nine_point_one != Approx( 9.0f ) </Original> @@ -566,7 +566,7 @@ 9.1f != Approx( 9.0 ) </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/ConditionTests.cpp" > + <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ConditionTests.cpp" > <Original> data.float_nine_point_one != Approx( 1 ) </Original> @@ -574,7 +574,7 @@ 9.1f != Approx( 1.0 ) </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/ConditionTests.cpp" > + <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ConditionTests.cpp" > <Original> data.float_nine_point_one != Approx( 0 ) </Original> @@ -582,7 +582,7 @@ 9.1f != Approx( 0.0 ) </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/ConditionTests.cpp" > + <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ConditionTests.cpp" > <Original> data.double_pi != Approx( 3.1415 ) </Original> @@ -590,7 +590,7 @@ 3.1415926535 != Approx( 3.1415 ) </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/ConditionTests.cpp" > + <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ConditionTests.cpp" > <Original> data.str_hello != "goodbye" </Original> @@ -598,7 +598,7 @@ "hello" != "goodbye" </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/ConditionTests.cpp" > + <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ConditionTests.cpp" > <Original> data.str_hello != "hell" </Original> @@ -606,7 +606,7 @@ "hello" != "hell" </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/ConditionTests.cpp" > + <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ConditionTests.cpp" > <Original> data.str_hello != "hello1" </Original> @@ -614,7 +614,7 @@ "hello" != "hello1" </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/ConditionTests.cpp" > + <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ConditionTests.cpp" > <Original> data.str_hello.size() != 6 </Original> @@ -625,7 +625,7 @@ <OverallResult success="true"/> </TestCase> <TestCase name="Inequality checks that should fail"> - <Expression success="false" filename="projects/SelfTest/ConditionTests.cpp" > + <Expression success="false" type="CHECK" filename="projects/SelfTest/ConditionTests.cpp" > <Original> data.int_seven != 7 </Original> @@ -633,7 +633,7 @@ 7 != 7 </Expanded> </Expression> - <Expression success="false" filename="projects/SelfTest/ConditionTests.cpp" > + <Expression success="false" type="CHECK" filename="projects/SelfTest/ConditionTests.cpp" > <Original> data.float_nine_point_one != Approx( 9.1f ) </Original> @@ -641,7 +641,7 @@ 9.1f != Approx( 9.1000003815 ) </Expanded> </Expression> - <Expression success="false" filename="projects/SelfTest/ConditionTests.cpp" > + <Expression success="false" type="CHECK" filename="projects/SelfTest/ConditionTests.cpp" > <Original> data.double_pi != Approx( 3.1415926535 ) </Original> @@ -649,7 +649,7 @@ 3.1415926535 != Approx( 3.1415926535 ) </Expanded> </Expression> - <Expression success="false" filename="projects/SelfTest/ConditionTests.cpp" > + <Expression success="false" type="CHECK" filename="projects/SelfTest/ConditionTests.cpp" > <Original> data.str_hello != "hello" </Original> @@ -657,7 +657,7 @@ "hello" != "hello" </Expanded> </Expression> - <Expression success="false" filename="projects/SelfTest/ConditionTests.cpp" > + <Expression success="false" type="CHECK" filename="projects/SelfTest/ConditionTests.cpp" > <Original> data.str_hello.size() != 5 </Original> @@ -668,7 +668,7 @@ <OverallResult success="false"/> </TestCase> <TestCase name="Ordering comparison checks that should succeed"> - <Expression success="true" filename="projects/SelfTest/ConditionTests.cpp" > + <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ConditionTests.cpp" > <Original> data.int_seven < 8 </Original> @@ -676,7 +676,7 @@ 7 < 8 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/ConditionTests.cpp" > + <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ConditionTests.cpp" > <Original> data.int_seven > 6 </Original> @@ -684,7 +684,7 @@ 7 > 6 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/ConditionTests.cpp" > + <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ConditionTests.cpp" > <Original> data.int_seven > 0 </Original> @@ -692,7 +692,7 @@ 7 > 0 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/ConditionTests.cpp" > + <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ConditionTests.cpp" > <Original> data.int_seven > -1 </Original> @@ -700,7 +700,7 @@ 7 > -1 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/ConditionTests.cpp" > + <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ConditionTests.cpp" > <Original> data.int_seven >= 7 </Original> @@ -708,7 +708,7 @@ 7 >= 7 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/ConditionTests.cpp" > + <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ConditionTests.cpp" > <Original> data.int_seven >= 6 </Original> @@ -716,7 +716,7 @@ 7 >= 6 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/ConditionTests.cpp" > + <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ConditionTests.cpp" > <Original> data.int_seven <= 7 </Original> @@ -724,7 +724,7 @@ 7 <= 7 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/ConditionTests.cpp" > + <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ConditionTests.cpp" > <Original> data.int_seven <= 8 </Original> @@ -732,7 +732,7 @@ 7 <= 8 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/ConditionTests.cpp" > + <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ConditionTests.cpp" > <Original> data.float_nine_point_one > 9 </Original> @@ -740,7 +740,7 @@ 9.1f > 9 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/ConditionTests.cpp" > + <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ConditionTests.cpp" > <Original> data.float_nine_point_one < 10 </Original> @@ -748,7 +748,7 @@ 9.1f < 10 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/ConditionTests.cpp" > + <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ConditionTests.cpp" > <Original> data.float_nine_point_one < 9.2 </Original> @@ -756,7 +756,7 @@ 9.1f < 9.2 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/ConditionTests.cpp" > + <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ConditionTests.cpp" > <Original> data.str_hello <= "hello" </Original> @@ -764,7 +764,7 @@ "hello" <= "hello" </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/ConditionTests.cpp" > + <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ConditionTests.cpp" > <Original> data.str_hello >= "hello" </Original> @@ -772,7 +772,7 @@ "hello" >= "hello" </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/ConditionTests.cpp" > + <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ConditionTests.cpp" > <Original> data.str_hello < "hellp" </Original> @@ -780,7 +780,7 @@ "hello" < "hellp" </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/ConditionTests.cpp" > + <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ConditionTests.cpp" > <Original> data.str_hello < "zebra" </Original> @@ -788,7 +788,7 @@ "hello" < "zebra" </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/ConditionTests.cpp" > + <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ConditionTests.cpp" > <Original> data.str_hello > "hellm" </Original> @@ -796,7 +796,7 @@ "hello" > "hellm" </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/ConditionTests.cpp" > + <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ConditionTests.cpp" > <Original> data.str_hello > "a" </Original> @@ -807,7 +807,7 @@ <OverallResult success="true"/> </TestCase> <TestCase name="Ordering comparison checks that should fail"> - <Expression success="false" filename="projects/SelfTest/ConditionTests.cpp" > + <Expression success="false" type="CHECK" filename="projects/SelfTest/ConditionTests.cpp" > <Original> data.int_seven > 7 </Original> @@ -815,7 +815,7 @@ 7 > 7 </Expanded> </Expression> - <Expression success="false" filename="projects/SelfTest/ConditionTests.cpp" > + <Expression success="false" type="CHECK" filename="projects/SelfTest/ConditionTests.cpp" > <Original> data.int_seven < 7 </Original> @@ -823,7 +823,7 @@ 7 < 7 </Expanded> </Expression> - <Expression success="false" filename="projects/SelfTest/ConditionTests.cpp" > + <Expression success="false" type="CHECK" filename="projects/SelfTest/ConditionTests.cpp" > <Original> data.int_seven > 8 </Original> @@ -831,7 +831,7 @@ 7 > 8 </Expanded> </Expression> - <Expression success="false" filename="projects/SelfTest/ConditionTests.cpp" > + <Expression success="false" type="CHECK" filename="projects/SelfTest/ConditionTests.cpp" > <Original> data.int_seven < 6 </Original> @@ -839,7 +839,7 @@ 7 < 6 </Expanded> </Expression> - <Expression success="false" filename="projects/SelfTest/ConditionTests.cpp" > + <Expression success="false" type="CHECK" filename="projects/SelfTest/ConditionTests.cpp" > <Original> data.int_seven < 0 </Original> @@ -847,7 +847,7 @@ 7 < 0 </Expanded> </Expression> - <Expression success="false" filename="projects/SelfTest/ConditionTests.cpp" > + <Expression success="false" type="CHECK" filename="projects/SelfTest/ConditionTests.cpp" > <Original> data.int_seven < -1 </Original> @@ -855,7 +855,7 @@ 7 < -1 </Expanded> </Expression> - <Expression success="false" filename="projects/SelfTest/ConditionTests.cpp" > + <Expression success="false" type="CHECK" filename="projects/SelfTest/ConditionTests.cpp" > <Original> data.int_seven >= 8 </Original> @@ -863,7 +863,7 @@ 7 >= 8 </Expanded> </Expression> - <Expression success="false" filename="projects/SelfTest/ConditionTests.cpp" > + <Expression success="false" type="CHECK" filename="projects/SelfTest/ConditionTests.cpp" > <Original> data.int_seven <= 6 </Original> @@ -871,7 +871,7 @@ 7 <= 6 </Expanded> </Expression> - <Expression success="false" filename="projects/SelfTest/ConditionTests.cpp" > + <Expression success="false" type="CHECK" filename="projects/SelfTest/ConditionTests.cpp" > <Original> data.float_nine_point_one < 9 </Original> @@ -879,7 +879,7 @@ 9.1f < 9 </Expanded> </Expression> - <Expression success="false" filename="projects/SelfTest/ConditionTests.cpp" > + <Expression success="false" type="CHECK" filename="projects/SelfTest/ConditionTests.cpp" > <Original> data.float_nine_point_one > 10 </Original> @@ -887,7 +887,7 @@ 9.1f > 10 </Expanded> </Expression> - <Expression success="false" filename="projects/SelfTest/ConditionTests.cpp" > + <Expression success="false" type="CHECK" filename="projects/SelfTest/ConditionTests.cpp" > <Original> data.float_nine_point_one > 9.2 </Original> @@ -895,7 +895,7 @@ 9.1f > 9.2 </Expanded> </Expression> - <Expression success="false" filename="projects/SelfTest/ConditionTests.cpp" > + <Expression success="false" type="CHECK" filename="projects/SelfTest/ConditionTests.cpp" > <Original> data.str_hello > "hello" </Original> @@ -903,7 +903,7 @@ "hello" > "hello" </Expanded> </Expression> - <Expression success="false" filename="projects/SelfTest/ConditionTests.cpp" > + <Expression success="false" type="CHECK" filename="projects/SelfTest/ConditionTests.cpp" > <Original> data.str_hello < "hello" </Original> @@ -911,7 +911,7 @@ "hello" < "hello" </Expanded> </Expression> - <Expression success="false" filename="projects/SelfTest/ConditionTests.cpp" > + <Expression success="false" type="CHECK" filename="projects/SelfTest/ConditionTests.cpp" > <Original> data.str_hello > "hellp" </Original> @@ -919,7 +919,7 @@ "hello" > "hellp" </Expanded> </Expression> - <Expression success="false" filename="projects/SelfTest/ConditionTests.cpp" > + <Expression success="false" type="CHECK" filename="projects/SelfTest/ConditionTests.cpp" > <Original> data.str_hello > "z" </Original> @@ -927,7 +927,7 @@ "hello" > "z" </Expanded> </Expression> - <Expression success="false" filename="projects/SelfTest/ConditionTests.cpp" > + <Expression success="false" type="CHECK" filename="projects/SelfTest/ConditionTests.cpp" > <Original> data.str_hello < "hellm" </Original> @@ -935,7 +935,7 @@ "hello" < "hellm" </Expanded> </Expression> - <Expression success="false" filename="projects/SelfTest/ConditionTests.cpp" > + <Expression success="false" type="CHECK" filename="projects/SelfTest/ConditionTests.cpp" > <Original> data.str_hello < "a" </Original> @@ -943,7 +943,7 @@ "hello" < "a" </Expanded> </Expression> - <Expression success="false" filename="projects/SelfTest/ConditionTests.cpp" > + <Expression success="false" type="CHECK" filename="projects/SelfTest/ConditionTests.cpp" > <Original> data.str_hello >= "z" </Original> @@ -951,7 +951,7 @@ "hello" >= "z" </Expanded> </Expression> - <Expression success="false" filename="projects/SelfTest/ConditionTests.cpp" > + <Expression success="false" type="CHECK" filename="projects/SelfTest/ConditionTests.cpp" > <Original> data.str_hello <= "a" </Original> @@ -962,7 +962,7 @@ <OverallResult success="false"/> </TestCase> <TestCase name="Comparisons with int literals don't warn when mixing signed/ unsigned"> - <Expression success="true" filename="projects/SelfTest/ConditionTests.cpp" > + <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ConditionTests.cpp" > <Original> i == 1 </Original> @@ -970,7 +970,7 @@ 1 == 1 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/ConditionTests.cpp" > + <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ConditionTests.cpp" > <Original> ui == 2 </Original> @@ -978,7 +978,7 @@ 2 == 2 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/ConditionTests.cpp" > + <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ConditionTests.cpp" > <Original> l == 3 </Original> @@ -986,7 +986,7 @@ 3 == 3 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/ConditionTests.cpp" > + <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ConditionTests.cpp" > <Original> ul == 4 </Original> @@ -994,7 +994,7 @@ 4 == 4 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/ConditionTests.cpp" > + <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ConditionTests.cpp" > <Original> c == 5 </Original> @@ -1002,7 +1002,7 @@ 5 == 5 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/ConditionTests.cpp" > + <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ConditionTests.cpp" > <Original> uc == 6 </Original> @@ -1010,7 +1010,7 @@ 6 == 6 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/ConditionTests.cpp" > + <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ConditionTests.cpp" > <Original> 1 == i </Original> @@ -1018,7 +1018,7 @@ 1 == 1 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/ConditionTests.cpp" > + <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ConditionTests.cpp" > <Original> 2 == ui </Original> @@ -1026,7 +1026,7 @@ 2 == 2 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/ConditionTests.cpp" > + <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ConditionTests.cpp" > <Original> 3 == l </Original> @@ -1034,7 +1034,7 @@ 3 == 3 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/ConditionTests.cpp" > + <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ConditionTests.cpp" > <Original> 4 == ul </Original> @@ -1042,7 +1042,7 @@ 4 == 4 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/ConditionTests.cpp" > + <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ConditionTests.cpp" > <Original> 5 == c </Original> @@ -1050,7 +1050,7 @@ 5 == 5 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/ConditionTests.cpp" > + <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ConditionTests.cpp" > <Original> 6 == uc </Original> @@ -1058,7 +1058,7 @@ 6 == 6 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/ConditionTests.cpp" > + <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ConditionTests.cpp" > <Original> (std::numeric_limits<unsigned long>::max)() > ul </Original> @@ -1069,7 +1069,7 @@ <OverallResult success="true"/> </TestCase> <TestCase name="comparisons between int variables"> - <Expression success="true" filename="projects/SelfTest/ConditionTests.cpp" > + <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ConditionTests.cpp" > <Original> long_var == unsigned_char_var </Original> @@ -1077,7 +1077,7 @@ 1 == 1 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/ConditionTests.cpp" > + <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ConditionTests.cpp" > <Original> long_var == unsigned_short_var </Original> @@ -1085,7 +1085,7 @@ 1 == 1 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/ConditionTests.cpp" > + <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ConditionTests.cpp" > <Original> long_var == unsigned_int_var </Original> @@ -1093,7 +1093,7 @@ 1 == 1 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/ConditionTests.cpp" > + <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ConditionTests.cpp" > <Original> long_var == unsigned_long_var </Original> @@ -1104,7 +1104,7 @@ <OverallResult success="true"/> </TestCase> <TestCase name="comparisons between const int variables"> - <Expression success="true" filename="projects/SelfTest/ConditionTests.cpp" > + <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ConditionTests.cpp" > <Original> unsigned_char_var == 1 </Original> @@ -1112,7 +1112,7 @@ 1 == 1 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/ConditionTests.cpp" > + <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ConditionTests.cpp" > <Original> unsigned_short_var == 1 </Original> @@ -1120,7 +1120,7 @@ 1 == 1 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/ConditionTests.cpp" > + <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ConditionTests.cpp" > <Original> unsigned_int_var == 1 </Original> @@ -1128,7 +1128,7 @@ 1 == 1 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/ConditionTests.cpp" > + <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ConditionTests.cpp" > <Original> unsigned_long_var == 1 </Original> @@ -1139,7 +1139,7 @@ <OverallResult success="true"/> </TestCase> <TestCase name="Comparisons between unsigned ints and negative signed ints match c++ standard behaviour"> - <Expression success="true" filename="projects/SelfTest/ConditionTests.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/ConditionTests.cpp" > <Original> ( -1 > 2u ) </Original> @@ -1147,7 +1147,7 @@ true </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/ConditionTests.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/ConditionTests.cpp" > <Original> -1 > 2u </Original> @@ -1155,7 +1155,7 @@ -1 > 2 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/ConditionTests.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/ConditionTests.cpp" > <Original> ( 2u < -1 ) </Original> @@ -1163,7 +1163,7 @@ true </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/ConditionTests.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/ConditionTests.cpp" > <Original> 2u < -1 </Original> @@ -1171,7 +1171,7 @@ 2 < -1 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/ConditionTests.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/ConditionTests.cpp" > <Original> ( minInt > 2u ) </Original> @@ -1179,7 +1179,7 @@ true </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/ConditionTests.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/ConditionTests.cpp" > <Original> minInt > 2u </Original> @@ -1190,7 +1190,7 @@ <OverallResult success="true"/> </TestCase> <TestCase name="Comparisons between ints where one side is computed"> - <Expression success="true" filename="projects/SelfTest/ConditionTests.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/ConditionTests.cpp" > <Original> 54 == 6*9 </Original> @@ -1201,7 +1201,7 @@ <OverallResult success="true"/> </TestCase> <TestCase name="Pointers can be compared to null"> - <Expression success="true" filename="projects/SelfTest/ConditionTests.cpp" > + <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ConditionTests.cpp" > <Original> p == __null </Original> @@ -1209,7 +1209,7 @@ __null == 0 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/ConditionTests.cpp" > + <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ConditionTests.cpp" > <Original> p == pNULL </Original> @@ -1217,7 +1217,7 @@ __null == __null </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/ConditionTests.cpp" > + <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ConditionTests.cpp" > <Original> p != __null </Original> @@ -1225,7 +1225,7 @@ 0x<hex digits> != 0 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/ConditionTests.cpp" > + <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ConditionTests.cpp" > <Original> cp != __null </Original> @@ -1233,7 +1233,7 @@ 0x<hex digits> != 0 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/ConditionTests.cpp" > + <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ConditionTests.cpp" > <Original> cpc != __null </Original> @@ -1241,7 +1241,7 @@ 0x<hex digits> != 0 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/ConditionTests.cpp" > + <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ConditionTests.cpp" > <Original> returnsNull() == __null </Original> @@ -1249,7 +1249,7 @@ {null string} == 0 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/ConditionTests.cpp" > + <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ConditionTests.cpp" > <Original> returnsConstNull() == __null </Original> @@ -1257,7 +1257,7 @@ {null string} == 0 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/ConditionTests.cpp" > + <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ConditionTests.cpp" > <Original> __null != p </Original> @@ -1268,7 +1268,7 @@ <OverallResult success="true"/> </TestCase> <TestCase name="'Not' checks that should succeed"> - <Expression success="true" filename="projects/SelfTest/ConditionTests.cpp" > + <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ConditionTests.cpp" > <Original> false == false </Original> @@ -1276,7 +1276,7 @@ false == false </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/ConditionTests.cpp" > + <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ConditionTests.cpp" > <Original> true == true </Original> @@ -1284,7 +1284,7 @@ true == true </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/ConditionTests.cpp" > + <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ConditionTests.cpp" > <Original> !false </Original> @@ -1292,7 +1292,7 @@ true </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/ConditionTests.cpp" > + <Expression success="true" type="REQUIRE_FALSE" filename="projects/SelfTest/ConditionTests.cpp" > <Original> !false </Original> @@ -1300,7 +1300,7 @@ !false </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/ConditionTests.cpp" > + <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ConditionTests.cpp" > <Original> !falseValue </Original> @@ -1308,7 +1308,7 @@ true </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/ConditionTests.cpp" > + <Expression success="true" type="REQUIRE_FALSE" filename="projects/SelfTest/ConditionTests.cpp" > <Original> !falseValue </Original> @@ -1316,7 +1316,7 @@ !false </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/ConditionTests.cpp" > + <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ConditionTests.cpp" > <Original> !(1 == 2) </Original> @@ -1324,7 +1324,7 @@ true </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/ConditionTests.cpp" > + <Expression success="true" type="REQUIRE_FALSE" filename="projects/SelfTest/ConditionTests.cpp" > <Original> !1 == 2 </Original> @@ -1335,7 +1335,7 @@ <OverallResult success="true"/> </TestCase> <TestCase name="'Not' checks that should fail"> - <Expression success="false" filename="projects/SelfTest/ConditionTests.cpp" > + <Expression success="false" type="CHECK" filename="projects/SelfTest/ConditionTests.cpp" > <Original> false != false </Original> @@ -1343,7 +1343,7 @@ false != false </Expanded> </Expression> - <Expression success="false" filename="projects/SelfTest/ConditionTests.cpp" > + <Expression success="false" type="CHECK" filename="projects/SelfTest/ConditionTests.cpp" > <Original> true != true </Original> @@ -1351,7 +1351,7 @@ true != true </Expanded> </Expression> - <Expression success="false" filename="projects/SelfTest/ConditionTests.cpp" > + <Expression success="false" type="CHECK" filename="projects/SelfTest/ConditionTests.cpp" > <Original> !true </Original> @@ -1359,7 +1359,7 @@ false </Expanded> </Expression> - <Expression success="false" filename="projects/SelfTest/ConditionTests.cpp" > + <Expression success="false" type="CHECK_FALSE" filename="projects/SelfTest/ConditionTests.cpp" > <Original> !true </Original> @@ -1367,7 +1367,7 @@ !true </Expanded> </Expression> - <Expression success="false" filename="projects/SelfTest/ConditionTests.cpp" > + <Expression success="false" type="CHECK" filename="projects/SelfTest/ConditionTests.cpp" > <Original> !trueValue </Original> @@ -1375,7 +1375,7 @@ false </Expanded> </Expression> - <Expression success="false" filename="projects/SelfTest/ConditionTests.cpp" > + <Expression success="false" type="CHECK_FALSE" filename="projects/SelfTest/ConditionTests.cpp" > <Original> !trueValue </Original> @@ -1383,7 +1383,7 @@ !true </Expanded> </Expression> - <Expression success="false" filename="projects/SelfTest/ConditionTests.cpp" > + <Expression success="false" type="CHECK" filename="projects/SelfTest/ConditionTests.cpp" > <Original> !(1 == 1) </Original> @@ -1391,7 +1391,7 @@ false </Expanded> </Expression> - <Expression success="false" filename="projects/SelfTest/ConditionTests.cpp" > + <Expression success="false" type="CHECK_FALSE" filename="projects/SelfTest/ConditionTests.cpp" > <Original> !1 == 1 </Original> @@ -1402,7 +1402,7 @@ <OverallResult success="false"/> </TestCase> <TestCase name="When checked exceptions are thrown they can be expected or unexpected"> - <Expression success="true" filename="projects/SelfTest/ExceptionTests.cpp" > + <Expression success="true" type="REQUIRE_THROWS_AS" filename="projects/SelfTest/ExceptionTests.cpp" > <Original> thisThrows() </Original> @@ -1410,7 +1410,7 @@ thisThrows() </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/ExceptionTests.cpp" > + <Expression success="true" type="REQUIRE_NOTHROW" filename="projects/SelfTest/ExceptionTests.cpp" > <Original> thisDoesntThrow() </Original> @@ -1418,7 +1418,7 @@ thisDoesntThrow() </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/ExceptionTests.cpp" > + <Expression success="true" type="REQUIRE_THROWS" filename="projects/SelfTest/ExceptionTests.cpp" > <Original> thisThrows() </Original> @@ -1429,7 +1429,7 @@ <OverallResult success="true"/> </TestCase> <TestCase name="Expected exceptions that don't throw or unexpected exceptions fail the test"> - <Expression success="false" filename="projects/SelfTest/ExceptionTests.cpp" > + <Expression success="false" type="CHECK_THROWS_AS" filename="projects/SelfTest/ExceptionTests.cpp" > <Original> thisThrows() </Original> @@ -1440,7 +1440,7 @@ expected exception </Exception> </Expression> - <Expression success="false" filename="projects/SelfTest/ExceptionTests.cpp" > + <Expression success="false" type="CHECK_THROWS_AS" filename="projects/SelfTest/ExceptionTests.cpp" > <Original> thisDoesntThrow() </Original> @@ -1448,7 +1448,7 @@ thisDoesntThrow() </Expanded> </Expression> - <Expression success="false" filename="projects/SelfTest/ExceptionTests.cpp" > + <Expression success="false" type="CHECK_NOTHROW" filename="projects/SelfTest/ExceptionTests.cpp" > <Original> thisThrows() </Original> @@ -1468,7 +1468,7 @@ <OverallResult success="false"/> </TestCase> <TestCase name="An unchecked exception reports the line of the last assertion"> - <Expression success="true" filename="projects/SelfTest/ExceptionTests.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/ExceptionTests.cpp" > <Original> 1 == 1 </Original> @@ -1499,7 +1499,7 @@ <OverallResult success="false"/> </TestCase> <TestCase name="When unchecked exceptions are thrown from functions they are always failures"> - <Expression success="false" filename="projects/SelfTest/ExceptionTests.cpp" > + <Expression success="false" type="CHECK" filename="projects/SelfTest/ExceptionTests.cpp" > <Original> thisThrows() == 0 </Original> @@ -1513,7 +1513,7 @@ <OverallResult success="false"/> </TestCase> <TestCase name="When unchecked exceptions are thrown during a REQUIRE the test should abort fail"> - <Expression success="false" filename="projects/SelfTest/ExceptionTests.cpp" > + <Expression success="false" type="REQUIRE" filename="projects/SelfTest/ExceptionTests.cpp" > <Original> thisThrows() == 0 </Original> @@ -1527,7 +1527,7 @@ <OverallResult success="false"/> </TestCase> <TestCase name="When unchecked exceptions are thrown during a CHECK the test should abort and fail"> - <Expression success="false" filename="projects/SelfTest/ExceptionTests.cpp" > + <Expression success="false" type="CHECK" filename="projects/SelfTest/ExceptionTests.cpp" > <Original> thisThrows() == 0 </Original> @@ -1550,7 +1550,7 @@ <OverallResult success="false"/> </TestCase> <TestCase name="Custom exceptions can be translated when testing for nothrow"> - <Expression success="false" filename="projects/SelfTest/ExceptionTests.cpp" > + <Expression success="false" type="REQUIRE_NOTHROW" filename="projects/SelfTest/ExceptionTests.cpp" > <Original> throwCustom() </Original> @@ -1564,7 +1564,7 @@ <OverallResult success="false"/> </TestCase> <TestCase name="Custom exceptions can be translated when testing for throwing as something else"> - <Expression success="false" filename="projects/SelfTest/ExceptionTests.cpp" > + <Expression success="false" type="REQUIRE_THROWS_AS" filename="projects/SelfTest/ExceptionTests.cpp" > <Original> throwCustom() </Original> @@ -1584,7 +1584,7 @@ <OverallResult success="false"/> </TestCase> <TestCase name="NotImplemented exception"> - <Expression success="true" filename="projects/SelfTest/ExceptionTests.cpp" > + <Expression success="true" type="REQUIRE_THROWS" filename="projects/SelfTest/ExceptionTests.cpp" > <Original> thisFunctionNotImplemented( 7 ) </Original> @@ -1595,7 +1595,7 @@ <OverallResult success="true"/> </TestCase> <TestCase name="Generators over two ranges"> - <Expression success="true" filename="projects/SelfTest/GeneratorTests.cpp" > + <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" > <Original> multiply( i, 2 ) == i*2 </Original> @@ -1603,7 +1603,7 @@ 2 == 2 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/GeneratorTests.cpp" > + <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" > <Original> multiply( j, 2 ) == j*2 </Original> @@ -1611,7 +1611,7 @@ 200 == 200 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/GeneratorTests.cpp" > + <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" > <Original> multiply( i, 2 ) == i*2 </Original> @@ -1619,7 +1619,7 @@ 4 == 4 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/GeneratorTests.cpp" > + <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" > <Original> multiply( j, 2 ) == j*2 </Original> @@ -1627,7 +1627,7 @@ 200 == 200 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/GeneratorTests.cpp" > + <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" > <Original> multiply( i, 2 ) == i*2 </Original> @@ -1635,7 +1635,7 @@ 6 == 6 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/GeneratorTests.cpp" > + <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" > <Original> multiply( j, 2 ) == j*2 </Original> @@ -1643,7 +1643,7 @@ 200 == 200 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/GeneratorTests.cpp" > + <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" > <Original> multiply( i, 2 ) == i*2 </Original> @@ -1651,7 +1651,7 @@ 8 == 8 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/GeneratorTests.cpp" > + <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" > <Original> multiply( j, 2 ) == j*2 </Original> @@ -1659,7 +1659,7 @@ 200 == 200 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/GeneratorTests.cpp" > + <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" > <Original> multiply( i, 2 ) == i*2 </Original> @@ -1667,7 +1667,7 @@ 10 == 10 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/GeneratorTests.cpp" > + <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" > <Original> multiply( j, 2 ) == j*2 </Original> @@ -1675,7 +1675,7 @@ 200 == 200 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/GeneratorTests.cpp" > + <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" > <Original> multiply( i, 2 ) == i*2 </Original> @@ -1683,7 +1683,7 @@ 30 == 30 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/GeneratorTests.cpp" > + <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" > <Original> multiply( j, 2 ) == j*2 </Original> @@ -1691,7 +1691,7 @@ 200 == 200 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/GeneratorTests.cpp" > + <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" > <Original> multiply( i, 2 ) == i*2 </Original> @@ -1699,7 +1699,7 @@ 40 == 40 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/GeneratorTests.cpp" > + <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" > <Original> multiply( j, 2 ) == j*2 </Original> @@ -1707,7 +1707,7 @@ 200 == 200 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/GeneratorTests.cpp" > + <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" > <Original> multiply( i, 2 ) == i*2 </Original> @@ -1715,7 +1715,7 @@ 42 == 42 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/GeneratorTests.cpp" > + <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" > <Original> multiply( j, 2 ) == j*2 </Original> @@ -1723,7 +1723,7 @@ 200 == 200 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/GeneratorTests.cpp" > + <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" > <Original> multiply( i, 2 ) == i*2 </Original> @@ -1731,7 +1731,7 @@ 72 == 72 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/GeneratorTests.cpp" > + <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" > <Original> multiply( j, 2 ) == j*2 </Original> @@ -1739,7 +1739,7 @@ 200 == 200 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/GeneratorTests.cpp" > + <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" > <Original> multiply( i, 2 ) == i*2 </Original> @@ -1747,7 +1747,7 @@ 2 == 2 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/GeneratorTests.cpp" > + <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" > <Original> multiply( j, 2 ) == j*2 </Original> @@ -1755,7 +1755,7 @@ 202 == 202 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/GeneratorTests.cpp" > + <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" > <Original> multiply( i, 2 ) == i*2 </Original> @@ -1763,7 +1763,7 @@ 4 == 4 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/GeneratorTests.cpp" > + <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" > <Original> multiply( j, 2 ) == j*2 </Original> @@ -1771,7 +1771,7 @@ 202 == 202 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/GeneratorTests.cpp" > + <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" > <Original> multiply( i, 2 ) == i*2 </Original> @@ -1779,7 +1779,7 @@ 6 == 6 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/GeneratorTests.cpp" > + <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" > <Original> multiply( j, 2 ) == j*2 </Original> @@ -1787,7 +1787,7 @@ 202 == 202 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/GeneratorTests.cpp" > + <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" > <Original> multiply( i, 2 ) == i*2 </Original> @@ -1795,7 +1795,7 @@ 8 == 8 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/GeneratorTests.cpp" > + <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" > <Original> multiply( j, 2 ) == j*2 </Original> @@ -1803,7 +1803,7 @@ 202 == 202 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/GeneratorTests.cpp" > + <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" > <Original> multiply( i, 2 ) == i*2 </Original> @@ -1811,7 +1811,7 @@ 10 == 10 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/GeneratorTests.cpp" > + <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" > <Original> multiply( j, 2 ) == j*2 </Original> @@ -1819,7 +1819,7 @@ 202 == 202 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/GeneratorTests.cpp" > + <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" > <Original> multiply( i, 2 ) == i*2 </Original> @@ -1827,7 +1827,7 @@ 30 == 30 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/GeneratorTests.cpp" > + <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" > <Original> multiply( j, 2 ) == j*2 </Original> @@ -1835,7 +1835,7 @@ 202 == 202 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/GeneratorTests.cpp" > + <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" > <Original> multiply( i, 2 ) == i*2 </Original> @@ -1843,7 +1843,7 @@ 40 == 40 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/GeneratorTests.cpp" > + <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" > <Original> multiply( j, 2 ) == j*2 </Original> @@ -1851,7 +1851,7 @@ 202 == 202 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/GeneratorTests.cpp" > + <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" > <Original> multiply( i, 2 ) == i*2 </Original> @@ -1859,7 +1859,7 @@ 42 == 42 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/GeneratorTests.cpp" > + <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" > <Original> multiply( j, 2 ) == j*2 </Original> @@ -1867,7 +1867,7 @@ 202 == 202 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/GeneratorTests.cpp" > + <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" > <Original> multiply( i, 2 ) == i*2 </Original> @@ -1875,7 +1875,7 @@ 72 == 72 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/GeneratorTests.cpp" > + <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" > <Original> multiply( j, 2 ) == j*2 </Original> @@ -1883,7 +1883,7 @@ 202 == 202 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/GeneratorTests.cpp" > + <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" > <Original> multiply( i, 2 ) == i*2 </Original> @@ -1891,7 +1891,7 @@ 2 == 2 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/GeneratorTests.cpp" > + <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" > <Original> multiply( j, 2 ) == j*2 </Original> @@ -1899,7 +1899,7 @@ 204 == 204 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/GeneratorTests.cpp" > + <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" > <Original> multiply( i, 2 ) == i*2 </Original> @@ -1907,7 +1907,7 @@ 4 == 4 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/GeneratorTests.cpp" > + <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" > <Original> multiply( j, 2 ) == j*2 </Original> @@ -1915,7 +1915,7 @@ 204 == 204 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/GeneratorTests.cpp" > + <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" > <Original> multiply( i, 2 ) == i*2 </Original> @@ -1923,7 +1923,7 @@ 6 == 6 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/GeneratorTests.cpp" > + <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" > <Original> multiply( j, 2 ) == j*2 </Original> @@ -1931,7 +1931,7 @@ 204 == 204 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/GeneratorTests.cpp" > + <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" > <Original> multiply( i, 2 ) == i*2 </Original> @@ -1939,7 +1939,7 @@ 8 == 8 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/GeneratorTests.cpp" > + <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" > <Original> multiply( j, 2 ) == j*2 </Original> @@ -1947,7 +1947,7 @@ 204 == 204 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/GeneratorTests.cpp" > + <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" > <Original> multiply( i, 2 ) == i*2 </Original> @@ -1955,7 +1955,7 @@ 10 == 10 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/GeneratorTests.cpp" > + <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" > <Original> multiply( j, 2 ) == j*2 </Original> @@ -1963,7 +1963,7 @@ 204 == 204 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/GeneratorTests.cpp" > + <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" > <Original> multiply( i, 2 ) == i*2 </Original> @@ -1971,7 +1971,7 @@ 30 == 30 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/GeneratorTests.cpp" > + <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" > <Original> multiply( j, 2 ) == j*2 </Original> @@ -1979,7 +1979,7 @@ 204 == 204 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/GeneratorTests.cpp" > + <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" > <Original> multiply( i, 2 ) == i*2 </Original> @@ -1987,7 +1987,7 @@ 40 == 40 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/GeneratorTests.cpp" > + <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" > <Original> multiply( j, 2 ) == j*2 </Original> @@ -1995,7 +1995,7 @@ 204 == 204 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/GeneratorTests.cpp" > + <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" > <Original> multiply( i, 2 ) == i*2 </Original> @@ -2003,7 +2003,7 @@ 42 == 42 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/GeneratorTests.cpp" > + <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" > <Original> multiply( j, 2 ) == j*2 </Original> @@ -2011,7 +2011,7 @@ 204 == 204 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/GeneratorTests.cpp" > + <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" > <Original> multiply( i, 2 ) == i*2 </Original> @@ -2019,7 +2019,7 @@ 72 == 72 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/GeneratorTests.cpp" > + <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" > <Original> multiply( j, 2 ) == j*2 </Original> @@ -2027,7 +2027,7 @@ 204 == 204 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/GeneratorTests.cpp" > + <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" > <Original> multiply( i, 2 ) == i*2 </Original> @@ -2035,7 +2035,7 @@ 2 == 2 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/GeneratorTests.cpp" > + <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" > <Original> multiply( j, 2 ) == j*2 </Original> @@ -2043,7 +2043,7 @@ 206 == 206 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/GeneratorTests.cpp" > + <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" > <Original> multiply( i, 2 ) == i*2 </Original> @@ -2051,7 +2051,7 @@ 4 == 4 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/GeneratorTests.cpp" > + <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" > <Original> multiply( j, 2 ) == j*2 </Original> @@ -2059,7 +2059,7 @@ 206 == 206 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/GeneratorTests.cpp" > + <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" > <Original> multiply( i, 2 ) == i*2 </Original> @@ -2067,7 +2067,7 @@ 6 == 6 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/GeneratorTests.cpp" > + <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" > <Original> multiply( j, 2 ) == j*2 </Original> @@ -2075,7 +2075,7 @@ 206 == 206 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/GeneratorTests.cpp" > + <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" > <Original> multiply( i, 2 ) == i*2 </Original> @@ -2083,7 +2083,7 @@ 8 == 8 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/GeneratorTests.cpp" > + <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" > <Original> multiply( j, 2 ) == j*2 </Original> @@ -2091,7 +2091,7 @@ 206 == 206 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/GeneratorTests.cpp" > + <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" > <Original> multiply( i, 2 ) == i*2 </Original> @@ -2099,7 +2099,7 @@ 10 == 10 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/GeneratorTests.cpp" > + <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" > <Original> multiply( j, 2 ) == j*2 </Original> @@ -2107,7 +2107,7 @@ 206 == 206 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/GeneratorTests.cpp" > + <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" > <Original> multiply( i, 2 ) == i*2 </Original> @@ -2115,7 +2115,7 @@ 30 == 30 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/GeneratorTests.cpp" > + <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" > <Original> multiply( j, 2 ) == j*2 </Original> @@ -2123,7 +2123,7 @@ 206 == 206 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/GeneratorTests.cpp" > + <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" > <Original> multiply( i, 2 ) == i*2 </Original> @@ -2131,7 +2131,7 @@ 40 == 40 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/GeneratorTests.cpp" > + <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" > <Original> multiply( j, 2 ) == j*2 </Original> @@ -2139,7 +2139,7 @@ 206 == 206 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/GeneratorTests.cpp" > + <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" > <Original> multiply( i, 2 ) == i*2 </Original> @@ -2147,7 +2147,7 @@ 42 == 42 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/GeneratorTests.cpp" > + <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" > <Original> multiply( j, 2 ) == j*2 </Original> @@ -2155,7 +2155,7 @@ 206 == 206 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/GeneratorTests.cpp" > + <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" > <Original> multiply( i, 2 ) == i*2 </Original> @@ -2163,7 +2163,7 @@ 72 == 72 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/GeneratorTests.cpp" > + <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" > <Original> multiply( j, 2 ) == j*2 </Original> @@ -2171,7 +2171,7 @@ 206 == 206 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/GeneratorTests.cpp" > + <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" > <Original> multiply( i, 2 ) == i*2 </Original> @@ -2179,7 +2179,7 @@ 2 == 2 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/GeneratorTests.cpp" > + <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" > <Original> multiply( j, 2 ) == j*2 </Original> @@ -2187,7 +2187,7 @@ 208 == 208 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/GeneratorTests.cpp" > + <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" > <Original> multiply( i, 2 ) == i*2 </Original> @@ -2195,7 +2195,7 @@ 4 == 4 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/GeneratorTests.cpp" > + <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" > <Original> multiply( j, 2 ) == j*2 </Original> @@ -2203,7 +2203,7 @@ 208 == 208 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/GeneratorTests.cpp" > + <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" > <Original> multiply( i, 2 ) == i*2 </Original> @@ -2211,7 +2211,7 @@ 6 == 6 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/GeneratorTests.cpp" > + <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" > <Original> multiply( j, 2 ) == j*2 </Original> @@ -2219,7 +2219,7 @@ 208 == 208 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/GeneratorTests.cpp" > + <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" > <Original> multiply( i, 2 ) == i*2 </Original> @@ -2227,7 +2227,7 @@ 8 == 8 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/GeneratorTests.cpp" > + <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" > <Original> multiply( j, 2 ) == j*2 </Original> @@ -2235,7 +2235,7 @@ 208 == 208 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/GeneratorTests.cpp" > + <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" > <Original> multiply( i, 2 ) == i*2 </Original> @@ -2243,7 +2243,7 @@ 10 == 10 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/GeneratorTests.cpp" > + <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" > <Original> multiply( j, 2 ) == j*2 </Original> @@ -2251,7 +2251,7 @@ 208 == 208 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/GeneratorTests.cpp" > + <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" > <Original> multiply( i, 2 ) == i*2 </Original> @@ -2259,7 +2259,7 @@ 30 == 30 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/GeneratorTests.cpp" > + <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" > <Original> multiply( j, 2 ) == j*2 </Original> @@ -2267,7 +2267,7 @@ 208 == 208 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/GeneratorTests.cpp" > + <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" > <Original> multiply( i, 2 ) == i*2 </Original> @@ -2275,7 +2275,7 @@ 40 == 40 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/GeneratorTests.cpp" > + <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" > <Original> multiply( j, 2 ) == j*2 </Original> @@ -2283,7 +2283,7 @@ 208 == 208 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/GeneratorTests.cpp" > + <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" > <Original> multiply( i, 2 ) == i*2 </Original> @@ -2291,7 +2291,7 @@ 42 == 42 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/GeneratorTests.cpp" > + <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" > <Original> multiply( j, 2 ) == j*2 </Original> @@ -2299,7 +2299,7 @@ 208 == 208 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/GeneratorTests.cpp" > + <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" > <Original> multiply( i, 2 ) == i*2 </Original> @@ -2307,7 +2307,7 @@ 72 == 72 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/GeneratorTests.cpp" > + <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" > <Original> multiply( j, 2 ) == j*2 </Original> @@ -2315,7 +2315,7 @@ 208 == 208 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/GeneratorTests.cpp" > + <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" > <Original> multiply( i, 2 ) == i*2 </Original> @@ -2323,7 +2323,7 @@ 2 == 2 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/GeneratorTests.cpp" > + <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" > <Original> multiply( j, 2 ) == j*2 </Original> @@ -2331,7 +2331,7 @@ 210 == 210 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/GeneratorTests.cpp" > + <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" > <Original> multiply( i, 2 ) == i*2 </Original> @@ -2339,7 +2339,7 @@ 4 == 4 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/GeneratorTests.cpp" > + <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" > <Original> multiply( j, 2 ) == j*2 </Original> @@ -2347,7 +2347,7 @@ 210 == 210 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/GeneratorTests.cpp" > + <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" > <Original> multiply( i, 2 ) == i*2 </Original> @@ -2355,7 +2355,7 @@ 6 == 6 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/GeneratorTests.cpp" > + <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" > <Original> multiply( j, 2 ) == j*2 </Original> @@ -2363,7 +2363,7 @@ 210 == 210 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/GeneratorTests.cpp" > + <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" > <Original> multiply( i, 2 ) == i*2 </Original> @@ -2371,7 +2371,7 @@ 8 == 8 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/GeneratorTests.cpp" > + <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" > <Original> multiply( j, 2 ) == j*2 </Original> @@ -2379,7 +2379,7 @@ 210 == 210 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/GeneratorTests.cpp" > + <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" > <Original> multiply( i, 2 ) == i*2 </Original> @@ -2387,7 +2387,7 @@ 10 == 10 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/GeneratorTests.cpp" > + <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" > <Original> multiply( j, 2 ) == j*2 </Original> @@ -2395,7 +2395,7 @@ 210 == 210 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/GeneratorTests.cpp" > + <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" > <Original> multiply( i, 2 ) == i*2 </Original> @@ -2403,7 +2403,7 @@ 30 == 30 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/GeneratorTests.cpp" > + <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" > <Original> multiply( j, 2 ) == j*2 </Original> @@ -2411,7 +2411,7 @@ 210 == 210 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/GeneratorTests.cpp" > + <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" > <Original> multiply( i, 2 ) == i*2 </Original> @@ -2419,7 +2419,7 @@ 40 == 40 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/GeneratorTests.cpp" > + <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" > <Original> multiply( j, 2 ) == j*2 </Original> @@ -2427,7 +2427,7 @@ 210 == 210 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/GeneratorTests.cpp" > + <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" > <Original> multiply( i, 2 ) == i*2 </Original> @@ -2435,7 +2435,7 @@ 42 == 42 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/GeneratorTests.cpp" > + <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" > <Original> multiply( j, 2 ) == j*2 </Original> @@ -2443,7 +2443,7 @@ 210 == 210 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/GeneratorTests.cpp" > + <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" > <Original> multiply( i, 2 ) == i*2 </Original> @@ -2451,7 +2451,7 @@ 72 == 72 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/GeneratorTests.cpp" > + <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" > <Original> multiply( j, 2 ) == j*2 </Original> @@ -2459,7 +2459,7 @@ 210 == 210 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/GeneratorTests.cpp" > + <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" > <Original> multiply( i, 2 ) == i*2 </Original> @@ -2467,7 +2467,7 @@ 2 == 2 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/GeneratorTests.cpp" > + <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" > <Original> multiply( j, 2 ) == j*2 </Original> @@ -2475,7 +2475,7 @@ 212 == 212 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/GeneratorTests.cpp" > + <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" > <Original> multiply( i, 2 ) == i*2 </Original> @@ -2483,7 +2483,7 @@ 4 == 4 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/GeneratorTests.cpp" > + <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" > <Original> multiply( j, 2 ) == j*2 </Original> @@ -2491,7 +2491,7 @@ 212 == 212 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/GeneratorTests.cpp" > + <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" > <Original> multiply( i, 2 ) == i*2 </Original> @@ -2499,7 +2499,7 @@ 6 == 6 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/GeneratorTests.cpp" > + <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" > <Original> multiply( j, 2 ) == j*2 </Original> @@ -2507,7 +2507,7 @@ 212 == 212 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/GeneratorTests.cpp" > + <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" > <Original> multiply( i, 2 ) == i*2 </Original> @@ -2515,7 +2515,7 @@ 8 == 8 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/GeneratorTests.cpp" > + <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" > <Original> multiply( j, 2 ) == j*2 </Original> @@ -2523,7 +2523,7 @@ 212 == 212 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/GeneratorTests.cpp" > + <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" > <Original> multiply( i, 2 ) == i*2 </Original> @@ -2531,7 +2531,7 @@ 10 == 10 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/GeneratorTests.cpp" > + <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" > <Original> multiply( j, 2 ) == j*2 </Original> @@ -2539,7 +2539,7 @@ 212 == 212 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/GeneratorTests.cpp" > + <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" > <Original> multiply( i, 2 ) == i*2 </Original> @@ -2547,7 +2547,7 @@ 30 == 30 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/GeneratorTests.cpp" > + <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" > <Original> multiply( j, 2 ) == j*2 </Original> @@ -2555,7 +2555,7 @@ 212 == 212 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/GeneratorTests.cpp" > + <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" > <Original> multiply( i, 2 ) == i*2 </Original> @@ -2563,7 +2563,7 @@ 40 == 40 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/GeneratorTests.cpp" > + <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" > <Original> multiply( j, 2 ) == j*2 </Original> @@ -2571,7 +2571,7 @@ 212 == 212 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/GeneratorTests.cpp" > + <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" > <Original> multiply( i, 2 ) == i*2 </Original> @@ -2579,7 +2579,7 @@ 42 == 42 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/GeneratorTests.cpp" > + <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" > <Original> multiply( j, 2 ) == j*2 </Original> @@ -2587,7 +2587,7 @@ 212 == 212 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/GeneratorTests.cpp" > + <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" > <Original> multiply( i, 2 ) == i*2 </Original> @@ -2595,7 +2595,7 @@ 72 == 72 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/GeneratorTests.cpp" > + <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" > <Original> multiply( j, 2 ) == j*2 </Original> @@ -2603,7 +2603,7 @@ 212 == 212 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/GeneratorTests.cpp" > + <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" > <Original> multiply( i, 2 ) == i*2 </Original> @@ -2611,7 +2611,7 @@ 2 == 2 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/GeneratorTests.cpp" > + <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" > <Original> multiply( j, 2 ) == j*2 </Original> @@ -2619,7 +2619,7 @@ 214 == 214 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/GeneratorTests.cpp" > + <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" > <Original> multiply( i, 2 ) == i*2 </Original> @@ -2627,7 +2627,7 @@ 4 == 4 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/GeneratorTests.cpp" > + <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" > <Original> multiply( j, 2 ) == j*2 </Original> @@ -2635,7 +2635,7 @@ 214 == 214 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/GeneratorTests.cpp" > + <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" > <Original> multiply( i, 2 ) == i*2 </Original> @@ -2643,7 +2643,7 @@ 6 == 6 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/GeneratorTests.cpp" > + <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" > <Original> multiply( j, 2 ) == j*2 </Original> @@ -2651,7 +2651,7 @@ 214 == 214 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/GeneratorTests.cpp" > + <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" > <Original> multiply( i, 2 ) == i*2 </Original> @@ -2659,7 +2659,7 @@ 8 == 8 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/GeneratorTests.cpp" > + <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" > <Original> multiply( j, 2 ) == j*2 </Original> @@ -2667,7 +2667,7 @@ 214 == 214 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/GeneratorTests.cpp" > + <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" > <Original> multiply( i, 2 ) == i*2 </Original> @@ -2675,7 +2675,7 @@ 10 == 10 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/GeneratorTests.cpp" > + <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" > <Original> multiply( j, 2 ) == j*2 </Original> @@ -2683,7 +2683,7 @@ 214 == 214 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/GeneratorTests.cpp" > + <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" > <Original> multiply( i, 2 ) == i*2 </Original> @@ -2691,7 +2691,7 @@ 30 == 30 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/GeneratorTests.cpp" > + <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" > <Original> multiply( j, 2 ) == j*2 </Original> @@ -2699,7 +2699,7 @@ 214 == 214 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/GeneratorTests.cpp" > + <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" > <Original> multiply( i, 2 ) == i*2 </Original> @@ -2707,7 +2707,7 @@ 40 == 40 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/GeneratorTests.cpp" > + <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" > <Original> multiply( j, 2 ) == j*2 </Original> @@ -2715,7 +2715,7 @@ 214 == 214 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/GeneratorTests.cpp" > + <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" > <Original> multiply( i, 2 ) == i*2 </Original> @@ -2723,7 +2723,7 @@ 42 == 42 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/GeneratorTests.cpp" > + <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" > <Original> multiply( j, 2 ) == j*2 </Original> @@ -2731,7 +2731,7 @@ 214 == 214 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/GeneratorTests.cpp" > + <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" > <Original> multiply( i, 2 ) == i*2 </Original> @@ -2739,7 +2739,7 @@ 72 == 72 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/GeneratorTests.cpp" > + <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" > <Original> multiply( j, 2 ) == j*2 </Original> @@ -2750,7 +2750,7 @@ <OverallResult success="true"/> </TestCase> <TestCase name="Generator over a range of pairs"> - <Expression success="true" filename="projects/SelfTest/GeneratorTests.cpp" > + <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" > <Original> i->first == i->second-1 </Original> @@ -2758,7 +2758,7 @@ 0 == 0 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/GeneratorTests.cpp" > + <Expression success="true" type="CATCH_REQUIRE" filename="projects/SelfTest/GeneratorTests.cpp" > <Original> i->first == i->second-1 </Original> @@ -2787,7 +2787,7 @@ <Info> so should this </Info> - <Expression success="false" filename="projects/SelfTest/MessageTests.cpp" > + <Expression success="false" type="REQUIRE" filename="projects/SelfTest/MessageTests.cpp" > <Original> a == 1 </Original> @@ -2798,7 +2798,7 @@ <OverallResult success="false"/> </TestCase> <TestCase name="INFO gets logged on failure, even if captured before successful assertions"> - <Expression success="true" filename="projects/SelfTest/MessageTests.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/MessageTests.cpp" > <Original> a == 2 </Original> @@ -2809,7 +2809,7 @@ <Info> this message should be logged </Info> - <Expression success="false" filename="projects/SelfTest/MessageTests.cpp" > + <Expression success="false" type="CHECK" filename="projects/SelfTest/MessageTests.cpp" > <Original> a == 1 </Original> @@ -2820,7 +2820,7 @@ <Info> and this, but later </Info> - <Expression success="false" filename="projects/SelfTest/MessageTests.cpp" > + <Expression success="false" type="CHECK" filename="projects/SelfTest/MessageTests.cpp" > <Original> a == 0 </Original> @@ -2828,7 +2828,7 @@ 2 == 0 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/MessageTests.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/MessageTests.cpp" > <Original> a == 2 </Original> @@ -2876,7 +2876,7 @@ <OverallResult success="false"/> </TestCase> <TestCase name="SCOPED_INFO is reset for each loop"> - <Expression success="true" filename="projects/SelfTest/MessageTests.cpp" > + <Expression success="true" type="REQUIRE" filename="projects/SelfTest/MessageTests.cpp" > <Original> i < 10 </Original> @@ -2884,7 +2884,7 @@ 0 < 10 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/MessageTests.cpp" > + <Expression success="true" type="REQUIRE" filename="projects/SelfTest/MessageTests.cpp" > <Original> i < 10 </Original> @@ -2892,7 +2892,7 @@ 1 < 10 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/MessageTests.cpp" > + <Expression success="true" type="REQUIRE" filename="projects/SelfTest/MessageTests.cpp" > <Original> i < 10 </Original> @@ -2900,7 +2900,7 @@ 2 < 10 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/MessageTests.cpp" > + <Expression success="true" type="REQUIRE" filename="projects/SelfTest/MessageTests.cpp" > <Original> i < 10 </Original> @@ -2908,7 +2908,7 @@ 3 < 10 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/MessageTests.cpp" > + <Expression success="true" type="REQUIRE" filename="projects/SelfTest/MessageTests.cpp" > <Original> i < 10 </Original> @@ -2916,7 +2916,7 @@ 4 < 10 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/MessageTests.cpp" > + <Expression success="true" type="REQUIRE" filename="projects/SelfTest/MessageTests.cpp" > <Original> i < 10 </Original> @@ -2924,7 +2924,7 @@ 5 < 10 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/MessageTests.cpp" > + <Expression success="true" type="REQUIRE" filename="projects/SelfTest/MessageTests.cpp" > <Original> i < 10 </Original> @@ -2932,7 +2932,7 @@ 6 < 10 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/MessageTests.cpp" > + <Expression success="true" type="REQUIRE" filename="projects/SelfTest/MessageTests.cpp" > <Original> i < 10 </Original> @@ -2940,7 +2940,7 @@ 7 < 10 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/MessageTests.cpp" > + <Expression success="true" type="REQUIRE" filename="projects/SelfTest/MessageTests.cpp" > <Original> i < 10 </Original> @@ -2948,7 +2948,7 @@ 8 < 10 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/MessageTests.cpp" > + <Expression success="true" type="REQUIRE" filename="projects/SelfTest/MessageTests.cpp" > <Original> i < 10 </Original> @@ -2962,7 +2962,7 @@ <Info> i := 10 </Info> - <Expression success="false" filename="projects/SelfTest/MessageTests.cpp" > + <Expression success="false" type="REQUIRE" filename="projects/SelfTest/MessageTests.cpp" > <Original> i < 10 </Original> @@ -2973,7 +2973,7 @@ <OverallResult success="false"/> </TestCase> <TestCase name="The NO_FAIL macro reports a failure but does not fail the test"> - <Expression success="false" filename="projects/SelfTest/MessageTests.cpp" > + <Expression success="false" type="CHECK_NOFAIL" filename="projects/SelfTest/MessageTests.cpp" > <Original> 1 == 2 </Original> @@ -2999,7 +2999,7 @@ <Info> i := 7 </Info> - <Expression success="false" filename="projects/SelfTest/MessageTests.cpp" > + <Expression success="false" type="REQUIRE" filename="projects/SelfTest/MessageTests.cpp" > <Original> false </Original> @@ -3020,7 +3020,7 @@ </TestCase> <TestCase name="random SECTION tests"> <Section name="s1" description="doesn't equal"> - <Expression success="true" filename="projects/SelfTest/MiscTests.cpp" > + <Expression success="true" type="REQUIRE" filename="projects/SelfTest/MiscTests.cpp" > <Original> a != b </Original> @@ -3028,7 +3028,7 @@ 1 != 2 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/MiscTests.cpp" > + <Expression success="true" type="REQUIRE" filename="projects/SelfTest/MiscTests.cpp" > <Original> b != a </Original> @@ -3039,7 +3039,7 @@ <OverallResults successes="2" failures="0" expectedFailures="0"/> </Section> <Section name="s2" description="not equal"> - <Expression success="true" filename="projects/SelfTest/MiscTests.cpp" > + <Expression success="true" type="REQUIRE" filename="projects/SelfTest/MiscTests.cpp" > <Original> a != b </Original> @@ -3053,7 +3053,7 @@ </TestCase> <TestCase name="nested SECTION tests"> <Section name="s1" description="doesn't equal"> - <Expression success="true" filename="projects/SelfTest/MiscTests.cpp" > + <Expression success="true" type="REQUIRE" filename="projects/SelfTest/MiscTests.cpp" > <Original> a != b </Original> @@ -3061,7 +3061,7 @@ 1 != 2 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/MiscTests.cpp" > + <Expression success="true" type="REQUIRE" filename="projects/SelfTest/MiscTests.cpp" > <Original> b != a </Original> @@ -3070,7 +3070,7 @@ </Expanded> </Expression> <Section name="s2" description="not equal"> - <Expression success="true" filename="projects/SelfTest/MiscTests.cpp" > + <Expression success="true" type="REQUIRE" filename="projects/SelfTest/MiscTests.cpp" > <Original> a != b </Original> @@ -3087,7 +3087,7 @@ <TestCase name="more nested SECTION tests"> <Section name="s1" description="doesn't equal"> <Section name="s2" description="equal"> - <Expression success="false" filename="projects/SelfTest/MiscTests.cpp" > + <Expression success="false" type="REQUIRE" filename="projects/SelfTest/MiscTests.cpp" > <Original> a == b </Original> @@ -3121,7 +3121,7 @@ </TestCase> <TestCase name="looped SECTION tests"> <Section name="s1" description="b is currently: 0"> - <Expression success="false" filename="projects/SelfTest/MiscTests.cpp" > + <Expression success="false" type="CHECK" filename="projects/SelfTest/MiscTests.cpp" > <Original> b > a </Original> @@ -3137,7 +3137,7 @@ <Info> Testing if fib[0] (1) is even </Info> - <Expression success="false" filename="projects/SelfTest/MiscTests.cpp" > + <Expression success="false" type="CHECK" filename="projects/SelfTest/MiscTests.cpp" > <Original> ( fib[i] % 2 ) == 0 </Original> @@ -3148,7 +3148,7 @@ <Info> Testing if fib[1] (1) is even </Info> - <Expression success="false" filename="projects/SelfTest/MiscTests.cpp" > + <Expression success="false" type="CHECK" filename="projects/SelfTest/MiscTests.cpp" > <Original> ( fib[i] % 2 ) == 0 </Original> @@ -3156,7 +3156,7 @@ 1 == 0 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/MiscTests.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/MiscTests.cpp" > <Original> ( fib[i] % 2 ) == 0 </Original> @@ -3167,7 +3167,7 @@ <Info> Testing if fib[3] (3) is even </Info> - <Expression success="false" filename="projects/SelfTest/MiscTests.cpp" > + <Expression success="false" type="CHECK" filename="projects/SelfTest/MiscTests.cpp" > <Original> ( fib[i] % 2 ) == 0 </Original> @@ -3178,7 +3178,7 @@ <Info> Testing if fib[4] (5) is even </Info> - <Expression success="false" filename="projects/SelfTest/MiscTests.cpp" > + <Expression success="false" type="CHECK" filename="projects/SelfTest/MiscTests.cpp" > <Original> ( fib[i] % 2 ) == 0 </Original> @@ -3186,7 +3186,7 @@ 1 == 0 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/MiscTests.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/MiscTests.cpp" > <Original> ( fib[i] % 2 ) == 0 </Original> @@ -3197,7 +3197,7 @@ <Info> Testing if fib[6] (13) is even </Info> - <Expression success="false" filename="projects/SelfTest/MiscTests.cpp" > + <Expression success="false" type="CHECK" filename="projects/SelfTest/MiscTests.cpp" > <Original> ( fib[i] % 2 ) == 0 </Original> @@ -3208,7 +3208,7 @@ <Info> Testing if fib[7] (21) is even </Info> - <Expression success="false" filename="projects/SelfTest/MiscTests.cpp" > + <Expression success="false" type="CHECK" filename="projects/SelfTest/MiscTests.cpp" > <Original> ( fib[i] % 2 ) == 0 </Original> @@ -3222,7 +3222,7 @@ <OverallResult success="false"/> </TestCase> <TestCase name="null strings"> - <Expression success="true" filename="projects/SelfTest/MiscTests.cpp" > + <Expression success="true" type="REQUIRE" filename="projects/SelfTest/MiscTests.cpp" > <Original> makeString( false ) != static_cast<char*>(__null) </Original> @@ -3230,7 +3230,7 @@ "valid string" != {null string} </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/MiscTests.cpp" > + <Expression success="true" type="REQUIRE" filename="projects/SelfTest/MiscTests.cpp" > <Original> makeString( true ) == static_cast<char*>(__null) </Original> @@ -3241,7 +3241,7 @@ <OverallResult success="true"/> </TestCase> <TestCase name="checkedIf"> - <Expression success="true" filename="projects/SelfTest/MiscTests.cpp" > + <Expression success="true" type="CHECKED_IF" filename="projects/SelfTest/MiscTests.cpp" > <Original> flag </Original> @@ -3249,7 +3249,7 @@ true </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/MiscTests.cpp" > + <Expression success="true" type="REQUIRE" filename="projects/SelfTest/MiscTests.cpp" > <Original> testCheckedIf( true ) </Original> @@ -3260,7 +3260,7 @@ <OverallResult success="true"/> </TestCase> <TestCase name="checkedIf, failing"> - <Expression success="false" filename="projects/SelfTest/MiscTests.cpp" > + <Expression success="false" type="CHECKED_IF" filename="projects/SelfTest/MiscTests.cpp" > <Original> flag </Original> @@ -3268,7 +3268,7 @@ false </Expanded> </Expression> - <Expression success="false" filename="projects/SelfTest/MiscTests.cpp" > + <Expression success="false" type="REQUIRE" filename="projects/SelfTest/MiscTests.cpp" > <Original> testCheckedIf( false ) </Original> @@ -3279,7 +3279,7 @@ <OverallResult success="false"/> </TestCase> <TestCase name="checkedElse"> - <Expression success="true" filename="projects/SelfTest/MiscTests.cpp" > + <Expression success="true" type="CHECKED_ELSE" filename="projects/SelfTest/MiscTests.cpp" > <Original> flag </Original> @@ -3287,7 +3287,7 @@ true </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/MiscTests.cpp" > + <Expression success="true" type="REQUIRE" filename="projects/SelfTest/MiscTests.cpp" > <Original> testCheckedElse( true ) </Original> @@ -3298,7 +3298,7 @@ <OverallResult success="true"/> </TestCase> <TestCase name="checkedElse, failing"> - <Expression success="false" filename="projects/SelfTest/MiscTests.cpp" > + <Expression success="false" type="CHECKED_ELSE" filename="projects/SelfTest/MiscTests.cpp" > <Original> flag </Original> @@ -3306,7 +3306,7 @@ false </Expanded> </Expression> - <Expression success="false" filename="projects/SelfTest/MiscTests.cpp" > + <Expression success="false" type="REQUIRE" filename="projects/SelfTest/MiscTests.cpp" > <Original> testCheckedElse( false ) </Original> @@ -3329,7 +3329,7 @@ <Info> 3 </Info> - <Expression success="false" filename="projects/SelfTest/MiscTests.cpp" > + <Expression success="false" type="REQUIRE" filename="projects/SelfTest/MiscTests.cpp" > <Original> false </Original> @@ -3340,7 +3340,7 @@ <OverallResult success="false"/> </TestCase> <TestCase name="atomic if"> - <Expression success="true" filename="projects/SelfTest/MiscTests.cpp" > + <Expression success="true" type="REQUIRE" filename="projects/SelfTest/MiscTests.cpp" > <Original> x == 0 </Original> @@ -3351,7 +3351,7 @@ <OverallResult success="true"/> </TestCase> <TestCase name="String matchers"> - <Expression success="true" filename="projects/SelfTest/MiscTests.cpp" > + <Expression success="true" type="REQUIRE_THAT" filename="projects/SelfTest/MiscTests.cpp" > <Original> testStringForMatching() Contains( "string" ) </Original> @@ -3359,7 +3359,7 @@ "this string contains 'abc' as a substring" contains: "string" </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/MiscTests.cpp" > + <Expression success="true" type="CHECK_THAT" filename="projects/SelfTest/MiscTests.cpp" > <Original> testStringForMatching() Contains( "abc" ) </Original> @@ -3367,7 +3367,7 @@ "this string contains 'abc' as a substring" contains: "abc" </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/MiscTests.cpp" > + <Expression success="true" type="CHECK_THAT" filename="projects/SelfTest/MiscTests.cpp" > <Original> testStringForMatching() StartsWith( "this" ) </Original> @@ -3375,7 +3375,7 @@ "this string contains 'abc' as a substring" starts with: "this" </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/MiscTests.cpp" > + <Expression success="true" type="CHECK_THAT" filename="projects/SelfTest/MiscTests.cpp" > <Original> testStringForMatching() EndsWith( "substring" ) </Original> @@ -3386,7 +3386,7 @@ <OverallResult success="true"/> </TestCase> <TestCase name="Contains string matcher"> - <Expression success="false" filename="projects/SelfTest/MiscTests.cpp" > + <Expression success="false" type="CHECK_THAT" filename="projects/SelfTest/MiscTests.cpp" > <Original> testStringForMatching() Contains( "not there" ) </Original> @@ -3397,7 +3397,7 @@ <OverallResult success="false"/> </TestCase> <TestCase name="StartsWith string matcher"> - <Expression success="false" filename="projects/SelfTest/MiscTests.cpp" > + <Expression success="false" type="CHECK_THAT" filename="projects/SelfTest/MiscTests.cpp" > <Original> testStringForMatching() StartsWith( "string" ) </Original> @@ -3408,7 +3408,7 @@ <OverallResult success="false"/> </TestCase> <TestCase name="EndsWith string matcher"> - <Expression success="false" filename="projects/SelfTest/MiscTests.cpp" > + <Expression success="false" type="CHECK_THAT" filename="projects/SelfTest/MiscTests.cpp" > <Original> testStringForMatching() EndsWith( "this" ) </Original> @@ -3419,7 +3419,7 @@ <OverallResult success="false"/> </TestCase> <TestCase name="Equals string matcher"> - <Expression success="false" filename="projects/SelfTest/MiscTests.cpp" > + <Expression success="false" type="CHECK_THAT" filename="projects/SelfTest/MiscTests.cpp" > <Original> testStringForMatching() Equals( "something else" ) </Original> @@ -3430,7 +3430,7 @@ <OverallResult success="false"/> </TestCase> <TestCase name="Equals string matcher, with NULL"> - <Expression success="true" filename="projects/SelfTest/MiscTests.cpp" > + <Expression success="true" type="REQUIRE_THAT" filename="projects/SelfTest/MiscTests.cpp" > <Original> "" Equals(__null) </Original> @@ -3441,7 +3441,7 @@ <OverallResult success="true"/> </TestCase> <TestCase name="AllOf matcher"> - <Expression success="true" filename="projects/SelfTest/MiscTests.cpp" > + <Expression success="true" type="CHECK_THAT" filename="projects/SelfTest/MiscTests.cpp" > <Original> testStringForMatching() AllOf( Catch::Contains( "string" ), Catch::Contains( "abc" ) ) </Original> @@ -3452,7 +3452,7 @@ <OverallResult success="true"/> </TestCase> <TestCase name="AnyOf matcher"> - <Expression success="true" filename="projects/SelfTest/MiscTests.cpp" > + <Expression success="true" type="CHECK_THAT" filename="projects/SelfTest/MiscTests.cpp" > <Original> testStringForMatching() AnyOf( Catch::Contains( "string" ), Catch::Contains( "not there" ) ) </Original> @@ -3460,7 +3460,7 @@ "this string contains 'abc' as a substring" ( contains: "string" or contains: "not there" ) </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/MiscTests.cpp" > + <Expression success="true" type="CHECK_THAT" filename="projects/SelfTest/MiscTests.cpp" > <Original> testStringForMatching() AnyOf( Catch::Contains( "not there" ), Catch::Contains( "string" ) ) </Original> @@ -3471,7 +3471,7 @@ <OverallResult success="true"/> </TestCase> <TestCase name="Equals"> - <Expression success="true" filename="projects/SelfTest/MiscTests.cpp" > + <Expression success="true" type="CHECK_THAT" filename="projects/SelfTest/MiscTests.cpp" > <Original> testStringForMatching() Equals( "this string contains 'abc' as a substring" ) </Original> @@ -3482,7 +3482,7 @@ <OverallResult success="true"/> </TestCase> <TestCase name="Factorials are computed"> - <Expression success="true" filename="projects/SelfTest/MiscTests.cpp" > + <Expression success="true" type="REQUIRE" filename="projects/SelfTest/MiscTests.cpp" > <Original> Factorial(0) == 1 </Original> @@ -3490,7 +3490,7 @@ 1 == 1 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/MiscTests.cpp" > + <Expression success="true" type="REQUIRE" filename="projects/SelfTest/MiscTests.cpp" > <Original> Factorial(1) == 1 </Original> @@ -3498,7 +3498,7 @@ 1 == 1 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/MiscTests.cpp" > + <Expression success="true" type="REQUIRE" filename="projects/SelfTest/MiscTests.cpp" > <Original> Factorial(2) == 2 </Original> @@ -3506,7 +3506,7 @@ 2 == 2 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/MiscTests.cpp" > + <Expression success="true" type="REQUIRE" filename="projects/SelfTest/MiscTests.cpp" > <Original> Factorial(3) == 6 </Original> @@ -3514,7 +3514,7 @@ 6 == 6 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/MiscTests.cpp" > + <Expression success="true" type="REQUIRE" filename="projects/SelfTest/MiscTests.cpp" > <Original> Factorial(10) == 3628800 </Original> @@ -3540,7 +3540,7 @@ <OverallResult success="false"/> </TestCase> <TestCase name="vectors can be sized and resized"> - <Expression success="true" filename="projects/SelfTest/MiscTests.cpp" > + <Expression success="true" type="REQUIRE" filename="projects/SelfTest/MiscTests.cpp" > <Original> v.size() == 5 </Original> @@ -3548,7 +3548,7 @@ 5 == 5 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/MiscTests.cpp" > + <Expression success="true" type="REQUIRE" filename="projects/SelfTest/MiscTests.cpp" > <Original> v.capacity() >= 5 </Original> @@ -3557,7 +3557,7 @@ </Expanded> </Expression> <Section name="resizing bigger changes size and capacity"> - <Expression success="true" filename="projects/SelfTest/MiscTests.cpp" > + <Expression success="true" type="REQUIRE" filename="projects/SelfTest/MiscTests.cpp" > <Original> v.size() == 10 </Original> @@ -3565,7 +3565,7 @@ 10 == 10 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/MiscTests.cpp" > + <Expression success="true" type="REQUIRE" filename="projects/SelfTest/MiscTests.cpp" > <Original> v.capacity() >= 10 </Original> @@ -3575,7 +3575,7 @@ </Expression> <OverallResults successes="2" failures="0" expectedFailures="0"/> </Section> - <Expression success="true" filename="projects/SelfTest/MiscTests.cpp" > + <Expression success="true" type="REQUIRE" filename="projects/SelfTest/MiscTests.cpp" > <Original> v.size() == 5 </Original> @@ -3583,7 +3583,7 @@ 5 == 5 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/MiscTests.cpp" > + <Expression success="true" type="REQUIRE" filename="projects/SelfTest/MiscTests.cpp" > <Original> v.capacity() >= 5 </Original> @@ -3592,7 +3592,7 @@ </Expanded> </Expression> <Section name="resizing smaller changes size but not capacity"> - <Expression success="true" filename="projects/SelfTest/MiscTests.cpp" > + <Expression success="true" type="REQUIRE" filename="projects/SelfTest/MiscTests.cpp" > <Original> v.size() == 0 </Original> @@ -3600,7 +3600,7 @@ 0 == 0 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/MiscTests.cpp" > + <Expression success="true" type="REQUIRE" filename="projects/SelfTest/MiscTests.cpp" > <Original> v.capacity() >= 5 </Original> @@ -3609,7 +3609,7 @@ </Expanded> </Expression> <Section name="We can use the 'swap trick' to reset the capacity"> - <Expression success="true" filename="projects/SelfTest/MiscTests.cpp" > + <Expression success="true" type="REQUIRE" filename="projects/SelfTest/MiscTests.cpp" > <Original> v.capacity() == 0 </Original> @@ -3621,7 +3621,7 @@ </Section> <OverallResults successes="3" failures="0" expectedFailures="0"/> </Section> - <Expression success="true" filename="projects/SelfTest/MiscTests.cpp" > + <Expression success="true" type="REQUIRE" filename="projects/SelfTest/MiscTests.cpp" > <Original> v.size() == 5 </Original> @@ -3629,7 +3629,7 @@ 5 == 5 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/MiscTests.cpp" > + <Expression success="true" type="REQUIRE" filename="projects/SelfTest/MiscTests.cpp" > <Original> v.capacity() >= 5 </Original> @@ -3638,7 +3638,7 @@ </Expanded> </Expression> <Section name="reserving bigger changes capacity but not size"> - <Expression success="true" filename="projects/SelfTest/MiscTests.cpp" > + <Expression success="true" type="REQUIRE" filename="projects/SelfTest/MiscTests.cpp" > <Original> v.size() == 5 </Original> @@ -3646,7 +3646,7 @@ 5 == 5 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/MiscTests.cpp" > + <Expression success="true" type="REQUIRE" filename="projects/SelfTest/MiscTests.cpp" > <Original> v.capacity() >= 10 </Original> @@ -3656,7 +3656,7 @@ </Expression> <OverallResults successes="2" failures="0" expectedFailures="0"/> </Section> - <Expression success="true" filename="projects/SelfTest/MiscTests.cpp" > + <Expression success="true" type="REQUIRE" filename="projects/SelfTest/MiscTests.cpp" > <Original> v.size() == 5 </Original> @@ -3664,7 +3664,7 @@ 5 == 5 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/MiscTests.cpp" > + <Expression success="true" type="REQUIRE" filename="projects/SelfTest/MiscTests.cpp" > <Original> v.capacity() >= 5 </Original> @@ -3673,7 +3673,7 @@ </Expanded> </Expression> <Section name="reserving smaller does not change size or capacity"> - <Expression success="true" filename="projects/SelfTest/MiscTests.cpp" > + <Expression success="true" type="REQUIRE" filename="projects/SelfTest/MiscTests.cpp" > <Original> v.size() == 5 </Original> @@ -3681,7 +3681,7 @@ 5 == 5 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/MiscTests.cpp" > + <Expression success="true" type="REQUIRE" filename="projects/SelfTest/MiscTests.cpp" > <Original> v.capacity() >= 5 </Original> @@ -3709,7 +3709,7 @@ <OverallResult success="true"/> </TestCase> <TestCase name="Tabs and newlines show in output"> - <Expression success="false" filename="projects/SelfTest/MiscTests.cpp" > + <Expression success="false" type="CHECK" filename="projects/SelfTest/MiscTests.cpp" > <Original> s1 == s2 </Original> @@ -3727,7 +3727,7 @@ <OverallResult success="false"/> </TestCase> <TestCase name="toString on const wchar_t const pointer returns the string contents"> - <Expression success="true" filename="projects/SelfTest/MiscTests.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/MiscTests.cpp" > <Original> result == "\"wide load\"" </Original> @@ -3738,7 +3738,7 @@ <OverallResult success="true"/> </TestCase> <TestCase name="toString on const wchar_t pointer returns the string contents"> - <Expression success="true" filename="projects/SelfTest/MiscTests.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/MiscTests.cpp" > <Original> result == "\"wide load\"" </Original> @@ -3749,7 +3749,7 @@ <OverallResult success="true"/> </TestCase> <TestCase name="toString on wchar_t const pointer returns the string contents"> - <Expression success="true" filename="projects/SelfTest/MiscTests.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/MiscTests.cpp" > <Original> result == "\"wide load\"" </Original> @@ -3760,7 +3760,7 @@ <OverallResult success="true"/> </TestCase> <TestCase name="toString on wchar_t returns the string contents"> - <Expression success="true" filename="projects/SelfTest/MiscTests.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/MiscTests.cpp" > <Original> result == "\"wide load\"" </Original> @@ -3772,7 +3772,7 @@ </TestCase> <TestCase name="Process can be configured on command line"> <Section name="default - no arguments"> - <Expression success="true" filename="projects/SelfTest/TestMain.cpp" > + <Expression success="true" type="CHECK_NOTHROW" filename="projects/SelfTest/TestMain.cpp" > <Original> parseIntoConfig( argv, config ) </Original> @@ -3780,7 +3780,7 @@ parseIntoConfig( argv, config ) </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/TestMain.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/TestMain.cpp" > <Original> config.shouldDebugBreak == false </Original> @@ -3788,7 +3788,7 @@ false == false </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/TestMain.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/TestMain.cpp" > <Original> config.abortAfter == -1 </Original> @@ -3796,7 +3796,7 @@ -1 == -1 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/TestMain.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/TestMain.cpp" > <Original> config.noThrow == false </Original> @@ -3804,7 +3804,7 @@ false == false </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/TestMain.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/TestMain.cpp" > <Original> config.reporterName.empty() </Original> @@ -3816,7 +3816,7 @@ </Section> <Section name="test lists"> <Section name="1 test" description="Specify one test case using"> - <Expression success="true" filename="projects/SelfTest/TestMain.cpp" > + <Expression success="true" type="CHECK_NOTHROW" filename="projects/SelfTest/TestMain.cpp" > <Original> parseIntoConfig( argv, config ) </Original> @@ -3824,7 +3824,7 @@ parseIntoConfig( argv, config ) </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/TestMain.cpp" > + <Expression success="true" type="REQUIRE" filename="projects/SelfTest/TestMain.cpp" > <Original> cfg.testSpec().matches( fakeTestCase( "notIncluded" ) ) == false </Original> @@ -3832,7 +3832,7 @@ false == false </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/TestMain.cpp" > + <Expression success="true" type="REQUIRE" filename="projects/SelfTest/TestMain.cpp" > <Original> cfg.testSpec().matches( fakeTestCase( "test1" ) ) </Original> @@ -3846,7 +3846,7 @@ </Section> <Section name="test lists"> <Section name="Specify one test case exclusion using exclude:"> - <Expression success="true" filename="projects/SelfTest/TestMain.cpp" > + <Expression success="true" type="CHECK_NOTHROW" filename="projects/SelfTest/TestMain.cpp" > <Original> parseIntoConfig( argv, config ) </Original> @@ -3854,7 +3854,7 @@ parseIntoConfig( argv, config ) </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/TestMain.cpp" > + <Expression success="true" type="REQUIRE" filename="projects/SelfTest/TestMain.cpp" > <Original> cfg.testSpec().matches( fakeTestCase( "test1" ) ) == false </Original> @@ -3862,7 +3862,7 @@ false == false </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/TestMain.cpp" > + <Expression success="true" type="REQUIRE" filename="projects/SelfTest/TestMain.cpp" > <Original> cfg.testSpec().matches( fakeTestCase( "alwaysIncluded" ) ) </Original> @@ -3876,7 +3876,7 @@ </Section> <Section name="test lists"> <Section name="Specify one test case exclusion using ~"> - <Expression success="true" filename="projects/SelfTest/TestMain.cpp" > + <Expression success="true" type="CHECK_NOTHROW" filename="projects/SelfTest/TestMain.cpp" > <Original> parseIntoConfig( argv, config ) </Original> @@ -3884,7 +3884,7 @@ parseIntoConfig( argv, config ) </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/TestMain.cpp" > + <Expression success="true" type="REQUIRE" filename="projects/SelfTest/TestMain.cpp" > <Original> cfg.testSpec().matches( fakeTestCase( "test1" ) ) == false </Original> @@ -3892,7 +3892,7 @@ false == false </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/TestMain.cpp" > + <Expression success="true" type="REQUIRE" filename="projects/SelfTest/TestMain.cpp" > <Original> cfg.testSpec().matches( fakeTestCase( "alwaysIncluded" ) ) </Original> @@ -3906,7 +3906,7 @@ </Section> <Section name="reporter"> <Section name="-r/console"> - <Expression success="true" filename="projects/SelfTest/TestMain.cpp" > + <Expression success="true" type="CHECK_NOTHROW" filename="projects/SelfTest/TestMain.cpp" > <Original> parseIntoConfig( argv, config ) </Original> @@ -3914,7 +3914,7 @@ parseIntoConfig( argv, config ) </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/TestMain.cpp" > + <Expression success="true" type="REQUIRE" filename="projects/SelfTest/TestMain.cpp" > <Original> config.reporterName == "console" </Original> @@ -3928,7 +3928,7 @@ </Section> <Section name="reporter"> <Section name="-r/xml"> - <Expression success="true" filename="projects/SelfTest/TestMain.cpp" > + <Expression success="true" type="CHECK_NOTHROW" filename="projects/SelfTest/TestMain.cpp" > <Original> parseIntoConfig( argv, config ) </Original> @@ -3936,7 +3936,7 @@ parseIntoConfig( argv, config ) </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/TestMain.cpp" > + <Expression success="true" type="REQUIRE" filename="projects/SelfTest/TestMain.cpp" > <Original> config.reporterName == "xml" </Original> @@ -3950,7 +3950,7 @@ </Section> <Section name="reporter"> <Section name="--reporter/junit"> - <Expression success="true" filename="projects/SelfTest/TestMain.cpp" > + <Expression success="true" type="CHECK_NOTHROW" filename="projects/SelfTest/TestMain.cpp" > <Original> parseIntoConfig( argv, config ) </Original> @@ -3958,7 +3958,7 @@ parseIntoConfig( argv, config ) </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/TestMain.cpp" > + <Expression success="true" type="REQUIRE" filename="projects/SelfTest/TestMain.cpp" > <Original> config.reporterName == "junit" </Original> @@ -3972,7 +3972,7 @@ </Section> <Section name="debugger"> <Section name="-b"> - <Expression success="true" filename="projects/SelfTest/TestMain.cpp" > + <Expression success="true" type="CHECK_NOTHROW" filename="projects/SelfTest/TestMain.cpp" > <Original> parseIntoConfig( argv, config ) </Original> @@ -3980,7 +3980,7 @@ parseIntoConfig( argv, config ) </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/TestMain.cpp" > + <Expression success="true" type="REQUIRE" filename="projects/SelfTest/TestMain.cpp" > <Original> config.shouldDebugBreak == true </Original> @@ -3994,7 +3994,7 @@ </Section> <Section name="debugger"> <Section name="--break"> - <Expression success="true" filename="projects/SelfTest/TestMain.cpp" > + <Expression success="true" type="CHECK_NOTHROW" filename="projects/SelfTest/TestMain.cpp" > <Original> parseIntoConfig( argv, config ) </Original> @@ -4002,7 +4002,7 @@ parseIntoConfig( argv, config ) </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/TestMain.cpp" > + <Expression success="true" type="REQUIRE" filename="projects/SelfTest/TestMain.cpp" > <Original> config.shouldDebugBreak </Original> @@ -4016,7 +4016,7 @@ </Section> <Section name="abort"> <Section name="-a aborts after first failure"> - <Expression success="true" filename="projects/SelfTest/TestMain.cpp" > + <Expression success="true" type="CHECK_NOTHROW" filename="projects/SelfTest/TestMain.cpp" > <Original> parseIntoConfig( argv, config ) </Original> @@ -4024,7 +4024,7 @@ parseIntoConfig( argv, config ) </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/TestMain.cpp" > + <Expression success="true" type="REQUIRE" filename="projects/SelfTest/TestMain.cpp" > <Original> config.abortAfter == 1 </Original> @@ -4038,7 +4038,7 @@ </Section> <Section name="abort"> <Section name="-x 2 aborts after two failures"> - <Expression success="true" filename="projects/SelfTest/TestMain.cpp" > + <Expression success="true" type="CHECK_NOTHROW" filename="projects/SelfTest/TestMain.cpp" > <Original> parseIntoConfig( argv, config ) </Original> @@ -4046,7 +4046,7 @@ parseIntoConfig( argv, config ) </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/TestMain.cpp" > + <Expression success="true" type="REQUIRE" filename="projects/SelfTest/TestMain.cpp" > <Original> config.abortAfter == 2 </Original> @@ -4060,7 +4060,7 @@ </Section> <Section name="abort"> <Section name="-x must be greater than zero"> - <Expression success="true" filename="projects/SelfTest/TestMain.cpp" > + <Expression success="true" type="REQUIRE_THAT" filename="projects/SelfTest/TestMain.cpp" > <Original> parseIntoConfigAndReturnError( argv, config ) Contains( "greater than zero" ) </Original> @@ -4075,7 +4075,7 @@ </Section> <Section name="abort"> <Section name="-x must be numeric"> - <Expression success="true" filename="projects/SelfTest/TestMain.cpp" > + <Expression success="true" type="REQUIRE_THAT" filename="projects/SelfTest/TestMain.cpp" > <Original> parseIntoConfigAndReturnError( argv, config ) Contains( "-x" ) </Original> @@ -4090,7 +4090,7 @@ </Section> <Section name="nothrow"> <Section name="-e"> - <Expression success="true" filename="projects/SelfTest/TestMain.cpp" > + <Expression success="true" type="CHECK_NOTHROW" filename="projects/SelfTest/TestMain.cpp" > <Original> parseIntoConfig( argv, config ) </Original> @@ -4098,7 +4098,7 @@ parseIntoConfig( argv, config ) </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/TestMain.cpp" > + <Expression success="true" type="REQUIRE" filename="projects/SelfTest/TestMain.cpp" > <Original> config.noThrow == true </Original> @@ -4112,7 +4112,7 @@ </Section> <Section name="nothrow"> <Section name="--nothrow"> - <Expression success="true" filename="projects/SelfTest/TestMain.cpp" > + <Expression success="true" type="CHECK_NOTHROW" filename="projects/SelfTest/TestMain.cpp" > <Original> parseIntoConfig( argv, config ) </Original> @@ -4120,7 +4120,7 @@ parseIntoConfig( argv, config ) </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/TestMain.cpp" > + <Expression success="true" type="REQUIRE" filename="projects/SelfTest/TestMain.cpp" > <Original> config.noThrow == true </Original> @@ -4134,7 +4134,7 @@ </Section> <Section name="output filename"> <Section name="-o filename"> - <Expression success="true" filename="projects/SelfTest/TestMain.cpp" > + <Expression success="true" type="CHECK_NOTHROW" filename="projects/SelfTest/TestMain.cpp" > <Original> parseIntoConfig( argv, config ) </Original> @@ -4142,7 +4142,7 @@ parseIntoConfig( argv, config ) </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/TestMain.cpp" > + <Expression success="true" type="REQUIRE" filename="projects/SelfTest/TestMain.cpp" > <Original> config.outputFilename == "filename.ext" </Original> @@ -4156,7 +4156,7 @@ </Section> <Section name="output filename"> <Section name="--out"> - <Expression success="true" filename="projects/SelfTest/TestMain.cpp" > + <Expression success="true" type="CHECK_NOTHROW" filename="projects/SelfTest/TestMain.cpp" > <Original> parseIntoConfig( argv, config ) </Original> @@ -4164,7 +4164,7 @@ parseIntoConfig( argv, config ) </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/TestMain.cpp" > + <Expression success="true" type="REQUIRE" filename="projects/SelfTest/TestMain.cpp" > <Original> config.outputFilename == "filename.ext" </Original> @@ -4178,7 +4178,7 @@ </Section> <Section name="combinations"> <Section name="Single character flags can be combined"> - <Expression success="true" filename="projects/SelfTest/TestMain.cpp" > + <Expression success="true" type="CHECK_NOTHROW" filename="projects/SelfTest/TestMain.cpp" > <Original> parseIntoConfig( argv, config ) </Original> @@ -4186,7 +4186,7 @@ parseIntoConfig( argv, config ) </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/TestMain.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/TestMain.cpp" > <Original> config.abortAfter == 1 </Original> @@ -4194,7 +4194,7 @@ 1 == 1 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/TestMain.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/TestMain.cpp" > <Original> config.shouldDebugBreak </Original> @@ -4202,7 +4202,7 @@ true </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/TestMain.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/TestMain.cpp" > <Original> config.noThrow == true </Original> @@ -4219,7 +4219,7 @@ <TestCase name="Long strings can be wrapped"> <Section name="plain string"> <Section name="No wrapping"> - <Expression success="true" filename="projects/SelfTest/TestMain.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/TestMain.cpp" > <Original> Text( testString, TextAttributes().setWidth( 80 ) ).toString() == testString </Original> @@ -4229,7 +4229,7 @@ "one two three four" </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/TestMain.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/TestMain.cpp" > <Original> Text( testString, TextAttributes().setWidth( 18 ) ).toString() == testString </Original> @@ -4245,7 +4245,7 @@ </Section> <Section name="plain string"> <Section name="Wrapped once"> - <Expression success="true" filename="projects/SelfTest/TestMain.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/TestMain.cpp" > <Original> Text( testString, TextAttributes().setWidth( 17 ) ).toString() == "one two three\nfour" </Original> @@ -4257,7 +4257,7 @@ four" four" </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/TestMain.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/TestMain.cpp" > <Original> Text( testString, TextAttributes().setWidth( 16 ) ).toString() == "one two three\nfour" </Original> @@ -4269,7 +4269,7 @@ four" four" </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/TestMain.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/TestMain.cpp" > <Original> Text( testString, TextAttributes().setWidth( 14 ) ).toString() == "one two three\nfour" </Original> @@ -4281,7 +4281,7 @@ four" four" </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/TestMain.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/TestMain.cpp" > <Original> Text( testString, TextAttributes().setWidth( 13 ) ).toString() == "one two three\nfour" </Original> @@ -4293,7 +4293,7 @@ four" four" </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/TestMain.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/TestMain.cpp" > <Original> Text( testString, TextAttributes().setWidth( 12 ) ).toString() == "one two\nthree four" </Original> @@ -4311,7 +4311,7 @@ three four" </Section> <Section name="plain string"> <Section name="Wrapped twice"> - <Expression success="true" filename="projects/SelfTest/TestMain.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/TestMain.cpp" > <Original> Text( testString, TextAttributes().setWidth( 9 ) ).toString() == "one two\nthree\nfour" </Original> @@ -4325,7 +4325,7 @@ three four" </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/TestMain.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/TestMain.cpp" > <Original> Text( testString, TextAttributes().setWidth( 8 ) ).toString() == "one two\nthree\nfour" </Original> @@ -4339,7 +4339,7 @@ three four" </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/TestMain.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/TestMain.cpp" > <Original> Text( testString, TextAttributes().setWidth( 7 ) ).toString() == "one two\nthree\nfour" </Original> @@ -4359,7 +4359,7 @@ four" </Section> <Section name="plain string"> <Section name="Wrapped three times"> - <Expression success="true" filename="projects/SelfTest/TestMain.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/TestMain.cpp" > <Original> Text( testString, TextAttributes().setWidth( 6 ) ).toString() == "one\ntwo\nthree\nfour" </Original> @@ -4375,7 +4375,7 @@ three four" </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/TestMain.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/TestMain.cpp" > <Original> Text( testString, TextAttributes().setWidth( 5 ) ).toString() == "one\ntwo\nthree\nfour" </Original> @@ -4397,7 +4397,7 @@ four" </Section> <Section name="plain string"> <Section name="Short wrap"> - <Expression success="true" filename="projects/SelfTest/TestMain.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/TestMain.cpp" > <Original> Text( "abcdef", TextAttributes().setWidth( 4 ) ).toString() == "abc-\ndef" </Original> @@ -4409,7 +4409,7 @@ def" def" </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/TestMain.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/TestMain.cpp" > <Original> Text( "abcdefg", TextAttributes().setWidth( 4 ) ).toString() == "abc-\ndefg" </Original> @@ -4421,7 +4421,7 @@ defg" defg" </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/TestMain.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/TestMain.cpp" > <Original> Text( "abcdefgh", TextAttributes().setWidth( 4 ) ).toString() == "abc-\ndef-\ngh" </Original> @@ -4435,7 +4435,7 @@ def- gh" </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/TestMain.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/TestMain.cpp" > <Original> Text( testString, TextAttributes().setWidth( 4 ) ).toString() == "one\ntwo\nthr-\nee\nfour" </Original> @@ -4453,7 +4453,7 @@ ee four" </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/TestMain.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/TestMain.cpp" > <Original> Text( testString, TextAttributes().setWidth( 3 ) ).toString() == "one\ntwo\nth-\nree\nfo-\nur" </Original> @@ -4479,7 +4479,7 @@ ur" </Section> <Section name="plain string"> <Section name="As container"> - <Expression success="true" filename="projects/SelfTest/TestMain.cpp" > + <Expression success="true" type="REQUIRE" filename="projects/SelfTest/TestMain.cpp" > <Original> text.size() == 4 </Original> @@ -4487,7 +4487,7 @@ ur" 4 == 4 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/TestMain.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/TestMain.cpp" > <Original> text[0] == "one" </Original> @@ -4495,7 +4495,7 @@ ur" "one" == "one" </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/TestMain.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/TestMain.cpp" > <Original> text[1] == "two" </Original> @@ -4503,7 +4503,7 @@ ur" "two" == "two" </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/TestMain.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/TestMain.cpp" > <Original> text[2] == "three" </Original> @@ -4511,7 +4511,7 @@ ur" "three" == "three" </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/TestMain.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/TestMain.cpp" > <Original> text[3] == "four" </Original> @@ -4525,7 +4525,7 @@ ur" </Section> <Section name="plain string"> <Section name="Indent first line differently"> - <Expression success="true" filename="projects/SelfTest/TestMain.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/TestMain.cpp" > <Original> text.toString() == " one two\n three\n four" </Original> @@ -4545,7 +4545,7 @@ ur" </Section> <Section name="With newlines"> <Section name="No wrapping"> - <Expression success="true" filename="projects/SelfTest/TestMain.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/TestMain.cpp" > <Original> Text( testString, TextAttributes().setWidth( 80 ) ).toString() == testString </Original> @@ -4557,7 +4557,7 @@ three four" three four" </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/TestMain.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/TestMain.cpp" > <Original> Text( testString, TextAttributes().setWidth( 18 ) ).toString() == testString </Original> @@ -4569,7 +4569,7 @@ three four" three four" </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/TestMain.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/TestMain.cpp" > <Original> Text( testString, TextAttributes().setWidth( 10 ) ).toString() == testString </Original> @@ -4587,7 +4587,7 @@ three four" </Section> <Section name="With newlines"> <Section name="Trailing newline"> - <Expression success="true" filename="projects/SelfTest/TestMain.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/TestMain.cpp" > <Original> Text( "abcdef\n", TextAttributes().setWidth( 10 ) ).toString() == "abcdef\n" </Original> @@ -4599,7 +4599,7 @@ three four" " </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/TestMain.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/TestMain.cpp" > <Original> Text( "abcdef", TextAttributes().setWidth( 6 ) ).toString() == "abcdef" </Original> @@ -4607,7 +4607,7 @@ three four" "abcdef" == "abcdef" </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/TestMain.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/TestMain.cpp" > <Original> Text( "abcdef\n", TextAttributes().setWidth( 6 ) ).toString() == "abcdef\n" </Original> @@ -4625,7 +4625,7 @@ three four" </Section> <Section name="With newlines"> <Section name="Wrapped once"> - <Expression success="true" filename="projects/SelfTest/TestMain.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/TestMain.cpp" > <Original> Text( testString, TextAttributes().setWidth( 9 ) ).toString() == "one two\nthree\nfour" </Original> @@ -4639,7 +4639,7 @@ three four" </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/TestMain.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/TestMain.cpp" > <Original> Text( testString, TextAttributes().setWidth( 8 ) ).toString() == "one two\nthree\nfour" </Original> @@ -4653,7 +4653,7 @@ three four" </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/TestMain.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/TestMain.cpp" > <Original> Text( testString, TextAttributes().setWidth( 7 ) ).toString() == "one two\nthree\nfour" </Original> @@ -4673,7 +4673,7 @@ four" </Section> <Section name="With newlines"> <Section name="Wrapped twice"> - <Expression success="true" filename="projects/SelfTest/TestMain.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/TestMain.cpp" > <Original> Text( testString, TextAttributes().setWidth( 6 ) ).toString() == "one\ntwo\nthree\nfour" </Original> @@ -4694,7 +4694,7 @@ four" <OverallResults successes="1" failures="0" expectedFailures="0"/> </Section> <Section name="With tabs"> - <Expression success="true" filename="projects/SelfTest/TestMain.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/TestMain.cpp" > <Original> Text( testString, TextAttributes().setWidth( 15 ) ).toString() == "one two three\n four\n five\n six" </Original> @@ -4716,7 +4716,7 @@ four" </TestCase> <TestCase name="replaceInPlace"> <Section name="replace single char"> - <Expression success="true" filename="projects/SelfTest/TestMain.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/TestMain.cpp" > <Original> replaceInPlace( letters, "b", "z" ) </Original> @@ -4724,7 +4724,7 @@ four" true </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/TestMain.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/TestMain.cpp" > <Original> letters == "azcdefcg" </Original> @@ -4735,7 +4735,7 @@ four" <OverallResults successes="2" failures="0" expectedFailures="0"/> </Section> <Section name="replace two chars"> - <Expression success="true" filename="projects/SelfTest/TestMain.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/TestMain.cpp" > <Original> replaceInPlace( letters, "c", "z" ) </Original> @@ -4743,7 +4743,7 @@ four" true </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/TestMain.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/TestMain.cpp" > <Original> letters == "abzdefzg" </Original> @@ -4754,7 +4754,7 @@ four" <OverallResults successes="2" failures="0" expectedFailures="0"/> </Section> <Section name="replace first char"> - <Expression success="true" filename="projects/SelfTest/TestMain.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/TestMain.cpp" > <Original> replaceInPlace( letters, "a", "z" ) </Original> @@ -4762,7 +4762,7 @@ four" true </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/TestMain.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/TestMain.cpp" > <Original> letters == "zbcdefcg" </Original> @@ -4773,7 +4773,7 @@ four" <OverallResults successes="2" failures="0" expectedFailures="0"/> </Section> <Section name="replace last char"> - <Expression success="true" filename="projects/SelfTest/TestMain.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/TestMain.cpp" > <Original> replaceInPlace( letters, "g", "z" ) </Original> @@ -4781,7 +4781,7 @@ four" true </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/TestMain.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/TestMain.cpp" > <Original> letters == "abcdefcz" </Original> @@ -4792,7 +4792,7 @@ four" <OverallResults successes="2" failures="0" expectedFailures="0"/> </Section> <Section name="replace all chars"> - <Expression success="true" filename="projects/SelfTest/TestMain.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/TestMain.cpp" > <Original> replaceInPlace( letters, letters, "replaced" ) </Original> @@ -4800,7 +4800,7 @@ four" true </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/TestMain.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/TestMain.cpp" > <Original> letters == "replaced" </Original> @@ -4811,7 +4811,7 @@ four" <OverallResults successes="2" failures="0" expectedFailures="0"/> </Section> <Section name="replace no chars"> - <Expression success="true" filename="projects/SelfTest/TestMain.cpp" > + <Expression success="true" type="CHECK_FALSE" filename="projects/SelfTest/TestMain.cpp" > <Original> !replaceInPlace( letters, "x", "z" ) </Original> @@ -4819,7 +4819,7 @@ four" !false </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/TestMain.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/TestMain.cpp" > <Original> letters == letters </Original> @@ -4830,7 +4830,7 @@ four" <OverallResults successes="2" failures="0" expectedFailures="0"/> </Section> <Section name="escape '"> - <Expression success="true" filename="projects/SelfTest/TestMain.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/TestMain.cpp" > <Original> replaceInPlace( s, "'", "|'" ) </Original> @@ -4838,7 +4838,7 @@ four" true </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/TestMain.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/TestMain.cpp" > <Original> s == "didn|'t" </Original> @@ -4854,7 +4854,7 @@ four" <OverallResult success="false"/> </TestCase> <TestCase name="Text can be formatted using the Text class"> - <Expression success="true" filename="projects/SelfTest/TestMain.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/TestMain.cpp" > <Original> Text( "hi there" ).toString() == "hi there" </Original> @@ -4862,7 +4862,7 @@ four" "hi there" == "hi there" </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/TestMain.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/TestMain.cpp" > <Original> Text( "hi there", narrow ).toString() == "hi\nthere" </Original> @@ -4877,7 +4877,7 @@ there" <OverallResult success="true"/> </TestCase> <TestCase name="Long text is truncted"> - <Expression success="true" filename="projects/SelfTest/TestMain.cpp" > + <Expression success="true" type="CHECK_THAT" filename="projects/SelfTest/TestMain.cpp" > <Original> t.toString() EndsWith( "... message truncated due to excessive size" ) </Original> @@ -5888,7 +5888,7 @@ there" <OverallResult success="true"/> </TestCase> <TestCase name="Parsing a std::pair"> - <Expression success="true" filename="projects/SelfTest/TrickyTests.cpp" > + <Expression success="true" type="REQUIRE" filename="projects/SelfTest/TrickyTests.cpp" > <Original> (std::pair<int, int>( 1, 2 )) == aNicePair </Original> @@ -5911,7 +5911,7 @@ there" <OverallResult success="false"/> </TestCase> <TestCase name="A failing expression with a non streamable type is still captured"> - <Expression success="false" filename="projects/SelfTest/TrickyTests.cpp" > + <Expression success="false" type="CHECK" filename="projects/SelfTest/TrickyTests.cpp" > <Original> &o1 == &o2 </Original> @@ -5919,7 +5919,7 @@ there" 0x<hex digits> == 0x<hex digits> </Expanded> </Expression> - <Expression success="false" filename="projects/SelfTest/TrickyTests.cpp" > + <Expression success="false" type="CHECK" filename="projects/SelfTest/TrickyTests.cpp" > <Original> o1 == o2 </Original> @@ -5930,7 +5930,7 @@ there" <OverallResult success="false"/> </TestCase> <TestCase name="string literals of different sizes can be compared"> - <Expression success="false" filename="projects/SelfTest/TrickyTests.cpp" > + <Expression success="false" type="REQUIRE" filename="projects/SelfTest/TrickyTests.cpp" > <Original> std::string( "first" ) == "second" </Original> @@ -5941,7 +5941,7 @@ there" <OverallResult success="false"/> </TestCase> <TestCase name="An expression with side-effects should only be evaluated once"> - <Expression success="true" filename="projects/SelfTest/TrickyTests.cpp" > + <Expression success="true" type="REQUIRE" filename="projects/SelfTest/TrickyTests.cpp" > <Original> i++ == 7 </Original> @@ -5949,7 +5949,7 @@ there" 7 == 7 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/TrickyTests.cpp" > + <Expression success="true" type="REQUIRE" filename="projects/SelfTest/TrickyTests.cpp" > <Original> i++ == 8 </Original> @@ -5960,7 +5960,7 @@ there" <OverallResult success="true"/> </TestCase> <TestCase name="Operators at different namespace levels not hijacked by Koenig lookup"> - <Expression success="true" filename="projects/SelfTest/TrickyTests.cpp" > + <Expression success="true" type="REQUIRE" filename="projects/SelfTest/TrickyTests.cpp" > <Original> 0x<hex digits> == o </Original> @@ -5971,7 +5971,7 @@ there" <OverallResult success="true"/> </TestCase> <TestCase name="Demonstrate that a non-const == is not used"> - <Expression success="true" filename="projects/SelfTest/TrickyTests.cpp" > + <Expression success="true" type="REQUIRE" filename="projects/SelfTest/TrickyTests.cpp" > <Original> t == 1u </Original> @@ -5982,7 +5982,7 @@ there" <OverallResult success="true"/> </TestCase> <TestCase name="Test enum bit values"> - <Expression success="true" filename="projects/SelfTest/TrickyTests.cpp" > + <Expression success="true" type="REQUIRE" filename="projects/SelfTest/TrickyTests.cpp" > <Original> 0x<hex digits> == bit30and31 </Original> @@ -5993,7 +5993,7 @@ there" <OverallResult success="true"/> </TestCase> <TestCase name="boolean member"> - <Expression success="true" filename="projects/SelfTest/TrickyTests.cpp" > + <Expression success="true" type="REQUIRE" filename="projects/SelfTest/TrickyTests.cpp" > <Original> obj.prop != __null </Original> @@ -6005,7 +6005,7 @@ there" </TestCase> <TestCase name="(unimplemented) static bools can be evaluated"> <Section name="compare to true"> - <Expression success="true" filename="projects/SelfTest/TrickyTests.cpp" > + <Expression success="true" type="REQUIRE" filename="projects/SelfTest/TrickyTests.cpp" > <Original> is_true<true>::value == true </Original> @@ -6013,7 +6013,7 @@ there" true == true </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/TrickyTests.cpp" > + <Expression success="true" type="REQUIRE" filename="projects/SelfTest/TrickyTests.cpp" > <Original> true == is_true<true>::value </Original> @@ -6024,7 +6024,7 @@ there" <OverallResults successes="2" failures="0" expectedFailures="0"/> </Section> <Section name="compare to false"> - <Expression success="true" filename="projects/SelfTest/TrickyTests.cpp" > + <Expression success="true" type="REQUIRE" filename="projects/SelfTest/TrickyTests.cpp" > <Original> is_true<false>::value == false </Original> @@ -6032,7 +6032,7 @@ there" false == false </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/TrickyTests.cpp" > + <Expression success="true" type="REQUIRE" filename="projects/SelfTest/TrickyTests.cpp" > <Original> false == is_true<false>::value </Original> @@ -6043,7 +6043,7 @@ there" <OverallResults successes="2" failures="0" expectedFailures="0"/> </Section> <Section name="negation"> - <Expression success="true" filename="projects/SelfTest/TrickyTests.cpp" > + <Expression success="true" type="REQUIRE" filename="projects/SelfTest/TrickyTests.cpp" > <Original> !is_true<false>::value </Original> @@ -6054,7 +6054,7 @@ there" <OverallResults successes="1" failures="0" expectedFailures="0"/> </Section> <Section name="double negation"> - <Expression success="true" filename="projects/SelfTest/TrickyTests.cpp" > + <Expression success="true" type="REQUIRE" filename="projects/SelfTest/TrickyTests.cpp" > <Original> !!is_true<true>::value </Original> @@ -6065,7 +6065,7 @@ there" <OverallResults successes="1" failures="0" expectedFailures="0"/> </Section> <Section name="direct"> - <Expression success="true" filename="projects/SelfTest/TrickyTests.cpp" > + <Expression success="true" type="REQUIRE" filename="projects/SelfTest/TrickyTests.cpp" > <Original> is_true<true>::value </Original> @@ -6073,7 +6073,7 @@ there" true </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/TrickyTests.cpp" > + <Expression success="true" type="REQUIRE_FALSE" filename="projects/SelfTest/TrickyTests.cpp" > <Original> !is_true<false>::value </Original> @@ -6086,7 +6086,7 @@ there" <OverallResult success="true"/> </TestCase> <TestCase name="Objects that evaluated in boolean contexts can be checked"> - <Expression success="true" filename="projects/SelfTest/TrickyTests.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/TrickyTests.cpp" > <Original> True </Original> @@ -6094,7 +6094,7 @@ there" true </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/TrickyTests.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/TrickyTests.cpp" > <Original> !False </Original> @@ -6102,7 +6102,7 @@ there" true </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/TrickyTests.cpp" > + <Expression success="true" type="CHECK_FALSE" filename="projects/SelfTest/TrickyTests.cpp" > <Original> !False </Original> @@ -6113,7 +6113,7 @@ there" <OverallResult success="true"/> </TestCase> <TestCase name="Assertions then sections"> - <Expression success="true" filename="projects/SelfTest/TrickyTests.cpp" > + <Expression success="true" type="REQUIRE" filename="projects/SelfTest/TrickyTests.cpp" > <Original> Catch::alwaysTrue() </Original> @@ -6122,7 +6122,7 @@ there" </Expanded> </Expression> <Section name="A section"> - <Expression success="true" filename="projects/SelfTest/TrickyTests.cpp" > + <Expression success="true" type="REQUIRE" filename="projects/SelfTest/TrickyTests.cpp" > <Original> Catch::alwaysTrue() </Original> @@ -6131,7 +6131,7 @@ there" </Expanded> </Expression> <Section name="Another section"> - <Expression success="true" filename="projects/SelfTest/TrickyTests.cpp" > + <Expression success="true" type="REQUIRE" filename="projects/SelfTest/TrickyTests.cpp" > <Original> Catch::alwaysTrue() </Original> @@ -6143,7 +6143,7 @@ there" </Section> <OverallResults successes="2" failures="0" expectedFailures="0"/> </Section> - <Expression success="true" filename="projects/SelfTest/TrickyTests.cpp" > + <Expression success="true" type="REQUIRE" filename="projects/SelfTest/TrickyTests.cpp" > <Original> Catch::alwaysTrue() </Original> @@ -6152,7 +6152,7 @@ there" </Expanded> </Expression> <Section name="A section"> - <Expression success="true" filename="projects/SelfTest/TrickyTests.cpp" > + <Expression success="true" type="REQUIRE" filename="projects/SelfTest/TrickyTests.cpp" > <Original> Catch::alwaysTrue() </Original> @@ -6161,7 +6161,7 @@ there" </Expanded> </Expression> <Section name="Another other section"> - <Expression success="true" filename="projects/SelfTest/TrickyTests.cpp" > + <Expression success="true" type="REQUIRE" filename="projects/SelfTest/TrickyTests.cpp" > <Original> Catch::alwaysTrue() </Original> @@ -6176,7 +6176,7 @@ there" <OverallResult success="true"/> </TestCase> <TestCase name="non streamable - with conv. op"> - <Expression success="true" filename="projects/SelfTest/TrickyTests.cpp" > + <Expression success="true" type="REQUIRE" filename="projects/SelfTest/TrickyTests.cpp" > <Original> s == "7" </Original> @@ -6187,7 +6187,7 @@ there" <OverallResult success="true"/> </TestCase> <TestCase name="Comparing function pointers"> - <Expression success="true" filename="projects/SelfTest/TrickyTests.cpp" > + <Expression success="true" type="REQUIRE" filename="projects/SelfTest/TrickyTests.cpp" > <Original> a </Original> @@ -6195,7 +6195,7 @@ there" true </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/TrickyTests.cpp" > + <Expression success="true" type="REQUIRE" filename="projects/SelfTest/TrickyTests.cpp" > <Original> a == &foo </Original> @@ -6206,7 +6206,7 @@ there" <OverallResult success="true"/> </TestCase> <TestCase name="Comparing member function pointers"> - <Expression success="true" filename="projects/SelfTest/TrickyTests.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/TrickyTests.cpp" > <Original> m == &S::f </Original> @@ -6219,7 +6219,7 @@ there" <OverallResult success="true"/> </TestCase> <TestCase name="pointer to class"> - <Expression success="true" filename="projects/SelfTest/TrickyTests.cpp" > + <Expression success="true" type="REQUIRE" filename="projects/SelfTest/TrickyTests.cpp" > <Original> p == 0 </Original> @@ -6230,7 +6230,7 @@ there" <OverallResult success="true"/> </TestCase> <TestCase name="null_ptr"> - <Expression success="true" filename="projects/SelfTest/TrickyTests.cpp" > + <Expression success="true" type="REQUIRE" filename="projects/SelfTest/TrickyTests.cpp" > <Original> ptr.get() == nullptr </Original> @@ -6253,7 +6253,7 @@ there" <OverallResult success="true"/> </TestCase> <TestCase name="toString( has_toString )"> - <Expression success="true" filename="projects/SelfTest/ToStringWhich.cpp" > + <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ToStringWhich.cpp" > <Original> Catch::toString( item ) == "toString( has_toString )" </Original> @@ -6266,7 +6266,7 @@ there" <OverallResult success="true"/> </TestCase> <TestCase name="toString( has_maker )"> - <Expression success="true" filename="projects/SelfTest/ToStringWhich.cpp" > + <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ToStringWhich.cpp" > <Original> Catch::toString( item ) == "StringMaker<has_maker>" </Original> @@ -6279,7 +6279,7 @@ there" <OverallResult success="true"/> </TestCase> <TestCase name="toString( has_maker_and_toString )"> - <Expression success="true" filename="projects/SelfTest/ToStringWhich.cpp" > + <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ToStringWhich.cpp" > <Original> Catch::toString( item ) == "toString( has_maker_and_toString )" </Original> @@ -6292,7 +6292,7 @@ there" <OverallResult success="true"/> </TestCase> <TestCase name="toString( vectors<has_toString )"> - <Expression success="true" filename="projects/SelfTest/ToStringWhich.cpp" > + <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ToStringWhich.cpp" > <Original> Catch::toString( v ) == "{ {?} }" </Original> @@ -6303,7 +6303,7 @@ there" <OverallResult success="true"/> </TestCase> <TestCase name="toString( vectors<has_maker )"> - <Expression success="true" filename="projects/SelfTest/ToStringWhich.cpp" > + <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ToStringWhich.cpp" > <Original> Catch::toString( v ) == "{ StringMaker<has_maker> }" </Original> @@ -6316,7 +6316,7 @@ there" <OverallResult success="true"/> </TestCase> <TestCase name="toString( vectors<has_maker_and_toString )"> - <Expression success="true" filename="projects/SelfTest/ToStringWhich.cpp" > + <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ToStringWhich.cpp" > <Original> Catch::toString( v ) == "{ StringMaker<has_maker_and_toString> }" </Original> @@ -6329,7 +6329,7 @@ there" <OverallResult success="true"/> </TestCase> <TestCase name="std::pair<int,std::string> -> toString"> - <Expression success="true" filename="projects/SelfTest/ToStringPair.cpp" > + <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ToStringPair.cpp" > <Original> Catch::toString( value ) == "{ 34, \"xyzzy\" }" </Original> @@ -6340,7 +6340,7 @@ there" <OverallResult success="true"/> </TestCase> <TestCase name="std::pair<int,const std::string> -> toString"> - <Expression success="true" filename="projects/SelfTest/ToStringPair.cpp" > + <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ToStringPair.cpp" > <Original> Catch::toString(value) == "{ 34, \"xyzzy\" }" </Original> @@ -6351,7 +6351,7 @@ there" <OverallResult success="true"/> </TestCase> <TestCase name="std::vector<std::pair<std::string,int> > -> toString"> - <Expression success="true" filename="projects/SelfTest/ToStringPair.cpp" > + <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ToStringPair.cpp" > <Original> Catch::toString( pr ) == "{ { \"green\", 55 } }" </Original> @@ -6364,7 +6364,7 @@ there" <OverallResult success="true"/> </TestCase> <TestCase name="pair<pair<int,const char *,pair<std::string,int> > -> toString"> - <Expression success="true" filename="projects/SelfTest/ToStringPair.cpp" > + <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ToStringPair.cpp" > <Original> Catch::toString( pair ) == "{ { 42, \"Arthur\" }, { \"Ford\", 24 } }" </Original> @@ -6377,7 +6377,7 @@ there" <OverallResult success="true"/> </TestCase> <TestCase name="vector<int> -> toString"> - <Expression success="true" filename="projects/SelfTest/ToStringVector.cpp" > + <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ToStringVector.cpp" > <Original> Catch::toString(vv) == "{ }" </Original> @@ -6385,7 +6385,7 @@ there" "{ }" == "{ }" </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/ToStringVector.cpp" > + <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ToStringVector.cpp" > <Original> Catch::toString(vv) == "{ 42 }" </Original> @@ -6393,7 +6393,7 @@ there" "{ 42 }" == "{ 42 }" </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/ToStringVector.cpp" > + <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ToStringVector.cpp" > <Original> Catch::toString(vv) == "{ 42, 512 }" </Original> @@ -6404,7 +6404,7 @@ there" <OverallResult success="true"/> </TestCase> <TestCase name="vector<string> -> toString"> - <Expression success="true" filename="projects/SelfTest/ToStringVector.cpp" > + <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ToStringVector.cpp" > <Original> Catch::toString(vv) == "{ }" </Original> @@ -6412,7 +6412,7 @@ there" "{ }" == "{ }" </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/ToStringVector.cpp" > + <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ToStringVector.cpp" > <Original> Catch::toString(vv) == "{ \"hello\" }" </Original> @@ -6420,7 +6420,7 @@ there" "{ "hello" }" == "{ "hello" }" </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/ToStringVector.cpp" > + <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ToStringVector.cpp" > <Original> Catch::toString(vv) == "{ \"hello\", \"world\" }" </Original> @@ -6433,7 +6433,7 @@ there" <OverallResult success="true"/> </TestCase> <TestCase name="vector<int,allocator> -> toString"> - <Expression success="true" filename="projects/SelfTest/ToStringVector.cpp" > + <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ToStringVector.cpp" > <Original> Catch::toString(vv) == "{ }" </Original> @@ -6441,7 +6441,7 @@ there" "{ }" == "{ }" </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/ToStringVector.cpp" > + <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ToStringVector.cpp" > <Original> Catch::toString(vv) == "{ 42 }" </Original> @@ -6449,7 +6449,7 @@ there" "{ 42 }" == "{ 42 }" </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/ToStringVector.cpp" > + <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ToStringVector.cpp" > <Original> Catch::toString(vv) == "{ 42, 512 }" </Original> @@ -6460,7 +6460,7 @@ there" <OverallResult success="true"/> </TestCase> <TestCase name="vec<vec<string,alloc>> -> toString"> - <Expression success="true" filename="projects/SelfTest/ToStringVector.cpp" > + <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ToStringVector.cpp" > <Original> Catch::toString(v) == "{ }" </Original> @@ -6468,7 +6468,7 @@ there" "{ }" == "{ }" </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/ToStringVector.cpp" > + <Expression success="true" type="REQUIRE" filename="projects/SelfTest/ToStringVector.cpp" > <Original> Catch::toString(v) == "{ { \"hello\" }, { \"world\" } }" </Original> @@ -6482,7 +6482,7 @@ there" </TestCase> <TestCase name="Parse test names and tags"> <Section name="Empty test spec should have no filters"> - <Expression success="true" filename="projects/SelfTest/CmdLineTests.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" > <Original> spec.hasFilters() == false </Original> @@ -6490,7 +6490,7 @@ there" false == false </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/CmdLineTests.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" > <Original> spec.matches( tcA ) == false </Original> @@ -6498,7 +6498,7 @@ there" false == false </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/CmdLineTests.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" > <Original> spec.matches( tcB ) == false </Original> @@ -6509,7 +6509,7 @@ there" <OverallResults successes="3" failures="0" expectedFailures="0"/> </Section> <Section name="Test spec from empty string should have no filters"> - <Expression success="true" filename="projects/SelfTest/CmdLineTests.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" > <Original> spec.hasFilters() == false </Original> @@ -6517,7 +6517,7 @@ there" false == false </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/CmdLineTests.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" > <Original> spec.matches(tcA ) == false </Original> @@ -6525,7 +6525,7 @@ there" false == false </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/CmdLineTests.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" > <Original> spec.matches( tcB ) == false </Original> @@ -6536,7 +6536,7 @@ there" <OverallResults successes="3" failures="0" expectedFailures="0"/> </Section> <Section name="Test spec from just a comma should have no filters"> - <Expression success="true" filename="projects/SelfTest/CmdLineTests.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" > <Original> spec.hasFilters() == false </Original> @@ -6544,7 +6544,7 @@ there" false == false </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/CmdLineTests.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" > <Original> spec.matches( tcA ) == false </Original> @@ -6552,7 +6552,7 @@ there" false == false </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/CmdLineTests.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" > <Original> spec.matches( tcB ) == false </Original> @@ -6563,7 +6563,7 @@ there" <OverallResults successes="3" failures="0" expectedFailures="0"/> </Section> <Section name="Test spec from name should have one filter"> - <Expression success="true" filename="projects/SelfTest/CmdLineTests.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" > <Original> spec.hasFilters() == true </Original> @@ -6571,7 +6571,7 @@ there" true == true </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/CmdLineTests.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" > <Original> spec.matches( tcA ) == false </Original> @@ -6579,7 +6579,7 @@ there" false == false </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/CmdLineTests.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" > <Original> spec.matches( tcB ) == true </Original> @@ -6590,7 +6590,7 @@ there" <OverallResults successes="3" failures="0" expectedFailures="0"/> </Section> <Section name="Test spec from quoted name should have one filter"> - <Expression success="true" filename="projects/SelfTest/CmdLineTests.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" > <Original> spec.hasFilters() == true </Original> @@ -6598,7 +6598,7 @@ there" true == true </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/CmdLineTests.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" > <Original> spec.matches( tcA ) == false </Original> @@ -6606,7 +6606,7 @@ there" false == false </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/CmdLineTests.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" > <Original> spec.matches( tcB ) == true </Original> @@ -6617,7 +6617,7 @@ there" <OverallResults successes="3" failures="0" expectedFailures="0"/> </Section> <Section name="Test spec from name should have one filter"> - <Expression success="true" filename="projects/SelfTest/CmdLineTests.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" > <Original> spec.hasFilters() == true </Original> @@ -6625,7 +6625,7 @@ there" true == true </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/CmdLineTests.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" > <Original> spec.matches( tcA ) == false </Original> @@ -6633,7 +6633,7 @@ there" false == false </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/CmdLineTests.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" > <Original> spec.matches( tcB ) == true </Original> @@ -6641,7 +6641,7 @@ there" true == true </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/CmdLineTests.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" > <Original> spec.matches( tcC ) == false </Original> @@ -6652,7 +6652,7 @@ there" <OverallResults successes="4" failures="0" expectedFailures="0"/> </Section> <Section name="Wildcard at the start"> - <Expression success="true" filename="projects/SelfTest/CmdLineTests.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" > <Original> spec.hasFilters() == true </Original> @@ -6660,7 +6660,7 @@ there" true == true </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/CmdLineTests.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" > <Original> spec.matches( tcA ) == false </Original> @@ -6668,7 +6668,7 @@ there" false == false </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/CmdLineTests.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" > <Original> spec.matches( tcB ) == false </Original> @@ -6676,7 +6676,7 @@ there" false == false </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/CmdLineTests.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" > <Original> spec.matches( tcC ) == true </Original> @@ -6684,7 +6684,7 @@ there" true == true </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/CmdLineTests.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" > <Original> spec.matches( tcD ) == false </Original> @@ -6692,7 +6692,7 @@ there" false == false </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/CmdLineTests.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" > <Original> parseTestSpec( "*a" ).matches( tcA ) == true </Original> @@ -6703,7 +6703,7 @@ there" <OverallResults successes="6" failures="0" expectedFailures="0"/> </Section> <Section name="Wildcard at the end"> - <Expression success="true" filename="projects/SelfTest/CmdLineTests.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" > <Original> spec.hasFilters() == true </Original> @@ -6711,7 +6711,7 @@ there" true == true </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/CmdLineTests.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" > <Original> spec.matches( tcA ) == false </Original> @@ -6719,7 +6719,7 @@ there" false == false </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/CmdLineTests.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" > <Original> spec.matches( tcB ) == false </Original> @@ -6727,7 +6727,7 @@ there" false == false </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/CmdLineTests.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" > <Original> spec.matches( tcC ) == true </Original> @@ -6735,7 +6735,7 @@ there" true == true </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/CmdLineTests.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" > <Original> spec.matches( tcD ) == false </Original> @@ -6743,7 +6743,7 @@ there" false == false </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/CmdLineTests.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" > <Original> parseTestSpec( "a*" ).matches( tcA ) == true </Original> @@ -6754,7 +6754,7 @@ there" <OverallResults successes="6" failures="0" expectedFailures="0"/> </Section> <Section name="Wildcard at both ends"> - <Expression success="true" filename="projects/SelfTest/CmdLineTests.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" > <Original> spec.hasFilters() == true </Original> @@ -6762,7 +6762,7 @@ there" true == true </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/CmdLineTests.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" > <Original> spec.matches( tcA ) == false </Original> @@ -6770,7 +6770,7 @@ there" false == false </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/CmdLineTests.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" > <Original> spec.matches( tcB ) == false </Original> @@ -6778,7 +6778,7 @@ there" false == false </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/CmdLineTests.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" > <Original> spec.matches( tcC ) == true </Original> @@ -6786,7 +6786,7 @@ there" true == true </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/CmdLineTests.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" > <Original> spec.matches( tcD ) == true </Original> @@ -6794,7 +6794,7 @@ there" true == true </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/CmdLineTests.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" > <Original> parseTestSpec( "*a*" ).matches( tcA ) == true </Original> @@ -6805,7 +6805,7 @@ there" <OverallResults successes="6" failures="0" expectedFailures="0"/> </Section> <Section name="Redundant wildcard at the start"> - <Expression success="true" filename="projects/SelfTest/CmdLineTests.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" > <Original> spec.hasFilters() == true </Original> @@ -6813,7 +6813,7 @@ there" true == true </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/CmdLineTests.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" > <Original> spec.matches( tcA ) == true </Original> @@ -6821,7 +6821,7 @@ there" true == true </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/CmdLineTests.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" > <Original> spec.matches( tcB ) == false </Original> @@ -6832,7 +6832,7 @@ there" <OverallResults successes="3" failures="0" expectedFailures="0"/> </Section> <Section name="Redundant wildcard at the end"> - <Expression success="true" filename="projects/SelfTest/CmdLineTests.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" > <Original> spec.hasFilters() == true </Original> @@ -6840,7 +6840,7 @@ there" true == true </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/CmdLineTests.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" > <Original> spec.matches( tcA ) == true </Original> @@ -6848,7 +6848,7 @@ there" true == true </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/CmdLineTests.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" > <Original> spec.matches( tcB ) == false </Original> @@ -6859,7 +6859,7 @@ there" <OverallResults successes="3" failures="0" expectedFailures="0"/> </Section> <Section name="Redundant wildcard at both ends"> - <Expression success="true" filename="projects/SelfTest/CmdLineTests.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" > <Original> spec.hasFilters() == true </Original> @@ -6867,7 +6867,7 @@ there" true == true </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/CmdLineTests.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" > <Original> spec.matches( tcA ) == true </Original> @@ -6875,7 +6875,7 @@ there" true == true </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/CmdLineTests.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" > <Original> spec.matches( tcB ) == false </Original> @@ -6886,7 +6886,7 @@ there" <OverallResults successes="3" failures="0" expectedFailures="0"/> </Section> <Section name="Wildcard at both ends, redundant at start"> - <Expression success="true" filename="projects/SelfTest/CmdLineTests.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" > <Original> spec.hasFilters() == true </Original> @@ -6894,7 +6894,7 @@ there" true == true </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/CmdLineTests.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" > <Original> spec.matches( tcA ) == false </Original> @@ -6902,7 +6902,7 @@ there" false == false </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/CmdLineTests.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" > <Original> spec.matches( tcB ) == false </Original> @@ -6910,7 +6910,7 @@ there" false == false </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/CmdLineTests.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" > <Original> spec.matches( tcC ) == true </Original> @@ -6918,7 +6918,7 @@ there" true == true </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/CmdLineTests.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" > <Original> spec.matches( tcD ) == true </Original> @@ -6929,7 +6929,7 @@ there" <OverallResults successes="5" failures="0" expectedFailures="0"/> </Section> <Section name="Just wildcard"> - <Expression success="true" filename="projects/SelfTest/CmdLineTests.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" > <Original> spec.hasFilters() == true </Original> @@ -6937,7 +6937,7 @@ there" true == true </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/CmdLineTests.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" > <Original> spec.matches( tcA ) == true </Original> @@ -6945,7 +6945,7 @@ there" true == true </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/CmdLineTests.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" > <Original> spec.matches( tcB ) == true </Original> @@ -6953,7 +6953,7 @@ there" true == true </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/CmdLineTests.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" > <Original> spec.matches( tcC ) == true </Original> @@ -6961,7 +6961,7 @@ there" true == true </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/CmdLineTests.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" > <Original> spec.matches( tcD ) == true </Original> @@ -6972,7 +6972,7 @@ there" <OverallResults successes="5" failures="0" expectedFailures="0"/> </Section> <Section name="Single tag"> - <Expression success="true" filename="projects/SelfTest/CmdLineTests.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" > <Original> spec.hasFilters() == true </Original> @@ -6980,7 +6980,7 @@ there" true == true </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/CmdLineTests.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" > <Original> spec.matches( tcA ) == false </Original> @@ -6988,7 +6988,7 @@ there" false == false </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/CmdLineTests.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" > <Original> spec.matches( tcB ) == true </Original> @@ -6996,7 +6996,7 @@ there" true == true </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/CmdLineTests.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" > <Original> spec.matches( tcC ) == false </Original> @@ -7007,7 +7007,7 @@ there" <OverallResults successes="4" failures="0" expectedFailures="0"/> </Section> <Section name="Single tag, two matches"> - <Expression success="true" filename="projects/SelfTest/CmdLineTests.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" > <Original> spec.hasFilters() == true </Original> @@ -7015,7 +7015,7 @@ there" true == true </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/CmdLineTests.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" > <Original> spec.matches( tcA ) == false </Original> @@ -7023,7 +7023,7 @@ there" false == false </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/CmdLineTests.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" > <Original> spec.matches( tcB ) == true </Original> @@ -7031,7 +7031,7 @@ there" true == true </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/CmdLineTests.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" > <Original> spec.matches( tcC ) == true </Original> @@ -7042,7 +7042,7 @@ there" <OverallResults successes="4" failures="0" expectedFailures="0"/> </Section> <Section name="Two tags"> - <Expression success="true" filename="projects/SelfTest/CmdLineTests.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" > <Original> spec.hasFilters() == true </Original> @@ -7050,7 +7050,7 @@ there" true == true </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/CmdLineTests.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" > <Original> spec.matches( tcA ) == false </Original> @@ -7058,7 +7058,7 @@ there" false == false </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/CmdLineTests.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" > <Original> spec.matches( tcB ) == false </Original> @@ -7066,7 +7066,7 @@ there" false == false </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/CmdLineTests.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" > <Original> spec.matches( tcC ) == true </Original> @@ -7077,7 +7077,7 @@ there" <OverallResults successes="4" failures="0" expectedFailures="0"/> </Section> <Section name="Two tags, spare separated"> - <Expression success="true" filename="projects/SelfTest/CmdLineTests.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" > <Original> spec.hasFilters() == true </Original> @@ -7085,7 +7085,7 @@ there" true == true </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/CmdLineTests.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" > <Original> spec.matches( tcA ) == false </Original> @@ -7093,7 +7093,7 @@ there" false == false </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/CmdLineTests.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" > <Original> spec.matches( tcB ) == false </Original> @@ -7101,7 +7101,7 @@ there" false == false </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/CmdLineTests.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" > <Original> spec.matches( tcC ) == true </Original> @@ -7112,7 +7112,7 @@ there" <OverallResults successes="4" failures="0" expectedFailures="0"/> </Section> <Section name="Wildcarded name and tag"> - <Expression success="true" filename="projects/SelfTest/CmdLineTests.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" > <Original> spec.hasFilters() == true </Original> @@ -7120,7 +7120,7 @@ there" true == true </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/CmdLineTests.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" > <Original> spec.matches( tcA ) == false </Original> @@ -7128,7 +7128,7 @@ there" false == false </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/CmdLineTests.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" > <Original> spec.matches( tcB ) == false </Original> @@ -7136,7 +7136,7 @@ there" false == false </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/CmdLineTests.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" > <Original> spec.matches( tcC ) == true </Original> @@ -7144,7 +7144,7 @@ there" true == true </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/CmdLineTests.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" > <Original> spec.matches( tcD ) == false </Original> @@ -7155,7 +7155,7 @@ there" <OverallResults successes="5" failures="0" expectedFailures="0"/> </Section> <Section name="Single tag exclusion"> - <Expression success="true" filename="projects/SelfTest/CmdLineTests.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" > <Original> spec.hasFilters() == true </Original> @@ -7163,7 +7163,7 @@ there" true == true </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/CmdLineTests.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" > <Original> spec.matches( tcA ) == true </Original> @@ -7171,7 +7171,7 @@ there" true == true </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/CmdLineTests.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" > <Original> spec.matches( tcB ) == false </Original> @@ -7179,7 +7179,7 @@ there" false == false </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/CmdLineTests.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" > <Original> spec.matches( tcC ) == true </Original> @@ -7190,7 +7190,7 @@ there" <OverallResults successes="4" failures="0" expectedFailures="0"/> </Section> <Section name="One tag exclusion and one tag inclusion"> - <Expression success="true" filename="projects/SelfTest/CmdLineTests.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" > <Original> spec.hasFilters() == true </Original> @@ -7198,7 +7198,7 @@ there" true == true </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/CmdLineTests.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" > <Original> spec.matches( tcA ) == false </Original> @@ -7206,7 +7206,7 @@ there" false == false </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/CmdLineTests.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" > <Original> spec.matches( tcB ) == true </Original> @@ -7214,7 +7214,7 @@ there" true == true </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/CmdLineTests.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" > <Original> spec.matches( tcC ) == false </Original> @@ -7225,7 +7225,7 @@ there" <OverallResults successes="4" failures="0" expectedFailures="0"/> </Section> <Section name="One tag exclusion and one wldcarded name inclusion"> - <Expression success="true" filename="projects/SelfTest/CmdLineTests.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" > <Original> spec.hasFilters() == true </Original> @@ -7233,7 +7233,7 @@ there" true == true </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/CmdLineTests.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" > <Original> spec.matches( tcA ) == false </Original> @@ -7241,7 +7241,7 @@ there" false == false </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/CmdLineTests.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" > <Original> spec.matches( tcB ) == false </Original> @@ -7249,7 +7249,7 @@ there" false == false </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/CmdLineTests.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" > <Original> spec.matches( tcC ) == false </Original> @@ -7257,7 +7257,7 @@ there" false == false </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/CmdLineTests.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" > <Original> spec.matches( tcD ) == true </Original> @@ -7268,7 +7268,7 @@ there" <OverallResults successes="5" failures="0" expectedFailures="0"/> </Section> <Section name="One tag exclusion, using exclude:, and one wldcarded name inclusion"> - <Expression success="true" filename="projects/SelfTest/CmdLineTests.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" > <Original> spec.hasFilters() == true </Original> @@ -7276,7 +7276,7 @@ there" true == true </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/CmdLineTests.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" > <Original> spec.matches( tcA ) == false </Original> @@ -7284,7 +7284,7 @@ there" false == false </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/CmdLineTests.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" > <Original> spec.matches( tcB ) == false </Original> @@ -7292,7 +7292,7 @@ there" false == false </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/CmdLineTests.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" > <Original> spec.matches( tcC ) == false </Original> @@ -7300,7 +7300,7 @@ there" false == false </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/CmdLineTests.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" > <Original> spec.matches( tcD ) == true </Original> @@ -7311,7 +7311,7 @@ there" <OverallResults successes="5" failures="0" expectedFailures="0"/> </Section> <Section name="name exclusion"> - <Expression success="true" filename="projects/SelfTest/CmdLineTests.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" > <Original> spec.hasFilters() == true </Original> @@ -7319,7 +7319,7 @@ there" true == true </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/CmdLineTests.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" > <Original> spec.matches( tcA ) == true </Original> @@ -7327,7 +7327,7 @@ there" true == true </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/CmdLineTests.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" > <Original> spec.matches( tcB ) == false </Original> @@ -7335,7 +7335,7 @@ there" false == false </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/CmdLineTests.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" > <Original> spec.matches( tcC ) == true </Original> @@ -7343,7 +7343,7 @@ there" true == true </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/CmdLineTests.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" > <Original> spec.matches( tcD ) == true </Original> @@ -7354,7 +7354,7 @@ there" <OverallResults successes="5" failures="0" expectedFailures="0"/> </Section> <Section name="wildcarded name exclusion"> - <Expression success="true" filename="projects/SelfTest/CmdLineTests.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" > <Original> spec.hasFilters() == true </Original> @@ -7362,7 +7362,7 @@ there" true == true </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/CmdLineTests.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" > <Original> spec.matches( tcA ) == true </Original> @@ -7370,7 +7370,7 @@ there" true == true </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/CmdLineTests.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" > <Original> spec.matches( tcB ) == true </Original> @@ -7378,7 +7378,7 @@ there" true == true </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/CmdLineTests.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" > <Original> spec.matches( tcC ) == false </Original> @@ -7386,7 +7386,7 @@ there" false == false </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/CmdLineTests.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" > <Original> spec.matches( tcD ) == false </Original> @@ -7397,7 +7397,7 @@ there" <OverallResults successes="5" failures="0" expectedFailures="0"/> </Section> <Section name="wildcarded name exclusion with tag inclusion"> - <Expression success="true" filename="projects/SelfTest/CmdLineTests.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" > <Original> spec.hasFilters() == true </Original> @@ -7405,7 +7405,7 @@ there" true == true </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/CmdLineTests.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" > <Original> spec.matches( tcA ) == true </Original> @@ -7413,7 +7413,7 @@ there" true == true </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/CmdLineTests.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" > <Original> spec.matches( tcB ) == true </Original> @@ -7421,7 +7421,7 @@ there" true == true </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/CmdLineTests.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" > <Original> spec.matches( tcC ) == true </Original> @@ -7429,7 +7429,7 @@ there" true == true </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/CmdLineTests.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" > <Original> spec.matches( tcD ) == false </Original> @@ -7440,7 +7440,7 @@ there" <OverallResults successes="5" failures="0" expectedFailures="0"/> </Section> <Section name="wildcarded name exclusion, using exclude:, with tag inclusion"> - <Expression success="true" filename="projects/SelfTest/CmdLineTests.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" > <Original> spec.hasFilters() == true </Original> @@ -7448,7 +7448,7 @@ there" true == true </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/CmdLineTests.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" > <Original> spec.matches( tcA ) == true </Original> @@ -7456,7 +7456,7 @@ there" true == true </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/CmdLineTests.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" > <Original> spec.matches( tcB ) == true </Original> @@ -7464,7 +7464,7 @@ there" true == true </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/CmdLineTests.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" > <Original> spec.matches( tcC ) == true </Original> @@ -7472,7 +7472,7 @@ there" true == true </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/CmdLineTests.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" > <Original> spec.matches( tcD ) == false </Original> @@ -7483,7 +7483,7 @@ there" <OverallResults successes="5" failures="0" expectedFailures="0"/> </Section> <Section name="two wildcarded names"> - <Expression success="true" filename="projects/SelfTest/CmdLineTests.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" > <Original> spec.hasFilters() == true </Original> @@ -7491,7 +7491,7 @@ there" true == true </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/CmdLineTests.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" > <Original> spec.matches( tcA ) == false </Original> @@ -7499,7 +7499,7 @@ there" false == false </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/CmdLineTests.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" > <Original> spec.matches( tcB ) == false </Original> @@ -7507,7 +7507,7 @@ there" false == false </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/CmdLineTests.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" > <Original> spec.matches( tcC ) == true </Original> @@ -7515,7 +7515,7 @@ there" true == true </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/CmdLineTests.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" > <Original> spec.matches( tcD ) == false </Original> @@ -7526,7 +7526,7 @@ there" <OverallResults successes="5" failures="0" expectedFailures="0"/> </Section> <Section name="empty tag"> - <Expression success="true" filename="projects/SelfTest/CmdLineTests.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" > <Original> spec.hasFilters() == false </Original> @@ -7534,7 +7534,7 @@ there" false == false </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/CmdLineTests.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" > <Original> spec.matches( tcA ) == false </Original> @@ -7542,7 +7542,7 @@ there" false == false </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/CmdLineTests.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" > <Original> spec.matches( tcB ) == false </Original> @@ -7550,7 +7550,7 @@ there" false == false </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/CmdLineTests.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" > <Original> spec.matches( tcC ) == false </Original> @@ -7558,7 +7558,7 @@ there" false == false </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/CmdLineTests.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" > <Original> spec.matches( tcD ) == false </Original> @@ -7569,7 +7569,7 @@ there" <OverallResults successes="5" failures="0" expectedFailures="0"/> </Section> <Section name="empty quoted name"> - <Expression success="true" filename="projects/SelfTest/CmdLineTests.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" > <Original> spec.hasFilters() == false </Original> @@ -7577,7 +7577,7 @@ there" false == false </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/CmdLineTests.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" > <Original> spec.matches( tcA ) == false </Original> @@ -7585,7 +7585,7 @@ there" false == false </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/CmdLineTests.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" > <Original> spec.matches( tcB ) == false </Original> @@ -7593,7 +7593,7 @@ there" false == false </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/CmdLineTests.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" > <Original> spec.matches( tcC ) == false </Original> @@ -7601,7 +7601,7 @@ there" false == false </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/CmdLineTests.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" > <Original> spec.matches( tcD ) == false </Original> @@ -7612,7 +7612,7 @@ there" <OverallResults successes="5" failures="0" expectedFailures="0"/> </Section> <Section name="quoted string followed by tag exclusion"> - <Expression success="true" filename="projects/SelfTest/CmdLineTests.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" > <Original> spec.hasFilters() == true </Original> @@ -7620,7 +7620,7 @@ there" true == true </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/CmdLineTests.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" > <Original> spec.matches( tcA ) == false </Original> @@ -7628,7 +7628,7 @@ there" false == false </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/CmdLineTests.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" > <Original> spec.matches( tcB ) == false </Original> @@ -7636,7 +7636,7 @@ there" false == false </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/CmdLineTests.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" > <Original> spec.matches( tcC ) == false </Original> @@ -7644,7 +7644,7 @@ there" false == false </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/CmdLineTests.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/CmdLineTests.cpp" > <Original> spec.matches( tcD ) == true </Original> @@ -7658,7 +7658,7 @@ there" </TestCase> <TestCase name="Tag alias can be registered against tag patterns"> <Section name="The same tag alias can only be registered once"> - <Expression success="true" filename="projects/SelfTest/TagAliasTests.cpp" > + <Expression success="true" type="CHECK_THAT" filename="projects/SelfTest/TagAliasTests.cpp" > <Original> what Contains( "[@zzz]" ) </Original> @@ -7668,7 +7668,7 @@ there" Redefined at file:10" contains: "[@zzz]" </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/TagAliasTests.cpp" > + <Expression success="true" type="CHECK_THAT" filename="projects/SelfTest/TagAliasTests.cpp" > <Original> what Contains( "file" ) </Original> @@ -7678,7 +7678,7 @@ there" Redefined at file:10" contains: "file" </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/TagAliasTests.cpp" > + <Expression success="true" type="CHECK_THAT" filename="projects/SelfTest/TagAliasTests.cpp" > <Original> what Contains( "2" ) </Original> @@ -7688,7 +7688,7 @@ there" Redefined at file:10" contains: "2" </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/TagAliasTests.cpp" > + <Expression success="true" type="CHECK_THAT" filename="projects/SelfTest/TagAliasTests.cpp" > <Original> what Contains( "10" ) </Original> @@ -7701,7 +7701,7 @@ there" <OverallResults successes="4" failures="0" expectedFailures="0"/> </Section> <Section name="Tag aliases must be of the form [@name]"> - <Expression success="true" filename="projects/SelfTest/TagAliasTests.cpp" > + <Expression success="true" type="CHECK_THROWS" filename="projects/SelfTest/TagAliasTests.cpp" > <Original> registry.add( "[no ampersat]", "", Catch::SourceLineInfo( "file", 3 ) ) </Original> @@ -7709,7 +7709,7 @@ there" registry.add( "[no ampersat]", "", Catch::SourceLineInfo( "file", 3 ) ) </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/TagAliasTests.cpp" > + <Expression success="true" type="CHECK_THROWS" filename="projects/SelfTest/TagAliasTests.cpp" > <Original> registry.add( "[the @ is not at the start]", "", Catch::SourceLineInfo( "file", 3 ) ) </Original> @@ -7717,7 +7717,7 @@ there" registry.add( "[the @ is not at the start]", "", Catch::SourceLineInfo( "file", 3 ) ) </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/TagAliasTests.cpp" > + <Expression success="true" type="CHECK_THROWS" filename="projects/SelfTest/TagAliasTests.cpp" > <Original> registry.add( "@no square bracket at start]", "", Catch::SourceLineInfo( "file", 3 ) ) </Original> @@ -7725,7 +7725,7 @@ there" registry.add( "@no square bracket at start]", "", Catch::SourceLineInfo( "file", 3 ) ) </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/TagAliasTests.cpp" > + <Expression success="true" type="CHECK_THROWS" filename="projects/SelfTest/TagAliasTests.cpp" > <Original> registry.add( "[@no square bracket at end", "", Catch::SourceLineInfo( "file", 3 ) ) </Original> @@ -7753,7 +7753,7 @@ there" <Section name="Given: This stuff exists"> <Section name="When: I do this"> <Section name="Then: it should do this"> - <Expression success="true" filename="projects/SelfTest/BDDTests.cpp" > + <Expression success="true" type="REQUIRE" filename="projects/SelfTest/BDDTests.cpp" > <Original> itDoesThis() </Original> @@ -7762,7 +7762,7 @@ there" </Expanded> </Expression> <Section name="And: do that"> - <Expression success="true" filename="projects/SelfTest/BDDTests.cpp" > + <Expression success="true" type="REQUIRE" filename="projects/SelfTest/BDDTests.cpp" > <Original> itDoesThat() </Original> @@ -7782,7 +7782,7 @@ there" </TestCase> <TestCase name="Scenario: Vector resizing affects size and capacity"> <Section name="Given: an empty vector"> - <Expression success="true" filename="projects/SelfTest/BDDTests.cpp" > + <Expression success="true" type="REQUIRE" filename="projects/SelfTest/BDDTests.cpp" > <Original> v.size() == 0 </Original> @@ -7792,7 +7792,7 @@ there" </Expression> <Section name="When: it is made larger"> <Section name="Then: the size and capacity go up"> - <Expression success="true" filename="projects/SelfTest/BDDTests.cpp" > + <Expression success="true" type="REQUIRE" filename="projects/SelfTest/BDDTests.cpp" > <Original> v.size() == 10 </Original> @@ -7800,7 +7800,7 @@ there" 10 == 10 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/BDDTests.cpp" > + <Expression success="true" type="REQUIRE" filename="projects/SelfTest/BDDTests.cpp" > <Original> v.capacity() >= 10 </Original> @@ -7810,7 +7810,7 @@ there" </Expression> <Section name="And when: it is made smaller again"> <Section name="Then: the size goes down but the capacity stays the same"> - <Expression success="true" filename="projects/SelfTest/BDDTests.cpp" > + <Expression success="true" type="REQUIRE" filename="projects/SelfTest/BDDTests.cpp" > <Original> v.size() == 5 </Original> @@ -7818,7 +7818,7 @@ there" 5 == 5 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/BDDTests.cpp" > + <Expression success="true" type="REQUIRE" filename="projects/SelfTest/BDDTests.cpp" > <Original> v.capacity() >= 10 </Original> @@ -7837,7 +7837,7 @@ there" <OverallResults successes="5" failures="0" expectedFailures="0"/> </Section> <Section name="Given: an empty vector"> - <Expression success="true" filename="projects/SelfTest/BDDTests.cpp" > + <Expression success="true" type="REQUIRE" filename="projects/SelfTest/BDDTests.cpp" > <Original> v.size() == 0 </Original> @@ -7847,7 +7847,7 @@ there" </Expression> <Section name="When: we reserve more space"> <Section name="Then: The capacity is increased but the size remains the same"> - <Expression success="true" filename="projects/SelfTest/BDDTests.cpp" > + <Expression success="true" type="REQUIRE" filename="projects/SelfTest/BDDTests.cpp" > <Original> v.capacity() >= 10 </Original> @@ -7855,7 +7855,7 @@ there" 10 >= 10 </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/BDDTests.cpp" > + <Expression success="true" type="REQUIRE" filename="projects/SelfTest/BDDTests.cpp" > <Original> v.size() == 0 </Original> @@ -7885,7 +7885,7 @@ there" </TestCase> <TestCase name="Scenario: BDD tests requiring Fixtures to provide commonly-accessed data or methods"> <Section name="Given: No operations precede me"> - <Expression success="true" filename="projects/SelfTest/BDDTests.cpp" > + <Expression success="true" type="REQUIRE" filename="projects/SelfTest/BDDTests.cpp" > <Original> before == 0 </Original> @@ -7895,7 +7895,7 @@ there" </Expression> <Section name="When: We get the count"> <Section name="Then: Subsequently values are higher"> - <Expression success="true" filename="projects/SelfTest/BDDTests.cpp" > + <Expression success="true" type="REQUIRE" filename="projects/SelfTest/BDDTests.cpp" > <Original> after > before </Original> @@ -7912,7 +7912,7 @@ there" <OverallResult success="true"/> </TestCase> <TestCase name="section tracking"> - <Expression success="true" filename="projects/SelfTest/SectionTrackerTests.cpp" > + <Expression success="true" type="CHECK_FALSE" filename="projects/SelfTest/SectionTrackerTests.cpp" > <Original> !testCaseTracker.isCompleted() </Original> @@ -7921,7 +7921,7 @@ there" </Expanded> </Expression> <Section name="test case with no sections"> - <Expression success="true" filename="projects/SelfTest/SectionTrackerTests.cpp" > + <Expression success="true" type="CHECK_FALSE" filename="projects/SelfTest/SectionTrackerTests.cpp" > <Original> !testCaseTracker.isCompleted() </Original> @@ -7929,7 +7929,7 @@ there" !false </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/SectionTrackerTests.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/SectionTrackerTests.cpp" > <Original> testCaseTracker.isCompleted() </Original> @@ -7939,7 +7939,7 @@ there" </Expression> <OverallResults successes="2" failures="0" expectedFailures="0"/> </Section> - <Expression success="true" filename="projects/SelfTest/SectionTrackerTests.cpp" > + <Expression success="true" type="CHECK_FALSE" filename="projects/SelfTest/SectionTrackerTests.cpp" > <Original> !testCaseTracker.isCompleted() </Original> @@ -7948,7 +7948,7 @@ there" </Expanded> </Expression> <Section name="test case with one section"> - <Expression success="true" filename="projects/SelfTest/SectionTrackerTests.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/SectionTrackerTests.cpp" > <Original> testCaseTracker.enterSection( section1Name ) </Original> @@ -7956,7 +7956,7 @@ there" true </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/SectionTrackerTests.cpp" > + <Expression success="true" type="CHECK_FALSE" filename="projects/SelfTest/SectionTrackerTests.cpp" > <Original> !testCaseTracker.isCompleted() </Original> @@ -7964,7 +7964,7 @@ there" !false </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/SectionTrackerTests.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/SectionTrackerTests.cpp" > <Original> testCaseTracker.isCompleted() </Original> @@ -7972,7 +7972,7 @@ there" true </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/SectionTrackerTests.cpp" > + <Expression success="true" type="CHECK_FALSE" filename="projects/SelfTest/SectionTrackerTests.cpp" > <Original> !testCaseTracker.enterSection( section1Name ) </Original> @@ -7982,7 +7982,7 @@ there" </Expression> <OverallResults successes="4" failures="0" expectedFailures="0"/> </Section> - <Expression success="true" filename="projects/SelfTest/SectionTrackerTests.cpp" > + <Expression success="true" type="CHECK_FALSE" filename="projects/SelfTest/SectionTrackerTests.cpp" > <Original> !testCaseTracker.isCompleted() </Original> @@ -7991,7 +7991,7 @@ there" </Expanded> </Expression> <Section name="test case with two consecutive sections"> - <Expression success="true" filename="projects/SelfTest/SectionTrackerTests.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/SectionTrackerTests.cpp" > <Original> testCaseTracker.enterSection( section1Name ) </Original> @@ -7999,7 +7999,7 @@ there" true </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/SectionTrackerTests.cpp" > + <Expression success="true" type="CHECK_FALSE" filename="projects/SelfTest/SectionTrackerTests.cpp" > <Original> !testCaseTracker.enterSection( section2Name ) </Original> @@ -8007,7 +8007,7 @@ there" !false </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/SectionTrackerTests.cpp" > + <Expression success="true" type="CHECK_FALSE" filename="projects/SelfTest/SectionTrackerTests.cpp" > <Original> !testCaseTracker.isCompleted() </Original> @@ -8015,7 +8015,7 @@ there" !false </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/SectionTrackerTests.cpp" > + <Expression success="true" type="CHECK_FALSE" filename="projects/SelfTest/SectionTrackerTests.cpp" > <Original> !testCaseTracker.enterSection( section1Name ) </Original> @@ -8023,7 +8023,7 @@ there" !false </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/SectionTrackerTests.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/SectionTrackerTests.cpp" > <Original> testCaseTracker.enterSection( section2Name ) </Original> @@ -8031,7 +8031,7 @@ there" true </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/SectionTrackerTests.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/SectionTrackerTests.cpp" > <Original> testCaseTracker.isCompleted() </Original> @@ -8041,7 +8041,7 @@ there" </Expression> <OverallResults successes="6" failures="0" expectedFailures="0"/> </Section> - <Expression success="true" filename="projects/SelfTest/SectionTrackerTests.cpp" > + <Expression success="true" type="CHECK_FALSE" filename="projects/SelfTest/SectionTrackerTests.cpp" > <Original> !testCaseTracker.isCompleted() </Original> @@ -8050,7 +8050,7 @@ there" </Expanded> </Expression> <Section name="test case with one section within another"> - <Expression success="true" filename="projects/SelfTest/SectionTrackerTests.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/SectionTrackerTests.cpp" > <Original> testCaseTracker.enterSection( section1Name ) </Original> @@ -8058,7 +8058,7 @@ there" true </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/SectionTrackerTests.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/SectionTrackerTests.cpp" > <Original> testCaseTracker.enterSection( section2Name ) </Original> @@ -8066,7 +8066,7 @@ there" true </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/SectionTrackerTests.cpp" > + <Expression success="true" type="CHECK_FALSE" filename="projects/SelfTest/SectionTrackerTests.cpp" > <Original> !testCaseTracker.isCompleted() </Original> @@ -8074,7 +8074,7 @@ there" !false </Expanded> </Expression> - <Expression success="true" filename="projects/SelfTest/SectionTrackerTests.cpp" > + <Expression success="true" type="CHECK" filename="projects/SelfTest/SectionTrackerTests.cpp" > <Original> testCaseTracker.isCompleted() </Original>