[Bf-blender-cvs] [b0feb0615c] temp-depsgraph-layers: Layers / Depsgraph: Unittesting for selection and visibility evaluation

Dalai Felinto noreply at git.blender.org
Mon Mar 20 19:48:12 CET 2017


Commit: b0feb0615c59a1b24e5e11ae2107f2fb86328885
Author: Dalai Felinto
Date:   Mon Mar 20 18:06:50 2017 +0100
Branches: temp-depsgraph-layers
https://developer.blender.org/rBb0feb0615c59a1b24e5e11ae2107f2fb86328885

Layers / Depsgraph: Unittesting for selection and visibility evaluation

===================================================================

M	tests/python/render_layer/CMakeLists.txt
A	tests/python/render_layer/test_evaluation_selectability_a.py
A	tests/python/render_layer/test_evaluation_selectability_b.py
A	tests/python/render_layer/test_evaluation_selectability_c.py
A	tests/python/render_layer/test_evaluation_selectability_d.py
A	tests/python/render_layer/test_evaluation_selectability_e.py
M	tests/python/render_layer/test_evaluation_visibility_a.py
M	tests/python/render_layer/test_evaluation_visibility_b.py
A	tests/python/render_layer/test_evaluation_visibility_c.py
A	tests/python/render_layer/test_evaluation_visibility_d.py
A	tests/python/render_layer/test_evaluation_visibility_e.py
A	tests/python/render_layer/test_evaluation_visibility_f.py

===================================================================

diff --git a/tests/python/render_layer/CMakeLists.txt b/tests/python/render_layer/CMakeLists.txt
index f03a04a702..e7cc3730ad 100644
--- a/tests/python/render_layer/CMakeLists.txt
+++ b/tests/python/render_layer/CMakeLists.txt
@@ -60,6 +60,15 @@ RENDER_LAYER_TEST(active_collection)
 RENDER_LAYER_TEST(collection_rename)
 RENDER_LAYER_TEST(evaluation_visibility_a)
 RENDER_LAYER_TEST(evaluation_visibility_b)
+RENDER_LAYER_TEST(evaluation_visibility_c)
+RENDER_LAYER_TEST(evaluation_visibility_d)
+RENDER_LAYER_TEST(evaluation_visibility_e)
+RENDER_LAYER_TEST(evaluation_visibility_f)
+RENDER_LAYER_TEST(evaluation_selectability_a)
+RENDER_LAYER_TEST(evaluation_selectability_b)
+RENDER_LAYER_TEST(evaluation_selectability_c)
+RENDER_LAYER_TEST(evaluation_selectability_d)
+RENDER_LAYER_TEST(evaluation_selectability_e)
 RENDER_LAYER_TEST(object_add_cylinder)
 RENDER_LAYER_TEST(object_add_empty)
 RENDER_LAYER_TEST(object_add_torus)
diff --git a/tests/python/render_layer/test_evaluation_visibility_b.py b/tests/python/render_layer/test_evaluation_selectability_a.py
similarity index 77%
copy from tests/python/render_layer/test_evaluation_visibility_b.py
copy to tests/python/render_layer/test_evaluation_selectability_a.py
index d6aaae310b..b95a9598d8 100644
--- a/tests/python/render_layer/test_evaluation_visibility_b.py
+++ b/tests/python/render_layer/test_evaluation_selectability_a.py
@@ -17,21 +17,21 @@ from render_layer_common import *
 # ############################################################
 
 class UnitTesting(RenderLayerTesting):
-    def test_visibility(self):
+    def test_selectability(self):
         """
-        See if we can link objects
+        See if the depsgraph evaluation is correct
         """
         import bpy
 
         scene = bpy.context.scene
         cube = bpy.data.objects.new('guinea pig', bpy.data.meshes.new('mesh'))
 
-        layer = scene.render_layers.new('Visibility Test')
+        layer = scene.render_layers.new('Selectability Test')
         layer.collections.unlink(layer.collections[0])
         scene.render_layers.active = layer
 
