Merge branch 'master' into kf6

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

diff --git a/src/tests/viewpropertiestest.cpp b/src/tests/viewpropertiestest.cpp
index c459f68746fa8d9458dcd6eab524262b56208513..7b30203d273098d0984a3be2d24d15b098ae39d3 100644 (file)
--- a/src/tests/viewpropertiestest.cpp
+++ b/src/tests/viewpropertiestest.cpp
@@ -1,36 +1,21 @@
-/***************************************************************************
- *   Copyright (C) 2012 by Peter Penz <peter.penz19@gmail.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 <qtest_kde.h>
+/*
+ * SPDX-FileCopyrightText: 2012 Peter Penz <peter.penz19@gmail.com>
+ *
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */

 
 

-#include "dolphin_generalsettings.h"

 #include "views/viewproperties.h"
 #include "views/viewproperties.h"

+#include "dolphin_generalsettings.h"

 #include "testdir.h"
 
 #include "testdir.h"
 

-#include <QDebug>
-#include <QDir>
+#include <QTest>

 
 class ViewPropertiesTest : public QObject
 {
     Q_OBJECT
 
 
 class ViewPropertiesTest : public QObject
 {
     Q_OBJECT
 

-private slots:
+private Q_SLOTS:
+    void initTestCase();

     void init();
     void cleanup();
 
     void init();
     void cleanup();
 


@@ -39,13 +24,19 @@ private slots:
 
 private:
     bool m_globalViewProps;
 
 private:
     bool m_globalViewProps;

-    TestDir* m_testDir;
+    TestDir *m_testDir;

 };
 
 };
 

+void ViewPropertiesTest::initTestCase()
+{
+    QStandardPaths::setTestModeEnabled(true);
+}
+

 void ViewPropertiesTest::init()
 {
     m_globalViewProps = GeneralSettings::self()->globalViewProps();
     GeneralSettings::self()->setGlobalViewProps(false);
 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
 
     // It is mandatory to create the test-directory inside the home-directory
     // of the user: ViewProperties does not write inside directories


@@ -57,9 +48,10 @@ void ViewPropertiesTest::init()
 void ViewPropertiesTest::cleanup()
 {
     delete m_testDir;
 void ViewPropertiesTest::cleanup()
 {
     delete m_testDir;

-    m_testDir = 0;
+    m_testDir = nullptr;

 
     GeneralSettings::self()->setGlobalViewProps(m_globalViewProps);
 
     GeneralSettings::self()->setGlobalViewProps(m_globalViewProps);

+    GeneralSettings::self()->save();

 }
 
 /**
 }
 
 /**


@@ -69,33 +61,31 @@ void ViewPropertiesTest::cleanup()
  */
 void ViewPropertiesTest::testReadOnlyBehavior()
 {
  */
 void ViewPropertiesTest::testReadOnlyBehavior()
 {

-    QString dotDirectoryFile = m_testDir->url().toLocalFile() + ".directory";
+    QString dotDirectoryFile = m_testDir->url().toLocalFile() + "/.directory";

     QVERIFY(!QFile::exists(dotDirectoryFile));
 
     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();
     QVERIFY(props->isAutoSaveEnabled());
     const QByteArray sortRole = props->sortRole();

-    Q_UNUSED(sortRole);
-    delete props;
-    props = 0;
+    Q_UNUSED(sortRole)
+    props.reset();

 
     QVERIFY(!QFile::exists(dotDirectoryFile));
 }
 
 void ViewPropertiesTest::testAutoSave()
 {
 
     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));
 
     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");
     QVERIFY(props->isAutoSaveEnabled());
     props->setSortRole("someNewSortRole");

-    delete props;
-    props = 0;
+    props.reset();

 
     QVERIFY(QFile::exists(dotDirectoryFile));
 }
 
 
     QVERIFY(QFile::exists(dotDirectoryFile));
 }
 

-QTEST_KDEMAIN(ViewPropertiesTest, NoGUI)
+QTEST_GUILESS_MAIN(ViewPropertiesTest)

 
 #include "viewpropertiestest.moc"
 
 #include "viewpropertiestest.moc"