shiboken6/smart pointer test suite: Rename API

Task-number: PYSIDE-454
Change-Id: Iac84695a35eb9e3e6512e3310536058b49ad79ac
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>

4 files changed, 54 insertions, 54 deletions

diff --git a/sources/shiboken6/tests/libsmart/smart.cpp b/sources/shiboken6/tests/libsmart/smart.cpp
index 3a1c36977..ae0ed6877 100644
--- a/sources/shiboken6/tests/libsmart/smart.cpp
+++ b/sources/shiboken6/tests/libsmart/smart.cpp
@@ -31,20 +31,20 @@
 #include <algorithm>
 #include <iostream>
 
-static inline bool shouldPrint()
+static inline bool verbose()
 {
-    return Registry::getInstance()->shouldPrint();
+    return Registry::getInstance()->verbose();
 }
 
 void SharedPtrBase::logDefaultConstructor(const void *t)
 {
-    if (shouldPrint())
+    if (verbose())
         std::cout << "shared_ptr default constructor " << t << '\n';
 }
 
 void SharedPtrBase::logConstructor(const void *t, const void *pointee)
 {
-    if (shouldPrint()) {
+    if (verbose()) {
         std::cout << "shared_ptr constructor " << t << " with pointer "
             << pointee << '\n';
     }
@@ -52,7 +52,7 @@ void SharedPtrBase::logConstructor(const void *t, const void *pointee)
 
 void SharedPtrBase::logCopyConstructor(const void *t, const void *refData)
 {
-    if (shouldPrint()) {
+    if (verbose()) {
         std::cout << "shared_ptr copy constructor " << t << " with pointer "
             << refData << '\n';
     }
@@ -60,7 +60,7 @@ void SharedPtrBase::logCopyConstructor(const void *t, const void *refData)
 
 void SharedPtrBase::logAssignment(const void *t, const void *refData)
 {
-    if (shouldPrint()) {
+    if (verbose()) {
         std::cout << "shared_ptr assignment operator " << t << " with pointer "
             << refData << "\n";
     }
@@ -68,7 +68,7 @@ void SharedPtrBase::logAssignment(const void *t, const void *refData)
 
 void SharedPtrBase::logDestructor(const void *t, int remainingRefCount)
 {
-    if (shouldPrint()) {
+    if (verbose()) {
         std::cout << "shared_ptr destructor " << t << " remaining refcount "
             << remainingRefCount << '\n';
     }
@@ -77,7 +77,7 @@ void SharedPtrBase::logDestructor(const void *t, int remainingRefCount)
 Obj::Obj() : m_integer(123), m_internalInteger(new Integer)
 {
     Registry::getInstance()->add(this);
-    if (shouldPrint())
+    if (verbose())
         std::cout << "Object constructor " << this << '\n';
 }
 
@@ -85,41 +85,41 @@ Obj::~Obj()
 {
     Registry::getInstance()->remove(this);
     delete m_internalInteger;
-    if (shouldPrint())
+    if (verbose())
         std::cout << "Object destructor " << this << '\n';
 }
 
 
 void Obj::printObj() {
-    if (shouldPrint()) {
+    if (verbose()) {
         std::cout << "integer value: " << m_integer
                   << " internal integer value: " << m_internalInteger->value() << '\n';
     }
 }
 
 
-SharedPtr<Obj> Obj::giveSharedPtrToObj()
+SharedPtr<Obj> Obj::createSharedPtrObj()
 {
     SharedPtr<Obj> o(new Obj);
     return o;
 }
 
-std::vector<SharedPtr<Obj> > Obj::giveSharedPtrToObjList(int size)
+std::vector<SharedPtr<Obj> > Obj::createSharedPtrObjList(int size)
 {
     std::vector<SharedPtr<Obj> > r;
     for (int i=0; i < size; i++)
-        r.push_back(giveSharedPtrToObj());
+        r.push_back(createSharedPtrObj());
     return r;
 }
 
 
-SharedPtr<Integer> Obj::giveSharedPtrToInteger()
+SharedPtr<Integer> Obj::createSharedPtrInteger()
 {
     SharedPtr<Integer> o(new Integer);
     return o;
 }
 
-SharedPtr<Smart::Integer2> Obj::giveSharedPtrToInteger2()
+SharedPtr<Smart::Integer2> Obj::createSharedPtrInteger2()
 {
     SharedPtr<Smart::Integer2> o(new Smart::Integer2);
     return o;
@@ -151,19 +151,19 @@ int Obj::takeSharedPtrToIntegerByConstRef(const SharedPtr<Integer> &pInt)
     return pInt->value();
 }
 
-SharedPtr<Integer> Obj::createSharedPtrToInteger(int value)
+SharedPtr<Integer> Obj::createSharedPtrInteger(int value)
 {
     auto *i = new Integer;
     i->setValue(value);
     return SharedPtr<Integer>(i);
 }
 
-SharedPtr<Integer> Obj::createNullSharedPtrToInteger()
+SharedPtr<Integer> Obj::createNullSharedPtrInteger()
 {
     return {};
 }
 
-SharedPtr<const Integer> Obj::giveSharedPtrToConstInteger()
+SharedPtr<const Integer> Obj::createSharedPtrConstInteger()
 {
     SharedPtr<const Integer> co(new Integer);
     return co;
@@ -182,14 +182,14 @@ Integer Obj::takeInteger(Integer val)
 Integer::Integer() : m_int(456)
 {
     Registry::getInstance()->add(this);
-    if (shouldPrint())
+    if (verbose())
         std::cout << "Integer constructor " << this << '\n';
 }
 
 Integer::Integer(const Integer &other)
 {
     Registry::getInstance()->add(this);
-    if (shouldPrint())
+    if (verbose())
         std::cout << "Integer copy constructor " << this << '\n';
     m_int = other.m_int;
 }
@@ -197,7 +197,7 @@ Integer::Integer(const Integer &other)
 Integer &Integer::operator=(const Integer &other)
 {
     Registry::getInstance()->add(this);
-    if (shouldPrint())
+    if (verbose())
         std::cout << "Integer operator= " << this << '\n';
     m_int = other.m_int;
     return *this;
@@ -206,7 +206,7 @@ Integer &Integer::operator=(const Integer &other)
 Integer::~Integer()
 {
     Registry::getInstance()->remove(this);
-    if (shouldPrint())
+    if (verbose())
         std::cout << "Integer destructor " << this << '\n';
 }
 
@@ -229,7 +229,7 @@ int Integer::compare(const Integer &rhs) const
 
 void Integer::printInteger() const
 {
-    if (shouldPrint())
+    if (verbose())
         std::cout << "Integer value for object " << this << " is " << m_int << '\n';
 }
 
@@ -273,14 +273,14 @@ int Registry::countIntegers() const
     return static_cast<int>(m_integers.size());
 }
 
-bool Registry::shouldPrint() const
+bool Registry::verbose() const
 {
-    return m_printStuff;
+    return m_verbose;
 }
 
-void Registry::setShouldPrint(bool flag)
+void Registry::setVerbose(bool flag)
 {
-    m_printStuff = flag;
+    m_verbose = flag;
 }
 
 Smart::Integer2::Integer2()
diff --git a/sources/shiboken6/tests/libsmart/smart_obj.h b/sources/shiboken6/tests/libsmart/smart_obj.h
index 2adc30cbb..4afbac226 100644
--- a/sources/shiboken6/tests/libsmart/smart_obj.h
+++ b/sources/shiboken6/tests/libsmart/smart_obj.h
@@ -46,18 +46,18 @@ public:
 
     void printObj();
     Integer takeInteger(Integer val);
-    static SharedPtr<Obj> giveSharedPtrToObj();
-    std::vector<SharedPtr<Obj> > giveSharedPtrToObjList(int size);
-    virtual SharedPtr<Integer> giveSharedPtrToInteger(); // virtual for PYSIDE-1188
-    SharedPtr<const Integer> giveSharedPtrToConstInteger();
+    static SharedPtr<Obj> createSharedPtrObj();
+    std::vector<SharedPtr<Obj> > createSharedPtrObjList(int size);
+    virtual SharedPtr<Integer> createSharedPtrInteger(); // virtual for PYSIDE-1188
+    SharedPtr<const Integer> createSharedPtrConstInteger();
     int takeSharedPtrToConstInteger(SharedPtr<const Integer> pInt);
-    SharedPtr<Smart::Integer2> giveSharedPtrToInteger2();
+    SharedPtr<Smart::Integer2> createSharedPtrInteger2();
     int takeSharedPtrToObj(SharedPtr<Obj> pObj);
     int takeSharedPtrToInteger(SharedPtr<Integer> pInt);
     int takeSharedPtrToIntegerByConstRef(const SharedPtr<Integer> &pInt);
 
-    static SharedPtr<Integer> createSharedPtrToInteger(int value);
-    static SharedPtr<Integer> createNullSharedPtrToInteger();
+    static SharedPtr<Integer> createSharedPtrInteger(int value);
+    static SharedPtr<Integer> createNullSharedPtrInteger();
 
     int m_integer;  // public for testing member field access.
     Integer *m_internalInteger;
diff --git a/sources/shiboken6/tests/libsmart/smart_registry.h b/sources/shiboken6/tests/libsmart/smart_registry.h
index 6171ddb59..e89248201 100644
--- a/sources/shiboken6/tests/libsmart/smart_registry.h
+++ b/sources/shiboken6/tests/libsmart/smart_registry.h
@@ -53,8 +53,8 @@ public:
     void remove(Integer *p);
     int countObjects() const;
     int countIntegers() const;
-    bool shouldPrint() const;
-    void setShouldPrint(bool flag);
+    bool verbose() const;
+    void setVerbose(bool flag);
 
 protected:
     Registry();
@@ -62,7 +62,7 @@ protected:
 private:
     std::vector<Obj *> m_objects;
     std::vector<Integer *> m_integers;
-    bool m_printStuff = false;
+    bool m_verbose = false;
 };
 
 #endif // SMART_REGISTRY_H
diff --git a/sources/shiboken6/tests/smartbinding/smart_pointer_test.py b/sources/shiboken6/tests/smartbinding/smart_pointer_test.py
index e4eb8a4e9..8660fd41d 100644
--- a/sources/shiboken6/tests/smartbinding/smart_pointer_test.py
+++ b/sources/shiboken6/tests/smartbinding/smart_pointer_test.py
@@ -55,7 +55,7 @@ class SmartPointerTests(unittest.TestCase):
     def setUp(self):
         super().setUp()
         if os.environ.get("VERBOSE"):
-            Registry.getInstance().setShouldPrint(True)
+            Registry.getInstance().setVerbose(True)
 
     def testObjSmartPointer(self):
         # Create Obj.
@@ -65,7 +65,7 @@ class SmartPointerTests(unittest.TestCase):
         self.assertEqual(objCount(), 1)
 
         # Create a shared pointer to an Obj together with an Obj.
-        ptrToObj = o.giveSharedPtrToObj()
+        ptrToObj = o.createSharedPtrObj()
         self.assertEqual(objCount(), 2)
 
         # Delete the old Obj.
@@ -131,7 +131,7 @@ class SmartPointerTests(unittest.TestCase):
         self.assertEqual(objCount(), 1)
 
         # Create a shared pointer to an Integer together with an Integer.
-        ptrToInteger = o.giveSharedPtrToInteger()
+        ptrToInteger = o.createSharedPtrInteger()
         self.assertEqual(objCount(), 1)
         self.assertEqual(integerCount(), 2)
 
@@ -183,7 +183,7 @@ class SmartPointerTests(unittest.TestCase):
     def testConstIntegerSmartPointer(self):
         # Create Obj.
         o = Obj()
-        ptrToConstInteger = o.giveSharedPtrToConstInteger()
+        ptrToConstInteger = o.createSharedPtrConstInteger()
         self.assertEqual(ptrToConstInteger.m_int, 456)
         result = o.takeSharedPtrToConstInteger(ptrToConstInteger)
         self.assertEqual(result, 456)
@@ -197,7 +197,7 @@ class SmartPointerTests(unittest.TestCase):
         self.assertEqual(objCount(), 1)
 
         # Create a shared pointer to an Integer together with an Integer.
-        ptrToInteger = o.giveSharedPtrToInteger2()
+        ptrToInteger = o.createSharedPtrInteger2()
         self.assertEqual(objCount(), 1)
         self.assertEqual(integerCount(), 2)
 
@@ -209,7 +209,7 @@ class SmartPointerTests(unittest.TestCase):
         o = Obj()
 
         # Create a list of shared objects
-        ptrToObjList = o.giveSharedPtrToObjList(10)
+        ptrToObjList = o.createSharedPtrObjList(10)
         self.assertEqual(len(ptrToObjList), 10)
         # PYSIDE-535: Need to collect garbage in PyPy to trigger deletion
         gc.collect()
@@ -235,7 +235,7 @@ class SmartPointerTests(unittest.TestCase):
         # Create Obj.
         o = Obj()
         # Create a shared pointer to an Obj together with an Obj.
-        ptrToObj = o.giveSharedPtrToObj()
+        ptrToObj = o.createSharedPtrObj()
         try:
             ptrToObj.typo
             self.assertFail()
@@ -251,7 +251,7 @@ class SmartPointerTests(unittest.TestCase):
         self.assertEqual(integerCount(), 1)
 
         # Create a shared pointer to an Integer2
-        integer2 = o.giveSharedPtrToInteger2()
+        integer2 = o.createSharedPtrInteger2()
         self.assertEqual(integer2.value(), 456)
 
         # pass Smart<Integer2> to a function that accepts Smart<Integer>
@@ -260,9 +260,9 @@ class SmartPointerTests(unittest.TestCase):
 
     def testSmartPointerValueComparison(self):
         """Test a pointee class with comparison operators."""
-        four = Obj.createSharedPtrToInteger(4)
-        four2 = Obj.createSharedPtrToInteger(4)
-        five = Obj.createSharedPtrToInteger(5)
+        four = Obj.createSharedPtrInteger(4)
+        four2 = Obj.createSharedPtrInteger(4)
+        five = Obj.createSharedPtrInteger(5)
         self.assertTrue(four == four)
         self.assertTrue(four == four2)
         self.assertFalse(four != four)
@@ -280,26 +280,26 @@ class SmartPointerTests(unittest.TestCase):
         self.assertTrue(five > four)
 
         self.assertRaises(NotImplementedError,
-                          lambda : Obj.createNullSharedPtrToInteger() == four)
+                          lambda : Obj.createNullSharedPtrInteger() == four)
 
     def testSmartPointerObjectComparison(self):
         """Test a pointee class without comparison operators."""
-        o1 = Obj.giveSharedPtrToObj()
-        o2 = Obj.giveSharedPtrToObj()
+        o1 = Obj.createSharedPtrObj()
+        o2 = Obj.createSharedPtrObj()
         self.assertTrue(o1 == o1)
         self.assertFalse(o1 != o1)
         self.assertFalse(o1 == o2)
         self.assertTrue(o1 != o2)
 
     def testOperatorNbBool(self):
-        null_ptr = Obj.createNullSharedPtrToInteger()
+        null_ptr = Obj.createNullSharedPtrInteger()
         self.assertFalse(null_ptr)
-        zero = Obj.createSharedPtrToInteger(0)
+        zero = Obj.createSharedPtrInteger(0)
         self.assertTrue(zero)
 
     def testParameterNone(self):
         o = Obj()
-        null_ptr = Obj.createNullSharedPtrToInteger()
+        null_ptr = Obj.createNullSharedPtrInteger()
         o.takeSharedPtrToInteger(null_ptr)
         o.takeSharedPtrToIntegerByConstRef(null_ptr)
         o.takeSharedPtrToInteger(None)