Merge branch 'Applications/16.04'

[dolphin.git] / src / tests / kfileitemmodelbenchmark.cpp

diff --git a/src/tests/kfileitemmodelbenchmark.cpp b/src/tests/kfileitemmodelbenchmark.cpp
index 7017863ab177636df5484d7bd3e0270ddfc29eb7..41dcce01966ecc0f1374c72beaa5465474137b09 100644 (file)
--- a/src/tests/kfileitemmodelbenchmark.cpp
+++ b/src/tests/kfileitemmodelbenchmark.cpp
@@ -18,25 +18,31 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA            *
  ***************************************************************************/
 
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA            *
  ***************************************************************************/
 

-#include <qtest_kde.h>
+#include <QTest>
+#include <QSignalSpy>

 
 

-#include <KGlobalSettings>
+#include <algorithm>
+#include <random>

 
 #include "kitemviews/kfileitemmodel.h"
 #include "kitemviews/private/kfileitemmodelsortalgorithm.h"
 
 
 #include "kitemviews/kfileitemmodel.h"
 #include "kitemviews/private/kfileitemmodelsortalgorithm.h"
 

-void myMessageOutput(QtMsgType type, const char* msg)
+#include "testdir.h"
+
+void myMessageOutput(QtMsgType type, const QMessageLogContext& context, const QString& msg)

 {
 {

+    Q_UNUSED(context);
+

     switch (type) {
     case QtDebugMsg:
         break;
     case QtWarningMsg:
         break;
     case QtCriticalMsg:
     switch (type) {
     case QtDebugMsg:
         break;
     case QtWarningMsg:
         break;
     case QtCriticalMsg:

-        fprintf(stderr, "Critical: %s\n", msg);
+        fprintf(stderr, "Critical: %s\n", msg.toLocal8Bit().data());

         break;
     case QtFatalMsg:
         break;
     case QtFatalMsg:

-        fprintf(stderr, "Fatal: %s\n", msg);
+        fprintf(stderr, "Fatal: %s\n", msg.toLocal8Bit().data());

         abort();
     default:
        break;
         abort();
     default:
        break;


@@ -75,8 +81,7 @@ void KFileItemModelBenchmark::insertAndRemoveManyItems_data()
     QTest::addColumn<KItemRangeList>("expectedItemsRemoved");
 
     QList<int> sizes;
     QTest::addColumn<KItemRangeList>("expectedItemsRemoved");
 
     QList<int> sizes;

-    sizes << 1000 << 4000 << 16000 << 64000 << 256000;
-    //sizes << 50000 << 100000 << 150000 << 200000 << 250000;
+    sizes << 100000;

 
     foreach (int n, sizes) {
         QStringList allStrings;
 
     foreach (int n, sizes) {
         QStringList allStrings;


@@ -160,25 +165,25 @@ void KFileItemModelBenchmark::insertAndRemoveManyItems()
     // Avoid overhead caused by natural sorting
     // and determining the isDir/isLink roles.
     model.m_naturalSorting = false;
     // Avoid overhead caused by natural sorting
     // and determining the isDir/isLink roles.
     model.m_naturalSorting = false;

-    model.setRoles(QSet<QByteArray>() << "text");
+    model.setRoles({"text"});

 
     QSignalSpy spyItemsInserted(&model, SIGNAL(itemsInserted(KItemRangeList)));
     QSignalSpy spyItemsRemoved(&model, SIGNAL(itemsRemoved(KItemRangeList)));
 
     QBENCHMARK {
         model.slotClear();
 
     QSignalSpy spyItemsInserted(&model, SIGNAL(itemsInserted(KItemRangeList)));
     QSignalSpy spyItemsRemoved(&model, SIGNAL(itemsRemoved(KItemRangeList)));
 
     QBENCHMARK {
         model.slotClear();

-        model.slotNewItems(initialItems);
+        model.slotItemsAdded(model.directory(), initialItems);

         model.slotCompleted();
         QCOMPARE(model.count(), initialItems.count());
 
         if (!newItems.isEmpty()) {
         model.slotCompleted();
         QCOMPARE(model.count(), initialItems.count());
 
         if (!newItems.isEmpty()) {

-            model.slotNewItems(newItems);
+            model.slotItemsAdded(model.directory(), newItems);

             model.slotCompleted();
         }
         QCOMPARE(model.count(), initialItems.count() + newItems.count());
 
         if (!removedItems.isEmpty()) {
             model.slotCompleted();
         }
         QCOMPARE(model.count(), initialItems.count() + newItems.count());
 
         if (!removedItems.isEmpty()) {

-            model.removeItems(removedItems);
+            model.slotItemsDeleted(removedItems);

         }
         QCOMPARE(model.count(), initialItems.count() + newItems.count() - removedItems.count());
     }
         }
         QCOMPARE(model.count(), initialItems.count() + newItems.count() - removedItems.count());
     }


@@ -205,17 +210,16 @@ void KFileItemModelBenchmark::insertAndRemoveManyItems()
 KFileItemList KFileItemModelBenchmark::createFileItemList(const QStringList& fileNames, const QString& prefix)
 {
     // Suppress 'file does not exist anymore' messages from KFileItemPrivate::init().
 KFileItemList KFileItemModelBenchmark::createFileItemList(const QStringList& fileNames, const QString& prefix)
 {
     // Suppress 'file does not exist anymore' messages from KFileItemPrivate::init().

-    qInstallMsgHandler(myMessageOutput);
+    qInstallMessageHandler(myMessageOutput);

 
     KFileItemList result;
     foreach (const QString& name, fileNames) {
 
     KFileItemList result;
     foreach (const QString& name, fileNames) {

-        const KUrl url(prefix + name);
-        const KFileItem item(url, QString(), KFileItem::Unknown);
+        const KFileItem item(QUrl::fromLocalFile(prefix + name), QString(), KFileItem::Unknown);

         result << item;
     }
     return result;
 }
 
         result << item;
     }
     return result;
 }
 

-QTEST_KDEMAIN(KFileItemModelBenchmark, NoGUI)
+QTEST_MAIN(KFileItemModelBenchmark)

 
 #include "kfileitemmodelbenchmark.moc"
 
 #include "kfileitemmodelbenchmark.moc"