Expanded the minimal example and tests to better deal with virtual methods.

2 files changed, 110 insertions, 5 deletions

diff --git a/tests/minimalbinding/obj_test.py b/tests/minimalbinding/obj_test.py
index 20b12aa03..a788c9833 100644
--- a/tests/minimalbinding/obj_test.py
+++ b/tests/minimalbinding/obj_test.py
@@ -36,6 +36,14 @@ class ExtObj(Obj):
         self.virtual_method_called = True
         return not Obj.virtualMethod(self, val)
 
+    def passObjectType(self, obj):
+        obj.setObjId(obj.objId() + 1)
+        return obj
+
+    def passObjectTypeReference(self, obj):
+        obj.setObjId(obj.objId() + 1)
+        return obj
+
 
 class ObjTest(unittest.TestCase):
 
@@ -44,22 +52,53 @@ class ObjTest(unittest.TestCase):
         obj = Obj(objId)
         self.assertEqual(obj.objId(), objId)
 
-    def testVirtualMethod(self):
-        obj = Obj(0)
-        even_number = 8
-        self.assertEqual(obj.virtualMethod(even_number), obj.callVirtualMethod(even_number))
-
     def testNormalMethodFromExtendedClass(self):
         objId = 123
         obj = ExtObj(objId)
         self.assertEqual(obj.objId(), objId)
 
+    def testVirtualMethod(self):
+        obj = Obj(0)
+        even_number = 8
+        self.assertEqual(obj.virtualMethod(even_number), obj.callVirtualMethod(even_number))
+
     def testVirtualMethodFromExtendedClass(self):
         obj = ExtObj(0)
         even_number = 8
         self.assertEqual(obj.virtualMethod(even_number), obj.callVirtualMethod(even_number))
         self.assert_(obj.virtual_method_called)
 
+    def testPassObjectType(self):
+        obj = Obj(0)
+        self.assertEqual(obj, obj.passObjectType(obj))
+        self.assertEqual(obj, obj.callPassObjectType(obj))
+
+    def testPassObjectTypeReference(self):
+        obj = Obj(0)
+        self.assertEqual(obj, obj.passObjectTypeReference(obj))
+        self.assertEqual(obj, obj.callPassObjectTypeReference(obj))
+
+    def testPassObjectTypeFromExtendedClass(self):
+        obj = ExtObj(0)
+        self.assertEqual(obj.objId(), 0)
+        sameObj = obj.passObjectType(obj)
+        self.assertEqual(obj, sameObj)
+        self.assertEqual(sameObj.objId(), 1)
+        sameObj = obj.callPassObjectType(obj)
+        self.assertEqual(obj, sameObj)
+        self.assertEqual(sameObj.objId(), 2)
+
+    def testPassObjectTypeReferenceFromExtendedClass(self):
+        obj = ExtObj(0)
+        self.assertEqual(obj.objId(), 0)
+        sameObj = obj.passObjectTypeReference(obj)
+        self.assertEqual(obj, sameObj)
+        self.assertEqual(sameObj.objId(), 1)
+        sameObj = obj.callPassObjectTypeReference(obj)
+        self.assertEqual(obj, sameObj)
+        self.assertEqual(sameObj.objId(), 2)
+
+
 if __name__ == '__main__':
     unittest.main()
 
diff --git a/tests/minimalbinding/val_test.py b/tests/minimalbinding/val_test.py
index 71d658f8f..f39f42309 100644
--- a/tests/minimalbinding/val_test.py
+++ b/tests/minimalbinding/val_test.py
@@ -27,6 +27,23 @@
 import unittest
 from minimal import Val
 
+
+class ExtVal(Val):
+    def __init__(self, valId):
+        Val.__init__(self, valId)
+
+    def passValueType(self, val):
+        return ExtVal(val.valId() + 1)
+
+    def passValueTypePointer(self, val):
+        val.setValId(val.valId() + 1)
+        return val
+
+    def passValueTypeReference(self, val):
+        val.setValId(val.valId() + 1)
+        return val
+
+
 class ValTest(unittest.TestCase):
 
     def testNormalMethod(self):
@@ -34,6 +51,55 @@ class ValTest(unittest.TestCase):
         val = Val(valId)
         self.assertEqual(val.valId(), valId)
 
+    def testPassValueType(self):
+        val = Val(123)
+        val1 = val.passValueType(val)
+        self.assertNotEqual(val, val1)
+        self.assertEqual(val1.valId(), 123)
+        val2 = val.callPassValueType(val)
+        self.assertNotEqual(val, val2)
+        self.assertEqual(val2.valId(), 123)
+
+    def testPassValueTypePointer(self):
+        val = Val(0)
+        self.assertEqual(val, val.passValueTypePointer(val))
+        self.assertEqual(val, val.callPassValueTypePointer(val))
+
+    def testPassValueTypeReference(self):
+        val = Val(0)
+        self.assertEqual(val, val.passValueTypeReference(val))
+        self.assertEqual(val, val.callPassValueTypeReference(val))
+
+    def testPassValueTypeFromExtendedClass(self):
+        val = ExtVal(0)
+        val1 = val.passValueType(val)
+        self.assertNotEqual(val, val1)
+        self.assertEqual(val1.valId(), val.valId() + 1)
+        val2 = val.callPassValueType(val)
+        self.assertNotEqual(val, val2)
+        self.assertEqual(val2.valId(), val.valId() + 1)
+
+    def testPassValueTypePointerFromExtendedClass(self):
+        val = ExtVal(0)
+        self.assertEqual(val.valId(), 0)
+        sameVal = val.passValueTypePointer(val)
+        self.assertEqual(val, sameVal)
+        self.assertEqual(sameVal.valId(), 1)
+        sameVal = val.callPassValueTypePointer(val)
+        self.assertEqual(val, sameVal)
+        self.assertEqual(sameVal.valId(), 2)
+
+    def testPassValueTypeReferenceFromExtendedClass(self):
+        val = ExtVal(0)
+        self.assertEqual(val.valId(), 0)
+        sameVal = val.passValueTypeReference(val)
+        self.assertEqual(val, sameVal)
+        self.assertEqual(sameVal.valId(), 1)
+        sameVal = val.callPassValueTypeReference(val)
+        self.assertEqual(val, sameVal)
+        self.assertEqual(sameVal.valId(), 2)
+
+
 if __name__ == '__main__':
     unittest.main()