From df055c0256ed61fb376dfc65cec30d371004f6bb Mon Sep 17 00:00:00 2001
From: Marc Mutz <marc.mutz@qt.io>
Date: Wed, 10 Jan 2024 16:22:48 +0100
Subject: [PATCH] tst_QCborValue: port to QTEST_THROW_ON_FAIL

Dogfooding the new QtTest 6.8 feature.

Change-Id: I1415e6af94eab3bb47d3f8d319f84554faa52d45
Reviewed-by: Ahmad Samir <a.samirh78@gmail.com>
(cherry picked from commit c8e33fc4fd1151edb3df4815f5fbae03eb1ea353)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
---
 .../auto/corelib/serialization/CMakeLists.txt |  1 +
 .../serialization/qcborvalue/CMakeLists.txt   |  4 ++
 .../qcborvalue/tst_qcborvalue.cpp             | 37 ++-----------------
 3 files changed, 9 insertions(+), 33 deletions(-)

diff --git a/tests/auto/corelib/serialization/CMakeLists.txt b/tests/auto/corelib/serialization/CMakeLists.txt
index 4e988a3d886..96959ec8f01 100644
--- a/tests/auto/corelib/serialization/CMakeLists.txt
+++ b/tests/auto/corelib/serialization/CMakeLists.txt
@@ -10,6 +10,7 @@ if(QT_FEATURE_cborstreamwriter)
     add_subdirectory(qcborstreamwriter)
     endif()
 endif()
+# also (but not only!) QTBUG-121822:
 if(NOT WASM)
     add_subdirectory(qcborvalue)
 endif()
diff --git a/tests/auto/corelib/serialization/qcborvalue/CMakeLists.txt b/tests/auto/corelib/serialization/qcborvalue/CMakeLists.txt
index 4b723964899..089677aacbf 100644
--- a/tests/auto/corelib/serialization/qcborvalue/CMakeLists.txt
+++ b/tests/auto/corelib/serialization/qcborvalue/CMakeLists.txt
@@ -17,6 +17,10 @@ qt_internal_add_test(tst_qcborvalue
     INCLUDE_DIRECTORIES
         ../../../../../src/3rdparty/tinycbor/src
         ../../../../../src/3rdparty/tinycbor/tests/parser
+    NO_BATCH # QTBUG-121815
+    DEFINES
+        QTEST_THROW_ON_FAIL
+        QTEST_THROW_ON_SKIP
     LIBRARIES
         Qt::CorePrivate
         Qt::TestPrivate
diff --git a/tests/auto/corelib/serialization/qcborvalue/tst_qcborvalue.cpp b/tests/auto/corelib/serialization/qcborvalue/tst_qcborvalue.cpp
index e480b033e13..04d90bcf9d1 100644
--- a/tests/auto/corelib/serialization/qcborvalue/tst_qcborvalue.cpp
+++ b/tests/auto/corelib/serialization/qcborvalue/tst_qcborvalue.cpp
@@ -14,6 +14,10 @@
 #include <QtEndian>
 #include <QTimeZone>
 
+#ifndef QTEST_THROW_ON_FAIL
+# error This test requires QTEST_THROW_ON_FAIL being active.
+#endif
+
 Q_DECLARE_METATYPE(QCborKnownTags)
 Q_DECLARE_METATYPE(QCborValue)
 Q_DECLARE_METATYPE(QCborValue::EncodingOptions)
@@ -1348,8 +1352,6 @@ void tst_QCborValue::arrayValueRef()
     };
 
     iteratorCheck(a.begin());
-    if (QTest::currentTestFailed())
-        return;
     iteratorCheck(a.constBegin());
 }
 
@@ -1412,8 +1414,6 @@ void tst_QCborValue::mapValueRef()
     };
 
     iteratorCheck(m.begin());
-    if (QTest::currentTestFailed())
-        return;
     iteratorCheck(m.constBegin());
 }
 
@@ -2410,53 +2410,29 @@ void fromCbor_common(void (*doCheck)(const QCborValue &, const QByteArray &))
     QFETCH(QByteArray, result);
 
     doCheck(v, result);
-    if (QTest::currentTestFailed())
-        return;
 
     // in an array
     doCheck(QCborArray{v}, "\x81" + result);
-    if (QTest::currentTestFailed())
-        return;
-
     doCheck(QCborArray{v, v}, "\x82" + result + result);
-    if (QTest::currentTestFailed())
-        return;
 
     // in a map
     doCheck(QCborMap{{1, v}}, "\xa1\1" + result);
-    if (QTest::currentTestFailed())
-        return;
 
     // undefined-length arrays and maps
     doCheck(QCborArray{v}, "\x9f" + result + "\xff");
-    if (QTest::currentTestFailed())
-        return;
     doCheck(QCborArray{v, v}, "\x9f" + result + result + "\xff");
-    if (QTest::currentTestFailed())
-        return;
     doCheck(QCborMap{{1, v}}, "\xbf\1" + result + "\xff");
-    if (QTest::currentTestFailed())
-        return;
 
     // tagged
     QCborValue t(QCborKnownTags::Signature, v);
     doCheck(t, "\xd9\xd9\xf7" + result);
-    if (QTest::currentTestFailed())
-        return;
 
     // in an array
     doCheck(QCborArray{t}, "\x81\xd9\xd9\xf7" + result);
-    if (QTest::currentTestFailed())
-        return;
-
     doCheck(QCborArray{t, t}, "\x82\xd9\xd9\xf7" + result + "\xd9\xd9\xf7" + result);
-    if (QTest::currentTestFailed())
-        return;
 
     // in a map
     doCheck(QCborMap{{1, t}}, "\xa1\1\xd9\xd9\xf7" + result);
-    if (QTest::currentTestFailed())
-        return;
 }
 
 void tst_QCborValue::fromCbor()
@@ -3116,14 +3092,9 @@ void tst_QCborValue::cborValueRefMutatingMapIntKey()
     };
     // accessing a negative index causes it to become a map
     executeTest(-1);
-    if (QTest::currentTestFailed())
-        return;
 
     // if the index is bigger than 0x10000, the array becomes a map
     executeTest(0x10000);
-    if (QTest::currentTestFailed())
-        return;
-
     if (type != QCborValue::Array)
         executeTest(5);
 }