Update SG items with recent GV item changes.

Change-Id: Ib9cadea91ab3717bee0caf2071102a100e81969d

2 files changed, 14 insertions, 0 deletions

diff --git a/tests/auto/declarative/qsglistview/data/listviewtest.qml b/tests/auto/declarative/qsglistview/data/listviewtest.qml
index 832eaafa0f..0202de1546 100644
--- a/tests/auto/declarative/qsglistview/data/listviewtest.qml
+++ b/tests/auto/declarative/qsglistview/data/listviewtest.qml
@@ -6,6 +6,7 @@ Rectangle {
     height: 320
     color: "#ffffff"
 
+    property int count: list.count
     property bool showHeader: false
     property bool showFooter: false
     property real hr: list.visibleArea.heightRatio
diff --git a/tests/auto/declarative/qsglistview/tst_qsglistview.cpp b/tests/auto/declarative/qsglistview/tst_qsglistview.cpp
index 507caede71..e32353ad53 100644
--- a/tests/auto/declarative/qsglistview/tst_qsglistview.cpp
+++ b/tests/auto/declarative/qsglistview/tst_qsglistview.cpp
@@ -399,6 +399,7 @@ void tst_QSGListView::items()
 
     QTRY_VERIFY(listview->highlightItem() != 0);
     QTRY_COMPARE(listview->count(), model.count());
+    QTRY_COMPARE(canvas->rootObject()->property("count").toInt(), model.count());
     QTRY_COMPARE(contentItem->childItems().count(), model.count()+1); // assumes all are visible, +1 for the (default) highlight item
 
     // current item should be first item
@@ -529,6 +530,7 @@ void tst_QSGListView::inserted()
 
     model.insertItem(0, "Foo", "1111"); // zero index, and current item
 
+    QCOMPARE(canvas->rootObject()->property("count").toInt(), model.count());
     QTRY_COMPARE(contentItem->childItems().count(), model.count()+1); // assumes all are visible, +1 for the (default) highlight item
 
     name = findItem<QSGText>(contentItem, "textName", 0);
@@ -597,6 +599,7 @@ void tst_QSGListView::removed(bool animated)
     QTRY_VERIFY(contentItem != 0);
 
     model.removeItem(1);
+    QCOMPARE(canvas->rootObject()->property("count").toInt(), model.count());
 
     QSGText *name = findItem<QSGText>(contentItem, "textName", 1);
     QTRY_VERIFY(name != 0);
@@ -725,6 +728,16 @@ void tst_QSGListView::removed(bool animated)
     QTRY_VERIFY(name = findItem<QSGText>(contentItem, "textName", model.count()-1));
     QCOMPARE(name->text(), QString("New"));
 
+    // Add some more items so that we don't run out
+    for (int i = 50; i < 100; i++)
+        model.addItem("Item" + QString::number(i), "");
+
+    // QTBUG-19198 move to end and remove all visible items one at a time.
+    listview->positionViewAtEnd();
+    for (int i = 0; i < 18; ++i)
+        model.removeItems(model.count() - 1, 1);
+    QTRY_VERIFY(findItems<QSGItem>(contentItem, "wrapper").count() > 16);
+
     delete canvas;
     delete testObject;
 }