aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarcelo Lira <marcelo.lira@openbossa.org>2010-03-30 14:44:24 -0300
committerMarcelo Lira <marcelo.lira@openbossa.org>2010-03-31 11:26:46 -0300
commitc6d32c0339749257ac1b97a48f3c8fdd6f10e50c (patch)
tree0deab5256962798a7b33ea21c4bef1fa5fd8173a
parent7c7d35f56293f4b7d7ce000bc03bab6f4d9994be (diff)
libsample's Point extended with a reverse operator defined in libother.
The libother's Number class now defines a multiply reverse operator with libsample's Point class. Tests were added to check if the generated binding correctly calls Number.__rmul__ method with Point as argument. Reviewed by Anderson Lizardo <anderson.lizardo@openbossa.org> Reviewed by Hugo Parente <hugo.lima@openbossa.org>
-rw-r--r--tests/libother/number.cpp6
-rw-r--r--tests/libother/number.h8
-rwxr-xr-xtests/otherbinding/extended_multiply_operator_test.py59
3 files changed, 72 insertions, 1 deletions
diff --git a/tests/libother/number.cpp b/tests/libother/number.cpp
index 0c64def6e..61dc33195 100644
--- a/tests/libother/number.cpp
+++ b/tests/libother/number.cpp
@@ -46,3 +46,9 @@ Number::toStr() const
return in.str().c_str();
}
+Point
+operator*(const Point& p, const Number& n)
+{
+ return Point(p.x() * n.value(), p.y() * n.value());
+}
+
diff --git a/tests/libother/number.h b/tests/libother/number.h
index d739802d8..32af33258 100644
--- a/tests/libother/number.h
+++ b/tests/libother/number.h
@@ -37,18 +37,24 @@
#include "libothermacros.h"
#include "str.h"
+#include "point.h"
class LIBOTHER_API Number
{
public:
explicit Number(int value) : m_value(value) {};
- int value() { return m_value; }
+ int value() const { return m_value; }
Str toStr() const;
operator Str() const { return toStr(); }
+ friend LIBOTHER_API Point operator*(const Point&, const Number&);
+
private:
int m_value;
};
+
+LIBOTHER_API Point operator*(const Point&, const Number&);
+
#endif // NUMBER_H
diff --git a/tests/otherbinding/extended_multiply_operator_test.py b/tests/otherbinding/extended_multiply_operator_test.py
new file mode 100755
index 000000000..133072fdc
--- /dev/null
+++ b/tests/otherbinding/extended_multiply_operator_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 libsample's Point multiply operator defined in libother module.'''
+
+import unittest
+
+from sample import Point
+from other import Number
+
+class PointOperationsWithNumber(unittest.TestCase):
+ '''Test cases for libsample's Point multiply operator defined in libother module.'''
+
+ def testPointTimesInt(self):
+ '''sample.Point * int'''
+ pt1 = Point(2, 7)
+ num = 3
+ pt2 = Point(pt1.x() * num, pt1.y() * num)
+ self.assertEqual(pt1 * num, pt2)
+
+ def testIntTimesPoint(self):
+ '''int * sample.Point'''
+ pt1 = Point(2, 7)
+ num = 3
+ pt2 = Point(pt1.x() * num, pt1.y() * num)
+ self.assertEqual(num * pt1, pt2)
+
+ def testPointTimesNumber(self):
+ '''sample.Point * other.Number'''
+ pt = Point(2, 7)
+ num = Number(11)
+ self.assertEqual(pt * num, pt * 11)
+
+if __name__ == '__main__':
+ unittest.main()
+