From 938a83b8b12d34087b17c27c29f8f7b7d70d19c8 Mon Sep 17 00:00:00 2001 From: Montel Laurent Date: Sat, 18 Oct 2014 14:36:34 +0200 Subject: [PATCH] Port test to qt5 --- src/tests/dolphinsearchboxtest.cpp | 4 ++-- src/tests/kfileitemlistviewtest.cpp | 15 +++++++++------ src/tests/kfileitemmodelbenchmark.cpp | 6 +++--- src/tests/kitemlistcontrollertest.cpp | 8 +++++--- src/tests/kitemlistkeyboardsearchmanagertest.cpp | 6 +++--- src/tests/kitemlistselectionmanagertest.cpp | 6 +++--- src/tests/kitemrangetest.cpp | 4 ++-- src/tests/kitemsettest.cpp | 4 ++-- src/tests/kstandarditemmodeltest.cpp | 4 ++-- src/tests/viewpropertiestest.cpp | 4 ++-- 10 files changed, 33 insertions(+), 28 deletions(-) diff --git a/src/tests/dolphinsearchboxtest.cpp b/src/tests/dolphinsearchboxtest.cpp index af6b58d327..49bc7e8240 100644 --- a/src/tests/dolphinsearchboxtest.cpp +++ b/src/tests/dolphinsearchboxtest.cpp @@ -17,7 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * ***************************************************************************/ -#include +#include #include "search/dolphinsearchbox.h" #include @@ -65,6 +65,6 @@ void DolphinSearchBoxTest::testTextClearing() QVERIFY(m_searchBox->text().isEmpty()); } -QTEST_KDEMAIN(DolphinSearchBoxTest, GUI) +QTEST_MAIN(DolphinSearchBoxTest) #include "dolphinsearchboxtest.moc" diff --git a/src/tests/kfileitemlistviewtest.cpp b/src/tests/kfileitemlistviewtest.cpp index 9f17458403..4987e8d653 100644 --- a/src/tests/kfileitemlistviewtest.cpp +++ b/src/tests/kfileitemlistviewtest.cpp @@ -17,8 +17,8 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * ***************************************************************************/ -#include - +#include +#include #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()); - 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()); - 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()); - 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); } -QTEST_KDEMAIN(KFileItemListViewTest, GUI) +QTEST_MAIN(KFileItemListViewTest) #include "kfileitemlistviewtest.moc" diff --git a/src/tests/kfileitemmodelbenchmark.cpp b/src/tests/kfileitemmodelbenchmark.cpp index 66918b6eec..2e942222cb 100644 --- a/src/tests/kfileitemmodelbenchmark.cpp +++ b/src/tests/kfileitemmodelbenchmark.cpp @@ -18,8 +18,8 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * ***************************************************************************/ -#include - +#include +#include #include "kitemviews/kfileitemmodel.h" #include "kitemviews/private/kfileitemmodelsortalgorithm.h" @@ -329,6 +329,6 @@ KFileItemList KFileItemModelBenchmark::createFileItemList(const QStringList& fil return result; } -QTEST_KDEMAIN(KFileItemModelBenchmark, NoGUI) +QTEST_MAIN(KFileItemModelBenchmark) #include "kfileitemmodelbenchmark.moc" diff --git a/src/tests/kitemlistcontrollertest.cpp b/src/tests/kitemlistcontrollertest.cpp index 7dd37bf0a3..42c0a8ed2c 100644 --- a/src/tests/kitemlistcontrollertest.cpp +++ b/src/tests/kitemlistcontrollertest.cpp @@ -17,7 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * ***************************************************************************/ -#include +#include #include #include @@ -33,6 +33,7 @@ #include #include +#include namespace { const int DefaultTimeout = 2000; @@ -102,7 +103,8 @@ void KItemListControllerTest::initTestCase() 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); @@ -670,6 +672,6 @@ void KItemListControllerTest::adjustGeometryForColumnCount(int count) } } -QTEST_KDEMAIN(KItemListControllerTest, GUI) +QTEST_MAIN(KItemListControllerTest) #include "kitemlistcontrollertest.moc" diff --git a/src/tests/kitemlistkeyboardsearchmanagertest.cpp b/src/tests/kitemlistkeyboardsearchmanagertest.cpp index 7d5fc3b9ab..373f4f3012 100644 --- a/src/tests/kitemlistkeyboardsearchmanagertest.cpp +++ b/src/tests/kitemlistkeyboardsearchmanagertest.cpp @@ -17,8 +17,8 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * ***************************************************************************/ -#include - +#include +#include #include "kitemviews/private/kitemlistkeyboardsearchmanager.h" class KItemListKeyboardSearchManagerTest : public QObject @@ -147,6 +147,6 @@ void KItemListKeyboardSearchManagerTest::testPressShift() QCOMPARE(spy.takeFirst(), QList() << "a_b" << false); } -QTEST_KDEMAIN(KItemListKeyboardSearchManagerTest, NoGUI) +QTEST_MAIN(KItemListKeyboardSearchManagerTest) #include "kitemlistkeyboardsearchmanagertest.moc" diff --git a/src/tests/kitemlistselectionmanagertest.cpp b/src/tests/kitemlistselectionmanagertest.cpp index 492d0234ff..b41b699a9d 100644 --- a/src/tests/kitemlistselectionmanagertest.cpp +++ b/src/tests/kitemlistselectionmanagertest.cpp @@ -18,8 +18,8 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * ***************************************************************************/ -#include - +#include +#include #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" diff --git a/src/tests/kitemrangetest.cpp b/src/tests/kitemrangetest.cpp index 9f3f799808..960530a7b1 100644 --- a/src/tests/kitemrangetest.cpp +++ b/src/tests/kitemrangetest.cpp @@ -17,7 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * ***************************************************************************/ -#include +#include #include "kitemviews/kitemrange.h" @@ -70,6 +70,6 @@ void KItemRangeTest::testFromSortedContainer() QCOMPARE(expected, result); } -QTEST_KDEMAIN(KItemRangeTest, NoGUI) +QTEST_MAIN(KItemRangeTest) #include "kitemrangetest.moc" diff --git a/src/tests/kitemsettest.cpp b/src/tests/kitemsettest.cpp index 2832596ba6..9cc02d0604 100644 --- a/src/tests/kitemsettest.cpp +++ b/src/tests/kitemsettest.cpp @@ -17,7 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * ***************************************************************************/ -#include +#include #include "kitemviews/kitemset.h" @@ -607,6 +607,6 @@ void KItemSetTest::testSymmetricDifference() } -QTEST_KDEMAIN(KItemSetTest, NoGUI) +QTEST_MAIN(KItemSetTest) #include "kitemsettest.moc" diff --git a/src/tests/kstandarditemmodeltest.cpp b/src/tests/kstandarditemmodeltest.cpp index 2de0d0b784..f7e61ce900 100644 --- a/src/tests/kstandarditemmodeltest.cpp +++ b/src/tests/kstandarditemmodeltest.cpp @@ -18,7 +18,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * ***************************************************************************/ -#include +#include #include "kitemviews/kstandarditem.h" #include "kitemviews/kstandarditemmodel.h" @@ -112,6 +112,6 @@ bool KStandardItemModelTest::isModelConsistent() const return true; } -QTEST_KDEMAIN(KStandardItemModelTest, NoGUI) +QTEST_MAIN(KStandardItemModelTest) #include "kstandarditemmodeltest.moc" diff --git a/src/tests/viewpropertiestest.cpp b/src/tests/viewpropertiestest.cpp index c459f68746..6c72a5706b 100644 --- a/src/tests/viewpropertiestest.cpp +++ b/src/tests/viewpropertiestest.cpp @@ -17,7 +17,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * ***************************************************************************/ -#include +#include #include "dolphin_generalsettings.h" #include "views/viewproperties.h" @@ -96,6 +96,6 @@ void ViewPropertiesTest::testAutoSave() QVERIFY(QFile::exists(dotDirectoryFile)); } -QTEST_KDEMAIN(ViewPropertiesTest, NoGUI) +QTEST_MAIN(ViewPropertiesTest) #include "viewpropertiestest.moc"