1 files changed, 26 insertions, 2 deletions
diff --git a/tests/auto/corelib/tools/qcollator/tst_qcollator.cpp b/tests/auto/corelib/tools/qcollator/tst_qcollator.cpp
index d09910fd5c..ead0992f92 100644
--- a/tests/auto/corelib/tools/qcollator/tst_qcollator.cpp
+++ b/tests/auto/corelib/tools/qcollator/tst_qcollator.cpp
@@ -33,6 +33,11 @@
 
 #include <cstring>
 
+Q_CONSTEXPR inline int sign(int i) Q_DECL_NOTHROW
+{ return i < 0 ? -1 : i > 0 ? 1 : 0; }
+
+#define QCOMPARE_SIGN(x, y) QCOMPARE(sign(x), sign(y))
+
 class tst_QCollator : public QObject
 {
     Q_OBJECT
@@ -173,9 +178,28 @@ void tst_QCollator::compare()
     if (numericMode)
         collator.setNumericMode(true);
 
-    QCOMPARE(collator.compare(s1, s2), result);
+    QCOMPARE_SIGN(collator.compare(s1, s2), result);
+    {
+        const auto s1sk = collator.sortKey(s1);
+        const auto s2sk = collator.sortKey(s2);
+
+        QCOMPARE_SIGN(s1sk.compare(s2sk), result);
+#define CHECK(op) QCOMPARE(s1sk op s2sk, result op 0)
+        CHECK(<);
+#undef CHECK
+    }
+
     collator.setCaseSensitivity(Qt::CaseInsensitive);
-    QCOMPARE(collator.compare(s1, s2), caseInsensitiveResult);
+    QCOMPARE_SIGN(collator.compare(s1, s2), caseInsensitiveResult);
+    {
+        const auto s1sk = collator.sortKey(s1);
+        const auto s2sk = collator.sortKey(s2);
+
+        QCOMPARE_SIGN(s1sk.compare(s2sk), caseInsensitiveResult);
+#define CHECK(op) QCOMPARE(s1sk op s2sk, caseInsensitiveResult op 0)
+        CHECK(<);
+#undef CHECK
+    }
 }