3bc2769 · unity8 · git.iko.soy

git.iko.soy/unity8

on xenial help sign in

Small refactor

3bc2769Albert Astals13 years ago

tests/plugins/ListViewWithPageHeader/listviewwithpageheadertest.cpp+55−113

compare with xenial

unifiedsplit

@@ -28,46 +28,7 @@ class ListViewWithPageHeaderTest : public QObject

28{

29 Q_OBJECT

31−private Q_SLOTS:

31+private:

32−

33− void initTestCase()

34− {

35− }

36−

37− void init()

38− {

39− view = new QQuickView();

40− view->engine()->addImportPath(BUILT_PLUGINS_DIR);

41− view->setSource(QUrl::fromLocalFile(LISTVIEWWITHPAGEHEADER_FOLDER "/test.qml"));

42− lvwph = dynamic_cast<ListViewWithPageHeader*>(view->rootObject()->findChild<QQuickFlickable*>());

43− model = view->rootObject()->findChild<QQuickListModel*>();

44− otherDelegate = view->rootObject()->findChild<QQmlComponent*>();

45− QVERIFY(lvwph);

46− QVERIFY(model);

47− QVERIFY(otherDelegate);

48− view->show();

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.);

64− }

65−

66− void cleanup()

67− {

68− delete view;

69− }

70−

71 void verifyItem(int visibleIndex, qreal pos, qreal height, bool culled)

32 void verifyItem(int visibleIndex, qreal pos, qreal height, bool culled)

72 {

33 {

73 ListViewWithPageHeader::ListItem *item = lvwph->m_visibleItems[visibleIndex];

34 ListViewWithPageHeader::ListItem *item = lvwph->m_visibleItems[visibleIndex];

@@ -83,17 +44,17 @@ private Q_SLOTS:

83 const qreal jump = 25;

44 const qreal jump = 25;

84 while (lvwph->contentY() + jump < dest) {

45 while (lvwph->contentY() + jump < dest) {

85 lvwph->setContentY(lvwph->contentY() + jump);

46 lvwph->setContentY(lvwph->contentY() + jump);

86− QTest::qWait(0);

47+ QTest::qWait(1);

87 }

48 }

88 } else {

49 } else {

89 const qreal jump = -25;

50 const qreal jump = -25;

90 while (lvwph->contentY() + jump > dest) {

51 while (lvwph->contentY() + jump > dest) {

91 lvwph->setContentY(lvwph->contentY() + jump);

52 lvwph->setContentY(lvwph->contentY() + jump);

92− QTest::qWait(0);

53+ QTest::qWait(1);

93 }

54 }

94 }

55 }

95 lvwph->setContentY(dest);

56 lvwph->setContentY(dest);

96− QTest::qWait(0);

57+ QTest::qWait(1);

97 }

58 }

99 void scrollToTop()

60 void scrollToTop()

@@ -105,7 +66,7 @@ private Q_SLOTS:

105 } else {

66 } else {

106 lvwph->setContentY(lvwph->contentY() - 1);

67 lvwph->setContentY(lvwph->contentY() - 1);

107 }

68 }

108− QTest::qWait(0);

69+ QTest::qWait(1);

109 }

70 }

110 }

71 }

111

@@ -118,10 +79,55 @@ private Q_SLOTS:

118 } else {

79 } else {

119 lvwph->setContentY(lvwph->contentY() + 1);

80 lvwph->setContentY(lvwph->contentY() + 1);

120 }

81 }

121− QTest::qWait(0);

82+ QTest::qWait(1);

122 }

83 }

123 }

84 }

124

86+ void verifyInitialTopPosition()

87+ {

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

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

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

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

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

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

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

95+ QCOMPARE(lvwph->m_clipItem->y(), 0.);

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

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

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

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

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

101+ }

102+

103+private Q_SLOTS:

104+

105+ void initTestCase()

106+ {

107+ }

108+

109+ void init()

110+ {

111+ view = new QQuickView();

112+ view->engine()->addImportPath(BUILT_PLUGINS_DIR);

113+ view->setSource(QUrl::fromLocalFile(LISTVIEWWITHPAGEHEADER_FOLDER "/test.qml"));

114+ lvwph = dynamic_cast<ListViewWithPageHeader*>(view->rootObject()->findChild<QQuickFlickable*>());

115+ model = view->rootObject()->findChild<QQuickListModel*>();

116+ otherDelegate = view->rootObject()->findChild<QQmlComponent*>();

117+ QVERIFY(lvwph);

118+ QVERIFY(model);

119+ QVERIFY(otherDelegate);

120+ view->show();

121+ QTest::qWaitForWindowExposed(view);

122+

123+ verifyInitialTopPosition();

124+ }

125+

126+ void cleanup()

