Katana_mirror/kde-workspace
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/kde-workspace.git synced 2025-02-23 18:32:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

dolphin: testing build fix

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2023-07-03 07:47:04 +03:00
parent 0ba740c6c5
commit 631226e93a
3 changed files with 20 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
dolphin/src/tests/kfileitemlistviewtest.cpp
View file

@ -100,14 +100,14 @@ void KFileItemListViewTest::testGroupedItemChanges()
QCOMPARE(m_model->count(), 3); QCOMPARE(m_model->count(), 3);
m_testDir->createFiles(QStringList() << "2" << "4"); 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)); QVERIFY(QTest::kWaitForSignal(m_model, SIGNAL(itemsInserted(KItemRangeList)), DefaultTimeout));
QCOMPARE(m_model->count(), 5); QCOMPARE(m_model->count(), 5);
m_testDir->removeFile("1"); m_testDir->removeFile("1");
m_testDir->removeFile("3"); m_testDir->removeFile("3");
m_testDir->removeFile("5"); 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)); QVERIFY(QTest::kWaitForSignal(m_model, SIGNAL(itemsRemoved(KItemRangeList)), DefaultTimeout));
QCOMPARE(m_model->count(), 2); QCOMPARE(m_model->count(), 2);
} }

5
dolphin/src/tests/kfileitemmodelbenchmark.cpp
View file

