diff options
| author | Martin Jones <martin.jones@nokia.com> | 2011-11-09 09:06:39 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-11-09 08:23:57 +0100 |
| commit | 15547ac366bdfd6f35779995b5d56df669b5e564 (patch) | |
| tree | ebcd79f011e34992eca28f3a387fc9b80119fc2f /tests/auto/declarative/qquickgridview | |
| parent | 89eea1765625c59a4362e600e4e0f99f261706bc (diff) | |
tst_QSGGridView enforceRange_rightToLeft fails
Change 9bd6361400a2a4e4045a090de73d70082cc6d1bf corrected the
highlight range for right to left layout, i.e. positioned relative
to the right. This change fixes the autotest to account for this and
fixes flicking in StrictlyEnforceRange mode with RTL layout.
Task-number: QTBUG-22162
Change-Id: I133b7e647883e51783bcf54111871451a3a7e67f
Reviewed-by: Bea Lam <bea.lam@nokia.com>
Diffstat (limited to 'tests/auto/declarative/qquickgridview')
| -rw-r--r-- | tests/auto/declarative/qquickgridview/tst_qquickgridview.cpp | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/tests/auto/declarative/qquickgridview/tst_qquickgridview.cpp b/tests/auto/declarative/qquickgridview/tst_qquickgridview.cpp index 5f3842a660..9492605359 100644 --- a/tests/auto/declarative/qquickgridview/tst_qquickgridview.cpp +++ b/tests/auto/declarative/qquickgridview/tst_qquickgridview.cpp @@ -2356,18 +2356,17 @@ void tst_QQuickGridView::enforceRange_rightToLeft() QQuickGridView *gridview = findItem<QQuickGridView>(canvas->rootObject(), "grid"); QTRY_VERIFY(gridview != 0); - QTRY_COMPARE(gridview->preferredHighlightBegin(), 100.0); - QTRY_COMPARE(gridview->preferredHighlightEnd(), 100.0); - QTRY_COMPARE(gridview->highlightRangeMode(), QQuickGridView::StrictlyEnforceRange); + QCOMPARE(gridview->preferredHighlightBegin(), 100.0); + QCOMPARE(gridview->preferredHighlightEnd(), 100.0); + QCOMPARE(gridview->highlightRangeMode(), QQuickGridView::StrictlyEnforceRange); QQuickItem *contentItem = gridview->contentItem(); - QTRY_VERIFY(contentItem != 0); + QVERIFY(contentItem != 0); // view should be positioned at the top of the range. QQuickItem *item = findItem<QQuickItem>(contentItem, "wrapper", 0); - QTRY_VERIFY(item); - QEXPECT_FAIL("", "QTBUG-22162", Abort); - QTRY_COMPARE(gridview->contentX(), -100.); + QVERIFY(item); + QTRY_COMPARE(gridview->contentX(), -140.); QTRY_COMPARE(gridview->contentY(), 0.0); QQuickText *name = findItem<QQuickText>(contentItem, "textName", 0); @@ -2378,11 +2377,11 @@ void tst_QQuickGridView::enforceRange_rightToLeft() QTRY_COMPARE(number->text(), model.number(0)); // Check currentIndex is updated when contentItem moves - gridview->setContentX(-200); + gridview->setContentX(-240); QTRY_COMPARE(gridview->currentIndex(), 3); gridview->setCurrentIndex(7); - QTRY_COMPARE(gridview->contentX(), -300.); + QTRY_COMPARE(gridview->contentX(), -340.); QTRY_COMPARE(gridview->contentY(), 0.0); TestModel model2; |