From 1352e294d255f323bef3110c71a793d16ba9be4f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=C3=A5rten=20Nordheim?= <marten.nordheim@qt.io>
Date: Fri, 2 Dec 2022 12:55:20 +0100
Subject: QTest: Rename QCOMPARE_XX parameters to add meaning

The parameter names were previously "lhs" and "rhs", which is incredibly
abstract for a testing framework. One of the parameters will tend to be
a baseline value to compare against while the other is the result of
some action we want to test. Thus I suggest they be renamed "computed"
and "baseline".

This way we can, hopefully, retain the semantic that the 'left'/first
argument is the computed ('actual' in QCOMPARE) value while the
'right'/second argument is the baseline ('expected' in QCOMPARE.)

Change-Id: I3e0fdce2a3f1faca06fdf7184ef6e0eb9724d990
Reviewed-by: Ivan Solovev <ivan.solovev@qt.io>
---
 .../selftests/expected_extendedcompare.junitxml    | 444 +++++++++----------
 .../selftests/expected_extendedcompare.lightxml    | 468 ++++++++++-----------
 .../testlib/selftests/expected_extendedcompare.tap | 156 +++----
 .../selftests/expected_extendedcompare.teamcity    | 156 +++----
 .../testlib/selftests/expected_extendedcompare.txt | 468 ++++++++++-----------
 .../testlib/selftests/expected_extendedcompare.xml | 468 ++++++++++-----------
 6 files changed, 1080 insertions(+), 1080 deletions(-)

(limited to 'tests/auto/testlib/selftests')

diff --git a/tests/auto/testlib/selftests/expected_extendedcompare.junitxml b/tests/auto/testlib/selftests/expected_extendedcompare.junitxml
index cbde2e3101..b840773852 100644
--- a/tests/auto/testlib/selftests/expected_extendedcompare.junitxml
+++ b/tests/auto/testlib/selftests/expected_extendedcompare.junitxml
@@ -8,518 +8,518 @@
   <testcase name="initTestCase" classname="tst_ExtendedCompare" time="@TEST_DURATION@"/>
   <testcase name="compareInts(EQ:left == right)" classname="tst_ExtendedCompare" time="@TEST_DURATION@"/>
   <testcase name="compareInts(EQ:left &lt; right)" classname="tst_ExtendedCompare" time="@TEST_DURATION@">
-    <failure type="fail" message="Left value is expected to be equal to right value, but is not">
-      <![CDATA[   Left   (lhs): 1
-   Right  (rhs): 2]]>
+    <failure type="fail" message="The computed value is expected to be equal to the baseline, but is not">
+      <![CDATA[   Computed (lhs): 1
+   Baseline (rhs): 2]]>
     </failure>
   </testcase>
   <testcase name="compareInts(EQ:left &gt; right)" classname="tst_ExtendedCompare" time="@TEST_DURATION@">
-    <failure type="fail" message="Left value is expected to be equal to right value, but is not">
-      <![CDATA[   Left   (lhs): 2
-   Right  (rhs): 1]]>
+    <failure type="fail" message="The computed value is expected to be equal to the baseline, but is not">
+      <![CDATA[   Computed (lhs): 2
+   Baseline (rhs): 1]]>
     </failure>
   </testcase>
   <testcase name="compareInts(NE:left == right)" classname="tst_ExtendedCompare" time="@TEST_DURATION@">
-    <failure type="fail" message="Left value is expected to be different from right value, but is not">
-      <![CDATA[   Left   (lhs): 1
-   Right  (rhs): 1]]>
+    <failure type="fail" message="The computed value is expected to be different from the baseline, but is not">
+      <![CDATA[   Computed (lhs): 1
+   Baseline (rhs): 1]]>
     </failure>
   </testcase>
   <testcase name="compareInts(NE:left &lt; right)" classname="tst_ExtendedCompare" time="@TEST_DURATION@"/>
   <testcase name="compareInts(NE:left &gt; right)" classname="tst_ExtendedCompare" time="@TEST_DURATION@"/>
   <testcase name="compareInts(LT:left == right)" classname="tst_ExtendedCompare" time="@TEST_DURATION@">
-    <failure type="fail" message="Left value is expected to be less than right value, but is not">
-      <![CDATA[   Left   (lhs): 1
-   Right  (rhs): 1]]>
+    <failure type="fail" message="The computed value is expected to be less than the baseline, but is not">
+      <![CDATA[   Computed (lhs): 1
+   Baseline (rhs): 1]]>
     </failure>
   </testcase>
   <testcase name="compareInts(LT:left &lt; right)" classname="tst_ExtendedCompare" time="@TEST_DURATION@"/>
   <testcase name="compareInts(LT:left &gt; right)" classname="tst_ExtendedCompare" time="@TEST_DURATION@">
-    <failure type="fail" message="Left value is expected to be less than right value, but is not">
-      <![CDATA[   Left   (lhs): 2
-   Right  (rhs): 1]]>
+    <failure type="fail" message="The computed value is expected to be less than the baseline, but is not">
+      <![CDATA[   Computed (lhs): 2
+   Baseline (rhs): 1]]>
     </failure>
   </testcase>
   <testcase name="compareInts(LE:left == right)" classname="tst_ExtendedCompare" time="@TEST_DURATION@"/>
   <testcase name="compareInts(LE:left &lt; right)" classname="tst_ExtendedCompare" time="@TEST_DURATION@"/>
   <testcase name="compareInts(LE:left &gt; right)" classname="tst_ExtendedCompare" time="@TEST_DURATION@">
-    <failure type="fail" message="Left value is expected to be less than or equal to right value, but is not">
-      <![CDATA[   Left   (lhs): 2
-   Right  (rhs): 1]]>
+    <failure type="fail" message="The computed value is expected to be less than or equal to the baseline, but is not">
+      <![CDATA[   Computed (lhs): 2
+   Baseline (rhs): 1]]>
     </failure>
   </testcase>
   <testcase name="compareInts(GT:left == right)" classname="tst_ExtendedCompare" time="@TEST_DURATION@">
-    <failure type="fail" message="Left value is expected to be greater than right value, but is not">
-      <![CDATA[   Left   (lhs): 1
-   Right  (rhs): 1]]>
+    <failure type="fail" message="The computed value is expected to be greater than the baseline, but is not">
+      <![CDATA[   Computed (lhs): 1
+   Baseline (rhs): 1]]>
     </failure>
   </testcase>
   <testcase name="compareInts(GT:left &lt; right)" classname="tst_ExtendedCompare" time="@TEST_DURATION@">
-    <failure type="fail" message="Left value is expected to be greater than right value, but is not">
-      <![CDATA[   Left   (lhs): 1
-   Right  (rhs): 2]]>
+    <failure type="fail" message="The computed value is expected to be greater than the baseline, but is not">
+      <![CDATA[   Computed (lhs): 1
+   Baseline (rhs): 2]]>
     </failure>
   </testcase>
   <testcase name="compareInts(GT:left &gt; right)" classname="tst_ExtendedCompare" time="@TEST_DURATION@"/>
   <testcase name="compareInts(GE:left == right)" classname="tst_ExtendedCompare" time="@TEST_DURATION@"/>
   <testcase name="compareInts(GE:left &lt; right)" classname="tst_ExtendedCompare" time="@TEST_DURATION@">
-    <failure type="fail" message="Left value is expected to be greater than or equal to right value, but is not">
-      <![CDATA[   Left   (lhs): 1
-   Right  (rhs): 2]]>
+    <failure type="fail" message="The computed value is expected to be greater than or equal to the baseline, but is not">
+      <![CDATA[   Computed (lhs): 1
+   Baseline (rhs): 2]]>
     </failure>
   </testcase>
   <testcase name="compareInts(GE:left &gt; right)" classname="tst_ExtendedCompare" time="@TEST_DURATION@"/>
   <testcase name="compareFloats(EQ:left == right)" classname="tst_ExtendedCompare" time="@TEST_DURATION@"/>
   <testcase name="compareFloats(EQ:left &lt; right)" classname="tst_ExtendedCompare" time="@TEST_DURATION@">
-    <failure type="fail" message="Left value is expected to be equal to right value, but is not">
-      <![CDATA[   Left   (lhs): 1
-   Right  (rhs): 1.1]]>
+    <failure type="fail" message="The computed value is expected to be equal to the baseline, but is not">
+      <![CDATA[   Computed (lhs): 1
+   Baseline (rhs): 1.1]]>
     </failure>
   </testcase>
   <testcase name="compareFloats(EQ:left &gt; right)" classname="tst_ExtendedCompare" time="@TEST_DURATION@">
-    <failure type="fail" message="Left value is expected to be equal to right value, but is not">
-      <![CDATA[   Left   (lhs): 1.1
-   Right  (rhs): 1]]>
+    <failure type="fail" message="The computed value is expected to be equal to the baseline, but is not">
+      <![CDATA[   Computed (lhs): 1.1
+   Baseline (rhs): 1]]>
     </failure>
   </testcase>
   <testcase name="compareFloats(NE:left == right)" classname="tst_ExtendedCompare" time="@TEST_DURATION@">
-    <failure type="fail" message="Left value is expected to be different from right value, but is not">
-      <![CDATA[   Left   (lhs): 1
-   Right  (rhs): 1]]>
+    <failure type="fail" message="The computed value is expected to be different from the baseline, but is not">
+      <![CDATA[   Computed (lhs): 1
+   Baseline (rhs): 1]]>
     </failure>
   </testcase>
   <testcase name="compareFloats(NE:left &lt; right)" classname="tst_ExtendedCompare" time="@TEST_DURATION@"/>
   <testcase name="compareFloats(NE:left &gt; right)" classname="tst_ExtendedCompare" time="@TEST_DURATION@"/>
   <testcase name="compareFloats(LT:left == right)" classname="tst_ExtendedCompare" time="@TEST_DURATION@">
-    <failure type="fail" message="Left value is expected to be less than right value, but is not">
-      <![CDATA[   Left   (lhs): 1
-   Right  (rhs): 1]]>
+    <failure type="fail" message="The computed value is expected to be less than the baseline, but is not">
+      <![CDATA[   Computed (lhs): 1
+   Baseline (rhs): 1]]>
     </failure>
   </testcase>
   <testcase name="compareFloats(LT:left &lt; right)" classname="tst_ExtendedCompare" time="@TEST_DURATION@"/>
   <testcase name="compareFloats(LT:left &gt; right)" classname="tst_ExtendedCompare" time="@TEST_DURATION@">
-    <failure type="fail" message="Left value is expected to be less than right value, but is not">
-      <![CDATA[   Left   (lhs): 1.1
-   Right  (rhs): 1]]>
+    <failure type="fail" message="The computed value is expected to be less than the baseline, but is not">
+      <![CDATA[   Computed (lhs): 1.1
+   Baseline (rhs): 1]]>
     </failure>
   </testcase>
   <testcase name="compareFloats(LE:left == right)" classname="tst_ExtendedCompare" time="@TEST_DURATION@"/>
   <testcase name="compareFloats(LE:left &lt; right)" classname="tst_ExtendedCompare" time="@TEST_DURATION@"/>
   <testcase name="compareFloats(LE:left &gt; right)" classname="tst_ExtendedCompare" time="@TEST_DURATION@">
-    <failure type="fail" message="Left value is expected to be less than or equal to right value, but is not">
-      <![CDATA[   Left   (lhs): 1.1
-   Right  (rhs): 1]]>
+    <failure type="fail" message="The computed value is expected to be less than or equal to the baseline, but is not">
+      <![CDATA[   Computed (lhs): 1.1
+   Baseline (rhs): 1]]>
     </failure>
   </testcase>
   <testcase name="compareFloats(GT:left == right)" classname="tst_ExtendedCompare" time="@TEST_DURATION@">
-    <failure type="fail" message="Left value is expected to be greater than right value, but is not">
-      <![CDATA[   Left   (lhs): 1
-   Right  (rhs): 1]]>
+    <failure type="fail" message="The computed value is expected to be greater than the baseline, but is not">
+      <![CDATA[   Computed (lhs): 1
+   Baseline (rhs): 1]]>
     </failure>
   </testcase>
   <testcase name="compareFloats(GT:left &lt; right)" classname="tst_ExtendedCompare" time="@TEST_DURATION@">
-    <failure type="fail" message="Left value is expected to be greater than right value, but is not">
-      <![CDATA[   Left   (lhs): 1
-   Right  (rhs): 1.1]]>
+    <failure type="fail" message="The computed value is expected to be greater than the baseline, but is not">
+      <![CDATA[   Computed (lhs): 1
+   Baseline (rhs): 1.1]]>
     </failure>
   </testcase>
   <testcase name="compareFloats(GT:left &gt; right)" classname="tst_ExtendedCompare" time="@TEST_DURATION@"/>
   <testcase name="compareFloats(GE:left == right)" classname="tst_ExtendedCompare" time="@TEST_DURATION@"/>
   <testcase name="compareFloats(GE:left &lt; right)" classname="tst_ExtendedCompare" time="@TEST_DURATION@">
-    <failure type="fail" message="Left value is expected to be greater than or equal to right value, but is not">
-      <![CDATA[   Left   (lhs): 1
-   Right  (rhs): 1.1]]>
+    <failure type="fail" message="The computed value is expected to be greater than or equal to the baseline, but is not">
+      <![CDATA[   Computed (lhs): 1
+   Baseline (rhs): 1.1]]>
     </failure>
   </testcase>
   <testcase name="compareFloats(GE:left &gt; right)" classname="tst_ExtendedCompare" time="@TEST_DURATION@"/>
   <testcase name="compareDoubles(EQ:left == right)" classname="tst_ExtendedCompare" time="@TEST_DURATION@"/>
   <testcase name="compareDoubles(EQ:left &lt; right)" classname="tst_ExtendedCompare" time="@TEST_DURATION@">
-    <failure type="fail" message="Left value is expected to be equal to right value, but is not">
-      <![CDATA[   Left   (lhs): 0
-   Right  (rhs): 0.1]]>
+    <failure type="fail" message="The computed value is expected to be equal to the baseline, but is not">
+      <![CDATA[   Computed (lhs): 0
+   Baseline (rhs): 0.1]]>
     </failure>
   </testcase>
   <testcase name="compareDoubles(EQ:left &gt; right)" classname="tst_ExtendedCompare" time="@TEST_DURATION@">
-    <failure type="fail" message="Left value is expected to be equal to right value, but is not">
-      <![CDATA[   Left   (lhs): 0.1
-   Right  (rhs): 0]]>
+    <failure type="fail" message="The computed value is expected to be equal to the baseline, but is not">
+      <![CDATA[   Computed (lhs): 0.1
+   Baseline (rhs): 0]]>
     </failure>
   </testcase>
   <testcase name="compareDoubles(NE:left == right)" classname="tst_ExtendedCompare" time="@TEST_DURATION@">
-    <failure type="fail" message="Left value is expected to be different from right value, but is not">
-      <![CDATA[   Left   (lhs): 0
-   Right  (rhs): 0]]>
+    <failure type="fail" message="The computed value is expected to be different from the baseline, but is not">
+      <![CDATA[   Computed (lhs): 0
+   Baseline (rhs): 0]]>
     </failure>
   </testcase>
   <testcase name="compareDoubles(NE:left &lt; right)" classname="tst_ExtendedCompare" time="@TEST_DURATION@"/>
   <testcase name="compareDoubles(NE:left &gt; right)" classname="tst_ExtendedCompare" time="@TEST_DURATION@"/>
   <testcase name="compareDoubles(LT:left == right)" classname="tst_ExtendedCompare" time="@TEST_DURATION@">
-    <failure type="fail" message="Left value is expected to be less than right value, but is not">
-      <![CDATA[   Left   (lhs): 0
-   Right  (rhs): 0]]>
+    <failure type="fail" message="The computed value is expected to be less than the baseline, but is not">
+      <![CDATA[   Computed (lhs): 0
+   Baseline (rhs): 0]]>
     </failure>
   </testcase>
   <testcase name="compareDoubles(LT:left &lt; right)" classname="tst_ExtendedCompare" time="@TEST_DURATION@"/>
   <testcase name="compareDoubles(LT:left &gt; right)" classname="tst_ExtendedCompare" time="@TEST_DURATION@">
-    <failure type="fail" message="Left value is expected to be less than right value, but is not">
-      <![CDATA[   Left   (lhs): 0.1
-   Right  (rhs): 0]]>
+    <failure type="fail" message="The computed value is expected to be less than the baseline, but is not">
+      <![CDATA[   Computed (lhs): 0.1
+   Baseline (rhs): 0]]>
     </failure>
   </testcase>
   <testcase name="compareDoubles(LE:left == right)" classname="tst_ExtendedCompare" time="@TEST_DURATION@"/>
   <testcase name="compareDoubles(LE:left &lt; right)" classname="tst_ExtendedCompare" time="@TEST_DURATION@"/>
   <testcase name="compareDoubles(LE:left &gt; right)" classname="tst_ExtendedCompare" time="@TEST_DURATION@">
-    <failure type="fail" message="Left value is expected to be less than or equal to right value, but is not">
-      <![CDATA[   Left   (lhs): 0.1
-   Right  (rhs): 0]]>
+    <failure type="fail" message="The computed value is expected to be less than or equal to the baseline, but is not">
+      <![CDATA[   Computed (lhs): 0.1
+   Baseline (rhs): 0]]>
     </failure>
   </testcase>
   <testcase name="compareDoubles(GT:left == right)" classname="tst_ExtendedCompare" time="@TEST_DURATION@">
-    <failure type="fail" message="Left value is expected to be greater than right value, but is not">
-      <![CDATA[   Left   (lhs): 0
-   Right  (rhs): 0]]>
+    <failure type="fail" message="The computed value is expected to be greater than the baseline, but is not">
+      <![CDATA[   Computed (lhs): 0
+   Baseline (rhs): 0]]>
     </failure>
   </testcase>
   <testcase name="compareDoubles(GT:left &lt; right)" classname="tst_ExtendedCompare" time="@TEST_DURATION@">
-    <failure type="fail" message="Left value is expected to be greater than right value, but is not">
-      <![CDATA[   Left   (lhs): 0
-   Right  (rhs): 0.1]]>
+    <failure type="fail" message="The computed value is expected to be greater than the baseline, but is not">
+      <![CDATA[   Computed (lhs): 0
+   Baseline (rhs): 0.1]]>
     </failure>
   </testcase>
   <testcase name="compareDoubles(GT:left &gt; right)" classname="tst_ExtendedCompare" time="@TEST_DURATION@"/>
   <testcase name="compareDoubles(GE:left == right)" classname="tst_ExtendedCompare" time="@TEST_DURATION@"/>
   <testcase name="compareDoubles(GE:left &lt; right)" classname="tst_ExtendedCompare" time="@TEST_DURATION@">
-    <failure type="fail" message="Left value is expected to be greater than or equal to right value, but is not">
-      <![CDATA[   Left   (lhs): 0
-   Right  (rhs): 0.1]]>
+    <failure type="fail" message="The computed value is expected to be greater than or equal to the baseline, but is not">
+      <![CDATA[   Computed (lhs): 0
+   Baseline (rhs): 0.1]]>
     </failure>
   </testcase>
   <testcase name="compareDoubles(GE:left &gt; right)" classname="tst_ExtendedCompare" time="@TEST_DURATION@"/>
   <testcase name="comparePointers(EQ:left == right)" classname="tst_ExtendedCompare" time="@TEST_DURATION@"/>
   <testcase name="comparePointers(EQ:left &lt; right)" classname="tst_ExtendedCompare" time="@TEST_DURATION@">
-    <failure type="fail" message="Left value is expected to be equal to right value, but is not">
-      <![CDATA[   Left   (lhs): 1
-   Right  (rhs): 2]]>
+    <failure type="fail" message="The computed value is expected to be equal to the baseline, but is not">
+      <![CDATA[   Computed (lhs): 1
+   Baseline (rhs): 2]]>
     </failure>
   </testcase>
   <testcase name="comparePointers(EQ:left &gt; right)" classname="tst_ExtendedCompare" time="@TEST_DURATION@">
-    <failure type="fail" message="Left value is expected to be equal to right value, but is not">
-      <![CDATA[   Left   (lhs): 2
-   Right  (rhs): 1]]>
+    <failure type="fail" message="The computed value is expected to be equal to the baseline, but is not">
+      <![CDATA[   Computed (lhs): 2
+   Baseline (rhs): 1]]>
     </failure>
   </testcase>
   <testcase name="comparePointers(NE:left == right)" classname="tst_ExtendedCompare" time="@TEST_DURATION@">
-    <failure type="fail" message="Left value is expected to be different from right value, but is not">
-      <![CDATA[   Left   (lhs): 1
-   Right  (rhs): 1]]>
+    <failure type="fail" message="The computed value is expected to be different from the baseline, but is not">
+      <![CDATA[   Computed (lhs): 1
+   Baseline (rhs): 1]]>
     </failure>
   </testcase>
   <testcase name="comparePointers(NE:left &lt; right)" classname="tst_ExtendedCompare" time="@TEST_DURATION@"/>
   <testcase name="comparePointers(NE:left &gt; right)" classname="tst_ExtendedCompare" time="@TEST_DURATION@"/>
   <testcase name="comparePointers(LT:left == right)" classname="tst_ExtendedCompare" time="@TEST_DURATION@">
-    <failure type="fail" message="Left value is expected to be less than right value, but is not">
-      <![CDATA[   Left   (lhs): 1
-   Right  (rhs): 1]]>
+    <failure type="fail" message="The computed value is expected to be less than the baseline, but is not">
+      <![CDATA[   Computed (lhs): 1
+   Baseline (rhs): 1]]>
     </failure>
   </testcase>
   <testcase name="comparePointers(LT:left &lt; right)" classname="tst_ExtendedCompare" time="@TEST_DURATION@"/>
   <testcase name="comparePointers(LT:left &gt; right)" classname="tst_ExtendedCompare" time="@TEST_DURATION@">
-    <failure type="fail" message="Left value is expected to be less than right value, but is not">
-      <![CDATA[   Left   (lhs): 2
-   Right  (rhs): 1]]>
+    <failure type="fail" message="The computed value is expected to be less than the baseline, but is not">
+      <![CDATA[   Computed (lhs): 2
+   Baseline (rhs): 1]]>
     </failure>
   </testcase>
   <testcase name="comparePointers(LE:left == right)" classname="tst_ExtendedCompare" time="@TEST_DURATION@"/>
   <testcase name="comparePointers(LE:left &lt; right)" classname="tst_ExtendedCompare" time="@TEST_DURATION@"/>
   <testcase name="comparePointers(LE:left &gt; right)" classname="tst_ExtendedCompare" time="@TEST_DURATION@">
-    <failure type="fail" message="Left value is expected to be less than or equal to right value, but is not">
-      <![CDATA[   Left   (lhs): 2
-   Right  (rhs): 1]]>
+    <failure type="fail" message="The computed value is expected to be less than or equal to the baseline, but is not">
+      <![CDATA[   Computed (lhs): 2
+   Baseline (rhs): 1]]>
     </failure>
   </testcase>
   <testcase name="comparePointers(GT:left == right)" classname="tst_ExtendedCompare" time="@TEST_DURATION@">
-    <failure type="fail" message="Left value is expected to be greater than right value, but is not">
-      <![CDATA[   Left   (lhs): 1
-   Right  (rhs): 1]]>
+    <failure type="fail" message="The computed value is expected to be greater than the baseline, but is not">
+      <![CDATA[   Computed (lhs): 1
+   Baseline (rhs): 1]]>
     </failure>
   </testcase>
   <testcase name="comparePointers(GT:left &lt; right)" classname="tst_ExtendedCompare" time="@TEST_DURATION@">
-    <failure type="fail" message="Left value is expected to be greater than right value, but is not">
-      <![CDATA[   Left   (lhs): 1
-   Right  (rhs): 2]]>
+    <failure type="fail" message="The computed value is expected to be greater than the baseline, but is not">
+      <![CDATA[   Computed (lhs): 1
+   Baseline (rhs): 2]]>
     </failure>
   </testcase>
   <testcase name="comparePointers(GT:left &gt; right)" classname="tst_ExtendedCompare" time="@TEST_DURATION@"/>
   <testcase name="comparePointers(GE:left == right)" classname="tst_ExtendedCompare" time="@TEST_DURATION@"/>
   <testcase name="comparePointers(GE:left &lt; right)" classname="tst_ExtendedCompare" time="@TEST_DURATION@">
-    <failure type="fail" message="Left value is expected to be greater than or equal to right value, but is not">
-      <![CDATA[   Left   (lhs): 1
-   Right  (rhs): 2]]>
+    <failure type="fail" message="The computed value is expected to be greater than or equal to the baseline, but is not">
+      <![CDATA[   Computed (lhs): 1
+   Baseline (rhs): 2]]>
     </failure>
   </testcase>
   <testcase name="comparePointers(GE:left &gt; right)" classname="tst_ExtendedCompare" time="@TEST_DURATION@"/>
   <testcase name="compareToNullptr(EQ:left == right)" classname="tst_ExtendedCompare" time="@TEST_DURATION@"/>
   <testcase name="compareToNullptr(EQ:left &lt; right)" classname="tst_ExtendedCompare" time="@TEST_DURATION@">
-    <failure type="fail" message="Left value is expected to be equal to right value, but is not">
-      <![CDATA[   Left   (lhs): "nullptr"
-   Right  (rhs): 1]]>
+    <failure type="fail" message="The computed value is expected to be equal to the baseline, but is not">
+      <![CDATA[   Computed (lhs): "nullptr"
+   Baseline (rhs): 1]]>
     </failure>
   </testcase>
   <testcase name="compareToNullptr(EQ:left &gt; right)" classname="tst_ExtendedCompare" time="@TEST_DURATION@">
-    <failure type="fail" message="Left value is expected to be equal to right value, but is not">
-      <![CDATA[   Left   (lhs): 1
-   Right  (rhs): "nullptr"]]>
+    <failure type="fail" message="The computed value is expected to be equal to the baseline, but is not">
+      <![CDATA[   Computed (lhs): 1
+   Baseline (rhs): "nullptr"]]>
     </failure>
   </testcase>
   <testcase name="compareToNullptr(NE:left == right)" classname="tst_ExtendedCompare" time="@TEST_DURATION@">
-    <failure type="fail" message="Left value is expected to be different from right value, but is not">
-      <![CDATA[   Left   (lhs): "nullptr"
-   Right  (rhs): "nullptr"]]>
+    <failure type="fail" message="The computed value is expected to be different from the baseline, but is not">
+      <![CDATA[   Computed (lhs): "nullptr"
+   Baseline (rhs): "nullptr"]]>
     </failure>
   </testcase>
   <testcase name="compareToNullptr(NE:left &lt; right)" classname="tst_ExtendedCompare" time="@TEST_DURATION@"/>
   <testcase name="compareToNullptr(NE:left &gt; right)" classname="tst_ExtendedCompare" time="@TEST_DURATION@"/>
   <testcase name="compareToNullptr(LT:left == right)" classname="tst_ExtendedCompare" time="@TEST_DURATION@">
-    <failure type="fail" message="Left value is expected to be less than right value, but is not">
-      <![CDATA[   Left   (lhs): "nullptr"
-   Right  (rhs): "nullptr"]]>
+    <failure type="fail" message="The computed value is expected to be less than the baseline, but is not">
+      <![CDATA[   Computed (lhs): "nullptr"
+   Baseline (rhs): "nullptr"]]>
     </failure>
   </testcase>
   <testcase name="compareToNullptr(LT:left &lt; right)" classname="tst_ExtendedCompare" time="@TEST_DURATION@"/>
   <testcase name="compareToNullptr(LT:left &gt; right)" classname="tst_ExtendedCompare" time="@TEST_DURATION@">
-    <failure type="fail" message="Left value is expected to be less than right value, but is not">
-      <![CDATA[   Left   (lhs): 1
-   Right  (rhs): "nullptr"]]>
+    <failure type="fail" message="The computed value is expected to be less than the baseline, but is not">
+      <![CDATA[   Computed (lhs): 1
+   Baseline (rhs): "nullptr"]]>
     </failure>
   </testcase>
   <testcase name="compareToNullptr(LE:left == right)" classname="tst_ExtendedCompare" time="@TEST_DURATION@"/>
   <testcase name="compareToNullptr(LE:left &lt; right)" classname="tst_ExtendedCompare" time="@TEST_DURATION@"/>
   <testcase name="compareToNullptr(LE:left &gt; right)" classname="tst_ExtendedCompare" time="@TEST_DURATION@">
-    <failure type="fail" message="Left value is expected to be less than or equal to right value, but is not">
-      <![CDATA[   Left   (lhs): 1
-   Right  (rhs): "nullptr"]]>
+    <failure type="fail" message="The computed value is expected to be less than or equal to the baseline, but is not">
+      <![CDATA[   Computed (lhs): 1
+   Baseline (rhs): "nullptr"]]>
     </failure>
   </testcase>
   <testcase name="compareToNullptr(GT:left == right)" classname="tst_ExtendedCompare" time="@TEST_DURATION@">
-    <failure type="fail" message="Left value is expected to be greater than right value, but is not">
-      <![CDATA[   Left   (lhs): "nullptr"
-   Right  (rhs): "nullptr"]]>
+    <failure type="fail" message="The computed value is expected to be greater than the baseline, but is not">
+      <![CDATA[   Computed (lhs): "nullptr"
+   Baseline (rhs): "nullptr"]]>
     </failure>
   </testcase>
   <testcase name="compareToNullptr(GT:left &lt; right)" classname="tst_ExtendedCompare" time="@TEST_DURATION@">
-    <failure type="fail" message="Left value is expected to be greater than right value, but is not">
-      <![CDATA[   Left   (lhs): "nullptr"
-   Right  (rhs): 1]]>
+    <failure type="fail" message="The computed value is expected to be greater than the baseline, but is not">
+      <![CDATA[   Computed (lhs): "nullptr"
+   Baseline (rhs): 1]]>
     </failure>
   </testcase>
   <testcase name="compareToNullptr(GT:left &gt; right)" classname="tst_ExtendedCompare" time="@TEST_DURATION@"/>
   <testcase name="compareToNullptr(GE:left == right)" classname="tst_ExtendedCompare" time="@TEST_DURATION@"/>
   <testcase name="compareToNullptr(GE:left &lt; right)" classname="tst_ExtendedCompare" time="@TEST_DURATION@">
-    <failure type="fail" message="Left value is expected to be greater than or equal to right value, but is not">
-      <![CDATA[   Left   (lhs): "nullptr"
-   Right  (rhs): 1]]>
+    <failure type="fail" message="The computed value is expected to be greater than or equal to the baseline, but is not">
+      <![CDATA[   Computed (lhs): "nullptr"
+   Baseline (rhs): 1]]>
     </failure>
   </testcase>
   <testcase name="compareToNullptr(GE:left &gt; right)" classname="tst_ExtendedCompare" time="@TEST_DURATION@"/>
   <testcase name="compareUnregistereEnum(EQ:left == right)" classname="tst_ExtendedCompare" time="@TEST_DURATION@"/>
   <testcase name="compareUnregistereEnum(EQ:left &lt; right)" classname="tst_ExtendedCompare" time="@TEST_DURATION@">
-    <failure type="fail" message="Left value is expected to be equal to right value, but is not">
-      <![CDATA[   Left   (lhs): 0
-   Right  (rhs): 1]]>
+    <failure type="fail" message="The computed value is expected to be equal to the baseline, but is not">
+      <![CDATA[   Computed (lhs): 0
+   Baseline (rhs): 1]]>
     </failure>
   </testcase>
   <testcase name="compareUnregistereEnum(EQ:left &gt; right)" classname="tst_ExtendedCompare" time="@TEST_DURATION@">
-    <failure type="fail" message="Left value is expected to be equal to right value, but is not">
-      <![CDATA[   Left   (lhs): 1
-   Right  (rhs): 0]]>
+    <failure type="fail" message="The computed value is expected to be equal to the baseline, but is not">
+      <![CDATA[   Computed (lhs): 1
+   Baseline (rhs): 0]]>
     </failure>
   </testcase>
   <testcase name="compareUnregistereEnum(NE:left == right)" classname="tst_ExtendedCompare" time="@TEST_DURATION@">
-    <failure type="fail" message="Left value is expected to be different from right value, but is not">
-      <![CDATA[   Left   (lhs): 0
-   Right  (rhs): 0]]>
+    <failure type="fail" message="The computed value is expected to be different from the baseline, but is not">
+      <![CDATA[   Computed (lhs): 0
+   Baseline (rhs): 0]]>
     </failure>
   </testcase>
   <testcase name="compareUnregistereEnum(NE:left &lt; right)" classname="tst_ExtendedCompare" time="@TEST_DURATION@"/>
   <testcase name="compareUnregistereEnum(NE:left &gt; right)" classname="tst_ExtendedCompare" time="@TEST_DURATION@"/>
   <testcase name="compareUnregistereEnum(LT:left == right)" classname="tst_ExtendedCompare" time="@TEST_DURATION@">
-    <failure type="fail" message="Left value is expected to be less than right value, but is not">
-      <![CDATA[   Left   (lhs): 0
-   Right  (rhs): 0]]>
+    <failure type="fail" message="The computed value is expected to be less than the baseline, but is not">
+      <![CDATA[   Computed (lhs): 0
+   Baseline (rhs): 0]]>
     </failure>
   </testcase>
   <testcase name="compareUnregistereEnum(LT:left &lt; right)" classname="tst_ExtendedCompare" time="@TEST_DURATION@"/>
   <testcase name="compareUnregistereEnum(LT:left &gt; right)" classname="tst_ExtendedCompare" time="@TEST_DURATION@">
-    <failure type="fail" message="Left value is expected to be less than right value, but is not">
-      <![CDATA[   Left   (lhs): 1
-   Right  (rhs): 0]]>
+    <failure type="fail" message="The computed value is expected to be less than the baseline, but is not">
+      <![CDATA[   Computed (lhs): 1
+   Baseline (rhs): 0]]>
     </failure>
   </testcase>
   <testcase name="compareUnregistereEnum(LE:left == right)" classname="tst_ExtendedCompare" time="@TEST_DURATION@"/>
   <testcase name="compareUnregistereEnum(LE:left &lt; right)" classname="tst_ExtendedCompare" time="@TEST_DURATION@"/>
   <testcase name="compareUnregistereEnum(LE:left &gt; right)" classname="tst_ExtendedCompare" time="@TEST_DURATION@">
-    <failure type="fail" message="Left value is expected to be less than or equal to right value, but is not">
-      <![CDATA[   Left   (lhs): 1
-   Right  (rhs): 0]]>
+    <failure type="fail" message="The computed value is expected to be less than or equal to the baseline, but is not">
+      <![CDATA[   Computed (lhs): 1
+   Baseline (rhs): 0]]>
     </failure>
   </testcase>
   <testcase name="compareUnregistereEnum(GT:left == right)" classname="tst_ExtendedCompare" time="@TEST_DURATION@">
-    <failure type="fail" message="Left value is expected to be greater than right value, but is not">
-      <![CDATA[   Left   (lhs): 0
-   Right  (rhs): 0]]>
+    <failure type="fail" message="The computed value is expected to be greater than the baseline, but is not">
+      <![CDATA[   Computed (lhs): 0
+   Baseline (rhs): 0]]>
     </failure>
   </testcase>
   <testcase name="compareUnregistereEnum(GT:left &lt; right)" classname="tst_ExtendedCompare" time="@TEST_DURATION@">