@ -49,7 +49,6 @@ namespace {
const int DefaultTimeout = 5000; const int DefaultTimeout = 5000;
}; };
Q_DECLARE_METATYPE(KFileItemList)
Q_DECLARE_METATYPE(KItemRangeList) Q_DECLARE_METATYPE(KItemRangeList)
class KFileItemModelBenchmark : public QObject class KFileItemModelBenchmark : public QObject
@ -174,12 +173,12 @@ void KFileItemModelBenchmark::insertAndRemoveManyItems()
QBENCHMARK { QBENCHMARK {
model.slotClear(); model.slotClear();
model.slotItemsAdded(model.directory(), initialItems); model.slotItemsAdded(initialItems);
model.slotCompleted(); model.slotCompleted();
QCOMPARE(model.count(), initialItems.count()); QCOMPARE(model.count(), initialItems.count());
if (!newItems.isEmpty()) { if (!newItems.isEmpty()) {
model.slotItemsAdded(model.directory(), newItems); model.slotItemsAdded(newItems);
model.slotCompleted(); model.slotCompleted();
} }
QCOMPARE(model.count(), initialItems.count() + newItems.count()); QCOMPARE(model.count(), initialItems.count() + newItems.count());

33
dolphin/src/tests/kfileitemmodeltest.cpp
View file

@ -188,7 +188,7 @@ void KFileItemModelTest::testRemoveItems()
QVERIFY(m_model->isConsistent()); QVERIFY(m_model->isConsistent());
m_testDir->removeFile("a.txt"); 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)); QVERIFY(QTest::kWaitForSignal(m_model, SIGNAL(itemsRemoved(KItemRangeList)), DefaultTimeout));
QCOMPARE(m_model->count(), 1); QCOMPARE(m_model->count(), 1);
QVERIFY(m_model->isConsistent()); QVERIFY(m_model->isConsistent());
@ -210,7 +210,7 @@ void KFileItemModelTest::testDirLoadingCompleted()
QCOMPARE(m_model->count(), 3); QCOMPARE(m_model->count(), 3);
m_testDir->createFiles(QStringList() << "d.txt" << "e.txt"); 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)); QVERIFY(QTest::kWaitForSignal(m_model, SIGNAL(directoryLoadingCompleted()), DefaultTimeout));
QCOMPARE(loadingCompletedSpy.count(), 2); QCOMPARE(loadingCompletedSpy.count(), 2);
QCOMPARE(itemsInsertedSpy.count(), 2); QCOMPARE(itemsInsertedSpy.count(), 2);
@ -219,7 +219,7 @@ void KFileItemModelTest::testDirLoadingCompleted()
m_testDir->removeFile("a.txt"); m_testDir->removeFile("a.txt");
m_testDir->createFile("f.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)); QVERIFY(QTest::kWaitForSignal(m_model, SIGNAL(directoryLoadingCompleted()), DefaultTimeout));
QCOMPARE(loadingCompletedSpy.count(), 3); QCOMPARE(loadingCompletedSpy.count(), 3);
QCOMPARE(itemsInsertedSpy.count(), 3); QCOMPARE(itemsInsertedSpy.count(), 3);
@ -227,7 +227,7 @@ void KFileItemModelTest::testDirLoadingCompleted()
QCOMPARE(m_model->count(), 5); QCOMPARE(m_model->count(), 5);
m_testDir->removeFile("b.txt"); 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)); QVERIFY(QTest::kWaitForSignal(m_model, SIGNAL(itemsRemoved(KItemRangeList)), DefaultTimeout));
QCOMPARE(loadingCompletedSpy.count(), 4); QCOMPARE(loadingCompletedSpy.count(), 4);
QCOMPARE(itemsInsertedSpy.count(), 3); QCOMPARE(itemsInsertedSpy.count(), 3);
@ -364,7 +364,7 @@ void KFileItemModelTest::testModelConsistencyWhenInsertingItems()
m_testDir->createFile(QString::number(itemName)); m_testDir->createFile(QString::number(itemName));
} }
m_model->m_dirLister->updateDirectory(m_testDir->url()); m_model->m_dirLister->updateDirectory();
if (spy.count() == 0) { if (spy.count() == 0) {
QVERIFY(QTest::kWaitForSignal(m_model, SIGNAL(itemsInserted(KItemRangeList)), DefaultTimeout)); QVERIFY(QTest::kWaitForSignal(m_model, SIGNAL(itemsInserted(KItemRangeList)), DefaultTimeout));
} }
@ -409,7 +409,7 @@ void KFileItemModelTest::testItemRangeConsistencyWhenInsertingItems()
m_testDir->createFiles(files); m_testDir->createFiles(files);
QSignalSpy spy2(m_model, SIGNAL(itemsInserted(KItemRangeList))); 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)); QVERIFY(QTest::kWaitForSignal(m_model, SIGNAL(itemsInserted(KItemRangeList)), DefaultTimeout));
QCOMPARE(spy2.count(), 1); QCOMPARE(spy2.count(), 1);
@ -947,7 +947,7 @@ void KFileItemModelTest::testEmptyPath()
KFileItemList items; KFileItemList items;
items << KFileItem(emptyUrl, QString(), KFileItem::Unknown) << KFileItem(url, QString(), KFileItem::Unknown); items << KFileItem(emptyUrl, QString(), KFileItem::Unknown) << KFileItem(url, QString(), KFileItem::Unknown);
m_model->slotItemsAdded(emptyUrl, items); m_model->slotItemsAdded(items);
m_model->slotCompleted(); m_model->slotCompleted();
} }
@ -1175,23 +1175,23 @@ void KFileItemModelTest::testGeneralParentChildRelationships()
const KUrl realChild1 = m_model->fileItem(1).url(); const KUrl realChild1 = m_model->fileItem(1).url();
const KUrl realChild2 = m_model->fileItem(4).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(); m_model->slotCompleted();
QCOMPARE(itemsInModel(), QStringList() << "parent1" << "realChild1" << "realGrandChild1" << "child1" << "parent2" << "realChild2" << "realGrandChild2"); 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(); m_model->slotCompleted();
QCOMPARE(itemsInModel(), QStringList() << "parent1" << "realChild1" << "realGrandChild1" << "child1" << "parent2" << "realChild2" << "realGrandChild2" << "child2"); 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(); m_model->slotCompleted();
QCOMPARE(itemsInModel(), QStringList() << "parent1" << "realChild1" << "grandChild1" << "realGrandChild1" << "child1" << "parent2" << "realChild2" << "realGrandChild2" << "child2"); 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(); m_model->slotCompleted();
QCOMPARE(itemsInModel(), QStringList() << "parent1" << "realChild1" << "grandChild1" << "realGrandChild1" << "child1" << "parent2" << "realChild2" << "realGrandChild2" << "child2"); 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(); m_model->slotCompleted();
QCOMPARE(itemsInModel(), QStringList() << "parent1" << "realChild1" << "grandChild1" << "realGrandChild1" << "child1" << "parent2" << "realChild2" << "grandChild2" << "realGrandChild2" << "child2"); QCOMPARE(itemsInModel(), QStringList() << "parent1" << "realChild1" << "grandChild1" << "realGrandChild1" << "child1" << "parent2" << "realChild2" << "grandChild2" << "realGrandChild2" << "child2");
@ -1369,7 +1369,7 @@ void KFileItemModelTest::testInconsistentModel()
KFileItemList items; KFileItemList items;
items << newItem << m_model->fileItem(2) << m_model->fileItem(3); items << newItem << m_model->fileItem(2) << m_model->fileItem(3);
m_model->slotItemsAdded(m_model->directory(), items); m_model->slotItemsAdded(items);
m_model->slotCompleted(); m_model->slotCompleted();
QCOMPARE(itemsInModel(), QStringList() << "a" << "b" << "c1.txt" << "c2.txt" << "a2" << "c1.txt" << "c2.txt"); 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"); entry.insert(KIO::UDSEntry::UDS_USER, "user-a");
items.append(KFileItem(entry, m_testDir->url(), false, true)); items.append(KFileItem(entry, m_testDir->url(), false, true));
m_model->slotItemsAdded(m_testDir->url(), items); m_model->slotItemsAdded(items);
m_model->slotCompleted(); m_model->slotCompleted();
QCOMPARE(itemsInModel(), QStringList() << "a.txt" << "b.txt" << "c.txt"); QCOMPARE(itemsInModel(), QStringList() << "a.txt" << "b.txt" << "c.txt");
@ -1573,8 +1573,7 @@ void KFileItemModelTest::testCollapseFolderWhileLoading()
urlC2.setFileName("c2.txt"); urlC2.setFileName("c2.txt");
fileItemC2.setUrl(urlC2); fileItemC2.setUrl(urlC2);
const KUrl urlB = m_model->fileItem(1).url(); m_model->slotItemsAdded(KFileItemList() << fileItemC2);
m_model->slotItemsAdded(urlB, KFileItemList() << fileItemC2);
QCOMPARE(itemsInModel(), QStringList() << "a2" << "b" << "c1.txt"); QCOMPARE(itemsInModel(), QStringList() << "a2" << "b" << "c1.txt");
// Collapse "a2/". This should also remove all its (indirect) children from // Collapse "a2/". This should also remove all its (indirect) children from
@ -1604,7 +1603,7 @@ void KFileItemModelTest::testCollapseFolderWhileLoading()
urlA1.setFileName("a1"); urlA1.setFileName("a1");
fileItemA1.setUrl(urlA1); fileItemA1.setUrl(urlA1);
m_model->slotItemsAdded(m_model->directory(), KFileItemList() << fileItemA1); m_model->slotItemsAdded(KFileItemList() << fileItemA1);
QCOMPARE(itemsInModel(), QStringList() << "a2" << "b"); QCOMPARE(itemsInModel(), QStringList() << "a2" << "b");
// Collapse "a2/". Note that this will cause "a1/" to be added to the model, // Collapse "a2/". Note that this will cause "a1/" to be added to the model,