QCborMap: add missing comparator to QCborValueConstRef

And ensure all combination of CBOR types are tested.

Amends e5ebb9022ab9e00ab01d0bce527755da77083217

Change-Id: I5f663c2f9f4149af84fefffd17c02d352cd41f3f
Reviewed-by: Tatiana Borisova <tatiana.borisova@qt.io>

1 files changed, 10 insertions, 2 deletions

diff --git a/tests/auto/corelib/serialization/qcborvalue/tst_qcborvalue.cpp b/tests/auto/corelib/serialization/qcborvalue/tst_qcborvalue.cpp
index e3544a4056..37f1569bbc 100644
--- a/tests/auto/corelib/serialization/qcborvalue/tst_qcborvalue.cpp
+++ b/tests/auto/corelib/serialization/qcborvalue/tst_qcborvalue.cpp
@@ -452,17 +452,25 @@ void tst_QCborValue::extendedTypes_data()
 
 void tst_QCborValue::compareCompiles()
 {
+    // homogeneous types
     QTestPrivate::testAllComparisonOperatorsCompile<QCborValue>();
     QTestPrivate::testAllComparisonOperatorsCompile<QCborValueRef>();
     QTestPrivate::testAllComparisonOperatorsCompile<QCborValueConstRef>();
     QTestPrivate::testAllComparisonOperatorsCompile<QCborArray>();
     QTestPrivate::testAllComparisonOperatorsCompile<QCborMap>();
+
+    // QCborValue, Ref and ConstRef
     QTestPrivate::testAllComparisonOperatorsCompile<QCborValueRef, QCborValueConstRef>();
     QTestPrivate::testAllComparisonOperatorsCompile<QCborValueConstRef, QCborValue>();
     QTestPrivate::testAllComparisonOperatorsCompile<QCborValueRef, QCborValue>();
-    QTestPrivate::testAllComparisonOperatorsCompile<QCborValueConstRef, QCborArray>();
-    QTestPrivate::testAllComparisonOperatorsCompile<QCborValueRef, QCborArray>();
+
+    // QCbor{Array,Map} <=> QCborValue{,Ref,ConstRef}
+    QTestPrivate::testAllComparisonOperatorsCompile<QCborArray, QCborValue>();
+    QTestPrivate::testAllComparisonOperatorsCompile<QCborArray, QCborValueRef>();
+    QTestPrivate::testAllComparisonOperatorsCompile<QCborArray, QCborValueConstRef>();
     QTestPrivate::testAllComparisonOperatorsCompile<QCborMap, QCborValue>();
+    QTestPrivate::testAllComparisonOperatorsCompile<QCborMap, QCborValueRef>();
+    QTestPrivate::testAllComparisonOperatorsCompile<QCborMap, QCborValueConstRef>();
 }
 
 void tst_QCborValue::extendedTypes()