-    <failure type="fail" message="Left value is expected to be greater than right value, but is not">
-      <![CDATA[   Left   (lhs): 0
-   Right  (rhs): 1]]>
+    <failure type="fail" message="The computed value is expected to be greater than the baseline, but is not">
+      <![CDATA[   Computed (lhs): 0
+   Baseline (rhs): 1]]>
     </failure>
   </testcase>
   <testcase name="compareUnregistereEnum(GT:left &gt; right)" classname="tst_ExtendedCompare" time="@TEST_DURATION@"/>
   <testcase name="compareUnregistereEnum(GE:left == right)" classname="tst_ExtendedCompare" time="@TEST_DURATION@"/>
   <testcase name="compareUnregistereEnum(GE:left &lt; right)" classname="tst_ExtendedCompare" time="@TEST_DURATION@">
-    <failure type="fail" message="Left value is expected to be greater than or equal to right value, but is not">
-      <![CDATA[   Left   (lhs): 0
-   Right  (rhs): 1]]>
+    <failure type="fail" message="The computed value is expected to be greater than or equal to the baseline, but is not">
+      <![CDATA[   Computed (lhs): 0
+   Baseline (rhs): 1]]>
     </failure>
   </testcase>
   <testcase name="compareUnregistereEnum(GE:left &gt; right)" classname="tst_ExtendedCompare" time="@TEST_DURATION@"/>
   <testcase name="compareRegistereEnum(EQ:left == right)" classname="tst_ExtendedCompare" time="@TEST_DURATION@"/>
   <testcase name="compareRegistereEnum(EQ:left &lt; right)" classname="tst_ExtendedCompare" time="@TEST_DURATION@">
-    <failure type="fail" message="Left value is expected to be equal to right value, but is not">
-      <![CDATA[   Left   (lhs): Monday
-   Right  (rhs): Sunday]]>
+    <failure type="fail" message="The computed value is expected to be equal to the baseline, but is not">
+      <![CDATA[   Computed (lhs): Monday
+   Baseline (rhs): Sunday]]>
     </failure>
   </testcase>
   <testcase name="compareRegistereEnum(EQ:left &gt; right)" classname="tst_ExtendedCompare" time="@TEST_DURATION@">
-    <failure type="fail" message="Left value is expected to be equal to right value, but is not">
-      <![CDATA[   Left   (lhs): Sunday
-   Right  (rhs): Monday]]>
+    <failure type="fail" message="The computed value is expected to be equal to the baseline, but is not">
+      <![CDATA[   Computed (lhs): Sunday
+   Baseline (rhs): Monday]]>
     </failure>
   </testcase>
   <testcase name="compareRegistereEnum(NE:left == right)" classname="tst_ExtendedCompare" time="@TEST_DURATION@">
-    <failure type="fail" message="Left value is expected to be different from right value, but is not">
-      <![CDATA[   Left   (lhs): Monday
-   Right  (rhs): Monday]]>
+    <failure type="fail" message="The computed value is expected to be different from the baseline, but is not">
+      <![CDATA[   Computed (lhs): Monday
+   Baseline (rhs): Monday]]>
     </failure>
   </testcase>
   <testcase name="compareRegistereEnum(NE:left &lt; right)" classname="tst_ExtendedCompare" time="@TEST_DURATION@"/>
   <testcase name="compareRegistereEnum(NE:left &gt; right)" classname="tst_ExtendedCompare" time="@TEST_DURATION@"/>
   <testcase name="compareRegistereEnum(LT:left == right)" classname="tst_ExtendedCompare" time="@TEST_DURATION@">
-    <failure type="fail" message="Left value is expected to be less than right value, but is not">
-      <![CDATA[   Left   (lhs): Monday
-   Right  (rhs): Monday]]>
+    <failure type="fail" message="The computed value is expected to be less than the baseline, but is not">
+      <![CDATA[   Computed (lhs): Monday
+   Baseline (rhs): Monday]]>
     </failure>
   </testcase>
   <testcase name="compareRegistereEnum(LT:left &lt; right)" classname="tst_ExtendedCompare" time="@TEST_DURATION@"/>
   <testcase name="compareRegistereEnum(LT:left &gt; right)" classname="tst_ExtendedCompare" time="@TEST_DURATION@">
-    <failure type="fail" message="Left value is expected to be less than right value, but is not">
-      <![CDATA[   Left   (lhs): Sunday
-   Right  (rhs): Monday]]>
+    <failure type="fail" message="The computed value is expected to be less than the baseline, but is not">
+      <![CDATA[   Computed (lhs): Sunday
+   Baseline (rhs): Monday]]>
     </failure>
   </testcase>
   <testcase name="compareRegistereEnum(LE:left == right)" classname="tst_ExtendedCompare" time="@TEST_DURATION@"/>
   <testcase name="compareRegistereEnum(LE:left &lt; right)" classname="tst_ExtendedCompare" time="@TEST_DURATION@"/>
   <testcase name="compareRegistereEnum(LE:left &gt; right)" classname="tst_ExtendedCompare" time="@TEST_DURATION@">
-    <failure type="fail" message="Left value is expected to be less than or equal to right value, but is not">
-      <![CDATA[   Left   (lhs): Sunday
-   Right  (rhs): Monday]]>
+    <failure type="fail" message="The computed value is expected to be less than or equal to the baseline, but is not">
+      <![CDATA[   Computed (lhs): Sunday
+   Baseline (rhs): Monday]]>
     </failure>
   </testcase>
   <testcase name="compareRegistereEnum(GT:left == right)" classname="tst_ExtendedCompare" time="@TEST_DURATION@">
-    <failure type="fail" message="Left value is expected to be greater than right value, but is not">
-      <![CDATA[   Left   (lhs): Monday
-   Right  (rhs): Monday]]>
+    <failure type="fail" message="The computed value is expected to be greater than the baseline, but is not">
+      <![CDATA[   Computed (lhs): Monday
+   Baseline (rhs): Monday]]>
     </failure>
   </testcase>
   <testcase name="compareRegistereEnum(GT:left &lt; right)" classname="tst_ExtendedCompare" time="@TEST_DURATION@">
-    <failure type="fail" message="Left value is expected to be greater than right value, but is not">
-      <![CDATA[   Left   (lhs): Monday
-   Right  (rhs): Sunday]]>
+    <failure type="fail" message="The computed value is expected to be greater than the baseline, but is not">
+      <![CDATA[   Computed (lhs): Monday
+   Baseline (rhs): Sunday]]>
     </failure>
   </testcase>
   <testcase name="compareRegistereEnum(GT:left &gt; right)" classname="tst_ExtendedCompare" time="@TEST_DURATION@"/>
   <testcase name="compareRegistereEnum(GE:left == right)" classname="tst_ExtendedCompare" time="@TEST_DURATION@"/>
   <testcase name="compareRegistereEnum(GE:left &lt; right)" classname="tst_ExtendedCompare" time="@TEST_DURATION@">
-    <failure type="fail" message="Left value is expected to be greater than or equal to right value, but is not">
-      <![CDATA[   Left   (lhs): Monday
-   Right  (rhs): Sunday]]>
+    <failure type="fail" message="The computed value is expected to be greater than or equal to the baseline, but is not">
+      <![CDATA[   Computed (lhs): Monday
+   Baseline (rhs): Sunday]]>
     </failure>
   </testcase>
   <testcase name="compareRegistereEnum(GE:left &gt; right)" classname="tst_ExtendedCompare" time="@TEST_DURATION@"/>
   <testcase name="compareCustomTypes(EQ:left == right)" classname="tst_ExtendedCompare" time="@TEST_DURATION@"/>
   <testcase name="compareCustomTypes(EQ:left &lt; right)" classname="tst_ExtendedCompare" time="@TEST_DURATION@">
-    <failure type="fail" message="Left value is expected to be equal to right value, but is not">
-      <![CDATA[   Left   (lhs): MyClass(1)
-   Right  (rhs): MyClass(2)]]>
+    <failure type="fail" message="The computed value is expected to be equal to the baseline, but is not">
+      <![CDATA[   Computed (lhs): MyClass(1)
+   Baseline (rhs): MyClass(2)]]>
     </failure>
   </testcase>
   <testcase name="compareCustomTypes(EQ:left &gt; right)" classname="tst_ExtendedCompare" time="@TEST_DURATION@">
-    <failure type="fail" message="Left value is expected to be equal to right value, but is not">
-      <![CDATA[   Left   (lhs): MyClass(2)
-   Right  (rhs): MyClass(1)]]>
+    <failure type="fail" message="The computed value is expected to be equal to the baseline, but is not">
+      <![CDATA[   Computed (lhs): MyClass(2)
+   Baseline (rhs): MyClass(1)]]>
     </failure>
   </testcase>
   <testcase name="compareCustomTypes(NE:left == right)" classname="tst_ExtendedCompare" time="@TEST_DURATION@">
-    <failure type="fail" message="Left value is expected to be different from right value, but is not">
-      <![CDATA[   Left   (lhs): MyClass(1)
-   Right  (rhs): MyClass(1)]]>
+    <failure type="fail" message="The computed value is expected to be different from the baseline, but is not">
+      <![CDATA[   Computed (lhs): MyClass(1)
+   Baseline (rhs): MyClass(1)]]>
     </failure>
   </testcase>
   <testcase name="compareCustomTypes(NE:left &lt; right)" classname="tst_ExtendedCompare" time="@TEST_DURATION@"/>
   <testcase name="compareCustomTypes(NE:left &gt; right)" classname="tst_ExtendedCompare" time="@TEST_DURATION@"/>
   <testcase name="compareCustomTypes(LT:left == right)" classname="tst_ExtendedCompare" time="@TEST_DURATION@">
-    <failure type="fail" message="Left value is expected to be less than right value, but is not">
-      <![CDATA[   Left   (lhs): MyClass(1)
-   Right  (rhs): MyClass(1)]]>
+    <failure type="fail" message="The computed value is expected to be less than the baseline, but is not">
+      <![CDATA[   Computed (lhs): MyClass(1)
+   Baseline (rhs): MyClass(1)]]>
     </failure>
   </testcase>
   <testcase name="compareCustomTypes(LT:left &lt; right)" classname="tst_ExtendedCompare" time="@TEST_DURATION@"/>
   <testcase name="compareCustomTypes(LT:left &gt; right)" classname="tst_ExtendedCompare" time="@TEST_DURATION@">
-    <failure type="fail" message="Left value is expected to be less than right value, but is not">
-      <![CDATA[   Left   (lhs): MyClass(2)
-   Right  (rhs): MyClass(1)]]>
+    <failure type="fail" message="The computed value is expected to be less than the baseline, but is not">
+      <![CDATA[   Computed (lhs): MyClass(2)
+   Baseline (rhs): MyClass(1)]]>
     </failure>
   </testcase>
   <testcase name="compareCustomTypes(LE:left == right)" classname="tst_ExtendedCompare" time="@TEST_DURATION@"/>
   <testcase name="compareCustomTypes(LE:left &lt; right)" classname="tst_ExtendedCompare" time="@TEST_DURATION@"/>
   <testcase name="compareCustomTypes(LE:left &gt; right)" classname="tst_ExtendedCompare" time="@TEST_DURATION@">
-    <failure type="fail" message="Left value is expected to be less than or equal to right value, but is not">
-      <![CDATA[   Left   (lhs): MyClass(2)
-   Right  (rhs): MyClass(1)]]>
+    <failure type="fail" message="The computed value is expected to be less than or equal to the baseline, but is not">
+      <![CDATA[   Computed (lhs): MyClass(2)
+   Baseline (rhs): MyClass(1)]]>
     </failure>
   </testcase>
   <testcase name="compareCustomTypes(GT:left == right)" classname="tst_ExtendedCompare" time="@TEST_DURATION@">
-    <failure type="fail" message="Left value is expected to be greater than right value, but is not">
-      <![CDATA[   Left   (lhs): MyClass(1)
-   Right  (rhs): MyClass(1)]]>
+    <failure type="fail" message="The computed value is expected to be greater than the baseline, but is not">
+      <![CDATA[   Computed (lhs): MyClass(1)
+   Baseline (rhs): MyClass(1)]]>
     </failure>
   </testcase>
   <testcase name="compareCustomTypes(GT:left &lt; right)" classname="tst_ExtendedCompare" time="@TEST_DURATION@">
-    <failure type="fail" message="Left value is expected to be greater than right value, but is not">
-      <![CDATA[   Left   (lhs): MyClass(1)
-   Right  (rhs): MyClass(2)]]>
+    <failure type="fail" message="The computed value is expected to be greater than the baseline, but is not">
+      <![CDATA[   Computed (lhs): MyClass(1)
+   Baseline (rhs): MyClass(2)]]>
     </failure>
   </testcase>
   <testcase name="compareCustomTypes(GT:left &gt; right)" classname="tst_ExtendedCompare" time="@TEST_DURATION@"/>
   <testcase name="compareCustomTypes(GE:left == right)" classname="tst_ExtendedCompare" time="@TEST_DURATION@"/>
   <testcase name="compareCustomTypes(GE:left &lt; right)" classname="tst_ExtendedCompare" time="@TEST_DURATION@">
-    <failure type="fail" message="Left value is expected to be greater than or equal to right value, but is not">
-      <![CDATA[   Left   (lhs): MyClass(1)
-   Right  (rhs): MyClass(2)]]>
+    <failure type="fail" message="The computed value is expected to be greater than or equal to the baseline, but is not">
+      <![CDATA[   Computed (lhs): MyClass(1)
+   Baseline (rhs): MyClass(2)]]>
     </failure>
   </testcase>
   <testcase name="compareCustomTypes(GE:left &gt; right)" classname="tst_ExtendedCompare" time="@TEST_DURATION@"/>
   <testcase name="checkComparisonForTemporaryObjects" classname="tst_ExtendedCompare" time="@TEST_DURATION@">
-    <failure type="fail" message="Left value is expected to be equal to right value, but is not">
-      <![CDATA[   Left   (getClassForValue(0).getValuePointer()): MyClass(2) on memory address with index 0
-   Right  (getClassForValue(1).getValuePointer()): MyClass(1) on memory address with index 1]]>
+    <failure type="fail" message="The computed value is expected to be equal to the baseline, but is not">
+      <![CDATA[   Computed (getClassForValue(0).getValuePointer()): MyClass(2) on memory address with index 0
+   Baseline (getClassForValue(1).getValuePointer()): MyClass(1) on memory address with index 1]]>
     </failure>
   </testcase>
   <testcase name="checkComparisonWithTimeout" classname="tst_ExtendedCompare" time="@TEST_DURATION@">
-    <failure type="fail" message="Left value is expected to be less than right value, but is not">
-      <![CDATA[   Left   (c)                         : ClassWithDeferredSetter(1)
-   Right  (ClassWithDeferredSetter(0)): ClassWithDeferredSetter(0)]]>
+    <failure type="fail" message="The computed value is expected to be less than the baseline, but is not">
+      <![CDATA[   Computed (c)                         : ClassWithDeferredSetter(1)
+   Baseline (ClassWithDeferredSetter(0)): ClassWithDeferredSetter(0)]]>
     </failure>
   </testcase>
   <testcase name="cleanupTestCase" classname="tst_ExtendedCompare" time="@TEST_DURATION@"/>
diff --git a/tests/auto/testlib/selftests/expected_extendedcompare.lightxml b/tests/auto/testlib/selftests/expected_extendedcompare.lightxml
index e59dd6edc7..fd6e486939 100644
--- a/tests/auto/testlib/selftests/expected_extendedcompare.lightxml
+++ b/tests/auto/testlib/selftests/expected_extendedcompare.lightxml
@@ -13,21 +13,21 @@
     </Incident>
     <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp" line="0">
       <DataTag><![CDATA[EQ:left < right]]></DataTag>
-      <Description><![CDATA[Left value is expected to be equal to right value, but is not
-   Left   (lhs): 1
-   Right  (rhs): 2]]></Description>
+      <Description><![CDATA[The computed value is expected to be equal to the baseline, but is not
+   Computed (lhs): 1
+   Baseline (rhs): 2]]></Description>
     </Incident>
     <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp" line="0">
       <DataTag><![CDATA[EQ:left > right]]></DataTag>
-      <Description><![CDATA[Left value is expected to be equal to right value, but is not
-   Left   (lhs): 2
-   Right  (rhs): 1]]></Description>
+      <Description><![CDATA[The computed value is expected to be equal to the baseline, but is not
+   Computed (lhs): 2
+   Baseline (rhs): 1]]></Description>
     </Incident>
     <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp" line="0">
       <DataTag><![CDATA[NE:left == right]]></DataTag>
-      <Description><![CDATA[Left value is expected to be different from right value, but is not
-   Left   (lhs): 1
-   Right  (rhs): 1]]></Description>
+      <Description><![CDATA[The computed value is expected to be different from the baseline, but is not
+   Computed (lhs): 1
+   Baseline (rhs): 1]]></Description>
     </Incident>
     <Incident type="pass" file="" line="0">
       <DataTag><![CDATA[NE:left < right]]></DataTag>
@@ -37,18 +37,18 @@
     </Incident>
     <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp" line="0">
       <DataTag><![CDATA[LT:left == right]]></DataTag>
-      <Description><![CDATA[Left value is expected to be less than right value, but is not
-   Left   (lhs): 1
-   Right  (rhs): 1]]></Description>
+      <Description><![CDATA[The computed value is expected to be less than the baseline, but is not
+   Computed (lhs): 1
+   Baseline (rhs): 1]]></Description>
     </Incident>
     <Incident type="pass" file="" line="0">
       <DataTag><![CDATA[LT:left < right]]></DataTag>
     </Incident>
     <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp" line="0">
       <DataTag><![CDATA[LT:left > right]]></DataTag>
-      <Description><![CDATA[Left value is expected to be less than right value, but is not
-   Left   (lhs): 2
-   Right  (rhs): 1]]></Description>
+      <Description><![CDATA[The computed value is expected to be less than the baseline, but is not
+   Computed (lhs): 2
+   Baseline (rhs): 1]]></Description>
     </Incident>
     <Incident type="pass" file="" line="0">
       <DataTag><![CDATA[LE:left == right]]></DataTag>
@@ -58,21 +58,21 @@
     </Incident>
     <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp" line="0">
       <DataTag><![CDATA[LE:left > right]]></DataTag>
-      <Description><![CDATA[Left value is expected to be less than or equal to right value, but is not
-   Left   (lhs): 2
-   Right  (rhs): 1]]></Description>
+      <Description><![CDATA[The computed value is expected to be less than or equal to the baseline, but is not
+   Computed (lhs): 2
+   Baseline (rhs): 1]]></Description>
     </Incident>
     <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp" line="0">
       <DataTag><![CDATA[GT:left == right]]></DataTag>
-      <Description><![CDATA[Left value is expected to be greater than right value, but is not
-   Left   (lhs): 1
-   Right  (rhs): 1]]></Description>
+      <Description><![CDATA[The computed value is expected to be greater than the baseline, but is not
+   Computed (lhs): 1
+   Baseline (rhs): 1]]></Description>
     </Incident>
     <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp" line="0">
       <DataTag><![CDATA[GT:left < right]]></DataTag>
-      <Description><![CDATA[Left value is expected to be greater than right value, but is not
-   Left   (lhs): 1
-   Right  (rhs): 2]]></Description>
+      <Description><![CDATA[The computed value is expected to be greater than the baseline, but is not
+   Computed (lhs): 1
+   Baseline (rhs): 2]]></Description>
     </Incident>
     <Incident type="pass" file="" line="0">
       <DataTag><![CDATA[GT:left > right]]></DataTag>
@@ -82,9 +82,9 @@
     </Incident>
     <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp" line="0">
       <DataTag><![CDATA[GE:left < right]]></DataTag>
-      <Description><![CDATA[Left value is expected to be greater than or equal to right value, but is not
-   Left   (lhs): 1
-   Right  (rhs): 2]]></Description>
+      <Description><![CDATA[The computed value is expected to be greater than or equal to the baseline, but is not
+   Computed (lhs): 1
+   Baseline (rhs): 2]]></Description>
     </Incident>
     <Incident type="pass" file="" line="0">
       <DataTag><![CDATA[GE:left > right]]></DataTag>
@@ -97,21 +97,21 @@
     </Incident>
     <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp" line="0">
       <DataTag><![CDATA[EQ:left < right]]></DataTag>
-      <Description><![CDATA[Left value is expected to be equal to right value, but is not
-   Left   (lhs): 1
-   Right  (rhs): 1.1]]></Description>
+      <Description><![CDATA[The computed value is expected to be equal to the baseline, but is not
+   Computed (lhs): 1
+   Baseline (rhs): 1.1]]></Description>
     </Incident>
     <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp" line="0">
       <DataTag><![CDATA[EQ:left > right]]></DataTag>
-      <Description><![CDATA[Left value is expected to be equal to right value, but is not
-   Left   (lhs): 1.1
-   Right  (rhs): 1]]></Description>
+      <Description><![CDATA[The computed value is expected to be equal to the baseline, but is not
+   Computed (lhs): 1.1
+   Baseline (rhs): 1]]></Description>
     </Incident>
     <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp" line="0">
       <DataTag><![CDATA[NE:left == right]]></DataTag>
-      <Description><![CDATA[Left value is expected to be different from right value, but is not
-   Left   (lhs): 1
-   Right  (rhs): 1]]></Description>
+      <Description><![CDATA[The computed value is expected to be different from the baseline, but is not
+   Computed (lhs): 1
+   Baseline (rhs): 1]]></Description>
     </Incident>
     <Incident type="pass" file="" line="0">
       <DataTag><![CDATA[NE:left < right]]></DataTag>
@@ -121,18 +121,18 @@
     </Incident>
     <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp" line="0">
       <DataTag><![CDATA[LT:left == right]]></DataTag>
-      <Description><![CDATA[Left value is expected to be less than right value, but is not
-   Left   (lhs): 1
-   Right  (rhs): 1]]></Description>
+      <Description><![CDATA[The computed value is expected to be less than the baseline, but is not
+   Computed (lhs): 1
+   Baseline (rhs): 1]]></Description>
     </Incident>
     <Incident type="pass" file="" line="0">
       <DataTag><![CDATA[LT:left < right]]></DataTag>
     </Incident>
     <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp" line="0">
       <DataTag><![CDATA[LT:left > right]]></DataTag>
-      <Description><![CDATA[Left value is expected to be less than right value, but is not
-   Left   (lhs): 1.1
-   Right  (rhs): 1]]></Description>
+      <Description><![CDATA[The computed value is expected to be less than the baseline, but is not
+   Computed (lhs): 1.1
+   Baseline (rhs): 1]]></Description>
     </Incident>
     <Incident type="pass" file="" line="0">
       <DataTag><![CDATA[LE:left == right]]></DataTag>
@@ -142,21 +142,21 @@
     </Incident>
     <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp" line="0">
       <DataTag><![CDATA[LE:left > right]]></DataTag>
-      <Description><![CDATA[Left value is expected to be less than or equal to right value, but is not
-   Left   (lhs): 1.1
-   Right  (rhs): 1]]></Description>
+      <Description><![CDATA[The computed value is expected to be less than or equal to the baseline, but is not
+   Computed (lhs): 1.1
+   Baseline (rhs): 1]]></Description>
     </Incident>
     <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp" line="0">
       <DataTag><![CDATA[GT:left == right]]></DataTag>
-      <Description><![CDATA[Left value is expected to be greater than right value, but is not
-   Left   (lhs): 1
-   Right  (rhs): 1]]></Description>
+      <Description><![CDATA[The computed value is expected to be greater than the baseline, but is not
+   Computed (lhs): 1
+   Baseline (rhs): 1]]></Description>
     </Incident>
     <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp" line="0">
       <DataTag><![CDATA[GT:left < right]]></DataTag>
-      <Description><![CDATA[Left value is expected to be greater than right value, but is not
-   Left   (lhs): 1
-   Right  (rhs): 1.1]]></Description>
+      <Description><![CDATA[The computed value is expected to be greater than the baseline, but is not
+   Computed (lhs): 1
+   Baseline (rhs): 1.1]]></Description>
     </Incident>
     <Incident type="pass" file="" line="0">
       <DataTag><![CDATA[GT:left > right]]></DataTag>
@@ -166,9 +166,9 @@
     </Incident>
     <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp" line="0">
       <DataTag><![CDATA[GE:left < right]]></DataTag>
-      <Description><![CDATA[Left value is expected to be greater than or equal to right value, but is not
-   Left   (lhs): 1
-   Right  (rhs): 1.1]]></Description>
+      <Description><![CDATA[The computed value is expected to be greater than or equal to the baseline, but is not
+   Computed (lhs): 1
+   Baseline (rhs): 1.1]]></Description>
     </Incident>
     <Incident type="pass" file="" line="0">
       <DataTag><![CDATA[GE:left > right]]></DataTag>
@@ -181,21 +181,21 @@
     </Incident>
     <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp" line="0">
       <DataTag><![CDATA[EQ:left < right]]></DataTag>
-      <Description><![CDATA[Left value is expected to be equal to right value, but is not
-   Left   (lhs): 0
-   Right  (rhs): 0.1]]></Description>
+      <Description><![CDATA[The computed value is expected to be equal to the baseline, but is not
+   Computed (lhs): 0
+   Baseline (rhs): 0.1]]></Description>
     </Incident>
     <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp" line="0">
       <DataTag><![CDATA[EQ:left > right]]></DataTag>
-      <Description><![CDATA[Left value is expected to be equal to right value, but is not
-   Left   (lhs): 0.1
-   Right  (rhs): 0]]></Description>
+      <Description><![CDATA[The computed value is expected to be equal to the baseline, but is not
+   Computed (lhs): 0.1
+   Baseline (rhs): 0]]></Description>
     </Incident>
     <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp" line="0">
       <DataTag><![CDATA[NE:left == right]]></DataTag>
-      <Description><![CDATA[Left value is expected to be different from right value, but is not
-   Left   (lhs): 0
-   Right  (rhs): 0]]></Description>
+      <Description><![CDATA[The computed value is expected to be different from the baseline, but is not
+   Computed (lhs): 0
+   Baseline (rhs): 0]]></Description>
     </Incident>
     <Incident type="pass" file="" line="0">
       <DataTag><![CDATA[NE:left < right]]></DataTag>
@@ -205,18 +205,18 @@
     </Incident>
     <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp" line="0">
       <DataTag><![CDATA[LT:left == right]]></DataTag>
-      <Description><![CDATA[Left value is expected to be less than right value, but is not
-   Left   (lhs): 0
-   Right  (rhs): 0]]></Description>
+      <Description><![CDATA[The computed value is expected to be less than the baseline, but is not
+   Computed (lhs): 0
+   Baseline (rhs): 0]]></Description>
     </Incident>
     <Incident type="pass" file="" line="0">
       <DataTag><![CDATA[LT:left < right]]></DataTag>
     </Incident>
     <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp" line="0">
       <DataTag><![CDATA[LT:left > right]]></DataTag>
-      <Description><![CDATA[Left value is expected to be less than right value, but is not
-   Left   (lhs): 0.1
-   Right  (rhs): 0]]></Description>
+      <Description><![CDATA[The computed value is expected to be less than the baseline, but is not
+   Computed (lhs): 0.1
+   Baseline (rhs): 0]]></Description>
     </Incident>
     <Incident type="pass" file="" line="0">
       <DataTag><![CDATA[LE:left == right]]></DataTag>
@@ -226,21 +226,21 @@
     </Incident>
     <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp" line="0">
       <DataTag><![CDATA[LE:left > right]]></DataTag>
-      <Description><![CDATA[Left value is expected to be less than or equal to right value, but is not
-   Left   (lhs): 0.1
-   Right  (rhs): 0]]></Description>
+      <Description><![CDATA[The computed value is expected to be less than or equal to the baseline, but is not
+   Computed (lhs): 0.1
+   Baseline (rhs): 0]]></Description>
     </Incident>
     <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp" line="0">
       <DataTag><![CDATA[GT:left == right]]></DataTag>
-      <Description><![CDATA[Left value is expected to be greater than right value, but is not
-   Left   (lhs): 0
-   Right  (rhs): 0]]></Description>
+      <Description><![CDATA[The computed value is expected to be greater than the baseline, but is not
+   Computed (lhs): 0
+   Baseline (rhs): 0]]></Description>
     </Incident>
     <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp" line="0">
       <DataTag><![CDATA[GT:left < right]]></DataTag>
-      <Description><![CDATA[Left value is expected to be greater than right value, but is not
-   Left   (lhs): 0
-   Right  (rhs): 0.1]]></Description>
+      <Description><![CDATA[The computed value is expected to be greater than the baseline, but is not
+   Computed (lhs): 0
+   Baseline (rhs): 0.1]]></Description>
     </Incident>
     <Incident type="pass" file="" line="0">
       <DataTag><![CDATA[GT:left > right]]></DataTag>
@@ -250,9 +250,9 @@
     </Incident>
     <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp" line="0">
       <DataTag><![CDATA[GE:left < right]]></DataTag>
-      <Description><![CDATA[Left value is expected to be greater than or equal to right value, but is not
-   Left   (lhs): 0
-   Right  (rhs): 0.1]]></Description>
+      <Description><![CDATA[The computed value is expected to be greater than or equal to the baseline, but is not
+   Computed (lhs): 0
+   Baseline (rhs): 0.1]]></Description>
     </Incident>
     <Incident type="pass" file="" line="0">
       <DataTag><![CDATA[GE:left > right]]></DataTag>
@@ -265,21 +265,21 @@
     </Incident>
     <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp" line="0">
       <DataTag><![CDATA[EQ:left < right]]></DataTag>
-      <Description><![CDATA[Left value is expected to be equal to right value, but is not
-   Left   (lhs): 1
-   Right  (rhs): 2]]></Description>
+      <Description><![CDATA[The computed value is expected to be equal to the baseline, but is not
+   Computed (lhs): 1
+   Baseline (rhs): 2]]></Description>
     </Incident>
     <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp" line="0">
       <DataTag><![CDATA[EQ:left > right]]></DataTag>
-      <Description><![CDATA[Left value is expected to be equal to right value, but is not
-   Left   (lhs): 2
-   Right  (rhs): 1]]></Description>
+      <Description><![CDATA[The computed value is expected to be equal to the baseline, but is not
+   Computed (lhs): 2
+   Baseline (rhs): 1]]></Description>
     </Incident>
     <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp" line="0">
       <DataTag><![CDATA[NE:left == right]]></DataTag>
-      <Description><![CDATA[Left value is expected to be different from right value, but is not
-   Left   (lhs): 1
-   Right  (rhs): 1]]></Description>
+      <Description><![CDATA[The computed value is expected to be different from the baseline, but is not
+   Computed (lhs): 1
+   Baseline (rhs): 1]]></Description>
     </Incident>
     <Incident type="pass" file="" line="0">
       <DataTag><![CDATA[NE:left < right]]></DataTag>
@@ -289,18 +289,18 @@
     </Incident>
     <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp" line="0">
       <DataTag><![CDATA[LT:left == right]]></DataTag>
-      <Description><![CDATA[Left value is expected to be less than right value, but is not
-   Left   (lhs): 1
-   Right  (rhs): 1]]></Description>
+      <Description><![CDATA[The computed value is expected to be less than the baseline, but is not
+   Computed (lhs): 1
+   Baseline (rhs): 1]]></Description>
     </Incident>
     <Incident type="pass" file="" line="0">
       <DataTag><![CDATA[LT:left < right]]></DataTag>
     </Incident>
     <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp" line="0">
       <DataTag><![CDATA[LT:left > right]]></DataTag>
-      <Description><![CDATA[Left value is expected to be less than right value, but is not
-   Left   (lhs): 2
-   Right  (rhs): 1]]></Description>
+      <Description><![CDATA[The computed value is expected to be less than the baseline, but is not
+   Computed (lhs): 2
+   Baseline (rhs): 1]]></Description>
     </Incident>
     <Incident type="pass" file="" line="0">
       <DataTag><![CDATA[LE:left == right]]></DataTag>
@@ -310,21 +310,21 @@
     </Incident>
     <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp" line="0">
       <DataTag><![CDATA[LE:left > right]]></DataTag>
-      <Description><![CDATA[Left value is expected to be less than or equal to right value, but is not
-   Left   (lhs): 2
-   Right  (rhs): 1]]></Description>
+      <Description><![CDATA[The computed value is expected to be less than or equal to the baseline, but is not
+   Computed (lhs): 2
+   Baseline (rhs): 1]]></Description>
     </Incident>
     <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp" line="0">
       <DataTag><![CDATA[GT:left == right]]></DataTag>
-      <Description><![CDATA[Left value is expected to be greater than right value, but is not
-   Left   (lhs): 1
-   Right  (rhs): 1]]></Description>
+      <Description><![CDATA[The computed value is expected to be greater than the baseline, but is not
+   Computed (lhs): 1
+   Baseline (rhs): 1]]></Description>
     </Incident>
     <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp" line="0">
       <DataTag><![CDATA[GT:left < right]]></DataTag>
-      <Description><![CDATA[Left value is expected to be greater than right value, but is not
-   Left   (lhs): 1
-   Right  (rhs): 2]]></Description>
+      <Description><![CDATA[The computed value is expected to be greater than the baseline, but is not
+   Computed (lhs): 1
+   Baseline (rhs): 2]]></Description>
     </Incident>
     <Incident type="pass" file="" line="0">
       <DataTag><![CDATA[GT:left > right]]></DataTag>
@@ -334,9 +334,9 @@
     </Incident>
     <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp" line="0">
       <DataTag><![CDATA[GE:left < right]]></DataTag>
-      <Description><![CDATA[Left value is expected to be greater than or equal to right value, but is not
-   Left   (lhs): 1
-   Right  (rhs): 2]]></Description>
+      <Description><![CDATA[The computed value is expected to be greater than or equal to the baseline, but is not
+   Computed (lhs): 1
+   Baseline (rhs): 2]]></Description>
     </Incident>
     <Incident type="pass" file="" line="0">
       <DataTag><![CDATA[GE:left > right]]></DataTag>
@@ -349,21 +349,21 @@
     </Incident>
     <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp" line="0">
       <DataTag><![CDATA[EQ:left < right]]></DataTag>
-      <Description><![CDATA[Left value is expected to be equal to right value, but is not
-   Left   (lhs): "nullptr"
-   Right  (rhs): 1]]></Description>
+      <Description><![CDATA[The computed value is expected to be equal to the baseline, but is not
+   Computed (lhs): "nullptr"
+   Baseline (rhs): 1]]></Description>
     </Incident>
     <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp" line="0">
       <DataTag><![CDATA[EQ:left > right]]></DataTag>
-      <Description><![CDATA[Left value is expected to be equal to right value, but is not
-   Left   (lhs): 1
-   Right  (rhs): "nullptr"]]></Description>
+      <Description><![CDATA[The computed value is expected to be equal to the baseline, but is not
+   Computed (lhs): 1
+   Baseline (rhs): "nullptr"]]></Description>
     </Incident>
     <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp" line="0">
       <DataTag><![CDATA[NE:left == right]]></DataTag>
-      <Description><![CDATA[Left value is expected to be different from right value, but is not
-   Left   (lhs): "nullptr"
-   Right  (rhs): "nullptr"]]></Description>
+      <Description><![CDATA[The computed value is expected to be different from the baseline, but is not
+   Computed (lhs): "nullptr"
+   Baseline (rhs): "nullptr"]]></Description>
     </Incident>
     <Incident type="pass" file="" line="0">
       <DataTag><![CDATA[NE:left < right]]></DataTag>
@@ -373,18 +373,18 @@
     </Incident>
     <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp" line="0">
       <DataTag><![CDATA[LT:left == right]]></DataTag>
-      <Description><![CDATA[Left value is expected to be less than right value, but is not
-   Left   (lhs): "nullptr"
-   Right  (rhs): "nullptr"]]></Description>
+      <Description><![CDATA[The computed value is expected to be less than the baseline, but is not
+   Computed (lhs): "nullptr"
+   Baseline (rhs): "nullptr"]]></Description>
     </Incident>
     <Incident type="pass" file="" line="0">
       <DataTag><![CDATA[LT:left < right]]></DataTag>
     </Incident>
     <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp" line="0">
       <DataTag><![CDATA[LT:left > right]]></DataTag>
