summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorPaul Lemire <paul.lemire@kdab.com>2014-04-14 12:44:44 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-04-14 16:28:37 +0200
commit215e606a5e9cbaf504f8c42760e6327e2c180c8e (patch)
tree544d0b8808d6f365a77e5f789116dcbcbcb2b75a /tests
parent7a46cc8bf03708ec3e5b44648eb6ea405aead9d6 (diff)
Added missing methods to QAbstractResourcesManager
Change-Id: I50d7d25f0fb4afd8fba247a08b8f937a064030cc Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/core/arrayresourcesmanager/tst_arrayresourcesmanager.cpp5
-rw-r--r--tests/auto/core/listresourcesmanager/tst_listresourcesmanager.cpp5
2 files changed, 6 insertions, 4 deletions
diff --git a/tests/auto/core/arrayresourcesmanager/tst_arrayresourcesmanager.cpp b/tests/auto/core/arrayresourcesmanager/tst_arrayresourcesmanager.cpp
index 3719c8b10..8b9e01986 100644
--- a/tests/auto/core/arrayresourcesmanager/tst_arrayresourcesmanager.cpp
+++ b/tests/auto/core/arrayresourcesmanager/tst_arrayresourcesmanager.cpp
@@ -235,11 +235,12 @@ void tst_ArrayResourcesManager::lookupResource()
tHandle16 t = manager.lookupHandle(2);
QVERIFY(t.handle() == 0);
QVERIFY(manager.data(t) == Q_NULLPTR);
- tst_ArrayResource *resource = manager.getOrCreate(2);
+ tst_ArrayResource *resource = manager.getOrCreateResource(2);
QVERIFY(resource != Q_NULLPTR);
t = manager.lookupHandle(2);
QVERIFY(manager.data(t) == manager.lookupResource(2));
- QVERIFY(resource == manager.getOrCreate(2));
+ QVERIFY(t == manager.getOrAcquireHandle(2));
+ QVERIFY(resource == manager.getOrCreateResource(2));
QVERIFY(manager.data(t) == resource);
}
diff --git a/tests/auto/core/listresourcesmanager/tst_listresourcesmanager.cpp b/tests/auto/core/listresourcesmanager/tst_listresourcesmanager.cpp
index cc89ce9df..9166d3d80 100644
--- a/tests/auto/core/listresourcesmanager/tst_listresourcesmanager.cpp
+++ b/tests/auto/core/listresourcesmanager/tst_listresourcesmanager.cpp
@@ -236,11 +236,12 @@ void tst_ListResourcesManager::lookupResource()
tHandle16 t = manager.lookupHandle(2);
QVERIFY(t.handle() == 0);
QVERIFY(manager.data(t) == Q_NULLPTR);
- tst_ListResource *resource = manager.getOrCreate(2);
+ tst_ListResource *resource = manager.getOrCreateResource(2);
QVERIFY(resource != Q_NULLPTR);
t = manager.lookupHandle(2);
QVERIFY(manager.data(t) == manager.lookupResource(2));
- QVERIFY(resource == manager.getOrCreate(2));
+ QVERIFY(t == manager.getOrAcquireHandle(2));
+ QVERIFY(resource == manager.getOrCreateResource(2));
QVERIFY(manager.data(t) == resource);
}