shiboken: Test setters/getters of classes held by smart pointers

Add a setter/getter to the pointee.

Task-number: PYSIDE-454
Change-Id: Ia6978300846ff82d8061df9f27c3fbd0c8e71b2f
Reviewed-by: Christian Tismer <tismer@stackless.com>

4 files changed, 24 insertions, 6 deletions

diff --git a/sources/shiboken2/tests/libsmart/smart.cpp b/sources/shiboken2/tests/libsmart/smart.cpp
index 6a4deb50a..a426f0f41 100644
--- a/sources/shiboken2/tests/libsmart/smart.cpp
+++ b/sources/shiboken2/tests/libsmart/smart.cpp
@@ -93,7 +93,7 @@ Obj::~Obj()
 void Obj::printObj() {
     if (shouldPrint()) {
         std::cout << "integer value: " << m_integer
-                  << " internal integer value: " << m_internalInteger->m_int << '\n';
+                  << " internal integer value: " << m_internalInteger->value() << '\n';
     }
 }
 
@@ -134,7 +134,7 @@ int Obj::takeSharedPtrToObj(SharedPtr<Obj> pObj)
 int Obj::takeSharedPtrToInteger(SharedPtr<Integer> pInt)
 {
     pInt->printInteger();
-    return pInt->m_int;
+    return pInt->value();
 }
 
 Integer Obj::takeInteger(Integer val)
@@ -173,7 +173,17 @@ Integer::~Integer()
         std::cout << "Integer destructor " << this << '\n';
 }
 
-void Integer::printInteger()
+int Integer::value() const
+{
+    return m_int;
+}
+
+void Integer::setValue(int v)
+{
+    m_int = v;
+}
+
+void Integer::printInteger() const
 {
     if (shouldPrint())
         std::cout << "Integer value for object " << this << " is " << m_int << '\n';
diff --git a/sources/shiboken2/tests/libsmart/smart_integer.h b/sources/shiboken2/tests/libsmart/smart_integer.h
index 3756f68b0..126894120 100644
--- a/sources/shiboken2/tests/libsmart/smart_integer.h
+++ b/sources/shiboken2/tests/libsmart/smart_integer.h
@@ -37,8 +37,12 @@ public:
     Integer(const Integer &other);
     Integer &operator=(const Integer &other);
     ~Integer();
-    void printInteger();
-    int m_int;
+    void printInteger() const;
+
+    int value() const;
+    void setValue(int v);
+
+    int m_int; // public for testing member field access.
 };
 
 namespace Smart {
diff --git a/sources/shiboken2/tests/libsmart/smart_obj.h b/sources/shiboken2/tests/libsmart/smart_obj.h
index 12425366e..18c085ae2 100644
--- a/sources/shiboken2/tests/libsmart/smart_obj.h
+++ b/sources/shiboken2/tests/libsmart/smart_obj.h
@@ -53,7 +53,7 @@ public:
     int takeSharedPtrToObj(SharedPtr<Obj> pObj);
     int takeSharedPtrToInteger(SharedPtr<Integer> pInt);
 
-    int m_integer;
+    int m_integer;  // public for testing member field access.
     Integer *m_internalInteger;
 };
 
diff --git a/sources/shiboken2/tests/smartbinding/smart_pointer_test.py b/sources/shiboken2/tests/smartbinding/smart_pointer_test.py
index e1883c7cc..5f8840b23 100644
--- a/sources/shiboken2/tests/smartbinding/smart_pointer_test.py
+++ b/sources/shiboken2/tests/smartbinding/smart_pointer_test.py
@@ -116,6 +116,10 @@ class SmartPointerTests(unittest.TestCase):
         self.assertEqual(integer.m_int, 50)
 
         # Set and get a member value via shared pointer (like operator->).
+        ptrToInteger.setValue(150)
+        self.assertEqual(ptrToInteger.value(), 150)
+
+        # Set and get a member field via shared pointer (like operator->).
         ptrToInteger.m_int = 100
         self.assertEqual(ptrToInteger.m_int, 100)