Python arguments are now checked for Python wrapper validity.

If the expected argument type has implicit conversions the type of
the Python object is also checked.

The invalidate-after-use test was moved from the ObjectType test
to its own test file.

Reviewed by Luciano Wolf <luciano.wolf@openbossa.org>

4 files changed, 87 insertions, 25 deletions

diff --git a/cppgenerator.cpp b/cppgenerator.cpp
index 425f4f50..75ee859a 100644
--- a/cppgenerator.cpp
+++ b/cppgenerator.cpp
@@ -574,6 +574,7 @@ void CppGenerator::writeMethodWrapper(QTextStream& s, const AbstractMetaFunction
 
             // Checks if the underlying C++ object is valid.
             writeInvalidCppObjectCheck(s);
+            s << endl;
         }
 
         bool hasReturnValue = overloadData.hasNonVoidReturnType();
@@ -674,14 +675,16 @@ void CppGenerator::writeErrorSection(QTextStream& s, OverloadData& overloadData)
     s << INDENT << "return 0;" << endl;
 }
 
-void CppGenerator::writeInvalidCppObjectCheck(QTextStream& s, QString pyArgName)
+void CppGenerator::writeInvalidCppObjectCheck(QTextStream& s, QString pyArgName, const TypeEntry* type)
 {
-    s << INDENT << "if (Shiboken::cppObjectIsInvalid(" << pyArgName << "))" << endl;
+    s << INDENT << "if (";
+    if (type)
+        s << cpythonCheckFunction(type) << '(' << pyArgName << ") && ";
+    s << "Shiboken::cppObjectIsInvalid(" << pyArgName << "))" << endl;
     {
         Indentation indent(INDENT);
         s << INDENT << "return 0;" << endl;
     }
-    s << endl;
 }
 
 void CppGenerator::writeTypeCheck(QTextStream& s, const OverloadData* overloadData, QString argumentName)