-      <Description><![CDATA[Left value is expected to be less than right value, but is not
-   Left   (lhs): 1
-   Right  (rhs): "nullptr"]]></Description>
+      <Description><![CDATA[The computed value is expected to be less than the baseline, but is not
+   Computed (lhs): 1
+   Baseline (rhs): "nullptr"]]></Description>
     </Incident>
     <Incident type="pass" file="" line="0">
       <DataTag><![CDATA[LE:left == right]]></DataTag>
@@ -394,21 +394,21 @@
     </Incident>
     <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp" line="0">
       <DataTag><![CDATA[LE:left > right]]></DataTag>
-      <Description><![CDATA[Left value is expected to be less than or equal to right value, but is not
-   Left   (lhs): 1
-   Right  (rhs): "nullptr"]]></Description>
+      <Description><![CDATA[The computed value is expected to be less than or equal to the baseline, but is not
+   Computed (lhs): 1
+   Baseline (rhs): "nullptr"]]></Description>
     </Incident>
     <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp" line="0">
       <DataTag><![CDATA[GT:left == right]]></DataTag>
-      <Description><![CDATA[Left value is expected to be greater than right value, but is not
-   Left   (lhs): "nullptr"
-   Right  (rhs): "nullptr"]]></Description>
+      <Description><![CDATA[The computed value is expected to be greater than the baseline, but is not
+   Computed (lhs): "nullptr"
+   Baseline (rhs): "nullptr"]]></Description>
     </Incident>
     <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp" line="0">
       <DataTag><![CDATA[GT:left < right]]></DataTag>
-      <Description><![CDATA[Left value is expected to be greater than right value, but is not
-   Left   (lhs): "nullptr"
-   Right  (rhs): 1]]></Description>
+      <Description><![CDATA[The computed value is expected to be greater than the baseline, but is not
+   Computed (lhs): "nullptr"
+   Baseline (rhs): 1]]></Description>
     </Incident>
     <Incident type="pass" file="" line="0">
       <DataTag><![CDATA[GT:left > right]]></DataTag>
@@ -418,9 +418,9 @@
     </Incident>
     <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp" line="0">
       <DataTag><![CDATA[GE:left < right]]></DataTag>
-      <Description><![CDATA[Left value is expected to be greater than or equal to right value, but is not
-   Left   (lhs): "nullptr"
-   Right  (rhs): 1]]></Description>
+      <Description><![CDATA[The computed value is expected to be greater than or equal to the baseline, but is not
+   Computed (lhs): "nullptr"
+   Baseline (rhs): 1]]></Description>
     </Incident>
     <Incident type="pass" file="" line="0">
       <DataTag><![CDATA[GE:left > right]]></DataTag>
@@ -433,21 +433,21 @@
     </Incident>
     <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp" line="0">
       <DataTag><![CDATA[EQ:left < right]]></DataTag>
-      <Description><![CDATA[Left value is expected to be equal to right value, but is not
-   Left   (lhs): 0
-   Right  (rhs): 1]]></Description>
+      <Description><![CDATA[The computed value is expected to be equal to the baseline, but is not
+   Computed (lhs): 0
+   Baseline (rhs): 1]]></Description>
     </Incident>
     <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp" line="0">
       <DataTag><![CDATA[EQ:left > right]]></DataTag>
-      <Description><![CDATA[Left value is expected to be equal to right value, but is not
-   Left   (lhs): 1
-   Right  (rhs): 0]]></Description>
+      <Description><![CDATA[The computed value is expected to be equal to the baseline, but is not
+   Computed (lhs): 1
+   Baseline (rhs): 0]]></Description>
     </Incident>
     <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp" line="0">
       <DataTag><![CDATA[NE:left == right]]></DataTag>
-      <Description><![CDATA[Left value is expected to be different from right value, but is not
-   Left   (lhs): 0
-   Right  (rhs): 0]]></Description>
+      <Description><![CDATA[The computed value is expected to be different from the baseline, but is not
+   Computed (lhs): 0
+   Baseline (rhs): 0]]></Description>
     </Incident>
     <Incident type="pass" file="" line="0">
       <DataTag><![CDATA[NE:left < right]]></DataTag>
@@ -457,18 +457,18 @@
     </Incident>
     <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp" line="0">
       <DataTag><![CDATA[LT:left == right]]></DataTag>
-      <Description><![CDATA[Left value is expected to be less than right value, but is not
-   Left   (lhs): 0
-   Right  (rhs): 0]]></Description>
+      <Description><![CDATA[The computed value is expected to be less than the baseline, but is not
+   Computed (lhs): 0
+   Baseline (rhs): 0]]></Description>
     </Incident>
     <Incident type="pass" file="" line="0">
       <DataTag><![CDATA[LT:left < right]]></DataTag>
     </Incident>
     <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp" line="0">
       <DataTag><![CDATA[LT:left > right]]></DataTag>
-      <Description><![CDATA[Left value is expected to be less than right value, but is not
-   Left   (lhs): 1
-   Right  (rhs): 0]]></Description>
+      <Description><![CDATA[The computed value is expected to be less than the baseline, but is not
+   Computed (lhs): 1
+   Baseline (rhs): 0]]></Description>
     </Incident>
     <Incident type="pass" file="" line="0">
       <DataTag><![CDATA[LE:left == right]]></DataTag>
@@ -478,21 +478,21 @@
     </Incident>
     <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp" line="0">
       <DataTag><![CDATA[LE:left > right]]></DataTag>
-      <Description><![CDATA[Left value is expected to be less than or equal to right value, but is not
-   Left   (lhs): 1
-   Right  (rhs): 0]]></Description>
+      <Description><![CDATA[The computed value is expected to be less than or equal to the baseline, but is not
+   Computed (lhs): 1
+   Baseline (rhs): 0]]></Description>
     </Incident>
     <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp" line="0">
       <DataTag><![CDATA[GT:left == right]]></DataTag>
-      <Description><![CDATA[Left value is expected to be greater than right value, but is not
-   Left   (lhs): 0
-   Right  (rhs): 0]]></Description>
+      <Description><![CDATA[The computed value is expected to be greater than the baseline, but is not
+   Computed (lhs): 0
+   Baseline (rhs): 0]]></Description>
     </Incident>
     <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp" line="0">
       <DataTag><![CDATA[GT:left < right]]></DataTag>
-      <Description><![CDATA[Left value is expected to be greater than right value, but is not
-   Left   (lhs): 0
-   Right  (rhs): 1]]></Description>
+      <Description><![CDATA[The computed value is expected to be greater than the baseline, but is not
+   Computed (lhs): 0
+   Baseline (rhs): 1]]></Description>
     </Incident>
     <Incident type="pass" file="" line="0">
       <DataTag><![CDATA[GT:left > right]]></DataTag>
@@ -502,9 +502,9 @@
     </Incident>
     <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp" line="0">
       <DataTag><![CDATA[GE:left < right]]></DataTag>
-      <Description><![CDATA[Left value is expected to be greater than or equal to right value, but is not
-   Left   (lhs): 0
-   Right  (rhs): 1]]></Description>
+      <Description><![CDATA[The computed value is expected to be greater than or equal to the baseline, but is not
+   Computed (lhs): 0
+   Baseline (rhs): 1]]></Description>
     </Incident>
     <Incident type="pass" file="" line="0">
       <DataTag><![CDATA[GE:left > right]]></DataTag>
@@ -517,21 +517,21 @@
     </Incident>
     <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp" line="0">
       <DataTag><![CDATA[EQ:left < right]]></DataTag>
-      <Description><![CDATA[Left value is expected to be equal to right value, but is not
-   Left   (lhs): Monday
-   Right  (rhs): Sunday]]></Description>
+      <Description><![CDATA[The computed value is expected to be equal to the baseline, but is not
+   Computed (lhs): Monday
+   Baseline (rhs): Sunday]]></Description>
     </Incident>
     <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp" line="0">
       <DataTag><![CDATA[EQ:left > right]]></DataTag>
-      <Description><![CDATA[Left value is expected to be equal to right value, but is not
-   Left   (lhs): Sunday
-   Right  (rhs): Monday]]></Description>
+      <Description><![CDATA[The computed value is expected to be equal to the baseline, but is not
+   Computed (lhs): Sunday
+   Baseline (rhs): Monday]]></Description>
     </Incident>
     <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp" line="0">
       <DataTag><![CDATA[NE:left == right]]></DataTag>
-      <Description><![CDATA[Left value is expected to be different from right value, but is not
-   Left   (lhs): Monday
-   Right  (rhs): Monday]]></Description>
+      <Description><![CDATA[The computed value is expected to be different from the baseline, but is not
+   Computed (lhs): Monday
+   Baseline (rhs): Monday]]></Description>
     </Incident>
     <Incident type="pass" file="" line="0">
       <DataTag><![CDATA[NE:left < right]]></DataTag>
@@ -541,18 +541,18 @@
     </Incident>
     <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp" line="0">
       <DataTag><![CDATA[LT:left == right]]></DataTag>
-      <Description><![CDATA[Left value is expected to be less than right value, but is not
-   Left   (lhs): Monday
-   Right  (rhs): Monday]]></Description>
+      <Description><![CDATA[The computed value is expected to be less than the baseline, but is not
+   Computed (lhs): Monday
+   Baseline (rhs): Monday]]></Description>
     </Incident>
     <Incident type="pass" file="" line="0">
       <DataTag><![CDATA[LT:left < right]]></DataTag>
     </Incident>
     <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp" line="0">
       <DataTag><![CDATA[LT:left > right]]></DataTag>
-      <Description><![CDATA[Left value is expected to be less than right value, but is not
-   Left   (lhs): Sunday
-   Right  (rhs): Monday]]></Description>
+      <Description><![CDATA[The computed value is expected to be less than the baseline, but is not
+   Computed (lhs): Sunday
+   Baseline (rhs): Monday]]></Description>
     </Incident>
     <Incident type="pass" file="" line="0">
       <DataTag><![CDATA[LE:left == right]]></DataTag>
@@ -562,21 +562,21 @@
     </Incident>
     <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp" line="0">
       <DataTag><![CDATA[LE:left > right]]></DataTag>
-      <Description><![CDATA[Left value is expected to be less than or equal to right value, but is not
-   Left   (lhs): Sunday
-   Right  (rhs): Monday]]></Description>
+      <Description><![CDATA[The computed value is expected to be less than or equal to the baseline, but is not
+   Computed (lhs): Sunday
+   Baseline (rhs): Monday]]></Description>
     </Incident>
     <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp" line="0">
       <DataTag><![CDATA[GT:left == right]]></DataTag>
-      <Description><![CDATA[Left value is expected to be greater than right value, but is not
-   Left   (lhs): Monday
-   Right  (rhs): Monday]]></Description>
+      <Description><![CDATA[The computed value is expected to be greater than the baseline, but is not
+   Computed (lhs): Monday
+   Baseline (rhs): Monday]]></Description>
     </Incident>
     <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp" line="0">
       <DataTag><![CDATA[GT:left < right]]></DataTag>
-      <Description><![CDATA[Left value is expected to be greater than right value, but is not
-   Left   (lhs): Monday
-   Right  (rhs): Sunday]]></Description>
+      <Description><![CDATA[The computed value is expected to be greater than the baseline, but is not
+   Computed (lhs): Monday
+   Baseline (rhs): Sunday]]></Description>
     </Incident>
     <Incident type="pass" file="" line="0">
       <DataTag><![CDATA[GT:left > right]]></DataTag>
@@ -586,9 +586,9 @@
     </Incident>
     <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp" line="0">
       <DataTag><![CDATA[GE:left < right]]></DataTag>
-      <Description><![CDATA[Left value is expected to be greater than or equal to right value, but is not
-   Left   (lhs): Monday
-   Right  (rhs): Sunday]]></Description>
+      <Description><![CDATA[The computed value is expected to be greater than or equal to the baseline, but is not
+   Computed (lhs): Monday
+   Baseline (rhs): Sunday]]></Description>
     </Incident>
     <Incident type="pass" file="" line="0">
       <DataTag><![CDATA[GE:left > right]]></DataTag>
@@ -601,21 +601,21 @@
     </Incident>
     <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp" line="0">
       <DataTag><![CDATA[EQ:left < right]]></DataTag>
-      <Description><![CDATA[Left value is expected to be equal to right value, but is not
-   Left   (lhs): MyClass(1)
-   Right  (rhs): MyClass(2)]]></Description>
+      <Description><![CDATA[The computed value is expected to be equal to the baseline, but is not
+   Computed (lhs): MyClass(1)
+   Baseline (rhs): MyClass(2)]]></Description>
     </Incident>
     <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp" line="0">
       <DataTag><![CDATA[EQ:left > right]]></DataTag>
-      <Description><![CDATA[Left value is expected to be equal to right value, but is not
-   Left   (lhs): MyClass(2)
-   Right  (rhs): MyClass(1)]]></Description>
+      <Description><![CDATA[The computed value is expected to be equal to the baseline, but is not
+   Computed (lhs): MyClass(2)
+   Baseline (rhs): MyClass(1)]]></Description>
     </Incident>
     <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp" line="0">
       <DataTag><![CDATA[NE:left == right]]></DataTag>
-      <Description><![CDATA[Left value is expected to be different from right value, but is not
-   Left   (lhs): MyClass(1)
-   Right  (rhs): MyClass(1)]]></Description>
+      <Description><![CDATA[The computed value is expected to be different from the baseline, but is not
+   Computed (lhs): MyClass(1)
+   Baseline (rhs): MyClass(1)]]></Description>
     </Incident>
     <Incident type="pass" file="" line="0">
       <DataTag><![CDATA[NE:left < right]]></DataTag>
@@ -625,18 +625,18 @@
     </Incident>
     <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp" line="0">
       <DataTag><![CDATA[LT:left == right]]></DataTag>
-      <Description><![CDATA[Left value is expected to be less than right value, but is not
-   Left   (lhs): MyClass(1)
-   Right  (rhs): MyClass(1)]]></Description>
+      <Description><![CDATA[The computed value is expected to be less than the baseline, but is not
+   Computed (lhs): MyClass(1)
+   Baseline (rhs): MyClass(1)]]></Description>
     </Incident>
     <Incident type="pass" file="" line="0">
       <DataTag><![CDATA[LT:left < right]]></DataTag>
     </Incident>
     <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp" line="0">
       <DataTag><![CDATA[LT:left > right]]></DataTag>
-      <Description><![CDATA[Left value is expected to be less than right value, but is not
-   Left   (lhs): MyClass(2)
-   Right  (rhs): MyClass(1)]]></Description>
+      <Description><![CDATA[The computed value is expected to be less than the baseline, but is not
+   Computed (lhs): MyClass(2)
+   Baseline (rhs): MyClass(1)]]></Description>
     </Incident>
     <Incident type="pass" file="" line="0">
       <DataTag><![CDATA[LE:left == right]]></DataTag>
@@ -646,21 +646,21 @@
     </Incident>
     <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp" line="0">
       <DataTag><![CDATA[LE:left > right]]></DataTag>
-      <Description><![CDATA[Left value is expected to be less than or equal to right value, but is not
-   Left   (lhs): MyClass(2)
-   Right  (rhs): MyClass(1)]]></Description>
+      <Description><![CDATA[The computed value is expected to be less than or equal to the baseline, but is not
+   Computed (lhs): MyClass(2)
+   Baseline (rhs): MyClass(1)]]></Description>
     </Incident>
     <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp" line="0">
       <DataTag><![CDATA[GT:left == right]]></DataTag>
-      <Description><![CDATA[Left value is expected to be greater than right value, but is not
-   Left   (lhs): MyClass(1)
-   Right  (rhs): MyClass(1)]]></Description>
+      <Description><![CDATA[The computed value is expected to be greater than the baseline, but is not
+   Computed (lhs): MyClass(1)
+   Baseline (rhs): MyClass(1)]]></Description>
     </Incident>
     <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp" line="0">
       <DataTag><![CDATA[GT:left < right]]></DataTag>
-      <Description><![CDATA[Left value is expected to be greater than right value, but is not
-   Left   (lhs): MyClass(1)
-   Right  (rhs): MyClass(2)]]></Description>
+      <Description><![CDATA[The computed value is expected to be greater than the baseline, but is not
+   Computed (lhs): MyClass(1)
+   Baseline (rhs): MyClass(2)]]></Description>
     </Incident>
     <Incident type="pass" file="" line="0">
       <DataTag><![CDATA[GT:left > right]]></DataTag>
@@ -670,9 +670,9 @@
     </Incident>
     <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp" line="0">
       <DataTag><![CDATA[GE:left < right]]></DataTag>
-      <Description><![CDATA[Left value is expected to be greater than or equal to right value, but is not
-   Left   (lhs): MyClass(1)
-   Right  (rhs): MyClass(2)]]></Description>
+      <Description><![CDATA[The computed value is expected to be greater than or equal to the baseline, but is not
+   Computed (lhs): MyClass(1)
+   Baseline (rhs): MyClass(2)]]></Description>
     </Incident>
     <Incident type="pass" file="" line="0">
       <DataTag><![CDATA[GE:left > right]]></DataTag>
@@ -682,9 +682,9 @@
   <TestFunction name="checkComparisonForTemporaryObjects">
     <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp" line="0">
       <DataTag><![CDATA[EQ]]></DataTag>
-      <Description><![CDATA[Left value is expected to be equal to right value, but is not
-   Left   (getClassForValue(0).getValuePointer()): MyClass(2) on memory address with index 0
-   Right  (getClassForValue(1).getValuePointer()): MyClass(1) on memory address with index 1]]></Description>
+      <Description><![CDATA[The computed value is expected to be equal to the baseline, but is not
+   Computed (getClassForValue(0).getValuePointer()): MyClass(2) on memory address with index 0
+   Baseline (getClassForValue(1).getValuePointer()): MyClass(1) on memory address with index 1]]></Description>
     </Incident>
     <Incident type="pass" file="" line="0">
       <DataTag><![CDATA[NE]]></DataTag>
@@ -697,15 +697,15 @@
     </Incident>
     <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp" line="0">
       <DataTag><![CDATA[GT]]></DataTag>
-      <Description><![CDATA[Left value is expected to be greater than right value, but is not
-   Left   (getClassForValue(0).getValuePointer()): MyClass(2) on memory address with index 0
-   Right  (getClassForValue(1).getValuePointer()): MyClass(1) on memory address with index 1]]></Description>
+      <Description><![CDATA[The computed value is expected to be greater than the baseline, but is not
+   Computed (getClassForValue(0).getValuePointer()): MyClass(2) on memory address with index 0
+   Baseline (getClassForValue(1).getValuePointer()): MyClass(1) on memory address with index 1]]></Description>
     </Incident>
     <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp" line="0">
       <DataTag><![CDATA[GE]]></DataTag>
-      <Description><![CDATA[Left value is expected to be greater than or equal to right value, but is not
-   Left   (getClassForValue(0).getValuePointer()): MyClass(2) on memory address with index 0
-   Right  (getClassForValue(1).getValuePointer()): MyClass(1) on memory address with index 1]]></Description>
+      <Description><![CDATA[The computed value is expected to be greater than or equal to the baseline, but is not
+   Computed (getClassForValue(0).getValuePointer()): MyClass(2) on memory address with index 0
+   Baseline (getClassForValue(1).getValuePointer()): MyClass(1) on memory address with index 1]]></Description>
     </Incident>
     <Duration msecs="0"/>
   </TestFunction>
@@ -718,21 +718,21 @@
     </Incident>
     <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp" line="0">
       <DataTag><![CDATA[LT]]></DataTag>
-      <Description><![CDATA[Left value is expected to be less than right value, but is not
-   Left   (c)                         : ClassWithDeferredSetter(1)
-   Right  (ClassWithDeferredSetter(0)): ClassWithDeferredSetter(0)]]></Description>
+      <Description><![CDATA[The computed value is expected to be less than the baseline, but is not
+   Computed (c)                         : ClassWithDeferredSetter(1)
+   Baseline (ClassWithDeferredSetter(0)): ClassWithDeferredSetter(0)]]></Description>
     </Incident>
     <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp" line="0">
       <DataTag><![CDATA[LE]]></DataTag>
-      <Description><![CDATA[Left value is expected to be less than or equal to right value, but is not
-   Left   (c)                          : ClassWithDeferredSetter(1)
-   Right  (ClassWithDeferredSetter(-1)): ClassWithDeferredSetter(-1)]]></Description>
+      <Description><![CDATA[The computed value is expected to be less than or equal to the baseline, but is not
+   Computed (c)                          : ClassWithDeferredSetter(1)
+   Baseline (ClassWithDeferredSetter(-1)): ClassWithDeferredSetter(-1)]]></Description>
     </Incident>
     <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp" line="0">
       <DataTag><![CDATA[GT]]></DataTag>
-      <Description><![CDATA[Left value is expected to be greater than right value, but is not
-   Left   (c)                         : ClassWithDeferredSetter(1)
-   Right  (ClassWithDeferredSetter(1)): ClassWithDeferredSetter(1)]]></Description>
+      <Description><![CDATA[The computed value is expected to be greater than the baseline, but is not
+   Computed (c)                         : ClassWithDeferredSetter(1)
+   Baseline (ClassWithDeferredSetter(1)): ClassWithDeferredSetter(1)]]></Description>
     </Incident>
     <Incident type="pass" file="" line="0">
       <DataTag><![CDATA[GE]]></DataTag>
diff --git a/tests/auto/testlib/selftests/expected_extendedcompare.tap b/tests/auto/testlib/selftests/expected_extendedcompare.tap
index 31562636fb..25d30c3e08 100644
--- a/tests/auto/testlib/selftests/expected_extendedcompare.tap
+++ b/tests/auto/testlib/selftests/expected_extendedcompare.tap
@@ -5,7 +5,7 @@ ok 2 - compareInts(EQ:left == right)
 not ok 3 - compareInts(EQ:left < right)
   ---
   type: QCOMPARE_EQ
-  message: Left value is expected to be equal to right value, but is not
+  message: The computed value is expected to be equal to the baseline, but is not
   wanted: == 2 (rhs)
   found: 1 (lhs)
   expected: == 2 (rhs)
@@ -17,7 +17,7 @@ not ok 3 - compareInts(EQ:left < right)
 not ok 4 - compareInts(EQ:left > right)
   ---
   type: QCOMPARE_EQ
-  message: Left value is expected to be equal to right value, but is not
+  message: The computed value is expected to be equal to the baseline, but is not
   wanted: == 1 (rhs)
   found: 2 (lhs)
   expected: == 1 (rhs)
@@ -29,7 +29,7 @@ not ok 4 - compareInts(EQ:left > right)
 not ok 5 - compareInts(NE:left == right)
   ---
   type: QCOMPARE_NE
-  message: Left value is expected to be different from right value, but is not
+  message: The computed value is expected to be different from the baseline, but is not
   wanted: != 1 (rhs)
   found: 1 (lhs)
   expected: != 1 (rhs)
@@ -43,7 +43,7 @@ ok 7 - compareInts(NE:left > right)
 not ok 8 - compareInts(LT:left == right)
   ---
   type: QCOMPARE_LT
-  message: Left value is expected to be less than right value, but is not
+  message: The computed value is expected to be less than the baseline, but is not
   wanted: < 1 (rhs)
   found: 1 (lhs)
   expected: < 1 (rhs)
@@ -56,7 +56,7 @@ ok 9 - compareInts(LT:left < right)
 not ok 10 - compareInts(LT:left > right)
   ---
   type: QCOMPARE_LT
-  message: Left value is expected to be less than right value, but is not
+  message: The computed value is expected to be less than the baseline, but is not
   wanted: < 1 (rhs)
   found: 2 (lhs)
   expected: < 1 (rhs)
@@ -70,7 +70,7 @@ ok 12 - compareInts(LE:left < right)
 not ok 13 - compareInts(LE:left > right)
   ---
   type: QCOMPARE_LE
-  message: Left value is expected to be less than or equal to right value, but is not
+  message: The computed value is expected to be less than or equal to the baseline, but is not
   wanted: <= 1 (rhs)
   found: 2 (lhs)
   expected: <= 1 (rhs)
@@ -82,7 +82,7 @@ not ok 13 - compareInts(LE:left > right)
 not ok 14 - compareInts(GT:left == right)
   ---
   type: QCOMPARE_GT
-  message: Left value is expected to be greater than right value, but is not
+  message: The computed value is expected to be greater than the baseline, but is not
   wanted: > 1 (rhs)
   found: 1 (lhs)
   expected: > 1 (rhs)
@@ -94,7 +94,7 @@ not ok 14 - compareInts(GT:left == right)
 not ok 15 - compareInts(GT:left < right)
   ---
   type: QCOMPARE_GT
-  message: Left value is expected to be greater than right value, but is not
+  message: The computed value is expected to be greater than the baseline, but is not
   wanted: > 2 (rhs)
   found: 1 (lhs)
   expected: > 2 (rhs)
@@ -108,7 +108,7 @@ ok 17 - compareInts(GE:left == right)
 not ok 18 - compareInts(GE:left < right)
   ---
   type: QCOMPARE_GE
-  message: Left value is expected to be greater than or equal to right value, but is not
+  message: The computed value is expected to be greater than or equal to the baseline, but is not
   wanted: >= 2 (rhs)
   found: 1 (lhs)
   expected: >= 2 (rhs)
@@ -122,7 +122,7 @@ ok 20 - compareFloats(EQ:left == right)
 not ok 21 - compareFloats(EQ:left < right)
   ---
   type: QCOMPARE_EQ
-  message: Left value is expected to be equal to right value, but is not
+  message: The computed value is expected to be equal to the baseline, but is not
   wanted: == 1.1 (rhs)
   found: 1 (lhs)
   expected: == 1.1 (rhs)
@@ -134,7 +134,7 @@ not ok 21 - compareFloats(EQ:left < right)
 not ok 22 - compareFloats(EQ:left > right)
   ---
   type: QCOMPARE_EQ
-  message: Left value is expected to be equal to right value, but is not
+  message: The computed value is expected to be equal to the baseline, but is not
   wanted: == 1 (rhs)
   found: 1.1 (lhs)
   expected: == 1 (rhs)
@@ -146,7 +146,7 @@ not ok 22 - compareFloats(EQ:left > right)
 not ok 23 - compareFloats(NE:left == right)
   ---
   type: QCOMPARE_NE
-  message: Left value is expected to be different from right value, but is not
+  message: The computed value is expected to be different from the baseline, but is not
   wanted: != 1 (rhs)
   found: 1 (lhs)
   expected: != 1 (rhs)
@@ -160,7 +160,7 @@ ok 25 - compareFloats(NE:left > right)
 not ok 26 - compareFloats(LT:left == right)
   ---
   type: QCOMPARE_LT
-  message: Left value is expected to be less than right value, but is not
+  message: The computed value is expected to be less than the baseline, but is not
   wanted: < 1 (rhs)
   found: 1 (lhs)
   expected: < 1 (rhs)
@@ -173,7 +173,7 @@ ok 27 - compareFloats(LT:left < right)
 not ok 28 - compareFloats(LT:left > right)
   ---
   type: QCOMPARE_LT
-  message: Left value is expected to be less than right value, but is not
+  message: The computed value is expected to be less than the baseline, but is not
   wanted: < 1 (rhs)
   found: 1.1 (lhs)
   expected: < 1 (rhs)
@@ -187,7 +187,7 @@ ok 30 - compareFloats(LE:left < right)
 not ok 31 - compareFloats(LE:left > right)
   ---
   type: QCOMPARE_LE
-  message: Left value is expected to be less than or equal to right value, but is not
+  message: The computed value is expected to be less than or equal to the baseline, but is not
   wanted: <= 1 (rhs)
   found: 1.1 (lhs)
   expected: <= 1 (rhs)
@@ -199,7 +199,7 @@ not ok 31 - compareFloats(LE:left > right)
 not ok 32 - compareFloats(GT:left == right)
   ---
   type: QCOMPARE_GT
-  message: Left value is expected to be greater than right value, but is not
+  message: The computed value is expected to be greater than the baseline, but is not
   wanted: > 1 (rhs)
   found: 1 (lhs)
   expected: > 1 (rhs)
@@ -211,7 +211,7 @@ not ok 32 - compareFloats(GT:left == right)
 not ok 33 - compareFloats(GT:left < right)
   ---
   type: QCOMPARE_GT
-  message: Left value is expected to be greater than right value, but is not
+  message: The computed value is expected to be greater than the baseline, but is not
   wanted: > 1.1 (rhs)
   found: 1 (lhs)
   expected: > 1.1 (rhs)
@@ -225,7 +225,7 @@ ok 35 - compareFloats(GE:left == right)
 not ok 36 - compareFloats(GE:left < right)
   ---
   type: QCOMPARE_GE
-  message: Left value is expected to be greater than or equal to right value, but is not
+  message: The computed value is expected to be greater than or equal to the baseline, but is not
   wanted: >= 1.1 (rhs)
   found: 1 (lhs)
   expected: >= 1.1 (rhs)
@@ -239,7 +239,7 @@ ok 38 - compareDoubles(EQ:left == right)
 not ok 39 - compareDoubles(EQ:left < right)
   ---
   type: QCOMPARE_EQ
-  message: Left value is expected to be equal to right value, but is not
+  message: The computed value is expected to be equal to the baseline, but is not
   wanted: == 0.1 (rhs)
   found: 0 (lhs)
   expected: == 0.1 (rhs)
@@ -251,7 +251,7 @@ not ok 39 - compareDoubles(EQ:left < right)
 not ok 40 - compareDoubles(EQ:left > right)
   ---
   type: QCOMPARE_EQ
-  message: Left value is expected to be equal to right value, but is not
+  message: The computed value is expected to be equal to the baseline, but is not
   wanted: == 0 (rhs)
   found: 0.1 (lhs)
   expected: == 0 (rhs)
@@ -263,7 +263,7 @@ not ok 40 - compareDoubles(EQ:left > right)
 not ok 41 - compareDoubles(NE:left == right)
   ---
   type: QCOMPARE_NE
-  message: Left value is expected to be different from right value, but is not
+  message: The computed value is expected to be different from the baseline, but is not
   wanted: != 0 (rhs)
   found: 0 (lhs)
   expected: != 0 (rhs)
@@ -277,7 +277,7 @@ ok 43 - compareDoubles(NE:left > right)
 not ok 44 - compareDoubles(LT:left == right)
   ---
   type: QCOMPARE_LT
-  message: Left value is expected to be less than right value, but is not
+  message: The computed value is expected to be less than the baseline, but is not
   wanted: < 0 (rhs)
   found: 0 (lhs)
   expected: < 0 (rhs)
@@ -290,7 +290,7 @@ ok 45 - compareDoubles(LT:left < right)
 not ok 46 - compareDoubles(LT:left > right)
   ---
   type: QCOMPARE_LT
-  message: Left value is expected to be less than right value, but is not
+  message: The computed value is expected to be less than the baseline, but is not
   wanted: < 0 (rhs)
   found: 0.1 (lhs)
   expected: < 0 (rhs)
@@ -304,7 +304,7 @@ ok 48 - compareDoubles(LE:left < right)
 not ok 49 - compareDoubles(LE:left > right)
   ---
   type: QCOMPARE_LE
-  message: Left value is expected to be less than or equal to right value, but is not
+  message: The computed value is expected to be less than or equal to the baseline, but is not
   wanted: <= 0 (rhs)
   found: 0.1 (lhs)
   expected: <= 0 (rhs)
@@ -316,7 +316,7 @@ not ok 49 - compareDoubles(LE:left > right)
 not ok 50 - compareDoubles(GT:left == right)
   ---
   type: QCOMPARE_GT
-  message: Left value is expected to be greater than right value, but is not
+  message: The computed value is expected to be greater than the baseline, but is not
   wanted: > 0 (rhs)
   found: 0 (lhs)
   expected: > 0 (rhs)
@@ -328,7 +328,7 @@ not ok 50 - compareDoubles(GT:left == right)
 not ok 51 - compareDoubles(GT:left < right)
   ---
   type: QCOMPARE_GT
-  message: Left value is expected to be greater than right value, but is not
+  message: The computed value is expected to be greater than the baseline, but is not
   wanted: > 0.1 (rhs)
   found: 0 (lhs)
   expected: > 0.1 (rhs)
@@ -342,7 +342,7 @@ ok 53 - compareDoubles(GE:left == right)
 not ok 54 - compareDoubles(GE:left < right)
   ---
   type: QCOMPARE_GE
-  message: Left value is expected to be greater than or equal to right value, but is not
+  message: The computed value is expected to be greater than or equal to the baseline, but is not
   wanted: >= 0.1 (rhs)
   found: 0 (lhs)
   expected: >= 0.1 (rhs)
@@ -356,7 +356,7 @@ ok 56 - comparePointers(EQ:left == right)
 not ok 57 - comparePointers(EQ:left < right)
   ---
   type: QCOMPARE_EQ
-  message: Left value is expected to be equal to right value, but is not
+  message: The computed value is expected to be equal to the baseline, but is not
   wanted: == 2 (rhs)
   found: 1 (lhs)
   expected: == 2 (rhs)
@@ -368,7 +368,7 @@ not ok 57 - comparePointers(EQ:left < right)
 not ok 58 - comparePointers(EQ:left > right)
   ---
   type: QCOMPARE_EQ
-  message: Left value is expected to be equal to right value, but is not
+  message: The computed value is expected to be equal to the baseline, but is not
   wanted: == 1 (rhs)
   found: 2 (lhs)
   expected: == 1 (rhs)
@@ -380,7 +380,7 @@ not ok 58 - comparePointers(EQ:left > right)
 not ok 59 - comparePointers(NE:left == right)
   ---
   type: QCOMPARE_NE
-  message: Left value is expected to be different from right value, but is not
+  message: The computed value is expected to be different from the baseline, but is not
   wanted: != 1 (rhs)
   found: 1 (lhs)
   expected: != 1 (rhs)
@@ -394,7 +394,7 @@ ok 61 - comparePointers(NE:left > right)
 not ok 62 - comparePointers(LT:left == right)
   ---
   type: QCOMPARE_LT
-  message: Left value is expected to be less than right value, but is not
+  message: The computed value is expected to be less than the baseline, but is not
   wanted: < 1 (rhs)
   found: 1 (lhs)
   expected: < 1 (rhs)
@@ -407,7 +407,7 @@ ok 63 - comparePointers(LT:left < right)
 not ok 64 - comparePointers(LT:left > right)
   ---
   type: QCOMPARE_LT
-  message: Left value is expected to be less than right value, but is not
+  message: The computed value is expected to be less than the baseline, but is not
   wanted: < 1 (rhs)
   found: 2 (lhs)
   expected: < 1 (rhs)
@@ -421,7 +421,7 @@ ok 66 - comparePointers(LE:left < right)
 not ok 67 - comparePointers(LE:left > right)
   ---
   type: QCOMPARE_LE
-  message: Left value is expected to be less than or equal to right value, but is not
+  message: The computed value is expected to be less than or equal to the baseline, but is not
   wanted: <= 1 (rhs)
   found: 2 (lhs)
   expected: <= 1 (rhs)
@@ -433,7 +433,7 @@ not ok 67 - comparePointers(LE:left > right)
 not ok 68 - comparePointers(GT:left == right)
   ---
   type: QCOMPARE_GT
-  message: Left value is expected to be greater than right value, but is not
+  message: The computed value is expected to be greater than the baseline, but is not
   wanted: > 1 (rhs)
   found: 1 (lhs)
   expected: > 1 (rhs)
@@ -445,7 +445,7 @@ not ok 68 - comparePointers(GT:left == right)
 not ok 69 - comparePointers(GT:left < right)
   ---
   type: QCOMPARE_GT
