summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Lemire <paul.lemire@kdab.com>2016-06-14 12:06:14 +0200
committerPaul Lemire <paul.lemire@kdab.com>2016-06-30 19:15:51 +0000
commit2b0e9172305fc6abf0a2e8bba89008fbadbe8be2 (patch)
treed2a5f16d78b1f3bd1a4f7bdb216e55434ae6130c
parent4fffabbafe8e158783d98f595224bc38f0acbe86 (diff)
Fix threadpooler test to work with QT3D_JOBS_RUN_STATS
Change-Id: I0f5b949af420f162193403328815568c1c89eb5a Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
-rw-r--r--tests/auto/core/threadpooler/tst_threadpooler.cpp9
1 files changed, 5 insertions, 4 deletions
diff --git a/tests/auto/core/threadpooler/tst_threadpooler.cpp b/tests/auto/core/threadpooler/tst_threadpooler.cpp
index 6dc7925b2..2fc6e8c3b 100644
--- a/tests/auto/core/threadpooler/tst_threadpooler.cpp
+++ b/tests/auto/core/threadpooler/tst_threadpooler.cpp
@@ -37,6 +37,7 @@
#include <Qt3DCore/private/qaspectjobmanager_p.h>
#include <Qt3DCore/private/qabstractaspectjobmanager_p.h>
+#include <Qt3DCore/private/qthreadpooler_p.h>
#include <Qt3DCore/qaspectjob.h>
#include <Qt3DCore/qt3dcore_global.h>
#include <qmath.h>
@@ -56,8 +57,8 @@ private:
Qt3DCore::QAspectJobManager *m_jobManager;
private Q_SLOTS:
- void init();
- void cleanup();
+ void initTestCase();
+ void cleanupTestCase();
void defaultPerThread();
void defaultAspectQueue();
@@ -178,12 +179,12 @@ void massTestFunction(QVector3D *data)
data->setZ(result.z());
}
-void tst_ThreadPooler::init()
+void tst_ThreadPooler::initTestCase()
{
m_jobManager = new JobManager(this);
}
-void tst_ThreadPooler::cleanup()
+void tst_ThreadPooler::cleanupTestCase()
{
delete m_jobManager;
}