diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-07-03 08:12:24 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-07-03 08:12:24 +0300 |
| commit | 646f8bdb4801b0376b3e4bd01bbac49a51c99940 (patch) | |
| tree | 1844ac7a5a3f01da1b1ae2c1ce21cc1ff3d53de1 /tests | |
| parent | 00fc1d70a70694973c53d4974ed21ef888532d0a (diff) | |
Cleanup: pep8
Diffstat (limited to 'tests')
50 files changed, 658 insertions, 655 deletions
diff --git a/tests/python/eevee_render_tests.py b/tests/python/eevee_render_tests.py index 74e716dc8e6..48751e6bbcb 100755 --- a/tests/python/eevee_render_tests.py +++ b/tests/python/eevee_render_tests.py @@ -8,6 +8,7 @@ import shutil import subprocess import sys + def setup(): import bpy @@ -29,6 +30,7 @@ def setup(): mat.use_screen_refraction = True mat.use_screen_subsurface = True + # When run from inside Blender, render and exit. try: import bpy diff --git a/tests/python/view_layer/test_active_collection.py b/tests/python/view_layer/test_active_collection.py index 10df71f77ce..1c6c3cd1983 100644 --- a/tests/python/view_layer/test_active_collection.py +++ b/tests/python/view_layer/test_active_collection.py @@ -42,23 +42,23 @@ class UnitTesting(ViewLayerTesting): layer.collections.link(subzero) lookup = [ - 'Master Collection', - '1', - 'sub-zero', - 'scorpion', - '2', - '3', - '4', - '5', - 'sub-zero', - 'scorpion'] + 'Master Collection', + '1', + 'sub-zero', + 'scorpion', + '2', + '3', + '4', + '5', + 'sub-zero', + 'scorpion'] for i, name in enumerate(lookup): layer.collections.active_index = i self.assertEqual( - name, layer.collections.active.name, - "Collection index mismatch: [{0}] : {1} != {2}".format( - i, name, layer.collections.active.name)) + name, layer.collections.active.name, + "Collection index mismatch: [{0}] : {1} != {2}".format( + i, name, layer.collections.active.name)) # ############################################################ diff --git a/tests/python/view_layer/test_collection_new_sync.py b/tests/python/view_layer/test_collection_new_sync.py index 582e6c13d89..46b63c64f45 100644 --- a/tests/python/view_layer/test_collection_new_sync.py +++ b/tests/python/view_layer/test_collection_new_sync.py @@ -26,16 +26,16 @@ class UnitTesting(ViewLayerTesting): self.assertEqual(view_layer.collections[0].collection, scene.master_collection) self.assertEqual( - {collection.name for collection in view_layer.collections[0].collections}, - {'Collection 1'}) + {collection.name for collection in view_layer.collections[0].collections}, + {'Collection 1'}) self.assertEqual( - bpy.ops.outliner.collection_new(), - {'FINISHED'}) + bpy.ops.outliner.collection_new(), + {'FINISHED'}) self.assertEqual( - {collection.name for collection in view_layer.collections[0].collections}, - {'Collection 1', 'Collection 2'}) + {collection.name for collection in view_layer.collections[0].collections}, + {'Collection 1', 'Collection 2'}) # ############################################################ diff --git a/tests/python/view_layer/test_group_d.py b/tests/python/view_layer/test_group_d.py index 6f54ca5340a..709d27df184 100644 --- a/tests/python/view_layer/test_group_d.py +++ b/tests/python/view_layer/test_group_d.py @@ -46,7 +46,6 @@ class UnitTesting(ViewLayerTesting): self.assertEqual(1, bpy.data.groups[0].users) self.assertEqual(3, len(bpy.data.groups[0].objects)) - # empty the group of objects group = bpy.data.groups[0] while group.objects: diff --git a/tests/python/view_layer/test_layer_linking.py b/tests/python/view_layer/test_layer_linking.py index 4c66c564d7c..43c88aa65f9 100644 --- a/tests/python/view_layer/test_layer_linking.py +++ b/tests/python/view_layer/test_layer_linking.py @@ -67,7 +67,7 @@ class UnitTesting(ViewLayerTesting): self.assertTrue(compare_files( filepath_nested_json, filepath_json, - ), + ), "Scene dump files differ") def test_syncing_layer_new(self): diff --git a/tests/python/view_layer/test_layer_syncing.py b/tests/python/view_layer/test_layer_syncing.py index d8175c4850f..9baf25f9e9e 100644 --- a/tests/python/view_layer/test_layer_syncing.py +++ b/tests/python/view_layer/test_layer_syncing.py @@ -68,7 +68,7 @@ class UnitTesting(ViewLayerTesting): self.assertTrue(compare_files( filepath_nested_json, filepath_json, - ), + ), "Scene dump files differ") def test_syncing_link(self): diff --git a/tests/python/view_layer/test_make_single_user.py b/tests/python/view_layer/test_make_single_user.py index 2a8a479bab2..292c2d50605 100644 --- a/tests/python/view_layer/test_make_single_user.py +++ b/tests/python/view_layer/test_make_single_user.py @@ -33,7 +33,7 @@ class UnitTesting(ViewLayerTesting): while master_collection.collections: master_collection.collections.remove( - master_collection.collections[0]) + master_collection.collections[0]) view_layer.collections.link(master_collection) ob.select_set('SELECT') diff --git a/tests/python/view_layer/test_move_above_below_layer_collection_f.py b/tests/python/view_layer/test_move_above_below_layer_collection_f.py index 77d65ef8671..036486bf55a 100644 --- a/tests/python/view_layer/test_move_above_below_layer_collection_f.py +++ b/tests/python/view_layer/test_move_above_below_layer_collection_f.py @@ -16,36 +16,36 @@ from view_layer_common import * class UnitTesting(MoveLayerCollectionTesting): def get_reference_scene_tree_map(self): reference_tree_map = [ - ['A', [ - ['i', None], - ['ii', None], - ['iii', None], - ]], - ['B', None], - ['C', [ - ['1', None], - ['3', [ - ['dog', None], - ['cat', None], - ]], - ['2', None], - ]], - ] + ['A', [ + ['i', None], + ['ii', None], + ['iii', None], + ]], + ['B', None], + ['C', [ + ['1', None], + ['3', [ + ['dog', None], + ['cat', None], + ]], + ['2', None], + ]], + ] return reference_tree_map def get_reference_layers_tree_map(self): reference_layers_map = [ - ['Layer 1', [ - 'Master Collection', - 'C', - '3', - ]], - ['Layer 2', [ - 'C', - 'dog', - 'cat', - ]], - ] + ['Layer 1', [ + 'Master Collection', + 'C', + '3', + ]], + ['Layer 2', [ + 'C', + 'dog', + 'cat', + ]], + ] return reference_layers_map def test_layer_collection_move_a(self): diff --git a/tests/python/view_layer/test_move_above_below_layer_collection_g.py b/tests/python/view_layer/test_move_above_below_layer_collection_g.py index 16cd628edfc..aca6c5d5ff6 100644 --- a/tests/python/view_layer/test_move_above_below_layer_collection_g.py +++ b/tests/python/view_layer/test_move_above_below_layer_collection_g.py @@ -16,21 +16,21 @@ from view_layer_common import * class UnitTesting(MoveLayerCollectionTesting): def get_reference_scene_tree_map(self): reference_tree_map = [ - ['A', [ - ['i', None], - ['ii', None], - ['iii', None], - ]], - ['B', None], - ['C', [ - ['1', None], - ['2', None], - ['3', [ - ['cat', None], - ['dog', None], - ]], - ]], - ] + ['A', [ + ['i', None], + ['ii', None], + ['iii', None], + ]], + ['B', None], + ['C', [ + ['1', None], + ['2', None], + ['3', [ + ['cat', None], + ['dog', None], + ]], + ]], + ] return reference_tree_map def get_reference_layers_tree_map(self): diff --git a/tests/python/view_layer/test_move_above_below_layer_collection_i.py b/tests/python/view_layer/test_move_above_below_layer_collection_i.py index 0134d11adcd..dada882a412 100644 --- a/tests/python/view_layer/test_move_above_below_layer_collection_i.py +++ b/tests/python/view_layer/test_move_above_below_layer_collection_i.py @@ -20,18 +20,18 @@ class UnitTesting(MoveLayerCollectionTesting): def get_reference_layers_tree_map(self): reference_layers_map = [ - ['Layer 1', [ - 'Master Collection', - 'C', - '3', - ]], - ['Layer 2', [ - '3', - 'C', - 'dog', - 'cat', - ]], - ] + ['Layer 1', [ + 'Master Collection', + 'C', + '3', + ]], + ['Layer 2', [ + '3', + 'C', + 'dog', + 'cat', + ]], + ] return reference_layers_map def test_layer_collection_move_a(self): diff --git a/tests/python/view_layer/test_move_above_below_layer_collection_l.py b/tests/python/view_layer/test_move_above_below_layer_collection_l.py index 2bc1054ec7e..a8fad414685 100644 --- a/tests/python/view_layer/test_move_above_below_layer_collection_l.py +++ b/tests/python/view_layer/test_move_above_below_layer_collection_l.py @@ -20,18 +20,18 @@ class UnitTesting(MoveLayerCollectionTesting): def get_reference_layers_tree_map(self): reference_layers_map = [ - ['Layer 1', [ - 'Master Collection', - 'C', - '3', - ]], - ['Layer 2', [ - 'C', - 'cat', - '3', - 'dog', - ]], - ] + ['Layer 1', [ + 'Master Collection', + 'C', + '3', + ]], + ['Layer 2', [ + 'C', + 'cat', + '3', + 'dog', + ]], + ] return reference_layers_map def test_layer_collection_move_a(self): diff --git a/tests/python/view_layer/test_move_above_below_scene_collection_a.py b/tests/python/view_layer/test_move_above_below_scene_collection_a.py index 3e45102e0b2..f558491527e 100644 --- a/tests/python/view_layer/test_move_above_below_scene_collection_a.py +++ b/tests/python/view_layer/test_move_above_below_scene_collection_a.py @@ -17,21 +17,21 @@ class UnitTesting(MoveSceneCollectionTesting): def get_reference_scene_tree_map(self): # original tree, no changes reference_tree_map = [ - ['A', [ - ['i', None], - ['ii', None], - ['iii', None], - ]], - ['B', None], - ['C', [ - ['1', None], - ['2', None], - ['3', [ - ['dog', None], - ['cat', None], - ]], - ]], - ] + ['A', [ + ['i', None], + ['ii', None], + ['iii', None], + ]], + ['B', None], + ['C', [ + ['1', None], + ['2', None], + ['3', [ + ['dog', None], + ['cat', None], + ]], + ]], + ] return reference_tree_map def test_scene_collection_move_a(self): diff --git a/tests/python/view_layer/test_move_above_below_scene_collection_b.py b/tests/python/view_layer/test_move_above_below_scene_collection_b.py index 83980705846..037ee01e205 100644 --- a/tests/python/view_layer/test_move_above_below_scene_collection_b.py +++ b/tests/python/view_layer/test_move_above_below_scene_collection_b.py @@ -16,21 +16,21 @@ from view_layer_common import * class UnitTesting(MoveSceneCollectionTesting): def get_reference_scene_tree_map(self): reference_tree_map = [ - ['A', [ - ['i', None], - ['ii', None], - ['iii', None], - ]], - ['B', None], - ['C', [ - ['3', [ - ['dog', None], - ['cat', None], - ]], - ['1', None], - ['2', None], - ]], - ] + ['A', [ + ['i', None], + ['ii', None], + ['iii', None], + ]], + ['B', None], + ['C', [ + ['3', [ + ['dog', None], + ['cat', None], + ]], + ['1', None], + ['2', None], + ]], + ] return reference_tree_map def test_scene_collection_move_a(self): diff --git a/tests/python/view_layer/test_move_above_below_scene_collection_c.py b/tests/python/view_layer/test_move_above_below_scene_collection_c.py index cceb2bb235b..07b67092d3e 100644 --- a/tests/python/view_layer/test_move_above_below_scene_collection_c.py +++ b/tests/python/view_layer/test_move_above_below_scene_collection_c.py @@ -16,21 +16,21 @@ from view_layer_common import * class UnitTesting(MoveSceneCollectionTesting): def get_reference_scene_tree_map(self): reference_tree_map = [ - ['A', [ - ['i', None], - ['ii', None], - ['3', [ - ['dog', None], - ['cat', None], - ]], - ['iii', None], - ]], - ['B', None], - ['C', [ - ['1', None], - ['2', None], - ]], - ] + ['A', [ + ['i', None], + ['ii', None], + ['3', [ + ['dog', None], + ['cat', None], + ]], + ['iii', None], + ]], + ['B', None], + ['C', [ + ['1', None], + ['2', None], + ]], + ] return reference_tree_map def test_scene_collection_move(self): diff --git a/tests/python/view_layer/test_move_above_below_scene_collection_d.py b/tests/python/view_layer/test_move_above_below_scene_collection_d.py index 5917e9ceb6c..9923d917abf 100644 --- a/tests/python/view_layer/test_move_above_below_scene_collection_d.py +++ b/tests/python/view_layer/test_move_above_below_scene_collection_d.py @@ -17,21 +17,21 @@ class UnitTesting(MoveSceneCollectionTesting): def get_reference_scene_tree_map(self): # original tree, no changes reference_tree_map = [ - ['A', [ - ['i', None], - ['ii', None], - ['iii', None], - ]], - ['C', [ - ['1', None], - ['2', None], - ['3', [ - ['dog', None], - ['B', None], - ['cat', None], - ]], - ]], - ] + ['A', [ + ['i', None], + ['ii', None], + ['iii', None], + ]], + ['C', [ + ['1', None], + ['2', None], + ['3', [ + ['dog', None], + ['B', None], + ['cat', None], + ]], + ]], + ] return reference_tree_map def test_scene_collection_move_a(self): diff --git a/tests/python/view_layer/test_move_above_below_scene_collection_e.py b/tests/python/view_layer/test_move_above_below_scene_collection_e.py index 12778ff9131..b9076826551 100644 --- a/tests/python/view_layer/test_move_above_below_scene_collection_e.py +++ b/tests/python/view_layer/test_move_above_below_scene_collection_e.py @@ -17,21 +17,21 @@ class UnitTesting(MoveSceneCollectionTesting): def get_reference_scene_tree_map(self): # original tree, no changes reference_tree_map = [ - ['A', [ - ['i', None], - ['ii', None], - ]], - ['B', None], - ['C', [ - ['1', None], - ['2', None], - ['3', [ - ['dog', None], - ['iii', None], - ['cat', None], - ]], - ]], - ] + ['A', [ + ['i', None], + ['ii', None], + ]], + ['B', None], + ['C', [ + ['1', None], + ['2', None], + ['3', [ + ['dog', None], + ['iii', None], + ['cat', None], + ]], + ]], + ] return reference_tree_map def test_scene_collection_move_a(self): diff --git a/tests/python/view_layer/test_move_above_below_scene_collection_f.py b/tests/python/view_layer/test_move_above_below_scene_collection_f.py index b9d5e8eff24..3343d0d774b 100644 --- a/tests/python/view_layer/test_move_above_below_scene_collection_f.py +++ b/tests/python/view_layer/test_move_above_below_scene_collection_f.py @@ -16,21 +16,21 @@ from view_layer_common import * class UnitTesting(MoveSceneCollectionTesting): def get_reference_scene_tree_map(self): reference_tree_map = [ - ['B', None], - ['C', [ - ['1', None], - ['2', None], - ['3', [ - ['A', [ - ['i', None], - ['ii', None], - ['iii', None], - ]], - ['dog', None], - ['cat', None], - ]], + ['B', None], + ['C', [ + ['1', None], + ['2', None], + ['3', [ + ['A', [ + ['i', None], + ['ii', None], + ['iii', None], ]], - ] + ['dog', None], + ['cat', None], + ]], + ]], + ] return reference_tree_map def test_scene_collection_move(self): diff --git a/tests/python/view_layer/test_move_above_below_scene_collection_sync_a.py b/tests/python/view_layer/test_move_above_below_scene_collection_sync_a.py index d36930dcbc5..73c79b0de87 100644 --- a/tests/python/view_layer/test_move_above_below_scene_collection_sync_a.py +++ b/tests/python/view_layer/test_move_above_below_scene_collection_sync_a.py @@ -17,21 +17,21 @@ class UnitTesting(MoveSceneCollectionSyncTesting): def get_reference_scene_tree_map(self): # original tree, no changes reference_tree_map = [ - ['A', [ - ['i', None], - ['ii', None], - ['iii', None], - ]], - ['B', None], - ['C', [ - ['1', None], - ['2', None], - ['3', [ - ['dog', None], - ['cat', None], - ]], - ]], - ] + ['A', [ + ['i', None], + ['ii', None], + ['iii', None], + ]], + ['B', None], + ['C', [ + ['1', None], + ['2', None], + ['3', [ + ['dog', None], + ['cat', None], + ]], + ]], + ] return reference_tree_map def test_scene_collection_move_a(self): diff --git a/tests/python/view_layer/test_move_above_below_scene_collection_sync_b.py b/tests/python/view_layer/test_move_above_below_scene_collection_sync_b.py index 79718e1168a..552ca0d5c9b 100644 --- a/tests/python/view_layer/test_move_above_below_scene_collection_sync_b.py +++ b/tests/python/view_layer/test_move_above_below_scene_collection_sync_b.py @@ -16,21 +16,21 @@ from view_layer_common import * class UnitTesting(MoveSceneCollectionSyncTesting): def get_reference_scene_tree_map(self): reference_tree_map = [ - ['A', [ - ['i', None], - ['ii', None], - ['iii', None], - ]], - ['B', None], - ['C', [ - ['3', [ - ['dog', None], - ['cat', None], - ]], - ['1', None], - ['2', None], - ]], - ] + ['A', [ + ['i', None], + ['ii', None], + ['iii', None], + ]], + ['B', None], + ['C', [ + ['3', [ + ['dog', None], + ['cat', None], + ]], + ['1', None], + ['2', None], + ]], + ] return reference_tree_map def test_scene_collection_move_a(self): diff --git a/tests/python/view_layer/test_move_above_below_scene_collection_sync_c.py b/tests/python/view_layer/test_move_above_below_scene_collection_sync_c.py index ef23b722b8b..c54115b0d13 100644 --- a/tests/python/view_layer/test_move_above_below_scene_collection_sync_c.py +++ b/tests/python/view_layer/test_move_above_below_scene_collection_sync_c.py @@ -16,21 +16,21 @@ from view_layer_common import * class UnitTesting(MoveSceneCollectionSyncTesting): def get_reference_scene_tree_map(self): reference_tree_map = [ - ['A', [ - ['i', None], - ['ii', None], - ['3', [ - ['dog', None], - ['cat', None], - ]], - ['iii', None], - ]], - ['B', None], - ['C', [ - ['1', None], - ['2', None], - ]], - ] + ['A', [ + ['i', None], + ['ii', None], + ['3', [ + ['dog', None], + ['cat', None], + ]], + ['iii', None], + ]], + ['B', None], + ['C', [ + ['1', None], + ['2', None], + ]], + ] return reference_tree_map def test_scene_collection_move(self): diff --git a/tests/python/view_layer/test_move_above_below_scene_collection_sync_d.py b/tests/python/view_layer/test_move_above_below_scene_collection_sync_d.py index 05c3bcdbcbb..bb770f61344 100644 --- a/tests/python/view_layer/test_move_above_below_scene_collection_sync_d.py +++ b/tests/python/view_layer/test_move_above_below_scene_collection_sync_d.py @@ -17,21 +17,21 @@ class UnitTesting(MoveSceneCollectionSyncTesting): def get_reference_scene_tree_map(self): # original tree, no changes reference_tree_map = [ - ['A', [ - ['i', None], - ['ii', None], - ['iii', None], - ]], - ['C', [ - ['1', None], - ['2', None], - ['3', [ - ['dog', None], - ['B', None], - ['cat', None], - ]], - ]], - ] + ['A', [ + ['i', None], + ['ii', None], + ['iii', None], + ]], + ['C', [ + ['1', None], + ['2', None], + ['3', [ + ['dog', None], + ['B', None], + ['cat', None], + ]], + ]], + ] return reference_tree_map def test_scene_collection_move_a(self): diff --git a/tests/python/view_layer/test_move_above_below_scene_collection_sync_e.py b/tests/python/view_layer/test_move_above_below_scene_collection_sync_e.py index ebab970ba19..88a77bf8385 100644 --- a/tests/python/view_layer/test_move_above_below_scene_collection_sync_e.py +++ b/tests/python/view_layer/test_move_above_below_scene_collection_sync_e.py @@ -17,21 +17,21 @@ class UnitTesting(MoveSceneCollectionSyncTesting): def get_reference_scene_tree_map(self): # original tree, no changes reference_tree_map = [ - ['A', [ - ['i', None], - ['ii', None], - ]], - ['B', None], - ['C', [ - ['1', None], - ['2', None], - ['3', [ - ['dog', None], - ['iii', None], - ['cat', None], - ]], - ]], - ] + ['A', [ + ['i', None], + ['ii', None], + ]], + ['B', None], + ['C', [ + ['1', None], + ['2', None], + ['3', [ + ['dog', None], + ['iii', None], + ['cat', None], + ]], + ]], + ] return reference_tree_map def test_scene_collection_move_a(self): diff --git a/tests/python/view_layer/test_move_above_below_scene_collection_sync_f.py b/tests/python/view_layer/test_move_above_below_scene_collection_sync_f.py index 7e4f0bc4a9c..013165986f4 100644 --- a/tests/python/view_layer/test_move_above_below_scene_collection_sync_f.py +++ b/tests/python/view_layer/test_move_above_below_scene_collection_sync_f.py @@ -16,21 +16,21 @@ from view_layer_common import * class UnitTesting(MoveSceneCollectionSyncTesting): def get_reference_scene_tree_map(self): reference_tree_map = [ - ['B', None], - ['C', [ - ['1', None], - ['2', None], - ['3', [ - ['A', [ - ['i', None], - ['ii', None], - ['iii', None], - ]], - ['dog', None], - ['cat', None], - ]], + ['B', None], + ['C', [ + ['1', None], + ['2', None], + ['3', [ + ['A', [ + ['i', None], + ['ii', None], + ['iii', None], ]], - ] + ['dog', None], + ['cat', None], + ]], + ]], + ] return reference_tree_map def test_scene_collection_move(self): diff --git a/tests/python/view_layer/test_move_into_layer_collection_a.py b/tests/python/view_layer/test_move_into_layer_collection_a.py index ef5a839a44a..85e24e53463 100644 --- a/tests/python/view_layer/test_move_into_layer_collection_a.py +++ b/tests/python/view_layer/test_move_into_layer_collection_a.py @@ -17,38 +17,38 @@ class UnitTesting(MoveLayerCollectionTesting): def get_reference_scene_tree_map(self): # original tree, no changes reference_tree_map = [ - ['A', [ - ['i', None], - ['ii', None], - ['iii', None], - ]], - ['B', None], - ['C', [ - ['1', None], - ['2', None], - ['3', [ - ['dog', None], - ['cat', None], - ]], - ]], - ] + ['A', [ + ['i', None], + ['ii', None], + ['iii', None], + ]], + ['B', None], + ['C', [ + ['1', None], + ['2', None], + ['3', [ + ['dog', None], + ['cat', None], + ]], + ]], + ] return reference_tree_map def get_reference_layers_tree_map(self): # original tree, no changes reference_layers_map = [ - ['Layer 1', [ - 'Master Collection', - 'C', - '3', - ]], - ['Layer 2', [ - 'C', - '3', - 'dog', - 'cat', - ]], - ] + ['Layer 1', [ + 'Master Collection', + 'C', + '3', + ]], + ['Layer 2', [ + 'C', + '3', + 'dog', + 'cat', + ]], + ] return reference_layers_map def test_layer_collection_into(self): diff --git a/tests/python/view_layer/test_move_into_layer_collection_f.py b/tests/python/view_layer/test_move_into_layer_collection_f.py index 7bf007d2724..7595619f42a 100644 --- a/tests/python/view_layer/test_move_into_layer_collection_f.py +++ b/tests/python/view_layer/test_move_into_layer_collection_f.py @@ -16,36 +16,36 @@ from view_layer_common import * class UnitTesting(MoveLayerCollectionTesting): def get_reference_scene_tree_map(self): reference_tree_map = [ - ['A', [ - ['i', None], - ['ii', None], - ['iii', None], - ['3', [ - ['dog', None], - ['cat', None], - ]], - ]], - ['B', None], - ['C', [ - ['1', None], - ['2', None], - ]], - ] + ['A', [ + ['i', None], + ['ii', None], + ['iii', None], + ['3', [ + ['dog', None], + ['cat', None], + ]], + ]], + ['B', None], + ['C', [ + ['1', None], + ['2', None], + ]], + ] return reference_tree_map def get_reference_layers_tree_map(self): reference_layers_map = [ - ['Layer 1', [ - 'Master Collection', - 'C', - ]], - ['Layer 2', [ - 'C', - '3', - 'dog', - 'cat', - ]], - ] + ['Layer 1', [ + 'Master Collection', + 'C', + ]], + ['Layer 2', [ + 'C', + '3', + 'dog', + 'cat', + ]], + ] return reference_layers_map def test_layer_collection_into_a(self): diff --git a/tests/python/view_layer/test_move_into_layer_collection_g.py b/tests/python/view_layer/test_move_into_layer_collection_g.py index efcdd44da97..90f6739d249 100644 --- a/tests/python/view_layer/test_move_into_layer_collection_g.py +++ b/tests/python/view_layer/test_move_into_layer_collection_g.py @@ -20,17 +20,17 @@ class UnitTesting(MoveLayerCollectionTesting): def get_reference_layers_tree_map(self): reference_layers_map = [ - ['Layer 1', [ - 'Master Collection', - 'C', - '3', - ]], - ['Layer 2', [ - 'C', - 'dog', - 'cat', - ]], - ] + ['Layer 1', [ + 'Master Collection', + 'C', + '3', + ]], + ['Layer 2', [ + 'C', + 'dog', + 'cat', + ]], + ] return reference_layers_map def test_layer_collection_into_a(self): diff --git a/tests/python/view_layer/test_move_into_layer_collection_h.py b/tests/python/view_layer/test_move_into_layer_collection_h.py index 82f5d70dceb..0e5a86c57ae 100644 --- a/tests/python/view_layer/test_move_into_layer_collection_h.py +++ b/tests/python/view_layer/test_move_into_layer_collection_h.py @@ -16,22 +16,22 @@ from view_layer_common import * class UnitTesting(MoveLayerCollectionTesting): def get_reference_scene_tree_map(self): reference_tree_map = [ - ['A', [ - ['i', None], - ['ii', None], - ['iii', None], - ]], - ['B', None], - ['C', [ - ['1', [ - ['dog', None], - ]], - ['2', None], - ['3', [ - ['cat', None], - ]], - ]], - ] + ['A', [ + ['i', None], + ['ii', None], + ['iii', None], + ]], + ['B', None], + ['C', [ + ['1', [ + ['dog', None], + ]], + ['2', None], + ['3', [ + ['cat', None], + ]], + ]], + ] return reference_tree_map def get_reference_layers_tree_map(self): diff --git a/tests/python/view_layer/test_move_into_scene_collection_a.py b/tests/python/view_layer/test_move_into_scene_collection_a.py index c5671d46316..ab997ddf9b6 100644 --- a/tests/python/view_layer/test_move_into_scene_collection_a.py +++ b/tests/python/view_layer/test_move_into_scene_collection_a.py @@ -17,21 +17,21 @@ class UnitTesting(MoveSceneCollectionTesting): def get_reference_scene_tree_map(self): # original tree, no changes reference_tree_map = [ - ['A', [ - ['i', None], - ['ii', None], - ['iii', None], - ]], - ['B', None], - ['C', [ - ['1', None], - ['2', None], - ['3', [ - ['dog', None], - ['cat', None], - ]], - ]], - ] + ['A', [ + ['i', None], + ['ii', None], + ['iii', None], + ]], + ['B', None], + ['C', [ + ['1', None], + ['2', None], + ['3', [ + ['dog', None], + ['cat', None], + ]], + ]], + ] return reference_tree_map def test_scene_collection_into(self): diff --git a/tests/python/view_layer/test_move_into_scene_collection_b.py b/tests/python/view_layer/test_move_into_scene_collection_b.py index 08cacde6f0c..4254a736b40 100644 --- a/tests/python/view_layer/test_move_into_scene_collection_b.py +++ b/tests/python/view_layer/test_move_into_scene_collection_b.py @@ -16,22 +16,22 @@ from view_layer_common import * class UnitTesting(MoveSceneCollectionTesting): def get_reference_scene_tree_map(self): reference_tree_map = [ - ['A', [ - ['i', None], - ['ii', None], - ['iii', None], - ]], - ['B', [ - ['3', [ - ['dog', None], - ['cat', None], - ]], - ]], - ['C', [ - ['1', None], - ['2', None], - ]], - ] + ['A', [ + ['i', None], + ['ii', None], + ['iii', None], + ]], + ['B', [ + ['3', [ + ['dog', None], + ['cat', None], + ]], + ]], + ['C', [ + ['1', None], + ['2', None], + ]], + ] return reference_tree_map def test_scene_collection_into(self): diff --git a/tests/python/view_layer/test_move_into_scene_collection_c.py b/tests/python/view_layer/test_move_into_scene_collection_c.py index 83b1d2fc52b..1c9aa295f72 100644 --- a/tests/python/view_layer/test_move_into_scene_collection_c.py +++ b/tests/python/view_layer/test_move_into_scene_collection_c.py @@ -16,22 +16,22 @@ from view_layer_common import * class UnitTesting(MoveSceneCollectionTesting): def get_reference_scene_tree_map(self): reference_tree_map = [ - ['A', [ - ['i', None], - ['ii', None], - ['iii', None], - ]], - ['B', None], - ['C', [ - ['1', None], - ['2', None], - ['3', [ - ['dog', [ + ['A', [ + ['i', None], + ['ii', None], + ['iii', None], + ]], + ['B', None], + ['C', [ + ['1', None], + ['2', None], + ['3', [ + ['dog', [ ['cat', None], - ]], - ]], ]], - ] + ]], + ]], + ] return reference_tree_map def test_scene_collection_into(self): diff --git a/tests/python/view_layer/test_move_into_scene_collection_e.py b/tests/python/view_layer/test_move_into_scene_collection_e.py index 00a4274c564..f8d37eb769d 100644 --- a/tests/python/view_layer/test_move_into_scene_collection_e.py +++ b/tests/python/view_layer/test_move_into_scene_collection_e.py @@ -16,22 +16,22 @@ from view_layer_common import * class UnitTesting(MoveSceneCollectionTesting): def get_reference_scene_tree_map(self): reference_tree_map = [ - ['A', [ - ['i', None], - ['ii', None], - ['iii', None], - ]], - ['C', [ - ['1', None], - ['2', None], - ['3', [ - ['dog', None], - ['cat', [ + ['A', [ + ['i', None], + ['ii', None], + ['iii', None], + ]], + ['C', [ + ['1', None], + ['2', None], + ['3', [ + ['dog', None], + ['cat', [ ['B', None], - ]], - ]], ]], - ] + ]], + ]], + ] return reference_tree_map def test_scene_collection_into(self): diff --git a/tests/python/view_layer/test_move_into_scene_collection_f.py b/tests/python/view_layer/test_move_into_scene_collection_f.py index 4cba04c35a5..a89c7dd81e9 100644 --- a/tests/python/view_layer/test_move_into_scene_collection_f.py +++ b/tests/python/view_layer/test_move_into_scene_collection_f.py @@ -16,21 +16,21 @@ from view_layer_common import * class UnitTesting(MoveSceneCollectionTesting): def get_reference_scene_tree_map(self): reference_tree_map = [ - ['A', [ - ['i', None], - ['ii', None], - ['iii', None], - ]], - ['C', [ - ['1', None], - ['2', None], - ['3', [ - ['dog', None], - ['cat', None], - ['B', None], - ]], - ]], - ] + ['A', [ + ['i', None], + ['ii', None], + ['iii', None], + ]], + ['C', [ + ['1', None], + ['2', None], + ['3', [ + ['dog', None], + ['cat', None], + ['B', None], + ]], + ]], + ] return reference_tree_map def test_scene_collection_into(self): diff --git a/tests/python/view_layer/test_move_into_scene_collection_g.py b/tests/python/view_layer/test_move_into_scene_collection_g.py index 5ca2658407f..04919ca720b 100644 --- a/tests/python/view_layer/test_move_into_scene_collection_g.py +++ b/tests/python/view_layer/test_move_into_scene_collection_g.py @@ -16,22 +16,22 @@ from view_layer_common import * class UnitTesting(MoveSceneCollectionTesting): def get_reference_scene_tree_map(self): reference_tree_map = [ - ['B', None], - ['C', [ - ['1', None], - ['2', None], - ['3', [ - ['dog', [ + ['B', None], + ['C', [ + ['1', None], + ['2', None], + ['3', [ + ['dog', [ ['A', [ ['i', None], ['ii', None], ['iii', None], - ]], ]], - ['cat', None], - ]], ]], - ] + ['cat', None], + ]], + ]], + ] return reference_tree_map def test_scene_collection_into(self): diff --git a/tests/python/view_layer/test_move_into_scene_collection_h.py b/tests/python/view_layer/test_move_into_scene_collection_h.py index 1524dbad7bc..57b15c4ef44 100644 --- a/tests/python/view_layer/test_move_into_scene_collection_h.py +++ b/tests/python/view_layer/test_move_into_scene_collection_h.py @@ -16,22 +16,22 @@ from view_layer_common import * class UnitTesting(MoveSceneCollectionTesting): def get_reference_scene_tree_map(self): reference_tree_map = [ - ['A', [ - ['i', None], - ['iii', None], - ]], - ['B', None], - ['C', [ - ['1', None], - ['2', [ - ['ii', None], - ]], - ['3', [ - ['dog', None], - ['cat', None], - ]], - ]], - ] + ['A', [ + ['i', None], + ['iii', None], + ]], + ['B', None], + ['C', [ + ['1', None], + ['2', [ + ['ii', None], + ]], + ['3', [ + ['dog', None], + ['cat', None], + ]], + ]], + ] return reference_tree_map def test_scene_collection_into(self): diff --git a/tests/python/view_layer/test_move_into_scene_collection_i.py b/tests/python/view_layer/test_move_into_scene_collection_i.py index 2240ba50d75..7b4076f3fd9 100644 --- a/tests/python/view_layer/test_move_into_scene_collection_i.py +++ b/tests/python/view_layer/test_move_into_scene_collection_i.py @@ -16,22 +16,22 @@ from view_layer_common import * class UnitTesting(MoveSceneCollectionTesting): def get_reference_scene_tree_map(self): reference_tree_map = [ - ['A', [ - ['i', None], - ['iii', None], - ]], - ['B', None], - ['C', [ - ['1', None], - ['2', None], - ['3', [ - ['dog', [ + ['A', [ + ['i', None], + ['iii', None], + ]], + ['B', None], + ['C', [ + ['1', None], + ['2', None], + ['3', [ + ['dog', [ ['ii', None], - ]], - ['cat', None], - ]], ]], - ] + ['cat', None], + ]], + ]], + ] return reference_tree_map def test_scene_collection_into(self): diff --git a/tests/python/view_layer/test_move_into_scene_collection_sync_b.py b/tests/python/view_layer/test_move_into_scene_collection_sync_b.py index a4d05b57f77..a485d7160d6 100644 --- a/tests/python/view_layer/test_move_into_scene_collection_sync_b.py +++ b/tests/python/view_layer/test_move_into_scene_collection_sync_b.py @@ -16,22 +16,22 @@ from view_layer_common import * class UnitTesting(MoveSceneCollectionSyncTesting): def get_reference_scene_tree_map(self): reference_tree_map = [ - ['A', [ - ['i', None], - ['ii', None], - ['iii', None], - ]], - ['B', [ - ['3', [ - ['dog', None], - ['cat', None], - ]], - ]], - ['C', [ - ['1', None], - ['2', None], - ]], - ] + ['A', [ + ['i', None], + ['ii', None], + ['iii', None], + ]], + ['B', [ + ['3', [ + ['dog', None], + ['cat', None], + ]], + ]], + ['C', [ + ['1', None], + ['2', None], + ]], + ] return reference_tree_map def test_scene_collection_into(self): diff --git a/tests/python/view_layer/test_move_into_scene_collection_sync_c.py b/tests/python/view_layer/test_move_into_scene_collection_sync_c.py index 3f125d513ce..e68e1d04a56 100644 --- a/tests/python/view_layer/test_move_into_scene_collection_sync_c.py +++ b/tests/python/view_layer/test_move_into_scene_collection_sync_c.py @@ -16,22 +16,22 @@ from view_layer_common import * class UnitTesting(MoveSceneCollectionSyncTesting): def get_reference_scene_tree_map(self): reference_tree_map = [ - ['A', [ - ['i', None], - ['ii', None], - ['iii', None], - ]], - ['B', None], - ['C', [ - ['1', None], - ['2', None], - ['3', [ - ['dog', [ + ['A', [ + ['i', None], + ['ii', None], + ['iii', None], + ]], + ['B', None], + ['C', [ + ['1', None], + ['2', None], + ['3', [ + ['dog', [ ['cat', None], - ]], - ]], ]], - ] + ]], + ]], + ] return reference_tree_map def test_scene_collection_into(self): diff --git a/tests/python/view_layer/test_move_into_scene_collection_sync_e.py b/tests/python/view_layer/test_move_into_scene_collection_sync_e.py index 689b4976dab..fac8d46e471 100644 --- a/tests/python/view_layer/test_move_into_scene_collection_sync_e.py +++ b/tests/python/view_layer/test_move_into_scene_collection_sync_e.py @@ -16,22 +16,22 @@ from view_layer_common import * class UnitTesting(MoveSceneCollectionSyncTesting): def get_reference_scene_tree_map(self): reference_tree_map = [ - ['A', [ - ['i', None], - ['ii', None], - ['iii', None], - ]], - ['C', [ - ['1', None], - ['2', None], - ['3', [ - ['dog', None], - ['cat', [ + ['A', [ + ['i', None], + ['ii', None], + ['iii', None], + ]], + ['C', [ + ['1', None], + ['2', None], + ['3', [ + ['dog', None], + ['cat', [ ['B', None], - ]], - ]], ]], - ] + ]], + ]], + ] return reference_tree_map def test_scene_collection_into(self): diff --git a/tests/python/view_layer/test_move_into_scene_collection_sync_f.py b/tests/python/view_layer/test_move_into_scene_collection_sync_f.py index e486f48aac1..bce9e45a764 100644 --- a/tests/python/view_layer/test_move_into_scene_collection_sync_f.py +++ b/tests/python/view_layer/test_move_into_scene_collection_sync_f.py @@ -16,21 +16,21 @@ from view_layer_common import * class UnitTesting(MoveSceneCollectionSyncTesting): def get_reference_scene_tree_map(self): reference_tree_map = [ - ['A', [ - ['i', None], - ['ii', None], - ['iii', None], - ]], - ['C', [ - ['1', None], - ['2', None], - ['3', [ - ['dog', None], - ['cat', None], - ['B', None], - ]], - ]], - ] + ['A', [ + ['i', None], + ['ii', None], + ['iii', None], + ]], + ['C', [ + ['1', None], + ['2', None], + ['3', [ + ['dog', None], + ['cat', None], + ['B', None], + ]], + ]], + ] return reference_tree_map def test_scene_collection_into(self): diff --git a/tests/python/view_layer/test_move_into_scene_collection_sync_g.py b/tests/python/view_layer/test_move_into_scene_collection_sync_g.py index 3792e9429a3..8b08eb9f210 100644 --- a/tests/python/view_layer/test_move_into_scene_collection_sync_g.py +++ b/tests/python/view_layer/test_move_into_scene_collection_sync_g.py @@ -16,22 +16,22 @@ from view_layer_common import * class UnitTesting(MoveSceneCollectionSyncTesting): def get_reference_scene_tree_map(self): reference_tree_map = [ - ['B', None], - ['C', [ - ['1', None], - ['2', None], - ['3', [ - ['dog', [ + ['B', None], + ['C', [ + ['1', None], + ['2', None], + ['3', [ + ['dog', [ ['A', [ ['i', None], ['ii', None], ['iii', None], - ]], ]], - ['cat', None], - ]], ]], - ] + ['cat', None], + ]], + ]], + ] return reference_tree_map def test_scene_collection_into(self): diff --git a/tests/python/view_layer/test_move_into_scene_collection_sync_h.py b/tests/python/view_layer/test_move_into_scene_collection_sync_h.py index 8b3ceb14d73..f7eeb00b150 100644 --- a/tests/python/view_layer/test_move_into_scene_collection_sync_h.py +++ b/tests/python/view_layer/test_move_into_scene_collection_sync_h.py @@ -16,22 +16,22 @@ from view_layer_common import * class UnitTesting(MoveSceneCollectionSyncTesting): def get_reference_scene_tree_map(self): reference_tree_map = [ - ['A', [ - ['i', None], - ['iii', None], - ]], - ['B', None], - ['C', [ - ['1', None], - ['2', [ - ['ii', None], - ]], - ['3', [ - ['dog', None], - ['cat', None], - ]], - ]], - ] + ['A', [ + ['i', None], + ['iii', None], + ]], + ['B', None], + ['C', [ + ['1', None], + ['2', [ + ['ii', None], + ]], + ['3', [ + ['dog', None], + ['cat', None], + ]], + ]], + ] return reference_tree_map def test_scene_collection_into(self): diff --git a/tests/python/view_layer/test_move_into_scene_collection_sync_i.py b/tests/python/view_layer/test_move_into_scene_collection_sync_i.py index 8262dcc06c1..373665dd732 100644 --- a/tests/python/view_layer/test_move_into_scene_collection_sync_i.py +++ b/tests/python/view_layer/test_move_into_scene_collection_sync_i.py @@ -16,22 +16,22 @@ from view_layer_common import * class UnitTesting(MoveSceneCollectionSyncTesting): def get_reference_scene_tree_map(self): reference_tree_map = [ - ['A', [ - ['i', None], - ['iii', None], - ]], - ['B', None], - ['C', [ - ['1', None], - ['2', None], - ['3', [ - ['dog', [ + ['A', [ + ['i', None], + ['iii', None], + ]], + ['B', None], + ['C', [ + ['1', None], + ['2', None], + ['3', [ + ['dog', [ ['ii', None], - ]], - ['cat', None], - ]], ]], - ] + ['cat', None], + ]], + ]], + ] return reference_tree_map def test_scene_collection_into(self): diff --git a/tests/python/view_layer/test_object_copy.py b/tests/python/view_layer/test_object_copy.py index 15d863f3138..19a7c56b989 100644 --- a/tests/python/view_layer/test_object_copy.py +++ b/tests/python/view_layer/test_object_copy.py @@ -68,7 +68,7 @@ class UnitTesting(ViewLayerTesting): self.assertTrue(compare_files( filepath_objects_json, filepath_json, - ), + ), "Scene dump files differ") def test_copy_object(self): diff --git a/tests/python/view_layer/test_operator_context.py b/tests/python/view_layer/test_operator_context.py index 38379aa2a75..d11666de118 100644 --- a/tests/python/view_layer/test_operator_context.py +++ b/tests/python/view_layer/test_operator_context.py @@ -27,19 +27,19 @@ class UnitTesting(ViewLayerTesting): bl_label = "Sample Operator" view_layer = bpy.props.StringProperty( - default="Not Set", - options={'SKIP_SAVE'}, - ) + default="Not Set", + options={'SKIP_SAVE'}, + ) scene_collection = bpy.props.StringProperty( - default="", - options={'SKIP_SAVE'}, - ) + default="", + options={'SKIP_SAVE'}, + ) use_verbose = bpy.props.BoolProperty( - default=False, - options={'SKIP_SAVE'}, - ) + default=False, + options={'SKIP_SAVE'}, + ) def execute(self, context): view_layer = context.view_layer diff --git a/tests/python/view_layer/test_scene_copy_a.py b/tests/python/view_layer/test_scene_copy_a.py index 8cccb26a92d..8f0f2316ce1 100644 --- a/tests/python/view_layer/test_scene_copy_a.py +++ b/tests/python/view_layer/test_scene_copy_a.py @@ -23,9 +23,9 @@ class UnitTesting(ViewLayerTesting): filepath_layers_json_copy = os.path.join(ROOT, 'layers_copy_full_simple.json') self.do_scene_copy( - filepath_layers_json_copy, - 'FULL_COPY', - (get_scene_collections,)) + filepath_layers_json_copy, + 'FULL_COPY', + (get_scene_collections,)) # ############################################################ diff --git a/tests/python/view_layer/test_scene_copy_b.py b/tests/python/view_layer/test_scene_copy_b.py index 1d53b56719d..73c6976c32c 100644 --- a/tests/python/view_layer/test_scene_copy_b.py +++ b/tests/python/view_layer/test_scene_copy_b.py @@ -24,9 +24,9 @@ class UnitTesting(ViewLayerTesting): # note: nothing should change, so using `layers_simple.json` filepath_layers_json_copy = os.path.join(ROOT, 'layers_simple.json') self.do_scene_copy( - filepath_layers_json_copy, - 'LINK_OBJECTS', - (get_scene_collections,)) + filepath_layers_json_copy, + 'LINK_OBJECTS', + (get_scene_collections,)) # ############################################################ diff --git a/tests/python/view_layer/test_scene_copy_c.py b/tests/python/view_layer/test_scene_copy_c.py index c9bb0924848..57c875c047c 100644 --- a/tests/python/view_layer/test_scene_copy_c.py +++ b/tests/python/view_layer/test_scene_copy_c.py @@ -23,9 +23,9 @@ class UnitTesting(ViewLayerTesting): filepath_layers_json_copy = os.path.join(ROOT, 'layers_copy_full.json') self.do_scene_copy( - filepath_layers_json_copy, - 'FULL_COPY', - (get_scene_collections, get_layers)) + filepath_layers_json_copy, + 'FULL_COPY', + (get_scene_collections, get_layers)) # ############################################################ diff --git a/tests/python/view_layer/test_scene_copy_d.py b/tests/python/view_layer/test_scene_copy_d.py index 6efd93c7659..6db3fb797e5 100644 --- a/tests/python/view_layer/test_scene_copy_d.py +++ b/tests/python/view_layer/test_scene_copy_d.py @@ -23,9 +23,9 @@ class UnitTesting(ViewLayerTesting): filepath_layers_json_copy = os.path.join(ROOT, 'layers_copy_link.json') self.do_scene_copy( - filepath_layers_json_copy, - 'LINK_OBJECTS', - (get_scene_collections, get_layers)) + filepath_layers_json_copy, + 'LINK_OBJECTS', + (get_scene_collections, get_layers)) # ############################################################ diff --git a/tests/python/view_layer/test_scene_write_read.py b/tests/python/view_layer/test_scene_write_read.py index 6c750d87987..92f3395d819 100644 --- a/tests/python/view_layer/test_scene_write_read.py +++ b/tests/python/view_layer/test_scene_write_read.py @@ -46,7 +46,7 @@ class UnitTesting(ViewLayerTesting): self.assertTrue(compare_files( filepath_doversion_json, filepath_layers_json, - ), + ), "Run: test_scene_write_layers") if do_read: @@ -65,7 +65,7 @@ class UnitTesting(ViewLayerTesting): self.assertTrue(compare_files( filepath_read_json, filepath_layers_json, - ), + ), "Scene dump files differ") def test_scene_write_collections(self): @@ -79,10 +79,10 @@ class UnitTesting(ViewLayerTesting): filepath_layers_json = os.path.join(ROOT, 'layers_simple.json') self.do_scene_write_read( - filepath_layers, - filepath_layers_json, - (get_scene_collections,), - False) + filepath_layers, + filepath_layers_json, + (get_scene_collections,), + False) def test_scene_write_layers(self): """ @@ -95,10 +95,10 @@ class UnitTesting(ViewLayerTesting): filepath_layers_json = os.path.join(ROOT, 'layers.json') self.do_scene_write_read( - filepath_layers, - filepath_layers_json, - (get_scene_collections, get_layers), - False) + filepath_layers, + filepath_layers_json, + (get_scene_collections, get_layers), + False) def test_scene_read_collections(self): """ @@ -112,10 +112,10 @@ class UnitTesting(ViewLayerTesting): filepath_layers_json = os.path.join(ROOT, 'layers_simple.json') self.do_scene_write_read( - filepath_layers, - filepath_layers_json, - (get_scene_collections,), - True) + filepath_layers, + filepath_layers_json, + (get_scene_collections,), + True) def test_scene_read_layers(self): """ @@ -129,10 +129,10 @@ class UnitTesting(ViewLayerTesting): filepath_layers_json = os.path.join(ROOT, 'layers.json') self.do_scene_write_read( - filepath_layers, - filepath_layers_json, - (get_scene_collections, get_layers), - True) + filepath_layers, + filepath_layers_json, + (get_scene_collections, get_layers), + True) # ############################################################ diff --git a/tests/python/view_layer/view_layer_common.py b/tests/python/view_layer/view_layer_common.py index 8dcc094a1c6..25cf7c80d96 100644 --- a/tests/python/view_layer/view_layer_common.py +++ b/tests/python/view_layer/view_layer_common.py @@ -157,11 +157,11 @@ def query_scene(filepath, name, callbacks): def dump(data): import json return json.dumps( - data, - sort_keys=True, - indent=4, - separators=(',', ': '), - ) + data, + sort_keys=True, + indent=4, + separators=(',', ': '), + ) # ############################################################ @@ -170,7 +170,7 @@ def dump(data): PDB = False DUMP_DIFF = True -UPDATE_DIFF = False # HACK used to update tests when something change +UPDATE_DIFF = False # HACK used to update tests when something change def compare_files(file_a, file_b): @@ -188,7 +188,6 @@ def compare_files(file_a, file_b): import subprocess subprocess.call(["cp", "-u", file_a, file_b]) - if PDB: import pdb print("Files differ:", file_b, file_a) @@ -239,8 +238,8 @@ class ViewLayerTesting(unittest.TestCase): def path_exists(self, filepath): import os self.assertTrue( - os.path.exists(filepath), - "Test file \"{0}\" not found".format(filepath)) + os.path.exists(filepath), + "Test file \"{0}\" not found".format(filepath)) def do_object_add(self, filepath_json, add_mode): """ @@ -307,7 +306,7 @@ class ViewLayerTesting(unittest.TestCase): self.assertTrue(compare_files( filepath_objects_json, filepath_json, - ), + ), "Scene dump files differ") def do_object_add_no_collection(self, add_mode): @@ -356,7 +355,7 @@ class ViewLayerTesting(unittest.TestCase): (self.path_exists(f) for f in ( filepath_layers, filepath_json_reference, - )) + )) filepath_saved = os.path.join(dirpath, '{0}.blend'.format(copy_mode)) filepath_json = os.path.join(dirpath, "{0}.json".format(copy_mode)) @@ -376,7 +375,7 @@ class ViewLayerTesting(unittest.TestCase): self.assertTrue(compare_files( filepath_json, filepath_json_reference, - ), + ), "Scene copy \"{0}\" test failed".format(copy_mode.title())) def do_object_delete(self, del_mode): @@ -437,7 +436,7 @@ class ViewLayerTesting(unittest.TestCase): self.assertTrue(compare_files( filepath_generated_json, filepath_reference_json, - ), + ), "Scene dump files differ") def do_visibility_object_add(self, add_mode): @@ -517,23 +516,24 @@ class MoveSceneCollectionTesting(ViewLayerTesting): """ To be used by tests of view_layer_move_into_scene_collection """ + def get_initial_scene_tree_map(self): collections_map = [ - ['A', [ - ['i', None], - ['ii', None], - ['iii', None], - ]], - ['B', None], - ['C', [ - ['1', None], - ['2', None], - ['3', [ - ['dog', None], - ['cat', None], - ]], - ]], - ] + ['A', [ + ['i', None], + ['ii', None], + ['iii', None], + ]], + ['B', None], + ['C', [ + ['1', None], + ['2', None], + ['3', [ + ['dog', None], + ['cat', None], + ]], + ]], + ] return collections_map def build_scene_tree(self, tree_map, collection=None, ret_dict=None): @@ -565,8 +565,8 @@ class MoveSceneCollectionTesting(ViewLayerTesting): """ self.cleanup_tree() self.assertTrue( - hasattr(self, "get_initial_scene_tree_map"), - "Test class has no get_initial_scene_tree_map method implemented") + hasattr(self, "get_initial_scene_tree_map"), + "Test class has no get_initial_scene_tree_map method implemented") return self.build_scene_tree(self.get_initial_scene_tree_map()) @@ -605,20 +605,21 @@ class MoveSceneCollectionSyncTesting(MoveSceneCollectionTesting): """ To be used by tests of view_layer_move_into_scene_collection_sync """ + def get_initial_layers_tree_map(self): layers_map = [ - ['Layer 1', [ - 'Master Collection', - 'C', - '3', - ]], - ['Layer 2', [ - 'C', - '3', - 'dog', - 'cat', - ]], - ] + ['Layer 1', [ + 'Master Collection', + 'C', + '3', + ]], + ['Layer 2', [ + 'C', + '3', + 'dog', + 'cat', + ]], + ] return layers_map def get_reference_layers_tree_map(self): @@ -634,8 +635,8 @@ class MoveSceneCollectionSyncTesting(MoveSceneCollectionTesting): scene = bpy.context.scene self.assertTrue( - hasattr(self, "get_initial_layers_tree_map"), - "Test class has no get_initial_layers_tree_map method implemented") + hasattr(self, "get_initial_layers_tree_map"), + "Test class has no get_initial_layers_tree_map method implemented") layers_map = self.get_initial_layers_tree_map() @@ -684,6 +685,7 @@ class MoveLayerCollectionTesting(MoveSceneCollectionSyncTesting): """ To be used by tests of view_layer_move_into_layer_collection """ + def parse_move(self, path, sep='.'): """ convert 'Layer 1.C.2' into: @@ -739,15 +741,15 @@ class Clay: # store the variables self._scene_collections = { - 'grandma': scene_collection_grandma, - 'mom': scene_collection_mom, - 'kid': scene_collection_kid, - } + 'grandma': scene_collection_grandma, + 'mom': scene_collection_mom, + 'kid': scene_collection_kid, + } self._layer_collections = { - 'grandma': layer_collection_grandma, - 'mom': layer_collection_mom, - 'kid': layer_collection_kid, - } + 'grandma': layer_collection_grandma, + 'mom': layer_collection_mom, + 'kid': layer_collection_kid, + } if extra_kid_layer: layer_collection_extra = self._layer.collections.link(scene_collection_kid) @@ -765,7 +767,7 @@ class Clay: # remove all the other collections while self._scene.master_collection.collections: self._scene.master_collection.collections.remove( - self._scene.master_collection.collections[0]) + self._scene.master_collection.collections[0]) layer = self._scene.view_layers.new('Evaluation Test') layer.collections.unlink(layer.collections[0]) @@ -790,9 +792,9 @@ class Clay: # change scene settings self._properties = { - 'scene': self._scene.collection_properties[ENGINE], - 'object': self._object.collection_properties[ENGINE], - } + 'scene': self._scene.collection_properties[ENGINE], + 'object': self._object.collection_properties[ENGINE], + } for key, value in self._layer_collections.items(): self._properties[key] = self._layer_collections[key].engine_overrides[ENGINE] |