diff --git a/projects/SelfTest/Baselines/console.std.approved.txt b/projects/SelfTest/Baselines/console.std.approved.txt index 81dfd96c..ecd074a5 100644 --- a/projects/SelfTest/Baselines/console.std.approved.txt +++ b/projects/SelfTest/Baselines/console.std.approved.txt @@ -890,6 +890,6 @@ with expansion: "first" == "second" =============================================================================== -test cases: 162 | 117 passed | 43 failed | 2 failed as expected -assertions: 948 | 844 passed | 86 failed | 18 failed as expected +test cases: 163 | 118 passed | 43 failed | 2 failed as expected +assertions: 953 | 849 passed | 86 failed | 18 failed as expected diff --git a/projects/SelfTest/Baselines/console.sw.approved.txt b/projects/SelfTest/Baselines/console.sw.approved.txt index 13a187d0..55137b31 100644 --- a/projects/SelfTest/Baselines/console.sw.approved.txt +++ b/projects/SelfTest/Baselines/console.sw.approved.txt @@ -304,6 +304,42 @@ TrickyTests.cpp:: FAILED: with expansion: {?} == {?} +------------------------------------------------------------------------------- +Absolute margin +------------------------------------------------------------------------------- +ApproxTests.cpp: +............................................................................... + +ApproxTests.cpp:: +PASSED: + REQUIRE( 104.0 != Approx(100.0) ) +with expansion: + 104.0 != Approx( 100.0 ) + +ApproxTests.cpp:: +PASSED: + REQUIRE( 104.0 == Approx(100.0).margin(5) ) +with expansion: + 104.0 == Approx( 100.0 ) + +ApproxTests.cpp:: +PASSED: + REQUIRE( 104.0 != Approx(100.0).margin(3) ) +with expansion: + 104.0 != Approx( 100.0 ) + +ApproxTests.cpp:: +PASSED: + REQUIRE( 100.3 != Approx(100.0) ) +with expansion: + 100.3 != Approx( 100.0 ) + +ApproxTests.cpp:: +PASSED: + REQUIRE( 100.3 == Approx(100.0).margin(0.5) ) +with expansion: + 100.3 == Approx( 100.0 ) + ------------------------------------------------------------------------------- AllOf matcher ------------------------------------------------------------------------------- @@ -9288,6 +9324,6 @@ MiscTests.cpp:: PASSED: =============================================================================== -test cases: 162 | 116 passed | 44 failed | 2 failed as expected -assertions: 950 | 844 passed | 88 failed | 18 failed as expected +test cases: 163 | 117 passed | 44 failed | 2 failed as expected +assertions: 955 | 849 passed | 88 failed | 18 failed as expected diff --git a/projects/SelfTest/Baselines/junit.sw.approved.txt b/projects/SelfTest/Baselines/junit.sw.approved.txt index 23044dc6..400b1c8b 100644 --- a/projects/SelfTest/Baselines/junit.sw.approved.txt +++ b/projects/SelfTest/Baselines/junit.sw.approved.txt @@ -1,6 +1,6 @@ - + @@ -63,6 +63,7 @@ TrickyTests.cpp: TrickyTests.cpp: + diff --git a/projects/SelfTest/Baselines/xml.sw.approved.txt b/projects/SelfTest/Baselines/xml.sw.approved.txt index f62de9e3..62e3abaf 100644 --- a/projects/SelfTest/Baselines/xml.sw.approved.txt +++ b/projects/SelfTest/Baselines/xml.sw.approved.txt @@ -341,6 +341,49 @@ + + + + 104.0 != Approx(100.0) + + + 104.0 != Approx( 100.0 ) + + + + + 104.0 == Approx(100.0).margin(5) + + + 104.0 == Approx( 100.0 ) + + + + + 104.0 != Approx(100.0).margin(3) + + + 104.0 != Approx( 100.0 ) + + + + + 100.3 != Approx(100.0) + + + 100.3 != Approx( 100.0 ) + + + + + 100.3 == Approx(100.0).margin(0.5) + + + 100.3 == Approx( 100.0 ) + + + + @@ -9842,7 +9885,7 @@ spanner - + - +