From eec0a30e5e0c64a8f373b59290b8e6c0bc88c17c 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_QCborStreamWriter: port to QTEST_THROW_ON_FAIL

Dogfooding the new QtTest 6.8 feature.

Pick-to: 6.8
Change-Id: Ie197dc94fb9dfebd5f730c7ca4ef5ce0ed07e9f3
Reviewed-by: Ahmad Samir <a.samirh78@gmail.com>
---
 tests/auto/corelib/serialization/CMakeLists.txt   |  2 ++
 .../qcborstreamwriter/CMakeLists.txt              |  4 ++++
 .../qcborstreamwriter/tst_qcborstreamwriter.cpp   | 15 ++++-----------
 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/tests/auto/corelib/serialization/CMakeLists.txt b/tests/auto/corelib/serialization/CMakeLists.txt
index d9a7e528cbc..4e988a3d886 100644
--- a/tests/auto/corelib/serialization/CMakeLists.txt
+++ b/tests/auto/corelib/serialization/CMakeLists.txt
@@ -6,7 +6,9 @@ if (NOT WASM) # QTBUG-121822
 add_subdirectory(qcborstreamreader)
 endif()
 if(QT_FEATURE_cborstreamwriter)
+    if (NOT WASM) # QTBUG-121822
     add_subdirectory(qcborstreamwriter)
+    endif()
 endif()
 if(NOT WASM)
     add_subdirectory(qcborvalue)
diff --git a/tests/auto/corelib/serialization/qcborstreamwriter/CMakeLists.txt b/tests/auto/corelib/serialization/qcborstreamwriter/CMakeLists.txt
index c1a9a87677c..7b2428e0278 100644
--- a/tests/auto/corelib/serialization/qcborstreamwriter/CMakeLists.txt
+++ b/tests/auto/corelib/serialization/qcborstreamwriter/CMakeLists.txt
@@ -16,4 +16,8 @@ qt_internal_add_test(tst_qcborstreamwriter
         tst_qcborstreamwriter.cpp
     INCLUDE_DIRECTORIES
         ../../../../../src/3rdparty/tinycbor/tests
+    NO_BATCH # QTBUG-121815
+    DEFINES
+        QTEST_THROW_ON_FAIL
+        QTEST_THROW_ON_SKIP
 )
diff --git a/tests/auto/corelib/serialization/qcborstreamwriter/tst_qcborstreamwriter.cpp b/tests/auto/corelib/serialization/qcborstreamwriter/tst_qcborstreamwriter.cpp
index 45e241ef5cb..a0ce4a93a6a 100644
--- a/tests/auto/corelib/serialization/qcborstreamwriter/tst_qcborstreamwriter.cpp
+++ b/tests/auto/corelib/serialization/qcborstreamwriter/tst_qcborstreamwriter.cpp
@@ -5,6 +5,10 @@
 #include <QCborStreamWriter>
 #include <QBuffer>
 
+#ifndef QTEST_THROW_ON_FAIL
+# error This test requires QTEST_THROW_ON_FAIL being active.
+#endif
+
 class tst_QCborStreamWriter : public QObject
 {
     Q_OBJECT
@@ -247,18 +251,10 @@ void tst_QCborStreamWriter::arrays()
     QFETCH(QByteArray, output);
 
     compare(make_list(input), "\x81" + output);
-    if (QTest::currentTestFailed())
-        return;
-
     compare(make_list(input, input), "\x82" + output + output);
-    if (QTest::currentTestFailed())
-        return;
 
     // nested lists
     compare(make_list(make_list(input)), "\x81\x81" + output);
-    if (QTest::currentTestFailed())
-        return;
-
     compare(make_list(make_list(input), make_list(input)), "\x82\x81" + output + "\x81" + output);
 }
 
@@ -268,9 +264,6 @@ void tst_QCborStreamWriter::maps()
     QFETCH(QByteArray, output);
 
     compare(make_map({{1, input}}), "\xa1\1" + output);
-    if (QTest::currentTestFailed())
-        return;
-
     compare(make_map({{1, input}, {input, 24}}), "\xa2\1" + output + output + "\x18\x18");
 }