#2094. You can now add material sets independently of IFC objects in the material manager

src/blenderbim/test/bim/feature/material.feature

@@ -3,20 +3,33 @@ Feature: Material
 
 Scenario: Load materials
     Given an empty IFC project
-    And I press "bim.add_default_material"
+    And I press "bim.add_material(obj='')"
     When I press "bim.load_materials"
     Then nothing happens
 
 Scenario: Disable editing materials
     Given an empty IFC project
-    And I press "bim.add_default_material"
+    And I press "bim.add_material(obj='')"
     And I press "bim.load_materials"
     When I press "bim.disable_editing_materials"
     Then nothing happens
 
+Scenario: Load materials - then add material
+    Given an empty IFC project
+    And I press "bim.load_materials"
+    When I press "bim.add_material(obj='')"
+    Then the material "Default" exists
+
+Scenario: Load materials - then add material set
+    Given an empty IFC project
+    And I set "scene.BIMMaterialProperties.material_type" to "IfcMaterialLayerSet"
+    And I press "bim.load_materials"
+    When I press "bim.add_material_set(set_type='IfcMaterialLayerSet')"
+    Then nothing happens
+
 Scenario: Add default material
     Given an empty IFC project
-    When I press "bim.add_default_material"
+    When I press "bim.add_material(obj='')"
     Then the material "Default" exists
 
 Scenario: Add material
@@ -24,7 +37,7 @@ Scenario: Add material
     And I add a cube
     And the object "Cube" is selected
     And I add a material
-    When I press "bim.add_material"
+    When I press "bim.add_material(obj='Material')"
     Then the material "Material" is an IFC material
 
 Scenario: Remove material
@@ -32,7 +45,7 @@ Scenario: Remove material
     And I add a cube
     And the object "Cube" is selected
     And I add a material
-    And I press "bim.add_material"
+    And I press "bim.add_material(obj='Material')"
     When I press "bim.remove_material"
     Then the material "Material" is not an IFC material
 
@@ -41,7 +54,7 @@ Scenario: Unlink material
     And I add a cube
     And the object "Cube" is selected
     And I add a material
-    And I press "bim.add_material"
+    And I press "bim.add_material(obj='Material')"
     When I press "bim.unlink_material"
     Then the material "Material" is not an IFC material
 
@@ -51,7 +64,7 @@ Scenario: Assign material - Assign a material
     And the object "Cube" is selected
     And I set "scene.BIMRootProperties.ifc_class" to "IfcWall"
     And I press "bim.assign_class"
-    And I press "bim.add_default_material"
+    And I press "bim.add_material(obj='')"
     When I set "active_object.BIMObjectMaterialProperties.material_type" to "IfcMaterial"
     And I press "bim.assign_material"
     Then the object "IfcWall/Cube" has the material "Default"
@@ -67,7 +80,7 @@ Scenario: Assign material - Assign a material layer set
     And I set "scene.BIMRootProperties.ifc_product" to "IfcElementType"
     And I set "scene.BIMRootProperties.ifc_class" to "IfcWallType"
     And I press "bim.assign_class"
-    And I press "bim.add_default_material"
+    And I press "bim.add_material(obj='')"
     When I set "active_object.BIMObjectMaterialProperties.material_type" to "IfcMaterialLayerSet"
     And I press "bim.assign_material"
     Then nothing happens
@@ -83,7 +96,7 @@ Scenario: Assign material - Assign a material profile set
     And I set "scene.BIMRootProperties.ifc_product" to "IfcElementType"
     And I set "scene.BIMRootProperties.ifc_class" to "IfcWallType"
     And I press "bim.assign_class"
-    And I press "bim.add_default_material"
+    And I press "bim.add_material(obj='')"
     When I set "active_object.BIMObjectMaterialProperties.material_type" to "IfcMaterialProfileSet"
     And I press "bim.assign_material"
     Then nothing happens

src/blenderbim/test/core/test_material.py

@@ -17,7 +17,7 @@
 # along with BlenderBIM Add-on.  If not, see <http://www.gnu.org/licenses/>.
 
 import blenderbim.core.material as subject
-from test.core.bootstrap import ifc, material
+from test.core.bootstrap import ifc, material, style
 
 
 class TestUnlinkMaterial:
@@ -26,12 +26,70 @@ class TestUnlinkMaterial:
         subject.unlink_material(ifc, obj="obj")
 
 
-class TestAddDefaultMaterial:
-    def test_run(self, ifc, material):
+class TestAddMaterial:
+    def test_add_a_default_material(self, ifc, material, style):
         material.add_default_material_object().should_be_called().will_return("obj")
-        ifc.run("material.add_material", name="Default").should_be_called().will_return("material")
+        material.get_name("obj").should_be_called().will_return("name")
+        ifc.run("material.add_material", name="name").should_be_called().will_return("material")
         ifc.link("material", "obj").should_be_called()
