diff options
| author | Marcelo Lira <marcelo.lira@openbossa.org> | 2011-11-01 18:42:47 -0300 |
|---|---|---|
| committer | Hugo Parente Lima <hugo.pl@gmail.com> | 2012-03-08 16:56:20 -0300 |
| commit | 2a87b74bfea936691db2eb97a8ab2788277869b6 (patch) | |
| tree | b4ec4ef4b62df6bf488301e243501ceac960fa46 /tests | |
| parent | 792504f978441d0a7708ebdaabc4b4baf24fdff4 (diff) | |
Replaced TypeResolver by SbkConverter and SpecificConverter.
Also updated QtGui's WId conversion to Python 3.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/QtCore/qobject_property_test.py | 9 | ||||
| -rw-r--r-- | tests/pysidetest/testview.cpp | 2 | ||||
| -rw-r--r-- | tests/pysidetest/typesystem_pysidetest.xml | 38 |
3 files changed, 36 insertions, 13 deletions
diff --git a/tests/QtCore/qobject_property_test.py b/tests/QtCore/qobject_property_test.py index 48895919b..17589cbe8 100644 --- a/tests/QtCore/qobject_property_test.py +++ b/tests/QtCore/qobject_property_test.py @@ -3,7 +3,7 @@ import unittest -from PySide.QtCore import * +from PySide.QtCore import QObject, Property, Signal class MyObjectWithNotifyProperty(QObject): def __init__(self, parent=None): @@ -31,7 +31,12 @@ class PropertyWithNotify(unittest.TestCase): obj.myProperty = 10 self.assert_(self.called_) + def testHasProperty(self): + o = MyObjectWithNotifyProperty() + o.setProperty("myProperty", 10) + self.assertEqual(o.myProperty, 10) + self.assertEqual(o.property("myProperty"), 10) + if __name__ == '__main__': unittest.main() - diff --git a/tests/pysidetest/testview.cpp b/tests/pysidetest/testview.cpp index 75620e0db..6adfe69ef 100644 --- a/tests/pysidetest/testview.cpp +++ b/tests/pysidetest/testview.cpp @@ -1,5 +1,6 @@ #include "testview.h" +#include <QDebug> #include <QWidget> #include <QAbstractListModel> #include <QAbstractItemDelegate> @@ -21,4 +22,3 @@ TestView::getEditorWidgetFromItemDelegate() const QStyleOptionViewItem options; return m_delegate->createEditor(0, options, index); } - diff --git a/tests/pysidetest/typesystem_pysidetest.xml b/tests/pysidetest/typesystem_pysidetest.xml index fb9b82b6f..babb541d2 100644 --- a/tests/pysidetest/typesystem_pysidetest.xml +++ b/tests/pysidetest/typesystem_pysidetest.xml @@ -3,27 +3,46 @@ <load-typesystem name="typesystem_core.xml" generate="no" /> <load-typesystem name="typesystem_gui.xml" generate="no"/> <value-type name="IntValue"/> - <primitive-type name="TypedefValue"/> + <primitive-type name="TypedefValue"> + <!-- + A conversion rule is used here because ApiExtractor can't associate + a primitive typedef to a non-primitive type. That would be a good + improvement to ApiExtractor. + --> + <conversion-rule> + <native-to-target> + return %CONVERTTOPYTHON[IntValue](%in); + </native-to-target> + <target-to-native> + <add-conversion type="IntValue"> + IntValue value = %CONVERTTOCPP[IntValue](%in); + %out = %OUTTYPE(value); + </add-conversion> + </target-to-native> + </conversion-rule> + </primitive-type> <object-type name="TestObject" /> + <primitive-type name="PySideInt"/> + <primitive-type name="PySideCPP2::PySideLong"/> + <!--<primitive-type name="PySideLong"/>--> + <function signature="getHiddenObject()" /> <inject-code position="end"> - Shiboken::TypeResolver::createObjectTypeResolver< ::PySideCPP2::TestObjectWithoutNamespace>("TestObjectWithoutNamespace*"); - Shiboken::TypeResolver::createValueTypeResolver< ::PySideCPP2::PySideLong>("PySideLong"); - Shiboken::TypeResolver::createObjectTypeResolver< ::PySideCPP::TestObjectWithNamespace>("TestObjectWithNamespace*"); - Shiboken::TypeResolver::createValueTypeResolver< ::PySideInt>("PySideInt"); - qRegisterMetaType<PySideInt>("PySideInt"); - qRegisterMetaType<PySideCPP2::PySideLong>("PySideLong"); + Shiboken::Conversions::registerConverterName(Shiboken::Conversions::PrimitiveTypeConverter<long>(), "PySideLong"); + Shiboken::Conversions::registerConverterName(Shiboken::Conversions::PrimitiveTypeConverter<long>(), "PySideCPP2::PySideLong"); + qRegisterMetaType<PySideInt>("PySideInt"); + qRegisterMetaType<PySideCPP2::PySideLong>("PySideLong"); </inject-code> <namespace-type name="PySideCPP"> - <object-type name="TestObjectWithNamespace" /> + <object-type name="TestObjectWithNamespace"/> </namespace-type> <namespace-type name="PySideCPP2" generate="no"> <enum-type name="Enum1" /> - <object-type name="TestObjectWithoutNamespace" > + <object-type name="TestObjectWithoutNamespace"> <enum-type name="Enum2" /> </object-type> </namespace-type> @@ -36,4 +55,3 @@ </modify-function> </object-type> </typesystem> - |