diff --git a/projects/SelfTest/Baselines/console.std.approved.txt b/projects/SelfTest/Baselines/console.std.approved.txt
index 0b8f1bd9..12dc52ee 100644
--- a/projects/SelfTest/Baselines/console.std.approved.txt
+++ b/projects/SelfTest/Baselines/console.std.approved.txt
@@ -830,6 +830,6 @@ with expansion:
"first" == "second"
===============================================================================
-test cases: 157 | 113 passed | 42 failed | 2 failed as expected
-assertions: 901 | 805 passed | 78 failed | 18 failed as expected
+test cases: 159 | 115 passed | 42 failed | 2 failed as expected
+assertions: 909 | 813 passed | 78 failed | 18 failed as expected
diff --git a/projects/SelfTest/Baselines/console.sw.approved.txt b/projects/SelfTest/Baselines/console.sw.approved.txt
index 4d7177dd..ab488d3b 100644
--- a/projects/SelfTest/Baselines/console.sw.approved.txt
+++ b/projects/SelfTest/Baselines/console.sw.approved.txt
@@ -2366,6 +2366,36 @@ PASSED:
with expansion:
214 == 214
+-------------------------------------------------------------------------------
+Greater-than inequalities with different epsilons
+-------------------------------------------------------------------------------
+ApproxTests.cpp:<line number>
+...............................................................................
+
+ApproxTests.cpp:<line number>:
+PASSED:
+ REQUIRE( d >= Approx( 1.22 ) )
+with expansion:
+ 1.23 >= Approx( 1.22 )
+
+ApproxTests.cpp:<line number>:
+PASSED:
+ REQUIRE( d >= Approx( 1.23 ) )
+with expansion:
+ 1.23 >= Approx( 1.23 )
+
+ApproxTests.cpp:<line number>:
+PASSED:
+ REQUIRE_FALSE( d >= Approx( 1.24 ) )
+with expansion:
+ !(1.23 >= Approx( 1.24 ))
+
+ApproxTests.cpp:<line number>:
+PASSED:
+ REQUIRE( d >= Approx( 1.24 ).epsilon(0.1) )
+with expansion:
+ 1.23 >= Approx( 1.24 )
+
-------------------------------------------------------------------------------
INFO and WARN do not abort tests
-------------------------------------------------------------------------------
@@ -2530,6 +2560,36 @@ PASSED:
with expansion:
5 != 6
+-------------------------------------------------------------------------------
+Less-than inequalities with different epsilons
+-------------------------------------------------------------------------------
+ApproxTests.cpp:<line number>
+...............................................................................
+
+ApproxTests.cpp:<line number>:
+PASSED:
+ REQUIRE( d <= Approx( 1.24 ) )
+with expansion:
+ 1.23 <= Approx( 1.24 )
+
+ApproxTests.cpp:<line number>:
+PASSED:
+ REQUIRE( d <= Approx( 1.23 ) )
+with expansion:
+ 1.23 <= Approx( 1.23 )
+
+ApproxTests.cpp:<line number>:
+PASSED:
+ REQUIRE_FALSE( d <= Approx( 1.22 ) )
+with expansion:
+ !(1.23 <= Approx( 1.22 ))
+
+ApproxTests.cpp:<line number>:
+PASSED:
+ REQUIRE( d <= Approx( 1.22 ).epsilon(0.1) )
+with expansion:
+ 1.23 <= Approx( 1.22 )
+
-------------------------------------------------------------------------------
Long strings can be wrapped
plain string
@@ -8911,6 +8971,6 @@ MiscTests.cpp:<line number>:
PASSED:
===============================================================================
-test cases: 157 | 112 passed | 43 failed | 2 failed as expected
-assertions: 903 | 805 passed | 80 failed | 18 failed as expected
+test cases: 159 | 114 passed | 43 failed | 2 failed as expected
+assertions: 911 | 813 passed | 80 failed | 18 failed as expected
diff --git a/projects/SelfTest/Baselines/junit.sw.approved.txt b/projects/SelfTest/Baselines/junit.sw.approved.txt
index 1b4cd69f..a8b43453 100644
--- a/projects/SelfTest/Baselines/junit.sw.approved.txt
+++ b/projects/SelfTest/Baselines/junit.sw.approved.txt
@@ -1,6 +1,6 @@
<?xml version="1.1" encoding="UTF-8"?>
<testsuites>
- <testsuite name="<exe-name>" errors="13" failures="68" tests="904" hostname="tbd" time="{duration}" timestamp="tbd">
+ <testsuite name="<exe-name>" errors="13" failures="68" tests="912" hostname="tbd" time="{duration}" timestamp="tbd">
<testcase classname="global" name="# A test name that starts with a #" time="{duration}"/>
<testcase classname="global" name="'Not' checks that should fail" time="{duration}">
<failure message="false != false" type="CHECK">
@@ -193,6 +193,7 @@ MessageTests.cpp:<line number>
<testcase classname="global" name="Factorials are computed" time="{duration}"/>
<testcase classname="global" name="Generator over a range of pairs" time="{duration}"/>
<testcase classname="global" name="Generators over two ranges" time="{duration}"/>
+ <testcase classname="global" name="Greater-than inequalities with different epsilons" time="{duration}"/>
<testcase classname="global" name="INFO and WARN do not abort tests" time="{duration}"/>
<testcase classname="global" name="INFO gets logged on failure" time="{duration}">
<failure message="2 == 1" type="REQUIRE">
@@ -229,6 +230,7 @@ ConditionTests.cpp:<line number>
</failure>
</testcase>
<testcase classname="global" name="Inequality checks that should succeed" time="{duration}"/>
+ <testcase classname="global" name="Less-than inequalities with different epsilons" time="{duration}"/>
<testcase classname="Long strings can be wrapped" name="plain string/No wrapping" time="{duration}"/>
<testcase classname="Long strings can be wrapped" name="plain string/Wrapped once" time="{duration}"/>
<testcase classname="Long strings can be wrapped" name="plain string/Wrapped twice" time="{duration}"/>
diff --git a/projects/SelfTest/Baselines/xml.sw.approved.txt b/projects/SelfTest/Baselines/xml.sw.approved.txt
index 1484d398..c09629e1 100644
--- a/projects/SelfTest/Baselines/xml.sw.approved.txt
+++ b/projects/SelfTest/Baselines/xml.sw.approved.txt
@@ -2343,6 +2343,41 @@
</Expression>
<OverallResult success="true"/>
</TestCase>
+ <TestCase name="Greater-than inequalities with different epsilons">
+ <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/ApproxTests.cpp" >
+ <Original>
+ d >= Approx( 1.22 )
+ </Original>
+ <Expanded>
+ 1.23 >= Approx( 1.22 )
+ </Expanded>
+ </Expression>
+ <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/ApproxTests.cpp" >
+ <Original>
+ d >= Approx( 1.23 )
+ </Original>
+ <Expanded>
+ 1.23 >= Approx( 1.23 )
+ </Expanded>
+ </Expression>
+ <Expression success="true" type="REQUIRE_FALSE" filename="projects/<exe-name>/ApproxTests.cpp" >
+ <Original>
+ !d >= Approx( 1.24 )
+ </Original>
+ <Expanded>
+ !(1.23 >= Approx( 1.24 ))
+ </Expanded>
+ </Expression>
+ <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/ApproxTests.cpp" >
+ <Original>
+ d >= Approx( 1.24 ).epsilon(0.1)
+ </Original>
+ <Expanded>
+ 1.23 >= Approx( 1.24 )
+ </Expanded>
+ </Expression>
+ <OverallResult success="true"/>
+ </TestCase>
<TestCase name="INFO and WARN do not abort tests">
<Info>
this is a message
@@ -2544,6 +2579,41 @@
</Expression>
<OverallResult success="true"/>
</TestCase>
+ <TestCase name="Less-than inequalities with different epsilons">
+ <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/ApproxTests.cpp" >
+ <Original>
+ d <= Approx( 1.24 )
+ </Original>
+ <Expanded>
+ 1.23 <= Approx( 1.24 )
+ </Expanded>
+ </Expression>
+ <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/ApproxTests.cpp" >
+ <Original>
+ d <= Approx( 1.23 )
+ </Original>
+ <Expanded>
+ 1.23 <= Approx( 1.23 )
+ </Expanded>
+ </Expression>
+ <Expression success="true" type="REQUIRE_FALSE" filename="projects/<exe-name>/ApproxTests.cpp" >
+ <Original>
+ !d <= Approx( 1.22 )
+ </Original>
+ <Expanded>
+ !(1.23 <= Approx( 1.22 ))
+ </Expanded>
+ </Expression>
+ <Expression success="true" type="REQUIRE" filename="projects/<exe-name>/ApproxTests.cpp" >
+ <Original>
+ d <= Approx( 1.22 ).epsilon(0.1)
+ </Original>
+ <Expanded>
+ 1.23 <= Approx( 1.22 )
+ </Expanded>
+ </Expression>
+ <OverallResult success="true"/>
+ </TestCase>
<TestCase name="Long strings can be wrapped">
<Section name="plain string">
<Section name="No wrapping">
@@ -9362,7 +9432,7 @@ there"
</Section>
<OverallResult success="true"/>
</TestCase>
- <OverallResults successes="805" failures="81" expectedFailures="18"/>
+ <OverallResults successes="813" failures="81" expectedFailures="18"/>
</Group>
- <OverallResults successes="805" failures="80" expectedFailures="18"/>
+ <OverallResults successes="813" failures="80" expectedFailures="18"/>
</Catch>