- CppGenerator and HeaderGenerator modified to take classes with

  private destructors into account
- Removed ShibokenGenerator::canCreateWrapperFor(...) method
- Minor improvements to ShibokenGenerator documentation
- Expanded PrivateDtor case and added related unit test

2 files changed, 67 insertions, 2 deletions

diff --git a/tests/libsample/privatedtor.h b/tests/libsample/privatedtor.h
index 9cc78ae8b..8e428292a 100644
--- a/tests/libsample/privatedtor.h
+++ b/tests/libsample/privatedtor.h
@@ -37,13 +37,23 @@
 
 class PrivateDtor
 {
-    PrivateDtor* instance()
+public:
+    static PrivateDtor* instance()
     {
         static PrivateDtor self;
+        self.m_instanciations++;
         return &self;
     }
+
+    int instanceCalls()
+    {
+        return m_instanciations;
+    }
+
 private:
-    PrivateDtor() {}
+    int m_instanciations;
+
+    PrivateDtor() : m_instanciations(0) {}
     PrivateDtor(const PrivateDtor&) {}
     ~PrivateDtor() {}
 };
diff --git a/tests/samplebinding/privatedtor_test.py b/tests/samplebinding/privatedtor_test.py
new file mode 100755
index 000000000..7acabf039
--- /dev/null
+++ b/tests/samplebinding/privatedtor_test.py
@@ -0,0 +1,55 @@
+#!/usr/bin/python
+
+'''Test cases for a class with a private destructor.'''
+
+import gc
+import sys
+import unittest
+
+from sample import PrivateDtor
+
+
+class PrivateDtorTest(unittest.TestCase):
+    '''Test case for PrivateDtor class'''
+
+    def testPrivateDtorInstanciation(self):
+        '''Test if instanciation of class with a private destructor raises an exception.'''
+        self.assertRaises(TypeError, PrivateDtor)
+
+    def testPrivateDtorInheritance(self):
+        '''Test if inheriting from PrivateDtor raises an exception.'''
+        def inherit():
+            class Foo(PrivateDtor):
+                pass
+        self.assertRaises(TypeError, inherit)
+
+    def testPrivateDtorInstanceMethod(self):
+        '''Test if PrivateDtor.instance() method return the proper singleton.'''
+        pd1 = PrivateDtor.instance()
+        calls = pd1.instanceCalls()
+        self.assertEqual(type(pd1), PrivateDtor)
+        pd2 = PrivateDtor.instance()
+        self.assertEqual(pd2, pd1)
+        self.assertEqual(pd2.instanceCalls(), calls + 1)
+
+    def testPrivateDtorRefCounting(self):
+        '''Test refcounting of the singleton returned by PrivateDtor.instance().'''
+        pd1 = PrivateDtor.instance()
+        calls = pd1.instanceCalls()
+        refcnt = sys.getrefcount(pd1)
+        pd2 = PrivateDtor.instance()
+        self.assertEqual(pd2.instanceCalls(), calls + 1)
+        self.assertEqual(sys.getrefcount(pd2), sys.getrefcount(pd1))
+        self.assertEqual(sys.getrefcount(pd2), refcnt + 1)
+        del pd1
+        self.assertEqual(sys.getrefcount(pd2), refcnt)
+        del pd2
+        gc.collect()
+        pd3 = PrivateDtor.instance()
+        self.assertEqual(type(pd3), PrivateDtor)
+        self.assertEqual(pd3.instanceCalls(), calls + 2)
+        self.assertEqual(sys.getrefcount(pd3), refcnt)
+
+if __name__ == '__main__':
+    unittest.main()
+