Add unit-test to test a possible crash when updating group-headers

diff --git a/src/kitemviews/kfileitemmodel.h b/src/kitemviews/kfileitemmodel.h
index 2683336e1e221d88c93233f5c577ceca58a459c8..2bbdfc7972122ff1a66740626be422106979ccb4 100644 (file)
--- a/src/kitemviews/kfileitemmodel.h
+++ b/src/kitemviews/kfileitemmodel.h
@@ -459,7 +459,8 @@ private:
 
     friend class KFileItemModelSortAlgorithm;  // Accesses lessThan() method
     friend class KFileItemModelRolesUpdater;   // Accesses emitSortProgress() method
 
     friend class KFileItemModelSortAlgorithm;  // Accesses lessThan() method
     friend class KFileItemModelRolesUpdater;   // Accesses emitSortProgress() method

-    friend class KFileItemModelTest;           // For unit testing
+    friend class KFileItemModelTest;           // For unit testing (accesses m_dirLister)
+    friend class KFileItemListViewTest;        // For unit testing (accesses m_dirLister)

 };
 
 inline bool KFileItemModel::isChildItem(int index) const
 };
 
 inline bool KFileItemModel::isChildItem(int index) const

diff --git a/src/tests/kfileitemlistviewtest.cpp b/src/tests/kfileitemlistviewtest.cpp
index a7493d17f97a92a8d240c9969867f91bb937fb14..9f17458403966f5788accfaeb460212ca3873134 100644 (file)
--- a/src/tests/kfileitemlistviewtest.cpp
+++ b/src/tests/kfileitemlistviewtest.cpp
@@ -19,9 +19,9 @@
 
 #include <qtest_kde.h>
 
 
 #include <qtest_kde.h>
 

-#include <KDirLister>

 #include "kitemviews/kfileitemlistview.h"
 #include "kitemviews/kfileitemmodel.h"
 #include "kitemviews/kfileitemlistview.h"
 #include "kitemviews/kfileitemmodel.h"

+#include "kitemviews/private/kfileitemmodeldirlister.h"

 #include "testdir.h"
 
 #include <QGraphicsView>
 #include "testdir.h"
 
 #include <QGraphicsView>


@@ -37,11 +37,11 @@ class KFileItemListViewTest : public QObject
 private slots:
     void init();
     void cleanup();
 private slots:
     void init();
     void cleanup();

+    void testGroupedItemChanges();

 
 private:
     KFileItemListView* m_listView;
     KFileItemModel* m_model;
 
 private:
     KFileItemListView* m_listView;
     KFileItemModel* m_model;

-    KDirLister* m_dirLister;

     TestDir* m_testDir;
     QGraphicsView* m_graphicsView;
 };
     TestDir* m_testDir;
     QGraphicsView* m_graphicsView;
 };


@@ -52,8 +52,8 @@ void KFileItemListViewTest::init()
     qRegisterMetaType<KFileItemList>("KFileItemList");
 
     m_testDir = new TestDir();
     qRegisterMetaType<KFileItemList>("KFileItemList");
 
     m_testDir = new TestDir();

-    m_dirLister = new KDirLister();
-    m_model = new KFileItemModel(m_dirLister);
+    m_model = new KFileItemModel();
+    m_model->m_dirLister->setAutoUpdate(false);

 
     m_listView = new KFileItemListView();
     m_listView->onModelChanged(m_model, 0);
 
     m_listView = new KFileItemListView();
     m_listView->onModelChanged(m_model, 0);


@@ -74,13 +74,44 @@ void KFileItemListViewTest::cleanup()
     delete m_model;
     m_model = 0;
 
     delete m_model;
     m_model = 0;
 

-    delete m_dirLister;
-    m_dirLister = 0;
-

     delete m_testDir;
     m_testDir = 0;
 }
 
     delete m_testDir;
     m_testDir = 0;
 }
 

+/**
+ * If grouping is enabled, the group headers must be updated
+ * when items have been inserted or removed. This updating
+ * may only be done after all multiple ranges have been inserted
+ * or removed and not after each individual range (see description
+ * in #ifndef QT_NO_DEBUG-block of KItemListView::slotItemsInserted()
+ * and KItemListView::slotItemsRemoved()). This test inserts and
+ * removes multiple ranges and will trigger the Q_ASSERT in the
+ * ifndef QT_NO_DEBUG-block in case if a group-header will be updated
+ * too early.
+ */
+void KFileItemListViewTest::testGroupedItemChanges()
+{
+    m_model->setGroupedSorting(true);
+
+    m_testDir->createFiles(QStringList() << "1" << "3" << "5");
+
+    m_model->loadDirectory(m_testDir->url());
+    QVERIFY(QTest::kWaitForSignal(m_model, SIGNAL(itemsInserted(KItemRangeList)), DefaultTimeout));
+    QCOMPARE(m_model->count(), 3);
+
+    m_testDir->createFiles(QStringList() << "2" << "4");
+    m_model->m_dirLister->updateDirectory(m_testDir->url());
+    QVERIFY(QTest::kWaitForSignal(m_model, SIGNAL(itemsInserted(KItemRangeList)), DefaultTimeout));
+    QCOMPARE(m_model->count(), 5);
+
+    m_testDir->removeFile("1");
+    m_testDir->removeFile("3");
+    m_testDir->removeFile("5");
+    m_model->m_dirLister->updateDirectory(m_testDir->url());
+    QVERIFY(QTest::kWaitForSignal(m_model, SIGNAL(itemsRemoved(KItemRangeList)), DefaultTimeout));
+    QCOMPARE(m_model->count(), 2);
+}
+

 QTEST_KDEMAIN(KFileItemListViewTest, GUI)
 
 #include "kfileitemlistviewtest.moc"
 QTEST_KDEMAIN(KFileItemListViewTest, GUI)
 
 #include "kfileitemlistviewtest.moc"