-  message: Left value is expected to be greater than right value, but is not
+  message: The computed value is expected to be greater than the baseline, but is not
   wanted: > 2 (rhs)
   found: 1 (lhs)
   expected: > 2 (rhs)
@@ -459,7 +459,7 @@ ok 71 - comparePointers(GE:left == right)
 not ok 72 - comparePointers(GE:left < right)
   ---
   type: QCOMPARE_GE
-  message: Left value is expected to be greater than or equal to right value, but is not
+  message: The computed value is expected to be greater than or equal to the baseline, but is not
   wanted: >= 2 (rhs)
   found: 1 (lhs)
   expected: >= 2 (rhs)
@@ -473,7 +473,7 @@ ok 74 - compareToNullptr(EQ:left == right)
 not ok 75 - compareToNullptr(EQ:left < right)
   ---
   type: QCOMPARE_EQ
-  message: Left value is expected to be equal to right value, but is not
+  message: The computed value is expected to be equal to the baseline, but is not
   wanted: == 1 (rhs)
   found: "nullptr" (lhs)
   expected: == 1 (rhs)
@@ -485,7 +485,7 @@ not ok 75 - compareToNullptr(EQ:left < right)
 not ok 76 - compareToNullptr(EQ:left > right)
   ---
   type: QCOMPARE_EQ
-  message: Left value is expected to be equal to right value, but is not
+  message: The computed value is expected to be equal to the baseline, but is not
   wanted: == "nullptr" (rhs)
   found: 1 (lhs)
   expected: == "nullptr" (rhs)
@@ -497,7 +497,7 @@ not ok 76 - compareToNullptr(EQ:left > right)
 not ok 77 - compareToNullptr(NE:left == right)
   ---
   type: QCOMPARE_NE
-  message: Left value is expected to be different from right value, but is not
+  message: The computed value is expected to be different from the baseline, but is not
   wanted: != "nullptr" (rhs)
   found: "nullptr" (lhs)
   expected: != "nullptr" (rhs)
@@ -511,7 +511,7 @@ ok 79 - compareToNullptr(NE:left > right)
 not ok 80 - compareToNullptr(LT:left == right)
   ---
   type: QCOMPARE_LT
-  message: Left value is expected to be less than right value, but is not
+  message: The computed value is expected to be less than the baseline, but is not
   wanted: < "nullptr" (rhs)
   found: "nullptr" (lhs)
   expected: < "nullptr" (rhs)
@@ -524,7 +524,7 @@ ok 81 - compareToNullptr(LT:left < right)
 not ok 82 - compareToNullptr(LT:left > right)
   ---
   type: QCOMPARE_LT
-  message: Left value is expected to be less than right value, but is not
+  message: The computed value is expected to be less than the baseline, but is not
   wanted: < "nullptr" (rhs)
   found: 1 (lhs)
   expected: < "nullptr" (rhs)
@@ -538,7 +538,7 @@ ok 84 - compareToNullptr(LE:left < right)
 not ok 85 - compareToNullptr(LE:left > right)
   ---
   type: QCOMPARE_LE
-  message: Left value is expected to be less than or equal to right value, but is not
+  message: The computed value is expected to be less than or equal to the baseline, but is not
   wanted: <= "nullptr" (rhs)
   found: 1 (lhs)
   expected: <= "nullptr" (rhs)
@@ -550,7 +550,7 @@ not ok 85 - compareToNullptr(LE:left > right)
 not ok 86 - compareToNullptr(GT:left == right)
   ---
   type: QCOMPARE_GT
-  message: Left value is expected to be greater than right value, but is not
+  message: The computed value is expected to be greater than the baseline, but is not
   wanted: > "nullptr" (rhs)
   found: "nullptr" (lhs)
   expected: > "nullptr" (rhs)
@@ -562,7 +562,7 @@ not ok 86 - compareToNullptr(GT:left == right)
 not ok 87 - compareToNullptr(GT:left < right)
   ---
   type: QCOMPARE_GT
-  message: Left value is expected to be greater than right value, but is not
+  message: The computed value is expected to be greater than the baseline, but is not
   wanted: > 1 (rhs)
   found: "nullptr" (lhs)
   expected: > 1 (rhs)
@@ -576,7 +576,7 @@ ok 89 - compareToNullptr(GE:left == right)
 not ok 90 - compareToNullptr(GE:left < right)
   ---
   type: QCOMPARE_GE
-  message: Left value is expected to be greater than or equal to right value, but is not
+  message: The computed value is expected to be greater than or equal to the baseline, but is not
   wanted: >= 1 (rhs)
   found: "nullptr" (lhs)
   expected: >= 1 (rhs)
@@ -590,7 +590,7 @@ ok 92 - compareUnregistereEnum(EQ:left == right)
 not ok 93 - compareUnregistereEnum(EQ:left < right)
   ---
   type: QCOMPARE_EQ
-  message: Left value is expected to be equal to right value, but is not
+  message: The computed value is expected to be equal to the baseline, but is not
   wanted: == 1 (rhs)
   found: 0 (lhs)
   expected: == 1 (rhs)
@@ -602,7 +602,7 @@ not ok 93 - compareUnregistereEnum(EQ:left < right)
 not ok 94 - compareUnregistereEnum(EQ:left > right)
   ---
   type: QCOMPARE_EQ
-  message: Left value is expected to be equal to right value, but is not
+  message: The computed value is expected to be equal to the baseline, but is not
   wanted: == 0 (rhs)
   found: 1 (lhs)
   expected: == 0 (rhs)
@@ -614,7 +614,7 @@ not ok 94 - compareUnregistereEnum(EQ:left > right)
 not ok 95 - compareUnregistereEnum(NE:left == right)
   ---
   type: QCOMPARE_NE
-  message: Left value is expected to be different from right value, but is not
+  message: The computed value is expected to be different from the baseline, but is not
   wanted: != 0 (rhs)
   found: 0 (lhs)
   expected: != 0 (rhs)
@@ -628,7 +628,7 @@ ok 97 - compareUnregistereEnum(NE:left > right)
 not ok 98 - compareUnregistereEnum(LT:left == right)
   ---
   type: QCOMPARE_LT
-  message: Left value is expected to be less than right value, but is not
+  message: The computed value is expected to be less than the baseline, but is not
   wanted: < 0 (rhs)
   found: 0 (lhs)
   expected: < 0 (rhs)
@@ -641,7 +641,7 @@ ok 99 - compareUnregistereEnum(LT:left < right)
 not ok 100 - compareUnregistereEnum(LT:left > right)
   ---
   type: QCOMPARE_LT
-  message: Left value is expected to be less than right value, but is not
+  message: The computed value is expected to be less than the baseline, but is not
   wanted: < 0 (rhs)
   found: 1 (lhs)
   expected: < 0 (rhs)
@@ -655,7 +655,7 @@ ok 102 - compareUnregistereEnum(LE:left < right)
 not ok 103 - compareUnregistereEnum(LE:left > right)
   ---
   type: QCOMPARE_LE
-  message: Left value is expected to be less than or equal to right value, but is not
+  message: The computed value is expected to be less than or equal to the baseline, but is not
   wanted: <= 0 (rhs)
   found: 1 (lhs)
   expected: <= 0 (rhs)
@@ -667,7 +667,7 @@ not ok 103 - compareUnregistereEnum(LE:left > right)
 not ok 104 - compareUnregistereEnum(GT:left == right)
   ---
   type: QCOMPARE_GT
-  message: Left value is expected to be greater than right value, but is not
+  message: The computed value is expected to be greater than the baseline, but is not
   wanted: > 0 (rhs)
   found: 0 (lhs)
   expected: > 0 (rhs)
@@ -679,7 +679,7 @@ not ok 104 - compareUnregistereEnum(GT:left == right)
 not ok 105 - compareUnregistereEnum(GT:left < right)
   ---
   type: QCOMPARE_GT
-  message: Left value is expected to be greater than right value, but is not
+  message: The computed value is expected to be greater than the baseline, but is not
   wanted: > 1 (rhs)
   found: 0 (lhs)
   expected: > 1 (rhs)
@@ -693,7 +693,7 @@ ok 107 - compareUnregistereEnum(GE:left == right)
 not ok 108 - compareUnregistereEnum(GE:left < right)
   ---
   type: QCOMPARE_GE
-  message: Left value is expected to be greater than or equal to right value, but is not
+  message: The computed value is expected to be greater than or equal to the baseline, but is not
   wanted: >= 1 (rhs)
   found: 0 (lhs)
   expected: >= 1 (rhs)
@@ -707,7 +707,7 @@ ok 110 - compareRegistereEnum(EQ:left == right)
 not ok 111 - compareRegistereEnum(EQ:left < right)
   ---
   type: QCOMPARE_EQ
-  message: Left value is expected to be equal to right value, but is not
+  message: The computed value is expected to be equal to the baseline, but is not
   wanted: == Sunday (rhs)
   found: Monday (lhs)
   expected: == Sunday (rhs)
@@ -719,7 +719,7 @@ not ok 111 - compareRegistereEnum(EQ:left < right)
 not ok 112 - compareRegistereEnum(EQ:left > right)
   ---
   type: QCOMPARE_EQ
-  message: Left value is expected to be equal to right value, but is not
+  message: The computed value is expected to be equal to the baseline, but is not
   wanted: == Monday (rhs)
   found: Sunday (lhs)
   expected: == Monday (rhs)
@@ -731,7 +731,7 @@ not ok 112 - compareRegistereEnum(EQ:left > right)
 not ok 113 - compareRegistereEnum(NE:left == right)
   ---
   type: QCOMPARE_NE
-  message: Left value is expected to be different from right value, but is not
+  message: The computed value is expected to be different from the baseline, but is not
   wanted: != Monday (rhs)
   found: Monday (lhs)
   expected: != Monday (rhs)
@@ -745,7 +745,7 @@ ok 115 - compareRegistereEnum(NE:left > right)
 not ok 116 - compareRegistereEnum(LT:left == right)
   ---
   type: QCOMPARE_LT
-  message: Left value is expected to be less than right value, but is not
+  message: The computed value is expected to be less than the baseline, but is not
   wanted: < Monday (rhs)
   found: Monday (lhs)
   expected: < Monday (rhs)
@@ -758,7 +758,7 @@ ok 117 - compareRegistereEnum(LT:left < right)
 not ok 118 - compareRegistereEnum(LT:left > right)
   ---
   type: QCOMPARE_LT
-  message: Left value is expected to be less than right value, but is not
+  message: The computed value is expected to be less than the baseline, but is not
   wanted: < Monday (rhs)
   found: Sunday (lhs)
   expected: < Monday (rhs)
@@ -772,7 +772,7 @@ ok 120 - compareRegistereEnum(LE:left < right)
 not ok 121 - compareRegistereEnum(LE:left > right)
   ---
   type: QCOMPARE_LE
-  message: Left value is expected to be less than or equal to right value, but is not
+  message: The computed value is expected to be less than or equal to the baseline, but is not
   wanted: <= Monday (rhs)
   found: Sunday (lhs)
   expected: <= Monday (rhs)
@@ -784,7 +784,7 @@ not ok 121 - compareRegistereEnum(LE:left > right)
 not ok 122 - compareRegistereEnum(GT:left == right)
   ---
   type: QCOMPARE_GT
-  message: Left value is expected to be greater than right value, but is not
+  message: The computed value is expected to be greater than the baseline, but is not
   wanted: > Monday (rhs)
   found: Monday (lhs)
   expected: > Monday (rhs)
@@ -796,7 +796,7 @@ not ok 122 - compareRegistereEnum(GT:left == right)
 not ok 123 - compareRegistereEnum(GT:left < right)
   ---
   type: QCOMPARE_GT
-  message: Left value is expected to be greater than right value, but is not
+  message: The computed value is expected to be greater than the baseline, but is not
   wanted: > Sunday (rhs)
   found: Monday (lhs)
   expected: > Sunday (rhs)
@@ -810,7 +810,7 @@ ok 125 - compareRegistereEnum(GE:left == right)
 not ok 126 - compareRegistereEnum(GE:left < right)
   ---
   type: QCOMPARE_GE
-  message: Left value is expected to be greater than or equal to right value, but is not
+  message: The computed value is expected to be greater than or equal to the baseline, but is not
   wanted: >= Sunday (rhs)
   found: Monday (lhs)
   expected: >= Sunday (rhs)
@@ -824,7 +824,7 @@ ok 128 - compareCustomTypes(EQ:left == right)
 not ok 129 - compareCustomTypes(EQ:left < right)
   ---
   type: QCOMPARE_EQ
-  message: Left value is expected to be equal to right value, but is not
+  message: The computed value is expected to be equal to the baseline, but is not
   wanted: == MyClass(2) (rhs)
   found: MyClass(1) (lhs)
   expected: == MyClass(2) (rhs)
@@ -836,7 +836,7 @@ not ok 129 - compareCustomTypes(EQ:left < right)
 not ok 130 - compareCustomTypes(EQ:left > right)
   ---
   type: QCOMPARE_EQ
-  message: Left value is expected to be equal to right value, but is not
+  message: The computed value is expected to be equal to the baseline, but is not
   wanted: == MyClass(1) (rhs)
   found: MyClass(2) (lhs)
   expected: == MyClass(1) (rhs)
@@ -848,7 +848,7 @@ not ok 130 - compareCustomTypes(EQ:left > right)
 not ok 131 - compareCustomTypes(NE:left == right)
   ---
   type: QCOMPARE_NE
-  message: Left value is expected to be different from right value, but is not
+  message: The computed value is expected to be different from the baseline, but is not
   wanted: != MyClass(1) (rhs)
   found: MyClass(1) (lhs)
   expected: != MyClass(1) (rhs)
@@ -862,7 +862,7 @@ ok 133 - compareCustomTypes(NE:left > right)
 not ok 134 - compareCustomTypes(LT:left == right)
   ---
   type: QCOMPARE_LT
-  message: Left value is expected to be less than right value, but is not
+  message: The computed value is expected to be less than the baseline, but is not
   wanted: < MyClass(1) (rhs)
   found: MyClass(1) (lhs)
   expected: < MyClass(1) (rhs)
@@ -875,7 +875,7 @@ ok 135 - compareCustomTypes(LT:left < right)
 not ok 136 - compareCustomTypes(LT:left > right)
   ---
   type: QCOMPARE_LT
-  message: Left value is expected to be less than right value, but is not
+  message: The computed value is expected to be less than the baseline, but is not
   wanted: < MyClass(1) (rhs)
   found: MyClass(2) (lhs)
   expected: < MyClass(1) (rhs)
@@ -889,7 +889,7 @@ ok 138 - compareCustomTypes(LE:left < right)
 not ok 139 - compareCustomTypes(LE:left > right)
   ---
   type: QCOMPARE_LE
-  message: Left value is expected to be less than or equal to right value, but is not
+  message: The computed value is expected to be less than or equal to the baseline, but is not
   wanted: <= MyClass(1) (rhs)
   found: MyClass(2) (lhs)
   expected: <= MyClass(1) (rhs)
@@ -901,7 +901,7 @@ not ok 139 - compareCustomTypes(LE:left > right)
 not ok 140 - compareCustomTypes(GT:left == right)
   ---
   type: QCOMPARE_GT
-  message: Left value is expected to be greater than right value, but is not
+  message: The computed value is expected to be greater than the baseline, but is not
   wanted: > MyClass(1) (rhs)
   found: MyClass(1) (lhs)
   expected: > MyClass(1) (rhs)
@@ -913,7 +913,7 @@ not ok 140 - compareCustomTypes(GT:left == right)
 not ok 141 - compareCustomTypes(GT:left < right)
   ---
   type: QCOMPARE_GT
-  message: Left value is expected to be greater than right value, but is not
+  message: The computed value is expected to be greater than the baseline, but is not
   wanted: > MyClass(2) (rhs)
   found: MyClass(1) (lhs)
   expected: > MyClass(2) (rhs)
@@ -927,7 +927,7 @@ ok 143 - compareCustomTypes(GE:left == right)
 not ok 144 - compareCustomTypes(GE:left < right)
   ---
   type: QCOMPARE_GE
-  message: Left value is expected to be greater than or equal to right value, but is not
+  message: The computed value is expected to be greater than or equal to the baseline, but is not
   wanted: >= MyClass(2) (rhs)
   found: MyClass(1) (lhs)
   expected: >= MyClass(2) (rhs)
@@ -940,7 +940,7 @@ ok 145 - compareCustomTypes(GE:left > right)
 not ok 146 - checkComparisonForTemporaryObjects(EQ)
   ---
   type: QCOMPARE_EQ
-  message: Left value is expected to be equal to right value, but is not
+  message: The computed value is expected to be equal to the baseline, but is not
   wanted: == MyClass(1) on memory address with index 1 (getClassForValue(1).getValuePointer())
   found: MyClass(2) on memory address with index 0 (getClassForValue(0).getValuePointer())
   expected: == MyClass(1) on memory address with index 1 (getClassForValue(1).getValuePointer())
@@ -955,7 +955,7 @@ ok 149 - checkComparisonForTemporaryObjects(LE)
 not ok 150 - checkComparisonForTemporaryObjects(GT)
   ---
   type: QCOMPARE_GT
-  message: Left value is expected to be greater than right value, but is not
+  message: The computed value is expected to be greater than the baseline, but is not
   wanted: > MyClass(1) on memory address with index 1 (getClassForValue(1).getValuePointer())
   found: MyClass(2) on memory address with index 0 (getClassForValue(0).getValuePointer())
   expected: > MyClass(1) on memory address with index 1 (getClassForValue(1).getValuePointer())
@@ -967,7 +967,7 @@ not ok 150 - checkComparisonForTemporaryObjects(GT)
 not ok 151 - checkComparisonForTemporaryObjects(GE)
   ---
   type: QCOMPARE_GE
-  message: Left value is expected to be greater than or equal to right value, but is not
+  message: The computed value is expected to be greater than or equal to the baseline, but is not
   wanted: >= MyClass(1) on memory address with index 1 (getClassForValue(1).getValuePointer())
   found: MyClass(2) on memory address with index 0 (getClassForValue(0).getValuePointer())
   expected: >= MyClass(1) on memory address with index 1 (getClassForValue(1).getValuePointer())
@@ -981,7 +981,7 @@ ok 153 - checkComparisonWithTimeout(NE)
 not ok 154 - checkComparisonWithTimeout(LT)
   ---
   type: QCOMPARE_LT
-  message: Left value is expected to be less than right value, but is not
+  message: The computed value is expected to be less than the baseline, but is not
   wanted: < ClassWithDeferredSetter(0) (ClassWithDeferredSetter(0))
   found: ClassWithDeferredSetter(1) (c)
   expected: < ClassWithDeferredSetter(0) (ClassWithDeferredSetter(0))
@@ -993,7 +993,7 @@ not ok 154 - checkComparisonWithTimeout(LT)
 not ok 155 - checkComparisonWithTimeout(LE)
   ---
   type: QCOMPARE_LE
-  message: Left value is expected to be less than or equal to right value, but is not
+  message: The computed value is expected to be less than or equal to the baseline, but is not
   wanted: <= ClassWithDeferredSetter(-1) (ClassWithDeferredSetter(-1))
   found: ClassWithDeferredSetter(1) (c)
   expected: <= ClassWithDeferredSetter(-1) (ClassWithDeferredSetter(-1))
@@ -1005,7 +1005,7 @@ not ok 155 - checkComparisonWithTimeout(LE)
 not ok 156 - checkComparisonWithTimeout(GT)
   ---
   type: QCOMPARE_GT
-  message: Left value is expected to be greater than right value, but is not
+  message: The computed value is expected to be greater than the baseline, but is not
   wanted: > ClassWithDeferredSetter(1) (ClassWithDeferredSetter(1))
   found: ClassWithDeferredSetter(1) (c)
   expected: > ClassWithDeferredSetter(1) (ClassWithDeferredSetter(1))
diff --git a/tests/auto/testlib/selftests/expected_extendedcompare.teamcity b/tests/auto/testlib/selftests/expected_extendedcompare.teamcity
index be0e9ca736..4c76556138 100644
--- a/tests/auto/testlib/selftests/expected_extendedcompare.teamcity
+++ b/tests/auto/testlib/selftests/expected_extendedcompare.teamcity
@@ -4,365 +4,365 @@
 ##teamcity[testStarted name='compareInts(EQ:left == right)' flowId='tst_ExtendedCompare']
 ##teamcity[testFinished name='compareInts(EQ:left == right)' flowId='tst_ExtendedCompare']
 ##teamcity[testStarted name='compareInts(EQ:left < right)' flowId='tst_ExtendedCompare']
-##teamcity[testFailed name='compareInts(EQ:left < right)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)|]' details='Left value is expected to be equal to right value, but is not|n Left (lhs): 1|n Right (rhs): 2' flowId='tst_ExtendedCompare']
+##teamcity[testFailed name='compareInts(EQ:left < right)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)|]' details='The computed value is expected to be equal to the baseline, but is not|n Computed (lhs): 1|n Baseline (rhs): 2' flowId='tst_ExtendedCompare']
 ##teamcity[testFinished name='compareInts(EQ:left < right)' flowId='tst_ExtendedCompare']
 ##teamcity[testStarted name='compareInts(EQ:left > right)' flowId='tst_ExtendedCompare']
-##teamcity[testFailed name='compareInts(EQ:left > right)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)|]' details='Left value is expected to be equal to right value, but is not|n Left (lhs): 2|n Right (rhs): 1' flowId='tst_ExtendedCompare']
+##teamcity[testFailed name='compareInts(EQ:left > right)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)|]' details='The computed value is expected to be equal to the baseline, but is not|n Computed (lhs): 2|n Baseline (rhs): 1' flowId='tst_ExtendedCompare']
 ##teamcity[testFinished name='compareInts(EQ:left > right)' flowId='tst_ExtendedCompare']
 ##teamcity[testStarted name='compareInts(NE:left == right)' flowId='tst_ExtendedCompare']
-##teamcity[testFailed name='compareInts(NE:left == right)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)|]' details='Left value is expected to be different from right value, but is not|n Left (lhs): 1|n Right (rhs): 1' flowId='tst_ExtendedCompare']
+##teamcity[testFailed name='compareInts(NE:left == right)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)|]' details='The computed value is expected to be different from the baseline, but is not|n Computed (lhs): 1|n Baseline (rhs): 1' flowId='tst_ExtendedCompare']
 ##teamcity[testFinished name='compareInts(NE:left == right)' flowId='tst_ExtendedCompare']
 ##teamcity[testStarted name='compareInts(NE:left < right)' flowId='tst_ExtendedCompare']
 ##teamcity[testFinished name='compareInts(NE:left < right)' flowId='tst_ExtendedCompare']
 ##teamcity[testStarted name='compareInts(NE:left > right)' flowId='tst_ExtendedCompare']
 ##teamcity[testFinished name='compareInts(NE:left > right)' flowId='tst_ExtendedCompare']
 ##teamcity[testStarted name='compareInts(LT:left == right)' flowId='tst_ExtendedCompare']
-##teamcity[testFailed name='compareInts(LT:left == right)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)|]' details='Left value is expected to be less than right value, but is not|n Left (lhs): 1|n Right (rhs): 1' flowId='tst_ExtendedCompare']
+##teamcity[testFailed name='compareInts(LT:left == right)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)|]' details='The computed value is expected to be less than the baseline, but is not|n Computed (lhs): 1|n Baseline (rhs): 1' flowId='tst_ExtendedCompare']
 ##teamcity[testFinished name='compareInts(LT:left == right)' flowId='tst_ExtendedCompare']
 ##teamcity[testStarted name='compareInts(LT:left < right)' flowId='tst_ExtendedCompare']
 ##teamcity[testFinished name='compareInts(LT:left < right)' flowId='tst_ExtendedCompare']
 ##teamcity[testStarted name='compareInts(LT:left > right)' flowId='tst_ExtendedCompare']
-##teamcity[testFailed name='compareInts(LT:left > right)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)|]' details='Left value is expected to be less than right value, but is not|n Left (lhs): 2|n Right (rhs): 1' flowId='tst_ExtendedCompare']
+##teamcity[testFailed name='compareInts(LT:left > right)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)|]' details='The computed value is expected to be less than the baseline, but is not|n Computed (lhs): 2|n Baseline (rhs): 1' flowId='tst_ExtendedCompare']
 ##teamcity[testFinished name='compareInts(LT:left > right)' flowId='tst_ExtendedCompare']
 ##teamcity[testStarted name='compareInts(LE:left == right)' flowId='tst_ExtendedCompare']
 ##teamcity[testFinished name='compareInts(LE:left == right)' flowId='tst_ExtendedCompare']
 ##teamcity[testStarted name='compareInts(LE:left < right)' flowId='tst_ExtendedCompare']
 ##teamcity[testFinished name='compareInts(LE:left < right)' flowId='tst_ExtendedCompare']
 ##teamcity[testStarted name='compareInts(LE:left > right)' flowId='tst_ExtendedCompare']
-##teamcity[testFailed name='compareInts(LE:left > right)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)|]' details='Left value is expected to be less than or equal to right value, but is not|n Left (lhs): 2|n Right (rhs): 1' flowId='tst_ExtendedCompare']
+##teamcity[testFailed name='compareInts(LE:left > right)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)|]' details='The computed value is expected to be less than or equal to the baseline, but is not|n Computed (lhs): 2|n Baseline (rhs): 1' flowId='tst_ExtendedCompare']
 ##teamcity[testFinished name='compareInts(LE:left > right)' flowId='tst_ExtendedCompare']
 ##teamcity[testStarted name='compareInts(GT:left == right)' flowId='tst_ExtendedCompare']
-##teamcity[testFailed name='compareInts(GT:left == right)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)|]' details='Left value is expected to be greater than right value, but is not|n Left (lhs): 1|n Right (rhs): 1' flowId='tst_ExtendedCompare']
+##teamcity[testFailed name='compareInts(GT:left == right)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)|]' details='The computed value is expected to be greater than the baseline, but is not|n Computed (lhs): 1|n Baseline (rhs): 1' flowId='tst_ExtendedCompare']
 ##teamcity[testFinished name='compareInts(GT:left == right)' flowId='tst_ExtendedCompare']
 ##teamcity[testStarted name='compareInts(GT:left < right)' flowId='tst_ExtendedCompare']
-##teamcity[testFailed name='compareInts(GT:left < right)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)|]' details='Left value is expected to be greater than right value, but is not|n Left (lhs): 1|n Right (rhs): 2' flowId='tst_ExtendedCompare']
+##teamcity[testFailed name='compareInts(GT:left < right)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)|]' details='The computed value is expected to be greater than the baseline, but is not|n Computed (lhs): 1|n Baseline (rhs): 2' flowId='tst_ExtendedCompare']
 ##teamcity[testFinished name='compareInts(GT:left < right)' flowId='tst_ExtendedCompare']
 ##teamcity[testStarted name='compareInts(GT:left > right)' flowId='tst_ExtendedCompare']
 ##teamcity[testFinished name='compareInts(GT:left > right)' flowId='tst_ExtendedCompare']
 ##teamcity[testStarted name='compareInts(GE:left == right)' flowId='tst_ExtendedCompare']
 ##teamcity[testFinished name='compareInts(GE:left == right)' flowId='tst_ExtendedCompare']
 ##teamcity[testStarted name='compareInts(GE:left < right)' flowId='tst_ExtendedCompare']
-##teamcity[testFailed name='compareInts(GE:left < right)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)|]' details='Left value is expected to be greater than or equal to right value, but is not|n Left (lhs): 1|n Right (rhs): 2' flowId='tst_ExtendedCompare']
+##teamcity[testFailed name='compareInts(GE:left < right)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)|]' details='The computed value is expected to be greater than or equal to the baseline, but is not|n Computed (lhs): 1|n Baseline (rhs): 2' flowId='tst_ExtendedCompare']
 ##teamcity[testFinished name='compareInts(GE:left < right)' flowId='tst_ExtendedCompare']
 ##teamcity[testStarted name='compareInts(GE:left > right)' flowId='tst_ExtendedCompare']
 ##teamcity[testFinished name='compareInts(GE:left > right)' flowId='tst_ExtendedCompare']
 ##teamcity[testStarted name='compareFloats(EQ:left == right)' flowId='tst_ExtendedCompare']
 ##teamcity[testFinished name='compareFloats(EQ:left == right)' flowId='tst_ExtendedCompare']
 ##teamcity[testStarted name='compareFloats(EQ:left < right)' flowId='tst_ExtendedCompare']
-##teamcity[testFailed name='compareFloats(EQ:left < right)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)|]' details='Left value is expected to be equal to right value, but is not|n Left (lhs): 1|n Right (rhs): 1.1' flowId='tst_ExtendedCompare']
+##teamcity[testFailed name='compareFloats(EQ:left < right)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)|]' details='The computed value is expected to be equal to the baseline, but is not|n Computed (lhs): 1|n Baseline (rhs): 1.1' flowId='tst_ExtendedCompare']
 ##teamcity[testFinished name='compareFloats(EQ:left < right)' flowId='tst_ExtendedCompare']
 ##teamcity[testStarted name='compareFloats(EQ:left > right)' flowId='tst_ExtendedCompare']
-##teamcity[testFailed name='compareFloats(EQ:left > right)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)|]' details='Left value is expected to be equal to right value, but is not|n Left (lhs): 1.1|n Right (rhs): 1' flowId='tst_ExtendedCompare']
+##teamcity[testFailed name='compareFloats(EQ:left > right)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)|]' details='The computed value is expected to be equal to the baseline, but is not|n Computed (lhs): 1.1|n Baseline (rhs): 1' flowId='tst_ExtendedCompare']
 ##teamcity[testFinished name='compareFloats(EQ:left > right)' flowId='tst_ExtendedCompare']
 ##teamcity[testStarted name='compareFloats(NE:left == right)' flowId='tst_ExtendedCompare']
-##teamcity[testFailed name='compareFloats(NE:left == right)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)|]' details='Left value is expected to be different from right value, but is not|n Left (lhs): 1|n Right (rhs): 1' flowId='tst_ExtendedCompare']
+##teamcity[testFailed name='compareFloats(NE:left == right)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)|]' details='The computed value is expected to be different from the baseline, but is not|n Computed (lhs): 1|n Baseline (rhs): 1' flowId='tst_ExtendedCompare']
 ##teamcity[testFinished name='compareFloats(NE:left == right)' flowId='tst_ExtendedCompare']
 ##teamcity[testStarted name='compareFloats(NE:left < right)' flowId='tst_ExtendedCompare']
 ##teamcity[testFinished name='compareFloats(NE:left < right)' flowId='tst_ExtendedCompare']
 ##teamcity[testStarted name='compareFloats(NE:left > right)' flowId='tst_ExtendedCompare']
 ##teamcity[testFinished name='compareFloats(NE:left > right)' flowId='tst_ExtendedCompare']
 ##teamcity[testStarted name='compareFloats(LT:left == right)' flowId='tst_ExtendedCompare']
-##teamcity[testFailed name='compareFloats(LT:left == right)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)|]' details='Left value is expected to be less than right value, but is not|n Left (lhs): 1|n Right (rhs): 1' flowId='tst_ExtendedCompare']
+##teamcity[testFailed name='compareFloats(LT:left == right)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)|]' details='The computed value is expected to be less than the baseline, but is not|n Computed (lhs): 1|n Baseline (rhs): 1' flowId='tst_ExtendedCompare']
 ##teamcity[testFinished name='compareFloats(LT:left == right)' flowId='tst_ExtendedCompare']
 ##teamcity[testStarted name='compareFloats(LT:left < right)' flowId='tst_ExtendedCompare']
 ##teamcity[testFinished name='compareFloats(LT:left < right)' flowId='tst_ExtendedCompare']
 ##teamcity[testStarted name='compareFloats(LT:left > right)' flowId='tst_ExtendedCompare']
-##teamcity[testFailed name='compareFloats(LT:left > right)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)|]' details='Left value is expected to be less than right value, but is not|n Left (lhs): 1.1|n Right (rhs): 1' flowId='tst_ExtendedCompare']
+##teamcity[testFailed name='compareFloats(LT:left > right)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)|]' details='The computed value is expected to be less than the baseline, but is not|n Computed (lhs): 1.1|n Baseline (rhs): 1' flowId='tst_ExtendedCompare']
 ##teamcity[testFinished name='compareFloats(LT:left > right)' flowId='tst_ExtendedCompare']
 ##teamcity[testStarted name='compareFloats(LE:left == right)' flowId='tst_ExtendedCompare']
 ##teamcity[testFinished name='compareFloats(LE:left == right)' flowId='tst_ExtendedCompare']
 ##teamcity[testStarted name='compareFloats(LE:left < right)' flowId='tst_ExtendedCompare']
 ##teamcity[testFinished name='compareFloats(LE:left < right)' flowId='tst_ExtendedCompare']
 ##teamcity[testStarted name='compareFloats(LE:left > right)' flowId='tst_ExtendedCompare']
-##teamcity[testFailed name='compareFloats(LE:left > right)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)|]' details='Left value is expected to be less than or equal to right value, but is not|n Left (lhs): 1.1|n Right (rhs): 1' flowId='tst_ExtendedCompare']
+##teamcity[testFailed name='compareFloats(LE:left > right)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)|]' details='The computed value is expected to be less than or equal to the baseline, but is not|n Computed (lhs): 1.1|n Baseline (rhs): 1' flowId='tst_ExtendedCompare']
 ##teamcity[testFinished name='compareFloats(LE:left > right)' flowId='tst_ExtendedCompare']
 ##teamcity[testStarted name='compareFloats(GT:left == right)' flowId='tst_ExtendedCompare']
-##teamcity[testFailed name='compareFloats(GT:left == right)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)|]' details='Left value is expected to be greater than right value, but is not|n Left (lhs): 1|n Right (rhs): 1' flowId='tst_ExtendedCompare']
+##teamcity[testFailed name='compareFloats(GT:left == right)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)|]' details='The computed value is expected to be greater than the baseline, but is not|n Computed (lhs): 1|n Baseline (rhs): 1' flowId='tst_ExtendedCompare']
 ##teamcity[testFinished name='compareFloats(GT:left == right)' flowId='tst_ExtendedCompare']
 ##teamcity[testStarted name='compareFloats(GT:left < right)' flowId='tst_ExtendedCompare']
-##teamcity[testFailed name='compareFloats(GT:left < right)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)|]' details='Left value is expected to be greater than right value, but is not|n Left (lhs): 1|n Right (rhs): 1.1' flowId='tst_ExtendedCompare']
+##teamcity[testFailed name='compareFloats(GT:left < right)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)|]' details='The computed value is expected to be greater than the baseline, but is not|n Computed (lhs): 1|n Baseline (rhs): 1.1' flowId='tst_ExtendedCompare']
 ##teamcity[testFinished name='compareFloats(GT:left < right)' flowId='tst_ExtendedCompare']
 ##teamcity[testStarted name='compareFloats(GT:left > right)' flowId='tst_ExtendedCompare']
 ##teamcity[testFinished name='compareFloats(GT:left > right)' flowId='tst_ExtendedCompare']
 ##teamcity[testStarted name='compareFloats(GE:left == right)' flowId='tst_ExtendedCompare']
 ##teamcity[testFinished name='compareFloats(GE:left == right)' flowId='tst_ExtendedCompare']
 ##teamcity[testStarted name='compareFloats(GE:left < right)' flowId='tst_ExtendedCompare']
