From e5fb8ee50dbcb0eab68260efe95c985ddc979e00 Mon Sep 17 00:00:00 2001 From: Marcelo Lira Date: Thu, 18 Aug 2011 17:00:32 -0300 Subject: Fixed generator to consider conversion rules for the return type of wrapper methods. Tests were added. Reviewed by Hugo Parente Reviewed by Lauro Moura --- tests/libsample/modifications.cpp | 14 ++++++++ tests/libsample/modifications.h | 4 +++ tests/samplebinding/modifications_test.py | 57 +++++++++++++++++++++++++++++++ tests/samplebinding/typesystem_sample.xml | 43 +++++++++++++++++++++++ 4 files changed, 118 insertions(+) (limited to 'tests') diff --git a/tests/libsample/modifications.cpp b/tests/libsample/modifications.cpp index d809e823e..95880d229 100644 --- a/tests/libsample/modifications.cpp +++ b/tests/libsample/modifications.cpp @@ -122,6 +122,20 @@ Modifications::sumPointCoordinates(const Point* point) return point->x() + point->y(); } +double +Modifications::differenceOfPointCoordinates(const Point* pt, bool* ok) +{ + if (!pt) { + *ok = false; + return 0.0; + } + *ok = true; + double result = pt->x() - pt->y(); + if (result < 0) + result = result * -1.0; + return result; +} + bool Modifications::nonConversionRuleForArgumentWithDefaultValue(ObjectType** object) { diff --git a/tests/libsample/modifications.h b/tests/libsample/modifications.h index f17261473..7d5c9123f 100644 --- a/tests/libsample/modifications.h +++ b/tests/libsample/modifications.h @@ -106,6 +106,10 @@ public: // the test implementation must expect point never to be null. int sumPointCoordinates(const Point* point); + // Modify the return value of a virtual method. + virtual double differenceOfPointCoordinates(const Point* pt, bool* ok); + double callDifferenceOfPointCoordinates(const Point* pt, bool* ok) { return differenceOfPointCoordinates(pt, ok); } + // Sets an ObjectType in the argument and returns true. bool nonConversionRuleForArgumentWithDefaultValue(ObjectType** object = 0); ObjectType* getObject() const { return m_object; } diff --git a/tests/samplebinding/modifications_test.py b/tests/samplebinding/modifications_test.py index bc7b38dfa..a18bd7a18 100644 --- a/tests/samplebinding/modifications_test.py +++ b/tests/samplebinding/modifications_test.py @@ -33,10 +33,16 @@ from sample import Modifications, Point, ByteArray class ExtModifications(Modifications): def __init__(self): Modifications.__init__(self) + self.multiplier = 3.0 + self.increment = 10.0 def name(self): return 'ExtModifications' + def differenceOfPointCoordinates(self, point): + ok, res = Modifications.differenceOfPointCoordinates(self, point) + return ok, res * self.multiplier + self.increment + class ModificationsTest(unittest.TestCase): '''Test cases for method modifications performed as described on type system. ''' @@ -158,5 +164,56 @@ class ModificationsTest(unittest.TestCase): self.assertTrue(Modifications.invertBoolean(False)) self.assertFalse(Modifications.invertBoolean(True)) + def testConversionRuleForReturnType(self): + x, y = 11, 2 + diff = float(abs(x - y)) + point = Point(x, y) + + ok, res = self.mods.differenceOfPointCoordinates(point) + self.assertTrue(isinstance(ok, bool)) + self.assertTrue(isinstance(res, float)) + self.assertEqual(res, diff) + + ok, res = self.mods.callDifferenceOfPointCoordinates(point) + self.assertTrue(isinstance(ok, bool)) + self.assertTrue(isinstance(res, float)) + self.assertEqual(res, diff) + + ok, res = self.mods.differenceOfPointCoordinates(None) + self.assertTrue(isinstance(ok, bool)) + self.assertTrue(isinstance(res, float)) + self.assertEqual(res, 0.0) + + ok, res = self.mods.callDifferenceOfPointCoordinates(None) + self.assertTrue(isinstance(ok, bool)) + self.assertTrue(isinstance(res, float)) + self.assertEqual(res, 0.0) + + def testConversionRuleForReturnTypeOnExtendedClass(self): + x, y = 11, 2 + diff = float(abs(x - y)) + point = Point(x, y) + em = ExtModifications() + + ok, res = em.differenceOfPointCoordinates(point) + self.assertTrue(isinstance(ok, bool)) + self.assertTrue(isinstance(res, float)) + self.assertEqual(res, diff * em.multiplier + em.increment) + + ok, res = em.callDifferenceOfPointCoordinates(point) + self.assertTrue(isinstance(ok, bool)) + self.assertTrue(isinstance(res, float)) + self.assertEqual(res, diff * em.multiplier + em.increment) + + ok, res = em.differenceOfPointCoordinates(None) + self.assertTrue(isinstance(ok, bool)) + self.assertTrue(isinstance(res, float)) + self.assertEqual(res, em.increment) + + ok, res = em.callDifferenceOfPointCoordinates(None) + self.assertTrue(isinstance(ok, bool)) + self.assertTrue(isinstance(res, float)) + self.assertEqual(res, em.increment) + if __name__ == '__main__': unittest.main() diff --git a/tests/samplebinding/typesystem_sample.xml b/tests/samplebinding/typesystem_sample.xml index 75d222b7b..2fef355fc 100644 --- a/tests/samplebinding/typesystem_sample.xml +++ b/tests/samplebinding/typesystem_sample.xml @@ -731,6 +731,49 @@ + + + + + + + + + + + + + Shiboken::AutoDecRef _py_ok_(PySequence_GetItem(%PYARG_0, 0)); + Shiboken::AutoDecRef _py_ret_(PySequence_GetItem(%PYARG_0, 1)); + *%2 = %CONVERTTOCPP[bool](_py_ok_); + %RETURN_TYPE %out = %CONVERTTOCPP[%RETURN_TYPE](_py_ret_); + + + + + + + + + + + + + + + + + + + + -- cgit v1.2.3