-        scene_collection_mom = scene.master_collection.collections.new("Visible")
-        scene_collection_kid = scene_collection_mom.collections.new("Invisible")
+        scene_collection_mom = scene.master_collection.collections.new("Mom")
+        scene_collection_kid = scene_collection_mom.collections.new("Kid")
 
         scene_collection_kid.objects.link(cube)
 
@@ -39,10 +39,12 @@ class UnitTesting(RenderLayerTesting):
         layer_collection_kid = layer.collections.link(scene_collection_kid)
 
         layer_collection_mom.hide = False
-        layer_collection_mom.collections[layer_collection_kid.name].hide = True
-        layer_collection_kid.hide = True
+        cube.select_set('SELECT')
 
-        self.assertFalse(cube.visible_get(), "Object is not invisible")
+        bpy.context.scene.update() # update depsgraph
+        bpy.context.scene.depsgraph.debug_graphviz("/home/guest/tmp/depsgraph.dot")
+        self.assertTrue(cube.visible_get(), "Cube should be visible")
+        self.assertTrue(cube.select_get(), "Cube should be selected")
 
 
 # ############################################################
diff --git a/tests/python/render_layer/test_evaluation_visibility_b.py b/tests/python/render_layer/test_evaluation_selectability_b.py
similarity index 81%
copy from tests/python/render_layer/test_evaluation_visibility_b.py
copy to tests/python/render_layer/test_evaluation_selectability_b.py
index d6aaae310b..81ddddbb4b 100644
--- a/tests/python/render_layer/test_evaluation_visibility_b.py
+++ b/tests/python/render_layer/test_evaluation_selectability_b.py
@@ -17,21 +17,21 @@ from render_layer_common import *
 # ############################################################
 
 class UnitTesting(RenderLayerTesting):
-    def test_visibility(self):
+    def test_selectability(self):
         """
-        See if we can link objects
+        See if the depsgraph evaluation is correct
         """
         import bpy
 
         scene = bpy.context.scene
         cube = bpy.data.objects.new('guinea pig', bpy.data.meshes.new('mesh'))
 
-        layer = scene.render_layers.new('Visibility Test')
+        layer = scene.render_layers.new('Selectability Test')
         layer.collections.unlink(layer.collections[0])
         scene.render_layers.active = layer
 
-        scene_collection_mom = scene.master_collection.collections.new("Visible")
-        scene_collection_kid = scene_collection_mom.collections.new("Invisible")
+        scene_collection_mom = scene.master_collection.collections.new("Mom")
+        scene_collection_kid = scene_collection_mom.collections.new("Kid")
 
         scene_collection_kid.objects.link(cube)
 
@@ -39,10 +39,14 @@ class UnitTesting(RenderLayerTesting):
         layer_collection_kid = layer.collections.link(scene_collection_kid)
 
         layer_collection_mom.hide = False
+        cube.select_set('SELECT')
+
         layer_collection_mom.collections[layer_collection_kid.name].hide = True
         layer_collection_kid.hide = True
 
-        self.assertFalse(cube.visible_get(), "Object is not invisible")
+        bpy.context.scene.update() # update depsgraph
+        self.assertFalse(cube.visible_get(), "Cube should be invisible")
+        self.assertFalse(cube.select_get(), "Cube should be unselected")
 
 
 # ############################################################
diff --git a/tests/python/render_layer/test_evaluation_visibility_b.py b/tests/python/render_layer/test_evaluation_selectability_c.py
similarity index 80%
copy from tests/python/render_layer/test_evaluation_visibility_b.py
copy to tests/python/render_layer/test_evaluation_selectability_c.py
index d6aaae310b..7d8a83e6f7 100644
--- a/tests/python/render_layer/test_evaluation_visibility_b.py
+++ b/tests/python/render_layer/test_evaluation_selectability_c.py
@@ -17,21 +17,21 @@ from render_layer_common import *
 # ############################################################
 
 class UnitTesting(RenderLayerTesting):
