From e34754e4331ef5b161555495d13549a2a13f81b2 Mon Sep 17 00:00:00 2001 From: Phil Nash Date: Mon, 13 Nov 2017 15:38:52 +0000 Subject: [PATCH] Split SelfTest test files into Usage and Introspective varieties Usage: just exercises Catch. The tests are over arbitrary date/ types Introspective: Tests parts of Catch itself. --- CMakeLists.txt | 51 +- .../Baselines/console.sw.approved.txt | 36 +- .../SelfTest/Baselines/xml.sw.approved.txt | 2724 ++++++++--------- .../{ => IntrospectiveTests}/CmdLineTests.cpp | 0 .../PartTrackerTests.cpp | 0 .../StringRef.tests.cpp | 2 +- .../TagAliasTests.cpp | 0 .../{ => IntrospectiveTests}/TestMain.cpp | 6 +- .../SelfTest/IntrospectiveTests/XmlTests.cpp | 41 + .../SelfTest/{ => UsageTests}/ApproxTests.cpp | 0 .../SelfTest/{ => UsageTests}/BDDTests.cpp | 0 .../{ => UsageTests}/Benchmark.tests.cpp | 0 .../SelfTest/{ => UsageTests}/ClassTests.cpp | 0 .../{ => UsageTests}/CompilationTests.cpp | 0 .../{ => UsageTests}/ConditionTests.cpp | 0 .../{ => UsageTests}/DecompositionTests.cpp | 0 .../{ => UsageTests}/EnumToString.cpp | 0 .../{ => UsageTests}/ExceptionTests.cpp | 0 .../{ => UsageTests}/MatchersTests.cpp | 0 .../{ => UsageTests}/MessageTests.cpp | 0 .../SelfTest/{ => UsageTests}/MiscTests.cpp | 37 - .../{ => UsageTests}/ToStringChrono.cpp | 0 .../{ => UsageTests}/ToStringGeneralTests.cpp | 0 .../{ => UsageTests}/ToStringPair.cpp | 0 .../{ => UsageTests}/ToStringTuple.cpp | 0 .../{ => UsageTests}/ToStringVector.cpp | 0 .../{ => UsageTests}/ToStringWhich.cpp | 0 .../SelfTest/{ => UsageTests}/TrickyTests.cpp | 0 .../{ => UsageTests}/VariadicMacrosTests.cpp | 0 29 files changed, 1451 insertions(+), 1446 deletions(-) rename projects/SelfTest/{ => IntrospectiveTests}/CmdLineTests.cpp (100%) rename projects/SelfTest/{ => IntrospectiveTests}/PartTrackerTests.cpp (100%) rename projects/SelfTest/{ => IntrospectiveTests}/StringRef.tests.cpp (99%) rename projects/SelfTest/{ => IntrospectiveTests}/TagAliasTests.cpp (100%) rename projects/SelfTest/{ => IntrospectiveTests}/TestMain.cpp (97%) create mode 100644 projects/SelfTest/IntrospectiveTests/XmlTests.cpp rename projects/SelfTest/{ => UsageTests}/ApproxTests.cpp (100%) rename projects/SelfTest/{ => UsageTests}/BDDTests.cpp (100%) rename projects/SelfTest/{ => UsageTests}/Benchmark.tests.cpp (100%) rename projects/SelfTest/{ => UsageTests}/ClassTests.cpp (100%) rename projects/SelfTest/{ => UsageTests}/CompilationTests.cpp (100%) rename projects/SelfTest/{ => UsageTests}/ConditionTests.cpp (100%) rename projects/SelfTest/{ => UsageTests}/DecompositionTests.cpp (100%) rename projects/SelfTest/{ => UsageTests}/EnumToString.cpp (100%) rename projects/SelfTest/{ => UsageTests}/ExceptionTests.cpp (100%) rename projects/SelfTest/{ => UsageTests}/MatchersTests.cpp (100%) rename projects/SelfTest/{ => UsageTests}/MessageTests.cpp (100%) rename projects/SelfTest/{ => UsageTests}/MiscTests.cpp (86%) rename projects/SelfTest/{ => UsageTests}/ToStringChrono.cpp (100%) rename projects/SelfTest/{ => UsageTests}/ToStringGeneralTests.cpp (100%) rename projects/SelfTest/{ => UsageTests}/ToStringPair.cpp (100%) rename projects/SelfTest/{ => UsageTests}/ToStringTuple.cpp (100%) rename projects/SelfTest/{ => UsageTests}/ToStringVector.cpp (100%) rename projects/SelfTest/{ => UsageTests}/ToStringWhich.cpp (100%) rename projects/SelfTest/{ => UsageTests}/TrickyTests.cpp (100%) rename projects/SelfTest/{ => UsageTests}/VariadicMacrosTests.cpp (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index a13e100b..a27b0aab 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -47,31 +47,32 @@ endfunction() # define the sources of the self test # Please keep these ordered alphabetically set(TEST_SOURCES - ${SELF_TEST_DIR}/ApproxTests.cpp - ${SELF_TEST_DIR}/BDDTests.cpp - ${SELF_TEST_DIR}/Benchmark.tests.cpp - ${SELF_TEST_DIR}/ClassTests.cpp - ${SELF_TEST_DIR}/CmdLineTests.cpp - ${SELF_TEST_DIR}/CompilationTests.cpp - ${SELF_TEST_DIR}/ConditionTests.cpp - ${SELF_TEST_DIR}/DecompositionTests.cpp - ${SELF_TEST_DIR}/EnumToString.cpp - ${SELF_TEST_DIR}/ExceptionTests.cpp - ${SELF_TEST_DIR}/MessageTests.cpp - ${SELF_TEST_DIR}/MiscTests.cpp - ${SELF_TEST_DIR}/PartTrackerTests.cpp - ${SELF_TEST_DIR}/TagAliasTests.cpp - ${SELF_TEST_DIR}/TestMain.cpp - ${SELF_TEST_DIR}/ToStringChrono.cpp - ${SELF_TEST_DIR}/ToStringGeneralTests.cpp - ${SELF_TEST_DIR}/ToStringPair.cpp - ${SELF_TEST_DIR}/ToStringTuple.cpp - ${SELF_TEST_DIR}/ToStringVector.cpp - ${SELF_TEST_DIR}/ToStringWhich.cpp - ${SELF_TEST_DIR}/TrickyTests.cpp - ${SELF_TEST_DIR}/VariadicMacrosTests.cpp - ${SELF_TEST_DIR}/MatchersTests.cpp - ${SELF_TEST_DIR}/StringRef.tests.cpp + ${SELF_TEST_DIR}/UsageTests/ApproxTests.cpp + ${SELF_TEST_DIR}/UsageTests/BDDTests.cpp + ${SELF_TEST_DIR}/UsageTests/Benchmark.tests.cpp + ${SELF_TEST_DIR}/UsageTests/ClassTests.cpp + ${SELF_TEST_DIR}/IntrospectiveTests/CmdLineTests.cpp + ${SELF_TEST_DIR}/UsageTests/CompilationTests.cpp + ${SELF_TEST_DIR}/UsageTests/ConditionTests.cpp + ${SELF_TEST_DIR}/UsageTests/DecompositionTests.cpp + ${SELF_TEST_DIR}/UsageTests/EnumToString.cpp + ${SELF_TEST_DIR}/UsageTests/ExceptionTests.cpp + ${SELF_TEST_DIR}/UsageTests/MessageTests.cpp + ${SELF_TEST_DIR}/UsageTests/MiscTests.cpp + ${SELF_TEST_DIR}/IntrospectiveTests/PartTrackerTests.cpp + ${SELF_TEST_DIR}/IntrospectiveTests/TagAliasTests.cpp + ${SELF_TEST_DIR}/IntrospectiveTests/TestMain.cpp + ${SELF_TEST_DIR}/UsageTests/ToStringChrono.cpp + ${SELF_TEST_DIR}/UsageTests/ToStringGeneralTests.cpp + ${SELF_TEST_DIR}/UsageTests/ToStringPair.cpp + ${SELF_TEST_DIR}/UsageTests/ToStringTuple.cpp + ${SELF_TEST_DIR}/UsageTests/ToStringVector.cpp + ${SELF_TEST_DIR}/UsageTests/ToStringWhich.cpp + ${SELF_TEST_DIR}/UsageTests/TrickyTests.cpp + ${SELF_TEST_DIR}/UsageTests/VariadicMacrosTests.cpp + ${SELF_TEST_DIR}/UsageTests/MatchersTests.cpp + ${SELF_TEST_DIR}/IntrospectiveTests/StringRef.tests.cpp + ${SELF_TEST_DIR}/IntrospectiveTests/XmlTests.cpp ) CheckFileList(TEST_SOURCES ${SELF_TEST_DIR}) diff --git a/projects/SelfTest/Baselines/console.sw.approved.txt b/projects/SelfTest/Baselines/console.sw.approved.txt index a20ff716..845ac8bd 100644 --- a/projects/SelfTest/Baselines/console.sw.approved.txt +++ b/projects/SelfTest/Baselines/console.sw.approved.txt @@ -6670,10 +6670,10 @@ PASSED: XmlEncode normal string ------------------------------------------------------------------------------- -MiscTests.cpp: +XmlTests.cpp: ............................................................................... -MiscTests.cpp:: +XmlTests.cpp:: PASSED: REQUIRE( encode( "normal string" ) == "normal string" ) with expansion: @@ -6683,10 +6683,10 @@ with expansion: XmlEncode empty string ------------------------------------------------------------------------------- -MiscTests.cpp: +XmlTests.cpp: ............................................................................... -MiscTests.cpp:: +XmlTests.cpp:: PASSED: REQUIRE( encode( "" ) == "" ) with expansion: @@ -6696,10 +6696,10 @@ with expansion: XmlEncode string with ampersand ------------------------------------------------------------------------------- -MiscTests.cpp: +XmlTests.cpp: ............................................................................... -MiscTests.cpp:: +XmlTests.cpp:: PASSED: REQUIRE( encode( "smith & jones" ) == "smith & jones" ) with expansion: @@ -6709,10 +6709,10 @@ with expansion: XmlEncode string with less-than ------------------------------------------------------------------------------- -MiscTests.cpp: +XmlTests.cpp: ............................................................................... -MiscTests.cpp:: +XmlTests.cpp:: PASSED: REQUIRE( encode( "smith < jones" ) == "smith < jones" ) with expansion: @@ -6722,16 +6722,16 @@ with expansion: XmlEncode string with greater-than ------------------------------------------------------------------------------- -MiscTests.cpp: +XmlTests.cpp: ............................................................................... -MiscTests.cpp:: +XmlTests.cpp:: PASSED: REQUIRE( encode( "smith > jones" ) == "smith > jones" ) with expansion: "smith > jones" == "smith > jones" -MiscTests.cpp:: +XmlTests.cpp:: PASSED: REQUIRE( encode( "smith ]]> jones" ) == "smith ]]> jones" ) with expansion: @@ -6743,10 +6743,10 @@ with expansion: XmlEncode string with quotes ------------------------------------------------------------------------------- -MiscTests.cpp: +XmlTests.cpp: ............................................................................... -MiscTests.cpp:: +XmlTests.cpp:: PASSED: REQUIRE( encode( stringWithQuotes ) == stringWithQuotes ) with expansion: @@ -6754,7 +6754,7 @@ with expansion: == "don't "quote" me on that" -MiscTests.cpp:: +XmlTests.cpp:: PASSED: REQUIRE( encode( stringWithQuotes, Catch::XmlEncode::ForAttributes ) == "don't "quote" me on that" ) with expansion: @@ -6766,10 +6766,10 @@ with expansion: XmlEncode string with control char (1) ------------------------------------------------------------------------------- -MiscTests.cpp: +XmlTests.cpp: ............................................................................... -MiscTests.cpp:: +XmlTests.cpp:: PASSED: REQUIRE( encode( "[\x01]" ) == "[\\x01]" ) with expansion: @@ -6779,10 +6779,10 @@ with expansion: XmlEncode string with control char (x7F) ------------------------------------------------------------------------------- -MiscTests.cpp: +XmlTests.cpp: ............................................................................... -MiscTests.cpp:: +XmlTests.cpp:: PASSED: REQUIRE( encode( "[\x7F]" ) == "[\\x7F]" ) with expansion: diff --git a/projects/SelfTest/Baselines/xml.sw.approved.txt b/projects/SelfTest/Baselines/xml.sw.approved.txt index d14dd1d2..7fb1c6b4 100644 --- a/projects/SelfTest/Baselines/xml.sw.approved.txt +++ b/projects/SelfTest/Baselines/xml.sw.approved.txt @@ -1,11 +1,11 @@ - + - - + + fptr == 0 @@ -13,7 +13,7 @@ 0 == 0 - + fptr == 0l @@ -23,8 +23,8 @@ - - + + y.v == 0 @@ -32,7 +32,7 @@ 0 == 0 - + 0 == y.v @@ -42,38 +42,38 @@ - -
+ +
answer := 42 - + expected exception
-
+
answer := 42 - + thisThrows() thisThrows() - + expected exception
-
+
answer := 42 - + thisThrows() @@ -85,8 +85,8 @@
- - + + 42 == f @@ -96,8 +96,8 @@ - - + + a == t @@ -105,7 +105,7 @@ 3 == 3 - + a == t @@ -113,7 +113,7 @@ 3 == 3 - + throws_int(true) @@ -121,7 +121,7 @@ throws_int(true) - + throws_int(true), int @@ -129,7 +129,7 @@ throws_int(true), int - + throws_int(false) @@ -137,7 +137,7 @@ throws_int(false) - + "aaa", Catch::EndsWith("aaa") @@ -145,7 +145,7 @@ "aaa" ends with: "aaa" - + templated_tests<int>(3) @@ -155,8 +155,8 @@ - - + + f() == 0 @@ -164,7 +164,7 @@ 1 == 0 - + errno == 1 @@ -174,11 +174,11 @@ - + dummy := 0 - + x == 4 @@ -188,26 +188,26 @@ - -
+ +
-
+
-
+
-
+
-
+
- - + + false != false @@ -215,7 +215,7 @@ false != false - + true != true @@ -223,7 +223,7 @@ true != true - + !true @@ -231,7 +231,7 @@ false - + !(true) @@ -239,7 +239,7 @@ !true - + !trueValue @@ -247,7 +247,7 @@ false - + !(trueValue) @@ -255,7 +255,7 @@ !true - + !(1 == 1) @@ -263,7 +263,7 @@ false - + !(1 == 1) @@ -273,8 +273,8 @@ - - + + false == false @@ -282,7 +282,7 @@ false == false - + true == true @@ -290,7 +290,7 @@ true == true - + !false @@ -298,7 +298,7 @@ true - + !(false) @@ -306,7 +306,7 @@ !false - + !falseValue @@ -314,7 +314,7 @@ true - + !(falseValue) @@ -322,7 +322,7 @@ !false - + !(1 == 2) @@ -330,7 +330,7 @@ true - + !(1 == 2) @@ -340,9 +340,9 @@ - -
- + +
+ is_true<true>::value == true @@ -350,7 +350,7 @@ true == true - + true == is_true<true>::value @@ -360,8 +360,8 @@
-
- +
+ is_true<false>::value == false @@ -369,7 +369,7 @@ false == false - + false == is_true<false>::value @@ -379,8 +379,8 @@
-
- +
+ !is_true<false>::value @@ -390,8 +390,8 @@
-
- +
+ !!is_true<true>::value @@ -401,8 +401,8 @@
-
- +
+ is_true<true>::value @@ -410,7 +410,7 @@ true - + !(is_true<false>::value) @@ -422,8 +422,8 @@
- - + + s == "world" @@ -433,8 +433,8 @@ - - + + s == "hello" @@ -444,8 +444,8 @@ - - + + m_a == 2 @@ -455,8 +455,8 @@ - - + + m_a == 1 @@ -466,20 +466,20 @@ - -
-
+ +
+
- + to infinity and beyond - - + + &o1 == &o2 @@ -487,7 +487,7 @@ 0x == 0x - + o1 == o2 @@ -497,8 +497,8 @@ - - + + 104.0 != Approx(100.0) @@ -506,7 +506,7 @@ 104.0 != Approx( 100.0 ) - + 104.0 == Approx(100.0).margin(5) @@ -514,7 +514,7 @@ 104.0 == Approx( 100.0 ) - + 104.0 == Approx(100.0).margin(4) @@ -522,7 +522,7 @@ 104.0 == Approx( 100.0 ) - + 104.0 != Approx(100.0).margin(3) @@ -530,7 +530,7 @@ 104.0 != Approx( 100.0 ) - + 100.3 != Approx(100.0) @@ -538,7 +538,7 @@ 100.3 != Approx( 100.0 ) - + 100.3 == Approx(100.0).margin(0.5) @@ -548,11 +548,11 @@ - + - - + + i++ == 7 @@ -560,7 +560,7 @@ 7 == 7 - + i++ == 8 @@ -570,8 +570,8 @@ - - + + 1 == 1 @@ -579,24 +579,24 @@ 1 == 1 - + {Unknown expression after the reported line} {Unknown expression after the reported line} - + unexpected exception - + - - + + Approx(0).margin(0) @@ -604,7 +604,7 @@ Approx(0).margin(0) - + Approx(0).margin(1234656) @@ -612,7 +612,7 @@ Approx(0).margin(1234656) - + Approx(0).margin(-2), std::domain_error @@ -620,7 +620,7 @@ Approx(0).margin(-2), std::domain_error - + Approx(0).epsilon(0) @@ -628,7 +628,7 @@ Approx(0).epsilon(0) - + Approx(0).epsilon(1) @@ -636,7 +636,7 @@ Approx(0).epsilon(1) - + Approx(0).epsilon(-0.001), std::domain_error @@ -644,7 +644,7 @@ Approx(0).epsilon(-0.001), std::domain_error - + Approx(0).epsilon(1.0001), std::domain_error @@ -654,8 +654,8 @@ - - + + 0.25f == Approx(0.0f).margin(0.25f) @@ -663,7 +663,7 @@ 0.25f == Approx( 0.0 ) - + 0.0f == Approx(0.25f).margin(0.25f) @@ -671,7 +671,7 @@ 0.0f == Approx( 0.25 ) - + 0.5f == Approx(0.25f).margin(0.25f) @@ -679,7 +679,7 @@ 0.5f == Approx( 0.25 ) - + 245.0f == Approx(245.25f).margin(0.25f) @@ -687,7 +687,7 @@ 245.0f == Approx( 245.25 ) - + 245.5f == Approx(245.25f).margin(0.25f) @@ -697,8 +697,8 @@ - - + + divide( 22, 7 ) == Approx( 3.141 ).epsilon( 0.001 ) @@ -706,7 +706,7 @@ 3.1428571429 == Approx( 3.141 ) - + divide( 22, 7 ) != Approx( 3.141 ).epsilon( 0.0001 ) @@ -716,8 +716,8 @@ - - + + d != Approx( 1.231 ) @@ -725,7 +725,7 @@ 1.23 != Approx( 1.231 ) - + d == Approx( 1.231 ).epsilon( 0.1 ) @@ -735,8 +735,8 @@ - - + + 1.23f == Approx( 1.23f ) @@ -744,7 +744,7 @@ 1.23f == Approx( 1.2300000191 ) - + 0.0f == Approx( 0.0f ) @@ -754,8 +754,8 @@ - - + + 1 == Approx( 1 ) @@ -763,7 +763,7 @@ 1 == Approx( 1.0 ) - + 0 == Approx( 0 ) @@ -773,8 +773,8 @@ - - + + 1.0f == Approx( 1 ) @@ -782,7 +782,7 @@ 1.0f == Approx( 1.0 ) - + 0 == Approx( dZero) @@ -790,7 +790,7 @@ 0 == Approx( 0.0 ) - + 0 == Approx( dSmall ).margin( 0.001 ) @@ -798,7 +798,7 @@ 0 == Approx( 0.00001 ) - + 1.234f == Approx( dMedium ) @@ -806,7 +806,7 @@ 1.234f == Approx( 1.234 ) - + dMedium == Approx( 1.234f ) @@ -816,8 +816,8 @@ - - + + Catch::alwaysTrue() @@ -825,8 +825,8 @@ true -
- +
+ Catch::alwaysTrue() @@ -834,8 +834,8 @@ true -
- +
+ Catch::alwaysTrue() @@ -847,7 +847,7 @@
- + Catch::alwaysTrue() @@ -855,8 +855,8 @@ true -
- +
+ Catch::alwaysTrue() @@ -864,8 +864,8 @@ true -
- +
+ Catch::alwaysTrue() @@ -879,8 +879,8 @@
- - + + INFINITY == Approx(INFINITY) @@ -888,7 +888,7 @@ inff == Approx( inf ) - + NAN != Approx(NAN) @@ -896,7 +896,7 @@ nanf != Approx( nan ) - + !(NAN == Approx(NAN)) @@ -906,8 +906,8 @@ - - + + y.v == 0 @@ -915,7 +915,7 @@ 0 == 0 - + 0 == y.v @@ -925,12 +925,12 @@ - -
+ +
i := 2 - + true @@ -940,11 +940,11 @@
-
+
3 - + true @@ -956,9 +956,9 @@
- -
- + +
+ tab == '\t' @@ -966,7 +966,7 @@ '\t' == '\t' - + newline == '\n' @@ -974,7 +974,7 @@ '\n' == '\n' - + carr_return == '\r' @@ -982,7 +982,7 @@ '\r' == '\r' - + form_feed == '\f' @@ -992,8 +992,8 @@
-
- +
+ space == ' ' @@ -1001,7 +1001,7 @@ ' ' == ' ' - + c == chars[i] @@ -1009,7 +1009,7 @@ 'a' == 'a' - + c == chars[i] @@ -1017,7 +1017,7 @@ 'z' == 'z' - + c == chars[i] @@ -1025,7 +1025,7 @@ 'A' == 'A' - + c == chars[i] @@ -1035,8 +1035,8 @@
-
- +
+ null_terminator == '\0' @@ -1044,7 +1044,7 @@ 0 == 0 - + c == i @@ -1052,7 +1052,7 @@ 2 == 2 - + c == i @@ -1060,7 +1060,7 @@ 3 == 3 - + c == i @@ -1068,7 +1068,7 @@ 4 == 4 - + c == i @@ -1080,8 +1080,8 @@
- - + + std::vector<constructor_throws>{constructor_throws{}, constructor_throws{}} @@ -1089,7 +1089,7 @@ std::vector<constructor_throws>{constructor_throws{}, constructor_throws{}} - + std::vector<constructor_throws>{constructor_throws{}, constructor_throws{}} @@ -1097,7 +1097,7 @@ std::vector<constructor_throws>{constructor_throws{}, constructor_throws{}} - + std::vector<int>{1, 2, 3} == std::vector<int>{1, 2, 3} @@ -1105,7 +1105,7 @@ std::vector<int>{1, 2, 3} == std::vector<int>{1, 2, 3} - + std::vector<int>{1, 2, 3} == std::vector<int>{1, 2, 3} @@ -1113,7 +1113,7 @@ std::vector<int>{1, 2, 3} == std::vector<int>{1, 2, 3} - + std::vector<int>{1, 2} == std::vector<int>{1, 2} @@ -1121,7 +1121,7 @@ { 1, 2 } == { 1, 2 } - + std::vector<int>{1, 2} == std::vector<int>{1, 2} @@ -1129,7 +1129,7 @@ { 1, 2 } == { 1, 2 } - + !(std::vector<int>{1, 2} == std::vector<int>{1, 2, 3}) @@ -1137,7 +1137,7 @@ !({ 1, 2 } == { 1, 2, 3 }) - + !(std::vector<int>{1, 2} == std::vector<int>{1, 2, 3}) @@ -1145,7 +1145,7 @@ !({ 1, 2 } == { 1, 2, 3 }) - + std::vector<int>{1, 2} == std::vector<int>{1, 2} @@ -1153,7 +1153,7 @@ { 1, 2 } == { 1, 2 } - + std::vector<int>{1, 2} == std::vector<int>{1, 2} @@ -1161,7 +1161,7 @@ { 1, 2 } == { 1, 2 } - + true @@ -1169,7 +1169,7 @@ true - + std::vector<int>{1, 2} == std::vector<int>{1, 2} @@ -1179,8 +1179,8 @@ - - + + a @@ -1188,7 +1188,7 @@ 0x - + a == &foo @@ -1198,8 +1198,8 @@ - - + + td == Approx(10.0) @@ -1207,7 +1207,7 @@ StrongDoubleTypedef(10) == Approx( 10.0 ) - + Approx(10.0) == td @@ -1215,7 +1215,7 @@ Approx( 10.0 ) == StrongDoubleTypedef(10) - + td != Approx(11.0) @@ -1223,7 +1223,7 @@ StrongDoubleTypedef(10) != Approx( 11.0 ) - + Approx(11.0) != td @@ -1231,7 +1231,7 @@ Approx( 11.0 ) != StrongDoubleTypedef(10) - + td <= Approx(10.0) @@ -1239,7 +1239,7 @@ StrongDoubleTypedef(10) <= Approx( 10.0 ) - + td <= Approx(11.0) @@ -1247,7 +1247,7 @@ StrongDoubleTypedef(10) <= Approx( 11.0 ) - + Approx(10.0) <= td @@ -1255,7 +1255,7 @@ Approx( 10.0 ) <= StrongDoubleTypedef(10) - + Approx(9.0) <= td @@ -1263,7 +1263,7 @@ Approx( 9.0 ) <= StrongDoubleTypedef(10) - + td >= Approx(9.0) @@ -1271,7 +1271,7 @@ StrongDoubleTypedef(10) >= Approx( 9.0 ) - + td >= Approx(10.0) @@ -1279,7 +1279,7 @@ StrongDoubleTypedef(10) >= Approx( 10.0 ) - + Approx(10.0) >= td @@ -1287,7 +1287,7 @@ Approx( 10.0 ) >= StrongDoubleTypedef(10) - + Approx(11.0) >= td @@ -1297,8 +1297,8 @@ - - + + 54 == 6*9 @@ -1308,8 +1308,8 @@ - - + + ( -1 > 2u ) @@ -1317,7 +1317,7 @@ true - + -1 > 2u @@ -1325,7 +1325,7 @@ -1 > 2 - + ( 2u < -1 ) @@ -1333,7 +1333,7 @@ true - + 2u < -1 @@ -1341,7 +1341,7 @@ 2 < -1 - + ( minInt > 2u ) @@ -1349,7 +1349,7 @@ true - + minInt > 2u @@ -1359,8 +1359,8 @@ - - + + i == 1 @@ -1368,7 +1368,7 @@ 1 == 1 - + ui == 2 @@ -1376,7 +1376,7 @@ 2 == 2 - + l == 3 @@ -1384,7 +1384,7 @@ 3 == 3 - + ul == 4 @@ -1392,7 +1392,7 @@ 4 == 4 - + c == 5 @@ -1400,7 +1400,7 @@ 5 == 5 - + uc == 6 @@ -1408,7 +1408,7 @@ 6 == 6 - + 1 == i @@ -1416,7 +1416,7 @@ 1 == 1 - + 2 == ui @@ -1424,7 +1424,7 @@ 2 == 2 - + 3 == l @@ -1432,7 +1432,7 @@ 3 == 3 - + 4 == ul @@ -1440,7 +1440,7 @@ 4 == 4 - + 5 == c @@ -1448,7 +1448,7 @@ 5 == 5 - + 6 == uc @@ -1456,7 +1456,7 @@ 6 == 6 - + (std::numeric_limits<uint32_t>::max)() > ul @@ -1466,8 +1466,8 @@ - - + + testStringForMatching(), Contains( "not there", Catch::CaseSensitive::No ) @@ -1475,7 +1475,7 @@ "this string contains 'abc' as a substring" contains: "not there" (case insensitive) - + testStringForMatching(), Contains( "STRING" ) @@ -1485,42 +1485,42 @@ - - + + throwCustom() throwCustom() - + custom exception - not std - - + + throwCustom(), std::exception throwCustom(), std::exception - + custom exception - not std - - + + custom std exception - - + + 101.000001 != Approx(100).epsilon(0.01) @@ -1528,7 +1528,7 @@ 101.000001 != Approx( 100.0 ) - + std::pow(10, -5) != Approx(std::pow(10, -7)) @@ -1538,8 +1538,8 @@ - - + + testStringForMatching(), EndsWith( "Substring" ) @@ -1547,7 +1547,7 @@ "this string contains 'abc' as a substring" ends with: "Substring" - + testStringForMatching(), EndsWith( "this", Catch::CaseSensitive::No ) @@ -1557,8 +1557,8 @@ - - + + 101.01 != Approx(100).epsilon(0.01) @@ -1568,8 +1568,8 @@ - - + + data.int_seven == 6 @@ -1577,7 +1577,7 @@ 7 == 6 - + data.int_seven == 8 @@ -1585,7 +1585,7 @@ 7 == 8 - + data.int_seven == 0 @@ -1593,7 +1593,7 @@ 7 == 0 - + data.float_nine_point_one == Approx( 9.11f ) @@ -1601,7 +1601,7 @@ 9.1f == Approx( 9.1099996567 ) - + data.float_nine_point_one == Approx( 9.0f ) @@ -1609,7 +1609,7 @@ 9.1f == Approx( 9.0 ) - + data.float_nine_point_one == Approx( 1 ) @@ -1617,7 +1617,7 @@ 9.1f == Approx( 1.0 ) - + data.float_nine_point_one == Approx( 0 ) @@ -1625,7 +1625,7 @@ 9.1f == Approx( 0.0 ) - + data.double_pi == Approx( 3.1415 ) @@ -1633,7 +1633,7 @@ 3.1415926535 == Approx( 3.1415 ) - + data.str_hello == "goodbye" @@ -1641,7 +1641,7 @@ "hello" == "goodbye" - + data.str_hello == "hell" @@ -1649,7 +1649,7 @@ "hello" == "hell" - + data.str_hello == "hello1" @@ -1657,7 +1657,7 @@ "hello" == "hello1" - + data.str_hello.size() == 6 @@ -1665,7 +1665,7 @@ 5 == 6 - + x == Approx( 1.301 ) @@ -1675,8 +1675,8 @@ - - + + data.int_seven == 7 @@ -1684,7 +1684,7 @@ 7 == 7 - + data.float_nine_point_one == Approx( 9.1f ) @@ -1692,7 +1692,7 @@ 9.1f == Approx( 9.1000003815 ) - + data.double_pi == Approx( 3.1415926535 ) @@ -1700,7 +1700,7 @@ 3.1415926535 == Approx( 3.1415926535 ) - + data.str_hello == "hello" @@ -1708,7 +1708,7 @@ "hello" == "hello" - + "hello" == data.str_hello @@ -1716,7 +1716,7 @@ "hello" == "hello" - + data.str_hello.size() == 5 @@ -1724,7 +1724,7 @@ 5 == 5 - + x == Approx( 1.3 ) @@ -1734,8 +1734,8 @@ - - + + testStringForMatching(), Equals( "this string contains 'abc' as a substring" ) @@ -1743,7 +1743,7 @@ "this string contains 'abc' as a substring" equals: "this string contains 'abc' as a substring" - + testStringForMatching(), Equals( "this string contains 'ABC' as a substring", Catch::CaseSensitive::No ) @@ -1753,8 +1753,8 @@ - - + + testStringForMatching(), Equals( "this string contains 'ABC' as a substring" ) @@ -1762,7 +1762,7 @@ "this string contains 'abc' as a substring" equals: "this string contains 'ABC' as a substring" - + testStringForMatching(), Equals( "something else", Catch::CaseSensitive::No ) @@ -1772,9 +1772,9 @@ - -
- + +
+ doesNotThrow(), SpecialException, ExceptionMatcher{ 1 } @@ -1782,7 +1782,7 @@ doesNotThrow(), SpecialException, ExceptionMatcher{ 1 } - + doesNotThrow(), SpecialException, ExceptionMatcher{ 1 } @@ -1792,33 +1792,33 @@
-
- +
+ throwsAsInt(1), SpecialException, ExceptionMatcher{ 1 } throwsAsInt(1), SpecialException, ExceptionMatcher{ 1 } - + Unknown exception - + throwsAsInt(1), SpecialException, ExceptionMatcher{ 1 } throwsAsInt(1), SpecialException, ExceptionMatcher{ 1 } - + Unknown exception
-
- +
+ throws(3), SpecialException, ExceptionMatcher{ 1 } @@ -1826,7 +1826,7 @@ {?} special exception has value of 1 - + throws(4), SpecialException, ExceptionMatcher{ 1 } @@ -1838,8 +1838,8 @@
- - + + throws(1), SpecialException, ExceptionMatcher{ 1 } @@ -1847,7 +1847,7 @@ {?} special exception has value of 1 - + throws(2), SpecialException, ExceptionMatcher{ 2 } @@ -1857,9 +1857,9 @@ - -
- + +
+ thisThrows(), "expected exception" @@ -1869,8 +1869,8 @@
-
- +
+ thisThrows(), Equals( "expecteD Exception", Catch::CaseSensitive::No ) @@ -1880,8 +1880,8 @@
-
- +
+ thisThrows(), StartsWith( "expected" ) @@ -1889,7 +1889,7 @@ "expected exception" starts with: "expected" - + thisThrows(), EndsWith( "exception" ) @@ -1897,7 +1897,7 @@ "expected exception" ends with: "exception" - + thisThrows(), Contains( "except" ) @@ -1905,7 +1905,7 @@ "expected exception" contains: "except" - + thisThrows(), Contains( "exCept", Catch::CaseSensitive::No ) @@ -1917,19 +1917,19 @@
- - + + thisThrows(), std::string thisThrows(), std::string - + expected exception - + thisDoesntThrow(), std::domain_error @@ -1937,31 +1937,31 @@ thisDoesntThrow(), std::domain_error - + thisThrows() thisThrows() - + expected exception - - + + This is a failure - - + + - - + + This is a failure @@ -1969,8 +1969,8 @@ - - + + Factorial(0) == 1 @@ -1978,7 +1978,7 @@ 1 == 1 - + Factorial(1) == 1 @@ -1986,7 +1986,7 @@ 1 == 1 - + Factorial(2) == 2 @@ -1994,7 +1994,7 @@ 2 == 2 - + Factorial(3) == 6 @@ -2002,7 +2002,7 @@ 6 == 6 - + Factorial(10) == 3628800 @@ -2012,9 +2012,9 @@ - -
- + +
+ 1., WithinAbs(1., 0) @@ -2022,7 +2022,7 @@ 1.0 is within 0.0 of 1.0 - + 0., WithinAbs(1., 1) @@ -2030,7 +2030,7 @@ 0.0 is within 1.0 of 1.0 - + 0., !WithinAbs(1., 0.99) @@ -2038,7 +2038,7 @@ 0.0 not is within 0.99 of 1.0 - + 0., !WithinAbs(1., 0.99) @@ -2046,7 +2046,7 @@ 0.0 not is within 0.99 of 1.0 - + NAN, !WithinAbs(NAN, 0) @@ -2056,8 +2056,8 @@
-
- +
+ 1., WithinULP(1., 0) @@ -2065,7 +2065,7 @@ 1.0 is within 0 ULPs of 1.0 - + std::nextafter(1., 2.), WithinULP(1., 1) @@ -2073,7 +2073,7 @@ 1.0 is within 1 ULPs of 1.0 - + std::nextafter(1., 0.), WithinULP(1., 1) @@ -2081,7 +2081,7 @@ 1.0 is within 1 ULPs of 1.0 - + std::nextafter(1., 2.), !WithinULP(1., 0) @@ -2089,7 +2089,7 @@ 1.0 not is within 0 ULPs of 1.0 - + 1., WithinULP(1., 0) @@ -2097,7 +2097,7 @@ 1.0 is within 0 ULPs of 1.0 - + -0., WithinULP(0., 0) @@ -2105,7 +2105,7 @@ -0.0 is within 0 ULPs of 0.0 - + NAN, !WithinULP(NAN, 123) @@ -2115,8 +2115,8 @@
-
- +
+ 1., WithinAbs(1., 0.5) || WithinULP(2., 1) @@ -2124,7 +2124,7 @@ 1.0 ( is within 0.5 of 1.0 or is within 1 ULPs of 2.0 ) - + 1., WithinAbs(2., 0.5) || WithinULP(1., 0) @@ -2132,7 +2132,7 @@ 1.0 ( is within 0.5 of 2.0 or is within 0 ULPs of 1.0 ) - + NAN, !(WithinAbs(NAN, 100) || WithinULP(NAN, 123)) @@ -2144,9 +2144,9 @@
- -
- + +
+ 1.f, WithinAbs(1.f, 0) @@ -2154,7 +2154,7 @@ 1.0f is within 0.0 of 1.0 - + 0.f, WithinAbs(1.f, 1) @@ -2162,7 +2162,7 @@ 0.0f is within 1.0 of 1.0 - + 0.f, !WithinAbs(1.f, 0.99f) @@ -2170,7 +2170,7 @@ 0.0f not is within 0.9900000095 of 1.0 - + 0.f, !WithinAbs(1.f, 0.99f) @@ -2178,7 +2178,7 @@ 0.0f not is within 0.9900000095 of 1.0 - + 0.f, WithinAbs(-0.f, 0) @@ -2186,7 +2186,7 @@ 0.0f is within 0.0 of -0.0 - + NAN, !WithinAbs(NAN, 0) @@ -2196,8 +2196,8 @@
-
- +
+ 1.f, WithinULP(1.f, 0) @@ -2205,7 +2205,7 @@ 1.0f is within 0 ULPs of 1.0f - + std::nextafter(1.f, 2.f), WithinULP(1.f, 1) @@ -2213,7 +2213,7 @@ 1.0f is within 1 ULPs of 1.0f - + std::nextafter(1.f, 0.f), WithinULP(1.f, 1) @@ -2221,7 +2221,7 @@ 1.0f is within 1 ULPs of 1.0f - + std::nextafter(1.f, 2.f), !WithinULP(1.f, 0) @@ -2229,7 +2229,7 @@ 1.0f not is within 0 ULPs of 1.0f - + 1.f, WithinULP(1.f, 0) @@ -2237,7 +2237,7 @@ 1.0f is within 0 ULPs of 1.0f - + -0.f, WithinULP(0.f, 0) @@ -2245,7 +2245,7 @@ -0.0f is within 0 ULPs of 0.0f - + NAN, !WithinULP(NAN, 123) @@ -2255,8 +2255,8 @@
-
- +
+ 1.f, WithinAbs(1.f, 0.5) || WithinULP(1.f, 1) @@ -2264,7 +2264,7 @@ 1.0f ( is within 0.5 of 1.0 or is within 1 ULPs of 1.0f ) - + 1.f, WithinAbs(2.f, 0.5) || WithinULP(1.f, 0) @@ -2272,7 +2272,7 @@ 1.0f ( is within 0.5 of 2.0 or is within 0 ULPs of 1.0f ) - + NAN, !(WithinAbs(NAN, 100) || WithinULP(NAN, 123)) @@ -2284,8 +2284,8 @@
- - + + d >= Approx( 1.22 ) @@ -2293,7 +2293,7 @@ 1.23 >= Approx( 1.22 ) - + d >= Approx( 1.23 ) @@ -2301,7 +2301,7 @@ 1.23 >= Approx( 1.23 ) - + !(d >= Approx( 1.24 )) @@ -2309,7 +2309,7 @@ !(1.23 >= Approx( 1.24 )) - + d >= Approx( 1.24 ).epsilon(0.1) @@ -2319,7 +2319,7 @@ - + this is a message @@ -2328,14 +2328,14 @@ - + this message should be logged so should this - + a == 1 @@ -2345,11 +2345,11 @@ - + this message may be logged later - + a == 2 @@ -2363,7 +2363,7 @@ this message should be logged - + a == 1 @@ -2380,7 +2380,7 @@ and this, but later - + a == 0 @@ -2400,7 +2400,7 @@ but not this - + a == 2 @@ -2410,14 +2410,14 @@ - + current counter 0 i := 0 - + i < 10 @@ -2431,7 +2431,7 @@ i := 1 - + i < 10 @@ -2445,7 +2445,7 @@ i := 2 - + i < 10 @@ -2459,7 +2459,7 @@ i := 3 - + i < 10 @@ -2473,7 +2473,7 @@ i := 4 - + i < 10 @@ -2487,7 +2487,7 @@ i := 5 - + i < 10 @@ -2501,7 +2501,7 @@ i := 6 - + i < 10 @@ -2515,7 +2515,7 @@ i := 7 - + i < 10 @@ -2529,7 +2529,7 @@ i := 8 - + i < 10 @@ -2543,7 +2543,7 @@ i := 9 - + i < 10 @@ -2557,7 +2557,7 @@ i := 10 - + i < 10 @@ -2567,8 +2567,8 @@ - - + + data.int_seven != 7 @@ -2576,7 +2576,7 @@ 7 != 7 - + data.float_nine_point_one != Approx( 9.1f ) @@ -2584,7 +2584,7 @@ 9.1f != Approx( 9.1000003815 ) - + data.double_pi != Approx( 3.1415926535 ) @@ -2592,7 +2592,7 @@ 3.1415926535 != Approx( 3.1415926535 ) - + data.str_hello != "hello" @@ -2600,7 +2600,7 @@ "hello" != "hello" - + data.str_hello.size() != 5 @@ -2610,8 +2610,8 @@ - - + + data.int_seven != 6 @@ -2619,7 +2619,7 @@ 7 != 6 - + data.int_seven != 8 @@ -2627,7 +2627,7 @@ 7 != 8 - + data.float_nine_point_one != Approx( 9.11f ) @@ -2635,7 +2635,7 @@ 9.1f != Approx( 9.1099996567 ) - + data.float_nine_point_one != Approx( 9.0f ) @@ -2643,7 +2643,7 @@ 9.1f != Approx( 9.0 ) - + data.float_nine_point_one != Approx( 1 ) @@ -2651,7 +2651,7 @@ 9.1f != Approx( 1.0 ) - + data.float_nine_point_one != Approx( 0 ) @@ -2659,7 +2659,7 @@ 9.1f != Approx( 0.0 ) - + data.double_pi != Approx( 3.1415 ) @@ -2667,7 +2667,7 @@ 3.1415926535 != Approx( 3.1415 ) - + data.str_hello != "goodbye" @@ -2675,7 +2675,7 @@ "hello" != "goodbye" - + data.str_hello != "hell" @@ -2683,7 +2683,7 @@ "hello" != "hell" - + data.str_hello != "hello1" @@ -2691,7 +2691,7 @@ "hello" != "hello1" - + data.str_hello.size() != 6 @@ -2701,8 +2701,8 @@ - - + + d <= Approx( 1.24 ) @@ -2710,7 +2710,7 @@ 1.23 <= Approx( 1.24 ) - + d <= Approx( 1.23 ) @@ -2718,7 +2718,7 @@ 1.23 <= Approx( 1.23 ) - + !(d <= Approx( 1.22 )) @@ -2726,7 +2726,7 @@ !(1.23 <= Approx( 1.22 )) - + d <= Approx( 1.22 ).epsilon(0.1) @@ -2736,11 +2736,11 @@ - + - - + + testStringForMatching(), Contains( "string" ) && Contains( "abc" ) && Contains( "substring" ) && Contains( "contains" ) @@ -2750,8 +2750,8 @@ - - + + testStringForMatching(), Contains( "string" ) || Contains( "different" ) || Contains( "random" ) @@ -2759,7 +2759,7 @@ "this string contains 'abc' as a substring" ( contains: "string" or contains: "different" or contains: "random" ) - + testStringForMatching2(), Contains( "string" ) || Contains( "different" ) || Contains( "random" ) @@ -2769,8 +2769,8 @@ - - + + testStringForMatching(), ( Contains( "string" ) || Contains( "different" ) ) && Contains( "substring" ) @@ -2780,8 +2780,8 @@ - - + + testStringForMatching(), ( Contains( "string" ) || Contains( "different" ) ) && Contains( "random" ) @@ -2791,8 +2791,8 @@ - - + + testStringForMatching(), !Contains( "different" ) @@ -2802,8 +2802,8 @@ - - + + testStringForMatching(), !Contains( "substring" ) @@ -2813,8 +2813,8 @@ - - + + thisThrows(), "expected exception" @@ -2822,7 +2822,7 @@ "expected exception" equals: "expected exception" - + thisThrows(), "should fail" @@ -2832,20 +2832,20 @@ - + This one ran - - + + custom exception - - + + True @@ -2853,7 +2853,7 @@ {?} - + !False @@ -2861,7 +2861,7 @@ true - + !(False) @@ -2871,8 +2871,8 @@ - - + + data.int_seven > 7 @@ -2880,7 +2880,7 @@ 7 > 7 - + data.int_seven < 7 @@ -2888,7 +2888,7 @@ 7 < 7 - + data.int_seven > 8 @@ -2896,7 +2896,7 @@ 7 > 8 - + data.int_seven < 6 @@ -2904,7 +2904,7 @@ 7 < 6 - + data.int_seven < 0 @@ -2912,7 +2912,7 @@ 7 < 0 - + data.int_seven < -1 @@ -2920,7 +2920,7 @@ 7 < -1 - + data.int_seven >= 8 @@ -2928,7 +2928,7 @@ 7 >= 8 - + data.int_seven <= 6 @@ -2936,7 +2936,7 @@ 7 <= 6 - + data.float_nine_point_one < 9 @@ -2944,7 +2944,7 @@ 9.1f < 9 - + data.float_nine_point_one > 10 @@ -2952,7 +2952,7 @@ 9.1f > 10 - + data.float_nine_point_one > 9.2 @@ -2960,7 +2960,7 @@ 9.1f > 9.2 - + data.str_hello > "hello" @@ -2968,7 +2968,7 @@ "hello" > "hello" - + data.str_hello < "hello" @@ -2976,7 +2976,7 @@ "hello" < "hello" - + data.str_hello > "hellp" @@ -2984,7 +2984,7 @@ "hello" > "hellp" - + data.str_hello > "z" @@ -2992,7 +2992,7 @@ "hello" > "z" - + data.str_hello < "hellm" @@ -3000,7 +3000,7 @@ "hello" < "hellm" - + data.str_hello < "a" @@ -3008,7 +3008,7 @@ "hello" < "a" - + data.str_hello >= "z" @@ -3016,7 +3016,7 @@ "hello" >= "z" - + data.str_hello <= "a" @@ -3026,8 +3026,8 @@ - - + + data.int_seven < 8 @@ -3035,7 +3035,7 @@ 7 < 8 - + data.int_seven > 6 @@ -3043,7 +3043,7 @@ 7 > 6 - + data.int_seven > 0 @@ -3051,7 +3051,7 @@ 7 > 0 - + data.int_seven > -1 @@ -3059,7 +3059,7 @@ 7 > -1 - + data.int_seven >= 7 @@ -3067,7 +3067,7 @@ 7 >= 7 - + data.int_seven >= 6 @@ -3075,7 +3075,7 @@ 7 >= 6 - + data.int_seven <= 7 @@ -3083,7 +3083,7 @@ 7 <= 7 - + data.int_seven <= 8 @@ -3091,7 +3091,7 @@ 7 <= 8 - + data.float_nine_point_one > 9 @@ -3099,7 +3099,7 @@ 9.1f > 9 - + data.float_nine_point_one < 10 @@ -3107,7 +3107,7 @@ 9.1f < 10 - + data.float_nine_point_one < 9.2 @@ -3115,7 +3115,7 @@ 9.1f < 9.2 - + data.str_hello <= "hello" @@ -3123,7 +3123,7 @@ "hello" <= "hello" - + data.str_hello >= "hello" @@ -3131,7 +3131,7 @@ "hello" >= "hello" - + data.str_hello < "hellp" @@ -3139,7 +3139,7 @@ "hello" < "hellp" - + data.str_hello < "zebra" @@ -3147,7 +3147,7 @@ "hello" < "zebra" - + data.str_hello > "hellm" @@ -3155,7 +3155,7 @@ "hello" > "hellm" - + data.str_hello > "a" @@ -3165,24 +3165,24 @@ - -
- + +
+ Message from section one
-
- +
+ Message from section two
- -
- + +
+ spec.hasFilters() == false @@ -3190,7 +3190,7 @@ false == false - + spec.matches( tcA ) == false @@ -3198,7 +3198,7 @@ false == false - + spec.matches( tcB ) == false @@ -3208,8 +3208,8 @@
-
- +
+ spec.hasFilters() == false @@ -3217,7 +3217,7 @@ false == false - + spec.matches(tcA ) == false @@ -3225,7 +3225,7 @@ false == false - + spec.matches( tcB ) == false @@ -3235,8 +3235,8 @@
-
- +
+ spec.hasFilters() == false @@ -3244,7 +3244,7 @@ false == false - + spec.matches( tcA ) == false @@ -3252,7 +3252,7 @@ false == false - + spec.matches( tcB ) == false @@ -3262,8 +3262,8 @@
-
- +
+ spec.hasFilters() == true @@ -3271,7 +3271,7 @@ true == true - + spec.matches( tcA ) == false @@ -3279,7 +3279,7 @@ false == false - + spec.matches( tcB ) == true @@ -3289,8 +3289,8 @@
-
- +
+ spec.hasFilters() == true @@ -3298,7 +3298,7 @@ true == true - + spec.matches( tcA ) == false @@ -3306,7 +3306,7 @@ false == false - + spec.matches( tcB ) == true @@ -3316,8 +3316,8 @@
-
- +
+ spec.hasFilters() == true @@ -3325,7 +3325,7 @@ true == true - + spec.matches( tcA ) == false @@ -3333,7 +3333,7 @@ false == false - + spec.matches( tcB ) == true @@ -3341,7 +3341,7 @@ true == true - + spec.matches( tcC ) == false @@ -3351,8 +3351,8 @@
-
- +
+ spec.hasFilters() == true @@ -3360,7 +3360,7 @@ true == true - + spec.matches( tcA ) == false @@ -3368,7 +3368,7 @@ false == false - + spec.matches( tcB ) == false @@ -3376,7 +3376,7 @@ false == false - + spec.matches( tcC ) == true @@ -3384,7 +3384,7 @@ true == true - + spec.matches( tcD ) == false @@ -3392,7 +3392,7 @@ false == false - + parseTestSpec( "*a" ).matches( tcA ) == true @@ -3402,8 +3402,8 @@
-
- +
+ spec.hasFilters() == true @@ -3411,7 +3411,7 @@ true == true - + spec.matches( tcA ) == false @@ -3419,7 +3419,7 @@ false == false - + spec.matches( tcB ) == false @@ -3427,7 +3427,7 @@ false == false - + spec.matches( tcC ) == true @@ -3435,7 +3435,7 @@ true == true - + spec.matches( tcD ) == false @@ -3443,7 +3443,7 @@ false == false - + parseTestSpec( "a*" ).matches( tcA ) == true @@ -3453,8 +3453,8 @@
-
- +
+ spec.hasFilters() == true @@ -3462,7 +3462,7 @@ true == true - + spec.matches( tcA ) == false @@ -3470,7 +3470,7 @@ false == false - + spec.matches( tcB ) == false @@ -3478,7 +3478,7 @@ false == false - + spec.matches( tcC ) == true @@ -3486,7 +3486,7 @@ true == true - + spec.matches( tcD ) == true @@ -3494,7 +3494,7 @@ true == true - + parseTestSpec( "*a*" ).matches( tcA ) == true @@ -3504,8 +3504,8 @@
-
- +
+ spec.hasFilters() == true @@ -3513,7 +3513,7 @@ true == true - + spec.matches( tcA ) == true @@ -3521,7 +3521,7 @@ true == true - + spec.matches( tcB ) == false @@ -3531,8 +3531,8 @@
-
- +
+ spec.hasFilters() == true @@ -3540,7 +3540,7 @@ true == true - + spec.matches( tcA ) == true @@ -3548,7 +3548,7 @@ true == true - + spec.matches( tcB ) == false @@ -3558,8 +3558,8 @@
-
- +
+ spec.hasFilters() == true @@ -3567,7 +3567,7 @@ true == true - + spec.matches( tcA ) == true @@ -3575,7 +3575,7 @@ true == true - + spec.matches( tcB ) == false @@ -3585,8 +3585,8 @@
-
- +
+ spec.hasFilters() == true @@ -3594,7 +3594,7 @@ true == true - + spec.matches( tcA ) == false @@ -3602,7 +3602,7 @@ false == false - + spec.matches( tcB ) == false @@ -3610,7 +3610,7 @@ false == false - + spec.matches( tcC ) == true @@ -3618,7 +3618,7 @@ true == true - + spec.matches( tcD ) == true @@ -3628,8 +3628,8 @@
-
- +
+ spec.hasFilters() == true @@ -3637,7 +3637,7 @@ true == true - + spec.matches( tcA ) == true @@ -3645,7 +3645,7 @@ true == true - + spec.matches( tcB ) == true @@ -3653,7 +3653,7 @@ true == true - + spec.matches( tcC ) == true @@ -3661,7 +3661,7 @@ true == true - + spec.matches( tcD ) == true @@ -3671,8 +3671,8 @@
-
- +
+ spec.hasFilters() == true @@ -3680,7 +3680,7 @@ true == true - + spec.matches( tcA ) == false @@ -3688,7 +3688,7 @@ false == false - + spec.matches( tcB ) == true @@ -3696,7 +3696,7 @@ true == true - + spec.matches( tcC ) == false @@ -3706,8 +3706,8 @@
-
- +
+ spec.hasFilters() == true @@ -3715,7 +3715,7 @@ true == true - + spec.matches( tcA ) == false @@ -3723,7 +3723,7 @@ false == false - + spec.matches( tcB ) == true @@ -3731,7 +3731,7 @@ true == true - + spec.matches( tcC ) == true @@ -3741,8 +3741,8 @@
-
- +
+ spec.hasFilters() == true @@ -3750,7 +3750,7 @@ true == true - + spec.matches( tcA ) == false @@ -3758,7 +3758,7 @@ false == false - + spec.matches( tcB ) == false @@ -3766,7 +3766,7 @@ false == false - + spec.matches( tcC ) == true @@ -3776,8 +3776,8 @@
-
- +
+ spec.hasFilters() == true @@ -3785,7 +3785,7 @@ true == true - + spec.matches( tcA ) == false @@ -3793,7 +3793,7 @@ false == false - + spec.matches( tcB ) == false @@ -3801,7 +3801,7 @@ false == false - + spec.matches( tcC ) == true @@ -3811,8 +3811,8 @@
-
- +
+ spec.hasFilters() == true @@ -3820,7 +3820,7 @@ true == true - + spec.matches( tcA ) == false @@ -3828,7 +3828,7 @@ false == false - + spec.matches( tcB ) == false @@ -3836,7 +3836,7 @@ false == false - + spec.matches( tcC ) == true @@ -3844,7 +3844,7 @@ true == true - + spec.matches( tcD ) == false @@ -3854,8 +3854,8 @@
-
- +
+ spec.hasFilters() == true @@ -3863,7 +3863,7 @@ true == true - + spec.matches( tcA ) == true @@ -3871,7 +3871,7 @@ true == true - + spec.matches( tcB ) == false @@ -3879,7 +3879,7 @@ false == false - + spec.matches( tcC ) == true @@ -3889,8 +3889,8 @@
-
- +
+ spec.hasFilters() == true @@ -3898,7 +3898,7 @@ true == true - + spec.matches( tcA ) == false @@ -3906,7 +3906,7 @@ false == false - + spec.matches( tcB ) == true @@ -3914,7 +3914,7 @@ true == true - + spec.matches( tcC ) == false @@ -3924,8 +3924,8 @@
-
- +
+ spec.hasFilters() == true @@ -3933,7 +3933,7 @@ true == true - + spec.matches( tcA ) == false @@ -3941,7 +3941,7 @@ false == false - + spec.matches( tcB ) == false @@ -3949,7 +3949,7 @@ false == false - + spec.matches( tcC ) == false @@ -3957,7 +3957,7 @@ false == false - + spec.matches( tcD ) == true @@ -3967,8 +3967,8 @@
-
- +
+ spec.hasFilters() == true @@ -3976,7 +3976,7 @@ true == true - + spec.matches( tcA ) == false @@ -3984,7 +3984,7 @@ false == false - + spec.matches( tcB ) == false @@ -3992,7 +3992,7 @@ false == false - + spec.matches( tcC ) == false @@ -4000,7 +4000,7 @@ false == false - + spec.matches( tcD ) == true @@ -4010,8 +4010,8 @@
-
- +
+ spec.hasFilters() == true @@ -4019,7 +4019,7 @@ true == true - + spec.matches( tcA ) == true @@ -4027,7 +4027,7 @@ true == true - + spec.matches( tcB ) == false @@ -4035,7 +4035,7 @@ false == false - + spec.matches( tcC ) == true @@ -4043,7 +4043,7 @@ true == true - + spec.matches( tcD ) == true @@ -4053,8 +4053,8 @@
-
- +
+ spec.hasFilters() == true @@ -4062,7 +4062,7 @@ true == true - + spec.matches( tcA ) == true @@ -4070,7 +4070,7 @@ true == true - + spec.matches( tcB ) == true @@ -4078,7 +4078,7 @@ true == true - + spec.matches( tcC ) == false @@ -4086,7 +4086,7 @@ false == false - + spec.matches( tcD ) == false @@ -4096,8 +4096,8 @@
-
- +
+ spec.hasFilters() == true @@ -4105,7 +4105,7 @@ true == true - + spec.matches( tcA ) == true @@ -4113,7 +4113,7 @@ true == true - + spec.matches( tcB ) == true @@ -4121,7 +4121,7 @@ true == true - + spec.matches( tcC ) == true @@ -4129,7 +4129,7 @@ true == true - + spec.matches( tcD ) == false @@ -4139,8 +4139,8 @@
-
- +
+ spec.hasFilters() == true @@ -4148,7 +4148,7 @@ true == true - + spec.matches( tcA ) == true @@ -4156,7 +4156,7 @@ true == true - + spec.matches( tcB ) == true @@ -4164,7 +4164,7 @@ true == true - + spec.matches( tcC ) == true @@ -4172,7 +4172,7 @@ true == true - + spec.matches( tcD ) == false @@ -4182,8 +4182,8 @@
-
- +
+ spec.hasFilters() == true @@ -4191,7 +4191,7 @@ true == true - + spec.matches( tcA ) == false @@ -4199,7 +4199,7 @@ false == false - + spec.matches( tcB ) == false @@ -4207,7 +4207,7 @@ false == false - + spec.matches( tcC ) == true @@ -4215,7 +4215,7 @@ true == true - + spec.matches( tcD ) == false @@ -4225,8 +4225,8 @@
-
- +
+ spec.hasFilters() == false @@ -4234,7 +4234,7 @@ false == false - + spec.matches( tcA ) == false @@ -4242,7 +4242,7 @@ false == false - + spec.matches( tcB ) == false @@ -4250,7 +4250,7 @@ false == false - + spec.matches( tcC ) == false @@ -4258,7 +4258,7 @@ false == false - + spec.matches( tcD ) == false @@ -4268,8 +4268,8 @@
-
- +
+ spec.hasFilters() == false @@ -4277,7 +4277,7 @@ false == false - + spec.matches( tcA ) == false @@ -4285,7 +4285,7 @@ false == false - + spec.matches( tcB ) == false @@ -4293,7 +4293,7 @@ false == false - + spec.matches( tcC ) == false @@ -4301,7 +4301,7 @@ false == false - + spec.matches( tcD ) == false @@ -4311,8 +4311,8 @@
-
- +
+ spec.hasFilters() == true @@ -4320,7 +4320,7 @@ true == true - + spec.matches( tcA ) == false @@ -4328,7 +4328,7 @@ false == false - + spec.matches( tcB ) == false @@ -4336,7 +4336,7 @@ false == false - + spec.matches( tcC ) == false @@ -4344,7 +4344,7 @@ false == false - + spec.matches( tcD ) == true @@ -4356,8 +4356,8 @@
- - + + (std::pair<int, int>( 1, 2 )) == aNicePair @@ -4367,8 +4367,8 @@ - - + + p == 0 @@ -4376,7 +4376,7 @@ 0 == 0 - + p == pNULL @@ -4384,7 +4384,7 @@ 0 == 0 - + p != 0 @@ -4392,7 +4392,7 @@ 0x != 0 - + cp != 0 @@ -4400,7 +4400,7 @@ 0x != 0 - + cpc != 0 @@ -4408,7 +4408,7 @@ 0x != 0 - + returnsNull() == 0 @@ -4416,7 +4416,7 @@ {null string} == 0 - + returnsConstNull() == 0 @@ -4424,7 +4424,7 @@ {null string} == 0 - + 0 != p @@ -4434,9 +4434,9 @@ - -
- + +
+ result @@ -4444,7 +4444,7 @@ {?} - + config.processName == "" @@ -4454,8 +4454,8 @@
-
- +
+ result @@ -4463,7 +4463,7 @@ {?} - + config.processName == "test" @@ -4471,7 +4471,7 @@ "test" == "test" - + config.shouldDebugBreak == false @@ -4479,7 +4479,7 @@ false == false - + config.abortAfter == -1 @@ -4487,7 +4487,7 @@ -1 == -1 - + config.noThrow == false @@ -4495,7 +4495,7 @@ false == false - + config.reporterNames.empty() @@ -4505,9 +4505,9 @@
-
-
- +
+
+ result @@ -4515,7 +4515,7 @@ {?} - + cfg.testSpec().matches(fakeTestCase("notIncluded")) == false @@ -4523,7 +4523,7 @@ false == false - + cfg.testSpec().matches(fakeTestCase("test1")) @@ -4535,9 +4535,9 @@
-
-
- +
+
+ result @@ -4545,7 +4545,7 @@ {?} - + cfg.testSpec().matches(fakeTestCase("test1")) == false @@ -4553,7 +4553,7 @@ false == false - + cfg.testSpec().matches(fakeTestCase("alwaysIncluded")) @@ -4565,9 +4565,9 @@
-
-
- +
+
+ result @@ -4575,7 +4575,7 @@ {?} - + cfg.testSpec().matches(fakeTestCase("test1")) == false @@ -4583,7 +4583,7 @@ false == false - + cfg.testSpec().matches(fakeTestCase("alwaysIncluded")) @@ -4595,9 +4595,9 @@
-
-
- +
+
+ cli.parse({"test", "-r", "console"}) @@ -4605,7 +4605,7 @@ {?} - + config.reporterNames[0] == "console" @@ -4617,9 +4617,9 @@
-
-
- +
+
+ cli.parse({"test", "-r", "xml"}) @@ -4627,7 +4627,7 @@ {?} - + config.reporterNames[0] == "xml" @@ -4639,9 +4639,9 @@
-
-
- +
+
+ cli.parse({"test", "-r", "xml", "-r", "junit"}) @@ -4649,7 +4649,7 @@ {?} - + config.reporterNames.size() == 2 @@ -4657,7 +4657,7 @@ 2 == 2 - + config.reporterNames[0] == "xml" @@ -4665,7 +4665,7 @@ "xml" == "xml" - + config.reporterNames[1] == "junit" @@ -4677,9 +4677,9 @@
-
-
- +
+
+ cli.parse({"test", "--reporter", "junit"}) @@ -4687,7 +4687,7 @@ {?} - + config.reporterNames[0] == "junit" @@ -4699,9 +4699,9 @@
-
-
- +
+
+ cli.parse({"test", "-b"}) @@ -4709,7 +4709,7 @@ {?} - + config.shouldDebugBreak == true @@ -4721,9 +4721,9 @@
-
-
- +
+
+ cli.parse({"test", "--break"}) @@ -4731,7 +4731,7 @@ {?} - + config.shouldDebugBreak @@ -4743,9 +4743,9 @@
-
-
- +
+
+ cli.parse({"test", "-a"}) @@ -4753,7 +4753,7 @@ {?} - + config.abortAfter == 1 @@ -4765,9 +4765,9 @@
-
-
- +
+
+ cli.parse({"test", "-x", "2"}) @@ -4775,7 +4775,7 @@ {?} - + config.abortAfter == 2 @@ -4787,9 +4787,9 @@
-
-
- +
+
+ !result @@ -4797,7 +4797,7 @@ true - + result.errorMessage(), Contains("convert") && Contains("oops") @@ -4809,9 +4809,9 @@
-
-
- +
+
+ cli.parse({"test", "-e"}) @@ -4819,7 +4819,7 @@ {?} - + config.noThrow @@ -4831,9 +4831,9 @@
-
-
- +
+
+ cli.parse({"test", "--nothrow"}) @@ -4841,7 +4841,7 @@ {?} - + config.noThrow @@ -4853,9 +4853,9 @@
-
-
- +
+
+ cli.parse({"test", "-o", "filename.ext"}) @@ -4863,7 +4863,7 @@ {?} - + config.outputFilename == "filename.ext" @@ -4875,9 +4875,9 @@
-
-
- +
+
+ cli.parse({"test", "--out", "filename.ext"}) @@ -4885,7 +4885,7 @@ {?} - + config.outputFilename == "filename.ext" @@ -4897,9 +4897,9 @@
-
-
- +
+
+ cli.parse({"test", "-abe"}) @@ -4907,7 +4907,7 @@ {?} - + config.abortAfter == 1 @@ -4915,7 +4915,7 @@ 1 == 1 - + config.shouldDebugBreak @@ -4923,7 +4923,7 @@ true - + config.noThrow == true @@ -4935,9 +4935,9 @@
-
-
- +
+
+ cli.parse({"test"}) @@ -4945,7 +4945,7 @@ {?} - + config.useColour == UseColour::Auto @@ -4957,9 +4957,9 @@
-
-
- +
+
+ cli.parse({"test", "--use-colour", "auto"}) @@ -4967,7 +4967,7 @@ {?} - + config.useColour == UseColour::Auto @@ -4979,9 +4979,9 @@
-
-
- +
+
+ cli.parse({"test", "--use-colour", "yes"}) @@ -4989,7 +4989,7 @@ {?} - + config.useColour == UseColour::Yes @@ -5001,9 +5001,9 @@
-
-
- +
+
+ cli.parse({"test", "--use-colour", "no"}) @@ -5011,7 +5011,7 @@ {?} - + config.useColour == UseColour::No @@ -5023,9 +5023,9 @@
-
-
- +
+
+ !result @@ -5033,7 +5033,7 @@ true - + result.errorMessage(), Contains( "colour mode must be one of" ) @@ -5047,8 +5047,8 @@
- - + + truthy(false) @@ -5058,8 +5058,8 @@ - - + + testStringForMatching(), Matches("this STRING contains 'abc' as a substring") @@ -5067,7 +5067,7 @@ "this string contains 'abc' as a substring" matches "this STRING contains 'abc' as a substring" case sensitively - + testStringForMatching(), Matches("contains 'abc' as a substring") @@ -5075,7 +5075,7 @@ "this string contains 'abc' as a substring" matches "contains 'abc' as a substring" case sensitively - + testStringForMatching(), Matches("this string contains 'abc' as a") @@ -5085,15 +5085,15 @@ - + - + - -
- + +
+ before == 0 @@ -5101,9 +5101,9 @@ 0 == 0 -
-
- +
+
+ after > before @@ -5119,11 +5119,11 @@
- -
-
-
- + +
+
+
+ itDoesThis() @@ -5131,8 +5131,8 @@ true -
- +
+ itDoesThat() @@ -5150,10 +5150,10 @@
- -
-
-
+ +
+
+
@@ -5162,9 +5162,9 @@
- -
- + +
+ v.size() == 0 @@ -5172,9 +5172,9 @@ 0 == 0 -
-
- +
+
+ v.size() == 10 @@ -5182,7 +5182,7 @@ 10 == 10 - + v.capacity() >= 10 @@ -5190,9 +5190,9 @@ 10 >= 10 -
-
- +
+
+ v.size() == 5 @@ -5200,7 +5200,7 @@ 5 == 5 - + v.capacity() >= 10 @@ -5218,8 +5218,8 @@
-
- +
+ v.size() == 0 @@ -5227,9 +5227,9 @@ 0 == 0 -
-
- +
+
+ v.capacity() >= 10 @@ -5237,7 +5237,7 @@ 10 >= 10 - + v.size() == 0 @@ -5253,7 +5253,7 @@
- + A string sent directly to stdout @@ -5263,8 +5263,8 @@ A string sent directly to stderr - - + + d == Approx( 1.23 ) @@ -5272,7 +5272,7 @@ A string sent directly to stderr 1.23 == Approx( 1.23 ) - + d != Approx( 1.22 ) @@ -5280,7 +5280,7 @@ A string sent directly to stderr 1.23 != Approx( 1.22 ) - + d != Approx( 1.24 ) @@ -5288,7 +5288,7 @@ A string sent directly to stderr 1.23 != Approx( 1.24 ) - + Approx( d ) == 1.23 @@ -5296,7 +5296,7 @@ A string sent directly to stderr Approx( 1.23 ) == 1.23 - + Approx( d ) != 1.22 @@ -5304,7 +5304,7 @@ A string sent directly to stderr Approx( 1.23 ) != 1.22 - + Approx( d ) != 1.24 @@ -5312,7 +5312,7 @@ A string sent directly to stderr Approx( 1.23 ) != 1.24 - + INFINITY == Approx(INFINITY) @@ -5322,11 +5322,11 @@ A string sent directly to stderr - -
+ +
-
+
@@ -5336,8 +5336,8 @@ Message from section two - - + + testStringForMatching(), StartsWith( "This String" ) @@ -5345,7 +5345,7 @@ Message from section two "this string contains 'abc' as a substring" starts with: "This String" - + testStringForMatching(), StartsWith( "string", Catch::CaseSensitive::No ) @@ -5355,8 +5355,8 @@ Message from section two - - + + testStringForMatching(), Contains( "string" ) @@ -5364,7 +5364,7 @@ Message from section two "this string contains 'abc' as a substring" contains: "string" - + testStringForMatching(), Contains( "string", Catch::CaseSensitive::No ) @@ -5372,7 +5372,7 @@ Message from section two "this string contains 'abc' as a substring" contains: "string" (case insensitive) - + testStringForMatching(), Contains( "abc" ) @@ -5380,7 +5380,7 @@ Message from section two "this string contains 'abc' as a substring" contains: "abc" - + testStringForMatching(), Contains( "aBC", Catch::CaseSensitive::No ) @@ -5388,7 +5388,7 @@ Message from section two "this string contains 'abc' as a substring" contains: "abc" (case insensitive) - + testStringForMatching(), StartsWith( "this" ) @@ -5396,7 +5396,7 @@ Message from section two "this string contains 'abc' as a substring" starts with: "this" - + testStringForMatching(), StartsWith( "THIS", Catch::CaseSensitive::No ) @@ -5404,7 +5404,7 @@ Message from section two "this string contains 'abc' as a substring" starts with: "this" (case insensitive) - + testStringForMatching(), EndsWith( "substring" ) @@ -5412,7 +5412,7 @@ Message from section two "this string contains 'abc' as a substring" ends with: "substring" - + testStringForMatching(), EndsWith(" SuBsTrInG", Catch::CaseSensitive::No ) @@ -5420,7 +5420,7 @@ Message from section two "this string contains 'abc' as a substring" ends with: " substring" (case insensitive) - + testStringForMatching(), Matches("this string contains 'abc' as a substring") @@ -5428,7 +5428,7 @@ Message from section two "this string contains 'abc' as a substring" matches "this string contains 'abc' as a substring" case sensitively - + testStringForMatching(), Matches("this string CONTAINS 'abc' as a substring", Catch::CaseSensitive::No) @@ -5436,7 +5436,7 @@ Message from section two "this string contains 'abc' as a substring" matches "this string CONTAINS 'abc' as a substring" case insensitively - + testStringForMatching(), Matches("^this string contains 'abc' as a substring$") @@ -5444,7 +5444,7 @@ Message from section two "this string contains 'abc' as a substring" matches "^this string contains 'abc' as a substring$" case sensitively - + testStringForMatching(), Matches("^.* 'abc' .*$") @@ -5452,7 +5452,7 @@ Message from section two "this string contains 'abc' as a substring" matches "^.* 'abc' .*$" case sensitively - + testStringForMatching(), Matches("^.* 'ABC' .*$", Catch::CaseSensitive::No) @@ -5462,9 +5462,9 @@ Message from section two - -
- + +
+ empty.empty() @@ -5472,7 +5472,7 @@ Message from section two true - + empty.size() == 0 @@ -5480,7 +5480,7 @@ Message from section two 0 == 0 - + std::strcmp( empty.c_str(), "" ) == 0 @@ -5490,8 +5490,8 @@ Message from section two
-
- +
+ s.empty() == false @@ -5499,7 +5499,7 @@ Message from section two false == false - + s.size() == 5 @@ -5507,7 +5507,7 @@ Message from section two 5 == 5 - + isSubstring( s ) == false @@ -5515,7 +5515,7 @@ Message from section two false == false - + std::strcmp( rawChars, "hello" ) == 0 @@ -5523,8 +5523,8 @@ Message from section two 0 == 0 -
- +
+ isOwned( s ) == false @@ -5532,7 +5532,7 @@ Message from section two false == false - + s.c_str() == rawChars @@ -5540,7 +5540,7 @@ Message from section two "hello" == "hello" - + isOwned( s ) == false @@ -5552,8 +5552,8 @@ Message from section two
-
- +
+ original == "original" @@ -5561,7 +5561,7 @@ Message from section two original == "original" - + isSubstring( original ) @@ -5571,9 +5571,9 @@ Message from section two
-
-
- +
+
+ ss.empty() == false @@ -5581,7 +5581,7 @@ Message from section two false == false - + ss.size() == 5 @@ -5589,7 +5589,7 @@ Message from section two 5 == 5 - + std::strcmp( ss.c_str(), "hello" ) == 0 @@ -5597,7 +5597,7 @@ Message from section two 0 == 0 - + ss == "hello" @@ -5609,9 +5609,9 @@ Message from section two
-
-
- +
+
+ isSubstring( ss ) @@ -5619,7 +5619,7 @@ Message from section two true - + isOwned( ss ) == false @@ -5627,7 +5627,7 @@ Message from section two false == false - + rawChars == data( s ) @@ -5635,7 +5635,7 @@ Message from section two "hello world!" == "hello world!" - + ss.c_str() != rawChars @@ -5643,7 +5643,7 @@ Message from section two "hello" != "hello world!" - + isSubstring( ss ) == false @@ -5651,7 +5651,7 @@ Message from section two false == false - + isOwned( ss ) @@ -5659,7 +5659,7 @@ Message from section two true - + data( ss ) != data( s ) @@ -5671,9 +5671,9 @@ Message from section two
-
-
- +
+
+ ss.size() == 6 @@ -5681,7 +5681,7 @@ Message from section two 6 == 6 - + std::strcmp( ss.c_str(), "world!" ) == 0 @@ -5693,9 +5693,9 @@ Message from section two
-
-
- +
+
+ s.c_str() == s2.c_str() @@ -5707,9 +5707,9 @@ Message from section two
-
-
- +
+
+ s.c_str() != ss.c_str() @@ -5721,8 +5721,8 @@ Message from section two
-
- +
+ StringRef("hello") == StringRef("hello") @@ -5730,7 +5730,7 @@ Message from section two hello == hello - + StringRef("hello") != StringRef("cello") @@ -5740,9 +5740,9 @@ Message from section two
-
-
- +
+
+ sr == "a standard string" @@ -5750,7 +5750,7 @@ Message from section two a standard string == "a standard string" - + sr.size() == stdStr.size() @@ -5762,9 +5762,9 @@ Message from section two
-
-
- +
+
+ sr == "a standard string" @@ -5772,7 +5772,7 @@ Message from section two a standard string == "a standard string" - + sr.size() == stdStr.size() @@ -5784,9 +5784,9 @@ Message from section two
-
-
- +
+
+ sr == "a standard string" @@ -5794,7 +5794,7 @@ Message from section two a standard string == "a standard string" - + sr.size() == stdStr.size() @@ -5806,9 +5806,9 @@ Message from section two
-
-
- +
+
+ stdStr == "a stringref" @@ -5816,7 +5816,7 @@ Message from section two "a stringref" == "a stringref" - + stdStr.size() == sr.size() @@ -5828,9 +5828,9 @@ Message from section two
-
-
- +
+
+ stdStr == "a stringref" @@ -5838,7 +5838,7 @@ Message from section two "a stringref" == "a stringref" - + stdStr.size() == sr.size() @@ -5850,9 +5850,9 @@ Message from section two
-
-
- +
+
+ stdStr == "a stringref" @@ -5860,7 +5860,7 @@ Message from section two "a stringref" == "a stringref" - + stdStr.size() == sr.size() @@ -5874,8 +5874,8 @@ Message from section two
- - + + minute == seconds @@ -5883,7 +5883,7 @@ Message from section two 1 m == 60 s - + hour != seconds @@ -5891,7 +5891,7 @@ Message from section two 1 h != 60 s - + micro != milli @@ -5899,7 +5899,7 @@ Message from section two 1 us != 1 ms - + nano != micro @@ -5909,8 +5909,8 @@ Message from section two - - + + half_minute != femto_second @@ -5920,8 +5920,8 @@ Message from section two - - + + now != later @@ -5933,8 +5933,8 @@ Message from section two - - + + s1 == s2 @@ -5951,9 +5951,9 @@ Message from section two - -
- + +
+ what, Contains( "[@zzz]" ) @@ -5963,7 +5963,7 @@ Message from section two Redefined at: file:10" contains: "[@zzz]" - + what, Contains( "file" ) @@ -5973,7 +5973,7 @@ Message from section two Redefined at: file:10" contains: "file" - + what, Contains( "2" ) @@ -5983,7 +5983,7 @@ Message from section two Redefined at: file:10" contains: "2" - + what, Contains( "10" ) @@ -5995,8 +5995,8 @@ Message from section two
-
- +
+ registry.add( "[no ampersat]", "", Catch::SourceLineInfo( "file", 3 ) ) @@ -6004,7 +6004,7 @@ Message from section two registry.add( "[no ampersat]", "", Catch::SourceLineInfo( "file", 3 ) ) - + registry.add( "[the @ is not at the start]", "", Catch::SourceLineInfo( "file", 3 ) ) @@ -6012,7 +6012,7 @@ Message from section two registry.add( "[the @ is not at the start]", "", Catch::SourceLineInfo( "file", 3 ) ) - + registry.add( "@no square bracket at start]", "", Catch::SourceLineInfo( "file", 3 ) ) @@ -6020,7 +6020,7 @@ Message from section two registry.add( "@no square bracket at start]", "", Catch::SourceLineInfo( "file", 3 ) ) - + registry.add( "[@no square bracket at end", "", Catch::SourceLineInfo( "file", 3 ) ) @@ -6032,11 +6032,11 @@ Message from section two
- + - - + + 0x == bit30and31 @@ -6046,8 +6046,8 @@ Message from section two - - + + 1 == 2 @@ -6057,11 +6057,11 @@ Message from section two - + - - + + testCase.isOpen() @@ -6069,7 +6069,7 @@ Message from section two true - + s1.isOpen() @@ -6077,8 +6077,8 @@ Message from section two true -
- +
+ s1.isSuccessfullyCompleted() @@ -6086,7 +6086,7 @@ Message from section two true - + testCase.isComplete() == false @@ -6094,7 +6094,7 @@ Message from section two false == false - + ctx.completedCycle() @@ -6102,7 +6102,7 @@ Message from section two true - + testCase.isSuccessfullyCompleted() @@ -6112,7 +6112,7 @@ Message from section two
- + testCase.isOpen() @@ -6120,7 +6120,7 @@ Message from section two true - + s1.isOpen() @@ -6128,8 +6128,8 @@ Message from section two true -
- +
+ s1.isComplete() @@ -6137,7 +6137,7 @@ Message from section two true - + s1.isSuccessfullyCompleted() == false @@ -6145,7 +6145,7 @@ Message from section two false == false - + testCase.isComplete() == false @@ -6153,7 +6153,7 @@ Message from section two false == false - + ctx.completedCycle() @@ -6161,7 +6161,7 @@ Message from section two true - + testCase.isSuccessfullyCompleted() == false @@ -6169,8 +6169,8 @@ Message from section two false == false -
- +
+ testCase2.isOpen() @@ -6178,7 +6178,7 @@ Message from section two true - + s1b.isOpen() == false @@ -6186,7 +6186,7 @@ Message from section two false == false - + ctx.completedCycle() @@ -6194,7 +6194,7 @@ Message from section two true - + testCase.isComplete() @@ -6202,7 +6202,7 @@ Message from section two true - + testCase.isSuccessfullyCompleted() @@ -6214,7 +6214,7 @@ Message from section two
- + testCase.isOpen() @@ -6222,7 +6222,7 @@ Message from section two true - + s1.isOpen() @@ -6230,8 +6230,8 @@ Message from section two true -
- +
+ s1.isComplete() @@ -6239,7 +6239,7 @@ Message from section two true - + s1.isSuccessfullyCompleted() == false @@ -6247,7 +6247,7 @@ Message from section two false == false - + testCase.isComplete() == false @@ -6255,7 +6255,7 @@ Message from section two false == false - + ctx.completedCycle() @@ -6263,7 +6263,7 @@ Message from section two true - + testCase.isSuccessfullyCompleted() == false @@ -6271,8 +6271,8 @@ Message from section two false == false -
- +
+ testCase2.isOpen() @@ -6280,7 +6280,7 @@ Message from section two true - + s1b.isOpen() == false @@ -6288,7 +6288,7 @@ Message from section two false == false - + s2.isOpen() @@ -6296,7 +6296,7 @@ Message from section two true - + ctx.completedCycle() @@ -6304,7 +6304,7 @@ Message from section two true - + testCase.isComplete() @@ -6312,7 +6312,7 @@ Message from section two true - + testCase.isSuccessfullyCompleted() @@ -6324,7 +6324,7 @@ Message from section two
- + testCase.isOpen() @@ -6332,7 +6332,7 @@ Message from section two true - + s1.isOpen() @@ -6340,8 +6340,8 @@ Message from section two true -
- +
+ s2.isOpen() == false @@ -6349,7 +6349,7 @@ Message from section two false == false - + testCase.isComplete() == false @@ -6357,8 +6357,8 @@ Message from section two false == false -
- +
+ testCase2.isOpen() @@ -6366,7 +6366,7 @@ Message from section two true - + s1b.isOpen() == false @@ -6374,7 +6374,7 @@ Message from section two false == false - + s2b.isOpen() @@ -6382,7 +6382,7 @@ Message from section two true - + ctx.completedCycle() == false @@ -6390,8 +6390,8 @@ Message from section two false == false -
- +
+ ctx.completedCycle() @@ -6399,7 +6399,7 @@ Message from section two true - + s2b.isSuccessfullyCompleted() @@ -6407,7 +6407,7 @@ Message from section two true - + testCase2.isComplete() == false @@ -6415,7 +6415,7 @@ Message from section two false == false - + testCase2.isSuccessfullyCompleted() @@ -6429,7 +6429,7 @@ Message from section two
- + testCase.isOpen() @@ -6437,7 +6437,7 @@ Message from section two true - + s1.isOpen() @@ -6445,8 +6445,8 @@ Message from section two true -
- +
+ s2.isOpen() == false @@ -6454,7 +6454,7 @@ Message from section two false == false - + testCase.isComplete() == false @@ -6462,8 +6462,8 @@ Message from section two false == false -
- +
+ testCase2.isOpen() @@ -6471,7 +6471,7 @@ Message from section two true - + s1b.isOpen() == false @@ -6479,7 +6479,7 @@ Message from section two false == false - + s2b.isOpen() @@ -6487,7 +6487,7 @@ Message from section two true - + ctx.completedCycle() == false @@ -6495,8 +6495,8 @@ Message from section two false == false -
- +
+ ctx.completedCycle() @@ -6504,7 +6504,7 @@ Message from section two true - + s2b.isComplete() @@ -6512,7 +6512,7 @@ Message from section two true - + s2b.isSuccessfullyCompleted() == false @@ -6520,7 +6520,7 @@ Message from section two false == false - + testCase2.isSuccessfullyCompleted() == false @@ -6528,7 +6528,7 @@ Message from section two false == false - + testCase3.isOpen() @@ -6536,7 +6536,7 @@ Message from section two true - + s1c.isOpen() == false @@ -6544,7 +6544,7 @@ Message from section two false == false - + s2c.isOpen() == false @@ -6552,7 +6552,7 @@ Message from section two false == false - + testCase3.isSuccessfullyCompleted() @@ -6566,7 +6566,7 @@ Message from section two
- + testCase.isOpen() @@ -6574,7 +6574,7 @@ Message from section two true - + s1.isOpen() @@ -6582,8 +6582,8 @@ Message from section two true -
- +
+ s2.isOpen() @@ -6591,7 +6591,7 @@ Message from section two true - + s2.isComplete() @@ -6599,7 +6599,7 @@ Message from section two true - + s1.isComplete() == false @@ -6607,7 +6607,7 @@ Message from section two false == false - + s1.isComplete() @@ -6615,7 +6615,7 @@ Message from section two true - + testCase.isComplete() == false @@ -6623,7 +6623,7 @@ Message from section two false == false - + testCase.isComplete() @@ -6633,7 +6633,7 @@ Message from section two
- + testCase.isOpen() @@ -6641,7 +6641,7 @@ Message from section two true - + s1.isOpen() @@ -6649,8 +6649,8 @@ Message from section two true -
- +
+ g1.isOpen() @@ -6658,7 +6658,7 @@ Message from section two true - + g1.index() == 0 @@ -6666,7 +6666,7 @@ Message from section two 0 == 0 - + g1.isComplete() == false @@ -6674,7 +6674,7 @@ Message from section two false == false - + s1.isComplete() == false @@ -6682,8 +6682,8 @@ Message from section two false == false -
- +
+ s1.isComplete() == false @@ -6691,7 +6691,7 @@ Message from section two false == false - + testCase.isSuccessfullyCompleted() == false @@ -6699,8 +6699,8 @@ Message from section two false == false -
- +
+ testCase2.isOpen() @@ -6708,7 +6708,7 @@ Message from section two true - + s1b.isOpen() @@ -6716,7 +6716,7 @@ Message from section two true - + g1b.isOpen() @@ -6724,7 +6724,7 @@ Message from section two true - + g1b.index() == 1 @@ -6732,7 +6732,7 @@ Message from section two 1 == 1 - + s1.isComplete() == false @@ -6740,7 +6740,7 @@ Message from section two false == false - + s1b.isComplete() @@ -6748,7 +6748,7 @@ Message from section two true - + g1b.isComplete() @@ -6756,7 +6756,7 @@ Message from section two true - + testCase2.isComplete() @@ -6770,7 +6770,7 @@ Message from section two
- + testCase.isOpen() @@ -6778,7 +6778,7 @@ Message from section two true - + s1.isOpen() @@ -6786,8 +6786,8 @@ Message from section two true -
- +
+ g1.isOpen() @@ -6795,7 +6795,7 @@ Message from section two true - + g1.index() == 0 @@ -6803,7 +6803,7 @@ Message from section two 0 == 0 - + g1.isComplete() == false @@ -6811,7 +6811,7 @@ Message from section two false == false - + s1.isComplete() == false @@ -6819,8 +6819,8 @@ Message from section two false == false -
- +
+ s2.isOpen() @@ -6828,7 +6828,7 @@ Message from section two true - + s2.isComplete() @@ -6836,7 +6836,7 @@ Message from section two true - + s1.isComplete() == false @@ -6844,7 +6844,7 @@ Message from section two false == false - + testCase.isComplete() == false @@ -6852,8 +6852,8 @@ Message from section two false == false -
- +
+ testCase2.isOpen() @@ -6861,7 +6861,7 @@ Message from section two true - + s1b.isOpen() @@ -6869,7 +6869,7 @@ Message from section two true - + g1b.isOpen() @@ -6877,7 +6877,7 @@ Message from section two true - + g1b.index() == 1 @@ -6885,7 +6885,7 @@ Message from section two 1 == 1 - + s2b.isOpen() @@ -6893,7 +6893,7 @@ Message from section two true - + s2b.isComplete() @@ -6901,7 +6901,7 @@ Message from section two true - + g1b.isComplete() @@ -6909,7 +6909,7 @@ Message from section two true - + s1b.isComplete() @@ -6917,7 +6917,7 @@ Message from section two true - + testCase2.isComplete() @@ -6931,7 +6931,7 @@ Message from section two
- + testCase.isOpen() @@ -6939,7 +6939,7 @@ Message from section two true - + s1.isOpen() @@ -6947,8 +6947,8 @@ Message from section two true -
- +
+ g1.isOpen() @@ -6956,7 +6956,7 @@ Message from section two true - + g1.index() == 0 @@ -6964,7 +6964,7 @@ Message from section two 0 == 0 - + g1.isComplete() == false @@ -6972,7 +6972,7 @@ Message from section two false == false - + s1.isComplete() == false @@ -6980,8 +6980,8 @@ Message from section two false == false -
- +
+ s2.isOpen() @@ -6989,7 +6989,7 @@ Message from section two true - + s2.isComplete() @@ -6997,7 +6997,7 @@ Message from section two true - + s2.isSuccessfullyCompleted() == false @@ -7005,7 +7005,7 @@ Message from section two false == false - + s1.isComplete() == false @@ -7013,7 +7013,7 @@ Message from section two false == false - + testCase.isComplete() == false @@ -7021,8 +7021,8 @@ Message from section two false == false -
- +
+ testCase2.isOpen() @@ -7030,7 +7030,7 @@ Message from section two true - + s1b.isOpen() @@ -7038,7 +7038,7 @@ Message from section two true - + g1b.isOpen() @@ -7046,7 +7046,7 @@ Message from section two true - + g1b.index() == 0 @@ -7054,7 +7054,7 @@ Message from section two 0 == 0 - + s2b.isOpen() == false @@ -7062,7 +7062,7 @@ Message from section two false == false - + g1b.isComplete() == false @@ -7070,7 +7070,7 @@ Message from section two false == false - + s1b.isComplete() == false @@ -7078,7 +7078,7 @@ Message from section two false == false - + testCase2.isComplete() == false @@ -7086,7 +7086,7 @@ Message from section two false == false - + testCase3.isOpen() @@ -7094,7 +7094,7 @@ Message from section two true - + s1c.isOpen() @@ -7102,7 +7102,7 @@ Message from section two true - + g1c.isOpen() @@ -7110,7 +7110,7 @@ Message from section two true - + g1c.index() == 1 @@ -7118,7 +7118,7 @@ Message from section two 1 == 1 - + s2c.isOpen() @@ -7126,7 +7126,7 @@ Message from section two true - + s2c.isComplete() @@ -7134,7 +7134,7 @@ Message from section two true - + g1c.isComplete() @@ -7142,7 +7142,7 @@ Message from section two true - + s1c.isComplete() @@ -7150,7 +7150,7 @@ Message from section two true - + testCase3.isComplete() @@ -7166,14 +7166,14 @@ Message from section two
- - + + 3.14 - - + + d == approx( 1.23 ) @@ -7181,7 +7181,7 @@ Message from section two 1.23 == Approx( 1.23 ) - + d == approx( 1.22 ) @@ -7189,7 +7189,7 @@ Message from section two 1.23 == Approx( 1.22 ) - + d == approx( 1.24 ) @@ -7197,7 +7197,7 @@ Message from section two 1.23 == Approx( 1.24 ) - + d != approx( 1.25 ) @@ -7205,7 +7205,7 @@ Message from section two 1.23 != Approx( 1.25 ) - + approx( d ) == 1.23 @@ -7213,7 +7213,7 @@ Message from section two Approx( 1.23 ) == 1.23 - + approx( d ) == 1.22 @@ -7221,7 +7221,7 @@ Message from section two Approx( 1.23 ) == 1.22 - + approx( d ) == 1.24 @@ -7229,7 +7229,7 @@ Message from section two Approx( 1.23 ) == 1.24 - + approx( d ) != 1.25 @@ -7239,15 +7239,15 @@ Message from section two - -
+ +
- -
- + +
+ v, VectorContains( 1 ) @@ -7255,7 +7255,7 @@ Message from section two { 1, 2, 3 } Contains: 1 - + v, VectorContains( 2 ) @@ -7265,8 +7265,8 @@ Message from section two
-
- +
+ v, Contains( v2 ) @@ -7274,7 +7274,7 @@ Message from section two { 1, 2, 3 } Contains: { 1, 2 } - + v, Contains( v2 ) @@ -7282,7 +7282,7 @@ Message from section two { 1, 2, 3 } Contains: { 1, 2, 3 } - + v, Contains( empty) @@ -7290,7 +7290,7 @@ Message from section two { 1, 2, 3 } Contains: { } - + empty, Contains( empty) @@ -7300,8 +7300,8 @@ Message from section two
-
- +
+ v, VectorContains( 1 ) && VectorContains( 2 ) @@ -7311,8 +7311,8 @@ Message from section two
-
- +
+ v, Equals( v ) @@ -7320,7 +7320,7 @@ Message from section two { 1, 2, 3 } Equals: { 1, 2, 3 } - + empty, Equals( empty ) @@ -7328,7 +7328,7 @@ Message from section two { } Equals: { } - + v, Equals( v2 ) @@ -7340,9 +7340,9 @@ Message from section two
- -
- + +
+ v, VectorContains( -1 ) @@ -7350,7 +7350,7 @@ Message from section two { 1, 2, 3 } Contains: -1 - + empty, VectorContains( 1 ) @@ -7360,8 +7360,8 @@ Message from section two
-
- +
+ empty, Contains( v) @@ -7369,7 +7369,7 @@ Message from section two { } Contains: { 1, 2, 3 } - + v, Contains( v2 ) @@ -7379,8 +7379,8 @@ Message from section two
-
- +
+ v, Equals( v2 ) @@ -7388,7 +7388,7 @@ Message from section two { 1, 2, 3 } Equals: { 1, 2 } - + v2, Equals( v ) @@ -7396,7 +7396,7 @@ Message from section two { 1, 2 } Equals: { 1, 2, 3 } - + empty, Equals( v ) @@ -7404,7 +7404,7 @@ Message from section two { } Equals: { 1, 2, 3 } - + v, Equals( empty ) @@ -7416,8 +7416,8 @@ Message from section two
- - + + thisThrows(), std::domain_error @@ -7425,7 +7425,7 @@ Message from section two thisThrows(), std::domain_error - + thisDoesntThrow() @@ -7433,7 +7433,7 @@ Message from section two thisDoesntThrow() - + thisThrows() @@ -7443,93 +7443,93 @@ Message from section two - - + + unexpected exception - - + + thisThrows() == 0 thisThrows() == 0 - + expected exception - - + + thisThrows() == 0 thisThrows() == 0 - + expected exception - - + + thisThrows() == 0 thisThrows() == 0 - + expected exception - -
- + +
+ unexpected exception
- + - + Uncomment the code in this test to check that it gives a sensible compiler error - + Uncomment the code in this test to check that it gives a sensible compiler error - + - + - + - + - -
- + +
+ encode( "normal string" ) == "normal string" @@ -7539,8 +7539,8 @@ Message from section two
-
- +
+ encode( "" ) == "" @@ -7550,8 +7550,8 @@ Message from section two
-
- +
+ encode( "smith & jones" ) == "smith &amp; jones" @@ -7561,8 +7561,8 @@ Message from section two
-
- +
+ encode( "smith < jones" ) == "smith &lt; jones" @@ -7572,8 +7572,8 @@ Message from section two
-
- +
+ encode( "smith > jones" ) == "smith > jones" @@ -7581,7 +7581,7 @@ Message from section two "smith > jones" == "smith > jones" - + encode( "smith ]]> jones" ) == "smith ]]&gt; jones" @@ -7593,8 +7593,8 @@ Message from section two
-
- +
+ encode( stringWithQuotes ) == stringWithQuotes @@ -7604,7 +7604,7 @@ Message from section two "don't "quote" me on that" - + encode( stringWithQuotes, Catch::XmlEncode::ForAttributes ) == "don't &quot;quote&quot; me on that" @@ -7616,8 +7616,8 @@ Message from section two
-
- +
+ encode( "[\x01]" ) == "[\\x01]" @@ -7627,8 +7627,8 @@ Message from section two
-
- +
+ encode( "[\x7F]" ) == "[\\x7F]" @@ -7640,8 +7640,8 @@ Message from section two
- - + + x == 0 @@ -7651,8 +7651,8 @@ Message from section two - - + + obj.prop != 0 @@ -7662,8 +7662,8 @@ Message from section two - - + + flag @@ -7671,7 +7671,7 @@ Message from section two true - + testCheckedElse( true ) @@ -7681,8 +7681,8 @@ Message from section two - - + + flag @@ -7690,7 +7690,7 @@ Message from section two false - + testCheckedElse( false ) @@ -7700,8 +7700,8 @@ Message from section two - - + + flag @@ -7709,7 +7709,7 @@ Message from section two true - + testCheckedIf( true ) @@ -7719,8 +7719,8 @@ Message from section two - - + + flag @@ -7728,7 +7728,7 @@ Message from section two false - + testCheckedIf( false ) @@ -7738,8 +7738,8 @@ Message from section two - - + + unsigned_char_var == 1 @@ -7747,7 +7747,7 @@ Message from section two 1 == 1 - + unsigned_short_var == 1 @@ -7755,7 +7755,7 @@ Message from section two 1 == 1 - + unsigned_int_var == 1 @@ -7763,7 +7763,7 @@ Message from section two 1 == 1 - + unsigned_long_var == 1 @@ -7773,8 +7773,8 @@ Message from section two - - + + long_var == unsigned_char_var @@ -7782,7 +7782,7 @@ Message from section two 1 == 1 - + long_var == unsigned_short_var @@ -7790,7 +7790,7 @@ Message from section two 1 == 1 - + long_var == unsigned_int_var @@ -7798,7 +7798,7 @@ Message from section two 1 == 1 - + long_var == unsigned_long_var @@ -7808,42 +7808,42 @@ Message from section two - -
-
+ +
+
-
-
+
+
-
+
- + - + loose text artifact - - + + Previous info should not be seen - + - - + + l == std::numeric_limits<long long>::max() @@ -7855,9 +7855,9 @@ loose text artifact - -
- + +
+ b > a @@ -7869,11 +7869,11 @@ loose text artifact
- + Testing if fib[0] (1) is even - + ( fib[i] % 2 ) == 0 @@ -7884,7 +7884,7 @@ loose text artifact Testing if fib[1] (1) is even - + ( fib[i] % 2 ) == 0 @@ -7895,7 +7895,7 @@ loose text artifact Testing if fib[2] (2) is even - + ( fib[i] % 2 ) == 0 @@ -7906,7 +7906,7 @@ loose text artifact Testing if fib[3] (3) is even - + ( fib[i] % 2 ) == 0 @@ -7917,7 +7917,7 @@ loose text artifact Testing if fib[4] (5) is even - + ( fib[i] % 2 ) == 0 @@ -7928,7 +7928,7 @@ loose text artifact Testing if fib[5] (8) is even - + ( fib[i] % 2 ) == 0 @@ -7939,7 +7939,7 @@ loose text artifact Testing if fib[6] (13) is even - + ( fib[i] % 2 ) == 0 @@ -7950,7 +7950,7 @@ loose text artifact Testing if fib[7] (21) is even - + ( fib[i] % 2 ) == 0 @@ -7960,10 +7960,10 @@ loose text artifact - -
-
- + +
+
+ a == b @@ -7975,9 +7975,9 @@ loose text artifact
-
-
- +
+
+ a != b @@ -7989,9 +7989,9 @@ loose text artifact
-
-
- +
+
+ a < b @@ -8005,9 +8005,9 @@ loose text artifact
- -
- + +
+ a != b @@ -8015,7 +8015,7 @@ loose text artifact 1 != 2 - + b != a @@ -8023,8 +8023,8 @@ loose text artifact 2 != 1 -
- +
+ a != b @@ -8038,8 +8038,8 @@ loose text artifact
- - + + s == "7" @@ -8049,8 +8049,8 @@ loose text artifact - - + + ti == typeid(int) @@ -8060,11 +8060,11 @@ loose text artifact - + - - + + makeString( false ) != static_cast<char*>(0) @@ -8072,7 +8072,7 @@ loose text artifact "valid string" != {null string} - + makeString( true ) == static_cast<char*>(0) @@ -8082,8 +8082,8 @@ loose text artifact - - + + ptr.get() == 0 @@ -8093,8 +8093,8 @@ loose text artifact - - + + ::Catch::Detail::stringify( pair ) == "{ { 42, \"Arthur\" }, { \"Ford\", 24 } }" @@ -8106,8 +8106,8 @@ loose text artifact - - + + p == 0 @@ -8117,9 +8117,9 @@ loose text artifact - -
- + +
+ a != b @@ -8127,7 +8127,7 @@ loose text artifact 1 != 2 - + b != a @@ -8137,8 +8137,8 @@ loose text artifact
-
- +
+ a != b @@ -8150,9 +8150,9 @@ loose text artifact
- -
- + +
+ Catch::replaceInPlace( letters, "b", "z" ) @@ -8160,7 +8160,7 @@ loose text artifact true - + letters == "azcdefcg" @@ -8170,8 +8170,8 @@ loose text artifact
-
- +
+ Catch::replaceInPlace( letters, "c", "z" ) @@ -8179,7 +8179,7 @@ loose text artifact true - + letters == "abzdefzg" @@ -8189,8 +8189,8 @@ loose text artifact
-
- +
+ Catch::replaceInPlace( letters, "a", "z" ) @@ -8198,7 +8198,7 @@ loose text artifact true - + letters == "zbcdefcg" @@ -8208,8 +8208,8 @@ loose text artifact
-
- +
+ Catch::replaceInPlace( letters, "g", "z" ) @@ -8217,7 +8217,7 @@ loose text artifact true - + letters == "abcdefcz" @@ -8227,8 +8227,8 @@ loose text artifact
-
- +
+ Catch::replaceInPlace( letters, letters, "replaced" ) @@ -8236,7 +8236,7 @@ loose text artifact true - + letters == "replaced" @@ -8246,8 +8246,8 @@ loose text artifact
-
- +
+ !(Catch::replaceInPlace( letters, "x", "z" )) @@ -8255,7 +8255,7 @@ loose text artifact !false - + letters == letters @@ -8265,8 +8265,8 @@ loose text artifact
-
- +
+ Catch::replaceInPlace( s, "'", "|'" ) @@ -8274,7 +8274,7 @@ loose text artifact true - + s == "didn|'t" @@ -8286,14 +8286,14 @@ loose text artifact
- + - + 3 - + false @@ -8303,14 +8303,14 @@ loose text artifact - + hi i := 7 - + false @@ -8320,8 +8320,8 @@ loose text artifact - - + + ::Catch::Detail::stringify(value) == "{ 34, \"xyzzy\" }" @@ -8331,8 +8331,8 @@ loose text artifact - - + + ::Catch::Detail::stringify( value ) == "{ 34, \"xyzzy\" }" @@ -8342,8 +8342,8 @@ loose text artifact - - + + ::Catch::Detail::stringify( pr ) == "{ { \"green\", 55 } }" @@ -8355,8 +8355,8 @@ loose text artifact - - + + std::string( "first" ) == "second" @@ -8366,8 +8366,8 @@ loose text artifact - - + + ::Catch::Detail::stringify( item ) == "StringMaker<has_maker>" @@ -8379,8 +8379,8 @@ loose text artifact - - + + ::Catch::Detail::stringify( item ) == "StringMaker<has_maker_and_operator>" @@ -8392,8 +8392,8 @@ loose text artifact - - + + ::Catch::Detail::stringify( item ) == "operator<<( has_operator )" @@ -8405,8 +8405,8 @@ loose text artifact - - + + result == "\"wide load\"" @@ -8416,8 +8416,8 @@ loose text artifact - - + + result == "\"wide load\"" @@ -8427,8 +8427,8 @@ loose text artifact - - + + result == "\"wide load\"" @@ -8438,8 +8438,8 @@ loose text artifact - - + + result == "\"wide load\"" @@ -8449,8 +8449,8 @@ loose text artifact - - + + ::Catch::Detail::stringify( v ) == "{ StringMaker<has_maker> }" @@ -8462,8 +8462,8 @@ loose text artifact - - + + ::Catch::Detail::stringify(e0) == "E2/V0" @@ -8471,7 +8471,7 @@ loose text artifact "E2/V0" == "E2/V0" - + ::Catch::Detail::stringify(e1) == "E2/V1" @@ -8479,7 +8479,7 @@ loose text artifact "E2/V1" == "E2/V1" - + ::Catch::Detail::stringify(e3) == "Unknown enum value 10" @@ -8491,8 +8491,8 @@ loose text artifact - - + + ::Catch::Detail::stringify(e0) == "0" @@ -8500,7 +8500,7 @@ loose text artifact "{?}" == "0" - + ::Catch::Detail::stringify(e1) == "1" @@ -8510,8 +8510,8 @@ loose text artifact - - + + ::Catch::Detail::stringify(e0) == "E2{0}" @@ -8519,7 +8519,7 @@ loose text artifact "E2{0}" == "E2{0}" - + ::Catch::Detail::stringify(e1) == "E2{1}" @@ -8529,8 +8529,8 @@ loose text artifact - - + + ::Catch::Detail::stringify(e0) == "0" @@ -8538,7 +8538,7 @@ loose text artifact "0" == "0" - + ::Catch::Detail::stringify(e1) == "1" @@ -8548,8 +8548,8 @@ loose text artifact - - + + "{ }" == ::Catch::Detail::stringify(type{}) @@ -8557,7 +8557,7 @@ loose text artifact "{ }" == "{ }" - + "{ }" == ::Catch::Detail::stringify(value) @@ -8567,8 +8567,8 @@ loose text artifact - - + + "1.2f" == ::Catch::Detail::stringify(float(1.2)) @@ -8576,7 +8576,7 @@ loose text artifact "1.2f" == "1.2f" - + "{ 1.2f, 0 }" == ::Catch::Detail::stringify(type{1.2f,0}) @@ -8586,8 +8586,8 @@ loose text artifact - - + + "{ 0 }" == ::Catch::Detail::stringify(type{0}) @@ -8597,8 +8597,8 @@ loose text artifact - - + + "{ 0, 42, \"Catch me\" }" == ::Catch::Detail::stringify(value) @@ -8610,8 +8610,8 @@ loose text artifact - - + + "{ \"hello\", \"world\" }" == ::Catch::Detail::stringify(type{"hello","world"}) @@ -8623,8 +8623,8 @@ loose text artifact - - + + "{ { 42 }, { }, 1.2f }" == ::Catch::Detail::stringify(value) @@ -8636,8 +8636,8 @@ loose text artifact - - + + ::Catch::Detail::stringify(v) == "{ }" @@ -8645,7 +8645,7 @@ loose text artifact "{ }" == "{ }" - + ::Catch::Detail::stringify(v) == "{ { \"hello\" }, { \"world\" } }" @@ -8657,8 +8657,8 @@ loose text artifact - - + + ::Catch::Detail::stringify(vv) == "{ }" @@ -8666,7 +8666,7 @@ loose text artifact "{ }" == "{ }" - + ::Catch::Detail::stringify(vv) == "{ 42 }" @@ -8674,7 +8674,7 @@ loose text artifact "{ 42 }" == "{ 42 }" - + ::Catch::Detail::stringify(vv) == "{ 42, 250 }" @@ -8684,8 +8684,8 @@ loose text artifact - - + + ::Catch::Detail::stringify(vv) == "{ }" @@ -8693,7 +8693,7 @@ loose text artifact "{ }" == "{ }" - + ::Catch::Detail::stringify(vv) == "{ 42 }" @@ -8701,7 +8701,7 @@ loose text artifact "{ 42 }" == "{ 42 }" - + ::Catch::Detail::stringify(vv) == "{ 42, 250 }" @@ -8711,8 +8711,8 @@ loose text artifact - - + + ::Catch::Detail::stringify(vv) == "{ }" @@ -8720,7 +8720,7 @@ loose text artifact "{ }" == "{ }" - + ::Catch::Detail::stringify(vv) == "{ \"hello\" }" @@ -8728,7 +8728,7 @@ loose text artifact "{ "hello" }" == "{ "hello" }" - + ::Catch::Detail::stringify(vv) == "{ \"hello\", \"world\" }" @@ -8740,8 +8740,8 @@ loose text artifact - - + + v.size() == 5 @@ -8749,7 +8749,7 @@ loose text artifact 5 == 5 - + v.capacity() >= 5 @@ -8757,8 +8757,8 @@ loose text artifact 5 >= 5 -
- +
+ v.size() == 10 @@ -8766,7 +8766,7 @@ loose text artifact 10 == 10 - + v.capacity() >= 10 @@ -8776,7 +8776,7 @@ loose text artifact
- + v.size() == 5 @@ -8784,7 +8784,7 @@ loose text artifact 5 == 5 - + v.capacity() >= 5 @@ -8792,8 +8792,8 @@ loose text artifact 5 >= 5 -
- +
+ v.size() == 0 @@ -8801,7 +8801,7 @@ loose text artifact 0 == 0 - + v.capacity() >= 5 @@ -8809,8 +8809,8 @@ loose text artifact 5 >= 5 -
- +
+ v.capacity() == 0 @@ -8822,7 +8822,7 @@ loose text artifact
- + v.size() == 5 @@ -8830,7 +8830,7 @@ loose text artifact 5 == 5 - + v.capacity() >= 5 @@ -8838,8 +8838,8 @@ loose text artifact 5 >= 5 -
- +
+ v.size() == 5 @@ -8847,7 +8847,7 @@ loose text artifact 5 == 5 - + v.capacity() >= 10 @@ -8857,7 +8857,7 @@ loose text artifact
- + v.size() == 5 @@ -8865,7 +8865,7 @@ loose text artifact 5 == 5 - + v.capacity() >= 5 @@ -8873,8 +8873,8 @@ loose text artifact 5 >= 5 -
- +
+ v.size() == 5 @@ -8882,7 +8882,7 @@ loose text artifact 5 == 5 - + v.capacity() >= 5 @@ -8894,11 +8894,11 @@ loose text artifact
- -
+ +
-
+
diff --git a/projects/SelfTest/CmdLineTests.cpp b/projects/SelfTest/IntrospectiveTests/CmdLineTests.cpp similarity index 100% rename from projects/SelfTest/CmdLineTests.cpp rename to projects/SelfTest/IntrospectiveTests/CmdLineTests.cpp diff --git a/projects/SelfTest/PartTrackerTests.cpp b/projects/SelfTest/IntrospectiveTests/PartTrackerTests.cpp similarity index 100% rename from projects/SelfTest/PartTrackerTests.cpp rename to projects/SelfTest/IntrospectiveTests/PartTrackerTests.cpp diff --git a/projects/SelfTest/StringRef.tests.cpp b/projects/SelfTest/IntrospectiveTests/StringRef.tests.cpp similarity index 99% rename from projects/SelfTest/StringRef.tests.cpp rename to projects/SelfTest/IntrospectiveTests/StringRef.tests.cpp index d12c79a3..763952ff 100644 --- a/projects/SelfTest/StringRef.tests.cpp +++ b/projects/SelfTest/IntrospectiveTests/StringRef.tests.cpp @@ -1,4 +1,4 @@ -#include "../include/internal/catch_stringref.h" +#include "internal/catch_stringref.h" #include "catch.hpp" diff --git a/projects/SelfTest/TagAliasTests.cpp b/projects/SelfTest/IntrospectiveTests/TagAliasTests.cpp similarity index 100% rename from projects/SelfTest/TagAliasTests.cpp rename to projects/SelfTest/IntrospectiveTests/TagAliasTests.cpp diff --git a/projects/SelfTest/TestMain.cpp b/projects/SelfTest/IntrospectiveTests/TestMain.cpp similarity index 97% rename from projects/SelfTest/TestMain.cpp rename to projects/SelfTest/IntrospectiveTests/TestMain.cpp index 68271b7e..cf574277 100644 --- a/projects/SelfTest/TestMain.cpp +++ b/projects/SelfTest/IntrospectiveTests/TestMain.cpp @@ -8,9 +8,9 @@ #define CATCH_CONFIG_MAIN #include "catch.hpp" -#include "../include/reporters/catch_reporter_teamcity.hpp" -#include "../include/reporters/catch_reporter_tap.hpp" -#include "../include/reporters/catch_reporter_automake.hpp" +#include "reporters/catch_reporter_teamcity.hpp" +#include "reporters/catch_reporter_tap.hpp" +#include "reporters/catch_reporter_automake.hpp" // Some example tag aliases diff --git a/projects/SelfTest/IntrospectiveTests/XmlTests.cpp b/projects/SelfTest/IntrospectiveTests/XmlTests.cpp new file mode 100644 index 00000000..9bbed258 --- /dev/null +++ b/projects/SelfTest/IntrospectiveTests/XmlTests.cpp @@ -0,0 +1,41 @@ +#include "catch.hpp" + +#include "internal/catch_xmlwriter.h" + +#include + +inline std::string encode( std::string const& str, Catch::XmlEncode::ForWhat forWhat = Catch::XmlEncode::ForTextNodes ) { + std::ostringstream oss; + oss << Catch::XmlEncode( str, forWhat ); + return oss.str(); +} + +TEST_CASE( "XmlEncode" ) { + SECTION( "normal string" ) { + REQUIRE( encode( "normal string" ) == "normal string" ); + } + SECTION( "empty string" ) { + REQUIRE( encode( "" ) == "" ); + } + SECTION( "string with ampersand" ) { + REQUIRE( encode( "smith & jones" ) == "smith & jones" ); + } + SECTION( "string with less-than" ) { + REQUIRE( encode( "smith < jones" ) == "smith < jones" ); + } + SECTION( "string with greater-than" ) { + REQUIRE( encode( "smith > jones" ) == "smith > jones" ); + REQUIRE( encode( "smith ]]> jones" ) == "smith ]]> jones" ); + } + SECTION( "string with quotes" ) { + std::string stringWithQuotes = "don't \"quote\" me on that"; + REQUIRE( encode( stringWithQuotes ) == stringWithQuotes ); + REQUIRE( encode( stringWithQuotes, Catch::XmlEncode::ForAttributes ) == "don't "quote" me on that" ); + } + SECTION( "string with control char (1)" ) { + REQUIRE( encode( "[\x01]" ) == "[\\x01]" ); + } + SECTION( "string with control char (x7F)" ) { + REQUIRE( encode( "[\x7F]" ) == "[\\x7F]" ); + } +} \ No newline at end of file diff --git a/projects/SelfTest/ApproxTests.cpp b/projects/SelfTest/UsageTests/ApproxTests.cpp similarity index 100% rename from projects/SelfTest/ApproxTests.cpp rename to projects/SelfTest/UsageTests/ApproxTests.cpp diff --git a/projects/SelfTest/BDDTests.cpp b/projects/SelfTest/UsageTests/BDDTests.cpp similarity index 100% rename from projects/SelfTest/BDDTests.cpp rename to projects/SelfTest/UsageTests/BDDTests.cpp diff --git a/projects/SelfTest/Benchmark.tests.cpp b/projects/SelfTest/UsageTests/Benchmark.tests.cpp similarity index 100% rename from projects/SelfTest/Benchmark.tests.cpp rename to projects/SelfTest/UsageTests/Benchmark.tests.cpp diff --git a/projects/SelfTest/ClassTests.cpp b/projects/SelfTest/UsageTests/ClassTests.cpp similarity index 100% rename from projects/SelfTest/ClassTests.cpp rename to projects/SelfTest/UsageTests/ClassTests.cpp diff --git a/projects/SelfTest/CompilationTests.cpp b/projects/SelfTest/UsageTests/CompilationTests.cpp similarity index 100% rename from projects/SelfTest/CompilationTests.cpp rename to projects/SelfTest/UsageTests/CompilationTests.cpp diff --git a/projects/SelfTest/ConditionTests.cpp b/projects/SelfTest/UsageTests/ConditionTests.cpp similarity index 100% rename from projects/SelfTest/ConditionTests.cpp rename to projects/SelfTest/UsageTests/ConditionTests.cpp diff --git a/projects/SelfTest/DecompositionTests.cpp b/projects/SelfTest/UsageTests/DecompositionTests.cpp similarity index 100% rename from projects/SelfTest/DecompositionTests.cpp rename to projects/SelfTest/UsageTests/DecompositionTests.cpp diff --git a/projects/SelfTest/EnumToString.cpp b/projects/SelfTest/UsageTests/EnumToString.cpp similarity index 100% rename from projects/SelfTest/EnumToString.cpp rename to projects/SelfTest/UsageTests/EnumToString.cpp diff --git a/projects/SelfTest/ExceptionTests.cpp b/projects/SelfTest/UsageTests/ExceptionTests.cpp similarity index 100% rename from projects/SelfTest/ExceptionTests.cpp rename to projects/SelfTest/UsageTests/ExceptionTests.cpp diff --git a/projects/SelfTest/MatchersTests.cpp b/projects/SelfTest/UsageTests/MatchersTests.cpp similarity index 100% rename from projects/SelfTest/MatchersTests.cpp rename to projects/SelfTest/UsageTests/MatchersTests.cpp diff --git a/projects/SelfTest/MessageTests.cpp b/projects/SelfTest/UsageTests/MessageTests.cpp similarity index 100% rename from projects/SelfTest/MessageTests.cpp rename to projects/SelfTest/UsageTests/MessageTests.cpp diff --git a/projects/SelfTest/MiscTests.cpp b/projects/SelfTest/UsageTests/MiscTests.cpp similarity index 86% rename from projects/SelfTest/MiscTests.cpp rename to projects/SelfTest/UsageTests/MiscTests.cpp index a7449081..45e09cfa 100644 --- a/projects/SelfTest/MiscTests.cpp +++ b/projects/SelfTest/UsageTests/MiscTests.cpp @@ -13,7 +13,6 @@ # pragma clang diagnostic ignored "-Wc++98-compat-pedantic" #endif -#include "internal/catch_xmlwriter.h" #include #include @@ -293,42 +292,6 @@ TEST_CASE( "toString on wchar_t returns the string contents", "[toString]" ) { CHECK( result == "\"wide load\"" ); } -inline std::string encode( std::string const& str, Catch::XmlEncode::ForWhat forWhat = Catch::XmlEncode::ForTextNodes ) { - std::ostringstream oss; - oss << Catch::XmlEncode( str, forWhat ); - return oss.str(); -} - -TEST_CASE( "XmlEncode" ) { - SECTION( "normal string" ) { - REQUIRE( encode( "normal string" ) == "normal string" ); - } - SECTION( "empty string" ) { - REQUIRE( encode( "" ) == "" ); - } - SECTION( "string with ampersand" ) { - REQUIRE( encode( "smith & jones" ) == "smith & jones" ); - } - SECTION( "string with less-than" ) { - REQUIRE( encode( "smith < jones" ) == "smith < jones" ); - } - SECTION( "string with greater-than" ) { - REQUIRE( encode( "smith > jones" ) == "smith > jones" ); - REQUIRE( encode( "smith ]]> jones" ) == "smith ]]> jones" ); - } - SECTION( "string with quotes" ) { - std::string stringWithQuotes = "don't \"quote\" me on that"; - REQUIRE( encode( stringWithQuotes ) == stringWithQuotes ); - REQUIRE( encode( stringWithQuotes, Catch::XmlEncode::ForAttributes ) == "don't "quote" me on that" ); - } - SECTION( "string with control char (1)" ) { - REQUIRE( encode( "[\x01]" ) == "[\\x01]" ); - } - SECTION( "string with control char (x7F)" ) { - REQUIRE( encode( "[\x7F]" ) == "[\\x7F]" ); - } -} - TEST_CASE( "long long" ) { long long l = std::numeric_limits::max(); diff --git a/projects/SelfTest/ToStringChrono.cpp b/projects/SelfTest/UsageTests/ToStringChrono.cpp similarity index 100% rename from projects/SelfTest/ToStringChrono.cpp rename to projects/SelfTest/UsageTests/ToStringChrono.cpp diff --git a/projects/SelfTest/ToStringGeneralTests.cpp b/projects/SelfTest/UsageTests/ToStringGeneralTests.cpp similarity index 100% rename from projects/SelfTest/ToStringGeneralTests.cpp rename to projects/SelfTest/UsageTests/ToStringGeneralTests.cpp diff --git a/projects/SelfTest/ToStringPair.cpp b/projects/SelfTest/UsageTests/ToStringPair.cpp similarity index 100% rename from projects/SelfTest/ToStringPair.cpp rename to projects/SelfTest/UsageTests/ToStringPair.cpp diff --git a/projects/SelfTest/ToStringTuple.cpp b/projects/SelfTest/UsageTests/ToStringTuple.cpp similarity index 100% rename from projects/SelfTest/ToStringTuple.cpp rename to projects/SelfTest/UsageTests/ToStringTuple.cpp diff --git a/projects/SelfTest/ToStringVector.cpp b/projects/SelfTest/UsageTests/ToStringVector.cpp similarity index 100% rename from projects/SelfTest/ToStringVector.cpp rename to projects/SelfTest/UsageTests/ToStringVector.cpp diff --git a/projects/SelfTest/ToStringWhich.cpp b/projects/SelfTest/UsageTests/ToStringWhich.cpp similarity index 100% rename from projects/SelfTest/ToStringWhich.cpp rename to projects/SelfTest/UsageTests/ToStringWhich.cpp diff --git a/projects/SelfTest/TrickyTests.cpp b/projects/SelfTest/UsageTests/TrickyTests.cpp similarity index 100% rename from projects/SelfTest/TrickyTests.cpp rename to projects/SelfTest/UsageTests/TrickyTests.cpp diff --git a/projects/SelfTest/VariadicMacrosTests.cpp b/projects/SelfTest/UsageTests/VariadicMacrosTests.cpp similarity index 100% rename from projects/SelfTest/VariadicMacrosTests.cpp rename to projects/SelfTest/UsageTests/VariadicMacrosTests.cpp