Added test for overload decisor handling container dependencies.

Explaining with an example. Consider a function called "function" with
two signatures accepting a list of Point and a list of PointF,
respectively. Consider also that Point is implicitly convertible to
PointF.

void function(list<Point>&)
void function(list<PointF>&)

A list of Point should be checked before a list of PointF.

Reviewed by Hugo Parente <hugo.lima@openbossa.org>
Reviewed by Luciano Wolf <luciano.wolf@openbossa.org>

10 files changed, 312 insertions, 3 deletions

diff --git a/tests/libsample/CMakeLists.txt b/tests/libsample/CMakeLists.txt
index d7bede642..158c0e5e8 100644
--- a/tests/libsample/CMakeLists.txt
+++ b/tests/libsample/CMakeLists.txt
@@ -23,6 +23,7 @@ overload.cpp
 overloadsort.cpp
 pairuser.cpp
 point.cpp
+pointf.cpp
 polygon.cpp
 protected.cpp
 reference.cpp
diff --git a/tests/libsample/listuser.cpp b/tests/libsample/listuser.cpp
index 2110c0047..67822d6d5 100644
--- a/tests/libsample/listuser.cpp
+++ b/tests/libsample/listuser.cpp
@@ -62,6 +62,18 @@ ListUser::sumList(std::list<double> vallist)
     return std::accumulate(vallist.begin(), vallist.end(), 0.0);
 }
 