@@ -736,7 +739,8 @@ void CppGenerator::writeArgumentConversion(QTextStream& s,
 {
     QString typeName;
     QString baseTypeName = argType->typeEntry()->name();
-    if (argType->typeEntry()->isValue() || argType->typeEntry()->isObject())
+    bool isWrappedCppClass = argType->typeEntry()->isValue() || argType->typeEntry()->isObject();
+    if (isWrappedCppClass)
         typeName = baseTypeName + '*';
     else
         typeName = translateTypeForWrapperMethod(argType, context);
@@ -750,6 +754,11 @@ void CppGenerator::writeArgumentConversion(QTextStream& s,
 
     bool hasImplicitConversions = !implicitConversions(argType).isEmpty();
 
+    if (isWrappedCppClass) {
+        const TypeEntry* type = (hasImplicitConversions ? argType->typeEntry() : 0);
+        writeInvalidCppObjectCheck(s, pyArgName, type);
+    }
+
     if (hasImplicitConversions) {
         s << INDENT << "std::auto_ptr<" << baseTypeName << " > ";
         s << argName << "_auto_ptr;" << endl;
diff --git a/cppgenerator.h b/cppgenerator.h
index 63935341..19002224 100644
--- a/cppgenerator.h
+++ b/cppgenerator.h
@@ -54,8 +54,13 @@ private:
     void writeArgumentsInitializer(QTextStream& s, OverloadData& overloadData);
 
     void writeErrorSection(QTextStream& s, OverloadData& overloadData);
-    /// Writes the check section for the validity of wrapped C++ objects.
-    void writeInvalidCppObjectCheck(QTextStream& s, QString pyArgName = "self");
+    /**
+     *   Writes the check section for the validity of wrapped C++ objects.
+     *   \param s text stream to write
+     *   \param argName Python argument name
+     *   \param type the TypeEntry passed when the validity check must confirm the type of the Python wrapper to be checked
+     */
+    void writeInvalidCppObjectCheck(QTextStream& s, QString pyArgName = "self", const TypeEntry* type = 0);
     void writeTypeCheck(QTextStream& s, const OverloadData* overloadData, QString argumentName);
 
     void writeTypeConverterImpl(QTextStream& s, const TypeEntry* type);
diff --git a/tests/samplebinding/objecttype_test.py b/tests/samplebinding/objecttype_test.py
index c442ec7e..958df1d5 100755
--- a/tests/samplebinding/objecttype_test.py
+++ b/tests/samplebinding/objecttype_test.py
@@ -29,18 +29,7 @@
 import sys
 import unittest
 
-from sample import ObjectType, Event, Str
-
-
-class ExtObjectType(ObjectType):
-    def __init__(self):
-        ObjectType.__init__(self)
-        self.type_of_last_event = None
-        self.last_event = None
-    def event(self, event):
-        self.last_event = event
-        self.type_of_last_event = event.eventType()
-        return True
+from sample import ObjectType, Str
 
 
 class ObjectTypeTest(unittest.TestCase):
@@ -66,13 +55,6 @@ class ObjectTypeTest(unittest.TestCase):
         o.setObjectName('object name')
         self.assertEqual(str(o.objectName()), 'object name')
 
-    def testInvalidateAfterUse(self):
-        '''In ObjectType.event(Event*) the wrapper object created for Event must me marked as invalid after the method is called.'''
-        o = ExtObjectType()
-        o.causeEvent(Event.SOME_EVENT)
-        self.assertEqual(o.type_of_last_event, Event.SOME_EVENT)
-        self.assertRaises(RuntimeError, o.last_event.eventType)
-
 if __name__ == '__main__':
     unittest.main()
 
diff --git a/tests/samplebinding/ownership_invalidate_after_use_test.py b/tests/samplebinding/ownership_invalidate_after_use_test.py
new file mode 100755
index 00000000..5f9930e1
--- /dev/null
+++ b/tests/samplebinding/ownership_invalidate_after_use_test.py
@@ -0,0 +1,66 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+#
+# This file is part of the Shiboken Python Bindings Generator project.
+#
+# Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+#
+# Contact: PySide team <contact@pyside.org>
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public License
+# version 2.1 as published by the Free Software Foundation. Please
+# review the following information to ensure the GNU Lesser General
+# Public License version 2.1 requirements will be met:
+# http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+# #
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+# 02110-1301 USA
+
+'''Ownership tests for cases of invalidation of Python wrapper after use.'''
+
+import sys
+import unittest
+
+from sample import ObjectType, Event
+
+
+class ExtObjectType(ObjectType):
+    def __init__(self):
+        ObjectType.__init__(self)
+        self.type_of_last_event = None
+        self.last_event = None
+    def event(self, event):
+        self.last_event = event
+        self.type_of_last_event = event.eventType()
+        return True
+
+
+class OwnershipInvalidateAfterUseTest(unittest.TestCase):
+    '''Ownership tests for cases of invalidation of Python wrapper after use.'''
+
+    def testInvalidateAfterUse(self):
+        '''In ObjectType.event(Event*) the wrapper object created for Event must me marked as invalid after the method is called.'''
+        eot = ExtObjectType()
+        eot.causeEvent(Event.SOME_EVENT)
+        self.assertEqual(eot.type_of_last_event, Event.SOME_EVENT)
+        self.assertRaises(RuntimeError, eot.last_event.eventType)
+
+    def testObjectInvalidatedAfterUseAsParameter(self):
+        '''Tries to use wrapper invalidated after use as a parameter to another method.'''
+        eot = ExtObjectType()
+        ot = ObjectType()
+        eot.causeEvent(Event.ANY_EVENT)
+        self.assertEqual(eot.type_of_last_event, Event.ANY_EVENT)
+        self.assertRaises(RuntimeError, lambda : ot.event(eot.last_event))
+
+if __name__ == '__main__':
+    unittest.main()
+