diff options
author | Mitch Curtis <mitch.curtis@qt.io> | 2022-06-09 18:22:12 +0800 |
---|---|---|
committer | Mitch Curtis <mitch.curtis@qt.io> | 2024-03-21 17:41:29 +0800 |
commit | 617476d45bab183741ee0a1579d1b2b6f58658ce (patch) | |
tree | b5945bb4087ce342b56ae03818805d5be030be6e /tests/auto/quick/qquicklistview/tst_qquicklistview.cpp | |
parent | eaad950651c237708c26f3931963c633077ace01 (diff) |
quicktestutils: rename delegateVisible to isDelegateVisible
Because it's the convention.
Pick-to: 6.5 6.6 6.7
Change-Id: I1d3d53f5c051ede0b011c1daa9d1019cad8875f8
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Diffstat (limited to 'tests/auto/quick/qquicklistview/tst_qquicklistview.cpp')
-rw-r--r-- | tests/auto/quick/qquicklistview/tst_qquicklistview.cpp | 134 |
1 files changed, 67 insertions, 67 deletions
diff --git a/tests/auto/quick/qquicklistview/tst_qquicklistview.cpp b/tests/auto/quick/qquicklistview/tst_qquicklistview.cpp index d3d4c1eb67..48171266de 100644 --- a/tests/auto/quick/qquicklistview/tst_qquicklistview.cpp +++ b/tests/auto/quick/qquicklistview/tst_qquicklistview.cpp @@ -1173,7 +1173,7 @@ void tst_QQuickListView::removed_more(const QUrl &source, QQuickItemView::Vertic int firstVisibleIndex = -1; for (int i=0; i<items.size(); i++) { QQuickItem *item = findItem<QQuickItem>(contentItem, "wrapper", i); - if (item && delegateVisible(item)) { + if (item && isDelegateVisible(item)) { firstVisibleIndex = i; break; } @@ -1405,7 +1405,7 @@ void tst_QQuickListView::moved(const QUrl &source, QQuickItemView::VerticalLayou int firstVisibleIndex = -1; for (int i=0; i<items.size(); i++) { QQuickItem *item = findItem<QQuickItem>(contentItem, "wrapper", i); - if (item && delegateVisible(item)) { + if (item && isDelegateVisible(item)) { firstVisibleIndex = i; break; } @@ -2898,9 +2898,9 @@ void tst_QQuickListView::currentIndex() // moving currentItem out of view should make it invisible listview->setCurrentIndex(0); - QTRY_VERIFY(delegateVisible(listview->currentItem())); + QTRY_VERIFY(isDelegateVisible(listview->currentItem())); listview->setContentY(200); - QTRY_VERIFY(!delegateVisible(listview->currentItem())); + QTRY_VERIFY(!isDelegateVisible(listview->currentItem())); // empty model should reset currentIndex to -1 QaimModel emptyModel; @@ -3132,37 +3132,37 @@ void tst_QQuickListView::itemListFlicker() QQuickItem *item = findItem<QQuickItem>(contentItem, "item1"); QVERIFY(item); - QVERIFY(delegateVisible(item)); + QVERIFY(isDelegateVisible(item)); item = findItem<QQuickItem>(contentItem, "item2"); QVERIFY(item); - QVERIFY(delegateVisible(item)); + QVERIFY(isDelegateVisible(item)); item = findItem<QQuickItem>(contentItem, "item3"); QVERIFY(item); - QVERIFY(delegateVisible(item)); + QVERIFY(isDelegateVisible(item)); listview->setCurrentIndex(1); item = findItem<QQuickItem>(contentItem, "item1"); QVERIFY(item); - QVERIFY(delegateVisible(item)); + QVERIFY(isDelegateVisible(item)); item = findItem<QQuickItem>(contentItem, "item2"); QVERIFY(item); - QVERIFY(delegateVisible(item)); + QVERIFY(isDelegateVisible(item)); item = findItem<QQuickItem>(contentItem, "item3"); QVERIFY(item); - QVERIFY(delegateVisible(item)); + QVERIFY(isDelegateVisible(item)); listview->setCurrentIndex(2); item = findItem<QQuickItem>(contentItem, "item1"); QVERIFY(item); - QVERIFY(delegateVisible(item)); + QVERIFY(isDelegateVisible(item)); item = findItem<QQuickItem>(contentItem, "item2"); QVERIFY(item); - QVERIFY(delegateVisible(item)); + QVERIFY(isDelegateVisible(item)); item = findItem<QQuickItem>(contentItem, "item3"); QVERIFY(item); - QVERIFY(delegateVisible(item)); + QVERIFY(isDelegateVisible(item)); } void tst_QQuickListView::cacheBuffer() @@ -4407,7 +4407,7 @@ void tst_QQuickListView::resizeView() if (!item) qWarning() << "Item" << i << "not found"; QTRY_VERIFY(item); QTRY_COMPARE(item->y(), i*20.); - QCOMPARE(delegateVisible(item), i < 11); // inside view visible, outside not visible + QCOMPARE(isDelegateVisible(item), i < 11); // inside view visible, outside not visible } // ensure items outside view become invisible @@ -4420,7 +4420,7 @@ void tst_QQuickListView::resizeView() if (!item) qWarning() << "Item" << i << "not found"; QTRY_VERIFY(item); QTRY_COMPARE(item->y(), i*20.); - QCOMPARE(delegateVisible(item), i < 6); // inside view visible, outside not visible + QCOMPARE(isDelegateVisible(item), i < 6); // inside view visible, outside not visible } } @@ -6496,30 +6496,30 @@ void tst_QQuickListView::unrequestedVisibility() const QString wrapperObjectName = QStringLiteral("wrapper"); QQuickItem *item = findItem<QQuickItem>(leftContent, wrapperObjectName, 1); QVERIFY(item); - QCOMPARE(delegateVisible(item), true); + QCOMPARE(isDelegateVisible(item), true); item = findItem<QQuickItem>(rightContent, wrapperObjectName, 1); QVERIFY(item); - QCOMPARE(delegateVisible(item), false); + QCOMPARE(isDelegateVisible(item), false); item = findItem<QQuickItem>(leftContent, wrapperObjectName, 19); QVERIFY(item); - QCOMPARE(delegateVisible(item), false); + QCOMPARE(isDelegateVisible(item), false); item = findItem<QQuickItem>(rightContent, wrapperObjectName, 19); QVERIFY(item); - QCOMPARE(delegateVisible(item), true); + QCOMPARE(isDelegateVisible(item), true); item = findItem<QQuickItem>(leftContent, wrapperObjectName, 16); QVERIFY(item); - QCOMPARE(delegateVisible(item), true); + QCOMPARE(isDelegateVisible(item), true); item = findItem<QQuickItem>(leftContent, wrapperObjectName, 17); QVERIFY(item); - QCOMPARE(delegateVisible(item), false); + QCOMPARE(isDelegateVisible(item), false); item = findItem<QQuickItem>(rightContent, wrapperObjectName, 3); QVERIFY(item); - QCOMPARE(delegateVisible(item), false); + QCOMPARE(isDelegateVisible(item), false); item = findItem<QQuickItem>(rightContent, wrapperObjectName, 4); QVERIFY(item); - QCOMPARE(delegateVisible(item), true); + QCOMPARE(isDelegateVisible(item), true); rightview->setCurrentIndex(0); @@ -6528,10 +6528,10 @@ void tst_QQuickListView::unrequestedVisibility() item = findItem<QQuickItem>(leftContent, wrapperObjectName, 1); QVERIFY(item); - QCOMPARE(delegateVisible(item), true); + QCOMPARE(isDelegateVisible(item), true); item = findItem<QQuickItem>(rightContent, wrapperObjectName, 1); QVERIFY(item); - QTRY_COMPARE(delegateVisible(item), true); + QTRY_COMPARE(isDelegateVisible(item), true); QVERIFY(!findItem<QQuickItem>(leftContent, wrapperObjectName, 19)); QVERIFY(!findItem<QQuickItem>(rightContent, wrapperObjectName, 19)); @@ -6543,123 +6543,123 @@ void tst_QQuickListView::unrequestedVisibility() item = findItem<QQuickItem>(leftContent, wrapperObjectName, 1); QVERIFY(item); - QTRY_COMPARE(delegateVisible(item), false); + QTRY_COMPARE(isDelegateVisible(item), false); item = findItem<QQuickItem>(rightContent, wrapperObjectName, 1); QVERIFY(item); - QCOMPARE(delegateVisible(item), true); + QCOMPARE(isDelegateVisible(item), true); item = findItem<QQuickItem>(leftContent, wrapperObjectName, 19); QVERIFY(item); - QCOMPARE(delegateVisible(item), true); + QCOMPARE(isDelegateVisible(item), true); item = findItem<QQuickItem>(rightContent, wrapperObjectName, 19); QVERIFY(item); - QCOMPARE(delegateVisible(item), false); + QCOMPARE(isDelegateVisible(item), false); item = findItem<QQuickItem>(leftContent, wrapperObjectName, 3); QVERIFY(item); - QCOMPARE(delegateVisible(item), false); + QCOMPARE(isDelegateVisible(item), false); item = findItem<QQuickItem>(leftContent, wrapperObjectName, 4); QVERIFY(item); - QCOMPARE(delegateVisible(item), true); + QCOMPARE(isDelegateVisible(item), true); item = findItem<QQuickItem>(rightContent, wrapperObjectName, 16); QVERIFY(item); - QCOMPARE(delegateVisible(item), true); + QCOMPARE(isDelegateVisible(item), true); item = findItem<QQuickItem>(rightContent, wrapperObjectName, 17); QVERIFY(item); - QCOMPARE(delegateVisible(item), false); + QCOMPARE(isDelegateVisible(item), false); model.moveItems(19, 1, 1); QVERIFY(QQuickTest::qWaitForPolish(leftview)); QTRY_VERIFY((item = findItem<QQuickItem>(leftContent, wrapperObjectName, 1))); - QCOMPARE(delegateVisible(item), false); + QCOMPARE(isDelegateVisible(item), false); item = findItem<QQuickItem>(rightContent, wrapperObjectName, 1); QVERIFY(item); - QCOMPARE(delegateVisible(item), true); + QCOMPARE(isDelegateVisible(item), true); item = findItem<QQuickItem>(leftContent, wrapperObjectName, 19); QVERIFY(item); - QCOMPARE(delegateVisible(item), true); + QCOMPARE(isDelegateVisible(item), true); item = findItem<QQuickItem>(rightContent, wrapperObjectName, 19); QVERIFY(item); - QCOMPARE(delegateVisible(item), false); + QCOMPARE(isDelegateVisible(item), false); item = findItem<QQuickItem>(leftContent, wrapperObjectName, 4); QVERIFY(item); - QCOMPARE(delegateVisible(item), false); + QCOMPARE(isDelegateVisible(item), false); item = findItem<QQuickItem>(leftContent, wrapperObjectName, 5); QVERIFY(item); - QCOMPARE(delegateVisible(item), true); + QCOMPARE(isDelegateVisible(item), true); item = findItem<QQuickItem>(rightContent, wrapperObjectName, 16); QVERIFY(item); - QCOMPARE(delegateVisible(item), true); + QCOMPARE(isDelegateVisible(item), true); item = findItem<QQuickItem>(rightContent, wrapperObjectName, 17); QVERIFY(item); - QCOMPARE(delegateVisible(item), false); + QCOMPARE(isDelegateVisible(item), false); model.moveItems(3, 4, 1); QVERIFY(QQuickTest::qWaitForPolish(leftview)); item = findItem<QQuickItem>(leftContent, wrapperObjectName, 4); QVERIFY(item); - QCOMPARE(delegateVisible(item), false); + QCOMPARE(isDelegateVisible(item), false); item = findItem<QQuickItem>(leftContent, wrapperObjectName, 5); QVERIFY(item); - QCOMPARE(delegateVisible(item), true); + QCOMPARE(isDelegateVisible(item), true); item = findItem<QQuickItem>(rightContent, wrapperObjectName, 16); QVERIFY(item); - QCOMPARE(delegateVisible(item), true); + QCOMPARE(isDelegateVisible(item), true); item = findItem<QQuickItem>(rightContent, wrapperObjectName, 17); QVERIFY(item); - QCOMPARE(delegateVisible(item), false); + QCOMPARE(isDelegateVisible(item), false); model.moveItems(4, 3, 1); QVERIFY(QQuickTest::qWaitForPolish(leftview)); item = findItem<QQuickItem>(leftContent, wrapperObjectName, 4); QVERIFY(item); - QCOMPARE(delegateVisible(item), false); + QCOMPARE(isDelegateVisible(item), false); item = findItem<QQuickItem>(leftContent, wrapperObjectName, 5); QVERIFY(item); - QCOMPARE(delegateVisible(item), true); + QCOMPARE(isDelegateVisible(item), true); item = findItem<QQuickItem>(rightContent, wrapperObjectName, 16); QVERIFY(item); - QCOMPARE(delegateVisible(item), true); + QCOMPARE(isDelegateVisible(item), true); item = findItem<QQuickItem>(rightContent, wrapperObjectName, 17); QVERIFY(item); - QCOMPARE(delegateVisible(item), false); + QCOMPARE(isDelegateVisible(item), false); model.moveItems(16, 17, 1); QVERIFY(QQuickTest::qWaitForPolish(leftview)); item = findItem<QQuickItem>(leftContent, wrapperObjectName, 4); QVERIFY(item); - QCOMPARE(delegateVisible(item), false); + QCOMPARE(isDelegateVisible(item), false); item = findItem<QQuickItem>(leftContent, wrapperObjectName, 5); QVERIFY(item); - QCOMPARE(delegateVisible(item), true); + QCOMPARE(isDelegateVisible(item), true); item = findItem<QQuickItem>(rightContent, wrapperObjectName, 16); QVERIFY(item); - QCOMPARE(delegateVisible(item), true); + QCOMPARE(isDelegateVisible(item), true); item = findItem<QQuickItem>(rightContent, wrapperObjectName, 17); QVERIFY(item); - QCOMPARE(delegateVisible(item), false); + QCOMPARE(isDelegateVisible(item), false); model.moveItems(17, 16, 1); QVERIFY(QQuickTest::qWaitForPolish(leftview)); item = findItem<QQuickItem>(leftContent, wrapperObjectName, 4); QVERIFY(item); - QCOMPARE(delegateVisible(item), false); + QCOMPARE(isDelegateVisible(item), false); item = findItem<QQuickItem>(leftContent, wrapperObjectName, 5); QVERIFY(item); - QCOMPARE(delegateVisible(item), true); + QCOMPARE(isDelegateVisible(item), true); item = findItem<QQuickItem>(rightContent, wrapperObjectName, 16); QVERIFY(item); - QCOMPARE(delegateVisible(item), true); + QCOMPARE(isDelegateVisible(item), true); item = findItem<QQuickItem>(rightContent, wrapperObjectName, 17); QVERIFY(item); - QCOMPARE(delegateVisible(item), false); + QCOMPARE(isDelegateVisible(item), false); } void tst_QQuickListView::populateTransitions() @@ -8257,24 +8257,24 @@ void tst_QQuickListView::displayMargin() QQuickItem *item0 = findItem<QQuickItem>(content, "delegate", 0); QVERIFY(item0); - QCOMPARE(delegateVisible(item0), true); + QCOMPARE(isDelegateVisible(item0), true); // the 14th item should be within the end margin QQuickItem *item14 = findItem<QQuickItem>(content, "delegate", 13); QVERIFY(item14); - QCOMPARE(delegateVisible(item14), true); + QCOMPARE(isDelegateVisible(item14), true); // the 15th item should be outside the end margin QVERIFY(findItem<QQuickItem>(content, "delegate", 14) == nullptr); // the first delegate should still be within the begin margin listview->positionViewAtIndex(3, QQuickListView::Beginning); - QCOMPARE(delegateVisible(item0), true); + QCOMPARE(isDelegateVisible(item0), true); // the first delegate should now be outside the begin margin listview->positionViewAtIndex(4, QQuickListView::Beginning); - QCOMPARE(delegateVisible(item0), false); + QCOMPARE(isDelegateVisible(item0), false); } void tst_QQuickListView::negativeDisplayMargin() @@ -8296,29 +8296,29 @@ void tst_QQuickListView::negativeDisplayMargin() QQuickItem *item = findItem<QQuickItem>(content, "delegate", 0); QVERIFY(item); - QCOMPARE(delegateVisible(item), true); + QCOMPARE(isDelegateVisible(item), true); item = findItem<QQuickItem>(content, "delegate", 7); QVERIFY(item); - QCOMPARE(delegateVisible(item), true); + QCOMPARE(isDelegateVisible(item), true); item = findItem<QQuickItem>(content, "delegate", 8); QVERIFY(item); - QCOMPARE(delegateVisible(item), false); + QCOMPARE(isDelegateVisible(item), false); // Flick until contentY means that delegate8 should be visible listview->setProperty("contentY", 500); item = findItem<QQuickItem>(content, "delegate", 8); QVERIFY(item); - QTRY_COMPARE(delegateVisible(item), true); + QTRY_COMPARE(isDelegateVisible(item), true); listview->setProperty("contentY", 1000); QTRY_VERIFY((item = findItem<QQuickItem>(content, "delegate", 14))); - QTRY_COMPARE(delegateVisible(item), true); + QTRY_COMPARE(isDelegateVisible(item), true); listview->setProperty("contentY", 0); QTRY_VERIFY(item = findItem<QQuickItem>(content, "delegate", 4)); - QTRY_COMPARE(delegateVisible(item), true); + QTRY_COMPARE(isDelegateVisible(item), true); } void tst_QQuickListView::highlightItemGeometryChanges() |