blender
/
blender
128
396
Fork 569
Code Issues 6.2k Pull Requests 756 Projects 19 Wiki Activity

unittests: Update (fix) unittests after workspace API change 

Tests were broken since e8c15e0ed1.

We now get view_layer from window, not workspace, since the same workspace can
have a different view_layer depending on the window scene.
This commit is contained in:
Dalai Felinto 2017-12-01 16:08:45 -02:00
parent e9cf3fae8e
commit aa0c9867b2
15 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/python/view_layer/test_evaluation_selectability_a.py
View File

@ -21,13 +21,13 @@ class UnitTesting(ViewLayerTesting):
import bpy
scene = bpy.context.scene
workspace = bpy.context.workspace
window = bpy.context.window
cube = bpy.data.objects.new('guinea pig', bpy.data.meshes.new('mesh'))
layer = scene.view_layers.new('Selectability Test')
layer.collections.unlink(layer.collections[0])
scene.view_layers.active = layer
workspace.view_layer = layer
window.view_layer = layer
scene_collection_mom = scene.master_collection.collections.new("Mom")
scene_collection_kid = scene_collection_mom.collections.new("Kid")

4
tests/python/view_layer/test_evaluation_selectability_b.py
View File

@ -21,13 +21,13 @@ class UnitTesting(ViewLayerTesting):
import bpy
scene = bpy.context.scene
workspace = bpy.context.workspace
window = bpy.context.window
cube = bpy.data.objects.new('guinea pig', bpy.data.meshes.new('mesh'))
layer = scene.view_layers.new('Selectability Test')
layer.collections.unlink(layer.collections[0])
scene.view_layers.active = layer
workspace.view_layer = layer
window.view_layer = layer
scene_collection_mom = scene.master_collection.collections.new("Mom")
scene_collection_kid = scene_collection_mom.collections.new("Kid")

4
tests/python/view_layer/test_evaluation_selectability_c.py
View File

@ -21,13 +21,13 @@ class UnitTesting(ViewLayerTesting):
import bpy
scene = bpy.context.scene
workspace = bpy.context.workspace
window = bpy.context.window
cube = bpy.data.objects.new('guinea pig', bpy.data.meshes.new('mesh'))
layer = scene.view_layers.new('Selectability Test')
layer.collections.unlink(layer.collections[0])
scene.view_layers.active = layer
workspace.view_layer = layer
window.view_layer = layer
scene_collection_mom = scene.master_collection.collections.new("Mom")
scene_collection_kid = scene_collection_mom.collections.new("Kid")

4
tests/python/view_layer/test_evaluation_selectability_d.py
View File

@ -21,13 +21,13 @@ class UnitTesting(ViewLayerTesting):
import bpy
scene = bpy.context.scene
workspace = bpy.context.workspace
window = bpy.context.window
cube = bpy.data.objects.new('guinea pig', bpy.data.meshes.new('mesh'))
layer = scene.view_layers.new('Selectability Test')
layer.collections.unlink(layer.collections[0])
scene.view_layers.active = layer
workspace.view_layer = layer
window.view_layer = layer
scene_collection_mom = scene.master_collection.collections.new("Mom")
scene_collection_kid = scene_collection_mom.collections.new("Kid")

4
tests/python/view_layer/test_evaluation_selectability_e.py
View File

@ -21,13 +21,13 @@ class UnitTesting(ViewLayerTesting):
import bpy
scene = bpy.context.scene
workspace = bpy.context.workspace
window = bpy.context.window
cube = bpy.data.objects.new('guinea pig', bpy.data.meshes.new('mesh'))
layer = scene.view_layers.new('Selectability Test')
layer.collections.unlink(layer.collections[0])
scene.view_layers.active = layer
workspace.view_layer = layer
window.view_layer = layer
scene_collection_mom = scene.master_collection.collections.new("Mom")
scene_collection_kid = scene_collection_mom.collections.new("Kid")

4
tests/python/view_layer/test_evaluation_visibility_a.py
View File

@ -21,13 +21,13 @@ class UnitTesting(ViewLayerTesting):
import bpy
scene = bpy.context.scene
workspace = bpy.context.workspace
window = bpy.context.window
cube = bpy.data.objects.new('guinea pig', bpy.data.meshes.new('mesh'))
layer = scene.view_layers.new('Visibility Test')
layer.collections.unlink(layer.collections[0])
scene.view_layers.active = layer
workspace.view_layer = layer
window.view_layer = layer
scene_collection_mom = scene.master_collection.collections.new("Mom")
scene_collection_kid = scene.master_collection.collections.new("Kid")

4
tests/python/view_layer/test_evaluation_visibility_b.py
View File

@ -21,13 +21,13 @@ class UnitTesting(ViewLayerTesting):
import bpy
scene = bpy.context.scene
workspace = bpy.context.workspace
window = bpy.context.window
cube = bpy.data.objects.new('guinea pig', bpy.data.meshes.new('mesh'))
layer = scene.view_layers.new('Visibility Test')
layer.collections.unlink(layer.collections[0])
scene.view_layers.active = layer
workspace.view_layer = layer
window.view_layer = layer
scene_collection_mom = scene.master_collection.collections.new("Mom")
scene_collection_kid = scene_collection_mom.collections.new("Kid")

