summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
Diffstat (limited to 'tests')
-rw-r--r--tests/libsample/objecttype.cpp6
-rw-r--r--tests/libsample/objecttype.h4
-rw-r--r--tests/samplebinding/ownership_invalidate_after_use_test.py21
-rw-r--r--tests/samplebinding/typesystem_sample.xml3
4 files changed, 33 insertions, 1 deletions
diff --git a/tests/libsample/objecttype.cpp b/tests/libsample/objecttype.cpp
index ea3c78e7..c1407d23 100644
--- a/tests/libsample/objecttype.cpp
+++ b/tests/libsample/objecttype.cpp
@@ -167,6 +167,12 @@ ObjectType::processEvent(ObjectTypeList objects, Event *event)
}
void
+ObjectType::callInvalidateEvent(Event* event)
+{
+ invalidateEvent(event);
+}
+
+void
ObjectType::setLayout(ObjectTypeLayout* l)
{
if (!l) {
diff --git a/tests/libsample/objecttype.h b/tests/libsample/objecttype.h
index c3bd8c62..b09b402e 100644
--- a/tests/libsample/objecttype.h
+++ b/tests/libsample/objecttype.h
@@ -78,6 +78,9 @@ public:
virtual bool event(Event* event);
static int processEvent(ObjectTypeList objects, Event *event);
+ void callInvalidateEvent(Event* event);
+ virtual void invalidateEvent(Event* event) {}
+
// This nonsense method emulate QWidget.setLayout method
// All layout objects will became children of this object.
void setLayout(ObjectTypeLayout* layout);
@@ -99,7 +102,6 @@ public:
void setObject(const Null&);
int callId() const;
-
private:
ObjectType(const ObjectType&);
ObjectType& operator=(const ObjectType&);
diff --git a/tests/samplebinding/ownership_invalidate_after_use_test.py b/tests/samplebinding/ownership_invalidate_after_use_test.py
index 80f252d5..5a03fc47 100644
--- a/tests/samplebinding/ownership_invalidate_after_use_test.py
+++ b/tests/samplebinding/ownership_invalidate_after_use_test.py
@@ -42,6 +42,22 @@ class ExtObjectType(ObjectType):
self.type_of_last_event = event.eventType()
return True
+class MyObjectType (ObjectType):
+ def __init__(self):
+ super(MyObjectType, self).__init__()
+ self.fail = False
+
+ def event(self, ev):
+ self.callInvalidateEvent(ev)
+ try:
+ ev.eventType()
+ except:
+ self.fail = True
+ raise
+ return True
+
+ def invalidateEvent(self, ev):
+ pass
class OwnershipInvalidateAfterUseTest(unittest.TestCase):
'''Ownership tests for cases of invalidation of Python wrapper after use.'''
@@ -61,6 +77,11 @@ class OwnershipInvalidateAfterUseTest(unittest.TestCase):
self.assertEqual(eot.type_of_last_event, Event.ANY_EVENT)
self.assertRaises(RuntimeError, ot.event, eot.last_event)
+ def testit(self):
+ obj = MyObjectType()
+ obj.causeEvent(Event.BASIC_EVENT)
+ self.assertFalse(obj.fail)
+
if __name__ == '__main__':
unittest.main()
diff --git a/tests/samplebinding/typesystem_sample.xml b/tests/samplebinding/typesystem_sample.xml
index de262c9e..40b70ab4 100644
--- a/tests/samplebinding/typesystem_sample.xml
+++ b/tests/samplebinding/typesystem_sample.xml
@@ -141,6 +141,9 @@
<modify-function signature="event(Event*)">
<modify-argument index="1" invalidate-after-use="yes"/>
</modify-function>
+ <modify-function signature="invalidateEvent(Event*)">
+ <modify-argument index="1" invalidate-after-use="yes"/>
+ </modify-function>
<modify-function signature="create()">
<modify-argument index="return">
<define-ownership owner="target"/>