-    def test_visibility(self):
+    def test_selectability(self):
         """
-        See if we can link objects
+        See if the depsgraph evaluation is correct
         """
         import bpy
 
         scene = bpy.context.scene
         cube = bpy.data.objects.new('guinea pig', bpy.data.meshes.new('mesh'))
 
-        layer = scene.render_layers.new('Visibility Test')
+        layer = scene.render_layers.new('Selectability Test')
         layer.collections.unlink(layer.collections[0])
         scene.render_layers.active = layer
 
-        scene_collection_mom = scene.master_collection.collections.new("Visible")
-        scene_collection_kid = scene_collection_mom.collections.new("Invisible")
+        scene_collection_mom = scene.master_collection.collections.new("Mom")
+        scene_collection_kid = scene_collection_mom.collections.new("Kid")
 
         scene_collection_kid.objects.link(cube)
 
@@ -39,10 +39,11 @@ class UnitTesting(RenderLayerTesting):
         layer_collection_kid = layer.collections.link(scene_collection_kid)
 
         layer_collection_mom.hide = False
-        layer_collection_mom.collections[layer_collection_kid.name].hide = True
-        layer_collection_kid.hide = True
+        cube.select_set('SELECT')
 
-        self.assertFalse(cube.visible_get(), "Object is not invisible")
+        bpy.context.scene.update() # update depsgraph
+        self.assertTrue(cube.visible_get(), "Cube should be visible")
+        self.assertTrue(cube.select_get(), "Cube should be selected")
 
 
 # ############################################################
diff --git a/tests/python/render_layer/test_evaluation_visibility_b.py b/tests/python/render_layer/test_evaluation_selectability_d.py
similarity index 80%
copy from tests/python/render_layer/test_evaluation_visibility_b.py
copy to tests/python/render_layer/test_evaluation_selectability_d.py
index d6aaae310b..76a077b955 100644
--- a/tests/python/render_layer/test_evaluation_visibility_b.py
+++ b/tests/python/render_layer/test_evaluation_selectability_d.py
@@ -17,21 +17,21 @@ from render_layer_common import *
 # ############################################################
 
 class UnitTesting(RenderLayerTesting):
-    def test_visibility(self):
+    def test_selectability(self):
         """
-        See if we can link objects
+        See if the depsgraph evaluation is correct
         """
         import bpy
 
         scene = bpy.context.scene
         cube = bpy.data.objects.new('guinea pig', bpy.data.meshes.new('mesh'))
 
-        layer = scene.render_layers.new('Visibility Test')
+        layer = scene.render_layers.new('Selectability Test')
         layer.collections.unlink(layer.collections[0])
         scene.render_layers.active = layer
 
-        scene_collection_mom = scene.master_collection.collections.new("Visible")
-        scene_collection_kid = scene_collection_mom.collections.new("Invisible")
+        scene_collection_mom = scene.master_collection.collections.new("Mom")
+        scene_collection_kid = scene_collection_mom.collections.new("Kid")
 
         scene_collection_kid.objects.link(cube)
 
@@ -39,10 +39,12 @@ class UnitTesting(RenderLayerTesting):
         layer_collection_kid = layer.collections.link(scene_collection_kid)
 
         layer_collection_mom.hide = False
-        layer_collection_mom.collections[layer_collection_kid.name].hide = True
-        layer_collection_kid.hide = True
+        cube.select_set('SELECT')
+        layer_collection_mom.collections[layer_collection_kid.name].hide_select = True
 
-        self.assertFalse(cube.visible_get(), "Object is not invisible")
+        bpy.context.scene.update() # update depsgraph
+        self.assertTrue(cube.visible_get(), "Cube should be visible")
+        self.assertTrue(cube.select_get(), "Cube should be selected")
 
 
 # ############################################################
diff --git a/tests/python/render_layer/test_evaluation_visibility_b.py b/tests/python/render_layer/test_evaluation_selectability_e.py
similarity index 80%
copy from tests/python/render_layer/test_evaluation_visibility_b.py
copy to tests/python/render_layer/test

@@ Diff output truncated at 10240 characters. @@




More information about the Bf-blender-cvs mailing list