┌   ┐
54
└   ┘

summaryrefslogtreecommitdiff
path: root/src/tests/kitemlistcontrollertest.cpp
diff options
context:
space:
mode:
authorMontel Laurent <[email protected]>2014-10-18 14:36:34 +0200
committerMontel Laurent <[email protected]>2014-10-18 14:36:34 +0200
commit938a83b8b12d34087b17c27c29f8f7b7d70d19c8 (patch)
tree2e57a66334bb54269996e90d35c997528ea36fbe /src/tests/kitemlistcontrollertest.cpp
parent01e4f60a0931aba506b184d384a4e2f926b2233c (diff)
Port test to qt5
Diffstat (limited to 'src/tests/kitemlistcontrollertest.cpp')
-rw-r--r--src/tests/kitemlistcontrollertest.cpp8
1 files changed, 5 insertions, 3 deletions
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 <qtest_kde.h>
+#include <qtest.h>
#include <qtestmouse.h>
#include <qtestkeyboard.h>
@@ -33,6 +33,7 @@
#include <KGlobalSettings>
#include <QGraphicsSceneMouseEvent>
+#include <QSignalSpy>
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"