Included tests for added function signatures very similar to already existing ones.

Specifically this causes the situation when there is in C++ a function
with an argument that is a reference to a Value Type, and the user adds
a very similar function with the same type, but passed as value.

Example:
C++  : function(const TYPE& a, int b)
Added: function(TYPE)

The return type of ShibokenGenerator::getArgumentReplacement() method
was modified, because the argument object is more useful than its index.

2 files changed, 76 insertions, 1 deletions

diff --git a/tests/samplebinding/addedfunction_test.py b/tests/samplebinding/addedfunction_test.py
new file mode 100644
index 000000000..7e8db06af
--- /dev/null
+++ b/tests/samplebinding/addedfunction_test.py
@@ -0,0 +1,57 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+#
+# This file is part of the Shiboken Python Bindings Generator project.
+#
+# Copyright (C) 2011 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 added functions.'''
+
+import unittest
+from sample import SampleNamespace, ObjectType, Point
+
+class TestAddedFunctionsWithSimilarTypes(unittest.TestCase):
+    '''Adds new signatures very similar to already existing ones.'''
+
+    def testValueTypeReferenceAndValue(self):
+        '''In C++ we have "function(const ValueType&, double)",
+        in Python we add "function(ValueType)".'''
+        point = Point(10, 20)
+        multiplier = 4.0
+        control = (point.x() + point.y()) * multiplier
+        self.assertEqual(SampleNamespace.passReferenceToValueType(point, multiplier), control)
+        control = point.x() + point.y()
+        self.assertEqual(SampleNamespace.passReferenceToValueType(point), control)
+
+    def testObjectTypeReferenceAndPointer(self):
+        '''In C++ we have "function(const ObjectType&, int)",
+        in Python we add "function(ValueType)".'''
+        obj = ObjectType()
+        obj.setObjectName('sbrubbles')
+        multiplier = 3.0
+        control = len(obj.objectName()) * multiplier
+        self.assertEqual(SampleNamespace.passReferenceToObjectType(obj, multiplier), control)
+        control = len(obj.objectName())
+        self.assertEqual(SampleNamespace.passReferenceToObjectType(obj), control)
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/tests/samplebinding/typesystem_sample.xml b/tests/samplebinding/typesystem_sample.xml
index 547710a52..be0f8fe88 100644
--- a/tests/samplebinding/typesystem_sample.xml
+++ b/tests/samplebinding/typesystem_sample.xml
@@ -137,6 +137,22 @@
                 %PYARG_0 = %CONVERTTOPYTHON[int](%1 + %2);
             </inject-code>
         </add-function>
+        <add-function signature="passReferenceToValueType(Point&amp;)" return-type="double">
+            <inject-code>
+            double %0 = %1.x() + %1.y();
+            %PYARG_0 = %CONVERTTOPYTHON[double](%0);
+            </inject-code>
+        </add-function>
+
+        <!-- Do change the argument from pointer to reference to comply with the C++ overload
+             of this function. The generator must be able to deal with this for Object Types. -->
+        <add-function signature="passReferenceToObjectType(ObjectType*)" return-type="int">
+            <inject-code>
+            // The dot in "%1." must be replaced by a "->".
+            double %0 = %1.objectName().size();
+            %PYARG_0 = %CONVERTTOPYTHON[int](%0);
+            </inject-code>
+        </add-function>
     </namespace-type>
 
     <namespace-type name="RemovedNamespace1" generate='no'>
@@ -1711,5 +1727,7 @@
     <suppress-warning text="template baseclass 'std::list&lt;T>' of 'QList' is not known" />
     <suppress-warning text="template baseclass 'std::list&lt;Str>' of 'StrList' is not known" />
 
-</typesystem>
+    <!-- Do not fix this warning, the generator should be able to handle this situation for Object Types. -->
+    <suppress-warning text="Argument in position 1 of added function 'SampleNamespace::passReferenceToObjectType(ObjectType * arg__1)', has a type that is not a reference, while the argument in the corresponding position in C++ function 'SampleNamespace::passReferenceToObjectType(const ObjectType &amp; obj, int multiplier)' is a reference." />
 
+</typesystem>