5fc7ed6 · unity8 · git.iko.soy

git.iko.soy/unity8

on xenial help sign in

Fix last todo in the test section

5fc7ed6Albert Astals13 years ago

plugins/ListViewWithPageHeader/listviewwithpageheader.cpp+3

compare with xenial

unifiedsplit

@@ -200,6 +200,9 @@ void ListViewWithPageHeader::setDelegate(QQmlComponent *delegate)

200 adjustMinYExtent();

201 setContentY(0);

202 m_clipItem->setY(0);

203+ if (m_topSectionItem) {

204+ QQuickItemPrivate::get(m_topSectionItem)->setCulled(true);

205+ }

203

206

204 m_delegateModel->setDelegate(delegate);

207 m_delegateModel->setDelegate(delegate);

205

208

tests/plugins/ListViewWithPageHeader/listviewwithpageheadertestsection.cpp+38−35

@@ -575,41 +575,44 @@ private Q_SLOTS:

575 QCOMPARE(lvwph->m_topSectionItem->y(), 0.);

576 }

577

578− // TODO

579−// void testChangeDelegateAtBottom()

578+ void testChangeDelegateAtBottom()

580−// {

579+ {

581−// scrollToBottom();

580+ scrollToBottom();

582−// QTRY_COMPARE(lvwph->m_visibleItems.count(), 3);

581+ QTRY_COMPARE(lvwph->m_visibleItems.count(), 3);

583−// QCOMPARE(lvwph->m_firstVisibleIndex, 3);

582+ QCOMPARE(lvwph->m_firstVisibleIndex, 3);

584−// verifyItem(0, -588., 390., true);

583+ verifyItem(0, -588., 390., true, "Bold", true);

585−// verifyItem(1, -198, 350., false);

584+ verifyItem(1, -198, 350., false, QString(), true);

586−// verifyItem(2, 152, 390., false);

585+ verifyItem(2, 152, 390., false, "Lazy", false);

587−// QCOMPARE(lvwph->m_minYExtent, 0.);

586+ QCOMPARE(lvwph->m_minYExtent, 310.);

588−// QCOMPARE(lvwph->m_clipItem->y(), 1458.);

587+ QCOMPARE(lvwph->m_clipItem->y(), 1458.);

589−// QCOMPARE(lvwph->m_clipItem->clip(), false);

588+ QCOMPARE(lvwph->m_clipItem->clip(), false);

590−// QCOMPARE(lvwph->m_headerItem->y(), 0.);

589+ QCOMPARE(lvwph->m_headerItem->y(), 0.);

591−// QCOMPARE(lvwph->m_headerItem->height(), 50.);

590+ QCOMPARE(lvwph->m_headerItem->height(), 50.);

592−// QCOMPARE(lvwph->contentY(), 1458.);

591+ QCOMPARE(lvwph->contentY(), 1458.);

593−// QCOMPARE(lvwph->m_headerItemShownHeight, 0.);

592+ QCOMPARE(lvwph->m_headerItemShownHeight, 0.);

594−//

593+ QVERIFY(!QQuickItemPrivate::get(lvwph->m_topSectionItem)->culled);

594+ QCOMPARE(section(lvwph->m_topSectionItem), QString("Bold"));

595+ QCOMPARE(lvwph->m_topSectionItem->y(), 0.);

596+

595−// lvwph->setDelegate(otherDelegate);

597+ lvwph->setDelegate(otherDelegate);

596−//

598+

597−// QTRY_COMPARE(lvwph->m_visibleItems.count(), 6);

599+ QTRY_COMPARE(lvwph->m_visibleItems.count(), 6);

598−// QCOMPARE(lvwph->m_firstVisibleIndex, 0);

600+ QCOMPARE(lvwph->m_firstVisibleIndex, 0);

599−// verifyItem(0, 50., 35., false);

601+ verifyItem(0, 50., 75., false, "Agressive", false);

600−// verifyItem(1, 85, 35., false);

602+ verifyItem(1, 125, 75., false, "Regular", false);

601−// verifyItem(2, 120, 35., false);

603+ verifyItem(2, 200, 75., false, "Mild", false);

602−// verifyItem(3, 155, 35., false);

604+ verifyItem(3, 275, 75., false, "Bold", false);

603−// verifyItem(4, 190, 35., false);

605+ verifyItem(4, 350, 35., false, QString(), true);

604−// verifyItem(5, 225, 35., false);

606+ verifyItem(5, 385, 75., false, "Lazy", false);

605−// QCOMPARE(lvwph->m_minYExtent, 0.);

607+ QCOMPARE(lvwph->m_minYExtent, 0.);

606−// QCOMPARE(lvwph->m_clipItem->y(), 0.);

608+ QCOMPARE(lvwph->m_clipItem->y(), 0.);

607−// QCOMPARE(lvwph->m_clipItem->clip(), false);

609+ QCOMPARE(lvwph->m_clipItem->clip(), false);

608−// QCOMPARE(lvwph->m_headerItem->y(), 0.);

610+ QCOMPARE(lvwph->m_headerItem->y(), 0.);

609−// QCOMPARE(lvwph->m_headerItem->height(), 50.);

611+ QCOMPARE(lvwph->m_headerItem->height(), 50.);

610−// QCOMPARE(lvwph->contentY(), 0.);

612+ QCOMPARE(lvwph->contentY(), 0.);

611−// QCOMPARE(lvwph->m_headerItemShownHeight, 0.);

613+ QCOMPARE(lvwph->m_headerItemShownHeight, 0.);

614+ QVERIFY(QQuickItemPrivate::get(lvwph->m_topSectionItem)->culled);

612−// }

615+ }

613

616

614 void testGrowHeaderAtTop()

617 void testGrowHeaderAtTop()

615 {

618 {