diff options
| author | Martin Jones <martin.jones@nokia.com> | 2009-12-04 06:44:33 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2009-12-04 06:44:33 (GMT) |
| commit | 510a85d350d4a5a538818af0f6b00c17cf081ea2 (patch) | |
| tree | 84decc7839aa04a999a3bbe36f3ada2ff59e0678 /tests | |
| parent | 5d3db0fbfa96964b9448705d9edd4c0cd9e65816 (diff) | |
| download | Qt-510a85d350d4a5a538818af0f6b00c17cf081ea2.zip Qt-510a85d350d4a5a538818af0f6b00c17cf081ea2.tar.gz Qt-510a85d350d4a5a538818af0f6b00c17cf081ea2.tar.bz2 | |
Fix item insertion/deletion before first visible item.
Also avoid destroying items in the same frame as adding items.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/declarative/qmlgraphicslistview/tst_qmlgraphicslistview.cpp | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/tests/auto/declarative/qmlgraphicslistview/tst_qmlgraphicslistview.cpp b/tests/auto/declarative/qmlgraphicslistview/tst_qmlgraphicslistview.cpp index 0a86ecc..7b5cfc0 100644 --- a/tests/auto/declarative/qmlgraphicslistview/tst_qmlgraphicslistview.cpp +++ b/tests/auto/declarative/qmlgraphicslistview/tst_qmlgraphicslistview.cpp @@ -443,7 +443,7 @@ void tst_QmlGraphicsListView::inserted() // Confirm items positioned correctly for (int i = 0; i < model.count(); ++i) { QmlGraphicsItem *item = findItem<QmlGraphicsItem>(viewport, "wrapper", i); - QVERIFY(item->y() == i*20); + QCOMPARE(item->y(), i*20.0); } model.insertItem(0, "Foo", "1111"); // zero index, and current item @@ -465,7 +465,7 @@ void tst_QmlGraphicsListView::inserted() // Confirm items positioned correctly for (int i = 0; i < model.count(); ++i) { QmlGraphicsItem *item = findItem<QmlGraphicsItem>(viewport, "wrapper", i); - QVERIFY(item->y() == i*20); + QCOMPARE(item->y(), i*20.0); } for (int i = model.count(); i < 30; ++i) @@ -482,10 +482,11 @@ void tst_QmlGraphicsListView::inserted() QVERIFY(listview->viewportY() == 80); // Confirm items positioned correctly - int itemCount = findItems<QmlGraphicsItem>(viewport, "wrapper").count() - 1; - for (int i = 5; i < 5+itemCount; ++i) { + for (int i = 5; i < 5+15; ++i) { QmlGraphicsItem *item = findItem<QmlGraphicsItem>(viewport, "wrapper", i); - QVERIFY(item->y() == i*20 - 20); + if (!item) qWarning() << "Item" << i << "not found"; + QVERIFY(item); + QCOMPARE(item->y(), i*20.0 - 20.0); } delete canvas; @@ -736,7 +737,7 @@ void tst_QmlGraphicsListView::moved() QmlGraphicsItem *item = findItem<QmlGraphicsItem>(viewport, "wrapper", i); if (!item) qWarning() << "Item" << i << "not found"; QVERIFY(item); - QVERIFY(item->y() == i*20 + 20); + QCOMPARE(item->y(), i*20.0 + 20); name = findItem<QmlGraphicsText>(viewport, "textName", i); QVERIFY(name != 0); QCOMPARE(name->text(), model.name(i)); @@ -756,7 +757,7 @@ void tst_QmlGraphicsListView::moved() QmlGraphicsItem *item = findItem<QmlGraphicsItem>(viewport, "wrapper", i); if (!item) qWarning() << "Item" << i << "not found"; QVERIFY(item); - QVERIFY(item->y() == i*20 + 20); + QCOMPARE(item->y(), i*20.0 + 20); name = findItem<QmlGraphicsText>(viewport, "textName", i); QVERIFY(name != 0); QCOMPARE(name->text(), model.name(i)); |