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

Merge remote-tracking branch 'origin/KDE/4.13'

Browse source
This commit is contained in:
Frank Reininghaus 2014-06-05 08:54:06 +02:00
parent e07468c784 352f644159
commit ea713e7a79
5 changed files with 148 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
src/kitemviews/kfileitemmodel.cpp
View file

@ -395,7 +395,41 @@ int KFileItemModel::index(const KUrl& url) const
index = m_items.value(urlToFind, -1);
}
Q_ASSERT(index >= 0 || m_items.count() == m_itemData.count());
if (index < 0) {
// The item could not be found, even though all items from m_itemData
// should be in m_items now. We print some diagnostic information which
// might help to find the cause of the problem, but only once. This
// prevents that obtaining and printing the debugging information
// wastes CPU cycles and floods the shell or .xsession-errors.
static bool printDebugInfo = true;
if (m_items.count() != m_itemData.count() && printDebugInfo) {
printDebugInfo = false;
kWarning() << "The model is in an inconsistent state.";
kWarning() << "m_items.count() ==" << m_items.count();
kWarning() << "m_itemData.count() ==" << m_itemData.count();
// Check if there are multiple items with the same URL.
QMultiHash<KUrl, int> indexesForUrl;
for (int i = 0; i < m_itemData.count(); ++i) {
indexesForUrl.insert(m_itemData.at(i)->item.url(), i);
}
foreach (const KUrl& url, indexesForUrl.uniqueKeys()) {
if (indexesForUrl.count(url) > 1) {
kWarning() << "Multiple items found with the URL" << url;
foreach (int index, indexesForUrl.values(url)) {
const ItemData* data = m_itemData.at(index);
kWarning() << "index" << index << ":" << data->item;
if (data->parent) {
kWarning() << "parent" << data->parent->item;
}
}
}
}
}
}
return index;
}

10
src/kitemviews/kitemrange.h
View file

@ -78,7 +78,10 @@ KItemRangeList KItemRangeList::fromSortedContainer(const Container& container)
int index = *it;
int count = 1;
++it;
// Remove duplicates, see https://bugs.kde.org/show_bug.cgi?id=335672
while (it != end && *it == index) {
++it;
}
while (it != end) {
if (*it == index + count) {
@ -89,6 +92,11 @@ KItemRangeList KItemRangeList::fromSortedContainer(const Container& container)
count = 1;
}
++it;
// Remove duplicates, see https://bugs.kde.org/show_bug.cgi?id=335672
while (it != end && *it == *(it - 1)) {
++it;
}
}
result << KItemRange(index, count);

7
src/tests/CMakeLists.txt
View file

