diff options
author | Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io> | 2018-11-08 14:51:00 +0100 |
---|---|---|
committer | Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io> | 2018-11-13 12:34:28 +0000 |
commit | 9f52793a68e9b7879331fe8399ff9709a5d5c558 (patch) | |
tree | 53f4d6f22aa404b4319ef139c87cb82b071fbb6d /sources/pyside2/tests | |
parent | 7f8abfc78d6ed861bcc5f41bef224e5c732d2ba9 (diff) |
Remove createIndex method that uses PyObject*
We have a proper `void*` treatment, so the extra
function does not seems to be necessary.
The injected code used for the interalPointer method was
also removed since is better to leave on shiboken hands
the conversion between void* and python types.
A couple of test were adapted since wrongly used ModelIndex
with Python objects.
Change-Id: I082637c7d1dd1bb0f50a3c453513e5d722f4b783
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'sources/pyside2/tests')
-rw-r--r-- | sources/pyside2/tests/QtCore/qabstractitemmodel_test.py | 4 | ||||
-rw-r--r-- | sources/pyside2/tests/QtCore/qmodelindex_internalpointer_test.py | 23 |
2 files changed, 13 insertions, 14 deletions
diff --git a/sources/pyside2/tests/QtCore/qabstractitemmodel_test.py b/sources/pyside2/tests/QtCore/qabstractitemmodel_test.py index 70b610c34..fd8d01c99 100644 --- a/sources/pyside2/tests/QtCore/qabstractitemmodel_test.py +++ b/sources/pyside2/tests/QtCore/qabstractitemmodel_test.py @@ -34,14 +34,12 @@ from PySide2.QtCore import * class MyModel (QAbstractListModel): pass -class Foo: - pass class TestQModelIndexInternalPointer(unittest.TestCase): def testInternalPointer(self): m = MyModel() - foo = Foo() + foo = QObject() idx = m.createIndex(0,0, foo) check = m.checkIndex(idx, QAbstractItemModel.CheckIndexOption.IndexIsValid | QAbstractItemModel.CheckIndexOption.DoNotUseParent diff --git a/sources/pyside2/tests/QtCore/qmodelindex_internalpointer_test.py b/sources/pyside2/tests/QtCore/qmodelindex_internalpointer_test.py index 875d2075c..a67bb380a 100644 --- a/sources/pyside2/tests/QtCore/qmodelindex_internalpointer_test.py +++ b/sources/pyside2/tests/QtCore/qmodelindex_internalpointer_test.py @@ -33,6 +33,7 @@ import sys import unittest from PySide2.QtCore import * +from PySide2.support import VoidPtr class MyModel (QAbstractListModel): pass @@ -50,22 +51,22 @@ class TestQModelIndexInternalPointer(unittest.TestCase): def testInternalPointer(self): #Test QAbstractListModel.createIndex and - #QModelIndex.internalPointer with regular - #Python objects - idx = self.model.createIndex(0, 0, "Hello") - self.assertEqual("Hello", idx.internalPointer()) - a = [1, 2, 3] - idx = self.model.createIndex(0, 0, a) - self.assertEqual(a, idx.internalPointer()) + #QModelIndex.internalPointer + obj = QObject() + obj_ptr = VoidPtr(obj) + idx = self.model.createIndex(0, 0, obj) + i = idx.internalPointer() + self.assertEqual(int(obj_ptr), int(i)) def testReferenceCounting(self): #Test reference counting when retrieving data with #QModelIndex.internalPointer - a = [1, 2, 3] - a_refcnt = sys.getrefcount(a) - idx = self.model.createIndex(0, 0, a) + o = QObject() + o_refcnt = sys.getrefcount(o) + idx = self.model.createIndex(0, 0, o) ptr = idx.internalPointer() - self.assertEqual(sys.getrefcount(a), a_refcnt + 1) + self.assertEqual(sys.getrefcount(o), o_refcnt) + def testIndexForDefaultDataArg(self): #Test QAbstractListModel.createIndex with a default |