kde/dolphin
kde/dolphin
1
0
Fork 0
mirror of https://invent.kde.org/system/dolphin synced 2024-10-05 16:19:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make this test work again with new uds implementation

Browse source 
Summary:
With the new uds implementation, when some data is meant to replace an old one, it has to use replace() instead of insert() to avoid an assert of data already exists.
Use 3 different entries and only insert().

Test Plan:
before: crash in the uds assert
after: passes the test

Reviewers: #dolphin, #frameworks, elvisangelaccio

Reviewed By: #dolphin, elvisangelaccio

Subscribers: bcooksley, bshah, nalvarez, cfeck, dfaure, aacid, ngraham, bruns, elvisangelaccio, kfm-devel

Tags: #dolphin

Differential Revision: https://phabricator.kde.org/D13813
This commit is contained in:
Jaime Torres Amate 2018-08-16 13:50:04 +02:00
parent adc5f6d3ac
commit e03cbe2584
1 changed files with 17 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
src/tests/kfileitemmodeltest.cpp
View file

@ -1551,25 +1551,26 @@ void KFileItemModelTest::testChangeSortRoleWhileFiltering()
{
KFileItemList items;
KIO::UDSEntry entry;
entry.insert(KIO::UDSEntry::UDS_FILE_TYPE, 0100000); // S_IFREG might not be defined on non-Unix platforms.
entry.insert(KIO::UDSEntry::UDS_ACCESS, 07777);
entry.insert(KIO::UDSEntry::UDS_SIZE, 0);
entry.insert(KIO::UDSEntry::UDS_MODIFICATION_TIME, 0);
entry.insert(KIO::UDSEntry::UDS_GROUP, "group");
entry.insert(KIO::UDSEntry::UDS_ACCESS_TIME, 0);
KIO::UDSEntry entry[3];
entry.insert(KIO::UDSEntry::UDS_NAME, "a.txt");
entry.insert(KIO::UDSEntry::UDS_USER, "user-b");
items.append(KFileItem(entry, m_testDir->url(), false, true));
entry[0].insert(KIO::UDSEntry::UDS_NAME, "a.txt");
entry[0].insert(KIO::UDSEntry::UDS_USER, "user-b");
entry.insert(KIO::UDSEntry::UDS_NAME, "b.txt");
entry.insert(KIO::UDSEntry::UDS_USER, "user-c");
items.append(KFileItem(entry, m_testDir->url(), false, true));
entry[1].insert(KIO::UDSEntry::UDS_NAME, "b.txt");
entry[1].insert(KIO::UDSEntry::UDS_USER, "user-c");
entry.insert(KIO::UDSEntry::UDS_NAME, "c.txt");
entry.insert(KIO::UDSEntry::UDS_USER, "user-a");
items.append(KFileItem(entry, m_testDir->url(), false, true));
entry[2].insert(KIO::UDSEntry::UDS_NAME, "c.txt");
entry[2].insert(KIO::UDSEntry::UDS_USER, "user-a");
for (int i = 0; i < 3; ++i) {
entry[i].insert(KIO::UDSEntry::UDS_FILE_TYPE, 0100000); // S_IFREG might not be defined on non-Unix platforms.
entry[i].insert(KIO::UDSEntry::UDS_ACCESS, 07777);
entry[i].insert(KIO::UDSEntry::UDS_SIZE, 0);
entry[i].insert(KIO::UDSEntry::UDS_MODIFICATION_TIME, 0);
entry[i].insert(KIO::UDSEntry::UDS_GROUP, "group");
entry[i].insert(KIO::UDSEntry::UDS_ACCESS_TIME, 0);
items.append(KFileItem(entry[i], m_testDir->url(), false, true));
}
m_model->slotItemsAdded(m_testDir->url(), items);
m_model->slotCompleted();