git.iko.soy/unity8
on xenial help sign in
Make tests more stable in Qt 5.0
a17a20fAlbert Astals
tests/plugins/ListViewWithPageHeader/listviewwithpageheadertest.cpp+14−17
compare with xenial
unifiedsplit
@@ -47,6 +47,20 @@ private Q_SLOTS:
47 QVERIFY(otherDelegate);
47 QVERIFY(otherDelegate);
48 view->show();
48 view->show();
49 QTest::qWaitForWindowExposed(view);
49 QTest::qWaitForWindowExposed(view);
50+
51+ QTRY_COMPARE(lvwph->m_visibleItems.count(), 4);
52+ QCOMPARE(lvwph->m_firstVisibleIndex, 0);
53+ verifyItem(0, 50., 150., false);
54+ verifyItem(1, 200., 200., false);
55+ verifyItem(2, 400., 350., false);
56+ verifyItem(3, 750., 350., true);
57+ QCOMPARE(lvwph->m_minYExtent, 0.);
58+ QCOMPARE(lvwph->m_clipItem->y(), 0.);
59+ QCOMPARE(lvwph->m_clipItem->clip(), false);
60+ QCOMPARE(lvwph->m_headerItem->y(), 0.);
61+ QCOMPARE(lvwph->m_headerItem->height(), 50.);
62+ QCOMPARE(lvwph->contentY(), 0.);
63+ QCOMPARE(lvwph->m_headerItemShownHeight, 0.);
50 }
64 }
51
65
52 void cleanup()
66 void cleanup()
@@ -113,23 +127,6 @@ private Q_SLOTS:
113 // Nothing, init/cleanup already tests this
127 // Nothing, init/cleanup already tests this
114 }
128 }
115
129
116− void testInitialLayout()
117− {
118− QTRY_COMPARE(lvwph->m_visibleItems.count(), 4);
119− QCOMPARE(lvwph->m_firstVisibleIndex, 0);
120− verifyItem(0, 50., 150., false);
121− verifyItem(1, 200., 200., false);
122− verifyItem(2, 400., 350., false);
123− verifyItem(3, 750., 350., true);
124− QCOMPARE(lvwph->m_minYExtent, 0.);
125− QCOMPARE(lvwph->m_clipItem->y(), 0.);
126− QCOMPARE(lvwph->m_clipItem->clip(), false);
127− QCOMPARE(lvwph->m_headerItem->y(), 0.);
128− QCOMPARE(lvwph->m_headerItem->height(), 50.);
129− QCOMPARE(lvwph->contentY(), 0.);
130− QCOMPARE(lvwph->m_headerItemShownHeight, 0.);
131− }
132−
133 void testDrag1PixelUp()
130 void testDrag1PixelUp()
134 {
131 {
135 lvwph->setContentY(lvwph->contentY() + 1);
132 lvwph->setContentY(lvwph->contentY() + 1);