1 files changed, 21 insertions, 27 deletions
diff --git a/sources/shiboken6/tests/samplebinding/sample_test.py b/sources/shiboken6/tests/samplebinding/sample_test.py
index 52abc968f..19b2f708d 100644
--- a/sources/shiboken6/tests/samplebinding/sample_test.py
+++ b/sources/shiboken6/tests/samplebinding/sample_test.py
@@ -15,35 +15,10 @@ init_paths()
 
 import sample
 
+
 class ModuleTest(unittest.TestCase):
     '''Test case for module and global functions'''
 
-    @unittest.skipIf(sys.pyside63_option_python_enum, "Makes no sense with strict Enums")
-    def testModuleMembers(self):
-        '''Test availability of classes, global functions and other members on binding'''
-        expected_members = set(['Abstract', 'Derived', 'Point',
-                                'ListUser', 'PairUser', 'MapUser',
-                                'gimmeComplexList', 'gimmeDouble', 'gimmeInt',
-                                'makeCString', 'multiplyPair', 'returnCString',
-                                'SampleNamespace', 'transmuteComplexIntoPoint',
-                                'transmutePointIntoComplex', 'sumComplexPair',
-                                'FirstThing', 'SecondThing', 'ThirdThing',
-                                'GlobalEnum', 'NoThing'])
-        self.assertTrue(expected_members.issubset(dir(sample)))
-
-    @unittest.skipIf(sys.pyside63_option_python_enum, "Makes no sense with strict Enums")
-    def testAbstractPrintFormatEnum(self):
-        '''Test availability of PrintFormat enum from Abstract class'''
-        enum_members = set(['PrintFormat', 'Short', 'Verbose',
-                            'OnlyId', 'ClassNameAndId'])
-        self.assertTrue(enum_members.issubset(dir(sample.Abstract)))
-
-    @unittest.skipIf(sys.pyside63_option_python_enum, "Makes no sense with strict Enums")
-    def testSampleNamespaceOptionEnum(self):
-        '''Test availability of Option enum from SampleNamespace namespace'''
-        enum_members = set(['Option', 'None_', 'RandomNumber', 'UnixTime'])
-        self.assertTrue(enum_members.issubset(dir(sample.SampleNamespace)))
-
     def testAddedFunctionAtModuleLevel(self):
         '''Calls function added to module from type system description.'''
         str1 = 'Foo'
@@ -76,7 +51,26 @@ class ModuleTest(unittest.TestCase):
         sample.testNullPtrT(None)
         self.assertRaises(TypeError, sample.testNullPtrT, 42)
 
+    def testRValueRefsWithValueTypes(self):
+        """Passing value types by rvalue refs: For value types, nothing should
+           happen since the argument is copied in the call and the copy is
+           moved from."""
+        polygon = sample.Polygon()
+        polygon.addPoint(sample.Point(1, 2))
+        polygon.addPoint(sample.Point(3, 4))
+        point_count = len(polygon.points())
+        self.assertEqual(point_count, sample.takePolygon(polygon))
+
+    def testRValueRefsWithObjectTypes(self):
+        """Passing object types by rvalue refs: The underlying object should
+           be moved from."""
+        o = sample.ObjectType()
+        object_name = "Name"
+        o.setObjectName(object_name)
+        self.assertEqual(len(object_name), sample.takeObjectType(o))
+        # o should be moved from, name is now empty
+        self.assertEqual(len(o.objectName()), 0)
+
 
 if __name__ == '__main__':
     unittest.main()
-