Adds tests to type system modifications regarding reference to pointer type.

Reviewed by Hugo Parente <hugo.lima@openbossa.org>
Reviewed by Lauro Moura <lauro.neto@openbossa.org>

4 files changed, 153 insertions, 0 deletions

diff --git a/tests/libsample/virtualmethods.cpp b/tests/libsample/virtualmethods.cpp
index 997f8f249..58f8a955a 100644
--- a/tests/libsample/virtualmethods.cpp
+++ b/tests/libsample/virtualmethods.cpp
@@ -42,3 +42,15 @@ VirtualMethods::virtualMethod0(Point pt, int val, Complex cpx, bool b)
     return (pt.x() * pt.y() * val) + cpx.imag() + ((int) b);
 }
 
+bool
+VirtualMethods::createStr(const char* text, Str*& ret)
+{
+    if (!text) {
+        ret = 0;
+        return false;
+    }
+
+    ret = new Str(text);
+    return true;
+}
+
diff --git a/tests/libsample/virtualmethods.h b/tests/libsample/virtualmethods.h
index be4c6de96..287f10e66 100644
--- a/tests/libsample/virtualmethods.h
+++ b/tests/libsample/virtualmethods.h
@@ -84,6 +84,10 @@ public:
     virtual void callMe() {}
     void callCallMe() { callMe(); }
 
+    // Passing reference to pointers.
+    virtual bool createStr(const char* text, Str*& ret);
+    bool callCreateStr(const char* text, Str*& ret) { return createStr(text, ret); }
+
 private:
     Str m_name;
 };
diff --git a/tests/samplebinding/referencetopointer_test.py b/tests/samplebinding/referencetopointer_test.py
new file mode 100755
index 000000000..88e901e20
--- /dev/null
+++ b/tests/samplebinding/referencetopointer_test.py
@@ -0,0 +1,93 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+#
+# This file is part of the Shiboken Python Bindings Generator project.
+#
+# Copyright (C) 2010 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
+
+'''Test cases for a reference to pointer argument type.'''
+
+import unittest
+
+from sample import VirtualMethods, Str
+
+class ExtendedVirtualMethods(VirtualMethods):
+    def __init__(self):
+        VirtualMethods.__init__(self)
+        self.prefix = 'Ext'
+
+    def createStr(self, text):
+        ext_text = text
+        if text is not None:
+            ext_text = self.prefix + text
+        print ext_text
+        return VirtualMethods.createStr(self, ext_text)
+
+
+class ReferenceToPointerTest(unittest.TestCase):
+    '''Test cases for a reference to pointer argument type.'''
+
+    def testSimpleCallWithNone(self):
+        '''Simple call to createStr method with a None argument.'''
+        obj = VirtualMethods()
+        ok, string = obj.createStr(None)
+        self.assertFalse(ok)
+        self.assertEqual(string, None)
+
+    def testSimpleCallWithString(self):
+        '''Simple call to createStr method with a Python string argument.'''
+        obj = VirtualMethods()
+        ok, string = obj.createStr('foo')
+        self.assert_(ok)
+        self.assertEqual(string, Str('foo'))
+
+    def testCallNonReimplementedMethodWithNone(self):
+        '''Calls createStr method from C++ with a None argument.'''
+        obj = VirtualMethods()
+        ok, string = obj.callCreateStr(None)
+        self.assertFalse(ok)
+        self.assertEqual(string, None)
+
+    def testCallNonReimplementedMethodWithString(self):
+        '''Calls createStr method from C++ with a Python string argument.'''
+        obj = VirtualMethods()
+        ok, string = obj.callCreateStr('foo')
+        self.assert_(ok)
+        self.assertEqual(string, Str('foo'))
+
+    def testCallReimplementedMethodWithNone(self):
+        '''Calls reimplemented createStr method from C++ with a None argument.'''
+        obj = ExtendedVirtualMethods()
+        ok, string = obj.callCreateStr(None)
+        self.assertFalse(ok)
+        self.assertEqual(string, None)
+
+    def testCallReimplementedMethodWithString(self):
+        '''Calls reimplemented createStr method from C++ with a Python string argument.'''
+        obj = ExtendedVirtualMethods()
+        ok, string = obj.callCreateStr('foo')
+        self.assert_(ok)
+        self.assertEqual(string, Str(obj.prefix + 'foo'))
+
+if __name__ == '__main__':
+    unittest.main()
+
diff --git a/tests/samplebinding/typesystem_sample.xml b/tests/samplebinding/typesystem_sample.xml
index eabc413f9..14ce1e18a 100644
--- a/tests/samplebinding/typesystem_sample.xml
+++ b/tests/samplebinding/typesystem_sample.xml
@@ -584,6 +584,50 @@
                 PyObject_Call(%PYTHON_METHOD_OVERRIDE, %PYTHON_ARGUMENTS, NULL);
             </inject-code>
         </modify-function>
+        <modify-function signature="createStr(const char*, Str*&amp;)">
+            <modify-argument index="2">
+                <remove-argument/>
+            </modify-argument>
+            <modify-argument index="return">
+                <replace-type modified-type="PySequence"/>
+                <conversion-rule class="native">
+                    AutoDecRef _py_ok_(PySequence_GetItem(%PYARG_0, 0));
+                    AutoDecRef _py_ret_(PySequence_GetItem(%PYARG_0, 1));
+                    %RETURN_TYPE %out = %CONVERTTOCPP[%RETURN_TYPE](_py_ok_);
+                    %2 = %CONVERTTOCPP[Str*](_py_ret_);
+                </conversion-rule>
+            </modify-argument>
+            <inject-code class="target" position="beginning">
+                Str* _str_arg_ = 0;
+                %RETURN_TYPE %0 = %CPPSELF.%TYPE::%FUNCTION_NAME(%1, _str_arg_);
+            </inject-code>
+            <inject-code class="target" position="end">
+                %PYARG_0 = PyTuple_New(2);
+                PyObject* _item_ = %CONVERTTOPYTHON[%RETURN_TYPE](%0);
+                PyTuple_SET_ITEM(%PYARG_0, 0, _item_);
+                _item_ = %CONVERTTOPYTHON[Str*](_str_arg_);
+                PyTuple_SET_ITEM(%PYARG_0, 1, _item_);
+            </inject-code>
+        </modify-function>
+        <modify-function signature="callCreateStr(const char*, Str*&amp;)">
+            <modify-argument index="2">
+                <remove-argument/>
+            </modify-argument>
+            <modify-argument index="return">
+                <replace-type modified-type="PySequence"/>
+            </modify-argument>
+            <inject-code class="target" position="beginning">
+                Str* _str_arg_ = 0;
+                %RETURN_TYPE %0 = %CPPSELF.%FUNCTION_NAME(%1, _str_arg_);
+            </inject-code>
+            <inject-code class="target" position="end">
+                %PYARG_0 = PyTuple_New(2);
+                PyObject* _item_ = %CONVERTTOPYTHON[%RETURN_TYPE](%0);
+                PyTuple_SET_ITEM(%PYARG_0, 0, _item_);
+                _item_ = %CONVERTTOPYTHON[Str*](_str_arg_);
+                PyTuple_SET_ITEM(%PYARG_0, 1, _item_);
+            </inject-code>
+        </modify-function>
     </value-type>
     <value-type name="VirtualDaughter" />