From: Frank Reininghaus <frank78ac@googlemail.com>
Date: Sun, 27 Jan 2013 14:25:47 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/KDE/4.10'
X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/1bd91417dbb7752795ca763d221a7e39c99985aa?hp=-c

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

Conflicts:
	dolphin/src/tests/kfileitemmodeltest.cpp
---

1bd91417dbb7752795ca763d221a7e39c99985aa
diff --combined src/tests/kfileitemmodeltest.cpp
index 3fc2b7c9a,65368b75b..d0f2e1eaa
--- a/src/tests/kfileitemmodeltest.cpp
+++ b/src/tests/kfileitemmodeltest.cpp
@@@ -72,12 -72,12 +72,11 @@@ private slots
      void testExpandItems();
      void testExpandParentItems();
      void testSorting();
- 
      void testIndexForKeyboardSearch();
- 
      void testNameFilter();
+     void testEmptyPath();
  
  private:
 -    bool isModelConsistent() const;
      QStringList itemsInModel() const;
  
  private:
@@@ -152,7 -152,7 +151,7 @@@ void KFileItemModelTest::testNewItems(
  
      QCOMPARE(m_model->count(), 3);
  
 -    QVERIFY(isModelConsistent());
 +    QVERIFY(m_model->isConsistent());
  }
  
  void KFileItemModelTest::testRemoveItems()
@@@ -162,13 -162,13 +161,13 @@@
      m_model->loadDirectory(m_testDir->url());
      QVERIFY(QTest::kWaitForSignal(m_model, SIGNAL(itemsInserted(KItemRangeList)), DefaultTimeout));
      QCOMPARE(m_model->count(), 2);
 -    QVERIFY(isModelConsistent());
 +    QVERIFY(m_model->isConsistent());
  
      m_testDir->removeFile("a.txt");
      m_model->m_dirLister->updateDirectory(m_testDir->url());
      QVERIFY(QTest::kWaitForSignal(m_model, SIGNAL(itemsRemoved(KItemRangeList)), DefaultTimeout));
      QCOMPARE(m_model->count(), 1);
 -    QVERIFY(isModelConsistent());
 +    QVERIFY(m_model->isConsistent());
  }
  
  void KFileItemModelTest::testDirLoadingCompleted()
@@@ -211,7 -211,7 +210,7 @@@
      QCOMPARE(itemsRemovedSpy.count(), 2);
      QCOMPARE(m_model->count(), 4);
  
 -    QVERIFY(isModelConsistent());
 +    QVERIFY(m_model->isConsistent());
  }
  
  void KFileItemModelTest::testSetData()
@@@ -232,7 -232,7 +231,7 @@@
      values = m_model->data(0);
      QCOMPARE(values.value("customRole1").toString(), QString("Test1"));
      QCOMPARE(values.value("customRole2").toString(), QString("Test2"));
 -    QVERIFY(isModelConsistent());
 +    QVERIFY(m_model->isConsistent());
  }
  
  void KFileItemModelTest::testSetDataWithModifiedSortRole_data()
@@@ -313,7 -313,7 +312,7 @@@ void KFileItemModelTest::testSetDataWit
      QCOMPARE(m_model->data(0).value("rating").toInt(), ratingIndex0);
      QCOMPARE(m_model->data(1).value("rating").toInt(), ratingIndex1);
      QCOMPARE(m_model->data(2).value("rating").toInt(), ratingIndex2);
 -    QVERIFY(isModelConsistent());
 +    QVERIFY(m_model->isConsistent());
  }
  
  void KFileItemModelTest::testModelConsistencyWhenInsertingItems()
@@@ -352,7 -352,7 +351,7 @@@
              QVERIFY(QTest::kWaitForSignal(m_model, SIGNAL(itemsInserted(KItemRangeList)), DefaultTimeout));
          }
  
 -        QVERIFY(isModelConsistent());
 +        QVERIFY(m_model->isConsistent());
      }
  
      QCOMPARE(m_model->count(), 201);
@@@ -773,6 -773,54 +772,31 @@@ void KFileItemModelTest::testNameFilter
      QCOMPARE(m_model->count(), 5);
  }
  
+ /**
+  * Verifies that we do not crash when adding a KFileItem with an empty path.
+  * Before this issue was fixed, KFileItemModel::expandedParentsCountCompare()
+  * tried to always read the first character of the path, even if the path is empty.
+  */
+ void KFileItemModelTest::testEmptyPath()
+ {
+     QSet<QByteArray> roles;
+     roles.insert("text");
+     roles.insert("isExpanded");
+     roles.insert("isExpandable");
+     roles.insert("expandedParentsCount");
+     m_model->setRoles(roles);
+ 
+     const KUrl emptyUrl;
+     QVERIFY(emptyUrl.path().isEmpty());
+     
+     const KUrl url("file:///test/");
+     
+     KFileItemList items;
+     items << KFileItem(emptyUrl, QString(), KFileItem::Unknown) << KFileItem(url, QString(), KFileItem::Unknown);
+     m_model->slotNewItems(items);
+     m_model->slotCompleted();
+ }
+ 
 -bool KFileItemModelTest::isModelConsistent() const
 -{
 -    if (m_model->m_items.count() != m_model->m_itemData.count()) {
 -        return false;
 -    }
 -
 -    for (int i = 0; i < m_model->count(); ++i) {
 -        const KFileItem item = m_model->fileItem(i);
 -        if (item.isNull()) {
 -            qWarning() << "Item" << i << "is null";
 -            return false;
 -        }
 -
 -        const int itemIndex = m_model->index(item);
 -        if (itemIndex != i) {
 -            qWarning() << "Item" << i << "has a wrong index:" << itemIndex;
 -            return false;
 -        }
 -    }
 -
 -    return true;
 -}
 -
  QStringList KFileItemModelTest::itemsInModel() const
  {
      QStringList items;