Port test to qt5

diff --git a/src/tests/dolphinsearchboxtest.cpp b/src/tests/dolphinsearchboxtest.cpp
index af6b58d32792fd532304bb3bbbfce063d73d08bc..49bc7e8240bcac00934b8f5d23b11a6c1f19cfc2 100644 (file)
--- a/src/tests/dolphinsearchboxtest.cpp
+++ b/src/tests/dolphinsearchboxtest.cpp
@@ -17,7 +17,7 @@
  *   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 <qtest.h>

 
 #include "search/dolphinsearchbox.h"
 #include <qtestkeyboard.h>
 
 #include "search/dolphinsearchbox.h"
 #include <qtestkeyboard.h>


@@ -65,6 +65,6 @@ void DolphinSearchBoxTest::testTextClearing()
     QVERIFY(m_searchBox->text().isEmpty());
 }
 
     QVERIFY(m_searchBox->text().isEmpty());
 }
 

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

 
 #include "dolphinsearchboxtest.moc"
 
 #include "dolphinsearchboxtest.moc"

diff --git a/src/tests/kfileitemlistviewtest.cpp b/src/tests/kfileitemlistviewtest.cpp
index 9f17458403966f5788accfaeb460212ca3873134..4987e8d6530da9274e8536a3ee7eded070b37bbe 100644 (file)
--- a/src/tests/kfileitemlistviewtest.cpp
+++ b/src/tests/kfileitemlistviewtest.cpp
@@ -17,8 +17,8 @@
  *   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 <qtest.h>
+#include <QSignalSpy>

 #include "kitemviews/kfileitemlistview.h"
 #include "kitemviews/kfileitemmodel.h"
 #include "kitemviews/private/kfileitemmodeldirlister.h"
 #include "kitemviews/kfileitemlistview.h"
 #include "kitemviews/kfileitemmodel.h"
 #include "kitemviews/private/kfileitemmodeldirlister.h"


@@ -96,22 +96,25 @@ void KFileItemListViewTest::testGroupedItemChanges()
     m_testDir->createFiles(QStringList() << "1" << "3" << "5");
 
     m_model->loadDirectory(m_testDir->url());
     m_testDir->createFiles(QStringList() << "1" << "3" << "5");
 
     m_model->loadDirectory(m_testDir->url());

-    QVERIFY(QTest::kWaitForSignal(m_model, SIGNAL(itemsInserted(KItemRangeList)), DefaultTimeout));
+    QSignalSpy psy(m_model, SIGNAL(itemsInserted(KItemRangeList)));
+    QVERIFY(psy.wait(DefaultTimeout));

     QCOMPARE(m_model->count(), 3);
 
     m_testDir->createFiles(QStringList() << "2" << "4");
     m_model->m_dirLister->updateDirectory(m_testDir->url());
     QCOMPARE(m_model->count(), 3);
 
     m_testDir->createFiles(QStringList() << "2" << "4");
     m_model->m_dirLister->updateDirectory(m_testDir->url());

-    QVERIFY(QTest::kWaitForSignal(m_model, SIGNAL(itemsInserted(KItemRangeList)), DefaultTimeout));
+    QSignalSpy psyItemsInserted(m_model, SIGNAL(itemsInserted(KItemRangeList)));
+    QVERIFY(psyItemsInserted.wait(DefaultTimeout));

     QCOMPARE(m_model->count(), 5);
 
     m_testDir->removeFile("1");
     m_testDir->removeFile("3");
     m_testDir->removeFile("5");
     m_model->m_dirLister->updateDirectory(m_testDir->url());
     QCOMPARE(m_model->count(), 5);
 
     m_testDir->removeFile("1");
     m_testDir->removeFile("3");
     m_testDir->removeFile("5");
     m_model->m_dirLister->updateDirectory(m_testDir->url());

-    QVERIFY(QTest::kWaitForSignal(m_model, SIGNAL(itemsRemoved(KItemRangeList)), DefaultTimeout));
+    QSignalSpy psyItemsRemoved(m_model, SIGNAL(itemsRemoved(KItemRangeList)));
+    QVERIFY(psyItemsRemoved.wait(DefaultTimeout));

     QCOMPARE(m_model->count(), 2);
 }
 
     QCOMPARE(m_model->count(), 2);
 }
 

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

 
 #include "kfileitemlistviewtest.moc"
 
 #include "kfileitemlistviewtest.moc"