-##teamcity[testFailed name='compareFloats(GE:left < right)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)|]' details='Left value is expected to be greater than or equal to right value, but is not|n Left (lhs): 1|n Right (rhs): 1.1' flowId='tst_ExtendedCompare']
+##teamcity[testFailed name='compareFloats(GE:left < right)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)|]' details='The computed value is expected to be greater than or equal to the baseline, but is not|n Computed (lhs): 1|n Baseline (rhs): 1.1' flowId='tst_ExtendedCompare']
 ##teamcity[testFinished name='compareFloats(GE:left < right)' flowId='tst_ExtendedCompare']
 ##teamcity[testStarted name='compareFloats(GE:left > right)' flowId='tst_ExtendedCompare']
 ##teamcity[testFinished name='compareFloats(GE:left > right)' flowId='tst_ExtendedCompare']
 ##teamcity[testStarted name='compareDoubles(EQ:left == right)' flowId='tst_ExtendedCompare']
 ##teamcity[testFinished name='compareDoubles(EQ:left == right)' flowId='tst_ExtendedCompare']
 ##teamcity[testStarted name='compareDoubles(EQ:left < right)' flowId='tst_ExtendedCompare']
-##teamcity[testFailed name='compareDoubles(EQ:left < right)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)|]' details='Left value is expected to be equal to right value, but is not|n Left (lhs): 0|n Right (rhs): 0.1' flowId='tst_ExtendedCompare']
+##teamcity[testFailed name='compareDoubles(EQ:left < right)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)|]' details='The computed value is expected to be equal to the baseline, but is not|n Computed (lhs): 0|n Baseline (rhs): 0.1' flowId='tst_ExtendedCompare']
 ##teamcity[testFinished name='compareDoubles(EQ:left < right)' flowId='tst_ExtendedCompare']
 ##teamcity[testStarted name='compareDoubles(EQ:left > right)' flowId='tst_ExtendedCompare']
-##teamcity[testFailed name='compareDoubles(EQ:left > right)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)|]' details='Left value is expected to be equal to right value, but is not|n Left (lhs): 0.1|n Right (rhs): 0' flowId='tst_ExtendedCompare']
+##teamcity[testFailed name='compareDoubles(EQ:left > right)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)|]' details='The computed value is expected to be equal to the baseline, but is not|n Computed (lhs): 0.1|n Baseline (rhs): 0' flowId='tst_ExtendedCompare']
 ##teamcity[testFinished name='compareDoubles(EQ:left > right)' flowId='tst_ExtendedCompare']
 ##teamcity[testStarted name='compareDoubles(NE:left == right)' flowId='tst_ExtendedCompare']
-##teamcity[testFailed name='compareDoubles(NE:left == right)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)|]' details='Left value is expected to be different from right value, but is not|n Left (lhs): 0|n Right (rhs): 0' flowId='tst_ExtendedCompare']
+##teamcity[testFailed name='compareDoubles(NE:left == right)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)|]' details='The computed value is expected to be different from the baseline, but is not|n Computed (lhs): 0|n Baseline (rhs): 0' flowId='tst_ExtendedCompare']
 ##teamcity[testFinished name='compareDoubles(NE:left == right)' flowId='tst_ExtendedCompare']
 ##teamcity[testStarted name='compareDoubles(NE:left < right)' flowId='tst_ExtendedCompare']
 ##teamcity[testFinished name='compareDoubles(NE:left < right)' flowId='tst_ExtendedCompare']
 ##teamcity[testStarted name='compareDoubles(NE:left > right)' flowId='tst_ExtendedCompare']
 ##teamcity[testFinished name='compareDoubles(NE:left > right)' flowId='tst_ExtendedCompare']
 ##teamcity[testStarted name='compareDoubles(LT:left == right)' flowId='tst_ExtendedCompare']
-##teamcity[testFailed name='compareDoubles(LT:left == right)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)|]' details='Left value is expected to be less than right value, but is not|n Left (lhs): 0|n Right (rhs): 0' flowId='tst_ExtendedCompare']
+##teamcity[testFailed name='compareDoubles(LT:left == right)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)|]' details='The computed value is expected to be less than the baseline, but is not|n Computed (lhs): 0|n Baseline (rhs): 0' flowId='tst_ExtendedCompare']
 ##teamcity[testFinished name='compareDoubles(LT:left == right)' flowId='tst_ExtendedCompare']
 ##teamcity[testStarted name='compareDoubles(LT:left < right)' flowId='tst_ExtendedCompare']
 ##teamcity[testFinished name='compareDoubles(LT:left < right)' flowId='tst_ExtendedCompare']
 ##teamcity[testStarted name='compareDoubles(LT:left > right)' flowId='tst_ExtendedCompare']
-##teamcity[testFailed name='compareDoubles(LT:left > right)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)|]' details='Left value is expected to be less than right value, but is not|n Left (lhs): 0.1|n Right (rhs): 0' flowId='tst_ExtendedCompare']
+##teamcity[testFailed name='compareDoubles(LT:left > right)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)|]' details='The computed value is expected to be less than the baseline, but is not|n Computed (lhs): 0.1|n Baseline (rhs): 0' flowId='tst_ExtendedCompare']
 ##teamcity[testFinished name='compareDoubles(LT:left > right)' flowId='tst_ExtendedCompare']
 ##teamcity[testStarted name='compareDoubles(LE:left == right)' flowId='tst_ExtendedCompare']
 ##teamcity[testFinished name='compareDoubles(LE:left == right)' flowId='tst_ExtendedCompare']
 ##teamcity[testStarted name='compareDoubles(LE:left < right)' flowId='tst_ExtendedCompare']
 ##teamcity[testFinished name='compareDoubles(LE:left < right)' flowId='tst_ExtendedCompare']
 ##teamcity[testStarted name='compareDoubles(LE:left > right)' flowId='tst_ExtendedCompare']
-##teamcity[testFailed name='compareDoubles(LE:left > right)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)|]' details='Left value is expected to be less than or equal to right value, but is not|n Left (lhs): 0.1|n Right (rhs): 0' flowId='tst_ExtendedCompare']
+##teamcity[testFailed name='compareDoubles(LE:left > right)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)|]' details='The computed value is expected to be less than or equal to the baseline, but is not|n Computed (lhs): 0.1|n Baseline (rhs): 0' flowId='tst_ExtendedCompare']
 ##teamcity[testFinished name='compareDoubles(LE:left > right)' flowId='tst_ExtendedCompare']
 ##teamcity[testStarted name='compareDoubles(GT:left == right)' flowId='tst_ExtendedCompare']
-##teamcity[testFailed name='compareDoubles(GT:left == right)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)|]' details='Left value is expected to be greater than right value, but is not|n Left (lhs): 0|n Right (rhs): 0' flowId='tst_ExtendedCompare']
+##teamcity[testFailed name='compareDoubles(GT:left == right)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)|]' details='The computed value is expected to be greater than the baseline, but is not|n Computed (lhs): 0|n Baseline (rhs): 0' flowId='tst_ExtendedCompare']
 ##teamcity[testFinished name='compareDoubles(GT:left == right)' flowId='tst_ExtendedCompare']
 ##teamcity[testStarted name='compareDoubles(GT:left < right)' flowId='tst_ExtendedCompare']
-##teamcity[testFailed name='compareDoubles(GT:left < right)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)|]' details='Left value is expected to be greater than right value, but is not|n Left (lhs): 0|n Right (rhs): 0.1' flowId='tst_ExtendedCompare']
+##teamcity[testFailed name='compareDoubles(GT:left < right)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)|]' details='The computed value is expected to be greater than the baseline, but is not|n Computed (lhs): 0|n Baseline (rhs): 0.1' flowId='tst_ExtendedCompare']
 ##teamcity[testFinished name='compareDoubles(GT:left < right)' flowId='tst_ExtendedCompare']
 ##teamcity[testStarted name='compareDoubles(GT:left > right)' flowId='tst_ExtendedCompare']
 ##teamcity[testFinished name='compareDoubles(GT:left > right)' flowId='tst_ExtendedCompare']
 ##teamcity[testStarted name='compareDoubles(GE:left == right)' flowId='tst_ExtendedCompare']
 ##teamcity[testFinished name='compareDoubles(GE:left == right)' flowId='tst_ExtendedCompare']
 ##teamcity[testStarted name='compareDoubles(GE:left < right)' flowId='tst_ExtendedCompare']
-##teamcity[testFailed name='compareDoubles(GE:left < right)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)|]' details='Left value is expected to be greater than or equal to right value, but is not|n Left (lhs): 0|n Right (rhs): 0.1' flowId='tst_ExtendedCompare']
+##teamcity[testFailed name='compareDoubles(GE:left < right)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)|]' details='The computed value is expected to be greater than or equal to the baseline, but is not|n Computed (lhs): 0|n Baseline (rhs): 0.1' flowId='tst_ExtendedCompare']
 ##teamcity[testFinished name='compareDoubles(GE:left < right)' flowId='tst_ExtendedCompare']
 ##teamcity[testStarted name='compareDoubles(GE:left > right)' flowId='tst_ExtendedCompare']
 ##teamcity[testFinished name='compareDoubles(GE:left > right)' flowId='tst_ExtendedCompare']
 ##teamcity[testStarted name='comparePointers(EQ:left == right)' flowId='tst_ExtendedCompare']
 ##teamcity[testFinished name='comparePointers(EQ:left == right)' flowId='tst_ExtendedCompare']
 ##teamcity[testStarted name='comparePointers(EQ:left < right)' flowId='tst_ExtendedCompare']
-##teamcity[testFailed name='comparePointers(EQ:left < right)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)|]' details='Left value is expected to be equal to right value, but is not|n Left (lhs): 1|n Right (rhs): 2' flowId='tst_ExtendedCompare']
+##teamcity[testFailed name='comparePointers(EQ:left < right)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)|]' details='The computed value is expected to be equal to the baseline, but is not|n Computed (lhs): 1|n Baseline (rhs): 2' flowId='tst_ExtendedCompare']
 ##teamcity[testFinished name='comparePointers(EQ:left < right)' flowId='tst_ExtendedCompare']
 ##teamcity[testStarted name='comparePointers(EQ:left > right)' flowId='tst_ExtendedCompare']
-##teamcity[testFailed name='comparePointers(EQ:left > right)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)|]' details='Left value is expected to be equal to right value, but is not|n Left (lhs): 2|n Right (rhs): 1' flowId='tst_ExtendedCompare']
+##teamcity[testFailed name='comparePointers(EQ:left > right)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)|]' details='The computed value is expected to be equal to the baseline, but is not|n Computed (lhs): 2|n Baseline (rhs): 1' flowId='tst_ExtendedCompare']
 ##teamcity[testFinished name='comparePointers(EQ:left > right)' flowId='tst_ExtendedCompare']
 ##teamcity[testStarted name='comparePointers(NE:left == right)' flowId='tst_ExtendedCompare']
-##teamcity[testFailed name='comparePointers(NE:left == right)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)|]' details='Left value is expected to be different from right value, but is not|n Left (lhs): 1|n Right (rhs): 1' flowId='tst_ExtendedCompare']
+##teamcity[testFailed name='comparePointers(NE:left == right)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)|]' details='The computed value is expected to be different from the baseline, but is not|n Computed (lhs): 1|n Baseline (rhs): 1' flowId='tst_ExtendedCompare']
 ##teamcity[testFinished name='comparePointers(NE:left == right)' flowId='tst_ExtendedCompare']
 ##teamcity[testStarted name='comparePointers(NE:left < right)' flowId='tst_ExtendedCompare']
 ##teamcity[testFinished name='comparePointers(NE:left < right)' flowId='tst_ExtendedCompare']
 ##teamcity[testStarted name='comparePointers(NE:left > right)' flowId='tst_ExtendedCompare']
 ##teamcity[testFinished name='comparePointers(NE:left > right)' flowId='tst_ExtendedCompare']
 ##teamcity[testStarted name='comparePointers(LT:left == right)' flowId='tst_ExtendedCompare']
-##teamcity[testFailed name='comparePointers(LT:left == right)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)|]' details='Left value is expected to be less than right value, but is not|n Left (lhs): 1|n Right (rhs): 1' flowId='tst_ExtendedCompare']
+##teamcity[testFailed name='comparePointers(LT:left == right)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)|]' details='The computed value is expected to be less than the baseline, but is not|n Computed (lhs): 1|n Baseline (rhs): 1' flowId='tst_ExtendedCompare']
 ##teamcity[testFinished name='comparePointers(LT:left == right)' flowId='tst_ExtendedCompare']
 ##teamcity[testStarted name='comparePointers(LT:left < right)' flowId='tst_ExtendedCompare']
 ##teamcity[testFinished name='comparePointers(LT:left < right)' flowId='tst_ExtendedCompare']
 ##teamcity[testStarted name='comparePointers(LT:left > right)' flowId='tst_ExtendedCompare']
-##teamcity[testFailed name='comparePointers(LT:left > right)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)|]' details='Left value is expected to be less than right value, but is not|n Left (lhs): 2|n Right (rhs): 1' flowId='tst_ExtendedCompare']
+##teamcity[testFailed name='comparePointers(LT:left > right)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)|]' details='The computed value is expected to be less than the baseline, but is not|n Computed (lhs): 2|n Baseline (rhs): 1' flowId='tst_ExtendedCompare']
 ##teamcity[testFinished name='comparePointers(LT:left > right)' flowId='tst_ExtendedCompare']
 ##teamcity[testStarted name='comparePointers(LE:left == right)' flowId='tst_ExtendedCompare']
 ##teamcity[testFinished name='comparePointers(LE:left == right)' flowId='tst_ExtendedCompare']
 ##teamcity[testStarted name='comparePointers(LE:left < right)' flowId='tst_ExtendedCompare']
 ##teamcity[testFinished name='comparePointers(LE:left < right)' flowId='tst_ExtendedCompare']
 ##teamcity[testStarted name='comparePointers(LE:left > right)' flowId='tst_ExtendedCompare']
-##teamcity[testFailed name='comparePointers(LE:left > right)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)|]' details='Left value is expected to be less than or equal to right value, but is not|n Left (lhs): 2|n Right (rhs): 1' flowId='tst_ExtendedCompare']
+##teamcity[testFailed name='comparePointers(LE:left > right)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)|]' details='The computed value is expected to be less than or equal to the baseline, but is not|n Computed (lhs): 2|n Baseline (rhs): 1' flowId='tst_ExtendedCompare']
 ##teamcity[testFinished name='comparePointers(LE:left > right)' flowId='tst_ExtendedCompare']
 ##teamcity[testStarted name='comparePointers(GT:left == right)' flowId='tst_ExtendedCompare']
-##teamcity[testFailed name='comparePointers(GT:left == right)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)|]' details='Left value is expected to be greater than right value, but is not|n Left (lhs): 1|n Right (rhs): 1' flowId='tst_ExtendedCompare']
+##teamcity[testFailed name='comparePointers(GT:left == right)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)|]' details='The computed value is expected to be greater than the baseline, but is not|n Computed (lhs): 1|n Baseline (rhs): 1' flowId='tst_ExtendedCompare']
 ##teamcity[testFinished name='comparePointers(GT:left == right)' flowId='tst_ExtendedCompare']
 ##teamcity[testStarted name='comparePointers(GT:left < right)' flowId='tst_ExtendedCompare']
-##teamcity[testFailed name='comparePointers(GT:left < right)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)|]' details='Left value is expected to be greater than right value, but is not|n Left (lhs): 1|n Right (rhs): 2' flowId='tst_ExtendedCompare']
+##teamcity[testFailed name='comparePointers(GT:left < right)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)|]' details='The computed value is expected to be greater than the baseline, but is not|n Computed (lhs): 1|n Baseline (rhs): 2' flowId='tst_ExtendedCompare']
 ##teamcity[testFinished name='comparePointers(GT:left < right)' flowId='tst_ExtendedCompare']
 ##teamcity[testStarted name='comparePointers(GT:left > right)' flowId='tst_ExtendedCompare']
 ##teamcity[testFinished name='comparePointers(GT:left > right)' flowId='tst_ExtendedCompare']
 ##teamcity[testStarted name='comparePointers(GE:left == right)' flowId='tst_ExtendedCompare']
 ##teamcity[testFinished name='comparePointers(GE:left == right)' flowId='tst_ExtendedCompare']
 ##teamcity[testStarted name='comparePointers(GE:left < right)' flowId='tst_ExtendedCompare']
-##teamcity[testFailed name='comparePointers(GE:left < right)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)|]' details='Left value is expected to be greater than or equal to right value, but is not|n Left (lhs): 1|n Right (rhs): 2' flowId='tst_ExtendedCompare']
+##teamcity[testFailed name='comparePointers(GE:left < right)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)|]' details='The computed value is expected to be greater than or equal to the baseline, but is not|n Computed (lhs): 1|n Baseline (rhs): 2' flowId='tst_ExtendedCompare']
 ##teamcity[testFinished name='comparePointers(GE:left < right)' flowId='tst_ExtendedCompare']
 ##teamcity[testStarted name='comparePointers(GE:left > right)' flowId='tst_ExtendedCompare']
 ##teamcity[testFinished name='comparePointers(GE:left > right)' flowId='tst_ExtendedCompare']
 ##teamcity[testStarted name='compareToNullptr(EQ:left == right)' flowId='tst_ExtendedCompare']
 ##teamcity[testFinished name='compareToNullptr(EQ:left == right)' flowId='tst_ExtendedCompare']
 ##teamcity[testStarted name='compareToNullptr(EQ:left < right)' flowId='tst_ExtendedCompare']
-##teamcity[testFailed name='compareToNullptr(EQ:left < right)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)|]' details='Left value is expected to be equal to right value, but is not|n Left (lhs): "nullptr"|n Right (rhs): 1' flowId='tst_ExtendedCompare']
+##teamcity[testFailed name='compareToNullptr(EQ:left < right)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)|]' details='The computed value is expected to be equal to the baseline, but is not|n Computed (lhs): "nullptr"|n Baseline (rhs): 1' flowId='tst_ExtendedCompare']
 ##teamcity[testFinished name='compareToNullptr(EQ:left < right)' flowId='tst_ExtendedCompare']
 ##teamcity[testStarted name='compareToNullptr(EQ:left > right)' flowId='tst_ExtendedCompare']
-##teamcity[testFailed name='compareToNullptr(EQ:left > right)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)|]' details='Left value is expected to be equal to right value, but is not|n Left (lhs): 1|n Right (rhs): "nullptr"' flowId='tst_ExtendedCompare']
+##teamcity[testFailed name='compareToNullptr(EQ:left > right)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)|]' details='The computed value is expected to be equal to the baseline, but is not|n Computed (lhs): 1|n Baseline (rhs): "nullptr"' flowId='tst_ExtendedCompare']
 ##teamcity[testFinished name='compareToNullptr(EQ:left > right)' flowId='tst_ExtendedCompare']
 ##teamcity[testStarted name='compareToNullptr(NE:left == right)' flowId='tst_ExtendedCompare']
-##teamcity[testFailed name='compareToNullptr(NE:left == right)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)|]' details='Left value is expected to be different from right value, but is not|n Left (lhs): "nullptr"|n Right (rhs): "nullptr"' flowId='tst_ExtendedCompare']
+##teamcity[testFailed name='compareToNullptr(NE:left == right)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)|]' details='The computed value is expected to be different from the baseline, but is not|n Computed (lhs): "nullptr"|n Baseline (rhs): "nullptr"' flowId='tst_ExtendedCompare']
 ##teamcity[testFinished name='compareToNullptr(NE:left == right)' flowId='tst_ExtendedCompare']
 ##teamcity[testStarted name='compareToNullptr(NE:left < right)' flowId='tst_ExtendedCompare']
 ##teamcity[testFinished name='compareToNullptr(NE:left < right)' flowId='tst_ExtendedCompare']
 ##teamcity[testStarted name='compareToNullptr(NE:left > right)' flowId='tst_ExtendedCompare']
 ##teamcity[testFinished name='compareToNullptr(NE:left > right)' flowId='tst_ExtendedCompare']
 ##teamcity[testStarted name='compareToNullptr(LT:left == right)' flowId='tst_ExtendedCompare']
-##teamcity[testFailed name='compareToNullptr(LT:left == right)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)|]' details='Left value is expected to be less than right value, but is not|n Left (lhs): "nullptr"|n Right (rhs): "nullptr"' flowId='tst_ExtendedCompare']
+##teamcity[testFailed name='compareToNullptr(LT:left == right)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)|]' details='The computed value is expected to be less than the baseline, but is not|n Computed (lhs): "nullptr"|n Baseline (rhs): "nullptr"' flowId='tst_ExtendedCompare']
 ##teamcity[testFinished name='compareToNullptr(LT:left == right)' flowId='tst_ExtendedCompare']
 ##teamcity[testStarted name='compareToNullptr(LT:left < right)' flowId='tst_ExtendedCompare']
 ##teamcity[testFinished name='compareToNullptr(LT:left < right)' flowId='tst_ExtendedCompare']
 ##teamcity[testStarted name='compareToNullptr(LT:left > right)' flowId='tst_ExtendedCompare']
-##teamcity[testFailed name='compareToNullptr(LT:left > right)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)|]' details='Left value is expected to be less than right value, but is not|n Left (lhs): 1|n Right (rhs): "nullptr"' flowId='tst_ExtendedCompare']
+##teamcity[testFailed name='compareToNullptr(LT:left > right)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)|]' details='The computed value is expected to be less than the baseline, but is not|n Computed (lhs): 1|n Baseline (rhs): "nullptr"' flowId='tst_ExtendedCompare']
 ##teamcity[testFinished name='compareToNullptr(LT:left > right)' flowId='tst_ExtendedCompare']
 ##teamcity[testStarted name='compareToNullptr(LE:left == right)' flowId='tst_ExtendedCompare']
 ##teamcity[testFinished name='compareToNullptr(LE:left == right)' flowId='tst_ExtendedCompare']
 ##teamcity[testStarted name='compareToNullptr(LE:left < right)' flowId='tst_ExtendedCompare']
 ##teamcity[testFinished name='compareToNullptr(LE:left < right)' flowId='tst_ExtendedCompare']
 ##teamcity[testStarted name='compareToNullptr(LE:left > right)' flowId='tst_ExtendedCompare']
-##teamcity[testFailed name='compareToNullptr(LE:left > right)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)|]' details='Left value is expected to be less than or equal to right value, but is not|n Left (lhs): 1|n Right (rhs): "nullptr"' flowId='tst_ExtendedCompare']
+##teamcity[testFailed name='compareToNullptr(LE:left > right)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)|]' details='The computed value is expected to be less than or equal to the baseline, but is not|n Computed (lhs): 1|n Baseline (rhs): "nullptr"' flowId='tst_ExtendedCompare']
 ##teamcity[testFinished name='compareToNullptr(LE:left > right)' flowId='tst_ExtendedCompare']
 ##teamcity[testStarted name='compareToNullptr(GT:left == right)' flowId='tst_ExtendedCompare']
-##teamcity[testFailed name='compareToNullptr(GT:left == right)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)|]' details='Left value is expected to be greater than right value, but is not|n Left (lhs): "nullptr"|n Right (rhs): "nullptr"' flowId='tst_ExtendedCompare']
+##teamcity[testFailed name='compareToNullptr(GT:left == right)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)|]' details='The computed value is expected to be greater than the baseline, but is not|n Computed (lhs): "nullptr"|n Baseline (rhs): "nullptr"' flowId='tst_ExtendedCompare']
 ##teamcity[testFinished name='compareToNullptr(GT:left == right)' flowId='tst_ExtendedCompare']
 ##teamcity[testStarted name='compareToNullptr(GT:left < right)' flowId='tst_ExtendedCompare']
-##teamcity[testFailed name='compareToNullptr(GT:left < right)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)|]' details='Left value is expected to be greater than right value, but is not|n Left (lhs): "nullptr"|n Right (rhs): 1' flowId='tst_ExtendedCompare']
+##teamcity[testFailed name='compareToNullptr(GT:left < right)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)|]' details='The computed value is expected to be greater than the baseline, but is not|n Computed (lhs): "nullptr"|n Baseline (rhs): 1' flowId='tst_ExtendedCompare']
 ##teamcity[testFinished name='compareToNullptr(GT:left < right)' flowId='tst_ExtendedCompare']
 ##teamcity[testStarted name='compareToNullptr(GT:left > right)' flowId='tst_ExtendedCompare']
 ##teamcity[testFinished name='compareToNullptr(GT:left > right)' flowId='tst_ExtendedCompare']
 ##teamcity[testStarted name='compareToNullptr(GE:left == right)' flowId='tst_ExtendedCompare']
 ##teamcity[testFinished name='compareToNullptr(GE:left == right)' flowId='tst_ExtendedCompare']
 ##teamcity[testStarted name='compareToNullptr(GE:left < right)' flowId='tst_ExtendedCompare']
-##teamcity[testFailed name='compareToNullptr(GE:left < right)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)|]' details='Left value is expected to be greater than or equal to right value, but is not|n Left (lhs): "nullptr"|n Right (rhs): 1' flowId='tst_ExtendedCompare']
+##teamcity[testFailed name='compareToNullptr(GE:left < right)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)|]' details='The computed value is expected to be greater than or equal to the baseline, but is not|n Computed (lhs): "nullptr"|n Baseline (rhs): 1' flowId='tst_ExtendedCompare']
 ##teamcity[testFinished name='compareToNullptr(GE:left < right)' flowId='tst_ExtendedCompare']
 ##teamcity[testStarted name='compareToNullptr(GE:left > right)' flowId='tst_ExtendedCompare']
 ##teamcity[testFinished name='compareToNullptr(GE:left > right)' flowId='tst_ExtendedCompare']
 ##teamcity[testStarted name='compareUnregistereEnum(EQ:left == right)' flowId='tst_ExtendedCompare']
 ##teamcity[testFinished name='compareUnregistereEnum(EQ:left == right)' flowId='tst_ExtendedCompare']
 ##teamcity[testStarted name='compareUnregistereEnum(EQ:left < right)' flowId='tst_ExtendedCompare']
-##teamcity[testFailed name='compareUnregistereEnum(EQ:left < right)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)|]' details='Left value is expected to be equal to right value, but is not|n Left (lhs): 0|n Right (rhs): 1' flowId='tst_ExtendedCompare']
+##teamcity[testFailed name='compareUnregistereEnum(EQ:left < right)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)|]' details='The computed value is expected to be equal to the baseline, but is not|n Computed (lhs): 0|n Baseline (rhs): 1' flowId='tst_ExtendedCompare']
 ##teamcity[testFinished name='compareUnregistereEnum(EQ:left < right)' flowId='tst_ExtendedCompare']
 ##teamcity[testStarted name='compareUnregistereEnum(EQ:left > right)' flowId='tst_ExtendedCompare']
-##teamcity[testFailed name='compareUnregistereEnum(EQ:left > right)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)|]' details='Left value is expected to be equal to right value, but is not|n Left (lhs): 1|n Right (rhs): 0' flowId='tst_ExtendedCompare']
+##teamcity[testFailed name='compareUnregistereEnum(EQ:left > right)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)|]' details='The computed value is expected to be equal to the baseline, but is not|n Computed (lhs): 1|n Baseline (rhs): 0' flowId='tst_ExtendedCompare']
 ##teamcity[testFinished name='compareUnregistereEnum(EQ:left > right)' flowId='tst_ExtendedCompare']
 ##teamcity[testStarted name='compareUnregistereEnum(NE:left == right)' flowId='tst_ExtendedCompare']
-##teamcity[testFailed name='compareUnregistereEnum(NE:left == right)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)|]' details='Left value is expected to be different from right value, but is not|n Left (lhs): 0|n Right (rhs): 0' flowId='tst_ExtendedCompare']
+##teamcity[testFailed name='compareUnregistereEnum(NE:left == right)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)|]' details='The computed value is expected to be different from the baseline, but is not|n Computed (lhs): 0|n Baseline (rhs): 0' flowId='tst_ExtendedCompare']
 ##teamcity[testFinished name='compareUnregistereEnum(NE:left == right)' flowId='tst_ExtendedCompare']
 ##teamcity[testStarted name='compareUnregistereEnum(NE:left < right)' flowId='tst_ExtendedCompare']
 ##teamcity[testFinished name='compareUnregistereEnum(NE:left < right)' flowId='tst_ExtendedCompare']
 ##teamcity[testStarted name='compareUnregistereEnum(NE:left > right)' flowId='tst_ExtendedCompare']
 ##teamcity[testFinished name='compareUnregistereEnum(NE:left > right)' flowId='tst_ExtendedCompare']
 ##teamcity[testStarted name='compareUnregistereEnum(LT:left == right)' flowId='tst_ExtendedCompare']
-##teamcity[testFailed name='compareUnregistereEnum(LT:left == right)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)|]' details='Left value is expected to be less than right value, but is not|n Left (lhs): 0|n Right (rhs): 0' flowId='tst_ExtendedCompare']
+##teamcity[testFailed name='compareUnregistereEnum(LT:left == right)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)|]' details='The computed value is expected to be less than the baseline, but is not|n Computed (lhs): 0|n Baseline (rhs): 0' flowId='tst_ExtendedCompare']
 ##teamcity[testFinished name='compareUnregistereEnum(LT:left == right)' flowId='tst_ExtendedCompare']
 ##teamcity[testStarted name='compareUnregistereEnum(LT:left < right)' flowId='tst_ExtendedCompare']
 ##teamcity[testFinished name='compareUnregistereEnum(LT:left < right)' flowId='tst_ExtendedCompare']
 ##teamcity[testStarted name='compareUnregistereEnum(LT:left > right)' flowId='tst_ExtendedCompare']
-##teamcity[testFailed name='compareUnregistereEnum(LT:left > right)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)|]' details='Left value is expected to be less than right value, but is not|n Left (lhs): 1|n Right (rhs): 0' flowId='tst_ExtendedCompare']
+##teamcity[testFailed name='compareUnregistereEnum(LT:left > right)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)|]' details='The computed value is expected to be less than the baseline, but is not|n Computed (lhs): 1|n Baseline (rhs): 0' flowId='tst_ExtendedCompare']
 ##teamcity[testFinished name='compareUnregistereEnum(LT:left > right)' flowId='tst_ExtendedCompare']
 ##teamcity[testStarted name='compareUnregistereEnum(LE:left == right)' flowId='tst_ExtendedCompare']
 ##teamcity[testFinished name='compareUnregistereEnum(LE:left == right)' flowId='tst_ExtendedCompare']
 ##teamcity[testStarted name='compareUnregistereEnum(LE:left < right)' flowId='tst_ExtendedCompare']
 ##teamcity[testFinished name='compareUnregistereEnum(LE:left < right)' flowId='tst_ExtendedCompare']
 ##teamcity[testStarted name='compareUnregistereEnum(LE:left > right)' flowId='tst_ExtendedCompare']
-##teamcity[testFailed name='compareUnregistereEnum(LE:left > right)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)|]' details='Left value is expected to be less than or equal to right value, but is not|n Left (lhs): 1|n Right (rhs): 0' flowId='tst_ExtendedCompare']
+##teamcity[testFailed name='compareUnregistereEnum(LE:left > right)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)|]' details='The computed value is expected to be less than or equal to the baseline, but is not|n Computed (lhs): 1|n Baseline (rhs): 0' flowId='tst_ExtendedCompare']
 ##teamcity[testFinished name='compareUnregistereEnum(LE:left > right)' flowId='tst_ExtendedCompare']
 ##teamcity[testStarted name='compareUnregistereEnum(GT:left == right)' flowId='tst_ExtendedCompare']
-##teamcity[testFailed name='compareUnregistereEnum(GT:left == right)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)|]' details='Left value is expected to be greater than right value, but is not|n Left (lhs): 0|n Right (rhs): 0' flowId='tst_ExtendedCompare']
+##teamcity[testFailed name='compareUnregistereEnum(GT:left == right)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)|]' details='The computed value is expected to be greater than the baseline, but is not|n Computed (lhs): 0|n Baseline (rhs): 0' flowId='tst_ExtendedCompare']
 ##teamcity[testFinished name='compareUnregistereEnum(GT:left == right)' flowId='tst_ExtendedCompare']
 ##teamcity[testStarted name='compareUnregistereEnum(GT:left < right)' flowId='tst_ExtendedCompare']
-##teamcity[testFailed name='compareUnregistereEnum(GT:left < right)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)|]' details='Left value is expected to be greater than right value, but is not|n Left (lhs): 0|n Right (rhs): 1' flowId='tst_ExtendedCompare']
+##teamcity[testFailed name='compareUnregistereEnum(GT:left < right)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)|]' details='The computed value is expected to be greater than the baseline, but is not|n Computed (lhs): 0|n Baseline (rhs): 1' flowId='tst_ExtendedCompare']
 ##teamcity[testFinished name='compareUnregistereEnum(GT:left < right)' flowId='tst_ExtendedCompare']
 ##teamcity[testStarted name='compareUnregistereEnum(GT:left > right)' flowId='tst_ExtendedCompare']
 ##teamcity[testFinished name='compareUnregistereEnum(GT:left > right)' flowId='tst_ExtendedCompare']
 ##teamcity[testStarted name='compareUnregistereEnum(GE:left == right)' flowId='tst_ExtendedCompare']
 ##teamcity[testFinished name='compareUnregistereEnum(GE:left == right)' flowId='tst_ExtendedCompare']
 ##teamcity[testStarted name='compareUnregistereEnum(GE:left < right)' flowId='tst_ExtendedCompare']
-##teamcity[testFailed name='compareUnregistereEnum(GE:left < right)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)|]' details='Left value is expected to be greater than or equal to right value, but is not|n Left (lhs): 0|n Right (rhs): 1' flowId='tst_ExtendedCompare']
+##teamcity[testFailed name='compareUnregistereEnum(GE:left < right)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)|]' details='The computed value is expected to be greater than or equal to the baseline, but is not|n Computed (lhs): 0|n Baseline (rhs): 1' flowId='tst_ExtendedCompare']
 ##teamcity[testFinished name='compareUnregistereEnum(GE:left < right)' flowId='tst_ExtendedCompare']
 ##teamcity[testStarted name='compareUnregistereEnum(GE:left > right)' flowId='tst_ExtendedCompare']
 ##teamcity[testFinished name='compareUnregistereEnum(GE:left > right)' flowId='tst_ExtendedCompare']
 ##teamcity[testStarted name='compareRegistereEnum(EQ:left == right)' flowId='tst_ExtendedCompare']
 ##teamcity[testFinished name='compareRegistereEnum(EQ:left == right)' flowId='tst_ExtendedCompare']
 ##teamcity[testStarted name='compareRegistereEnum(EQ:left < right)' flowId='tst_ExtendedCompare']
-##teamcity[testFailed name='compareRegistereEnum(EQ:left < right)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)|]' details='Left value is expected to be equal to right value, but is not|n Left (lhs): Monday|n Right (rhs): Sunday' flowId='tst_ExtendedCompare']
+##teamcity[testFailed name='compareRegistereEnum(EQ:left < right)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)|]' details='The computed value is expected to be equal to the baseline, but is not|n Computed (lhs): Monday|n Baseline (rhs): Sunday' flowId='tst_ExtendedCompare']
 ##teamcity[testFinished name='compareRegistereEnum(EQ:left < right)' flowId='tst_ExtendedCompare']
 ##teamcity[testStarted name='compareRegistereEnum(EQ:left > right)' flowId='tst_ExtendedCompare']
-##teamcity[testFailed name='compareRegistereEnum(EQ:left > right)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)|]' details='Left value is expected to be equal to right value, but is not|n Left (lhs): Sunday|n Right (rhs): Monday' flowId='tst_ExtendedCompare']
+##teamcity[testFailed name='compareRegistereEnum(EQ:left > right)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)|]' details='The computed value is expected to be equal to the baseline, but is not|n Computed (lhs): Sunday|n Baseline (rhs): Monday' flowId='tst_ExtendedCompare']
 ##teamcity[testFinished name='compareRegistereEnum(EQ:left > right)' flowId='tst_ExtendedCompare']
 ##teamcity[testStarted name='compareRegistereEnum(NE:left == right)' flowId='tst_ExtendedCompare']
