X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/3957884bf2e44619a4ed35ba0ffead519988885b..d1a70c0b629b:/src/tests/kfileitemlistviewtest.cpp

diff --git a/src/tests/kfileitemlistviewtest.cpp b/src/tests/kfileitemlistviewtest.cpp
index a7493d17f..775602f9f 100644
--- a/src/tests/kfileitemlistviewtest.cpp
+++ b/src/tests/kfileitemlistviewtest.cpp
@@ -17,18 +17,14 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA            *
  ***************************************************************************/
 
-#include <qtest_kde.h>
-
-#include <KDirLister>
 #include "kitemviews/kfileitemlistview.h"
 #include "kitemviews/kfileitemmodel.h"
+#include "kitemviews/private/kfileitemmodeldirlister.h"
 #include "testdir.h"
 
 #include <QGraphicsView>
-
-namespace {
-    const int DefaultTimeout = 2000;
-};
+#include <QTest>
+#include <QSignalSpy>
 
 class KFileItemListViewTest : public QObject
 {
@@ -37,11 +33,11 @@ class KFileItemListViewTest : public QObject
 private slots:
     void init();
     void cleanup();
+    void testGroupedItemChanges();
 
 private:
     KFileItemListView* m_listView;
     KFileItemModel* m_model;
-    KDirLister* m_dirLister;
     TestDir* m_testDir;
     QGraphicsView* m_graphicsView;
 };
@@ -52,35 +48,68 @@ void KFileItemListViewTest::init()
     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->onModelChanged(m_model, nullptr);
 
     m_graphicsView = new QGraphicsView();
     m_graphicsView->show();
-    QTest::qWaitForWindowShown(m_graphicsView);
+    QVERIFY(QTest::qWaitForWindowExposed(m_graphicsView));
 }
 
 void KFileItemListViewTest::cleanup()
 {
     delete m_graphicsView;
-    m_graphicsView = 0;
+    m_graphicsView = nullptr;
 
     delete m_listView;
-    m_listView = 0;
+    m_listView = nullptr;
 
     delete m_model;
-    m_model = 0;
-
-    delete m_dirLister;
-    m_dirLister = 0;
+    m_model = nullptr;
 
     delete m_testDir;
-    m_testDir = 0;
+    m_testDir = nullptr;
+}
+
+/**
+ * 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()
+{
+    QSignalSpy itemsInsertedSpy(m_model, &KFileItemModel::itemsInserted);
+    QVERIFY(itemsInsertedSpy.isValid());
+    QSignalSpy itemsRemovedSpy(m_model, &KFileItemModel::itemsRemoved);
+    QVERIFY(itemsRemovedSpy.isValid());
+
+    m_model->setGroupedSorting(true);
+
+    m_testDir->createFiles({"1", "3", "5"});
+    m_model->loadDirectory(m_testDir->url());
+    QVERIFY(itemsInsertedSpy.wait());
+    QCOMPARE(m_model->count(), 3);
+
+    m_testDir->createFiles({"2", "4"});
+    m_model->m_dirLister->updateDirectory(m_testDir->url());
+    QVERIFY(itemsInsertedSpy.wait());
+    QCOMPARE(m_model->count(), 5);
+
+    m_testDir->removeFiles({"1", "3", "5"});
+    m_model->m_dirLister->updateDirectory(m_testDir->url());
+    QVERIFY(itemsRemovedSpy.wait());
+    QCOMPARE(m_model->count(), 2);
 }
 
-QTEST_KDEMAIN(KFileItemListViewTest, GUI)
+QTEST_MAIN(KFileItemListViewTest)
 
 #include "kfileitemlistviewtest.moc"