1aef4e8 · unity8 · git.iko.soy

git.iko.soy/unity8

on xenial help sign in

QSKPI instead of comment

1aef4e8Albert Astals13 years ago

tests/plugins/ListViewWithPageHeader/listviewwithpageheadertest.cpp+54−52

compare with xenial

unifiedsplit

@@ -1248,58 +1248,60 @@ private Q_SLOTS:

1248 QCOMPARE(lvwph->m_headerItemShownHeight, 0.);

1249 }

1250

1251+ void testShowHeaderHalfShown()

1252+ {

1253+#if (QT_VERSION < QT_VERSION_CHECK(5, 1, 0))

1251−// TODO This test is extremely unstable in 5.0.x, reenable once we have 5.1.x

1254+ QSKIP("This test is extremely unstable in 5.0.x");

1252−// void testShowHeaderHalfShown()

1255+#endif

1253−// {

1254−// changeContentY(20);

1256+ changeContentY(20);

1255−//

1257+

1256−// QTRY_COMPARE(lvwph->m_visibleItems.count(), 4);

1258+ QTRY_COMPARE(lvwph->m_visibleItems.count(), 4);

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

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

1258−// verifyItem(0, 30., 150., false);

1260+ verifyItem(0, 30., 150., false);

1259−// verifyItem(1, 180, 200., false);

1261+ verifyItem(1, 180, 200., false);

1260−// verifyItem(2, 380, 350., false);

1262+ verifyItem(2, 380, 350., false);

1261−// verifyItem(3, 730, 350., true);

1263+ verifyItem(3, 730, 350., true);

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

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

1263−// QCOMPARE(lvwph->m_clipItem->y(), 20.);

1265+ QCOMPARE(lvwph->m_clipItem->y(), 20.);

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

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

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

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

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

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

1267−// QCOMPARE(lvwph->contentY(), 20.);

1269+ QCOMPARE(lvwph->contentY(), 20.);

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

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

1269−//

1271+

1270−// lvwph->showHeader();

1272+ lvwph->showHeader();

1271−//

1273+

1272−// QTRY_VERIFY(!lvwph->m_headerShowAnimation->isRunning());

1274+ QTRY_VERIFY(!lvwph->m_headerShowAnimation->isRunning());

1273−// QTRY_COMPARE(lvwph->m_visibleItems.count(), 4);

1275+ QTRY_COMPARE(lvwph->m_visibleItems.count(), 4);

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

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

1275−// verifyItem(0, -20., 150., false);

1277+ verifyItem(0, -20., 150., false);

1276−// verifyItem(1, 130, 200., false);

1278+ verifyItem(1, 130, 200., false);

1277−// verifyItem(2, 330, 350., false);

1279+ verifyItem(2, 330, 350., false);

1278−// verifyItem(3, 680, 350., true);

1280+ verifyItem(3, 680, 350., true);

1279−// QCOMPARE(lvwph->m_minYExtent, 20.);

1281+ QCOMPARE(lvwph->m_minYExtent, 20.);

1280−// QCOMPARE(lvwph->m_clipItem->y(), 50.);

1282+ QCOMPARE(lvwph->m_clipItem->y(), 50.);

1281−// QCOMPARE(lvwph->m_clipItem->clip(), true);

1283+ QCOMPARE(lvwph->m_clipItem->clip(), true);

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

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

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

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

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

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

1285−// QCOMPARE(lvwph->m_headerItemShownHeight, 50.);

1287+ QCOMPARE(lvwph->m_headerItemShownHeight, 50.);

1286−//

1288+

1287−// scrollToTop();

1289+ scrollToTop();

1288−//

1290+

1289−// QTRY_COMPARE(lvwph->m_visibleItems.count(), 4);

1291+ QTRY_COMPARE(lvwph->m_visibleItems.count(), 4);

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

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

1291−// verifyItem(0, 50., 150., false);

1293+ verifyItem(0, 50., 150., false);

1292−// verifyItem(1, 200., 200., false);

1294+ verifyItem(1, 200., 200., false);

1293−// verifyItem(2, 400., 350., false);

1295+ verifyItem(2, 400., 350., false);

1294−// verifyItem(3, 750, 350., true);

1296+ verifyItem(3, 750, 350., true);

1295−// QCOMPARE(lvwph->m_minYExtent, 20.);

1297+ QCOMPARE(lvwph->m_minYExtent, 20.);

1296−// QCOMPARE(lvwph->m_clipItem->y(), -20.);

1298+ QCOMPARE(lvwph->m_clipItem->y(), -20.);

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

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

1298−// QCOMPARE(lvwph->m_headerItem->y(), -20.);

1300+ QCOMPARE(lvwph->m_headerItem->y(), -20.);

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

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

1300−// QCOMPARE(lvwph->contentY(), -20.);

1302+ QCOMPARE(lvwph->contentY(), -20.);

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

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

1302−// }

1304+ }

1303

1305

