on xenial help sign in
Make tests more stable in Qt 5.0

by bringing the initial test layout to the init() function so it's always exectued and the rest of tests start from a "stable" position

commita17a20f8749db70ccc41a65105f1dbe6df3aab8d authorAlbert Astals <albert.astals@canonical.com> dateFri 14 Jun 2013, 12:20 (13 years ago) parent7e59aff
1 file changed+14−17
tests/plugins/ListViewWithPageHeader/listviewwithpageheadertest.cpp+14−17
tests/plugins/ListViewWithPageHeader/listviewwithpageheadertest.cpp+14−17
@@ -47,6 +47,20 @@ private Q_SLOTS:
4747 QVERIFY(otherDelegate);
4848 view->show();
4949 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.);
5064 }
5165
5266 void cleanup()
@@ -113,23 +127,6 @@ private Q_SLOTS:
113127 // Nothing, init/cleanup already tests this
114128 }
115129
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−
133130 void testDrag1PixelUp()
134131 {
135132 lvwph->setContentY(lvwph->contentY() + 1);