AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tst_QHeaderView: replace custom waitFor() function

Browse Source 
replace custom waitFor() function with QTest::qWaitFor() to avoid code
duplication.

Change-Id: I44ebcbfe4c6f6c6f787fb7dbaf958a245bc27fa1
Reviewed-by: Thorbjørn Lund Martsum <tmartsum@gmail.com>
This commit is contained in:
Christian Ehrlicher 2018-05-03 20:06:56 +02:00
parent f02256cce1
commit 0993a9e830
1 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
tests/auto/widgets/itemviews/qheaderview/tst_qheaderview.cpp
View File

@ -2283,7 +2283,7 @@ void tst_QHeaderView::QTBUG6058_reset()
QHeaderView view(Qt::Vertical);
view.setModel(&proxy);
view.show();
QTest::qWait(20);
QVERIFY(QTest::qWaitForWindowExposed(&view));
proxy.setSourceModel(&model1);
QApplication::processEvents();
@ -3294,16 +3294,6 @@ void tst_QHeaderView::testMinMaxSectionSizeNotStretched()
testMinMaxSectionSize(false);
}
static void waitFor(const std::function<bool()> &func)
{
for (int i = 0; i < 100; i++)
{
if (func())
return;
QTest::qWait(10);
}
}
void tst_QHeaderView::testMinMaxSectionSize(bool stretchLastSection)
{
QStandardItemModel m(5, 5);
@ -3341,7 +3331,7 @@ void tst_QHeaderView::testMinMaxSectionSize(bool stretchLastSection)
header.resizeSection(0, sectionSizeMax);
QCOMPARE(header.sectionSize(0), sectionSizeMax);
header.setMaximumSectionSize(defaultSectionSize);
waitFor([&header, defaultSectionSize]() { return header.sectionSize(0) == defaultSectionSize; });
QVERIFY(QTest::qWaitFor([&header, defaultSectionSize]() { return header.sectionSize(0) == defaultSectionSize; }));
QCOMPARE(header.sectionSize(0), defaultSectionSize);
// change section size on min change
@ -3350,7 +3340,7 @@ void tst_QHeaderView::testMinMaxSectionSize(bool stretchLastSection)
header.resizeSection(0, sectionSizeMin);
QCOMPARE(header.sectionSize(0), sectionSizeMin);
header.setMinimumSectionSize(defaultSectionSize);
waitFor([&header, defaultSectionSize]() { return header.sectionSize(0) == defaultSectionSize; });
QVERIFY(QTest::qWaitFor([&header, defaultSectionSize]() { return header.sectionSize(0) == defaultSectionSize; }));
QCOMPARE(header.sectionSize(0), defaultSectionSize);
}