kde/dolphin
kde/dolphin
1
0
Fork 0
mirror of https://invent.kde.org/system/dolphin synced 2024-09-12 12:54:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'Applications/19.04'

Browse source
This commit is contained in:
Elvis Angelaccio 2019-05-05 17:02:59 +02:00
parent f3a86bf29e d41d3be348
commit 8989e52088
1 changed files with 5 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/tests/placesitemmodeltest.cpp
View file

@ -99,8 +99,8 @@ private:
void createPlaceItem(const QString &text, const QUrl &url, const QString &icon);
void schedulePlaceRemoval(int index);
void cancelPlaceRemoval(int index);
void removeTestUserData();
QMimeData *createMimeData(const QList<int> &indexes) const;
QTemporaryDir m_tempHomeDir;
};
#define CHECK_PLACES_URLS(urls) \
@ -201,15 +201,6 @@ void PlacesItemModelTest::cancelPlaceRemoval(int index)
m_tobeRemoved.remove(index);
}
void PlacesItemModelTest::removeTestUserData()
{
// user hardcoded path to avoid removal of any user personal data
QDir dir(QStringLiteral("/home/renato/.qttest/share/placesitemmodeltest"));
if (dir.exists()) {
QVERIFY(dir.removeRecursively());
}
}
QMimeData *PlacesItemModelTest::createMimeData(const QList<int> &indexes) const
{
QByteArray itemData;
@ -252,14 +243,15 @@ void PlacesItemModelTest::cleanup()
m_tobeRemoved.clear();
delete m_model;
m_model = nullptr;
removeTestUserData();
}
void PlacesItemModelTest::initTestCase()
{
QVERIFY(m_tempHomeDir.isValid());
QVERIFY(qputenv("HOME", m_tempHomeDir.path().toUtf8()));
QVERIFY(qputenv("KDE_FORK_SLAVES", "yes"));
QStandardPaths::setTestModeEnabled(true);
// remove test user data
removeTestUserData();
const QString fakeHw = QFINDTESTDATA("data/fakecomputer.xml");
QVERIFY(!fakeHw.isEmpty());
@ -290,9 +282,6 @@ void PlacesItemModelTest::cleanupTestCase()
{
qDeleteAll(m_interfacesMap);
QFile::remove(bookmarksFile());
// Remove any previous properties file
removeTestUserData();
}
void PlacesItemModelTest::testModelSort()