summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorPaul Lemire <paul.lemire@kdab.com>2018-01-22 12:01:09 +0100
committerPaul Lemire <paul.lemire@kdab.com>2018-01-23 10:13:47 +0000
commit947d5aa3ffffbf3387f53259720459562b4109c8 (patch)
tree6a8b6c47db14a350a237f784d7b5eb3646489245 /tests
parent3957f6c8a6c47b6712a2f0e552b23799b2a89b14 (diff)
SceneManager: rename pendingSceneLoaderJobs()
Renamed to takePendingSceneLoaderJobs() as the name better indicates we are resetting the vector of jobs internally. Change-Id: I68a16139994552b7b26f1cf88a206a61a30950e0 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/render/sceneloader/tst_sceneloader.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/auto/render/sceneloader/tst_sceneloader.cpp b/tests/auto/render/sceneloader/tst_sceneloader.cpp
index 9aac50c73..257b1dbb8 100644
--- a/tests/auto/render/sceneloader/tst_sceneloader.cpp
+++ b/tests/auto/render/sceneloader/tst_sceneloader.cpp
@@ -52,7 +52,7 @@ private Q_SLOTS:
// THEN
QVERIFY(sceneLoader.source().isEmpty());
QVERIFY(sceneLoader.peerId().isNull());
- QVERIFY(sceneManager.pendingSceneLoaderJobs().isEmpty());
+ QVERIFY(sceneManager.takePendingSceneLoaderJobs().isEmpty());
// GIVEN
@@ -91,7 +91,7 @@ private Q_SLOTS:
// THEN
QCOMPARE(sceneLoader.peerId(), frontendSceneLoader.id());
QCOMPARE(sceneLoader.source(), frontendSceneLoader.source());
- QVERIFY(!sceneManager.pendingSceneLoaderJobs().isEmpty());
+ QVERIFY(!sceneManager.takePendingSceneLoaderJobs().isEmpty());
}
void checkPropertyChanges()
@@ -105,7 +105,7 @@ private Q_SLOTS:
sceneLoader.setSceneManager(&sceneManager);
// THEN
- QVERIFY(sceneManager.pendingSceneLoaderJobs().isEmpty());
+ QVERIFY(sceneManager.takePendingSceneLoaderJobs().isEmpty());
// WHEN
Qt3DCore::QPropertyUpdatedChangePtr updateChange(new Qt3DCore::QPropertyUpdatedChange(Qt3DCore::QNodeId()));
@@ -116,7 +116,7 @@ private Q_SLOTS:
// THEN
QCOMPARE(sceneLoader.source(), newUrl);
- QVERIFY(!sceneManager.pendingSceneLoaderJobs().isEmpty());
+ QVERIFY(!sceneManager.takePendingSceneLoaderJobs().isEmpty());
// WHEN
updateChange = QSharedPointer<Qt3DCore::QPropertyUpdatedChange>::create(Qt3DCore::QNodeId());