diff --git a/src/tests/kfileitemmodelbenchmark.cpp b/src/tests/kfileitemmodelbenchmark.cpp
index 66918b6eec50bd021da324f00a18a6004f0fe1a6..2e942222cb67d88da701e3d8d245b23072c66f8b 100644 (file)
--- a/src/tests/kfileitemmodelbenchmark.cpp
+++ b/src/tests/kfileitemmodelbenchmark.cpp
@@ -18,8 +18,8 @@
  *   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 <qtest.h>
+#include <QSignalSpy>

 #include "kitemviews/kfileitemmodel.h"
 #include "kitemviews/private/kfileitemmodelsortalgorithm.h"
 
 #include "kitemviews/kfileitemmodel.h"
 #include "kitemviews/private/kfileitemmodelsortalgorithm.h"
 


@@ -329,6 +329,6 @@ KFileItemList KFileItemModelBenchmark::createFileItemList(const QStringList& fil
     return result;
 }
 
     return result;
 }
 

-QTEST_KDEMAIN(KFileItemModelBenchmark, NoGUI)
+QTEST_MAIN(KFileItemModelBenchmark)

 
 #include "kfileitemmodelbenchmark.moc"
 
 #include "kfileitemmodelbenchmark.moc"

diff --git a/src/tests/kitemlistcontrollertest.cpp b/src/tests/kitemlistcontrollertest.cpp
index 7dd37bf0a3d60f78e5e56ec888d43ffe0db59073..42c0a8ed2c3410fea2f383f8e25a0633959ca8f0 100644 (file)
--- a/src/tests/kitemlistcontrollertest.cpp
+++ b/src/tests/kitemlistcontrollertest.cpp
@@ -17,7 +17,7 @@
  *   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 <qtest.h>

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


@@ -33,6 +33,7 @@
 #include <KGlobalSettings>
 
 #include <QGraphicsSceneMouseEvent>
 #include <KGlobalSettings>
 
 #include <QGraphicsSceneMouseEvent>

+#include <QSignalSpy>

 
 namespace {
     const int DefaultTimeout = 2000;
 
 namespace {
     const int DefaultTimeout = 2000;


@@ -102,7 +103,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(DefaultTimeout));

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


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

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

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

diff --git a/src/tests/kitemlistkeyboardsearchmanagertest.cpp b/src/tests/kitemlistkeyboardsearchmanagertest.cpp
index 7d5fc3b9ab94e9dfb142fd001251a644f16a5322..373f4f30120402cb257192375e87f393f0cb6c9e 100644 (file)
--- a/src/tests/kitemlistkeyboardsearchmanagertest.cpp
+++ b/src/tests/kitemlistkeyboardsearchmanagertest.cpp
@@ -17,8 +17,8 @@
  *   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 <qtest.h>
+#include <QSignalSpy>

 #include "kitemviews/private/kitemlistkeyboardsearchmanager.h"
 
 class KItemListKeyboardSearchManagerTest : public QObject
 #include "kitemviews/private/kitemlistkeyboardsearchmanager.h"
 
 class KItemListKeyboardSearchManagerTest : public QObject


@@ -147,6 +147,6 @@ void KItemListKeyboardSearchManagerTest::testPressShift()
     QCOMPARE(spy.takeFirst(), QList<QVariant>() << "a_b" << false);
 }
 
     QCOMPARE(spy.takeFirst(), QList<QVariant>() << "a_b" << false);
 }
 

-QTEST_KDEMAIN(KItemListKeyboardSearchManagerTest, NoGUI)
+QTEST_MAIN(KItemListKeyboardSearchManagerTest)

 
 #include "kitemlistkeyboardsearchmanagertest.moc"
 
 #include "kitemlistkeyboardsearchmanagertest.moc"

diff --git a/src/tests/kitemlistselectionmanagertest.cpp b/src/tests/kitemlistselectionmanagertest.cpp
index 492d0234ff7d50a26a5cc91b65211cf6728d12ae..b41b699a9d612ee71837a0f0149768cf0898b7ee 100644 (file)
--- a/src/tests/kitemlistselectionmanagertest.cpp
+++ b/src/tests/kitemlistselectionmanagertest.cpp
@@ -18,8 +18,8 @@
  *   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 <qtest.h>