1304 void testShowHeaderAtBottom()

1306 void testShowHeaderAtBottom()

1305 {

1307 {

tests/plugins/ListViewWithPageHeader/listviewwithpageheadertestsection.cpp+56−54

@@ -1407,60 +1407,62 @@ private Q_SLOTS:

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

1408 }

1409

1410+ void testShowHeaderHalfShown()

1411+ {

1412+#if (QT_VERSION < QT_VERSION_CHECK(5, 1, 0))

1410− // TODO This test is extremely unstable in 5.0.x, reenable once we have 5.1.x

1413+ QSKIP("This test is extremely unstable in 5.0.x");

1411−// void testShowHeaderHalfShown()

1414+#endif

1412−// {

1413−// changeContentY(20);

1415+ changeContentY(20);

1414−//

1416+

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

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

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

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

1417−// verifyItem(0, 30., 190., false, "Agressive", false);

1419+ verifyItem(0, 30., 190., false, "Agressive", false);

1418−// verifyItem(1, 220, 240., false, "Regular", false);

1420+ verifyItem(1, 220, 240., false, "Regular", false);

1419−// verifyItem(2, 460, 390., false, "Mild", false);

1421+ verifyItem(2, 460, 390., false, "Mild", false);

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

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

1421−// QCOMPARE(lvwph->m_clipItem->y(), 20.);

1423+ QCOMPARE(lvwph->m_clipItem->y(), 20.);

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

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

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

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

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

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

1425−// QCOMPARE(lvwph->contentY(), 20.);

1427+ QCOMPARE(lvwph->contentY(), 20.);

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

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

1427−// QVERIFY(QQuickItemPrivate::get(lvwph->m_topSectionItem)->culled);

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

1428−//

1430+

1429−// lvwph->showHeader();

1431+ lvwph->showHeader();

1430−//

1432+

1431−// QTRY_VERIFY(!lvwph->m_headerShowAnimation->isRunning());

1433+ QTRY_VERIFY(!lvwph->m_headerShowAnimation->isRunning());

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

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

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

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

1434−// verifyItem(0, -20., 190., false, "Agressive", true);

1436+ verifyItem(0, -20., 190., false, "Agressive", true);

1435−// verifyItem(1, 170, 240., false, "Regular", false);

1437+ verifyItem(1, 170, 240., false, "Regular", false);

1436−// verifyItem(2, 410, 390., false, "Mild", false);

1438+ verifyItem(2, 410, 390., false, "Mild", false);

1437−// QCOMPARE(lvwph->m_minYExtent, 20.);

1439+ QCOMPARE(lvwph->m_minYExtent, 20.);

1438−// QCOMPARE(lvwph->m_clipItem->y(), 50.);

1440+ QCOMPARE(lvwph->m_clipItem->y(), 50.);

1439−// QCOMPARE(lvwph->m_clipItem->clip(), true);

1441+ QCOMPARE(lvwph->m_clipItem->clip(), true);

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

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

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

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

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

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

1443−// QCOMPARE(lvwph->m_headerItemShownHeight, 50.);

1445+ QCOMPARE(lvwph->m_headerItemShownHeight, 50.);

1444−// QVERIFY(!QQuickItemPrivate::get(lvwph->m_topSectionItem)->culled);

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

1445−// QCOMPARE(section(lvwph->m_topSectionItem), QString("Agressive"));

1447+ QCOMPARE(section(lvwph->m_topSectionItem), QString("Agressive"));

1446−// QCOMPARE(lvwph->m_topSectionItem->y(), 0.);

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

1447−//

1449+

1448−// scrollToTop();

1450+ scrollToTop();

1449−//

1451+

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

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

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

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

1452−// verifyItem(0, 50., 190., false, "Agressive", false);

1454+ verifyItem(0, 50., 190., false, "Agressive", false);

1453−// verifyItem(1, 240., 240., false, "Regular", false);

1455+ verifyItem(1, 240., 240., false, "Regular", false);

1454−// verifyItem(2, 480., 390., false, "Mild", false);

1456+ verifyItem(2, 480., 390., false, "Mild", false);

1455−// QCOMPARE(lvwph->m_minYExtent, 20.);

1457+ QCOMPARE(lvwph->m_minYExtent, 20.);

1456−// QCOMPARE(lvwph->m_clipItem->y(), -20.);

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

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

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

1458−// QCOMPARE(lvwph->m_headerItem->y(), -20.);

1460+ QCOMPARE(lvwph->m_headerItem->y(), -20.);

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

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

1460−// QCOMPARE(lvwph->contentY(), -20.);

1462+ QCOMPARE(lvwph->contentY(), -20.);

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

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

1462−// QVERIFY(QQuickItemPrivate::get(lvwph->m_topSectionItem)->culled);

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

1463−// }

1465+ }

1464

1466

1465 void testShowHeaderCloseToTheTop()

1467 void testShowHeaderCloseToTheTop()

1466 {

1468 {