diff options
author | Sean Harmer <sean.harmer@kdab.com> | 2018-01-12 14:17:40 +0000 |
---|---|---|
committer | Sean Harmer <sean.harmer@kdab.com> | 2018-01-12 15:07:06 +0000 |
commit | 417b32815d5d6c45a6c8b4d38b62ca10119d14fd (patch) | |
tree | 5c910952affff3d376cbe84b7130be9ee7d6a577 /tests/auto/core | |
parent | 1d5f8b8536c1b0165c2292529dc3814e96bb0a27 (diff) | |
parent | c9edc164ab165ddd31ef2411be19deb130614e8b (diff) |
Merge branch '5.9' into 5.10
Conflicts:
.qmake.conf
src/animation/backend/handle_types_p.h
src/extras/defaults/qtexturematerial.h
src/render/backend/entity_p.h
src/render/backend/handle_types_p.h
src/render/backend/renderview.cpp
src/render/io/scenemanager.cpp
Change-Id: Ic145062cc98360e9067fd60f0992c7a6b51e41bb
Diffstat (limited to 'tests/auto/core')
-rw-r--r-- | tests/auto/core/qresourcemanager/tst_qresourcemanager.cpp | 73 |
1 files changed, 35 insertions, 38 deletions
diff --git a/tests/auto/core/qresourcemanager/tst_qresourcemanager.cpp b/tests/auto/core/qresourcemanager/tst_qresourcemanager.cpp index b7bd7c28a..9a387a919 100644 --- a/tests/auto/core/qresourcemanager/tst_qresourcemanager.cpp +++ b/tests/auto/core/qresourcemanager/tst_qresourcemanager.cpp @@ -31,12 +31,12 @@ #include <Qt3DCore/private/qhandle_p.h> #include <Qt3DCore/private/qresourcemanager_p.h> -class tst_DynamicArrayPolicy : public QObject +class tst_QResourceManager : public QObject { Q_OBJECT public: - tst_DynamicArrayPolicy() {} - ~tst_DynamicArrayPolicy() {} + tst_QResourceManager() {} + ~tst_QResourceManager() {} private slots: void createResourcesManager(); @@ -48,7 +48,7 @@ private slots: void releaseResource(); void heavyDutyMultiThreadedAccess(); void heavyDutyMultiThreadedAccessRelease(); - void maximumNumberOfResources(); + void collectResources(); void activeHandles(); }; @@ -68,29 +68,21 @@ Q_DECLARE_RESOURCE_INFO(tst_ArrayResource, Q_REQUIRES_CLEANUP) QT_END_NAMESPACE typedef Qt3DCore::QHandle<tst_ArrayResource> tHandle; -typedef Qt3DCore::QHandle<tst_ArrayResource, 4> tHandle4; -typedef Qt3DCore::QHandle<tst_ArrayResource, 8> tHandle8; -typedef Qt3DCore::QHandle<tst_ArrayResource, 16> tHandle16; -void tst_DynamicArrayPolicy::createResourcesManager() +void tst_QResourceManager::createResourcesManager() { - Qt3DCore::QResourceManager<tst_ArrayResource, int, 16> manager16; - Qt3DCore::QResourceManager<tst_ArrayResource, int, 4> manager4; - Qt3DCore::QResourceManager<tst_ArrayResource, int, 8> manager8; - QVERIFY(manager16.maximumSize() == 65535); - QVERIFY(manager8.maximumSize() == 255); - QVERIFY(manager4.maximumSize() == 15); + Qt3DCore::QResourceManager<tst_ArrayResource, int> manager; } /*! * Check that the handles returned when a registering resources * have a correct index and counter. */ -void tst_DynamicArrayPolicy::acquireResources() +void tst_QResourceManager::acquireResources() { - Qt3DCore::QResourceManager<tst_ArrayResource, uint, 4> manager; + Qt3DCore::QResourceManager<tst_ArrayResource, uint> manager; - QList<tHandle4> handles; + QList<tHandle> handles; for (int i = 0; i < 5; i++) { handles << manager.acquire(); @@ -106,12 +98,12 @@ void tst_DynamicArrayPolicy::acquireResources() /*! * Test that values can be properly retrieved. */ -void tst_DynamicArrayPolicy::getResources() +void tst_QResourceManager::getResources() { - Qt3DCore::QResourceManager<tst_ArrayResource, int, 8> manager; + Qt3DCore::QResourceManager<tst_ArrayResource, int> manager; QList<tst_ArrayResource *> resources; - QList<tHandle8> handles; + QList<tHandle> handles; for (int i = 0; i < 5; i++) { handles << manager.acquire(); @@ -127,7 +119,7 @@ void tst_DynamicArrayPolicy::getResources() QVERIFY(manager.data(handles.at(i))->m_value == i); // Check that an invalid resource returns NULL - tHandle8 iHandle; + tHandle iHandle; QVERIFY(manager.data(iHandle) == nullptr); } @@ -136,10 +128,10 @@ void tst_DynamicArrayPolicy::getResources() * Test that when a resize of the data vectors in the manager occurs, * everything behaves correctly. */ -void tst_DynamicArrayPolicy::registerResourcesResize() +void tst_QResourceManager::registerResourcesResize() { - Qt3DCore::QResourceManager<tst_ArrayResource, uint, 16> manager; - QList<tHandle16> handles; + Qt3DCore::QResourceManager<tst_ArrayResource, uint> manager; + QList<tHandle> handles; for (uint i = 0; i < 2; i++) { handles << manager.acquire(); @@ -162,7 +154,7 @@ void tst_DynamicArrayPolicy::registerResourcesResize() /*! * Checks for the removal of resources. */ -void tst_DynamicArrayPolicy::removeResource() +void tst_QResourceManager::removeResource() { Qt3DCore::QResourceManager<tst_ArrayResource, int> manager; @@ -185,12 +177,12 @@ void tst_DynamicArrayPolicy::removeResource() QVERIFY(manager.data(nHandle) != nullptr); } -void tst_DynamicArrayPolicy::lookupResource() +void tst_QResourceManager::lookupResource() { Qt3DCore::QResourceManager<tst_ArrayResource, uint> manager; QList<tst_ArrayResource *> resources; - QList<tHandle16> handles; + QList<tHandle> handles; for (int i = 0; i < 5; i++) { handles << manager.acquire(); @@ -198,7 +190,7 @@ void tst_DynamicArrayPolicy::lookupResource() resources.at(i)->m_value = 4; } - tHandle16 t = manager.lookupHandle(2); + tHandle t = manager.lookupHandle(2); QVERIFY(t.handle() == 0); QVERIFY(manager.data(t) == nullptr); tst_ArrayResource *resource = manager.getOrCreateResource(2); @@ -210,7 +202,7 @@ void tst_DynamicArrayPolicy::lookupResource() QVERIFY(manager.data(t) == resource); } -void tst_DynamicArrayPolicy::releaseResource() +void tst_QResourceManager::releaseResource() { Qt3DCore::QResourceManager<tst_ArrayResource, uint> manager; QList<tst_ArrayResource *> resources; @@ -236,7 +228,6 @@ public: typedef Qt3DCore::QResourceManager<tst_ArrayResource, int, - 16, Qt3DCore::ObjectLevelLockingPolicy> Manager; tst_Thread() @@ -267,7 +258,7 @@ protected: Manager *m_manager; }; -void tst_DynamicArrayPolicy::heavyDutyMultiThreadedAccess() +void tst_QResourceManager::heavyDutyMultiThreadedAccess() { tst_Thread::Manager *manager = new tst_Thread::Manager(); @@ -306,7 +297,6 @@ public: typedef Qt3DCore::QResourceManager<tst_ArrayResource, int, - 16, Qt3DCore::ObjectLevelLockingPolicy> Manager; tst_Thread2(int releaseAbove = 7) @@ -341,7 +331,7 @@ protected: int m_releaseAbove; }; -void tst_DynamicArrayPolicy::heavyDutyMultiThreadedAccessRelease() +void tst_QResourceManager::heavyDutyMultiThreadedAccessRelease() { tst_Thread2::Manager *manager = new tst_Thread2::Manager(); @@ -377,21 +367,28 @@ void tst_DynamicArrayPolicy::heavyDutyMultiThreadedAccessRelease() delete manager; } -void tst_DynamicArrayPolicy::maximumNumberOfResources() +void tst_QResourceManager::collectResources() { Qt3DCore::QResourceManager<tst_ArrayResource, uint> manager; QList<tst_ArrayResource *> resources; - QList<tHandle16> handles; + QList<tHandle> handles; - for (int i = 0; i < manager.maximumSize(); i++) { + for (int i = 0; i < 65536; i++) { handles << manager.acquire(); resources << manager.data(handles.at(i)); resources.at(i)->m_value = 4; } + for (auto h : handles) { + manager.release(h); + } + Q_ASSERT(manager.count() == 0); + handles.clear(); + manager.acquire(); + Q_ASSERT(manager.count() == 1); } -void tst_DynamicArrayPolicy::activeHandles() +void tst_QResourceManager::activeHandles() { // GIVEN Qt3DCore::QResourceManager<tst_ArrayResource, uint> manager; @@ -428,6 +425,6 @@ void tst_DynamicArrayPolicy::activeHandles() -QTEST_APPLESS_MAIN(tst_DynamicArrayPolicy) +QTEST_APPLESS_MAIN(tst_QResourceManager) #include "tst_qresourcemanager.moc" |