+#include <QSignalSpy>

 #include "kitemviews/kitemmodelbase.h"
 #include "kitemviews/kitemlistselectionmanager.h"
 
 #include "kitemviews/kitemmodelbase.h"
 #include "kitemviews/kitemlistselectionmanager.h"
 


@@ -571,6 +571,6 @@ void KItemListSelectionManagerTest::verifySelectionChange(QSignalSpy& spy,
     }
 }
 
     }
 }
 

-QTEST_KDEMAIN(KItemListSelectionManagerTest, NoGUI)
+QTEST_MAIN(KItemListSelectionManagerTest)

 
 #include "kitemlistselectionmanagertest.moc"
 
 #include "kitemlistselectionmanagertest.moc"

diff --git a/src/tests/kitemrangetest.cpp b/src/tests/kitemrangetest.cpp
index 9f3f799808ee14db86939bd5af448d3a15193b9b..960530a7b151ea041a28887affaa8a9ec936c4b7 100644 (file)
--- a/src/tests/kitemrangetest.cpp
+++ b/src/tests/kitemrangetest.cpp
@@ -17,7 +17,7 @@
  *   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 <qtest.h>

 
 #include "kitemviews/kitemrange.h"
 
 
 #include "kitemviews/kitemrange.h"
 


@@ -70,6 +70,6 @@ void KItemRangeTest::testFromSortedContainer()
     QCOMPARE(expected, result);
 }
 
     QCOMPARE(expected, result);
 }
 

-QTEST_KDEMAIN(KItemRangeTest, NoGUI)
+QTEST_MAIN(KItemRangeTest)

 
 #include "kitemrangetest.moc"
 
 #include "kitemrangetest.moc"

diff --git a/src/tests/kitemsettest.cpp b/src/tests/kitemsettest.cpp
index 2832596ba689a6ef07b444e4a92447dd218b881d..9cc02d0604aabaa461a7a103c2ea468aea1d9d6f 100644 (file)
--- a/src/tests/kitemsettest.cpp
+++ b/src/tests/kitemsettest.cpp
@@ -17,7 +17,7 @@
  *   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 <qtest.h>

 
 #include "kitemviews/kitemset.h"
 
 
 #include "kitemviews/kitemset.h"
 


@@ -607,6 +607,6 @@ void KItemSetTest::testSymmetricDifference()
 }
 
 
 }
 
 

-QTEST_KDEMAIN(KItemSetTest, NoGUI)
+QTEST_MAIN(KItemSetTest)

 
 #include "kitemsettest.moc"
 
 #include "kitemsettest.moc"

diff --git a/src/tests/kstandarditemmodeltest.cpp b/src/tests/kstandarditemmodeltest.cpp
index 2de0d0b784368aa3f9b7e0acb85993c40a046de4..f7e61ce900f3d571d33ddc820c6159da478b0dc6 100644 (file)
--- a/src/tests/kstandarditemmodeltest.cpp
+++ b/src/tests/kstandarditemmodeltest.cpp
@@ -18,7 +18,7 @@
  *   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 <qtest.h>

 
 #include "kitemviews/kstandarditem.h"
 #include "kitemviews/kstandarditemmodel.h"
 
 #include "kitemviews/kstandarditem.h"
 #include "kitemviews/kstandarditemmodel.h"


@@ -112,6 +112,6 @@ bool KStandardItemModelTest::isModelConsistent() const
     return true;
 }
 
     return true;
 }
 

-QTEST_KDEMAIN(KStandardItemModelTest, NoGUI)
+QTEST_MAIN(KStandardItemModelTest)

 
 #include "kstandarditemmodeltest.moc"
 
 #include "kstandarditemmodeltest.moc"

diff --git a/src/tests/viewpropertiestest.cpp b/src/tests/viewpropertiestest.cpp
index c459f68746fa8d9458dcd6eab524262b56208513..6c72a5706b295cb06fa92d3db5cf9eebf0148839 100644 (file)
--- a/src/tests/viewpropertiestest.cpp
+++ b/src/tests/viewpropertiestest.cpp
@@ -17,7 +17,7 @@
  *   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 <qtest.h>

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


@@ -96,6 +96,6 @@ void ViewPropertiesTest::testAutoSave()
     QVERIFY(QFile::exists(dotDirectoryFile));
 }
 
     QVERIFY(QFile::exists(dotDirectoryFile));
 }
 

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

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