Correct searchbox, split view transitions between tabs

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

diff --git a/src/tests/viewpropertiestest.cpp b/src/tests/viewpropertiestest.cpp
index d5584ce82b1be8bb8777fe89760e469b9b811173..114afdc33c9082830cc545eb7ee27f01125e7157 100644 (file)
--- a/src/tests/viewpropertiestest.cpp
+++ b/src/tests/viewpropertiestest.cpp
@@ -17,12 +17,11 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA            *
  ***************************************************************************/
 
  *   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 "dolphin_generalsettings.h"
 #include "views/viewproperties.h"
 #include "testdir.h"
 

+#include <QTest>

 #include <QDir>
 
 class ViewPropertiesTest : public QObject
 #include <QDir>
 
 class ViewPropertiesTest : public QObject


@@ -45,6 +44,7 @@ void ViewPropertiesTest::init()
 {
     m_globalViewProps = GeneralSettings::self()->globalViewProps();
     GeneralSettings::self()->setGlobalViewProps(false);
 {
     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


@@ -59,6 +59,7 @@ void ViewPropertiesTest::cleanup()
     m_testDir = 0;
 
     GeneralSettings::self()->setGlobalViewProps(m_globalViewProps);
     m_testDir = 0;
 
     GeneralSettings::self()->setGlobalViewProps(m_globalViewProps);

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

 }
 
 /**
 }
 
 /**


@@ -68,33 +69,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();
     Q_UNUSED(sortRole);
     QVERIFY(props->isAutoSaveEnabled());
     const QByteArray sortRole = props->sortRole();
     Q_UNUSED(sortRole);

-    delete props;
-    props = 0;
+    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_MAIN(ViewPropertiesTest)
+QTEST_GUILESS_MAIN(ViewPropertiesTest)

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