From f167150a66ee9d363df9436ab8e1a78d76f354b7 Mon Sep 17 00:00:00 2001
From: Axel Spoerl <axel.spoerl@qt.io>
Date: Wed, 13 Nov 2024 13:31:59 +0100
Subject: [PATCH] tst_AndroidItemModel::setData(): Extend timeout, use PMF
 connect

Use QTRY_COMPARE() with default timeout of 5000ms.
This amends 8ec25c9d6b6470c0771fe7b70c22b055ac001fd8.

Task-number: QTBUG-129387
Task-number: QTBUG-130253
Change-Id: I868a69c115dacd92d021381f27bef3430e7afb3c
Reviewed-by: Soheil Armin <soheil.armin@qt.io>
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
---
 .../platform/androiditemmodel/tst_androiditemmodel.cpp    | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/tests/auto/corelib/platform/androiditemmodel/tst_androiditemmodel.cpp b/tests/auto/corelib/platform/androiditemmodel/tst_androiditemmodel.cpp
index 3c6d6bb318d..a8adfaa4d32 100644
--- a/tests/auto/corelib/platform/androiditemmodel/tst_androiditemmodel.cpp
+++ b/tests/auto/corelib/platform/androiditemmodel/tst_androiditemmodel.cpp
@@ -225,9 +225,7 @@ void tst_AndroidItemModel::setData()
     QFETCH(int, column);
     QFETCH(int, role);
 
-    QSignalSpy spy(
-            qProxy,
-            SIGNAL(dataChanged(const QModelIndex &, const QModelIndex &, const QList<int> &)));
+    QSignalSpy spy(qProxy, &QAbstractItemModel::dataChanged);
 
     jModel.callMethod<void>("addRow");
     if (!isList)
@@ -238,7 +236,7 @@ void tst_AndroidItemModel::setData()
 
     JQtModelIndex index = jModel.callMethod<JQtModelIndex>("index", row, column, JQtModelIndex());
     QVERIFY(jModel.callMethod<jboolean>("setData", index, QJniObject(Void()), role));
-    QTRY_COMPARE_WITH_TIMEOUT(spy.count(), 1, 50);
+    QTRY_COMPARE(spy.count(), 1);
 
     const QList<QVariant> arguments = spy.takeFirst();
     QCOMPARE(arguments.size(), 3);
@@ -252,7 +250,7 @@ void tst_AndroidItemModel::setData()
     QCOMPARE(roles, QList<int>{role});
 
     jint jDataChangedCount = jModel.getField<jint>("m_dataChangedCount");
-    QTRY_COMPARE_WITH_TIMEOUT(jDataChangedCount, 1, 50);
+    QTRY_COMPARE(jDataChangedCount, 1);
 }
 
 void tst_AndroidItemModel::resetModel()