Fix for crash which was introduced by commit

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

diff --git a/src/tests/kitemlistcontrollertest.cpp b/src/tests/kitemlistcontrollertest.cpp
index 7dd37bf0a3d60f78e5e56ec888d43ffe0db59073..cd4d0a681b43dae9838f2f176def2ae5300442ff 100644 (file)
--- a/src/tests/kitemlistcontrollertest.cpp
+++ b/src/tests/kitemlistcontrollertest.cpp
@@ -17,10 +17,6 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA            *
  ***************************************************************************/
 
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA            *
  ***************************************************************************/
 

-#include <qtest_kde.h>
-#include <qtestmouse.h>
-#include <qtestkeyboard.h>
-

 #include "kitemviews/kitemlistcontainer.h"
 #include "kitemviews/kfileitemlistview.h"
 #include "kitemviews/kfileitemmodel.h"
 #include "kitemviews/kitemlistcontainer.h"
 #include "kitemviews/kfileitemlistview.h"
 #include "kitemviews/kfileitemmodel.h"


@@ -32,11 +28,9 @@
 #include <KConfigGroup>
 #include <KGlobalSettings>
 
 #include <KConfigGroup>
 #include <KGlobalSettings>
 

+#include <QTest>

 #include <QGraphicsSceneMouseEvent>
 #include <QGraphicsSceneMouseEvent>

-
-namespace {
-    const int DefaultTimeout = 2000;
-};
+#include <QSignalSpy>

 
 Q_DECLARE_METATYPE(KFileItemListView::ItemLayout);
 Q_DECLARE_METATYPE(Qt::Orientation);
 
 Q_DECLARE_METATYPE(KFileItemListView::ItemLayout);
 Q_DECLARE_METATYPE(Qt::Orientation);


@@ -102,7 +96,8 @@ void KItemListControllerTest::initTestCase()
 
     m_testDir->createFiles(files);
     m_model->loadDirectory(m_testDir->url());
 
     m_testDir->createFiles(files);
     m_model->loadDirectory(m_testDir->url());

-    QVERIFY(QTest::kWaitForSignal(m_model, SIGNAL(directoryLoadingCompleted()), DefaultTimeout));
+    QSignalSpy spyDirectoryLoadingCompleted(m_model, SIGNAL(directoryLoadingCompleted()));
+    QVERIFY(spyDirectoryLoadingCompleted.wait());

 
     m_container->show();
     QTest::qWaitForWindowShown(m_container);
 
     m_container->show();
     QTest::qWaitForWindowShown(m_container);


@@ -565,7 +560,7 @@ void KItemListControllerTest::testMouseClickActivation()
 
     if (!KGlobalSettings::singleClick()) {
         // TODO: Try to find a way to make sure that changing the global setting works.
 
     if (!KGlobalSettings::singleClick()) {
         // TODO: Try to find a way to make sure that changing the global setting works.

-        QSKIP("Failed to change the KGlobalSettings::singleClick() setting!", SkipSingle);
+        QSKIP("Failed to change the KGlobalSettings::singleClick() setting!");

     }
 
     m_view->event(&mousePressEvent);
     }
 
     m_view->event(&mousePressEvent);


@@ -586,7 +581,7 @@ void KItemListControllerTest::testMouseClickActivation()
 
     if (KGlobalSettings::singleClick()) {
         // TODO: Try to find a way to make sure that changing the global setting works.
 
     if (KGlobalSettings::singleClick()) {
         // TODO: Try to find a way to make sure that changing the global setting works.

-        QSKIP("Failed to change the KGlobalSettings::singleClick() setting!", SkipSingle);
+        QSKIP("Failed to change the KGlobalSettings::singleClick() setting!");

     }
 
     m_view->event(&mousePressEvent);
     }
 
     m_view->event(&mousePressEvent);


@@ -621,7 +616,7 @@ void KItemListControllerTest::testMouseClickActivation()
 
     if (!KGlobalSettings::singleClick()) {
         // TODO: Try to find a way to make sure that changing the global setting works.
 
     if (!KGlobalSettings::singleClick()) {
         // TODO: Try to find a way to make sure that changing the global setting works.

-        QSKIP("Failed to change the KGlobalSettings::singleClick() setting!", SkipSingle);
+        QSKIP("Failed to change the KGlobalSettings::singleClick() setting!");

     }
 
     m_view->event(&mousePressEvent);
     }
 
     m_view->event(&mousePressEvent);


@@ -650,7 +645,7 @@ void KItemListControllerTest::testMouseClickActivation()
 
     if (KGlobalSettings::singleClick() != restoreKGlobalSettingsSingleClick) {
         // TODO: Try to find a way to make sure that changing the global setting works.
 
     if (KGlobalSettings::singleClick() != restoreKGlobalSettingsSingleClick) {
         // TODO: Try to find a way to make sure that changing the global setting works.

-        QSKIP("Failed to change the KGlobalSettings::singleClick() setting!", SkipSingle);
+        QSKIP("Failed to change the KGlobalSettings::singleClick() setting!");

     }
 }
 
     }
 }
 


@@ -670,6 +665,6 @@ void KItemListControllerTest::adjustGeometryForColumnCount(int count)
     }
 }
 
     }
 }
 

-QTEST_KDEMAIN(KItemListControllerTest, GUI)
+QTEST_MAIN(KItemListControllerTest)

 
 #include "kitemlistcontrollertest.moc"
 
 #include "kitemlistcontrollertest.moc"