1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tst_AndroidItemModel::setData(): Extend timeout, use PMF connect

Browse Source 
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>
This commit is contained in:
Axel Spoerl 2024-11-13 13:31:59 +01:00 committed by Volker Hilsheimer
parent d63f144733
commit f167150a66
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tests/auto/corelib/platform/androiditemmodel/tst_androiditemmodel.cpp
View File

@ -225,9 +225,7 @@ void tst_AndroidItemModel::setData()
QFETCH(int, column); QFETCH(int, column);
QFETCH(int, role); QFETCH(int, role);
QSignalSpy spy( QSignalSpy spy(qProxy, &QAbstractItemModel::dataChanged);
qProxy,
SIGNAL(dataChanged(const QModelIndex &, const QModelIndex &, const QList<int> &)));
jModel.callMethod<void>("addRow"); jModel.callMethod<void>("addRow");
if (!isList) if (!isList)
@ -238,7 +236,7 @@ void tst_AndroidItemModel::setData()
JQtModelIndex index = jModel.callMethod<JQtModelIndex>("index", row, column, JQtModelIndex()); JQtModelIndex index = jModel.callMethod<JQtModelIndex>("index", row, column, JQtModelIndex());
QVERIFY(jModel.callMethod<jboolean>("setData", index, QJniObject(Void()), role)); 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(); const QList<QVariant> arguments = spy.takeFirst();
QCOMPARE(arguments.size(), 3); QCOMPARE(arguments.size(), 3);
@ -252,7 +250,7 @@ void tst_AndroidItemModel::setData()
QCOMPARE(roles, QList<int>{role}); QCOMPARE(roles, QList<int>{role});
jint jDataChangedCount = jModel.getField<jint>("m_dataChangedCount"); jint jDataChangedCount = jModel.getField<jint>("m_dataChangedCount");
QTRY_COMPARE_WITH_TIMEOUT(jDataChangedCount, 1, 50); QTRY_COMPARE(jDataChangedCount, 1);
} }
void tst_AndroidItemModel::resetModel() void tst_AndroidItemModel::resetModel()