-##teamcity[testFailed name='compareRegistereEnum(NE:left == right)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)|]' details='Left value is expected to be different from right value, but is not|n Left (lhs): Monday|n Right (rhs): Monday' flowId='tst_ExtendedCompare']
+##teamcity[testFailed name='compareRegistereEnum(NE:left == right)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)|]' details='The computed value is expected to be different from the baseline, but is not|n Computed (lhs): Monday|n Baseline (rhs): Monday' flowId='tst_ExtendedCompare']
 ##teamcity[testFinished name='compareRegistereEnum(NE:left == right)' flowId='tst_ExtendedCompare']
 ##teamcity[testStarted name='compareRegistereEnum(NE:left < right)' flowId='tst_ExtendedCompare']
 ##teamcity[testFinished name='compareRegistereEnum(NE:left < right)' flowId='tst_ExtendedCompare']
 ##teamcity[testStarted name='compareRegistereEnum(NE:left > right)' flowId='tst_ExtendedCompare']
 ##teamcity[testFinished name='compareRegistereEnum(NE:left > right)' flowId='tst_ExtendedCompare']
 ##teamcity[testStarted name='compareRegistereEnum(LT:left == right)' flowId='tst_ExtendedCompare']
-##teamcity[testFailed name='compareRegistereEnum(LT:left == right)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)|]' details='Left value is expected to be less than right value, but is not|n Left (lhs): Monday|n Right (rhs): Monday' flowId='tst_ExtendedCompare']
+##teamcity[testFailed name='compareRegistereEnum(LT:left == right)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)|]' details='The computed value is expected to be less than the baseline, but is not|n Computed (lhs): Monday|n Baseline (rhs): Monday' flowId='tst_ExtendedCompare']
 ##teamcity[testFinished name='compareRegistereEnum(LT:left == right)' flowId='tst_ExtendedCompare']
 ##teamcity[testStarted name='compareRegistereEnum(LT:left < right)' flowId='tst_ExtendedCompare']
 ##teamcity[testFinished name='compareRegistereEnum(LT:left < right)' flowId='tst_ExtendedCompare']
 ##teamcity[testStarted name='compareRegistereEnum(LT:left > right)' flowId='tst_ExtendedCompare']
-##teamcity[testFailed name='compareRegistereEnum(LT:left > right)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)|]' details='Left value is expected to be less than right value, but is not|n Left (lhs): Sunday|n Right (rhs): Monday' flowId='tst_ExtendedCompare']
+##teamcity[testFailed name='compareRegistereEnum(LT:left > right)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)|]' details='The computed value is expected to be less than the baseline, but is not|n Computed (lhs): Sunday|n Baseline (rhs): Monday' flowId='tst_ExtendedCompare']
 ##teamcity[testFinished name='compareRegistereEnum(LT:left > right)' flowId='tst_ExtendedCompare']
 ##teamcity[testStarted name='compareRegistereEnum(LE:left == right)' flowId='tst_ExtendedCompare']
 ##teamcity[testFinished name='compareRegistereEnum(LE:left == right)' flowId='tst_ExtendedCompare']
 ##teamcity[testStarted name='compareRegistereEnum(LE:left < right)' flowId='tst_ExtendedCompare']
 ##teamcity[testFinished name='compareRegistereEnum(LE:left < right)' flowId='tst_ExtendedCompare']
 ##teamcity[testStarted name='compareRegistereEnum(LE:left > right)' flowId='tst_ExtendedCompare']
-##teamcity[testFailed name='compareRegistereEnum(LE:left > right)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)|]' details='Left value is expected to be less than or equal to right value, but is not|n Left (lhs): Sunday|n Right (rhs): Monday' flowId='tst_ExtendedCompare']
+##teamcity[testFailed name='compareRegistereEnum(LE:left > right)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)|]' details='The computed value is expected to be less than or equal to the baseline, but is not|n Computed (lhs): Sunday|n Baseline (rhs): Monday' flowId='tst_ExtendedCompare']
 ##teamcity[testFinished name='compareRegistereEnum(LE:left > right)' flowId='tst_ExtendedCompare']
 ##teamcity[testStarted name='compareRegistereEnum(GT:left == right)' flowId='tst_ExtendedCompare']
-##teamcity[testFailed name='compareRegistereEnum(GT:left == right)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)|]' details='Left value is expected to be greater than right value, but is not|n Left (lhs): Monday|n Right (rhs): Monday' flowId='tst_ExtendedCompare']
+##teamcity[testFailed name='compareRegistereEnum(GT:left == right)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)|]' details='The computed value is expected to be greater than the baseline, but is not|n Computed (lhs): Monday|n Baseline (rhs): Monday' flowId='tst_ExtendedCompare']
 ##teamcity[testFinished name='compareRegistereEnum(GT:left == right)' flowId='tst_ExtendedCompare']
 ##teamcity[testStarted name='compareRegistereEnum(GT:left < right)' flowId='tst_ExtendedCompare']
-##teamcity[testFailed name='compareRegistereEnum(GT:left < right)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)|]' details='Left value is expected to be greater than right value, but is not|n Left (lhs): Monday|n Right (rhs): Sunday' flowId='tst_ExtendedCompare']
+##teamcity[testFailed name='compareRegistereEnum(GT:left < right)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)|]' details='The computed value is expected to be greater than the baseline, but is not|n Computed (lhs): Monday|n Baseline (rhs): Sunday' flowId='tst_ExtendedCompare']
 ##teamcity[testFinished name='compareRegistereEnum(GT:left < right)' flowId='tst_ExtendedCompare']
 ##teamcity[testStarted name='compareRegistereEnum(GT:left > right)' flowId='tst_ExtendedCompare']
 ##teamcity[testFinished name='compareRegistereEnum(GT:left > right)' flowId='tst_ExtendedCompare']
 ##teamcity[testStarted name='compareRegistereEnum(GE:left == right)' flowId='tst_ExtendedCompare']
 ##teamcity[testFinished name='compareRegistereEnum(GE:left == right)' flowId='tst_ExtendedCompare']
 ##teamcity[testStarted name='compareRegistereEnum(GE:left < right)' flowId='tst_ExtendedCompare']
-##teamcity[testFailed name='compareRegistereEnum(GE:left < right)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)|]' details='Left value is expected to be greater than or equal to right value, but is not|n Left (lhs): Monday|n Right (rhs): Sunday' flowId='tst_ExtendedCompare']
+##teamcity[testFailed name='compareRegistereEnum(GE:left < right)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)|]' details='The computed value is expected to be greater than or equal to the baseline, but is not|n Computed (lhs): Monday|n Baseline (rhs): Sunday' flowId='tst_ExtendedCompare']
 ##teamcity[testFinished name='compareRegistereEnum(GE:left < right)' flowId='tst_ExtendedCompare']
 ##teamcity[testStarted name='compareRegistereEnum(GE:left > right)' flowId='tst_ExtendedCompare']
 ##teamcity[testFinished name='compareRegistereEnum(GE:left > right)' flowId='tst_ExtendedCompare']
 ##teamcity[testStarted name='compareCustomTypes(EQ:left == right)' flowId='tst_ExtendedCompare']
 ##teamcity[testFinished name='compareCustomTypes(EQ:left == right)' flowId='tst_ExtendedCompare']
 ##teamcity[testStarted name='compareCustomTypes(EQ:left < right)' flowId='tst_ExtendedCompare']
-##teamcity[testFailed name='compareCustomTypes(EQ:left < right)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)|]' details='Left value is expected to be equal to right value, but is not|n Left (lhs): MyClass(1)|n Right (rhs): MyClass(2)' flowId='tst_ExtendedCompare']
+##teamcity[testFailed name='compareCustomTypes(EQ:left < right)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)|]' details='The computed value is expected to be equal to the baseline, but is not|n Computed (lhs): MyClass(1)|n Baseline (rhs): MyClass(2)' flowId='tst_ExtendedCompare']
 ##teamcity[testFinished name='compareCustomTypes(EQ:left < right)' flowId='tst_ExtendedCompare']
 ##teamcity[testStarted name='compareCustomTypes(EQ:left > right)' flowId='tst_ExtendedCompare']
-##teamcity[testFailed name='compareCustomTypes(EQ:left > right)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)|]' details='Left value is expected to be equal to right value, but is not|n Left (lhs): MyClass(2)|n Right (rhs): MyClass(1)' flowId='tst_ExtendedCompare']
+##teamcity[testFailed name='compareCustomTypes(EQ:left > right)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)|]' details='The computed value is expected to be equal to the baseline, but is not|n Computed (lhs): MyClass(2)|n Baseline (rhs): MyClass(1)' flowId='tst_ExtendedCompare']
 ##teamcity[testFinished name='compareCustomTypes(EQ:left > right)' flowId='tst_ExtendedCompare']
 ##teamcity[testStarted name='compareCustomTypes(NE:left == right)' flowId='tst_ExtendedCompare']
-##teamcity[testFailed name='compareCustomTypes(NE:left == right)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)|]' details='Left value is expected to be different from right value, but is not|n Left (lhs): MyClass(1)|n Right (rhs): MyClass(1)' flowId='tst_ExtendedCompare']
+##teamcity[testFailed name='compareCustomTypes(NE:left == right)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)|]' details='The computed value is expected to be different from the baseline, but is not|n Computed (lhs): MyClass(1)|n Baseline (rhs): MyClass(1)' flowId='tst_ExtendedCompare']
 ##teamcity[testFinished name='compareCustomTypes(NE:left == right)' flowId='tst_ExtendedCompare']
 ##teamcity[testStarted name='compareCustomTypes(NE:left < right)' flowId='tst_ExtendedCompare']
 ##teamcity[testFinished name='compareCustomTypes(NE:left < right)' flowId='tst_ExtendedCompare']
 ##teamcity[testStarted name='compareCustomTypes(NE:left > right)' flowId='tst_ExtendedCompare']
 ##teamcity[testFinished name='compareCustomTypes(NE:left > right)' flowId='tst_ExtendedCompare']
 ##teamcity[testStarted name='compareCustomTypes(LT:left == right)' flowId='tst_ExtendedCompare']
-##teamcity[testFailed name='compareCustomTypes(LT:left == right)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)|]' details='Left value is expected to be less than right value, but is not|n Left (lhs): MyClass(1)|n Right (rhs): MyClass(1)' flowId='tst_ExtendedCompare']
+##teamcity[testFailed name='compareCustomTypes(LT:left == right)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)|]' details='The computed value is expected to be less than the baseline, but is not|n Computed (lhs): MyClass(1)|n Baseline (rhs): MyClass(1)' flowId='tst_ExtendedCompare']
 ##teamcity[testFinished name='compareCustomTypes(LT:left == right)' flowId='tst_ExtendedCompare']
 ##teamcity[testStarted name='compareCustomTypes(LT:left < right)' flowId='tst_ExtendedCompare']
 ##teamcity[testFinished name='compareCustomTypes(LT:left < right)' flowId='tst_ExtendedCompare']
 ##teamcity[testStarted name='compareCustomTypes(LT:left > right)' flowId='tst_ExtendedCompare']
-##teamcity[testFailed name='compareCustomTypes(LT:left > right)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)|]' details='Left value is expected to be less than right value, but is not|n Left (lhs): MyClass(2)|n Right (rhs): MyClass(1)' flowId='tst_ExtendedCompare']
+##teamcity[testFailed name='compareCustomTypes(LT:left > right)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)|]' details='The computed value is expected to be less than the baseline, but is not|n Computed (lhs): MyClass(2)|n Baseline (rhs): MyClass(1)' flowId='tst_ExtendedCompare']
 ##teamcity[testFinished name='compareCustomTypes(LT:left > right)' flowId='tst_ExtendedCompare']
 ##teamcity[testStarted name='compareCustomTypes(LE:left == right)' flowId='tst_ExtendedCompare']
 ##teamcity[testFinished name='compareCustomTypes(LE:left == right)' flowId='tst_ExtendedCompare']
 ##teamcity[testStarted name='compareCustomTypes(LE:left < right)' flowId='tst_ExtendedCompare']
 ##teamcity[testFinished name='compareCustomTypes(LE:left < right)' flowId='tst_ExtendedCompare']
 ##teamcity[testStarted name='compareCustomTypes(LE:left > right)' flowId='tst_ExtendedCompare']
-##teamcity[testFailed name='compareCustomTypes(LE:left > right)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)|]' details='Left value is expected to be less than or equal to right value, but is not|n Left (lhs): MyClass(2)|n Right (rhs): MyClass(1)' flowId='tst_ExtendedCompare']
+##teamcity[testFailed name='compareCustomTypes(LE:left > right)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)|]' details='The computed value is expected to be less than or equal to the baseline, but is not|n Computed (lhs): MyClass(2)|n Baseline (rhs): MyClass(1)' flowId='tst_ExtendedCompare']
 ##teamcity[testFinished name='compareCustomTypes(LE:left > right)' flowId='tst_ExtendedCompare']
 ##teamcity[testStarted name='compareCustomTypes(GT:left == right)' flowId='tst_ExtendedCompare']
-##teamcity[testFailed name='compareCustomTypes(GT:left == right)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)|]' details='Left value is expected to be greater than right value, but is not|n Left (lhs): MyClass(1)|n Right (rhs): MyClass(1)' flowId='tst_ExtendedCompare']
+##teamcity[testFailed name='compareCustomTypes(GT:left == right)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)|]' details='The computed value is expected to be greater than the baseline, but is not|n Computed (lhs): MyClass(1)|n Baseline (rhs): MyClass(1)' flowId='tst_ExtendedCompare']
 ##teamcity[testFinished name='compareCustomTypes(GT:left == right)' flowId='tst_ExtendedCompare']
 ##teamcity[testStarted name='compareCustomTypes(GT:left < right)' flowId='tst_ExtendedCompare']
-##teamcity[testFailed name='compareCustomTypes(GT:left < right)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)|]' details='Left value is expected to be greater than right value, but is not|n Left (lhs): MyClass(1)|n Right (rhs): MyClass(2)' flowId='tst_ExtendedCompare']
+##teamcity[testFailed name='compareCustomTypes(GT:left < right)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)|]' details='The computed value is expected to be greater than the baseline, but is not|n Computed (lhs): MyClass(1)|n Baseline (rhs): MyClass(2)' flowId='tst_ExtendedCompare']
 ##teamcity[testFinished name='compareCustomTypes(GT:left < right)' flowId='tst_ExtendedCompare']
 ##teamcity[testStarted name='compareCustomTypes(GT:left > right)' flowId='tst_ExtendedCompare']
 ##teamcity[testFinished name='compareCustomTypes(GT:left > right)' flowId='tst_ExtendedCompare']
 ##teamcity[testStarted name='compareCustomTypes(GE:left == right)' flowId='tst_ExtendedCompare']
 ##teamcity[testFinished name='compareCustomTypes(GE:left == right)' flowId='tst_ExtendedCompare']
 ##teamcity[testStarted name='compareCustomTypes(GE:left < right)' flowId='tst_ExtendedCompare']
-##teamcity[testFailed name='compareCustomTypes(GE:left < right)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)|]' details='Left value is expected to be greater than or equal to right value, but is not|n Left (lhs): MyClass(1)|n Right (rhs): MyClass(2)' flowId='tst_ExtendedCompare']
+##teamcity[testFailed name='compareCustomTypes(GE:left < right)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)|]' details='The computed value is expected to be greater than or equal to the baseline, but is not|n Computed (lhs): MyClass(1)|n Baseline (rhs): MyClass(2)' flowId='tst_ExtendedCompare']
 ##teamcity[testFinished name='compareCustomTypes(GE:left < right)' flowId='tst_ExtendedCompare']
 ##teamcity[testStarted name='compareCustomTypes(GE:left > right)' flowId='tst_ExtendedCompare']
 ##teamcity[testFinished name='compareCustomTypes(GE:left > right)' flowId='tst_ExtendedCompare']
 ##teamcity[testStarted name='checkComparisonForTemporaryObjects(EQ)' flowId='tst_ExtendedCompare']
-##teamcity[testFailed name='checkComparisonForTemporaryObjects(EQ)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)|]' details='Left value is expected to be equal to right value, but is not|n Left (getClassForValue(0).getValuePointer()): MyClass(2) on memory address with index 0|n Right (getClassForValue(1).getValuePointer()): MyClass(1) on memory address with index 1' flowId='tst_ExtendedCompare']
+##teamcity[testFailed name='checkComparisonForTemporaryObjects(EQ)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)|]' details='The computed value is expected to be equal to the baseline, but is not|n Computed (getClassForValue(0).getValuePointer()): MyClass(2) on memory address with index 0|n Baseline (getClassForValue(1).getValuePointer()): MyClass(1) on memory address with index 1' flowId='tst_ExtendedCompare']
 ##teamcity[testFinished name='checkComparisonForTemporaryObjects(EQ)' flowId='tst_ExtendedCompare']
 ##teamcity[testStarted name='checkComparisonForTemporaryObjects(NE)' flowId='tst_ExtendedCompare']
 ##teamcity[testFinished name='checkComparisonForTemporaryObjects(NE)' flowId='tst_ExtendedCompare']
@@ -371,23 +371,23 @@
 ##teamcity[testStarted name='checkComparisonForTemporaryObjects(LE)' flowId='tst_ExtendedCompare']
 ##teamcity[testFinished name='checkComparisonForTemporaryObjects(LE)' flowId='tst_ExtendedCompare']
 ##teamcity[testStarted name='checkComparisonForTemporaryObjects(GT)' flowId='tst_ExtendedCompare']
-##teamcity[testFailed name='checkComparisonForTemporaryObjects(GT)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)|]' details='Left value is expected to be greater than right value, but is not|n Left (getClassForValue(0).getValuePointer()): MyClass(2) on memory address with index 0|n Right (getClassForValue(1).getValuePointer()): MyClass(1) on memory address with index 1' flowId='tst_ExtendedCompare']
+##teamcity[testFailed name='checkComparisonForTemporaryObjects(GT)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)|]' details='The computed value is expected to be greater than the baseline, but is not|n Computed (getClassForValue(0).getValuePointer()): MyClass(2) on memory address with index 0|n Baseline (getClassForValue(1).getValuePointer()): MyClass(1) on memory address with index 1' flowId='tst_ExtendedCompare']
 ##teamcity[testFinished name='checkComparisonForTemporaryObjects(GT)' flowId='tst_ExtendedCompare']
 ##teamcity[testStarted name='checkComparisonForTemporaryObjects(GE)' flowId='tst_ExtendedCompare']
-##teamcity[testFailed name='checkComparisonForTemporaryObjects(GE)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)|]' details='Left value is expected to be greater than or equal to right value, but is not|n Left (getClassForValue(0).getValuePointer()): MyClass(2) on memory address with index 0|n Right (getClassForValue(1).getValuePointer()): MyClass(1) on memory address with index 1' flowId='tst_ExtendedCompare']
+##teamcity[testFailed name='checkComparisonForTemporaryObjects(GE)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)|]' details='The computed value is expected to be greater than or equal to the baseline, but is not|n Computed (getClassForValue(0).getValuePointer()): MyClass(2) on memory address with index 0|n Baseline (getClassForValue(1).getValuePointer()): MyClass(1) on memory address with index 1' flowId='tst_ExtendedCompare']
 ##teamcity[testFinished name='checkComparisonForTemporaryObjects(GE)' flowId='tst_ExtendedCompare']
 ##teamcity[testStarted name='checkComparisonWithTimeout(EQ)' flowId='tst_ExtendedCompare']
 ##teamcity[testFinished name='checkComparisonWithTimeout(EQ)' flowId='tst_ExtendedCompare']
 ##teamcity[testStarted name='checkComparisonWithTimeout(NE)' flowId='tst_ExtendedCompare']
 ##teamcity[testFinished name='checkComparisonWithTimeout(NE)' flowId='tst_ExtendedCompare']
 ##teamcity[testStarted name='checkComparisonWithTimeout(LT)' flowId='tst_ExtendedCompare']
-##teamcity[testFailed name='checkComparisonWithTimeout(LT)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)|]' details='Left value is expected to be less than right value, but is not|n Left (c) : ClassWithDeferredSetter(1)|n Right (ClassWithDeferredSetter(0)): ClassWithDeferredSetter(0)' flowId='tst_ExtendedCompare']
+##teamcity[testFailed name='checkComparisonWithTimeout(LT)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)|]' details='The computed value is expected to be less than the baseline, but is not|n Computed (c) : ClassWithDeferredSetter(1)|n Baseline (ClassWithDeferredSetter(0)): ClassWithDeferredSetter(0)' flowId='tst_ExtendedCompare']
 ##teamcity[testFinished name='checkComparisonWithTimeout(LT)' flowId='tst_ExtendedCompare']
 ##teamcity[testStarted name='checkComparisonWithTimeout(LE)' flowId='tst_ExtendedCompare']
-##teamcity[testFailed name='checkComparisonWithTimeout(LE)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)|]' details='Left value is expected to be less than or equal to right value, but is not|n Left (c) : ClassWithDeferredSetter(1)|n Right (ClassWithDeferredSetter(-1)): ClassWithDeferredSetter(-1)' flowId='tst_ExtendedCompare']
+##teamcity[testFailed name='checkComparisonWithTimeout(LE)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)|]' details='The computed value is expected to be less than or equal to the baseline, but is not|n Computed (c) : ClassWithDeferredSetter(1)|n Baseline (ClassWithDeferredSetter(-1)): ClassWithDeferredSetter(-1)' flowId='tst_ExtendedCompare']
 ##teamcity[testFinished name='checkComparisonWithTimeout(LE)' flowId='tst_ExtendedCompare']
 ##teamcity[testStarted name='checkComparisonWithTimeout(GT)' flowId='tst_ExtendedCompare']
-##teamcity[testFailed name='checkComparisonWithTimeout(GT)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)|]' details='Left value is expected to be greater than right value, but is not|n Left (c) : ClassWithDeferredSetter(1)|n Right (ClassWithDeferredSetter(1)): ClassWithDeferredSetter(1)' flowId='tst_ExtendedCompare']
+##teamcity[testFailed name='checkComparisonWithTimeout(GT)' message='Failure! |[Loc: qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)|]' details='The computed value is expected to be greater than the baseline, but is not|n Computed (c) : ClassWithDeferredSetter(1)|n Baseline (ClassWithDeferredSetter(1)): ClassWithDeferredSetter(1)' flowId='tst_ExtendedCompare']
 ##teamcity[testFinished name='checkComparisonWithTimeout(GT)' flowId='tst_ExtendedCompare']
 ##teamcity[testStarted name='checkComparisonWithTimeout(GE)' flowId='tst_ExtendedCompare']
 ##teamcity[testFinished name='checkComparisonWithTimeout(GE)' flowId='tst_ExtendedCompare']
diff --git a/tests/auto/testlib/selftests/expected_extendedcompare.txt b/tests/auto/testlib/selftests/expected_extendedcompare.txt
index 15f3275844..08b6b6deb4 100644
--- a/tests/auto/testlib/selftests/expected_extendedcompare.txt
+++ b/tests/auto/testlib/selftests/expected_extendedcompare.txt
@@ -2,393 +2,393 @@
 Config: Using QtTest library
 PASS   : tst_ExtendedCompare::initTestCase()
 PASS   : tst_ExtendedCompare::compareInts(EQ:left == right)
-FAIL!  : tst_ExtendedCompare::compareInts(EQ:left < right) Left value is expected to be equal to right value, but is not
-   Left   (lhs): 1
-   Right  (rhs): 2
+FAIL!  : tst_ExtendedCompare::compareInts(EQ:left < right) The computed value is expected to be equal to the baseline, but is not
+   Computed (lhs): 1
+   Baseline (rhs): 2
    Loc: [qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)]
-FAIL!  : tst_ExtendedCompare::compareInts(EQ:left > right) Left value is expected to be equal to right value, but is not
-   Left   (lhs): 2
-   Right  (rhs): 1
+FAIL!  : tst_ExtendedCompare::compareInts(EQ:left > right) The computed value is expected to be equal to the baseline, but is not
+   Computed (lhs): 2
+   Baseline (rhs): 1
    Loc: [qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)]
-FAIL!  : tst_ExtendedCompare::compareInts(NE:left == right) Left value is expected to be different from right value, but is not
-   Left   (lhs): 1
-   Right  (rhs): 1
+FAIL!  : tst_ExtendedCompare::compareInts(NE:left == right) The computed value is expected to be different from the baseline, but is not
+   Computed (lhs): 1
+   Baseline (rhs): 1
    Loc: [qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)]
 PASS   : tst_ExtendedCompare::compareInts(NE:left < right)
 PASS   : tst_ExtendedCompare::compareInts(NE:left > right)
-FAIL!  : tst_ExtendedCompare::compareInts(LT:left == right) Left value is expected to be less than right value, but is not
-   Left   (lhs): 1
-   Right  (rhs): 1
+FAIL!  : tst_ExtendedCompare::compareInts(LT:left == right) The computed value is expected to be less than the baseline, but is not
+   Computed (lhs): 1
+   Baseline (rhs): 1
    Loc: [qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)]
 PASS   : tst_ExtendedCompare::compareInts(LT:left < right)
-FAIL!  : tst_ExtendedCompare::compareInts(LT:left > right) Left value is expected to be less than right value, but is not
-   Left   (lhs): 2
-   Right  (rhs): 1
+FAIL!  : tst_ExtendedCompare::compareInts(LT:left > right) The computed value is expected to be less than the baseline, but is not
+   Computed (lhs): 2
+   Baseline (rhs): 1
    Loc: [qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)]
 PASS   : tst_ExtendedCompare::compareInts(LE:left == right)
 PASS   : tst_ExtendedCompare::compareInts(LE:left < right)
-FAIL!  : tst_ExtendedCompare::compareInts(LE:left > right) Left value is expected to be less than or equal to right value, but is not
-   Left   (lhs): 2
-   Right  (rhs): 1
+FAIL!  : tst_ExtendedCompare::compareInts(LE:left > right) The computed value is expected to be less than or equal to the baseline, but is not
+   Computed (lhs): 2
+   Baseline (rhs): 1
    Loc: [qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)]
-FAIL!  : tst_ExtendedCompare::compareInts(GT:left == right) Left value is expected to be greater than right value, but is not
-   Left   (lhs): 1
-   Right  (rhs): 1
+FAIL!  : tst_ExtendedCompare::compareInts(GT:left == right) The computed value is expected to be greater than the baseline, but is not
+   Computed (lhs): 1
+   Baseline (rhs): 1
    Loc: [qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)]
-FAIL!  : tst_ExtendedCompare::compareInts(GT:left < right) Left value is expected to be greater than right value, but is not
-   Left   (lhs): 1
-   Right  (rhs): 2
+FAIL!  : tst_ExtendedCompare::compareInts(GT:left < right) The computed value is expected to be greater than the baseline, but is not
+   Computed (lhs): 1
+   Baseline (rhs): 2
    Loc: [qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)]
 PASS   : tst_ExtendedCompare::compareInts(GT:left > right)
 PASS   : tst_ExtendedCompare::compareInts(GE:left == right)
-FAIL!  : tst_ExtendedCompare::compareInts(GE:left < right) Left value is expected to be greater than or equal to right value, but is not
-   Left   (lhs): 1
-   Right  (rhs): 2
+FAIL!  : tst_ExtendedCompare::compareInts(GE:left < right) The computed value is expected to be greater than or equal to the baseline, but is not
+   Computed (lhs): 1
+   Baseline (rhs): 2
    Loc: [qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)]
 PASS   : tst_ExtendedCompare::compareInts(GE:left > right)
 PASS   : tst_ExtendedCompare::compareFloats(EQ:left == right)
-FAIL!  : tst_ExtendedCompare::compareFloats(EQ:left < right) Left value is expected to be equal to right value, but is not
-   Left   (lhs): 1
-   Right  (rhs): 1.1
+FAIL!  : tst_ExtendedCompare::compareFloats(EQ:left < right) The computed value is expected to be equal to the baseline, but is not
+   Computed (lhs): 1
+   Baseline (rhs): 1.1
    Loc: [qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)]
-FAIL!  : tst_ExtendedCompare::compareFloats(EQ:left > right) Left value is expected to be equal to right value, but is not
-   Left   (lhs): 1.1
-   Right  (rhs): 1
+FAIL!  : tst_ExtendedCompare::compareFloats(EQ:left > right) The computed value is expected to be equal to the baseline, but is not
+   Computed (lhs): 1.1
+   Baseline (rhs): 1
    Loc: [qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)]
-FAIL!  : tst_ExtendedCompare::compareFloats(NE:left == right) Left value is expected to be different from right value, but is not
-   Left   (lhs): 1
-   Right  (rhs): 1
+FAIL!  : tst_ExtendedCompare::compareFloats(NE:left == right) The computed value is expected to be different from the baseline, but is not
+   Computed (lhs): 1
+   Baseline (rhs): 1
    Loc: [qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)]
 PASS   : tst_ExtendedCompare::compareFloats(NE:left < right)
 PASS   : tst_ExtendedCompare::compareFloats(NE:left > right)
-FAIL!  : tst_ExtendedCompare::compareFloats(LT:left == right) Left value is expected to be less than right value, but is not
-   Left   (lhs): 1
-   Right  (rhs): 1
+FAIL!  : tst_ExtendedCompare::compareFloats(LT:left == right) The computed value is expected to be less than the baseline, but is not
+   Computed (lhs): 1
+   Baseline (rhs): 1
    Loc: [qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)]
 PASS   : tst_ExtendedCompare::compareFloats(LT:left < right)
-FAIL!  : tst_ExtendedCompare::compareFloats(LT:left > right) Left value is expected to be less than right value, but is not
-   Left   (lhs): 1.1
-   Right  (rhs): 1
+FAIL!  : tst_ExtendedCompare::compareFloats(LT:left > right) The computed value is expected to be less than the baseline, but is not
+   Computed (lhs): 1.1
+   Baseline (rhs): 1
    Loc: [qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)]
 PASS   : tst_ExtendedCompare::compareFloats(LE:left == right)
 PASS   : tst_ExtendedCompare::compareFloats(LE:left < right)
-FAIL!  : tst_ExtendedCompare::compareFloats(LE:left > right) Left value is expected to be less than or equal to right value, but is not
-   Left   (lhs): 1.1
-   Right  (rhs): 1
+FAIL!  : tst_ExtendedCompare::compareFloats(LE:left > right) The computed value is expected to be less than or equal to the baseline, but is not
+   Computed (lhs): 1.1
+   Baseline (rhs): 1
    Loc: [qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)]
-FAIL!  : tst_ExtendedCompare::compareFloats(GT:left == right) Left value is expected to be greater than right value, but is not
-   Left   (lhs): 1
-   Right  (rhs): 1
+FAIL!  : tst_ExtendedCompare::compareFloats(GT:left == right) The computed value is expected to be greater than the baseline, but is not
+   Computed (lhs): 1
+   Baseline (rhs): 1
    Loc: [qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)]
-FAIL!  : tst_ExtendedCompare::compareFloats(GT:left < right) Left value is expected to be greater than right value, but is not
-   Left   (lhs): 1
-   Right  (rhs): 1.1
+FAIL!  : tst_ExtendedCompare::compareFloats(GT:left < right) The computed value is expected to be greater than the baseline, but is not
+   Computed (lhs): 1
+   Baseline (rhs): 1.1
    Loc: [qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)]
 PASS   : tst_ExtendedCompare::compareFloats(GT:left > right)
 PASS   : tst_ExtendedCompare::compareFloats(GE:left == right)
-FAIL!  : tst_ExtendedCompare::compareFloats(GE:left < right) Left value is expected to be greater than or equal to right value, but is not
-   Left   (lhs): 1
-   Right  (rhs): 1.1
+FAIL!  : tst_ExtendedCompare::compareFloats(GE:left < right) The computed value is expected to be greater than or equal to the baseline, but is not
+   Computed (lhs): 1
+   Baseline (rhs): 1.1
    Loc: [qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)]
 PASS   : tst_ExtendedCompare::compareFloats(GE:left > right)
 PASS   : tst_ExtendedCompare::compareDoubles(EQ:left == right)
-FAIL!  : tst_ExtendedCompare::compareDoubles(EQ:left < right) Left value is expected to be equal to right value, but is not
-   Left   (lhs): 0
-   Right  (rhs): 0.1
+FAIL!  : tst_ExtendedCompare::compareDoubles(EQ:left < right) The computed value is expected to be equal to the baseline, but is not
+   Computed (lhs): 0
+   Baseline (rhs): 0.1
    Loc: [qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)]
-FAIL!  : tst_ExtendedCompare::compareDoubles(EQ:left > right) Left value is expected to be equal to right value, but is not
-   Left   (lhs): 0.1
-   Right  (rhs): 0
+FAIL!  : tst_ExtendedCompare::compareDoubles(EQ:left > right) The computed value is expected to be equal to the baseline, but is not
+   Computed (lhs): 0.1
+   Baseline (rhs): 0
    Loc: [qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)]
-FAIL!  : tst_ExtendedCompare::compareDoubles(NE:left == right) Left value is expected to be different from right value, but is not
-   Left   (lhs): 0
-   Right  (rhs): 0
+FAIL!  : tst_ExtendedCompare::compareDoubles(NE:left == right) The computed value is expected to be different from the baseline, but is not
+   Computed (lhs): 0
+   Baseline (rhs): 0
    Loc: [qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)]
 PASS   : tst_ExtendedCompare::compareDoubles(NE:left < right)
 PASS   : tst_ExtendedCompare::compareDoubles(NE:left > right)
-FAIL!  : tst_ExtendedCompare::compareDoubles(LT:left == right) Left value is expected to be less than right value, but is not
-   Left   (lhs): 0
-   Right  (rhs): 0
+FAIL!  : tst_ExtendedCompare::compareDoubles(LT:left == right) The computed value is expected to be less than the baseline, but is not
+   Computed (lhs): 0
+   Baseline (rhs): 0
    Loc: [qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)]
 PASS   : tst_ExtendedCompare::compareDoubles(LT:left < right)
-FAIL!  : tst_ExtendedCompare::compareDoubles(LT:left > right) Left value is expected to be less than right value, but is not
-   Left   (lhs): 0.1
-   Right  (rhs): 0
+FAIL!  : tst_ExtendedCompare::compareDoubles(LT:left > right) The computed value is expected to be less than the baseline, but is not
+   Computed (lhs): 0.1
+   Baseline (rhs): 0
    Loc: [qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)]
 PASS   : tst_ExtendedCompare::compareDoubles(LE:left == right)
 PASS   : tst_ExtendedCompare::compareDoubles(LE:left < right)
-FAIL!  : tst_ExtendedCompare::compareDoubles(LE:left > right) Left value is expected to be less than or equal to right value, but is not
-   Left   (lhs): 0.1
-   Right  (rhs): 0
+FAIL!  : tst_ExtendedCompare::compareDoubles(LE:left > right) The computed value is expected to be less than or equal to the baseline, but is not
+   Computed (lhs): 0.1
+   Baseline (rhs): 0
    Loc: [qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)]
-FAIL!  : tst_ExtendedCompare::compareDoubles(GT:left == right) Left value is expected to be greater than right value, but is not
-   Left   (lhs): 0
-   Right  (rhs): 0
+FAIL!  : tst_ExtendedCompare::compareDoubles(GT:left == right) The computed value is expected to be greater than the baseline, but is not
+   Computed (lhs): 0
+   Baseline (rhs): 0
    Loc: [qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)]
-FAIL!  : tst_ExtendedCompare::compareDoubles(GT:left < right) Left value is expected to be greater than right value, but is not
-   Left   (lhs): 0
-   Right  (rhs): 0.1
+FAIL!  : tst_ExtendedCompare::compareDoubles(GT:left < right) The computed value is expected to be greater than the baseline, but is not
+   Computed (lhs): 0
+   Baseline (rhs): 0.1
    Loc: [qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)]
 PASS   : tst_ExtendedCompare::compareDoubles(GT:left > right)
 PASS   : tst_ExtendedCompare::compareDoubles(GE:left == right)
