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

Repair some of tst_qtableview tests on Android

Browse Source 
The view.resize() command has no effect if the requested
size is smaller than the screen. So the view has space for
the whole model. It then won't scroll, so scrolling cannot
be tested.
This patch enlarges the model so that scrolling is always
necessary and thus possible.

Task-number: QTBUG-87407
Pick-to: 6.2 6.3
Change-Id: Ibff512158d9c16be120a69c7328b6d0ae2c3b551
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Rami Potinkara <rami.potinkara@qt.io>
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
This commit is contained in:
Andreas Buhr 2022-02-15 15:50:39 +01:00
parent b39d3cfe30
commit 1ba56134f5
2 changed files with 28 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/auto/widgets/itemviews/qtableview/BLACKLIST
View File

@ -4,9 +4,5 @@ osx
macos
# QTBUG-87407
[rowViewportPosition]
android
[columnViewportPosition]
android
[task191545_dragSelectRows]
android

56
tests/auto/widgets/itemviews/qtableview/tst_qtableview.cpp
View File

@ -2274,46 +2274,46 @@ void tst_QTableView::rowViewportPosition_data()
QTest::addColumn<int>("rowViewportPosition");
QTest::newRow("row 0, scroll per item 0")
<< 10 << 40 << 0 << QAbstractItemView::ScrollPerItem << 0 << 0;
<< 100 << 40 << 0 << QAbstractItemView::ScrollPerItem << 0 << 0;
QTest::newRow("row 1, scroll per item, 0")
<< 10 << 40 << 1 << QAbstractItemView::ScrollPerItem << 0 << 1 * 40;
<< 100 << 40 << 1 << QAbstractItemView::ScrollPerItem << 0 << 1 * 40;
QTest::newRow("row 1, scroll per item, 1")
<< 10 << 40 << 1 << QAbstractItemView::ScrollPerItem << 1 << 0;
<< 100 << 40 << 1 << QAbstractItemView::ScrollPerItem << 1 << 0;
QTest::newRow("row 5, scroll per item, 0")
<< 10 << 40 << 5 << QAbstractItemView::ScrollPerItem << 0 << 5 * 40;
<< 100 << 40 << 5 << QAbstractItemView::ScrollPerItem << 0 << 5 * 40;
QTest::newRow("row 5, scroll per item, 5")
<< 10 << 40 << 5 << QAbstractItemView::ScrollPerItem << 5 << 0;
<< 100 << 40 << 5 << QAbstractItemView::ScrollPerItem << 5 << 0;
QTest::newRow("row 9, scroll per item, 0")
<< 10 << 40 << 9 << QAbstractItemView::ScrollPerItem << 0 << 9 * 40;
<< 100 << 40 << 9 << QAbstractItemView::ScrollPerItem << 0 << 9 * 40;
QTest::newRow("row 9, scroll per item, 5")
<< 10 << 40 << 9 << QAbstractItemView::ScrollPerItem << 5 << 4 * 40;
<< 100 << 40 << 9 << QAbstractItemView::ScrollPerItem << 5 << 4 * 40;
QTest::newRow("row 0, scroll per pixel 0")
<< 10 << 40 << 0 << QAbstractItemView::ScrollPerPixel << 0 << 0;
<< 100 << 40 << 0 << QAbstractItemView::ScrollPerPixel << 0 << 0;
QTest::newRow("row 1, scroll per pixel, 0")
<< 10 << 40 << 1 << QAbstractItemView::ScrollPerPixel << 0 << 1 * 40;
<< 100 << 40 << 1 << QAbstractItemView::ScrollPerPixel << 0 << 1 * 40;
QTest::newRow("row 1, scroll per pixel, 1")
<< 10 << 40 << 1 << QAbstractItemView::ScrollPerPixel << 1 * 40 << 0;
<< 100 << 40 << 1 << QAbstractItemView::ScrollPerPixel << 1 * 40 << 0;
QTest::newRow("row 5, scroll per pixel, 0")
<< 10 << 40 << 5 << QAbstractItemView::ScrollPerPixel << 0 << 5 * 40;
<< 100 << 40 << 5 << QAbstractItemView::ScrollPerPixel << 0 << 5 * 40;
QTest::newRow("row 5, scroll per pixel, 5")
<< 10 << 40 << 5 << QAbstractItemView::ScrollPerPixel << 5 * 40 << 0;
<< 100 << 40 << 5 << QAbstractItemView::ScrollPerPixel << 5 * 40 << 0;
QTest::newRow("row 9, scroll per pixel, 0")
<< 10 << 40 << 9 << QAbstractItemView::ScrollPerPixel << 0 << 9 * 40;
<< 100 << 40 << 9 << QAbstractItemView::ScrollPerPixel << 0 << 9 * 40;
QTest::newRow("row 9, scroll per pixel, 5")
<< 10 << 40 << 9 << QAbstractItemView::ScrollPerPixel << 5 * 40 << 4 * 40;
<< 100 << 40 << 9 << QAbstractItemView::ScrollPerPixel << 5 * 40 << 4 * 40;
}
void tst_QTableView::rowViewportPosition()
@ -2437,46 +2437,46 @@ void tst_QTableView::columnViewportPosition_data()
QTest::addColumn<int>("columnViewportPosition");
QTest::newRow("column 0, scroll per item 0")
<< 10 << 40 << 0 << QAbstractItemView::ScrollPerItem << 0 << 0;
<< 100 << 40 << 0 << QAbstractItemView::ScrollPerItem << 0 << 0;
QTest::newRow("column 1, scroll per item, 0")
<< 10 << 40 << 1 << QAbstractItemView::ScrollPerItem << 0 << 1 * 40;
<< 100 << 40 << 1 << QAbstractItemView::ScrollPerItem << 0 << 1 * 40;
QTest::newRow("column 1, scroll per item, 1")
<< 10 << 40 << 1 << QAbstractItemView::ScrollPerItem << 1 << 0;
<< 100 << 40 << 1 << QAbstractItemView::ScrollPerItem << 1 << 0;
QTest::newRow("column 5, scroll per item, 0")
<< 10 << 40 << 5 << QAbstractItemView::ScrollPerItem << 0 << 5 * 40;
<< 100 << 40 << 5 << QAbstractItemView::ScrollPerItem << 0 << 5 * 40;
QTest::newRow("column 5, scroll per item, 5")
<< 10 << 40 << 5 << QAbstractItemView::ScrollPerItem << 5 << 0;
<< 100 << 40 << 5 << QAbstractItemView::ScrollPerItem << 5 << 0;
QTest::newRow("column 9, scroll per item, 0")
<< 10 << 40 << 9 << QAbstractItemView::ScrollPerItem << 0 << 9 * 40;
<< 100 << 40 << 9 << QAbstractItemView::ScrollPerItem << 0 << 9 * 40;
QTest::newRow("column 9, scroll per item, 5")
<< 10 << 40 << 9 << QAbstractItemView::ScrollPerItem << 5 << 4 * 40;
<< 100 << 40 << 9 << QAbstractItemView::ScrollPerItem << 5 << 4 * 40;
QTest::newRow("column 0, scroll per pixel 0")
<< 10 << 40 << 0 << QAbstractItemView::ScrollPerPixel << 0 << 0;
<< 100 << 40 << 0 << QAbstractItemView::ScrollPerPixel << 0 << 0;
QTest::newRow("column 1, scroll per pixel 0")
<< 10 << 40 << 1 << QAbstractItemView::ScrollPerPixel << 0 << 1 * 40;
<< 100 << 40 << 1 << QAbstractItemView::ScrollPerPixel << 0 << 1 * 40;
QTest::newRow("column 1, scroll per pixel 1")
<< 10 << 40 << 1 << QAbstractItemView::ScrollPerPixel << 1 * 40 << 0;
<< 100 << 40 << 1 << QAbstractItemView::ScrollPerPixel << 1 * 40 << 0;
QTest::newRow("column 5, scroll per pixel 0")
<< 10 << 40 << 5 << QAbstractItemView::ScrollPerPixel << 0 << 5 * 40;
<< 100 << 40 << 5 << QAbstractItemView::ScrollPerPixel << 0 << 5 * 40;
QTest::newRow("column 5, scroll per pixel 5")
<< 10 << 40 << 5 << QAbstractItemView::ScrollPerPixel << 5 * 40 << 0;
<< 100 << 40 << 5 << QAbstractItemView::ScrollPerPixel << 5 * 40 << 0;
QTest::newRow("column 9, scroll per pixel 0")
<< 10 << 40 << 9 << QAbstractItemView::ScrollPerPixel << 0 << 9 * 40;
<< 100 << 40 << 9 << QAbstractItemView::ScrollPerPixel << 0 << 9 * 40;
QTest::newRow("column 9, scroll per pixel 5")
<< 10 << 40 << 9 << QAbstractItemView::ScrollPerPixel << 5 * 40 << 4 * 40;
<< 100 << 40 << 9 << QAbstractItemView::ScrollPerPixel << 5 * 40 << 4 * 40;
}
void tst_QTableView::columnViewportPosition()