Improving ownership transference tests.

2 files changed, 87 insertions, 16 deletions

diff --git a/tests/samplebinding/ownership_invalidate_nonpolymorphic_test.py b/tests/samplebinding/ownership_invalidate_nonpolymorphic_test.py
new file mode 100755
index 00000000..a1f48dcd
--- /dev/null
+++ b/tests/samplebinding/ownership_invalidate_nonpolymorphic_test.py
@@ -0,0 +1,61 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+#
+# This file is part of the Shiboken Python Bindings Generator project.
+#
+# Copyright (C) 2009 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
+
+'''The BlackBox class has cases of ownership transference between Python and C++.'''
+
+import sys
+import unittest
+
+from sample import Point, BlackBox
+
+class OwnershipInvalidateNonPolymorphicTest(unittest.TestCase):
+    '''The BlackBox class has cases of ownership transference between Python and C++.'''
+
+    def testOwnershipTransference(self):
+        '''Ownership transference from Python to C++ and back again.'''
+        p1 = Point(10, 20)
+        p1_refcnt = sys.getrefcount(p1)
+        p2 = Point(25, 35)
+        p2_refcnt = sys.getrefcount(p2)
+        bb = BlackBox()
+        bb.keepPoint(p1)
+        bb.keepPoint(p2)
+        self.assertEqual(bb.points(), [p1, p2])
+        #self.assertEqual(p1.x(), 10)
+        #self.assertEqual(p2.x(), 25)
+        #self.assertEqual(sys.getrefcount(p1), p1_refcnt)
+        #self.assertEqual(sys.getrefcount(p2), p2_refcnt)
+        #p2 = bb.retrievePoint(p2)
+        #self.assertEqual(sys.getrefcount(p2), p2_refcnt)
+        #del bb
+        #self.assertRaises(RuntimeError, p1.x)
+        #self.assertEqual(p2.y(), 35)
+        #self.assertEqual(sys.getrefcount(p2), p2_refcnt)
+
+
+if __name__ == '__main__':
+    unittest.main()
+
diff --git a/tests/samplebinding/kindergarten_test.py b/tests/samplebinding/ownership_transference_test.py
index 2b7d611f..ec3c23db 100755
--- a/tests/samplebinding/kindergarten_test.py
+++ b/tests/samplebinding/ownership_transference_test.py
@@ -24,15 +24,15 @@
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
 # 02110-1301 USA
 
-'''The KinderGarten class has cases of ownership transference between C++ and Python.'''
+'''The BlackBox class has cases of ownership transference between C++ and Python.'''
 
 import sys
 import unittest
 
-from sample import ObjectType, KinderGarten
+from sample import ObjectType, BlackBox
 
-class KinderGartenTest(unittest.TestCase):
-    '''The KinderGarten class has cases of ownership transference between C++ and Python.'''
+class BlackBoxTest(unittest.TestCase):
+    '''The BlackBox class has cases of ownership transference between C++ and Python.'''
 
     def testOwnershipTransference(self):
         '''Ownership transference from Python to C++ and back again.'''
@@ -42,30 +42,40 @@ class KinderGartenTest(unittest.TestCase):
         o2 = ObjectType()
         o2.setObjectName('object2')
         o2_refcnt = sys.getrefcount(o2)
-        kg = KinderGarten()
-        kg.addChild(o1)
-        kg.addChild(o2)
-        self.assertEqual(kg.children(), [o1, o2])
+        bb = BlackBox()
+        bb.keepObjectType(o1)
+        bb.keepObjectType(o2)
+        self.assertEqual(bb.objects(), [o1, o2])
         self.assertEqual(str(o1.objectName()), 'object1')
         self.assertEqual(str(o2.objectName()), 'object2')
         self.assertEqual(sys.getrefcount(o1), o1_refcnt)
         self.assertEqual(sys.getrefcount(o2), o2_refcnt)
-        o2 = kg.releaseChild(o2)
+        o2 = bb.retrieveObjectType(o2)
         self.assertEqual(sys.getrefcount(o2), o2_refcnt)
-        del kg
-        self.assertNotEqual(str(o1.objectName()), 'object1')
+        del bb
+        self.assertRaises(RuntimeError, o1.objectName)
         self.assertEqual(str(o2.objectName()), 'object2')
         self.assertEqual(sys.getrefcount(o2), o2_refcnt)
 
-    def testKinderGartenReleasingUnknownChild(self):
-        '''Asks KinderGarten to release an unknown child object.'''
+    def testBlackBoxReleasingUnknownObjectType(self):
+        '''Asks BlackBox to release an unknown ObjectType.'''
         o1 = ObjectType()
         o2 = ObjectType()
-        kg = KinderGarten()
-        kg.addChild(o1)
-        o3 = kg.releaseChild(o2)
+        bb = BlackBox()
+        bb.keepObjectType(o1)
+        o3 = bb.retrieveObjectType(o2)
         self.assertEqual(o3, None)
 
+    def testOwnershipTransferenceCppCreated(self):
+        '''Ownership transference using a C++ created object.'''
+        o1 = ObjectType.create()
+        o1.setObjectName('object1')
+        o1_refcnt = sys.getrefcount(o1)
+        bb = BlackBox()
+        bb.keepObjectType(o1)
+        self.assertEqual(bb.objects(), [o1])
+        self.assertEqual(str(o1.objectName()), 'object1')
+
 if __name__ == '__main__':
     unittest.main()