c3b3248 · unity8 · git.iko.soy

git.iko.soy/unity8

Test for reset

commitc3b32480410ef6ef31a8b9f9b930fc9ef7251a1e authorAlbert Astals <albert.astals@canonical.com> dateWed 18 Dec 2013, 11:06 (13 years ago) parentd247be5

2 files changed+16−1

compare with xenial

unifiedsplit

plugins/DashViews/verticaljournal.cpp−1 tests/plugins/DashViews/verticaljournaltest.cpp+16

plugins/DashViews/verticaljournal.cpp−1

@@ -506,7 +506,6 @@ void VerticalJournal::onModelUpdated(const QQmlChangeSet & /*changeSet*/, bool r

506506#endif

507507{

508508 // TODO Add support for additions/removals at end that are not reset calls

509− // TODO Add a test for reset

510509 if (reset) {

511510 cleanupExistingItems();

512511 }

tests/plugins/DashViews/verticaljournaltest.cpp+16

@@ -303,6 +303,22 @@ private Q_SLOTS:

303303 verifyItem(vj->m_columnVisibleItems[2][2], 5, 320, 70, true);

304304 }

305305

306+ void testModelReset()

307+ {

308+ heightList.clear();

309+ heightList << "100" << "50" << "50" << "30";

310+ model->setStringList(heightList);

311+

312+ QTRY_COMPARE(vj->m_columnVisibleItems.count(), 3);

313+ QTRY_COMPARE(vj->m_columnVisibleItems[0].count(), 1);

314+ QTRY_COMPARE(vj->m_columnVisibleItems[1].count(), 2);

315+ QTRY_COMPARE(vj->m_columnVisibleItems[2].count(), 1);

316+ verifyItem(vj->m_columnVisibleItems[0][0], 0, 0, 0, true);

317+ verifyItem(vj->m_columnVisibleItems[1][0], 1, 160, 0, true);

318+ verifyItem(vj->m_columnVisibleItems[2][0], 2, 320, 0, true);

319+ verifyItem(vj->m_columnVisibleItems[1][1], 3, 160, 60, true);

320+ }

321+

306322private:

307323 QQuickView *view;

308324 VerticalJournal *vj;