-FAIL!  : tst_ExtendedCompare::compareDoubles(GE:left < right) Left value is expected to be greater than or equal to right value, but is not
-   Left   (lhs): 0
-   Right  (rhs): 0.1
+FAIL!  : tst_ExtendedCompare::compareDoubles(GE:left < right) The computed value is expected to be greater than or equal to the baseline, but is not
+   Computed (lhs): 0
+   Baseline (rhs): 0.1
    Loc: [qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)]
 PASS   : tst_ExtendedCompare::compareDoubles(GE:left > right)
 PASS   : tst_ExtendedCompare::comparePointers(EQ:left == right)
-FAIL!  : tst_ExtendedCompare::comparePointers(EQ:left < right) Left value is expected to be equal to right value, but is not
-   Left   (lhs): 1
-   Right  (rhs): 2
+FAIL!  : tst_ExtendedCompare::comparePointers(EQ:left < right) The computed value is expected to be equal to the baseline, but is not
+   Computed (lhs): 1
+   Baseline (rhs): 2
    Loc: [qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)]
-FAIL!  : tst_ExtendedCompare::comparePointers(EQ:left > right) Left value is expected to be equal to right value, but is not
-   Left   (lhs): 2
-   Right  (rhs): 1
+FAIL!  : tst_ExtendedCompare::comparePointers(EQ:left > right) The computed value is expected to be equal to the baseline, but is not
+   Computed (lhs): 2
+   Baseline (rhs): 1
    Loc: [qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)]
-FAIL!  : tst_ExtendedCompare::comparePointers(NE:left == right) Left value is expected to be different from right value, but is not
-   Left   (lhs): 1
-   Right  (rhs): 1
+FAIL!  : tst_ExtendedCompare::comparePointers(NE:left == right) The computed value is expected to be different from the baseline, but is not
+   Computed (lhs): 1
+   Baseline (rhs): 1
    Loc: [qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)]
 PASS   : tst_ExtendedCompare::comparePointers(NE:left < right)
 PASS   : tst_ExtendedCompare::comparePointers(NE:left > right)
-FAIL!  : tst_ExtendedCompare::comparePointers(LT:left == right) Left value is expected to be less than right value, but is not
-   Left   (lhs): 1
-   Right  (rhs): 1
+FAIL!  : tst_ExtendedCompare::comparePointers(LT:left == right) The computed value is expected to be less than the baseline, but is not
+   Computed (lhs): 1
+   Baseline (rhs): 1
    Loc: [qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)]
 PASS   : tst_ExtendedCompare::comparePointers(LT:left < right)
-FAIL!  : tst_ExtendedCompare::comparePointers(LT:left > right) Left value is expected to be less than right value, but is not
-   Left   (lhs): 2
-   Right  (rhs): 1
+FAIL!  : tst_ExtendedCompare::comparePointers(LT:left > right) The computed value is expected to be less than the baseline, but is not
+   Computed (lhs): 2
+   Baseline (rhs): 1
    Loc: [qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)]
 PASS   : tst_ExtendedCompare::comparePointers(LE:left == right)
 PASS   : tst_ExtendedCompare::comparePointers(LE:left < right)
-FAIL!  : tst_ExtendedCompare::comparePointers(LE:left > right) Left value is expected to be less than or equal to right value, but is not
-   Left   (lhs): 2
-   Right  (rhs): 1
+FAIL!  : tst_ExtendedCompare::comparePointers(LE:left > right) The computed value is expected to be less than or equal to the baseline, but is not
+   Computed (lhs): 2
+   Baseline (rhs): 1
    Loc: [qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)]
-FAIL!  : tst_ExtendedCompare::comparePointers(GT:left == right) Left value is expected to be greater than right value, but is not
-   Left   (lhs): 1
-   Right  (rhs): 1
+FAIL!  : tst_ExtendedCompare::comparePointers(GT:left == right) The computed value is expected to be greater than the baseline, but is not
+   Computed (lhs): 1
+   Baseline (rhs): 1
    Loc: [qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)]
-FAIL!  : tst_ExtendedCompare::comparePointers(GT:left < right) Left value is expected to be greater than right value, but is not
-   Left   (lhs): 1
-   Right  (rhs): 2
+FAIL!  : tst_ExtendedCompare::comparePointers(GT:left < right) The computed value is expected to be greater than the baseline, but is not
+   Computed (lhs): 1
+   Baseline (rhs): 2
    Loc: [qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)]
 PASS   : tst_ExtendedCompare::comparePointers(GT:left > right)
 PASS   : tst_ExtendedCompare::comparePointers(GE:left == right)
-FAIL!  : tst_ExtendedCompare::comparePointers(GE:left < right) Left value is expected to be greater than or equal to right value, but is not
-   Left   (lhs): 1
-   Right  (rhs): 2
+FAIL!  : tst_ExtendedCompare::comparePointers(GE:left < right) The computed value is expected to be greater than or equal to the baseline, but is not
+   Computed (lhs): 1
+   Baseline (rhs): 2
    Loc: [qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)]
 PASS   : tst_ExtendedCompare::comparePointers(GE:left > right)
 PASS   : tst_ExtendedCompare::compareToNullptr(EQ:left == right)
-FAIL!  : tst_ExtendedCompare::compareToNullptr(EQ:left < right) Left value is expected to be equal to right value, but is not
-   Left   (lhs): "nullptr"
-   Right  (rhs): 1
+FAIL!  : tst_ExtendedCompare::compareToNullptr(EQ:left < right) The computed value is expected to be equal to the baseline, but is not
+   Computed (lhs): "nullptr"
+   Baseline (rhs): 1
    Loc: [qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)]
-FAIL!  : tst_ExtendedCompare::compareToNullptr(EQ:left > right) Left value is expected to be equal to right value, but is not
-   Left   (lhs): 1
-   Right  (rhs): "nullptr"
+FAIL!  : tst_ExtendedCompare::compareToNullptr(EQ:left > right) The computed value is expected to be equal to the baseline, but is not
+   Computed (lhs): 1
+   Baseline (rhs): "nullptr"
    Loc: [qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)]
-FAIL!  : tst_ExtendedCompare::compareToNullptr(NE:left == right) Left value is expected to be different from right value, but is not
-   Left   (lhs): "nullptr"
-   Right  (rhs): "nullptr"
+FAIL!  : tst_ExtendedCompare::compareToNullptr(NE:left == right) The computed value is expected to be different from the baseline, but is not
+   Computed (lhs): "nullptr"
+   Baseline (rhs): "nullptr"
    Loc: [qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)]
 PASS   : tst_ExtendedCompare::compareToNullptr(NE:left < right)
 PASS   : tst_ExtendedCompare::compareToNullptr(NE:left > right)
-FAIL!  : tst_ExtendedCompare::compareToNullptr(LT:left == right) Left value is expected to be less than right value, but is not
-   Left   (lhs): "nullptr"
-   Right  (rhs): "nullptr"
+FAIL!  : tst_ExtendedCompare::compareToNullptr(LT:left == right) The computed value is expected to be less than the baseline, but is not
+   Computed (lhs): "nullptr"
+   Baseline (rhs): "nullptr"
    Loc: [qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)]
 PASS   : tst_ExtendedCompare::compareToNullptr(LT:left < right)
-FAIL!  : tst_ExtendedCompare::compareToNullptr(LT:left > right) Left value is expected to be less than right value, but is not
-   Left   (lhs): 1
-   Right  (rhs): "nullptr"
+FAIL!  : tst_ExtendedCompare::compareToNullptr(LT:left > right) The computed value is expected to be less than the baseline, but is not
+   Computed (lhs): 1
+   Baseline (rhs): "nullptr"
    Loc: [qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)]
 PASS   : tst_ExtendedCompare::compareToNullptr(LE:left == right)
 PASS   : tst_ExtendedCompare::compareToNullptr(LE:left < right)
-FAIL!  : tst_ExtendedCompare::compareToNullptr(LE:left > right) Left value is expected to be less than or equal to right value, but is not
-   Left   (lhs): 1
-   Right  (rhs): "nullptr"
+FAIL!  : tst_ExtendedCompare::compareToNullptr(LE:left > right) The computed value is expected to be less than or equal to the baseline, but is not
+   Computed (lhs): 1
+   Baseline (rhs): "nullptr"
    Loc: [qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)]
-FAIL!  : tst_ExtendedCompare::compareToNullptr(GT:left == right) Left value is expected to be greater than right value, but is not
-   Left   (lhs): "nullptr"
-   Right  (rhs): "nullptr"
+FAIL!  : tst_ExtendedCompare::compareToNullptr(GT:left == right) The computed value is expected to be greater than the baseline, but is not
+   Computed (lhs): "nullptr"
+   Baseline (rhs): "nullptr"
    Loc: [qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)]
-FAIL!  : tst_ExtendedCompare::compareToNullptr(GT:left < right) Left value is expected to be greater than right value, but is not
-   Left   (lhs): "nullptr"
-   Right  (rhs): 1
+FAIL!  : tst_ExtendedCompare::compareToNullptr(GT:left < right) The computed value is expected to be greater than the baseline, but is not
+   Computed (lhs): "nullptr"
+   Baseline (rhs): 1
    Loc: [qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)]
 PASS   : tst_ExtendedCompare::compareToNullptr(GT:left > right)
 PASS   : tst_ExtendedCompare::compareToNullptr(GE:left == right)
-FAIL!  : tst_ExtendedCompare::compareToNullptr(GE:left < right) Left value is expected to be greater than or equal to right value, but is not
-   Left   (lhs): "nullptr"
-   Right  (rhs): 1
+FAIL!  : tst_ExtendedCompare::compareToNullptr(GE:left < right) The computed value is expected to be greater than or equal to the baseline, but is not
+   Computed (lhs): "nullptr"
+   Baseline (rhs): 1
    Loc: [qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)]
 PASS   : tst_ExtendedCompare::compareToNullptr(GE:left > right)
 PASS   : tst_ExtendedCompare::compareUnregistereEnum(EQ:left == right)
-FAIL!  : tst_ExtendedCompare::compareUnregistereEnum(EQ:left < right) Left value is expected to be equal to right value, but is not
-   Left   (lhs): 0
-   Right  (rhs): 1
+FAIL!  : tst_ExtendedCompare::compareUnregistereEnum(EQ:left < right) The computed value is expected to be equal to the baseline, but is not
+   Computed (lhs): 0
+   Baseline (rhs): 1
    Loc: [qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)]
-FAIL!  : tst_ExtendedCompare::compareUnregistereEnum(EQ:left > right) Left value is expected to be equal to right value, but is not
-   Left   (lhs): 1
-   Right  (rhs): 0
+FAIL!  : tst_ExtendedCompare::compareUnregistereEnum(EQ:left > right) The computed value is expected to be equal to the baseline, but is not
+   Computed (lhs): 1
+   Baseline (rhs): 0
    Loc: [qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)]
-FAIL!  : tst_ExtendedCompare::compareUnregistereEnum(NE:left == right) Left value is expected to be different from right value, but is not
-   Left   (lhs): 0
-   Right  (rhs): 0
+FAIL!  : tst_ExtendedCompare::compareUnregistereEnum(NE:left == right) The computed value is expected to be different from the baseline, but is not
+   Computed (lhs): 0
+   Baseline (rhs): 0
    Loc: [qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)]
 PASS   : tst_ExtendedCompare::compareUnregistereEnum(NE:left < right)
 PASS   : tst_ExtendedCompare::compareUnregistereEnum(NE:left > right)
-FAIL!  : tst_ExtendedCompare::compareUnregistereEnum(LT:left == right) Left value is expected to be less than right value, but is not
-   Left   (lhs): 0
-   Right  (rhs): 0
+FAIL!  : tst_ExtendedCompare::compareUnregistereEnum(LT:left == right) The computed value is expected to be less than the baseline, but is not
+   Computed (lhs): 0
+   Baseline (rhs): 0
    Loc: [qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)]
 PASS   : tst_ExtendedCompare::compareUnregistereEnum(LT:left < right)
-FAIL!  : tst_ExtendedCompare::compareUnregistereEnum(LT:left > right) Left value is expected to be less than right value, but is not
-   Left   (lhs): 1
-   Right  (rhs): 0
+FAIL!  : tst_ExtendedCompare::compareUnregistereEnum(LT:left > right) The computed value is expected to be less than the baseline, but is not
+   Computed (lhs): 1
+   Baseline (rhs): 0
    Loc: [qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)]
 PASS   : tst_ExtendedCompare::compareUnregistereEnum(LE:left == right)
 PASS   : tst_ExtendedCompare::compareUnregistereEnum(LE:left < right)
-FAIL!  : tst_ExtendedCompare::compareUnregistereEnum(LE:left > right) Left value is expected to be less than or equal to right value, but is not
-   Left   (lhs): 1
-   Right  (rhs): 0
+FAIL!  : tst_ExtendedCompare::compareUnregistereEnum(LE:left > right) The computed value is expected to be less than or equal to the baseline, but is not
+   Computed (lhs): 1
+   Baseline (rhs): 0
    Loc: [qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)]
-FAIL!  : tst_ExtendedCompare::compareUnregistereEnum(GT:left == right) Left value is expected to be greater than right value, but is not
-   Left   (lhs): 0
-   Right  (rhs): 0
+FAIL!  : tst_ExtendedCompare::compareUnregistereEnum(GT:left == right) The computed value is expected to be greater than the baseline, but is not
+   Computed (lhs): 0
+   Baseline (rhs): 0
    Loc: [qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)]
-FAIL!  : tst_ExtendedCompare::compareUnregistereEnum(GT:left < right) Left value is expected to be greater than right value, but is not
-   Left   (lhs): 0
-   Right  (rhs): 1
+FAIL!  : tst_ExtendedCompare::compareUnregistereEnum(GT:left < right) The computed value is expected to be greater than the baseline, but is not
+   Computed (lhs): 0
+   Baseline (rhs): 1
    Loc: [qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)]
 PASS   : tst_ExtendedCompare::compareUnregistereEnum(GT:left > right)
 PASS   : tst_ExtendedCompare::compareUnregistereEnum(GE:left == right)
-FAIL!  : tst_ExtendedCompare::compareUnregistereEnum(GE:left < right) Left value is expected to be greater than or equal to right value, but is not
-   Left   (lhs): 0
-   Right  (rhs): 1
+FAIL!  : tst_ExtendedCompare::compareUnregistereEnum(GE:left < right) The computed value is expected to be greater than or equal to the baseline, but is not
+   Computed (lhs): 0
+   Baseline (rhs): 1
    Loc: [qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)]
 PASS   : tst_ExtendedCompare::compareUnregistereEnum(GE:left > right)
 PASS   : tst_ExtendedCompare::compareRegistereEnum(EQ:left == right)
-FAIL!  : tst_ExtendedCompare::compareRegistereEnum(EQ:left < right) Left value is expected to be equal to right value, but is not
-   Left   (lhs): Monday
-   Right  (rhs): Sunday
+FAIL!  : tst_ExtendedCompare::compareRegistereEnum(EQ:left < right) The computed value is expected to be equal to the baseline, but is not
+   Computed (lhs): Monday
+   Baseline (rhs): Sunday
    Loc: [qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)]
-FAIL!  : tst_ExtendedCompare::compareRegistereEnum(EQ:left > right) Left value is expected to be equal to right value, but is not
-   Left   (lhs): Sunday
-   Right  (rhs): Monday
+FAIL!  : tst_ExtendedCompare::compareRegistereEnum(EQ:left > right) The computed value is expected to be equal to the baseline, but is not
+   Computed (lhs): Sunday
+   Baseline (rhs): Monday
    Loc: [qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)]
-FAIL!  : tst_ExtendedCompare::compareRegistereEnum(NE:left == right) Left value is expected to be different from right value, but is not
-   Left   (lhs): Monday
-   Right  (rhs): Monday
+FAIL!  : tst_ExtendedCompare::compareRegistereEnum(NE:left == right) The computed value is expected to be different from the baseline, but is not
+   Computed (lhs): Monday
+   Baseline (rhs): Monday
    Loc: [qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)]
 PASS   : tst_ExtendedCompare::compareRegistereEnum(NE:left < right)
 PASS   : tst_ExtendedCompare::compareRegistereEnum(NE:left > right)
-FAIL!  : tst_ExtendedCompare::compareRegistereEnum(LT:left == right) Left value is expected to be less than right value, but is not
-   Left   (lhs): Monday
-   Right  (rhs): Monday
+FAIL!  : tst_ExtendedCompare::compareRegistereEnum(LT:left == right) The computed value is expected to be less than the baseline, but is not
+   Computed (lhs): Monday
+   Baseline (rhs): Monday
    Loc: [qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)]
 PASS   : tst_ExtendedCompare::compareRegistereEnum(LT:left < right)
-FAIL!  : tst_ExtendedCompare::compareRegistereEnum(LT:left > right) Left value is expected to be less than right value, but is not
-   Left   (lhs): Sunday
-   Right  (rhs): Monday
+FAIL!  : tst_ExtendedCompare::compareRegistereEnum(LT:left > right) The computed value is expected to be less than the baseline, but is not
+   Computed (lhs): Sunday
+   Baseline (rhs): Monday
    Loc: [qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)]
 PASS   : tst_ExtendedCompare::compareRegistereEnum(LE:left == right)
 PASS   : tst_ExtendedCompare::compareRegistereEnum(LE:left < right)
-FAIL!  : tst_ExtendedCompare::compareRegistereEnum(LE:left > right) Left value is expected to be less than or equal to right value, but is not
-   Left   (lhs): Sunday
-   Right  (rhs): Monday
+FAIL!  : tst_ExtendedCompare::compareRegistereEnum(LE:left > right) The computed value is expected to be less than or equal to the baseline, but is not
+   Computed (lhs): Sunday
+   Baseline (rhs): Monday
    Loc: [qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)]
-FAIL!  : tst_ExtendedCompare::compareRegistereEnum(GT:left == right) Left value is expected to be greater than right value, but is not
-   Left   (lhs): Monday
-   Right  (rhs): Monday
+FAIL!  : tst_ExtendedCompare::compareRegistereEnum(GT:left == right) The computed value is expected to be greater than the baseline, but is not
+   Computed (lhs): Monday
+   Baseline (rhs): Monday
    Loc: [qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)]
-FAIL!  : tst_ExtendedCompare::compareRegistereEnum(GT:left < right) Left value is expected to be greater than right value, but is not
-   Left   (lhs): Monday
-   Right  (rhs): Sunday
+FAIL!  : tst_ExtendedCompare::compareRegistereEnum(GT:left < right) The computed value is expected to be greater than the baseline, but is not
+   Computed (lhs): Monday
+   Baseline (rhs): Sunday
    Loc: [qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)]
 PASS   : tst_ExtendedCompare::compareRegistereEnum(GT:left > right)
 PASS   : tst_ExtendedCompare::compareRegistereEnum(GE:left == right)
-FAIL!  : tst_ExtendedCompare::compareRegistereEnum(GE:left < right) Left value is expected to be greater than or equal to right value, but is not
-   Left   (lhs): Monday
-   Right  (rhs): Sunday
+FAIL!  : tst_ExtendedCompare::compareRegistereEnum(GE:left < right) The computed value is expected to be greater than or equal to the baseline, but is not
+   Computed (lhs): Monday
+   Baseline (rhs): Sunday
    Loc: [qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)]
 PASS   : tst_ExtendedCompare::compareRegistereEnum(GE:left > right)
 PASS   : tst_ExtendedCompare::compareCustomTypes(EQ:left == right)
-FAIL!  : tst_ExtendedCompare::compareCustomTypes(EQ:left < right) Left value is expected to be equal to right value, but is not
-   Left   (lhs): MyClass(1)
-   Right  (rhs): MyClass(2)
+FAIL!  : tst_ExtendedCompare::compareCustomTypes(EQ:left < right) The computed value is expected to be equal to the baseline, but is not
+   Computed (lhs): MyClass(1)
+   Baseline (rhs): MyClass(2)
    Loc: [qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)]
-FAIL!  : tst_ExtendedCompare::compareCustomTypes(EQ:left > right) Left value is expected to be equal to right value, but is not
-   Left   (lhs): MyClass(2)
-   Right  (rhs): MyClass(1)
+FAIL!  : tst_ExtendedCompare::compareCustomTypes(EQ:left > right) The computed value is expected to be equal to the baseline, but is not
+   Computed (lhs): MyClass(2)
+   Baseline (rhs): MyClass(1)
    Loc: [qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)]
-FAIL!  : tst_ExtendedCompare::compareCustomTypes(NE:left == right) Left value is expected to be different from right value, but is not
-   Left   (lhs): MyClass(1)
-   Right  (rhs): MyClass(1)
+FAIL!  : tst_ExtendedCompare::compareCustomTypes(NE:left == right) The computed value is expected to be different from the baseline, but is not
+   Computed (lhs): MyClass(1)
+   Baseline (rhs): MyClass(1)
    Loc: [qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)]
 PASS   : tst_ExtendedCompare::compareCustomTypes(NE:left < right)
 PASS   : tst_ExtendedCompare::compareCustomTypes(NE:left > right)
-FAIL!  : tst_ExtendedCompare::compareCustomTypes(LT:left == right) Left value is expected to be less than right value, but is not
-   Left   (lhs): MyClass(1)
-   Right  (rhs): MyClass(1)
+FAIL!  : tst_ExtendedCompare::compareCustomTypes(LT:left == right) The computed value is expected to be less than the baseline, but is not
+   Computed (lhs): MyClass(1)
+   Baseline (rhs): MyClass(1)
    Loc: [qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)]
 PASS   : tst_ExtendedCompare::compareCustomTypes(LT:left < right)
-FAIL!  : tst_ExtendedCompare::compareCustomTypes(LT:left > right) Left value is expected to be less than right value, but is not
-   Left   (lhs): MyClass(2)
-   Right  (rhs): MyClass(1)
+FAIL!  : tst_ExtendedCompare::compareCustomTypes(LT:left > right) The computed value is expected to be less than the baseline, but is not
+   Computed (lhs): MyClass(2)
+   Baseline (rhs): MyClass(1)
    Loc: [qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)]
 PASS   : tst_ExtendedCompare::compareCustomTypes(LE:left == right)
 PASS   : tst_ExtendedCompare::compareCustomTypes(LE:left < right)
-FAIL!  : tst_ExtendedCompare::compareCustomTypes(LE:left > right) Left value is expected to be less than or equal to right value, but is not
-   Left   (lhs): MyClass(2)
-   Right  (rhs): MyClass(1)
+FAIL!  : tst_ExtendedCompare::compareCustomTypes(LE:left > right) The computed value is expected to be less than or equal to the baseline, but is not
+   Computed (lhs): MyClass(2)
+   Baseline (rhs): MyClass(1)
    Loc: [qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)]
-FAIL!  : tst_ExtendedCompare::compareCustomTypes(GT:left == right) Left value is expected to be greater than right value, but is not
-   Left   (lhs): MyClass(1)
-   Right  (rhs): MyClass(1)
+FAIL!  : tst_ExtendedCompare::compareCustomTypes(GT:left == right) The computed value is expected to be greater than the baseline, but is not
+   Computed (lhs): MyClass(1)
+   Baseline (rhs): MyClass(1)
    Loc: [qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)]
-FAIL!  : tst_ExtendedCompare::compareCustomTypes(GT:left < right) Left value is expected to be greater than right value, but is not
-   Left   (lhs): MyClass(1)
-   Right  (rhs): MyClass(2)
+FAIL!  : tst_ExtendedCompare::compareCustomTypes(GT:left < right) The computed value is expected to be greater than the baseline, but is not
+   Computed (lhs): MyClass(1)
+   Baseline (rhs): MyClass(2)
    Loc: [qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)]
 PASS   : tst_ExtendedCompare::compareCustomTypes(GT:left > right)
 PASS   : tst_ExtendedCompare::compareCustomTypes(GE:left == right)
-FAIL!  : tst_ExtendedCompare::compareCustomTypes(GE:left < right) Left value is expected to be greater than or equal to right value, but is not
-   Left   (lhs): MyClass(1)
-   Right  (rhs): MyClass(2)
+FAIL!  : tst_ExtendedCompare::compareCustomTypes(GE:left < right) The computed value is expected to be greater than or equal to the baseline, but is not
+   Computed (lhs): MyClass(1)
+   Baseline (rhs): MyClass(2)
    Loc: [qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)]
 PASS   : tst_ExtendedCompare::compareCustomTypes(GE:left > right)
-FAIL!  : tst_ExtendedCompare::checkComparisonForTemporaryObjects(EQ) Left value is expected to be equal to right value, but is not
-   Left   (getClassForValue(0).getValuePointer()): MyClass(2) on memory address with index 0
-   Right  (getClassForValue(1).getValuePointer()): MyClass(1) on memory address with index 1
+FAIL!  : tst_ExtendedCompare::checkComparisonForTemporaryObjects(EQ) The computed value is expected to be equal to the baseline, but is not
+   Computed (getClassForValue(0).getValuePointer()): MyClass(2) on memory address with index 0
+   Baseline (getClassForValue(1).getValuePointer()): MyClass(1) on memory address with index 1
    Loc: [qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)]
 PASS   : tst_ExtendedCompare::checkComparisonForTemporaryObjects(NE)
 PASS   : tst_ExtendedCompare::checkComparisonForTemporaryObjects(LT)
 PASS   : tst_ExtendedCompare::checkComparisonForTemporaryObjects(LE)
-FAIL!  : tst_ExtendedCompare::checkComparisonForTemporaryObjects(GT) Left value is expected to be greater than right value, but is not
-   Left   (getClassForValue(0).getValuePointer()): MyClass(2) on memory address with index 0
-   Right  (getClassForValue(1).getValuePointer()): MyClass(1) on memory address with index 1
+FAIL!  : tst_ExtendedCompare::checkComparisonForTemporaryObjects(GT) The computed value is expected to be greater than the baseline, but is not
+   Computed (getClassForValue(0).getValuePointer()): MyClass(2) on memory address with index 0
+   Baseline (getClassForValue(1).getValuePointer()): MyClass(1) on memory address with index 1
    Loc: [qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)]
-FAIL!  : tst_ExtendedCompare::checkComparisonForTemporaryObjects(GE) Left value is expected to be greater than or equal to right value, but is not
-   Left   (getClassForValue(0).getValuePointer()): MyClass(2) on memory address with index 0
-   Right  (getClassForValue(1).getValuePointer()): MyClass(1) on memory address with index 1
+FAIL!  : tst_ExtendedCompare::checkComparisonForTemporaryObjects(GE) The computed value is expected to be greater than or equal to the baseline, but is not
+   Computed (getClassForValue(0).getValuePointer()): MyClass(2) on memory address with index 0
+   Baseline (getClassForValue(1).getValuePointer()): MyClass(1) on memory address with index 1
    Loc: [qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)]
 PASS   : tst_ExtendedCompare::checkComparisonWithTimeout(EQ)
 PASS   : tst_ExtendedCompare::checkComparisonWithTimeout(NE)
-FAIL!  : tst_ExtendedCompare::checkComparisonWithTimeout(LT) Left value is expected to be less than right value, but is not
-   Left   (c)                         : ClassWithDeferredSetter(1)
-   Right  (ClassWithDeferredSetter(0)): ClassWithDeferredSetter(0)
+FAIL!  : tst_ExtendedCompare::checkComparisonWithTimeout(LT) The computed value is expected to be less than the baseline, but is not
+   Computed (c)                         : ClassWithDeferredSetter(1)
+   Baseline (ClassWithDeferredSetter(0)): ClassWithDeferredSetter(0)
    Loc: [qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)]
-FAIL!  : tst_ExtendedCompare::checkComparisonWithTimeout(LE) Left value is expected to be less than or equal to right value, but is not
-   Left   (c)                          : ClassWithDeferredSetter(1)
-   Right  (ClassWithDeferredSetter(-1)): ClassWithDeferredSetter(-1)
+FAIL!  : tst_ExtendedCompare::checkComparisonWithTimeout(LE) The computed value is expected to be less than or equal to the baseline, but is not
+   Computed (c)                          : ClassWithDeferredSetter(1)
+   Baseline (ClassWithDeferredSetter(-1)): ClassWithDeferredSetter(-1)
    Loc: [qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)]
-FAIL!  : tst_ExtendedCompare::checkComparisonWithTimeout(GT) Left value is expected to be greater than right value, but is not
-   Left   (c)                         : ClassWithDeferredSetter(1)
-   Right  (ClassWithDeferredSetter(1)): ClassWithDeferredSetter(1)
+FAIL!  : tst_ExtendedCompare::checkComparisonWithTimeout(GT) The computed value is expected to be greater than the baseline, but is not
+   Computed (c)                         : ClassWithDeferredSetter(1)
+   Baseline (ClassWithDeferredSetter(1)): ClassWithDeferredSetter(1)
    Loc: [qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp(0)]
 PASS   : tst_ExtendedCompare::checkComparisonWithTimeout(GE)
 PASS   : tst_ExtendedCompare::cleanupTestCase()
diff --git a/tests/auto/testlib/selftests/expected_extendedcompare.xml b/tests/auto/testlib/selftests/expected_extendedcompare.xml
index 7bfca23b02..ab55eebf89 100644
--- a/tests/auto/testlib/selftests/expected_extendedcompare.xml
+++ b/tests/auto/testlib/selftests/expected_extendedcompare.xml
@@ -15,21 +15,21 @@
     </Incident>
     <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp" line="0">
       <DataTag><![CDATA[EQ:left < right]]></DataTag>
-      <Description><![CDATA[Left value is expected to be equal to right value, but is not
-   Left   (lhs): 1
-   Right  (rhs): 2]]></Description>
+      <Description><![CDATA[The computed value is expected to be equal to the baseline, but is not
+   Computed (lhs): 1
+   Baseline (rhs): 2]]></Description>
     </Incident>
     <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp" line="0">
       <DataTag><![CDATA[EQ:left > right]]></DataTag>
-      <Description><![CDATA[Left value is expected to be equal to right value, but is not
-   Left   (lhs): 2
-   Right  (rhs): 1]]></Description>
+      <Description><![CDATA[The computed value is expected to be equal to the baseline, but is not
+   Computed (lhs): 2
+   Baseline (rhs): 1]]></Description>
     </Incident>
     <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp" line="0">
       <DataTag><![CDATA[NE:left == right]]></DataTag>
-      <Description><![CDATA[Left value is expected to be different from right value, but is not
-   Left   (lhs): 1
-   Right  (rhs): 1]]></Description>
+      <Description><![CDATA[The computed value is expected to be different from the baseline, but is not
+   Computed (lhs): 1
+   Baseline (rhs): 1]]></Description>
     </Incident>
     <Incident type="pass" file="" line="0">
       <DataTag><![CDATA[NE:left < right]]></DataTag>
@@ -39,18 +39,18 @@
     </Incident>
     <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp" line="0">
       <DataTag><![CDATA[LT:left == right]]></DataTag>
-      <Description><![CDATA[Left value is expected to be less than right value, but is not
-   Left   (lhs): 1
-   Right  (rhs): 1]]></Description>
+      <Description><![CDATA[The computed value is expected to be less than the baseline, but is not
+   Computed (lhs): 1
+   Baseline (rhs): 1]]></Description>
     </Incident>
     <Incident type="pass" file="" line="0">
       <DataTag><![CDATA[LT:left < right]]></DataTag>
     </Incident>
     <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp" line="0">
       <DataTag><![CDATA[LT:left > right]]></DataTag>
-      <Description><![CDATA[Left value is expected to be less than right value, but is not
-   Left   (lhs): 2
-   Right  (rhs): 1]]></Description>
+      <Description><![CDATA[The computed value is expected to be less than the baseline, but is not
+   Computed (lhs): 2
+   Baseline (rhs): 1]]></Description>
     </Incident>
     <Incident type="pass" file="" line="0">
       <DataTag><![CDATA[LE:left == right]]></DataTag>
@@ -60,21 +60,21 @@
     </Incident>
     <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp" line="0">
       <DataTag><![CDATA[LE:left > right]]></DataTag>
-      <Description><![CDATA[Left value is expected to be less than or equal to right value, but is not
-   Left   (lhs): 2
-   Right  (rhs): 1]]></Description>
+      <Description><![CDATA[The computed value is expected to be less than or equal to the baseline, but is not
+   Computed (lhs): 2
+   Baseline (rhs): 1]]></Description>
     </Incident>
     <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp" line="0">
       <DataTag><![CDATA[GT:left == right]]></DataTag>
-      <Description><![CDATA[Left value is expected to be greater than right value, but is not
-   Left   (lhs): 1
-   Right  (rhs): 1]]></Description>
+      <Description><![CDATA[The computed value is expected to be greater than the baseline, but is not
+   Computed (lhs): 1
+   Baseline (rhs): 1]]></Description>
     </Incident>
     <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp" line="0">
       <DataTag><![CDATA[GT:left < right]]></DataTag>
-      <Description><![CDATA[Left value is expected to be greater than right value, but is not
-   Left   (lhs): 1
-   Right  (rhs): 2]]></Description>
+      <Description><![CDATA[The computed value is expected to be greater than the baseline, but is not
+   Computed (lhs): 1
+   Baseline (rhs): 2]]></Description>
     </Incident>
     <Incident type="pass" file="" line="0">
       <DataTag><![CDATA[GT:left > right]]></DataTag>
@@ -84,9 +84,9 @@
     </Incident>
     <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp" line="0">
       <DataTag><![CDATA[GE:left < right]]></DataTag>
-      <Description><![CDATA[Left value is expected to be greater than or equal to right value, but is not
-   Left   (lhs): 1
-   Right  (rhs): 2]]></Description>
+      <Description><![CDATA[The computed value is expected to be greater than or equal to the baseline, but is not
+   Computed (lhs): 1
+   Baseline (rhs): 2]]></Description>
     </Incident>
     <Incident type="pass" file="" line="0">
       <DataTag><![CDATA[GE:left > right]]></DataTag>
@@ -99,21 +99,21 @@
     </Incident>
     <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp" line="0">
       <DataTag><![CDATA[EQ:left < right]]></DataTag>
-      <Description><![CDATA[Left value is expected to be equal to right value, but is not
-   Left   (lhs): 1
-   Right  (rhs): 1.1]]></Description>
+      <Description><![CDATA[The computed value is expected to be equal to the baseline, but is not
+   Computed (lhs): 1
+   Baseline (rhs): 1.1]]></Description>
     </Incident>
     <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp" line="0">
       <DataTag><![CDATA[EQ:left > right]]></DataTag>
-      <Description><![CDATA[Left value is expected to be equal to right value, but is not
-   Left   (lhs): 1.1
-   Right  (rhs): 1]]></Description>
+      <Description><![CDATA[The computed value is expected to be equal to the baseline, but is not
+   Computed (lhs): 1.1
+   Baseline (rhs): 1]]></Description>
     </Incident>
     <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp" line="0">
       <DataTag><![CDATA[NE:left == right]]></DataTag>
-      <Description><![CDATA[Left value is expected to be different from right value, but is not
-   Left   (lhs): 1
-   Right  (rhs): 1]]></Description>
+      <Description><![CDATA[The computed value is expected to be different from the baseline, but is not
+   Computed (lhs): 1
+   Baseline (rhs): 1]]></Description>
     </Incident>
     <Incident type="pass" file="" line="0">
       <DataTag><![CDATA[NE:left < right]]></DataTag>
@@ -123,18 +123,18 @@
     </Incident>
     <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp" line="0">
       <DataTag><![CDATA[LT:left == right]]></DataTag>
