git.iko.soy/unity8
on xenial help sign in
Clean up the tests
b3534beMichal Hruby
tests/plugins/ListViewWithPageHeader/listviewwithpageheadertest.cpp+19
compare with xenial
unifiedsplit
@@ -991,6 +991,25 @@ private Q_SLOTS:
991 QCOMPARE(lvwph->m_headerItemShownHeight, 50.);
991 QCOMPARE(lvwph->m_headerItemShownHeight, 50.);
992 }
992 }
993
993
994+ void testInsertToEmpty()
995+ {
996+ QMetaObject::invokeMethod(model, "removeItems", Q_ARG(QVariant, 0), Q_ARG(QVariant, 6));
997+ QTRY_COMPARE(lvwph->m_visibleItems.count(), 0);
998+ QCOMPARE(lvwph->m_minYExtent, 0.);
999+ QCOMPARE(lvwph->m_clipItem->y(), 0.);
1000+ QCOMPARE(lvwph->m_clipItem->clip(), false);
1001+ QCOMPARE(lvwph->m_headerItem->y(), 0.);
1002+ QCOMPARE(lvwph->m_headerItem->height(), 50.);
1003+ QCOMPARE(lvwph->contentY(), 0.);
1004+
1005+ QMetaObject::invokeMethod(model, "insertItem", Q_ARG(QVariant, 0), Q_ARG(QVariant, 100));
1006+ QMetaObject::invokeMethod(model, "insertItem", Q_ARG(QVariant, 0), Q_ARG(QVariant, 125));
1007+ QTRY_COMPARE(lvwph->m_visibleItems.count(), 2);
1008+ QCOMPARE(lvwph->m_firstVisibleIndex, 0);
1009+ verifyItem(0, 50., 125., false);
1010+ verifyItem(1, 175., 100., false);
1011+ }
1012+
994 void testRemoveItemsAtTop()
1013 void testRemoveItemsAtTop()
995 {
1014 {
996 QMetaObject::invokeMethod(model, "removeItems", Q_ARG(QVariant, 0), Q_ARG(QVariant, 2));
1015 QMetaObject::invokeMethod(model, "removeItems", Q_ARG(QVariant, 0), Q_ARG(QVariant, 2));
tests/plugins/ListViewWithPageHeader/listviewwithpageheadertestsection.cpp+19−24
@@ -770,30 +770,6 @@ private Q_SLOTS:
770 QVERIFY(QQuickItemPrivate::get(lvwph->m_topSectionItem)->culled);
770 QVERIFY(QQuickItemPrivate::get(lvwph->m_topSectionItem)->culled);
771 }
771 }
772
772
773− void testRemoveItems()
774− {
775− QTRY_COMPARE(lvwph->m_visibleItems.count(), 3);
776− QCOMPARE(lvwph->m_firstVisibleIndex, 0);
777− verifyItem(0, 50., 190., false, "Agressive", false);
778− verifyItem(1, 240., 240., false, "Regular", false);
779− verifyItem(2, 480., 390., false, "Mild", false);
780− QMetaObject::invokeMethod(model, "removeItems", Q_ARG(QVariant, 0), Q_ARG(QVariant, 3));
781− QTRY_COMPARE(lvwph->m_visibleItems.count(), 0);
782− QCOMPARE(lvwph->m_minYExtent, 0.);
783− QCOMPARE(lvwph->m_clipItem->y(), 0.);
784− QCOMPARE(lvwph->m_clipItem->clip(), false);
785− QCOMPARE(lvwph->m_headerItem->y(), 0.);
786− QCOMPARE(lvwph->m_headerItem->height(), 50.);
787− QCOMPARE(lvwph->contentY(), 0.);
788−
789− QMetaObject::invokeMethod(model, "insertItem", Q_ARG(QVariant, 0), Q_ARG(QVariant, 100), Q_ARG(QVariant, "Agressive"));
790− QMetaObject::invokeMethod(model, "insertItem", Q_ARG(QVariant, 1), Q_ARG(QVariant, 125), Q_ARG(QVariant, "Regular"));
791− QTRY_COMPARE(lvwph->m_visibleItems.count(), 2);
792− QCOMPARE(lvwph->m_firstVisibleIndex, 0);
793− verifyItem(0, 50., 140., false, "Agressive", false);
794− verifyItem(1, 190., 165., false, "Regular", false);
795− }
796−
797 void testInsertItemsStealSectionItem()
773 void testInsertItemsStealSectionItem()
798 {
774 {
799 QMetaObject::invokeMethod(model, "insertItem", Q_ARG(QVariant, 1), Q_ARG(QVariant, 125), Q_ARG(QVariant, "Regular"));
775 QMetaObject::invokeMethod(model, "insertItem", Q_ARG(QVariant, 1), Q_ARG(QVariant, 125), Q_ARG(QVariant, "Regular"));
@@ -1145,6 +1121,25 @@ private Q_SLOTS:
1145 QCOMPARE(lvwph->m_topSectionItem->y(), -23.);
1121 QCOMPARE(lvwph->m_topSectionItem->y(), -23.);
1146 }
1122 }
1147
1123
1124+ void testInsertToEmpty()
1125+ {
1126+ QMetaObject::invokeMethod(model, "removeItems", Q_ARG(QVariant, 0), Q_ARG(QVariant, 6));
1127+ QTRY_COMPARE(lvwph->m_visibleItems.count(), 0);
1128+ QCOMPARE(lvwph->m_minYExtent, 0.);
1129+ QCOMPARE(lvwph->m_clipItem->y(), 0.);
1130+ QCOMPARE(lvwph->m_clipItem->clip(), false);
1131+ QCOMPARE(lvwph->m_headerItem->y(), 0.);
1132+ QCOMPARE(lvwph->m_headerItem->height(), 50.);
1133+ QCOMPARE(lvwph->contentY(), 0.);
1134+
1135+ QMetaObject::invokeMethod(model, "insertItem", Q_ARG(QVariant, 0), Q_ARG(QVariant, 100), Q_ARG(QVariant, "Agressive"));
1136+ QMetaObject::invokeMethod(model, "insertItem", Q_ARG(QVariant, 1), Q_ARG(QVariant, 125), Q_ARG(QVariant, "Regular"));
1137+ QTRY_COMPARE(lvwph->m_visibleItems.count(), 2);
1138+ QCOMPARE(lvwph->m_firstVisibleIndex, 0);
1139+ verifyItem(0, 50., 140., false, "Agressive", false);
1140+ verifyItem(1, 190., 165., false, "Regular", false);
1141+ }
1142+
1148 void testRemoveItemsAtTop()
1143 void testRemoveItemsAtTop()
1149 {
1144 {
1150 QMetaObject::invokeMethod(model, "removeItems", Q_ARG(QVariant, 0), Q_ARG(QVariant, 2));
1145 QMetaObject::invokeMethod(model, "removeItems", Q_ARG(QVariant, 0), Q_ARG(QVariant, 2));