KDirectoryContentsCounter: scan first path not in cache

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

diff --git a/src/tests/viewpropertiestest.cpp b/src/tests/viewpropertiestest.cpp
index ba2ca307c86ec567a8bd446c0cb6dade55f229f2..6e04522097c62eb838ce28719171b48b09443b77 100644 (file)
--- a/src/tests/viewpropertiestest.cpp
+++ b/src/tests/viewpropertiestest.cpp
@@ -22,7 +22,6 @@
 #include "testdir.h"
 
 #include <QTest>
-#include <QDir>
 
 class ViewPropertiesTest : public QObject
 {
@@ -44,6 +43,7 @@ void ViewPropertiesTest::init()
 {
     m_globalViewProps = GeneralSettings::self()->globalViewProps();
     GeneralSettings::self()->setGlobalViewProps(false);
+    GeneralSettings::self()->save();
 
     // It is mandatory to create the test-directory inside the home-directory
     // of the user: ViewProperties does not write inside directories
@@ -55,9 +55,10 @@ void ViewPropertiesTest::init()
 void ViewPropertiesTest::cleanup()
 {
     delete m_testDir;
-    m_testDir = 0;
+    m_testDir = nullptr;
 
     GeneralSettings::self()->setGlobalViewProps(m_globalViewProps);
+    GeneralSettings::self()->save();
 }
 
 /**
@@ -73,7 +74,7 @@ void ViewPropertiesTest::testReadOnlyBehavior()
     QScopedPointer<ViewProperties> props(new ViewProperties(m_testDir->url()));
     QVERIFY(props->isAutoSaveEnabled());
     const QByteArray sortRole = props->sortRole();
-    Q_UNUSED(sortRole);
+    Q_UNUSED(sortRole)
     props.reset();
 
     QVERIFY(!QFile::exists(dotDirectoryFile));
@@ -92,6 +93,6 @@ void ViewPropertiesTest::testAutoSave()
     QVERIFY(QFile::exists(dotDirectoryFile));
 }
 
-QTEST_MAIN(ViewPropertiesTest)
+QTEST_GUILESS_MAIN(ViewPropertiesTest)
 
 #include "viewpropertiestest.moc"