-      <Description><![CDATA[Left value is expected to be less than right value, but is not
-   Left   (lhs): 1
-   Right  (rhs): 1]]></Description>
+      <Description><![CDATA[The computed value is expected to be less than the baseline, but is not
+   Computed (lhs): 1
+   Baseline (rhs): 1]]></Description>
     </Incident>
     <Incident type="pass" file="" line="0">
       <DataTag><![CDATA[LT:left < right]]></DataTag>
     </Incident>
     <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp" line="0">
       <DataTag><![CDATA[LT:left > right]]></DataTag>
-      <Description><![CDATA[Left value is expected to be less than right value, but is not
-   Left   (lhs): 1.1
-   Right  (rhs): 1]]></Description>
+      <Description><![CDATA[The computed value is expected to be less than the baseline, but is not
+   Computed (lhs): 1.1
+   Baseline (rhs): 1]]></Description>
     </Incident>
     <Incident type="pass" file="" line="0">
       <DataTag><![CDATA[LE:left == right]]></DataTag>
@@ -144,21 +144,21 @@
     </Incident>
     <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp" line="0">
       <DataTag><![CDATA[LE:left > right]]></DataTag>
-      <Description><![CDATA[Left value is expected to be less than or equal to right value, but is not
-   Left   (lhs): 1.1
-   Right  (rhs): 1]]></Description>
+      <Description><![CDATA[The computed value is expected to be less than or equal to the baseline, but is not
+   Computed (lhs): 1.1
+   Baseline (rhs): 1]]></Description>
     </Incident>
     <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp" line="0">
       <DataTag><![CDATA[GT:left == right]]></DataTag>
-      <Description><![CDATA[Left value is expected to be greater than right value, but is not
-   Left   (lhs): 1
-   Right  (rhs): 1]]></Description>
+      <Description><![CDATA[The computed value is expected to be greater than the baseline, but is not
+   Computed (lhs): 1
+   Baseline (rhs): 1]]></Description>
     </Incident>
     <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp" line="0">
       <DataTag><![CDATA[GT:left < right]]></DataTag>
-      <Description><![CDATA[Left value is expected to be greater than right value, but is not
-   Left   (lhs): 1
-   Right  (rhs): 1.1]]></Description>
+      <Description><![CDATA[The computed value is expected to be greater than the baseline, but is not
+   Computed (lhs): 1
+   Baseline (rhs): 1.1]]></Description>
     </Incident>
     <Incident type="pass" file="" line="0">
       <DataTag><![CDATA[GT:left > right]]></DataTag>
@@ -168,9 +168,9 @@
     </Incident>
     <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp" line="0">
       <DataTag><![CDATA[GE:left < right]]></DataTag>
-      <Description><![CDATA[Left value is expected to be greater than or equal to right value, but is not
-   Left   (lhs): 1
-   Right  (rhs): 1.1]]></Description>
+      <Description><![CDATA[The computed value is expected to be greater than or equal to the baseline, but is not
+   Computed (lhs): 1
+   Baseline (rhs): 1.1]]></Description>
     </Incident>
     <Incident type="pass" file="" line="0">
       <DataTag><![CDATA[GE:left > right]]></DataTag>
@@ -183,21 +183,21 @@
     </Incident>
     <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp" line="0">
       <DataTag><![CDATA[EQ:left < right]]></DataTag>
-      <Description><![CDATA[Left value is expected to be equal to right value, but is not
-   Left   (lhs): 0
-   Right  (rhs): 0.1]]></Description>
+      <Description><![CDATA[The computed value is expected to be equal to the baseline, but is not
+   Computed (lhs): 0
+   Baseline (rhs): 0.1]]></Description>
     </Incident>
     <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp" line="0">
       <DataTag><![CDATA[EQ:left > right]]></DataTag>
-      <Description><![CDATA[Left value is expected to be equal to right value, but is not
-   Left   (lhs): 0.1
-   Right  (rhs): 0]]></Description>
+      <Description><![CDATA[The computed value is expected to be equal to the baseline, but is not
+   Computed (lhs): 0.1
+   Baseline (rhs): 0]]></Description>
     </Incident>
     <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp" line="0">
       <DataTag><![CDATA[NE:left == right]]></DataTag>
-      <Description><![CDATA[Left value is expected to be different from right value, but is not
-   Left   (lhs): 0
-   Right  (rhs): 0]]></Description>
+      <Description><![CDATA[The computed value is expected to be different from the baseline, but is not
+   Computed (lhs): 0
+   Baseline (rhs): 0]]></Description>
     </Incident>
     <Incident type="pass" file="" line="0">
       <DataTag><![CDATA[NE:left < right]]></DataTag>
@@ -207,18 +207,18 @@
     </Incident>
     <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp" line="0">
       <DataTag><![CDATA[LT:left == right]]></DataTag>
-      <Description><![CDATA[Left value is expected to be less than right value, but is not
-   Left   (lhs): 0
-   Right  (rhs): 0]]></Description>
+      <Description><![CDATA[The computed value is expected to be less than the baseline, but is not
+   Computed (lhs): 0
+   Baseline (rhs): 0]]></Description>
     </Incident>
     <Incident type="pass" file="" line="0">
       <DataTag><![CDATA[LT:left < right]]></DataTag>
     </Incident>
     <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp" line="0">
       <DataTag><![CDATA[LT:left > right]]></DataTag>
-      <Description><![CDATA[Left value is expected to be less than right value, but is not
-   Left   (lhs): 0.1
-   Right  (rhs): 0]]></Description>
+      <Description><![CDATA[The computed value is expected to be less than the baseline, but is not
+   Computed (lhs): 0.1
+   Baseline (rhs): 0]]></Description>
     </Incident>
     <Incident type="pass" file="" line="0">
       <DataTag><![CDATA[LE:left == right]]></DataTag>
@@ -228,21 +228,21 @@
     </Incident>
     <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp" line="0">
       <DataTag><![CDATA[LE:left > right]]></DataTag>
-      <Description><![CDATA[Left value is expected to be less than or equal to right value, but is not
-   Left   (lhs): 0.1
-   Right  (rhs): 0]]></Description>
+      <Description><![CDATA[The computed value is expected to be less than or equal to the baseline, but is not
+   Computed (lhs): 0.1
+   Baseline (rhs): 0]]></Description>
     </Incident>
     <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp" line="0">
       <DataTag><![CDATA[GT:left == right]]></DataTag>
-      <Description><![CDATA[Left value is expected to be greater than right value, but is not
-   Left   (lhs): 0
-   Right  (rhs): 0]]></Description>
+      <Description><![CDATA[The computed value is expected to be greater than the baseline, but is not
+   Computed (lhs): 0
+   Baseline (rhs): 0]]></Description>
     </Incident>
     <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp" line="0">
       <DataTag><![CDATA[GT:left < right]]></DataTag>
-      <Description><![CDATA[Left value is expected to be greater than right value, but is not
-   Left   (lhs): 0
-   Right  (rhs): 0.1]]></Description>
+      <Description><![CDATA[The computed value is expected to be greater than the baseline, but is not
+   Computed (lhs): 0
+   Baseline (rhs): 0.1]]></Description>
     </Incident>
     <Incident type="pass" file="" line="0">
       <DataTag><![CDATA[GT:left > right]]></DataTag>
@@ -252,9 +252,9 @@
     </Incident>
     <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp" line="0">
       <DataTag><![CDATA[GE:left < right]]></DataTag>
-      <Description><![CDATA[Left value is expected to be greater than or equal to right value, but is not
-   Left   (lhs): 0
-   Right  (rhs): 0.1]]></Description>
+      <Description><![CDATA[The computed value is expected to be greater than or equal to the baseline, but is not
+   Computed (lhs): 0
+   Baseline (rhs): 0.1]]></Description>
     </Incident>
     <Incident type="pass" file="" line="0">
       <DataTag><![CDATA[GE:left > right]]></DataTag>
@@ -267,21 +267,21 @@
     </Incident>
     <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp" line="0">
       <DataTag><![CDATA[EQ:left < right]]></DataTag>
-      <Description><![CDATA[Left value is expected to be equal to right value, but is not
-   Left   (lhs): 1
-   Right  (rhs): 2]]></Description>
+      <Description><![CDATA[The computed value is expected to be equal to the baseline, but is not
+   Computed (lhs): 1
+   Baseline (rhs): 2]]></Description>
     </Incident>
     <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp" line="0">
       <DataTag><![CDATA[EQ:left > right]]></DataTag>
-      <Description><![CDATA[Left value is expected to be equal to right value, but is not
-   Left   (lhs): 2
-   Right  (rhs): 1]]></Description>
+      <Description><![CDATA[The computed value is expected to be equal to the baseline, but is not
+   Computed (lhs): 2
+   Baseline (rhs): 1]]></Description>
     </Incident>
     <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp" line="0">
       <DataTag><![CDATA[NE:left == right]]></DataTag>
-      <Description><![CDATA[Left value is expected to be different from right value, but is not
-   Left   (lhs): 1
-   Right  (rhs): 1]]></Description>
+      <Description><![CDATA[The computed value is expected to be different from the baseline, but is not
+   Computed (lhs): 1
+   Baseline (rhs): 1]]></Description>
     </Incident>
     <Incident type="pass" file="" line="0">
       <DataTag><![CDATA[NE:left < right]]></DataTag>
@@ -291,18 +291,18 @@
     </Incident>
     <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp" line="0">
       <DataTag><![CDATA[LT:left == right]]></DataTag>
-      <Description><![CDATA[Left value is expected to be less than right value, but is not
-   Left   (lhs): 1
-   Right  (rhs): 1]]></Description>
+      <Description><![CDATA[The computed value is expected to be less than the baseline, but is not
+   Computed (lhs): 1
+   Baseline (rhs): 1]]></Description>
     </Incident>
     <Incident type="pass" file="" line="0">
       <DataTag><![CDATA[LT:left < right]]></DataTag>
     </Incident>
     <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp" line="0">
       <DataTag><![CDATA[LT:left > right]]></DataTag>
-      <Description><![CDATA[Left value is expected to be less than right value, but is not
-   Left   (lhs): 2
-   Right  (rhs): 1]]></Description>
+      <Description><![CDATA[The computed value is expected to be less than the baseline, but is not
+   Computed (lhs): 2
+   Baseline (rhs): 1]]></Description>
     </Incident>
     <Incident type="pass" file="" line="0">
       <DataTag><![CDATA[LE:left == right]]></DataTag>
@@ -312,21 +312,21 @@
     </Incident>
     <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp" line="0">
       <DataTag><![CDATA[LE:left > right]]></DataTag>
-      <Description><![CDATA[Left value is expected to be less than or equal to right value, but is not
-   Left   (lhs): 2
-   Right  (rhs): 1]]></Description>
+      <Description><![CDATA[The computed value is expected to be less than or equal to the baseline, but is not
+   Computed (lhs): 2
+   Baseline (rhs): 1]]></Description>
     </Incident>
     <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp" line="0">
       <DataTag><![CDATA[GT:left == right]]></DataTag>
-      <Description><![CDATA[Left value is expected to be greater than right value, but is not
-   Left   (lhs): 1
-   Right  (rhs): 1]]></Description>
+      <Description><![CDATA[The computed value is expected to be greater than the baseline, but is not
+   Computed (lhs): 1
+   Baseline (rhs): 1]]></Description>
     </Incident>
     <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp" line="0">
       <DataTag><![CDATA[GT:left < right]]></DataTag>
-      <Description><![CDATA[Left value is expected to be greater than right value, but is not
-   Left   (lhs): 1
-   Right  (rhs): 2]]></Description>
+      <Description><![CDATA[The computed value is expected to be greater than the baseline, but is not
+   Computed (lhs): 1
+   Baseline (rhs): 2]]></Description>
     </Incident>
     <Incident type="pass" file="" line="0">
       <DataTag><![CDATA[GT:left > right]]></DataTag>
@@ -336,9 +336,9 @@
     </Incident>
     <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp" line="0">
       <DataTag><![CDATA[GE:left < right]]></DataTag>
-      <Description><![CDATA[Left value is expected to be greater than or equal to right value, but is not
-   Left   (lhs): 1
-   Right  (rhs): 2]]></Description>
+      <Description><![CDATA[The computed value is expected to be greater than or equal to the baseline, but is not
+   Computed (lhs): 1
+   Baseline (rhs): 2]]></Description>
     </Incident>
     <Incident type="pass" file="" line="0">
       <DataTag><![CDATA[GE:left > right]]></DataTag>
@@ -351,21 +351,21 @@
     </Incident>
     <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp" line="0">
       <DataTag><![CDATA[EQ:left < right]]></DataTag>
-      <Description><![CDATA[Left value is expected to be equal to right value, but is not
-   Left   (lhs): "nullptr"
-   Right  (rhs): 1]]></Description>
+      <Description><![CDATA[The computed value is expected to be equal to the baseline, but is not
+   Computed (lhs): "nullptr"
+   Baseline (rhs): 1]]></Description>
     </Incident>
     <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp" line="0">
       <DataTag><![CDATA[EQ:left > right]]></DataTag>
-      <Description><![CDATA[Left value is expected to be equal to right value, but is not
-   Left   (lhs): 1
-   Right  (rhs): "nullptr"]]></Description>
+      <Description><![CDATA[The computed value is expected to be equal to the baseline, but is not
+   Computed (lhs): 1
+   Baseline (rhs): "nullptr"]]></Description>
     </Incident>
     <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp" line="0">
       <DataTag><![CDATA[NE:left == right]]></DataTag>
-      <Description><![CDATA[Left value is expected to be different from right value, but is not
-   Left   (lhs): "nullptr"
-   Right  (rhs): "nullptr"]]></Description>
+      <Description><![CDATA[The computed value is expected to be different from the baseline, but is not
+   Computed (lhs): "nullptr"
+   Baseline (rhs): "nullptr"]]></Description>
     </Incident>
     <Incident type="pass" file="" line="0">
       <DataTag><![CDATA[NE:left < right]]></DataTag>
@@ -375,18 +375,18 @@
     </Incident>
     <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp" line="0">
       <DataTag><![CDATA[LT:left == right]]></DataTag>
-      <Description><![CDATA[Left value is expected to be less than right value, but is not
-   Left   (lhs): "nullptr"
-   Right  (rhs): "nullptr"]]></Description>
+      <Description><![CDATA[The computed value is expected to be less than the baseline, but is not
+   Computed (lhs): "nullptr"
+   Baseline (rhs): "nullptr"]]></Description>
     </Incident>
     <Incident type="pass" file="" line="0">
       <DataTag><![CDATA[LT:left < right]]></DataTag>
     </Incident>
     <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp" line="0">
       <DataTag><![CDATA[LT:left > right]]></DataTag>
-      <Description><![CDATA[Left value is expected to be less than right value, but is not
-   Left   (lhs): 1
-   Right  (rhs): "nullptr"]]></Description>
+      <Description><![CDATA[The computed value is expected to be less than the baseline, but is not
+   Computed (lhs): 1
+   Baseline (rhs): "nullptr"]]></Description>
     </Incident>
     <Incident type="pass" file="" line="0">
       <DataTag><![CDATA[LE:left == right]]></DataTag>
@@ -396,21 +396,21 @@
     </Incident>
     <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp" line="0">
       <DataTag><![CDATA[LE:left > right]]></DataTag>
-      <Description><![CDATA[Left value is expected to be less than or equal to right value, but is not
-   Left   (lhs): 1
-   Right  (rhs): "nullptr"]]></Description>
+      <Description><![CDATA[The computed value is expected to be less than or equal to the baseline, but is not
+   Computed (lhs): 1
+   Baseline (rhs): "nullptr"]]></Description>
     </Incident>
     <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp" line="0">
       <DataTag><![CDATA[GT:left == right]]></DataTag>
-      <Description><![CDATA[Left value is expected to be greater than right value, but is not
-   Left   (lhs): "nullptr"
-   Right  (rhs): "nullptr"]]></Description>
+      <Description><![CDATA[The computed value is expected to be greater than the baseline, but is not
+   Computed (lhs): "nullptr"
+   Baseline (rhs): "nullptr"]]></Description>
     </Incident>
     <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp" line="0">
       <DataTag><![CDATA[GT:left < right]]></DataTag>
-      <Description><![CDATA[Left value is expected to be greater than right value, but is not
-   Left   (lhs): "nullptr"
-   Right  (rhs): 1]]></Description>
+      <Description><![CDATA[The computed value is expected to be greater than the baseline, but is not
+   Computed (lhs): "nullptr"
+   Baseline (rhs): 1]]></Description>
     </Incident>
     <Incident type="pass" file="" line="0">
       <DataTag><![CDATA[GT:left > right]]></DataTag>
@@ -420,9 +420,9 @@
     </Incident>
     <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp" line="0">
       <DataTag><![CDATA[GE:left < right]]></DataTag>
-      <Description><![CDATA[Left value is expected to be greater than or equal to right value, but is not
-   Left   (lhs): "nullptr"
-   Right  (rhs): 1]]></Description>
+      <Description><![CDATA[The computed value is expected to be greater than or equal to the baseline, but is not
+   Computed (lhs): "nullptr"
+   Baseline (rhs): 1]]></Description>
     </Incident>
     <Incident type="pass" file="" line="0">
       <DataTag><![CDATA[GE:left > right]]></DataTag>
@@ -435,21 +435,21 @@
     </Incident>
     <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp" line="0">
       <DataTag><![CDATA[EQ:left < right]]></DataTag>
-      <Description><![CDATA[Left value is expected to be equal to right value, but is not
-   Left   (lhs): 0
-   Right  (rhs): 1]]></Description>
+      <Description><![CDATA[The computed value is expected to be equal to the baseline, but is not
+   Computed (lhs): 0
+   Baseline (rhs): 1]]></Description>
     </Incident>
     <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp" line="0">
       <DataTag><![CDATA[EQ:left > right]]></DataTag>
-      <Description><![CDATA[Left value is expected to be equal to right value, but is not
-   Left   (lhs): 1
-   Right  (rhs): 0]]></Description>
+      <Description><![CDATA[The computed value is expected to be equal to the baseline, but is not
+   Computed (lhs): 1
+   Baseline (rhs): 0]]></Description>
     </Incident>
     <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp" line="0">
       <DataTag><![CDATA[NE:left == right]]></DataTag>
-      <Description><![CDATA[Left value is expected to be different from right value, but is not
-   Left   (lhs): 0
-   Right  (rhs): 0]]></Description>
+      <Description><![CDATA[The computed value is expected to be different from the baseline, but is not
+   Computed (lhs): 0
+   Baseline (rhs): 0]]></Description>
     </Incident>
     <Incident type="pass" file="" line="0">
       <DataTag><![CDATA[NE:left < right]]></DataTag>
@@ -459,18 +459,18 @@
     </Incident>
     <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp" line="0">
       <DataTag><![CDATA[LT:left == right]]></DataTag>
-      <Description><![CDATA[Left value is expected to be less than right value, but is not
-   Left   (lhs): 0
-   Right  (rhs): 0]]></Description>
+      <Description><![CDATA[The computed value is expected to be less than the baseline, but is not
+   Computed (lhs): 0
+   Baseline (rhs): 0]]></Description>
     </Incident>
     <Incident type="pass" file="" line="0">
       <DataTag><![CDATA[LT:left < right]]></DataTag>
     </Incident>
     <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp" line="0">
       <DataTag><![CDATA[LT:left > right]]></DataTag>
-      <Description><![CDATA[Left value is expected to be less than right value, but is not
-   Left   (lhs): 1
-   Right  (rhs): 0]]></Description>
+      <Description><![CDATA[The computed value is expected to be less than the baseline, but is not
+   Computed (lhs): 1
+   Baseline (rhs): 0]]></Description>
     </Incident>
     <Incident type="pass" file="" line="0">
       <DataTag><![CDATA[LE:left == right]]></DataTag>
@@ -480,21 +480,21 @@
     </Incident>
     <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp" line="0">
       <DataTag><![CDATA[LE:left > right]]></DataTag>
-      <Description><![CDATA[Left value is expected to be less than or equal to right value, but is not
-   Left   (lhs): 1
-   Right  (rhs): 0]]></Description>
+      <Description><![CDATA[The computed value is expected to be less than or equal to the baseline, but is not
+   Computed (lhs): 1
+   Baseline (rhs): 0]]></Description>
     </Incident>
     <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp" line="0">
       <DataTag><![CDATA[GT:left == right]]></DataTag>
-      <Description><![CDATA[Left value is expected to be greater than right value, but is not
-   Left   (lhs): 0
-   Right  (rhs): 0]]></Description>
+      <Description><![CDATA[The computed value is expected to be greater than the baseline, but is not
+   Computed (lhs): 0
+   Baseline (rhs): 0]]></Description>
     </Incident>
     <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp" line="0">
       <DataTag><![CDATA[GT:left < right]]></DataTag>
-      <Description><![CDATA[Left value is expected to be greater than right value, but is not
-   Left   (lhs): 0
-   Right  (rhs): 1]]></Description>
+      <Description><![CDATA[The computed value is expected to be greater than the baseline, but is not
+   Computed (lhs): 0
+   Baseline (rhs): 1]]></Description>
     </Incident>
     <Incident type="pass" file="" line="0">
       <DataTag><![CDATA[GT:left > right]]></DataTag>
@@ -504,9 +504,9 @@
     </Incident>
     <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp" line="0">
       <DataTag><![CDATA[GE:left < right]]></DataTag>
-      <Description><![CDATA[Left value is expected to be greater than or equal to right value, but is not
-   Left   (lhs): 0
-   Right  (rhs): 1]]></Description>
+      <Description><![CDATA[The computed value is expected to be greater than or equal to the baseline, but is not
+   Computed (lhs): 0
+   Baseline (rhs): 1]]></Description>
     </Incident>
     <Incident type="pass" file="" line="0">
       <DataTag><![CDATA[GE:left > right]]></DataTag>
@@ -519,21 +519,21 @@
     </Incident>
     <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp" line="0">
       <DataTag><![CDATA[EQ:left < right]]></DataTag>
-      <Description><![CDATA[Left value is expected to be equal to right value, but is not
-   Left   (lhs): Monday
-   Right  (rhs): Sunday]]></Description>
+      <Description><![CDATA[The computed value is expected to be equal to the baseline, but is not
+   Computed (lhs): Monday
+   Baseline (rhs): Sunday]]></Description>
     </Incident>
     <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp" line="0">
       <DataTag><![CDATA[EQ:left > right]]></DataTag>
-      <Description><![CDATA[Left value is expected to be equal to right value, but is not
-   Left   (lhs): Sunday
-   Right  (rhs): Monday]]></Description>
+      <Description><![CDATA[The computed value is expected to be equal to the baseline, but is not
+   Computed (lhs): Sunday
+   Baseline (rhs): Monday]]></Description>
     </Incident>
     <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp" line="0">
       <DataTag><![CDATA[NE:left == right]]></DataTag>
-      <Description><![CDATA[Left value is expected to be different from right value, but is not
-   Left   (lhs): Monday
-   Right  (rhs): Monday]]></Description>
+      <Description><![CDATA[The computed value is expected to be different from the baseline, but is not
+   Computed (lhs): Monday
+   Baseline (rhs): Monday]]></Description>
     </Incident>
     <Incident type="pass" file="" line="0">
       <DataTag><![CDATA[NE:left < right]]></DataTag>
@@ -543,18 +543,18 @@
     </Incident>
     <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp" line="0">
       <DataTag><![CDATA[LT:left == right]]></DataTag>
-      <Description><![CDATA[Left value is expected to be less than right value, but is not
-   Left   (lhs): Monday
-   Right  (rhs): Monday]]></Description>
+      <Description><![CDATA[The computed value is expected to be less than the baseline, but is not
+   Computed (lhs): Monday
+   Baseline (rhs): Monday]]></Description>
     </Incident>
     <Incident type="pass" file="" line="0">
       <DataTag><![CDATA[LT:left < right]]></DataTag>
     </Incident>
     <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp" line="0">
       <DataTag><![CDATA[LT:left > right]]></DataTag>
-      <Description><![CDATA[Left value is expected to be less than right value, but is not
-   Left   (lhs): Sunday
-   Right  (rhs): Monday]]></Description>
+      <Description><![CDATA[The computed value is expected to be less than the baseline, but is not
+   Computed (lhs): Sunday
+   Baseline (rhs): Monday]]></Description>
     </Incident>
     <Incident type="pass" file="" line="0">
       <DataTag><![CDATA[LE:left == right]]></DataTag>
@@ -564,21 +564,21 @@
     </Incident>
     <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp" line="0">
       <DataTag><![CDATA[LE:left > right]]></DataTag>
-      <Description><![CDATA[Left value is expected to be less than or equal to right value, but is not
-   Left   (lhs): Sunday
-   Right  (rhs): Monday]]></Description>
+      <Description><![CDATA[The computed value is expected to be less than or equal to the baseline, but is not
+   Computed (lhs): Sunday
+   Baseline (rhs): Monday]]></Description>
     </Incident>
     <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp" line="0">
       <DataTag><![CDATA[GT:left == right]]></DataTag>
-      <Description><![CDATA[Left value is expected to be greater than right value, but is not
-   Left   (lhs): Monday
-   Right  (rhs): Monday]]></Description>
+      <Description><![CDATA[The computed value is expected to be greater than the baseline, but is not
+   Computed (lhs): Monday
+   Baseline (rhs): Monday]]></Description>
     </Incident>
     <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp" line="0">
       <DataTag><![CDATA[GT:left < right]]></DataTag>
-      <Description><![CDATA[Left value is expected to be greater than right value, but is not
-   Left   (lhs): Monday
-   Right  (rhs): Sunday]]></Description>
+      <Description><![CDATA[The computed value is expected to be greater than the baseline, but is not
+   Computed (lhs): Monday
+   Baseline (rhs): Sunday]]></Description>
     </Incident>
     <Incident type="pass" file="" line="0">
       <DataTag><![CDATA[GT:left > right]]></DataTag>
@@ -588,9 +588,9 @@
     </Incident>
     <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp" line="0">
       <DataTag><![CDATA[GE:left < right]]></DataTag>
-      <Description><![CDATA[Left value is expected to be greater than or equal to right value, but is not
-   Left   (lhs): Monday
-   Right  (rhs): Sunday]]></Description>
+      <Description><![CDATA[The computed value is expected to be greater than or equal to the baseline, but is not
+   Computed (lhs): Monday
+   Baseline (rhs): Sunday]]></Description>
     </Incident>
     <Incident type="pass" file="" line="0">
       <DataTag><![CDATA[GE:left > right]]></DataTag>
@@ -603,21 +603,21 @@
     </Incident>
     <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp" line="0">
       <DataTag><![CDATA[EQ:left < right]]></DataTag>
-      <Description><![CDATA[Left value is expected to be equal to right value, but is not
-   Left   (lhs): MyClass(1)
-   Right  (rhs): MyClass(2)]]></Description>
+      <Description><![CDATA[The computed value is expected to be equal to the baseline, but is not
+   Computed (lhs): MyClass(1)
+   Baseline (rhs): MyClass(2)]]></Description>
     </Incident>
     <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp" line="0">
       <DataTag><![CDATA[EQ:left > right]]></DataTag>
-      <Description><![CDATA[Left value is expected to be equal to right value, but is not
-   Left   (lhs): MyClass(2)
-   Right  (rhs): MyClass(1)]]></Description>
+      <Description><![CDATA[The computed value is expected to be equal to the baseline, but is not
+   Computed (lhs): MyClass(2)
+   Baseline (rhs): MyClass(1)]]></Description>
     </Incident>
     <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp" line="0">
       <DataTag><![CDATA[NE:left == right]]></DataTag>
-      <Description><![CDATA[Left value is expected to be different from right value, but is not
-   Left   (lhs): MyClass(1)
-   Right  (rhs): MyClass(1)]]></Description>
+      <Description><![CDATA[The computed value is expected to be different from the baseline, but is not
+   Computed (lhs): MyClass(1)
+   Baseline (rhs): MyClass(1)]]></Description>
     </Incident>
     <Incident type="pass" file="" line="0">
       <DataTag><![CDATA[NE:left < right]]></DataTag>
@@ -627,18 +627,18 @@
     </Incident>
     <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp" line="0">
       <DataTag><![CDATA[LT:left == right]]></DataTag>
-      <Description><![CDATA[Left value is expected to be less than right value, but is not
-   Left   (lhs): MyClass(1)
-   Right  (rhs): MyClass(1)]]></Description>
+      <Description><![CDATA[The computed value is expected to be less than the baseline, but is not
+   Computed (lhs): MyClass(1)
+   Baseline (rhs): MyClass(1)]]></Description>
     </Incident>
     <Incident type="pass" file="" line="0">
       <DataTag><![CDATA[LT:left < right]]></DataTag>
     </Incident>
     <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp" line="0">
       <DataTag><![CDATA[LT:left > right]]></DataTag>
-      <Description><![CDATA[Left value is expected to be less than right value, but is not
-   Left   (lhs): MyClass(2)
-   Right  (rhs): MyClass(1)]]></Description>
+      <Description><![CDATA[The computed value is expected to be less than the baseline, but is not
+   Computed (lhs): MyClass(2)
+   Baseline (rhs): MyClass(1)]]></Description>
     </Incident>
     <Incident type="pass" file="" line="0">
       <DataTag><![CDATA[LE:left == right]]></DataTag>
@@ -648,21 +648,21 @@
     </Incident>
     <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp" line="0">
       <DataTag><![CDATA[LE:left > right]]></DataTag>
-      <Description><![CDATA[Left value is expected to be less than or equal to right value, but is not
-   Left   (lhs): MyClass(2)
-   Right  (rhs): MyClass(1)]]></Description>
+      <Description><![CDATA[The computed value is expected to be less than or equal to the baseline, but is not
+   Computed (lhs): MyClass(2)
+   Baseline (rhs): MyClass(1)]]></Description>
     </Incident>
     <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp" line="0">
       <DataTag><![CDATA[GT:left == right]]></DataTag>
-      <Description><![CDATA[Left value is expected to be greater than right value, but is not
-   Left   (lhs): MyClass(1)
-   Right  (rhs): MyClass(1)]]></Description>
+      <Description><![CDATA[The computed value is expected to be greater than the baseline, but is not
+   Computed (lhs): MyClass(1)
+   Baseline (rhs): MyClass(1)]]></Description>
     </Incident>
     <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp" line="0">
       <DataTag><![CDATA[GT:left < right]]></DataTag>
-      <Description><![CDATA[Left value is expected to be greater than right value, but is not
-   Left   (lhs): MyClass(1)
-   Right  (rhs): MyClass(2)]]></Description>
+      <Description><![CDATA[The computed value is expected to be greater than the baseline, but is not
+   Computed (lhs): MyClass(1)
+   Baseline (rhs): MyClass(2)]]></Description>
     </Incident>
     <Incident type="pass" file="" line="0">
       <DataTag><![CDATA[GT:left > right]]></DataTag>
@@ -672,9 +672,9 @@
     </Incident>
     <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp" line="0">
       <DataTag><![CDATA[GE:left < right]]></DataTag>
-      <Description><![CDATA[Left value is expected to be greater than or equal to right value, but is not
-   Left   (lhs): MyClass(1)
-   Right  (rhs): MyClass(2)]]></Description>
+      <Description><![CDATA[The computed value is expected to be greater than or equal to the baseline, but is not
+   Computed (lhs): MyClass(1)
+   Baseline (rhs): MyClass(2)]]></Description>
     </Incident>
     <Incident type="pass" file="" line="0">
       <DataTag><![CDATA[GE:left > right]]></DataTag>
@@ -684,9 +684,9 @@
   <TestFunction name="checkComparisonForTemporaryObjects">
     <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp" line="0">
       <DataTag><![CDATA[EQ]]></DataTag>
-      <Description><![CDATA[Left value is expected to be equal to right value, but is not
-   Left   (getClassForValue(0).getValuePointer()): MyClass(2) on memory address with index 0
-   Right  (getClassForValue(1).getValuePointer()): MyClass(1) on memory address with index 1]]></Description>
+      <Description><![CDATA[The computed value is expected to be equal to the baseline, but is not
+   Computed (getClassForValue(0).getValuePointer()): MyClass(2) on memory address with index 0
+   Baseline (getClassForValue(1).getValuePointer()): MyClass(1) on memory address with index 1]]></Description>
     </Incident>
     <Incident type="pass" file="" line="0">
       <DataTag><![CDATA[NE]]></DataTag>
@@ -699,15 +699,15 @@
     </Incident>
     <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp" line="0">
       <DataTag><![CDATA[GT]]></DataTag>
-      <Description><![CDATA[Left value is expected to be greater than right value, but is not
-   Left   (getClassForValue(0).getValuePointer()): MyClass(2) on memory address with index 0
-   Right  (getClassForValue(1).getValuePointer()): MyClass(1) on memory address with index 1]]></Description>
+      <Description><![CDATA[The computed value is expected to be greater than the baseline, but is not
+   Computed (getClassForValue(0).getValuePointer()): MyClass(2) on memory address with index 0
+   Baseline (getClassForValue(1).getValuePointer()): MyClass(1) on memory address with index 1]]></Description>
     </Incident>
     <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp" line="0">
       <DataTag><![CDATA[GE]]></DataTag>
-      <Description><![CDATA[Left value is expected to be greater than or equal to right value, but is not
-   Left   (getClassForValue(0).getValuePointer()): MyClass(2) on memory address with index 0
-   Right  (getClassForValue(1).getValuePointer()): MyClass(1) on memory address with index 1]]></Description>
+      <Description><![CDATA[The computed value is expected to be greater than or equal to the baseline, but is not
+   Computed (getClassForValue(0).getValuePointer()): MyClass(2) on memory address with index 0
+   Baseline (getClassForValue(1).getValuePointer()): MyClass(1) on memory address with index 1]]></Description>
     </Incident>
     <Duration msecs="0"/>
   </TestFunction>
@@ -720,21 +720,21 @@
     </Incident>
     <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp" line="0">
       <DataTag><![CDATA[LT]]></DataTag>
-      <Description><![CDATA[Left value is expected to be less than right value, but is not
-   Left   (c)                         : ClassWithDeferredSetter(1)
-   Right  (ClassWithDeferredSetter(0)): ClassWithDeferredSetter(0)]]></Description>
+      <Description><![CDATA[The computed value is expected to be less than the baseline, but is not
+   Computed (c)                         : ClassWithDeferredSetter(1)
+   Baseline (ClassWithDeferredSetter(0)): ClassWithDeferredSetter(0)]]></Description>
     </Incident>
     <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp" line="0">
       <DataTag><![CDATA[LE]]></DataTag>
-      <Description><![CDATA[Left value is expected to be less than or equal to right value, but is not
-   Left   (c)                          : ClassWithDeferredSetter(1)
-   Right  (ClassWithDeferredSetter(-1)): ClassWithDeferredSetter(-1)]]></Description>
+      <Description><![CDATA[The computed value is expected to be less than or equal to the baseline, but is not
+   Computed (c)                          : ClassWithDeferredSetter(1)
+   Baseline (ClassWithDeferredSetter(-1)): ClassWithDeferredSetter(-1)]]></Description>
     </Incident>
     <Incident type="fail" file="qtbase/tests/auto/testlib/selftests/extendedcompare/tst_extendedcompare.cpp" line="0">
       <DataTag><![CDATA[GT]]></DataTag>
-      <Description><![CDATA[Left value is expected to be greater than right value, but is not
-   Left   (c)                         : ClassWithDeferredSetter(1)
-   Right  (ClassWithDeferredSetter(1)): ClassWithDeferredSetter(1)]]></Description>
+      <Description><![CDATA[The computed value is expected to be greater than the baseline, but is not
+   Computed (c)                         : ClassWithDeferredSetter(1)
+   Baseline (ClassWithDeferredSetter(1)): ClassWithDeferredSetter(1)]]></Description>
     </Incident>
     <Incident type="pass" file="" line="0">
       <DataTag><![CDATA[GE]]></DataTag>
-- 
cgit v1.2.3