-        assert subject.add_default_material(ifc, material) == "obj"
+        style.get_style("obj").should_be_called().will_return(None)
+        material.is_editing_materials().should_be_called().will_return(False)
+        assert subject.add_material(ifc, material, style) == "material"
+
+    def test_add_a_material_to_a_blender_material_object(self, ifc, material, style):
+        material.get_name("obj").should_be_called().will_return("name")
+        ifc.run("material.add_material", name="name").should_be_called().will_return("material")
+        ifc.link("material", "obj").should_be_called()
+        style.get_style("obj").should_be_called().will_return(None)
+        material.is_editing_materials().should_be_called().will_return(False)
+        assert subject.add_material(ifc, material, style, obj="obj") == "material"
+
+    def test_reloading_imported_materials_if_you_are_editing_scene_materials(self, ifc, material, style):
+        material.get_name("obj").should_be_called().will_return("name")
+        ifc.run("material.add_material", name="name").should_be_called().will_return("material")
+        ifc.link("material", "obj").should_be_called()
+        style.get_style("obj").should_be_called().will_return(None)
+        material.is_editing_materials().should_be_called().will_return(True)
+        material.get_active_material_type().should_be_called().will_return("material_type")
+        material.import_material_definitions("material_type").should_be_called()
+        assert subject.add_material(ifc, material, style, obj="obj") == "material"
+
+    def test_add_a_style_to_the_material_if_the_object_also_has_an_attached_style(self, ifc, material, style):
+        material.get_name("obj").should_be_called().will_return("name")
+        ifc.run("material.add_material", name="name").should_be_called().will_return("material")
+        ifc.link("material", "obj").should_be_called()
+        style.get_style("obj").should_be_called().will_return("style")
+        style.get_context("obj").should_be_called().will_return("context")
+        ifc.run("style.assign_material_style", material="material", style="style", context="context").should_be_called()
+        material.is_editing_materials().should_be_called().will_return(False)
+        assert subject.add_material(ifc, material, style, obj="obj") == "material"
+
+    def test_not_adding_a_style_if_there_is_no_style_context_available(self, ifc, material, style):
+        material.get_name("obj").should_be_called().will_return("name")
+        ifc.run("material.add_material", name="name").should_be_called().will_return("material")
+        ifc.link("material", "obj").should_be_called()
+        style.get_style("obj").should_be_called().will_return("style")
+        style.get_context("obj").should_be_called().will_return(None)
+        material.is_editing_materials().should_be_called().will_return(False)
+        assert subject.add_material(ifc, material, style, obj="obj") == "material"
+
+
+class TestAddMaterialSet:
+    def test_adding_a_material_set(self, ifc, material):
+        ifc.run("material.add_material_set", name="Unnamed", set_type="set_type").should_be_called().will_return(
+            "material"
+        )
+        material.is_editing_materials().should_be_called().will_return(False)
+        assert subject.add_material_set(ifc, material, set_type="set_type") == "material"
+
+    def test_adding_a_material_set_and_reloading_imported_materials(self, ifc, material):
+        ifc.run("material.add_material_set", name="Unnamed", set_type="set_type").should_be_called().will_return(
+            "material"
+        )
+        material.is_editing_materials().should_be_called().will_return(True)
+        material.get_active_material_type().should_be_called().will_return("material_type")
+        material.import_material_definitions("material_type").should_be_called()
+        assert subject.add_material_set(ifc, material, set_type="set_type") == "material"
 
 
 class TestLoadMaterials:

src/blenderbim/test/tool/test_material.py

@@ -50,6 +50,21 @@ class TestEnableEditingMaterials(NewFile):
         assert bpy.context.scene.BIMMaterialProperties.is_editing is True
 
 
+class TestGetActiveMaterialType(NewFile):
+    def test_run(self):
+        ifc = ifcopenshell.file()
+        tool.Ifc.set(ifc)
+        bpy.context.scene.BIMMaterialProperties.material_type = "IfcMaterial"
+        assert subject.get_active_material_type() == "IfcMaterial"
+        bpy.context.scene.BIMMaterialProperties.material_type = "IfcMaterialLayerSet"
+        assert subject.get_active_material_type() == "IfcMaterialLayerSet"
+
+
+class TestGetName(NewFile):
+    def test_run(self):
+        assert subject.get_name(bpy.data.materials.new("Material")) == "Material"
+
+
 class TestImportMaterialDefinitions(NewFile):
     def test_import_materials(self):
         ifc = ifcopenshell.file()
@@ -95,3 +110,11 @@ class TestImportMaterialDefinitions(NewFile):
         props = bpy.context.scene.BIMMaterialProperties
         assert props.materials[0].ifc_definition_id == material.id()
         assert props.materials[0].name == "Unnamed"
+
+
+class TestIsEditingMaterials(NewFile):
+    def test_run(self):
+        bpy.context.scene.BIMMaterialProperties.is_editing = False
+        subject.is_editing_materials() is False
+        bpy.context.scene.BIMMaterialProperties.is_editing = True
+        subject.is_editing_materials() is True