X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/fa988586bc923b33497cbc97aaac07fc93a4ca83..c72fdaa77380ef811dfef626a4edadbb824ed252:/src/tests/viewpropertiestest.cpp

diff --git a/src/tests/viewpropertiestest.cpp b/src/tests/viewpropertiestest.cpp
index d5584ce82..0cd55662d 100644
--- a/src/tests/viewpropertiestest.cpp
+++ b/src/tests/viewpropertiestest.cpp
@@ -17,13 +17,11 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA            *
  ***************************************************************************/
 
-#include <qtest.h>
-
 #include "dolphin_generalsettings.h"
 #include "views/viewproperties.h"
 #include "testdir.h"
 
-#include <QDir>
+#include <QTest>
 
 class ViewPropertiesTest : public QObject
 {
@@ -45,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
@@ -56,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();
 }
 
 /**
@@ -68,33 +68,31 @@ void ViewPropertiesTest::cleanup()
  */
 void ViewPropertiesTest::testReadOnlyBehavior()
 {
-    QString dotDirectoryFile = m_testDir->url().toLocalFile() + ".directory";
+    QString dotDirectoryFile = m_testDir->url().toLocalFile() + "/.directory";
     QVERIFY(!QFile::exists(dotDirectoryFile));
 
-    ViewProperties* props = new ViewProperties(m_testDir->url());
+    QScopedPointer<ViewProperties> props(new ViewProperties(m_testDir->url()));
     QVERIFY(props->isAutoSaveEnabled());
     const QByteArray sortRole = props->sortRole();
     Q_UNUSED(sortRole);
-    delete props;
-    props = 0;
+    props.reset();
 
     QVERIFY(!QFile::exists(dotDirectoryFile));
 }
 
 void ViewPropertiesTest::testAutoSave()
 {
-    QString dotDirectoryFile = m_testDir->url().toLocalFile() + ".directory";
+    QString dotDirectoryFile = m_testDir->url().toLocalFile() + "/.directory";
     QVERIFY(!QFile::exists(dotDirectoryFile));
 
-    ViewProperties* props = new ViewProperties(m_testDir->url());
+    QScopedPointer<ViewProperties> props(new ViewProperties(m_testDir->url()));
     QVERIFY(props->isAutoSaveEnabled());
     props->setSortRole("someNewSortRole");
-    delete props;
-    props = 0;
+    props.reset();
 
     QVERIFY(QFile::exists(dotDirectoryFile));
 }
 
-QTEST_MAIN(ViewPropertiesTest)
+QTEST_GUILESS_MAIN(ViewPropertiesTest)
 
 #include "viewpropertiestest.moc"