X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/fae8ba471b0adb917f4edd1a99bca47fdaea0169..41d8b21edef00745ff2f17b6bd54fca29d6cd598:/src/tests/testbase.cpp

diff --git a/src/tests/testbase.cpp b/src/tests/testbase.cpp
index db71fa48c..38909e671 100644
--- a/src/tests/testbase.cpp
+++ b/src/tests/testbase.cpp
@@ -1,21 +1,21 @@
-/***************************************************************************
- *   Copyright (C) 2010 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            *
- ***************************************************************************/
+/*****************************************************************************
+ *   Copyright (C) 2010-2011 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 "testbase.h"
 
@@ -26,96 +26,32 @@
 #include "views/dolphindirlister.h"
 #include "views/dolphinsortfilterproxymodel.h"
 
-#include <KTempDir>
+#include <QAbstractItemView>
 
-#include <QtCore/QDir>
-#include <QtGui/QAbstractItemView>
-
-#include <kdebug.h>
-
-TestBase::TestBase()
+QAbstractItemView* TestBase::itemView(const DolphinView* view)
 {
-    m_tempDir = new KTempDir;
-    Q_ASSERT(m_tempDir->exists());
-    m_path = m_tempDir->name();
-    m_dir = new QDir(m_path);
-    m_view = new DolphinView(KUrl(m_path), 0);
+    return view->m_viewAccessor.itemView();
 }
 
-TestBase::~TestBase()
+bool TestBase::waitForFinishedPathLoading(DolphinView* view, int milliseconds)
 {
-    delete m_view;
-    delete m_dir;
-    delete m_tempDir;
+    return QTest::kWaitForSignal(view, SIGNAL(finishedPathLoading(const KUrl&)), milliseconds);
 }
 
-QAbstractItemView* TestBase::itemView () const
+void TestBase::reloadViewAndWait(DolphinView* view)
 {
-    return m_view->m_viewAccessor.itemView();
+    view->reload();
+    QVERIFY(waitForFinishedPathLoading(view));
 }
 
-void TestBase::reloadViewAndWait()
+QStringList TestBase::viewItems(const DolphinView* view)
 {
-    m_view->reload();
-    QVERIFY(QTest::kWaitForSignal(m_view, SIGNAL(finishedPathLoading(const KUrl&)), 2000));
-}
+    QStringList itemList;
+    const QAbstractItemModel* model = itemView(view)->model();
 
-KUrl TestBase::testDirUrl() const
-{
-    return KUrl(m_path);
-}
-
-void TestBase::createFile(const QString& path, const QByteArray& data)
-{
-    QString absolutePath = path;
-    makePathAbsoluteAndCreateParents(absolutePath);
-
-    QFile f(absolutePath);
-    f.open(QIODevice::WriteOnly);
-    f.write(data);
-    f.close();
-
-    Q_ASSERT(QFile::exists(absolutePath));
-}
-
-void TestBase::createFiles(const QStringList& files)
-{
-    foreach(const QString& path, files) {
-        createFile(path);
+    for (int row = 0; row < model->rowCount(); row++) {
+        itemList << model->data(model->index(row, 0), Qt::DisplayRole).toString();
     }
-}
 
-void TestBase::createDir(const QString& path)
-{
-    QString absolutePath = path;
-    makePathAbsoluteAndCreateParents(absolutePath);
-    m_dir->mkdir(absolutePath);
-
-    Q_ASSERT(QFile::exists(absolutePath));
-}
-
-void TestBase::makePathAbsoluteAndCreateParents(QString& path)
-{
-    QFileInfo fileInfo(path);
-    if (!fileInfo.isAbsolute()) {
-        path = m_path + path;
-        fileInfo.setFile(path);
-    }
-
-    const QDir dir = fileInfo.dir();
-    if (!dir.exists()) {
-        createDir(dir.absolutePath());
-    }
-
-    Q_ASSERT(dir.exists());
-}
-
-void TestBase::cleanupTestDir()
-{
-    delete m_tempDir;
-    m_tempDir = new KTempDir;
-    Q_ASSERT(m_tempDir->exists());
-    m_path = m_tempDir->name();
-    m_dir->setPath(m_path);
-    m_view->setUrl(m_path);
+    return itemList;
 }