1 files changed, 10 insertions, 17 deletions

diff --git a/tests/auto/corelib/serialization/qcborstreamwriter/tst_qcborstreamwriter.cpp b/tests/auto/corelib/serialization/qcborstreamwriter/tst_qcborstreamwriter.cpp
index 5651cc3987..a0ce4a93a6 100644
--- a/tests/auto/corelib/serialization/qcborstreamwriter/tst_qcborstreamwriter.cpp
+++ b/tests/auto/corelib/serialization/qcborstreamwriter/tst_qcborstreamwriter.cpp
@@ -1,10 +1,14 @@
 // Copyright (C) 2018 Intel Corporation.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
 
 #include <QTest>
 #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
@@ -29,7 +33,7 @@ private Q_SLOTS:
 
 // Get the data from TinyCBOR (see src/3rdparty/tinycbor/tests/encoder/data.cpp)
 typedef quint64 CborTag;
-#include "data.cpp"
+#include "encoder/data.cpp"
 
 void encodeVariant(QCborStreamWriter &writer, const QVariant &v)
 {
@@ -81,9 +85,9 @@ void encodeVariant(QCborStreamWriter &writer, const QVariant &v)
                 list = v.value<IndeterminateLengthArray>();
                 writer.startArray();
             } else {
-                writer.startArray(list.length());
+                writer.startArray(list.size());
             }
-            for (const QVariant &v2 : qAsConst(list))
+            for (const QVariant &v2 : std::as_const(list))
                 encodeVariant(writer, v2);
             QVERIFY(writer.endArray());
             return;
@@ -94,9 +98,9 @@ void encodeVariant(QCborStreamWriter &writer, const QVariant &v)
                 map = v.value<IndeterminateLengthMap>();
                 writer.startMap();
             } else {
-                writer.startMap(map.length());
+                writer.startMap(map.size());
             }
-            for (auto pair : qAsConst(map)) {
+            for (auto pair : std::as_const(map)) {
                 encodeVariant(writer, pair.first);
                 encodeVariant(writer, pair.second);
             }
@@ -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");
 }