127+ {

128+ delete view;

129+ }

130+

125 void testCreationDeletion()

131 void testCreationDeletion()

126 {

132 {

127 // Nothing, init/cleanup already tests this

133 // Nothing, init/cleanup already tests this

@@ -173,19 +179,7 @@ private Q_SLOTS:

173

179

174 QTest::mouseRelease(view, Qt::LeftButton, Qt::NoModifier, QPoint(0, 15));

180 QTest::mouseRelease(view, Qt::LeftButton, Qt::NoModifier, QPoint(0, 15));

175

181

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

182+ verifyInitialTopPosition();

177− QCOMPARE(lvwph->m_firstVisibleIndex, 0);

178− verifyItem(0, 50., 150., false);

179− verifyItem(1, 200., 200., false);

180− verifyItem(2, 400., 350., false);

181− verifyItem(3, 750., 350., true);

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

183− QCOMPARE(lvwph->m_clipItem->y(), 0.);

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

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

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

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

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

189 }

183 }

190

184

191 void testDrag375PixelUp()

185 void testDrag375PixelUp()

@@ -318,19 +312,7 @@ private Q_SLOTS:

318

312

319 lvwph->positionAtBeginning();

313 lvwph->positionAtBeginning();

320

314

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

315+ verifyInitialTopPosition();

322− QCOMPARE(lvwph->m_firstVisibleIndex, 0);

323− verifyItem(0, 50., 150., false);

324− verifyItem(1, 200., 200., false);

325− verifyItem(2, 400., 350., false);

326− verifyItem(3, 750., 350., true);

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

328− QCOMPARE(lvwph->m_clipItem->y(), 0.);

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

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

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

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

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

334 }

316 }

335

317

336 void testPositionAtBeginningIndex0NotVisible()

318 void testPositionAtBeginningIndex0NotVisible()

@@ -352,37 +334,11 @@ private Q_SLOTS:

352

334

353 lvwph->positionAtBeginning();

335 lvwph->positionAtBeginning();

354

336

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

337+ verifyInitialTopPosition();

356− QCOMPARE(lvwph->m_firstVisibleIndex, 0);

357− verifyItem(0, 50., 150., false);

358− verifyItem(1, 200., 200., false);

359− verifyItem(2, 400., 350., false);

360− verifyItem(3, 750., 350., true);

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

362− QCOMPARE(lvwph->m_clipItem->y(), 0.);

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

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

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

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

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

368 }

338 }

369

339

370 void testIndex0GrowOnScreen()

340 void testIndex0GrowOnScreen()

371 {

341 {

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

373− QCOMPARE(lvwph->m_firstVisibleIndex, 0);

374− verifyItem(0, 50., 150., false);

375− verifyItem(1, 200., 200., false);

376− verifyItem(2, 400., 350., false);

377− verifyItem(3, 750., 350., true);

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

379− QCOMPARE(lvwph->m_clipItem->y(), 0.);

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

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

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

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

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

385−

386 model->setProperty(0, "size", 400);

342 model->setProperty(0, "size", 400);

387

343

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

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

@@ -610,20 +566,6 @@ private Q_SLOTS:

610

566

611 void testGrowHeaderAtTop()

567 void testGrowHeaderAtTop()

612 {

568 {

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

614− QCOMPARE(lvwph->m_firstVisibleIndex, 0);

615− verifyItem(0, 50., 150., false);

616− verifyItem(1, 200., 200., false);

617− verifyItem(2, 400., 350., false);

618− verifyItem(3, 750., 350., true);

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

620− QCOMPARE(lvwph->m_clipItem->y(), 0.);

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

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

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

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

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

626−

627 lvwph->m_headerItem->setHeight(100);

569 lvwph->m_headerItem->setHeight(100);

628

570

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

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

@@ -1008,7 +950,7 @@ private Q_SLOTS:

1008 verifyItem(2, 325., 100., false);

950 verifyItem(2, 325., 100., false);

1009 verifyItem(3, 425., 200., false);

951 verifyItem(3, 425., 200., false);

1010 verifyItem(4, 625., 350., true);

952 verifyItem(4, 625., 350., true);

1011− QTRY_COMPARE(lvwph->m_minYExtent, 225.);

953+ QCOMPARE(lvwph->m_minYExtent, 225.);

1012 QCOMPARE(lvwph->m_clipItem->y(), -225.);

954 QCOMPARE(lvwph->m_clipItem->y(), -225.);

1013 QCOMPARE(lvwph->m_clipItem->clip(), false);

955 QCOMPARE(lvwph->m_clipItem->clip(), false);

1014 QCOMPARE(lvwph->m_headerItem->y(), -225.);

956 QCOMPARE(lvwph->m_headerItem->y(), -225.);