From 631226e93ae600a123602eb294f49d3e0be3bf2d Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Mon, 3 Jul 2023 07:47:04 +0300 Subject: [PATCH] dolphin: testing build fix Signed-off-by: Ivailo Monev --- dolphin/src/tests/kfileitemlistviewtest.cpp | 4 +-- dolphin/src/tests/kfileitemmodelbenchmark.cpp | 5 ++- dolphin/src/tests/kfileitemmodeltest.cpp | 33 +++++++++---------- 3 files changed, 20 insertions(+), 22 deletions(-) diff --git a/dolphin/src/tests/kfileitemlistviewtest.cpp b/dolphin/src/tests/kfileitemlistviewtest.cpp index 9f174584..15b74a60 100644 --- a/dolphin/src/tests/kfileitemlistviewtest.cpp +++ b/dolphin/src/tests/kfileitemlistviewtest.cpp @@ -100,14 +100,14 @@ void KFileItemListViewTest::testGroupedItemChanges() QCOMPARE(m_model->count(), 3); m_testDir->createFiles(QStringList() << "2" << "4"); - m_model->m_dirLister->updateDirectory(m_testDir->url()); + m_model->m_dirLister->updateDirectory(); 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()); + m_model->m_dirLister->updateDirectory(); QVERIFY(QTest::kWaitForSignal(m_model, SIGNAL(itemsRemoved(KItemRangeList)), DefaultTimeout)); QCOMPARE(m_model->count(), 2); } diff --git a/dolphin/src/tests/kfileitemmodelbenchmark.cpp b/dolphin/src/tests/kfileitemmodelbenchmark.cpp index d480b9c1..ee05d73b 100644 --- a/dolphin/src/tests/kfileitemmodelbenchmark.cpp +++ b/dolphin/src/tests/kfileitemmodelbenchmark.cpp @@ -49,7 +49,6 @@ namespace { const int DefaultTimeout = 5000; }; -Q_DECLARE_METATYPE(KFileItemList) Q_DECLARE_METATYPE(KItemRangeList) class KFileItemModelBenchmark : public QObject @@ -174,12 +173,12 @@ void KFileItemModelBenchmark::insertAndRemoveManyItems() QBENCHMARK { model.slotClear(); - model.slotItemsAdded(model.directory(), initialItems); + model.slotItemsAdded(initialItems); model.slotCompleted(); QCOMPARE(model.count(), initialItems.count()); if (!newItems.isEmpty()) { - model.slotItemsAdded(model.directory(), newItems); + model.slotItemsAdded(newItems); model.slotCompleted(); } QCOMPARE(model.count(), initialItems.count() + newItems.count()); diff --git a/dolphin/src/tests/kfileitemmodeltest.cpp b/dolphin/src/tests/kfileitemmodeltest.cpp index bda9f7b4..7c02359c 100644 --- a/dolphin/src/tests/kfileitemmodeltest.cpp +++ b/dolphin/src/tests/kfileitemmodeltest.cpp @@ -188,7 +188,7 @@ void KFileItemModelTest::testRemoveItems() QVERIFY(m_model->isConsistent()); m_testDir->removeFile("a.txt"); - m_model->m_dirLister->updateDirectory(m_testDir->url()); + m_model->m_dirLister->updateDirectory(); QVERIFY(QTest::kWaitForSignal(m_model, SIGNAL(itemsRemoved(KItemRangeList)), DefaultTimeout)); QCOMPARE(m_model->count(), 1); QVERIFY(m_model->isConsistent()); @@ -210,7 +210,7 @@ void KFileItemModelTest::testDirLoadingCompleted() QCOMPARE(m_model->count(), 3); m_testDir->createFiles(QStringList() << "d.txt" << "e.txt"); - m_model->m_dirLister->updateDirectory(m_testDir->url()); + m_model->m_dirLister->updateDirectory(); QVERIFY(QTest::kWaitForSignal(m_model, SIGNAL(directoryLoadingCompleted()), DefaultTimeout)); QCOMPARE(loadingCompletedSpy.count(), 2); QCOMPARE(itemsInsertedSpy.count(), 2); @@ -219,7 +219,7 @@ void KFileItemModelTest::testDirLoadingCompleted() m_testDir->removeFile("a.txt"); m_testDir->createFile("f.txt"); - m_model->m_dirLister->updateDirectory(m_testDir->url()); + m_model->m_dirLister->updateDirectory(); QVERIFY(QTest::kWaitForSignal(m_model, SIGNAL(directoryLoadingCompleted()), DefaultTimeout)); QCOMPARE(loadingCompletedSpy.count(), 3); QCOMPARE(itemsInsertedSpy.count(), 3); @@ -227,7 +227,7 @@ void KFileItemModelTest::testDirLoadingCompleted() QCOMPARE(m_model->count(), 5); m_testDir->removeFile("b.txt"); - m_model->m_dirLister->updateDirectory(m_testDir->url()); + m_model->m_dirLister->updateDirectory(); QVERIFY(QTest::kWaitForSignal(m_model, SIGNAL(itemsRemoved(KItemRangeList)), DefaultTimeout)); QCOMPARE(loadingCompletedSpy.count(), 4); QCOMPARE(itemsInsertedSpy.count(), 3); @@ -364,7 +364,7 @@ void KFileItemModelTest::testModelConsistencyWhenInsertingItems() m_testDir->createFile(QString::number(itemName)); } - m_model->m_dirLister->updateDirectory(m_testDir->url()); + m_model->m_dirLister->updateDirectory(); if (spy.count() == 0) { QVERIFY(QTest::kWaitForSignal(m_model, SIGNAL(itemsInserted(KItemRangeList)), DefaultTimeout)); } @@ -409,7 +409,7 @@ void KFileItemModelTest::testItemRangeConsistencyWhenInsertingItems() m_testDir->createFiles(files); QSignalSpy spy2(m_model, SIGNAL(itemsInserted(KItemRangeList))); - m_model->m_dirLister->updateDirectory(m_testDir->url()); + m_model->m_dirLister->updateDirectory(); QVERIFY(QTest::kWaitForSignal(m_model, SIGNAL(itemsInserted(KItemRangeList)), DefaultTimeout)); QCOMPARE(spy2.count(), 1); @@ -947,7 +947,7 @@ void KFileItemModelTest::testEmptyPath() KFileItemList items; items << KFileItem(emptyUrl, QString(), KFileItem::Unknown) << KFileItem(url, QString(), KFileItem::Unknown); - m_model->slotItemsAdded(emptyUrl, items); + m_model->slotItemsAdded(items); m_model->slotCompleted(); } @@ -1175,23 +1175,23 @@ void KFileItemModelTest::testGeneralParentChildRelationships() const KUrl realChild1 = m_model->fileItem(1).url(); const KUrl realChild2 = m_model->fileItem(4).url(); - m_model->slotItemsAdded(parent1, KFileItemList() << KFileItem(KUrl("child1"), QString(), KFileItem::Unknown)); + m_model->slotItemsAdded(KFileItemList() << KFileItem(KUrl("child1"), QString(), KFileItem::Unknown)); m_model->slotCompleted(); QCOMPARE(itemsInModel(), QStringList() << "parent1" << "realChild1" << "realGrandChild1" << "child1" << "parent2" << "realChild2" << "realGrandChild2"); - m_model->slotItemsAdded(parent2, KFileItemList() << KFileItem(KUrl("child2"), QString(), KFileItem::Unknown)); + m_model->slotItemsAdded(KFileItemList() << KFileItem(KUrl("child2"), QString(), KFileItem::Unknown)); m_model->slotCompleted(); QCOMPARE(itemsInModel(), QStringList() << "parent1" << "realChild1" << "realGrandChild1" << "child1" << "parent2" << "realChild2" << "realGrandChild2" << "child2"); - m_model->slotItemsAdded(realChild1, KFileItemList() << KFileItem(KUrl("grandChild1"), QString(), KFileItem::Unknown)); + m_model->slotItemsAdded(KFileItemList() << KFileItem(KUrl("grandChild1"), QString(), KFileItem::Unknown)); m_model->slotCompleted(); QCOMPARE(itemsInModel(), QStringList() << "parent1" << "realChild1" << "grandChild1" << "realGrandChild1" << "child1" << "parent2" << "realChild2" << "realGrandChild2" << "child2"); - m_model->slotItemsAdded(realChild1, KFileItemList() << KFileItem(KUrl("grandChild1"), QString(), KFileItem::Unknown)); + m_model->slotItemsAdded(KFileItemList() << KFileItem(KUrl("grandChild1"), QString(), KFileItem::Unknown)); m_model->slotCompleted(); QCOMPARE(itemsInModel(), QStringList() << "parent1" << "realChild1" << "grandChild1" << "realGrandChild1" << "child1" << "parent2" << "realChild2" << "realGrandChild2" << "child2"); - m_model->slotItemsAdded(realChild2, KFileItemList() << KFileItem(KUrl("grandChild2"), QString(), KFileItem::Unknown)); + m_model->slotItemsAdded(KFileItemList() << KFileItem(KUrl("grandChild2"), QString(), KFileItem::Unknown)); m_model->slotCompleted(); QCOMPARE(itemsInModel(), QStringList() << "parent1" << "realChild1" << "grandChild1" << "realGrandChild1" << "child1" << "parent2" << "realChild2" << "grandChild2" << "realGrandChild2" << "child2"); @@ -1369,7 +1369,7 @@ void KFileItemModelTest::testInconsistentModel() KFileItemList items; items << newItem << m_model->fileItem(2) << m_model->fileItem(3); - m_model->slotItemsAdded(m_model->directory(), items); + m_model->slotItemsAdded(items); m_model->slotCompleted(); QCOMPARE(itemsInModel(), QStringList() << "a" << "b" << "c1.txt" << "c2.txt" << "a2" << "c1.txt" << "c2.txt"); @@ -1466,7 +1466,7 @@ void KFileItemModelTest::testChangeSortRoleWhileFiltering() entry.insert(KIO::UDSEntry::UDS_USER, "user-a"); items.append(KFileItem(entry, m_testDir->url(), false, true)); - m_model->slotItemsAdded(m_testDir->url(), items); + m_model->slotItemsAdded(items); m_model->slotCompleted(); QCOMPARE(itemsInModel(), QStringList() << "a.txt" << "b.txt" << "c.txt"); @@ -1573,8 +1573,7 @@ void KFileItemModelTest::testCollapseFolderWhileLoading() urlC2.setFileName("c2.txt"); fileItemC2.setUrl(urlC2); - const KUrl urlB = m_model->fileItem(1).url(); - m_model->slotItemsAdded(urlB, KFileItemList() << fileItemC2); + m_model->slotItemsAdded(KFileItemList() << fileItemC2); QCOMPARE(itemsInModel(), QStringList() << "a2" << "b" << "c1.txt"); // Collapse "a2/". This should also remove all its (indirect) children from @@ -1604,7 +1603,7 @@ void KFileItemModelTest::testCollapseFolderWhileLoading() urlA1.setFileName("a1"); fileItemA1.setUrl(urlA1); - m_model->slotItemsAdded(m_model->directory(), KFileItemList() << fileItemA1); + m_model->slotItemsAdded(KFileItemList() << fileItemA1); QCOMPARE(itemsInModel(), QStringList() << "a2" << "b"); // Collapse "a2/". Note that this will cause "a1/" to be added to the model,