2 files changed, 40 insertions, 23 deletions
diff --git a/tests/auto/corelib/itemmodels/qabstractproxymodel/CMakeLists.txt b/tests/auto/corelib/itemmodels/qabstractproxymodel/CMakeLists.txt
index 61fda88887..ea90d1dd79 100644
--- a/tests/auto/corelib/itemmodels/qabstractproxymodel/CMakeLists.txt
+++ b/tests/auto/corelib/itemmodels/qabstractproxymodel/CMakeLists.txt
@@ -1,15 +1,23 @@
 # Copyright (C) 2022 The Qt Company Ltd.
 # SPDX-License-Identifier: BSD-3-Clause
 
-# Generated from qabstractproxymodel.pro.
-
 #####################################################################
 ## tst_qabstractproxymodel Test:
 #####################################################################
 
+if(NOT QT_BUILD_STANDALONE_TESTS AND NOT QT_BUILDING_QT)
+    cmake_minimum_required(VERSION 3.16)
+    project(tst_qabstractproxymodel LANGUAGES CXX)
+    find_package(Qt6BuildInternals REQUIRED COMPONENTS STANDALONE_TEST)
+endif()
+
 qt_internal_add_test(tst_qabstractproxymodel
     SOURCES
         tst_qabstractproxymodel.cpp
+    NO_BATCH # QTBUG-121815
+    DEFINES
+        QTEST_THROW_ON_FAIL
+        QTEST_THROW_ON_SKIP
     LIBRARIES
         Qt::Gui
         Qt::TestPrivate
diff --git a/tests/auto/corelib/itemmodels/qabstractproxymodel/tst_qabstractproxymodel.cpp b/tests/auto/corelib/itemmodels/qabstractproxymodel/tst_qabstractproxymodel.cpp
index b8283709e2..73a81f56ab 100644
--- a/tests/auto/corelib/itemmodels/qabstractproxymodel/tst_qabstractproxymodel.cpp
+++ b/tests/auto/corelib/itemmodels/qabstractproxymodel/tst_qabstractproxymodel.cpp
@@ -1,12 +1,19 @@
 // Copyright (C) 2021 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
 
 #include <QTest>
 #include <QtTest/private/qpropertytesthelper_p.h>
+
+#ifndef QTEST_THROW_ON_FAIL
+# error This test requires QTEST_THROW_ON_FAIL being active.
+#endif
+
 #include <qabstractproxymodel.h>
 #include <QItemSelection>
 #include <qstandarditemmodel.h>
 
+#include <QtCore/qscopeguard.h>
+
 class tst_QAbstractProxyModel : public QObject
 {
     Q_OBJECT
@@ -225,7 +232,7 @@ void tst_QAbstractProxyModel::headerDataInBounds()
 
     QCOMPARE(proxy.rowCount(), 1);
     QCOMPARE(proxy.columnCount(), 5);
-    QCOMPARE(headerDataChangedSpy.count(), 1);
+    QTRY_COMPARE(headerDataChangedSpy.size(), 1);
     QCOMPARE(headerDataChangedSpy[0][0].value<Qt::Orientation>(), Qt::Horizontal);
     QCOMPARE(headerDataChangedSpy[0][1].value<int>(), 0);
     QCOMPARE(headerDataChangedSpy[0][2].value<int>(), 4);
@@ -244,7 +251,7 @@ void tst_QAbstractProxyModel::headerDataInBounds()
                    });
     QCOMPARE(proxy.rowCount(), 2);
     QCOMPARE(proxy.columnCount(), 5);
-    QCOMPARE(headerDataChangedSpy.count(), 1);
+    QCOMPARE(headerDataChangedSpy.size(), 1);
 
     for (int i = 0; i < proxy.columnCount(); ++i) {
         QString expected = QString("Col%1").arg(proxy.columnCount() - i);
@@ -255,7 +262,7 @@ void tst_QAbstractProxyModel::headerDataInBounds()
 
     QCOMPARE(proxy.rowCount(), 1);
     QCOMPARE(proxy.columnCount(), 5);
-    QCOMPARE(headerDataChangedSpy.count(), 1);
+    QCOMPARE(headerDataChangedSpy.size(), 1);
 
     for (int i = 0; i < proxy.columnCount(); ++i) {
         QString expected = QString("Col%1").arg(proxy.columnCount() - i);
@@ -266,7 +273,7 @@ void tst_QAbstractProxyModel::headerDataInBounds()
 
     QCOMPARE(proxy.rowCount(), 0);
     QCOMPARE(proxy.columnCount(), 5);
-    QCOMPARE(headerDataChangedSpy.count(), 2);
+    QTRY_COMPARE(headerDataChangedSpy.size(), 2);
     QCOMPARE(headerDataChangedSpy[1][0].value<Qt::Orientation>(), Qt::Horizontal);
     QCOMPARE(headerDataChangedSpy[1][1].value<int>(), 0);
     QCOMPARE(headerDataChangedSpy[1][2].value<int>(), 4);
@@ -291,7 +298,7 @@ void tst_QAbstractProxyModel::itemData()
     QFETCH(QModelIndex, index);
     QFETCH(int, count);
     SubQAbstractProxyModel model;
-    QCOMPARE(model.itemData(index).count(), count);
+    QCOMPARE(model.itemData(index).size(), count);
 }
 
 void tst_QAbstractProxyModel::mapFromSource_data()
@@ -610,28 +617,30 @@ void tst_QAbstractProxyModel::sourceModelBinding()
     SubQAbstractProxyModel proxy;
     QStandardItemModel model1;
     QStandardItemModel model2;
-    QTestPrivate::testReadWritePropertyBasics<QAbstractProxyModel, QAbstractItemModel *>(
+    const char *lhs;
+    const char *rhs;
+
+    auto printOnFailure = qScopeGuard([&] {
+            qDebug("Failed %s - %s test", lhs, rhs);
+        });
+    lhs = "model";
+    rhs = "model";
+    QTestPrivate::testReadWritePropertyBasics<SubQAbstractProxyModel, QAbstractItemModel *>(
             proxy, &model1, &model2, "sourceModel");
-    if (QTest::currentTestFailed()) {
-        qDebug("Failed model - model test");
-        return;
-    }
 
     proxy.setSourceModel(&model2);
-    QTestPrivate::testReadWritePropertyBasics<QAbstractProxyModel, QAbstractItemModel *>(
+    lhs = "model";
+    rhs = "nullptr";
+    QTestPrivate::testReadWritePropertyBasics<SubQAbstractProxyModel, QAbstractItemModel *>(
             proxy, &model1, nullptr, "sourceModel");
-    if (QTest::currentTestFailed()) {
-        qDebug("Failed model - nullptr test");
-        return;
-    }
 
     proxy.setSourceModel(&model1);
-    QTestPrivate::testReadWritePropertyBasics<QAbstractProxyModel, QAbstractItemModel *>(
+    lhs = "nullptr";
+    rhs = "model";
+    QTestPrivate::testReadWritePropertyBasics<SubQAbstractProxyModel, QAbstractItemModel *>(
             proxy, nullptr, &model2, "sourceModel");
-    if (QTest::currentTestFailed()) {
-        qDebug("Failed nullptr - model test");
-        return;
-    }
+
+    printOnFailure.dismiss();
 }
 
 QTEST_MAIN(tst_QAbstractProxyModel)