b3534be · unity8 · git.iko.soy

git.iko.soy/unity8

Clean up the tests

commitb3534be56b14f24c981a5701dee34f840125e681 authorMichal Hruby <michal.mhr@gmail.com> dateThu 18 Jul 2013, 22:29 (13 years ago) parent5cc363e

2 files changed+38−24

compare with xenial

unifiedsplit

tests/plugins/ListViewWithPageHeader/listviewwithpageheadertest.cpp+19 tests/plugins/ListViewWithPageHeader/listviewwithpageheadertestsection.cpp+19−24

tests/plugins/ListViewWithPageHeader/listviewwithpageheadertest.cpp+19

@@ -991,6 +991,25 @@ private Q_SLOTS:

991991 QCOMPARE(lvwph->m_headerItemShownHeight, 50.);

992992 }

993993

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+

9941013 void testRemoveItemsAtTop()

9951014 {

9961015 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:

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

771771 }

772772

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−

797773 void testInsertItemsStealSectionItem()

798774 {

799775 QMetaObject::invokeMethod(model, "insertItem", Q_ARG(QVariant, 1), Q_ARG(QVariant, 125), Q_ARG(QVariant, "Regular"));

@@ -1145,6 +1121,25 @@ private Q_SLOTS:

11451121 QCOMPARE(lvwph->m_topSectionItem->y(), -23.);

11461122 }

11471123

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+

11481143 void testRemoveItemsAtTop()

11491144 {

11501145 QMetaObject::invokeMethod(model, "removeItems", Q_ARG(QVariant, 0), Q_ARG(QVariant, 2));