+ListUser::ListOfSomething
+ListUser::listOfPoints(const std::list<Point>& pointlist)
+{
+    return ListOfPoint;
+}
+
+ListUser::ListOfSomething
+ListUser::listOfPoints(const std::list<PointF>& pointlist)
+{
+    return ListOfPointF;
+}
+
 void
 ListUser::multiplyPointList(PointList& points, double multiplier)
 {
diff --git a/tests/libsample/listuser.h b/tests/libsample/listuser.h
index bbb555be7..eb5d4b613 100644
--- a/tests/libsample/listuser.h
+++ b/tests/libsample/listuser.h
@@ -26,6 +26,7 @@
 #include <list>
 #include "complex.h"
 #include "point.h"
+#include "pointf.h"
 
 #include "libsamplemacros.h"
 
@@ -34,6 +35,11 @@ class LIBSAMPLE_API ListUser
 public:
     typedef std::list<Point*> PointList;
 
+    enum ListOfSomething {
+        ListOfPoint,
+        ListOfPointF
+    };
+
     ListUser() {}
     ListUser(const ListUser& other) : m_lst(other.m_lst) {}
     virtual ~ListUser() {}
@@ -46,6 +52,9 @@ public:
     double sumList(std::list<int> vallist);
     double sumList(std::list<double> vallist);
 
+    static ListOfSomething listOfPoints(const std::list<Point>& pointlist);
+    static ListOfSomething listOfPoints(const std::list<PointF>& pointlist);
+
     static void multiplyPointList(PointList& points, double multiplier);
 
     inline void setList(std::list<int> lst) { m_lst = lst; }
diff --git a/tests/libsample/pointf.cpp b/tests/libsample/pointf.cpp
new file mode 100644
index 000000000..2464c22bb
--- /dev/null
+++ b/tests/libsample/pointf.cpp
@@ -0,0 +1,111 @@
+/*
+ * This file is part of the Shiboken Python Binding Generator project.
+ *
+ * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+ *
+ * Contact: PySide team <contact@pyside.org>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library 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 library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+#include <iostream>
+#include "pointf.h"
+
+using namespace std;
+
+PointF::PointF(const Point& point) : m_x(point.x()), m_y(point.y())
+{
+}
+
+PointF::PointF(double x, double y) : m_x(x), m_y(y)
+{
+}
+
+void
+PointF::show()
+{
+    cout << "(x: " << m_x << ", y: " << m_y << ")";
+}
+
+bool
+PointF::operator==(const PointF& other)
+{
+    return m_x == other.m_x && m_y == other.m_y;
+}
+
+PointF
+PointF::operator+(const PointF& other)
+{
+    return PointF(m_x + other.m_x, m_y + other.m_y);
+}
+
+PointF
+PointF::operator-(const PointF& other)
+{
+    return PointF(m_x - other.m_x, m_y - other.m_y);
+}
+
+PointF&
+PointF::operator+=(PointF &other)
+{
+    m_x += other.m_x;
+    m_y += other.m_y;
+    return *this;
+}
+
+PointF&
+PointF::operator-=(PointF &other)
+{
+    m_x -= other.m_x;
+    m_y -= other.m_y;
+    return *this;
+}
+
+PointF
+operator*(const PointF& pt, double mult)
+{
+    return PointF(pt.m_x * mult, pt.m_y * mult);
+}
+
+PointF
+operator*(const PointF& pt, int mult)
+{
+    return PointF(((int) pt.m_x) * mult, ((int) pt.m_y) * mult);
+}
+
+PointF
+operator*(double mult, const PointF& pt)
+{
+    return PointF(pt.m_x * mult, pt.m_y * mult);
+}
+
+PointF
+operator*(int mult, const PointF& pt)
+{
+    return PointF(((int) pt.m_x) * mult, ((int) pt.m_y) * mult);
+}
+
+PointF
+operator-(const PointF& pt)
+{
+    return PointF(-pt.m_x, -pt.m_y);
+}
+
+bool
+operator!(const PointF& pt)
+{
+    return (pt.m_x == 0.0 && pt.m_y == 0.0);
+}
+
diff --git a/tests/libsample/pointf.h b/tests/libsample/pointf.h
new file mode 100644
index 000000000..832c3b323
--- /dev/null
+++ b/tests/libsample/pointf.h
@@ -0,0 +1,78 @@
+/*
+ * This file is part of the Shiboken Python Binding Generator project.
+ *
+ * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+ *
+ * Contact: PySide team <contact@pyside.org>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library 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 library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+#ifndef POINTF_H
+#define POINTF_H
+
+#include "point.h"
+#include <utility>
+
+#include "libsamplemacros.h"
+
+class LIBSAMPLE_API PointF
+{
+public:
+    PointF(const Point& point);
+    PointF(double x = 0.0, double y = 0.0);
+    ~PointF() {}
+
+    inline double x() const { return m_x; }
+    inline double y() const { return m_y; }
+
+    inline void setX(double x) { m_x = x; }
+    inline void setY(double y) { m_y = y; }
+
+    // The != operator is not implemented for the purpose of testing
+    // for the absense of the __ne__ method in the Python binding.
+    bool operator==(const PointF& other);
+
+    PointF operator+(const PointF& other);
+    PointF operator-(const PointF& other);
+
+    friend LIBSAMPLE_API PointF operator*(const PointF& pt, double mult);
+    friend LIBSAMPLE_API PointF operator*(const PointF& pt, int mult);
+    friend LIBSAMPLE_API PointF operator*(double mult, const PointF& pt);
+    friend LIBSAMPLE_API PointF operator*(int mult, const PointF& pt);
+    friend LIBSAMPLE_API PointF operator-(const PointF& pt);
+    friend LIBSAMPLE_API bool operator!(const PointF& pt);
+
+    PointF& operator+=(PointF &other);
+    PointF& operator-=(PointF &other);
+
+    void show();
+
+private:
+    double m_x;
+    double m_y;
+};
+
+LIBSAMPLE_API PointF operator*(const PointF& pt, double mult);
+LIBSAMPLE_API PointF operator*(const PointF& pt, int mult);
+LIBSAMPLE_API PointF operator*(double mult, const PointF& pt);
+LIBSAMPLE_API PointF operator*(int mult, const PointF& pt);
+LIBSAMPLE_API PointF operator-(const PointF& pt);
+LIBSAMPLE_API bool operator!(const PointF& pt);
+
+LIBSAMPLE_API PointF operator*(const PointF& pt, double multiplier);
+
+#endif // POINTF_H
+
diff --git a/tests/samplebinding/CMakeLists.txt b/tests/samplebinding/CMakeLists.txt
index c47ab96a3..3767a3a36 100644
--- a/tests/samplebinding/CMakeLists.txt
+++ b/tests/samplebinding/CMakeLists.txt
@@ -47,6 +47,7 @@ ${CMAKE_CURRENT_BINARY_DIR}/sample/oddbooluser_wrapper.cpp
 ${CMAKE_CURRENT_BINARY_DIR}/sample/overload_wrapper.cpp
 ${CMAKE_CURRENT_BINARY_DIR}/sample/pairuser_wrapper.cpp
 ${CMAKE_CURRENT_BINARY_DIR}/sample/point_wrapper.cpp
+${CMAKE_CURRENT_BINARY_DIR}/sample/pointf_wrapper.cpp
 ${CMAKE_CURRENT_BINARY_DIR}/sample/pointerholder_wrapper.cpp
 ${CMAKE_CURRENT_BINARY_DIR}/sample/polygon_wrapper.cpp
 ${CMAKE_CURRENT_BINARY_DIR}/sample/privatector_wrapper.cpp
diff --git a/tests/samplebinding/global.h b/tests/samplebinding/global.h
index 4677b814f..54a9795fa 100644
--- a/tests/samplebinding/global.h
+++ b/tests/samplebinding/global.h
@@ -26,6 +26,7 @@
 #include "overload.h"
 #include "pairuser.h"
 #include "point.h"
+#include "pointf.h"
 #include "pointerholder.h"
 #include "polygon.h"
 #include "privatector.h"
diff --git a/tests/samplebinding/list_test.py b/tests/samplebinding/list_test.py
index a71dbe716..0db059432 100644
--- a/tests/samplebinding/list_test.py
+++ b/tests/samplebinding/list_test.py
@@ -26,10 +26,9 @@
 
 '''Test cases for std::list container conversions'''
 
-import sys
 import unittest
 
-from sample import ListUser, Point
+from sample import ListUser, Point, PointF
 
 class ExtendedListUser(ListUser):
     def __init__(self):
@@ -108,6 +107,10 @@ class ListConversionTest(unittest.TestCase):
         pts = (Point(1.0, 2.0), 3, Point(5, 6))
         self.assertRaises(TypeError, ListUser.multiplyPointList, pts, mult)
 
+    def testOverloadMethodReceivingRelatedContainerTypes(self):
+        self.assertEqual(ListUser.ListOfPointF, ListUser.listOfPoints([PointF()]))
+        self.assertEqual(ListUser.ListOfPoint, ListUser.listOfPoints([Point()]))
+
 if __name__ == '__main__':
     unittest.main()
 
diff --git a/tests/samplebinding/pointf_test.py b/tests/samplebinding/pointf_test.py
new file mode 100644
index 000000000..f9aac9f20
--- /dev/null
+++ b/tests/samplebinding/pointf_test.py
@@ -0,0 +1,59 @@
+#!/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 PointF class'''
+
+import unittest
+
+from sample import PointF
+
+class PointFTest(unittest.TestCase):
+    '''Test case for PointF class, including operator overloads.'''
+
+    def testConstructor(self):
+        '''Test PointF class constructor.'''
+        pt = PointF(5.0, 2.3)
+        self.assertEqual(pt.x(), 5.0)
+        self.assertEqual(pt.y(), 2.3)
+
+    def testPlusOperator(self):
+        '''Test PointF class + operator.'''
+        pt1 = PointF(5.0, 2.3)
+        pt2 = PointF(0.5, 3.2)
+        self.assertEqual(pt1 + pt2, PointF(5.0 + 0.5, 2.3 + 3.2))
+
+    def testEqualOperator(self):
+        '''Test PointF class == operator.'''
+        pt1 = PointF(5.0, 2.3)
+        pt2 = PointF(5.0, 2.3)
+        pt3 = PointF(0.5, 3.2)
+        self.assertTrue(pt1 == pt1)
+        self.assertTrue(pt1 == pt2)
+        self.assertFalse(pt1 == pt3)
+
+if __name__ == '__main__':
+    unittest.main()
+
diff --git a/tests/samplebinding/typesystem_sample.xml b/tests/samplebinding/typesystem_sample.xml
index 82684fe88..319cc6589 100644
--- a/tests/samplebinding/typesystem_sample.xml
+++ b/tests/samplebinding/typesystem_sample.xml
@@ -969,6 +969,38 @@
         </add-function>
     </value-type>
 
+    <value-type name="PointF">
+        <add-function signature="__str__" return-type="PyObject*">
+            <inject-code class="target" position="beginning">
+            int x1 = (int) %CPPSELF.x();
+            int x2 = ((int) (%CPPSELF.x() * 100)) - (x1 * 100);
+            int y1 = (int) %CPPSELF.y();
+            int y2 = ((int) (%CPPSELF.y() * 100)) - (y1 * 100);
+            %PYARG_0 = PyString_FromFormat("PointF(%d.%d, %d.%d)", x1, x2, y1, y2);
+            </inject-code>
+        </add-function>
+        <add-function signature="__repr__" return-type="PyObject*">
+            <inject-code class="target" position="beginning">
+            int x1 = (int) %CPPSELF.x();
+            int x2 = ((int) (%CPPSELF.x() * 10)) - (x1 * 10);
+            int y1 = (int) %CPPSELF.y();
+            int y2 = ((int) (%CPPSELF.y() * 10)) - (y1 * 10);
+            %PYARG_0 = PyString_FromFormat("&lt;PointF object at %p: (%d.%d, %d.%d)&gt;", %CPPSELF, x1, x2, y1, y2);
+            </inject-code>
+        </add-function>
+
+        <add-function signature="__reduce__" return-type="PyObject*">
+            <inject-code class="target" position="beginning">
+            PyObject *type = PyObject_Type(%PYSELF);
+            PyObject *args = NULL;
+
+            args = Py_BuildValue("(dd)", %CPPSELF.x(), %CPPSELF.y());
+
+            %PYARG_0 = Py_BuildValue("(OO)", type, args);
+            </inject-code>
+        </add-function>
+    </value-type>
+
     <value-type name="Polygon">
         <modify-function signature="stealOwnershipFromPython(Point*)">
             <modify-argument index="1">
@@ -997,7 +1029,9 @@
     </value-type>
     <value-type name="MapUser"/>
     <value-type name="PairUser"/>
-    <value-type name="ListUser"/>
+    <value-type name="ListUser">
+        <enum-type name="ListOfSomething"/>
+    </value-type>
     <value-type name="NoImplicitConversion" />
     <value-type name="NonDefaultCtor" />
     <value-type name="OddBoolUser" />