From 938a83b8b12d34087b17c27c29f8f7b7d70d19c8 Mon Sep 17 00:00:00 2001 From: Montel Laurent Date: Sat, 18 Oct 2014 14:36:34 +0200 Subject: Port test to qt5 --- src/tests/kitemlistcontrollertest.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'src/tests/kitemlistcontrollertest.cpp') diff --git a/src/tests/kitemlistcontrollertest.cpp b/src/tests/kitemlistcontrollertest.cpp index 7dd37bf0a..42c0a8ed2 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" -- cgit v1.3