@ -12,6 +12,13 @@ set(kitemsettest_SRCS
kde4_add_unit_test(kitemsettest TEST ${kitemsettest_SRCS})
target_link_libraries(kitemsettest dolphinprivate ${KDE4_KIO_LIBS} ${QT_QTTEST_LIBRARY})
# KItemRangeTest
set(kitemrangetest_SRCS
kitemrangetest.cpp
)
kde4_add_unit_test(kitemrangetest TEST ${kitemrangetest_SRCS})
target_link_libraries(kitemrangetest dolphinprivate ${KDE4_KIO_LIBS} ${QT_QTTEST_LIBRARY})
# KItemListSelectionManagerTest
set(kitemlistselectionmanagertest_SRCS
kitemlistselectionmanagertest.cpp

22
src/tests/kfileitemmodeltest.cpp
View file

@ -95,6 +95,7 @@ private slots:
void testRefreshFilteredItems();
void testCollapseFolderWhileLoading();
void testCreateMimeData();
void testDeleteFileMoreThanOnce();
private:
QStringList itemsInModel() const;
@ -1697,6 +1698,27 @@ void KFileItemModelTest::testCollapseFolderWhileLoading()
QVERIFY(!m_model->isExpanded(1));
}
void KFileItemModelTest::testDeleteFileMoreThanOnce()
{
QStringList files;
files << "a.txt" << "b.txt" << "c.txt" << "d.txt";
m_testDir->createFiles(files);
m_model->loadDirectory(m_testDir->url());
QVERIFY(QTest::kWaitForSignal(m_model, SIGNAL(itemsInserted(KItemRangeList)), DefaultTimeout));
QCOMPARE(itemsInModel(), QStringList() << "a.txt" << "b.txt" << "c.txt" << "d.txt");
const KFileItem fileItemB = m_model->fileItem(1);
// Tell the model that a list of items has been deleted, where "b.txt" appears twice in the list.
KFileItemList list;
list << fileItemB << fileItemB;
m_model->slotItemsDeleted(list);
QVERIFY(m_model->isConsistent());
QCOMPARE(itemsInModel(), QStringList() << "a.txt" << "c.txt" << "d.txt");
}
QStringList KFileItemModelTest::itemsInModel() const
{
QStringList items;

75
src/tests/kitemrangetest.cpp Normal file
View file

@ -0,0 +1,75 @@
/***************************************************************************
* Copyright (C) 2014 by Frank Reininghaus <frank78ac@googlemail.com> *
* *
* This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
* the Free Software Foundation; either version 2 of the License, or *
* (at your option) any later version. *
* *
* This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* GNU General Public License for more details. *
* *
* You should have received a copy of the GNU General Public License *
* along with this program; if not, write to the *
* Free Software Foundation, Inc., *
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA *
***************************************************************************/
#include <qtest_kde.h>
#include "kitemviews/kitemrange.h"
#include <QVector>
Q_DECLARE_METATYPE(QVector<int>);
Q_DECLARE_METATYPE(KItemRangeList);
class KItemRangeTest : public QObject
{
Q_OBJECT
private slots:
void testFromSortedContainer_data();
void testFromSortedContainer();
};
void KItemRangeTest::testFromSortedContainer_data()
{
QTest::addColumn<QVector<int> >("sortedNumbers");
QTest::addColumn<KItemRangeList>("expected");
QTest::newRow("empty") << QVector<int>() << KItemRangeList();
QTest::newRow("[1]") << (QVector<int>() << 1) << (KItemRangeList() << KItemRange(1, 1));
QTest::newRow("[9]") << (QVector<int>() << 9) << (KItemRangeList() << KItemRange(9, 1));
QTest::newRow("[1-2]") << (QVector<int>() << 1 << 2) << (KItemRangeList() << KItemRange(1, 2));
QTest::newRow("[1-3]") << (QVector<int>() << 1 << 2 << 3) << (KItemRangeList() << KItemRange(1, 3));
QTest::newRow("[1] [4]") << (QVector<int>() << 1 << 4) << (KItemRangeList() << KItemRange(1, 1) << KItemRange(4, 1));
QTest::newRow("[1-3] [5]") << (QVector<int>() << 1 << 2 << 3 << 5) << (KItemRangeList() << KItemRange(1, 3) << KItemRange(5, 1));
QTest::newRow("[1] [5-6]") << (QVector<int>() << 1 << 5 << 6) << (KItemRangeList() << KItemRange(1, 1) << KItemRange(5, 2));
QTest::newRow("duplicates: 1 1") << (QVector<int>() << 1 << 1) << (KItemRangeList() << KItemRange(1, 1));
QTest::newRow("duplicates: 1 1 1") << (QVector<int>() << 1 << 1 << 1) << (KItemRangeList() << KItemRange(1, 1));
QTest::newRow("duplicates: 1 1 5") << (QVector<int>() << 1 << 1 << 5) << (KItemRangeList() << KItemRange(1, 1) << KItemRange(5, 1));
QTest::newRow("duplicates: 1 5 5") << (QVector<int>() << 1 << 5 << 5) << (KItemRangeList() << KItemRange(1, 1) << KItemRange(5, 1));
QTest::newRow("duplicates: 1 1 1 5") << (QVector<int>() << 1 << 1 << 1 << 5) << (KItemRangeList() << KItemRange(1, 1) << KItemRange(5, 1));
QTest::newRow("duplicates: 1 5 5 5") << (QVector<int>() << 1 << 5 << 5 << 5) << (KItemRangeList() << KItemRange(1, 1) << KItemRange(5, 1));
QTest::newRow("duplicates: 1 1 2") << (QVector<int>() << 1 << 1 << 2) << (KItemRangeList() << KItemRange(1, 2));
QTest::newRow("duplicates: 1 2 2") << (QVector<int>() << 1 << 2 << 2) << (KItemRangeList() << KItemRange(1, 2));
QTest::newRow("duplicates: 1 1 2 3") << (QVector<int>() << 1 << 1 << 2 << 3) << (KItemRangeList() << KItemRange(1, 3));
QTest::newRow("duplicates: 1 2 2 3") << (QVector<int>() << 1 << 2 << 2 << 3) << (KItemRangeList() << KItemRange(1, 3));
QTest::newRow("duplicates: 1 2 3 3") << (QVector<int>() << 1 << 2 << 3 << 3) << (KItemRangeList() << KItemRange(1, 3));
}
void KItemRangeTest::testFromSortedContainer()
{
QFETCH(QVector<int>, sortedNumbers);
QFETCH(KItemRangeList, expected);
const KItemRangeList result = KItemRangeList::fromSortedContainer(sortedNumbers);
QCOMPARE(expected, result);
}
QTEST_KDEMAIN(KItemRangeTest, NoGUI)
#include "kitemrangetest.moc"