diff options
author | J-P Nurmi <j-p.nurmi@nokia.com> | 2012-09-06 13:30:13 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-09-06 18:21:32 +0200 |
commit | 464ff857641211e7e4794a1b711a2ecc77594887 (patch) | |
tree | 218c196223a6a849aad7c8b1e0e10e190bdf2911 /tests | |
parent | 1a0f61613db908fa458d21f06d287f0e171a4a47 (diff) |
Attempt to fix tst_QQuickListView::sectionsDelegate_headerVisibility()
Task-number: QTBUG-24395
Change-Id: I07b0fc17566e86dcebf913721f293378cf15466b
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
Reviewed-by: Caroline Chao <caroline.chao@nokia.com>
Diffstat (limited to 'tests')
-rw-r--r-- | tests/auto/quick/qquicklistview/tst_qquicklistview.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/tests/auto/quick/qquicklistview/tst_qquicklistview.cpp b/tests/auto/quick/qquicklistview/tst_qquicklistview.cpp index fabba8f170..c2bcd54c48 100644 --- a/tests/auto/quick/qquicklistview/tst_qquicklistview.cpp +++ b/tests/auto/quick/qquicklistview/tst_qquicklistview.cpp @@ -2168,8 +2168,6 @@ void tst_QQuickListView::sectionsDragOutsideBounds() void tst_QQuickListView::sectionsDelegate_headerVisibility() { - QSKIP("QTBUG-24395"); - QQuickView *window = createView(); QaimModel model; @@ -2179,7 +2177,8 @@ void tst_QQuickListView::sectionsDelegate_headerVisibility() window->rootContext()->setContextProperty("testModel", &model); window->setSource(testFileUrl("listview-sections_delegate.qml")); window->show(); - qApp->processEvents(); + window->requestActivateWindow(); + QTest::qWaitForWindowActive(window); QQuickListView *listview = findItem<QQuickListView>(window->rootObject(), "list"); QTRY_VERIFY(listview != 0); @@ -2191,10 +2190,10 @@ void tst_QQuickListView::sectionsDelegate_headerVisibility() // ensure section header is maintained in view listview->setCurrentIndex(20); QTRY_COMPARE(QQuickItemPrivate::get(listview)->polishScheduled, false); - QTRY_COMPARE(listview->contentY(), 200.0); + QTRY_VERIFY(qFuzzyCompare(listview->contentY(), 200.0)); QTRY_VERIFY(listview->isMoving() == false); listview->setCurrentIndex(0); - QTRY_COMPARE(listview->contentY(), 0.0); + QTRY_VERIFY(qFuzzyIsNull(listview->contentY())); delete window; } |