4
tests/python/view_layer/test_evaluation_visibility_c.py
View File

@ -21,13 +21,13 @@ class UnitTesting(ViewLayerTesting):
import bpy
scene = bpy.context.scene
workspace = bpy.context.workspace
window = bpy.context.window
cube = bpy.data.objects.new('guinea pig', bpy.data.meshes.new('mesh'))
layer = scene.view_layers.new('Visibility Test')
layer.collections.unlink(layer.collections[0])
scene.view_layers.active = layer
workspace.view_layer = layer
window.view_layer = layer
scene_collection_mom = scene.master_collection.collections.new("Mom")
scene_collection_kid = scene_collection_mom.collections.new("Kid")

4
tests/python/view_layer/test_evaluation_visibility_d.py
View File

@ -21,13 +21,13 @@ class UnitTesting(ViewLayerTesting):
import bpy
scene = bpy.context.scene
workspace = bpy.context.workspace
window = bpy.context.window
cube = bpy.data.objects.new('guinea pig', bpy.data.meshes.new('mesh'))
layer = scene.view_layers.new('Visibility Test')
layer.collections.unlink(layer.collections[0])
scene.view_layers.active = layer
workspace.view_layer = layer
window.view_layer = layer
scene_collection_mom = scene.master_collection.collections.new("Mom")
scene_collection_kid = scene_collection_mom.collections.new("Kid")

4
tests/python/view_layer/test_evaluation_visibility_e.py
View File

@ -21,13 +21,13 @@ class UnitTesting(ViewLayerTesting):
import bpy
scene = bpy.context.scene
workspace = bpy.context.workspace
window = bpy.context.window
cube = bpy.data.objects.new('guinea pig', bpy.data.meshes.new('mesh'))
layer = scene.view_layers.new('Visibility Test')
layer.collections.unlink(layer.collections[0])
scene.view_layers.active = layer
workspace.view_layer = layer
window.view_layer = layer
scene_collection_mom = scene.master_collection.collections.new("Mom")
scene_collection_kid = scene_collection_mom.collections.new("Kid")

4
tests/python/view_layer/test_evaluation_visibility_f.py
View File

@ -21,13 +21,13 @@ class UnitTesting(ViewLayerTesting):
import bpy
scene = bpy.context.scene
workspace = bpy.context.workspace
window = bpy.context.window
cube = bpy.data.objects.new('guinea pig', bpy.data.meshes.new('mesh'))
layer = scene.view_layers.new('Visibility Test')
layer.collections.unlink(layer.collections[0])
scene.view_layers.active = layer
workspace.view_layer = layer
window.view_layer = layer
scene_collection_mom = scene.master_collection.collections.new("Mom")
scene_collection_kid = scene_collection_mom.collections.new("Kid")

2
tests/python/view_layer/test_object_copy.py
View File

@ -42,7 +42,7 @@ class UnitTesting(ViewLayerTesting):
layer.collections.link(subzero)
scene.view_layers.active_index = len(scene.view_layers) - 1
bpy.context.workspace.view_layer = bpy.context.scene.view_layers['Fresh new Layer']
bpy.context.window.view_layer = bpy.context.scene.view_layers['Fresh new Layer']
if mode == 'DUPLICATE':
# assuming the latest layer is the active layer

2
tests/python/view_layer/test_object_link_b.py
View File

@ -20,7 +20,7 @@ class UnitTesting(ViewLayerTesting):
"""
import bpy
bpy.context.scene.view_layers.active_index = len(bpy.context.scene.view_layers) - 1
bpy.context.workspace.view_layer = bpy.context.scene.view_layers['Viewport']
bpy.context.window.view_layer = bpy.context.scene.view_layers['Viewport']
master_collection = bpy.context.scene_collection
self.do_object_link(master_collection)

4
tests/python/view_layer/test_operator_context.py
View File

@ -88,11 +88,11 @@ class UnitTesting(ViewLayerTesting):
layer.collections.active_index = 3
self.assertEqual(layer.collections.active.name, 'scorpion')
# Change active scene layer (do it for workspace too just to don't get mangled in workspace bugs)
# Change active scene layer (do it for window too just to don't get mangled in window bugs)
scene = bpy.context.scene
scene.view_layers.active_index = len(scene.view_layers) - 2
self.assertEqual(scene.view_layers.active.name, "Viewport")
bpy.context.workspace.view_layer = bpy.context.scene.view_layers['Viewport']
bpy.context.window.view_layer = bpy.context.scene.view_layers['Viewport']
# old layer
self.assertEqual(bpy.ops.testing.sample(view_layer='Viewport', use_verbose=True), {'FINISHED'})

2
tests/python/view_layer/view_layer_common.py
View File

@ -760,7 +760,7 @@ class Clay:
layer = self._scene.view_layers.new('Evaluation Test')
layer.collections.unlink(layer.collections[0])
self._scene.view_layers.active = layer
bpy.context.workspace.view_layer = layer
bpy.context.window.view_layer = layer
# remove all other layers
for layer_iter in self._scene.view_layers: