From 135b42c3c4cb6654181df1d3e2dab35e7ae39bd7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sybren=20A=2E=20St=C3=BCvel?= Date: Thu, 11 Jan 2024 14:36:59 +0100 Subject: [PATCH] Anim: fix Python bone collection unit tests The bone collection unit tests in Python were failing, but this failure was not propagated to `ctest` and thus went unnoticed. Both issues are now fixed. --- tests/python/bl_animation_armature.py | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/tests/python/bl_animation_armature.py b/tests/python/bl_animation_armature.py index dcd12cfacab..53bcbe4a9db 100644 --- a/tests/python/bl_animation_armature.py +++ b/tests/python/bl_animation_armature.py @@ -62,6 +62,7 @@ class BoneCollectionTest(unittest.TestCase): def test_bone_collection_api(self): # Just to keep the rest of the code shorter. bcolls = self.arm.collections + bcolls_all = self.arm.collections_all self.assertEqual([], list(bcolls), "By default an Armature should have no collections") @@ -84,7 +85,7 @@ class BoneCollectionTest(unittest.TestCase): self.assertEqual(root1, r1_child1.parent) # Check the array order. - self.assertEqual([root1, root2, r1_child1, r1_child1_001, r2_child1, r2_child2], list(bcolls.all)) + self.assertEqual([root1, root2, r1_child1, r1_child1_001, r2_child1, r2_child2], list(bcolls_all)) # Move root2 to become the child of r1_child1. root2.parent = r1_child1 @@ -97,11 +98,11 @@ class BoneCollectionTest(unittest.TestCase): self.assertEqual(r1_child1, root2.parent) # Check the array order. - self.assertEqual([root1, r1_child1, r1_child1_001, r2_child1, r2_child2, root2], list(bcolls.all)) + self.assertEqual([root1, r1_child1, r1_child1_001, r2_child1, r2_child2, root2], list(bcolls_all)) # Move root2 between r1_child1 and r1_child1_001. root2.parent = root1 - root2.child_num = 1 + root2.child_number = 1 # Check the hierarchy. self.assertEqual([root1], list(bcolls), 'armature.collections should reflect only the roots') @@ -110,7 +111,7 @@ class BoneCollectionTest(unittest.TestCase): self.assertEqual([r2_child1, r2_child2], list(root2.children), 'root2.children should have its children') # Check the array order. - self.assertEqual([root1, r1_child1, root2, r1_child1_001, r2_child1, r2_child2], list(bcolls.all)) + self.assertEqual([root1, r1_child1, root2, r1_child1_001, r2_child1, r2_child2], list(bcolls_all)) def test_parent_property(self): # Just to keep the rest of the code shorter. @@ -210,15 +211,15 @@ class BoneCollectionTest(unittest.TestCase): self.assertEqual({'FINISHED'}, bpy.ops.object.join()) # Check the custom properties. - bcolls = self.arm.collections - self.assertEqual(0.2, bcolls.all['root']['float']) - self.assertEqual('main_string', bcolls.all['child1']['string']) - self.assertEqual({'agent': 47}, bcolls.all['child2']['dict'].to_dict()) + bcolls_all = self.arm.collections_all + self.assertEqual(0.2, bcolls_all['root']['float']) + self.assertEqual('main_string', bcolls_all['child1']['string']) + self.assertEqual({'agent': 47}, bcolls_all['child2']['dict'].to_dict()) self.assertNotIn( 'strange', - bcolls.all['child1'], + bcolls_all['child1'], 'Bone collections that already existed in the active armature are not expected to be updated') - self.assertEqual({'agent': 327}, bcolls.all['child3']['dict'].to_dict()) + self.assertEqual({'agent': 327}, bcolls_all['child3']['dict'].to_dict()) def main(): @@ -230,7 +231,7 @@ def main(): # Avoid passing all of Blender's arguments to unittest.main() argv = [sys.argv[0]] - unittest.main(argv=argv, exit=False) + unittest.main(argv=argv) if __name__ == "__main__":