diff options
| author | Frank Reininghaus <[email protected]> | 2011-04-03 15:31:27 +0200 |
|---|---|---|
| committer | Frank Reininghaus <[email protected]> | 2011-04-03 15:32:12 +0200 |
| commit | 95cb8ffe01e0252d3a26f244e8607254200d067f (patch) | |
| tree | d76499d9b454b8730e48a2f24a55c914f7f0230c /src/tests/testbase.cpp | |
| parent | 5ff682d852a07b5121e49d8ed2a239b0a1762b6b (diff) | |
Dolphin unit test refactoring
This commit changes mainly two things:
1. The functionality related to the handling of temporary files and
folders is moved to a new class TestDir.
2. The setup of a temporary folder and of DolphinView instances is
now done in each unit test function. A benefit of this change is that
there are no unwanted interactions between different unit test functions
any more. Moreover, different test functions could now share a test
folder more easily.
Additionally, the reference arguments of all functions are changed to
pointers for consistency.
Diffstat (limited to 'src/tests/testbase.cpp')
| -rw-r--r-- | src/tests/testbase.cpp | 126 |
1 files changed, 7 insertions, 119 deletions
diff --git a/src/tests/testbase.cpp b/src/tests/testbase.cpp index a0031d0f5..59c40fb94 100644 --- a/src/tests/testbase.cpp +++ b/src/tests/testbase.cpp @@ -26,109 +26,23 @@ #include "views/dolphindirlister.h" #include "views/dolphinsortfilterproxymodel.h" -#include <KTempDir> - -#include <QDir> #include <QAbstractItemView> -#include <KDebug> - -#ifdef Q_OS_UNIX -#include <utime.h> -#else -#include <sys/utime.h> -#endif - -TestBase::TestBase() -{ - 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); -} - -TestBase::~TestBase() -{ - delete m_view; - delete m_dir; - delete m_tempDir; -} - -QAbstractItemView* TestBase::itemView() const -{ - return m_view->m_viewAccessor.itemView(); -} - -void TestBase::reloadViewAndWait() -{ - m_view->reload(); - QVERIFY(QTest::kWaitForSignal(m_view, SIGNAL(finishedPathLoading(const KUrl&)), 2000)); -} - -KUrl TestBase::testDirUrl() const +QAbstractItemView* TestBase::itemView(const DolphinView* view) { - return KUrl(m_path); + return view->m_viewAccessor.itemView(); } -/** The following function is taken from kdelibs/kio/tests/kiotesthelper.h, copyright (C) 2006 by David Faure */ - -static void setTimeStamp(const QString& path, const QDateTime& mtime) +void TestBase::reloadViewAndWait(DolphinView* view) { -#ifdef Q_OS_UNIX - struct utimbuf utbuf; - utbuf.actime = mtime.toTime_t(); - utbuf.modtime = utbuf.actime; - utime(QFile::encodeName(path), &utbuf); -#elif defined(Q_OS_WIN) - struct _utimbuf utbuf; - utbuf.actime = mtime.toTime_t(); - utbuf.modtime = utbuf.actime; - _wutime(reinterpret_cast<const wchar_t *>(path.utf16()), &utbuf); -#endif + view->reload(); + QVERIFY(QTest::kWaitForSignal(view, SIGNAL(finishedPathLoading(const KUrl&)), 2000)); } -void TestBase::createFile(const QString& path, const QByteArray& data, const QDateTime& time) -{ - QString absolutePath = path; - makePathAbsoluteAndCreateParents(absolutePath); - - QFile f(absolutePath); - f.open(QIODevice::WriteOnly); - f.write(data); - f.close(); - - if (time.isValid()) { - setTimeStamp(absolutePath, time); - } - - Q_ASSERT(QFile::exists(absolutePath)); -} - -void TestBase::createFiles(const QStringList& files) -{ - foreach(const QString& path, files) { - createFile(path); - } -} - -void TestBase::createDir(const QString& path, const QDateTime& time) -{ - QString absolutePath = path; - makePathAbsoluteAndCreateParents(absolutePath); - m_dir->mkdir(absolutePath); - - if (time.isValid()) { - setTimeStamp(absolutePath, time); - } - - Q_ASSERT(QFile::exists(absolutePath)); -} - -QStringList TestBase::viewItems() const +QStringList TestBase::viewItems(const DolphinView* view) { QStringList itemList; - const QAbstractItemModel* model = itemView()->model(); + const QAbstractItemModel* model = itemView(view)->model(); for (int row = 0; row < model->rowCount(); row++) { itemList << model->data(model->index(row, 0), Qt::DisplayRole).toString(); @@ -136,29 +50,3 @@ QStringList TestBase::viewItems() const return itemList; } - -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); -} |
