ifc2x3 tests

removed part of test_append_two_type_products_sharing_the_same_material_indirectly_via_a_material_set for ifc2x3 compatibility and removed part is already tested in test_append_two_type_products_sharing_the_same_material_with_properties

src/ifcopenshell-python/test/api/material/test_add_material_set.py

@@ -20,12 +20,19 @@ import test.bootstrap
 import ifcopenshell.api
 
 
-class TestAddMaterialSet(test.bootstrap.IFC4):
+class TestAddMaterialSetIFC2X3(test.bootstrap.IFC2X3):
     def test_add_layer_set(self):
         material = ifcopenshell.api.run("material.add_material_set", self.file, set_type="IfcMaterialLayerSet")
         assert material.LayerSetName == "Unnamed"
         assert material.is_a("IfcMaterialLayerSet")
 
+    def test_add_list(self):
+        material = ifcopenshell.api.run("material.add_material_set", self.file, set_type="IfcMaterialList")
+        assert material.is_a("IfcMaterialList")
+
+
+class TestAddMaterialSetIFC4(test.bootstrap.IFC4, TestAddMaterialSetIFC2X3):
+    # entities added in IFC4
     def test_add_profile_set(self):
         material = ifcopenshell.api.run("material.add_material_set", self.file, set_type="IfcMaterialProfileSet")
         assert material.Name == "Unnamed"
@@ -35,7 +42,3 @@ class TestAddMaterialSet(test.bootstrap.IFC4):
         material = ifcopenshell.api.run("material.add_material_set", self.file, set_type="IfcMaterialConstituentSet")
         assert material.Name == "Unnamed"
         assert material.is_a("IfcMaterialConstituentSet")
-
-    def test_add_list(self):
-        material = ifcopenshell.api.run("material.add_material_set", self.file, set_type="IfcMaterialList")
-        assert material.is_a("IfcMaterialList")

src/ifcopenshell-python/test/api/material/test_copy_material.py

@@ -33,19 +33,31 @@ class TestCopyMaterial(test.bootstrap.IFC4):
         material = ifcopenshell.api.run("material.add_material", self.file, name="CON01")
         ifcopenshell.api.run("material.assign_material", self.file, products=[element], material=material)
         new = ifcopenshell.api.run("material.copy_material", self.file, material=material)
-        assert material.AssociatedTo
-        assert not new.AssociatedTo
+        assert ifcopenshell.util.element.get_elements_by_material(self.file, material)
+        assert not ifcopenshell.util.element.get_elements_by_material(self.file, new)
 
     def test_copy_a_material_with_properties(self):
+        def get_material_props(material: ifcopenshell.entity_instance) -> list[ifcopenshell.entity_instance]:
+            if self.file.schema != "IFC2X3":
+                return material.HasProperties
+            return [i for i in self.file.get_inverse(material) if i.is_a("IfcMaterialProperties")]
+
         material = ifcopenshell.api.run("material.add_material", self.file, name="CON01")
         pset = ifcopenshell.api.run("pset.add_pset", self.file, product=material, name="Foo_Bar")
         ifcopenshell.api.run("pset.edit_pset", self.file, pset=pset, properties={"foo": "bar"})
         new = ifcopenshell.api.run("material.copy_material", self.file, material=material)
         assert new.Name == "CON01"
         assert len(self.file.by_type("IfcMaterial")) == 2
-        assert new.HasProperties[0] != material.HasProperties[0]
-        assert new.HasProperties[0].Properties[0] != material.HasProperties[0].Properties[0]
-        assert ifcopenshell.util.element.get_pset(new, "Foo_Bar", "foo") == "bar"
+        assert len(self.file.by_type("IfcMaterialProperties")) == 2
+        props_old = get_material_props(material)[0]
+        props_new = get_material_props(new)[0]
+        assert props_old != props_new
+        if self.file.schema != "IFC2X3":
+            assert props_old.Properties[0] != props_new.Properties[0]
+            assert ifcopenshell.util.element.get_pset(new, "Foo_Bar", "foo") == "bar"
+        else:
+            assert props_old.ExtendedProperties[0] != props_new.ExtendedProperties[0]
+            assert props_new.ExtendedProperties[0].NominalValue.wrappedValue == "bar"
 
     def test_copy_a_material_with_a_style_representation(self):
         ifcopenshell.api.run("root.create_entity", self.file, ifc_class="IfcProject")
@@ -59,3 +71,6 @@ class TestCopyMaterial(test.bootstrap.IFC4):
         assert new.HasRepresentation[0] != material.HasRepresentation[0]
         assert new.HasRepresentation[0].Representations[0] != material.HasRepresentation[0].Representations[0]
         assert new.HasRepresentation[0].Representations[0].ContextOfItems == context
+
+class TestCopyMaterialIFC2X3(test.bootstrap.IFC2X3, TestCopyMaterial):
+    pass

src/ifcopenshell-python/test/api/material/test_remove_material.py

@@ -20,7 +20,7 @@ import test.bootstrap
 import ifcopenshell.api
 
 
-class TestRemoveMaterial(test.bootstrap.IFC4):
+class TestRemoveMaterialIFC2X3(test.bootstrap.IFC2X3):
     def test_removing_material(self):
         material = ifcopenshell.api.run("material.add_material", self.file)
         ifcopenshell.api.run("material.remove_material", self.file, material=material)
@@ -37,9 +37,7 @@ class TestRemoveMaterial(test.bootstrap.IFC4):
     def test_removing_material_in_layer(self):
         wall = ifcopenshell.api.run("root.create_entity", self.file, ifc_class="IfcWall")
         material = ifcopenshell.api.run("material.add_material", self.file)
-        material_set = ifcopenshell.api.run(
-            "material.add_material_set", self.file, set_type="IfcMaterialLayerSet"
-        )
+        material_set = ifcopenshell.api.run("material.add_material_set", self.file, set_type="IfcMaterialLayerSet")
         ifcopenshell.api.run("material.add_layer", self.file, layer_set=material_set, material=material)
         ifcopenshell.api.run("material.assign_material", self.file, products=[wall], material=material_set)
         assert len(self.file.by_type("IfcMaterialLayerSet")[0].MaterialLayers) == 1
@@ -48,40 +46,10 @@ class TestRemoveMaterial(test.bootstrap.IFC4):
         assert len(self.file.by_type("IfcRelAssociatesMaterial")) == 1
         assert len(self.file.by_type("IfcMaterialLayerSet")[0].MaterialLayers) == 0
 
-    def test_removing_material_in_profile(self):
-        wall = ifcopenshell.api.run("root.create_entity", self.file, ifc_class="IfcWall")
-        material = ifcopenshell.api.run("material.add_material", self.file)
-        material_set = ifcopenshell.api.run(
-            "material.add_material_set", self.file, set_type="IfcMaterialProfileSet"
-        )
-        ifcopenshell.api.run("material.add_profile", self.file, profile_set=material_set, material=material)
-        ifcopenshell.api.run("material.assign_material", self.file, products=[wall], material=material_set)
-        assert len(self.file.by_type("IfcMaterialProfileSet")[0].MaterialProfiles) == 1
-        ifcopenshell.api.run("material.remove_material", self.file, material=material)
-        assert len(self.file.by_type("IfcMaterial")) == 0
-        assert len(self.file.by_type("IfcRelAssociatesMaterial")) == 1
-        assert len(self.file.by_type("IfcMaterialProfileSet")[0].MaterialProfiles) == 0
-
-    def test_removing_material_in_constituent(self):
-        wall = ifcopenshell.api.run("root.create_entity", self.file, ifc_class="IfcWall")
-        material = ifcopenshell.api.run("material.add_material", self.file)
-        material_set = ifcopenshell.api.run(
-            "material.add_material_set", self.file, set_type="IfcMaterialConstituentSet"
-        )
-        ifcopenshell.api.run("material.add_constituent", self.file, constituent_set=material_set, material=material)
-        ifcopenshell.api.run("material.assign_material", self.file, products=[wall], material=material_set)
-        assert len(self.file.by_type("IfcMaterialConstituentSet")[0].MaterialConstituents) == 1
-        ifcopenshell.api.run("material.remove_material", self.file, material=material)
-        assert len(self.file.by_type("IfcMaterial")) == 0
-        assert len(self.file.by_type("IfcRelAssociatesMaterial")) == 1
-        assert self.file.by_type("IfcMaterialConstituentSet")[0].MaterialConstituents is None
-
     def test_removing_material_in_list(self):
         wall = ifcopenshell.api.run("root.create_entity", self.file, ifc_class="IfcWall")
         material = ifcopenshell.api.run("material.add_material", self.file)
-        material_set = ifcopenshell.api.run(
-            "material.add_material_set", self.file, set_type="IfcMaterialList"
-        )
+        material_set = ifcopenshell.api.run("material.add_material_set", self.file, set_type="IfcMaterialList")
         ifcopenshell.api.run("material.add_list_item", self.file, material_list=material_set, material=material)
         ifcopenshell.api.run("material.assign_material", self.file, products=[wall], material=material_set)
         assert len(self.file.by_type("IfcMaterialList")[0].Materials) == 1
@@ -108,10 +76,44 @@ class TestRemoveMaterial(test.bootstrap.IFC4):
         assert len(self.file.by_type("IfcSurfaceStyle")) == 1
 
     def test_removing_a_material_with_properties(self):
+        def get_material_props(material: ifcopenshell.entity_instance) -> list[ifcopenshell.entity_instance]:
+            if self.file.schema != "IFC2X3":
+                return material.HasProperties
+            return [i for i in self.file.get_inverse(material) if i.is_a("IfcMaterialProperties")]
+
         material = ifcopenshell.api.run("material.add_material", self.file)
         pset = ifcopenshell.api.run("pset.add_pset", self.file, product=material, name="Foo_Bar")
         ifcopenshell.api.run("pset.edit_pset", self.file, pset=pset, properties={"Foo": "Bar"})
-        assert material.HasProperties
+        assert get_material_props(material)
         ifcopenshell.api.run("material.remove_material", self.file, material=material)
         assert len(self.file.by_type("IfcMaterialProperties")) == 0
         assert len(self.file.by_type("IfcPropertySingleValue")) == 0
+
+
+class TestRemoveMaterialIFC4(test.bootstrap.IFC4, TestRemoveMaterialIFC2X3):
+    # IfcMaterialProfileSet added in IFC4
+    def test_removing_material_in_profile(self):
+        wall = ifcopenshell.api.run("root.create_entity", self.file, ifc_class="IfcWall")
+        material = ifcopenshell.api.run("material.add_material", self.file)
+        material_set = ifcopenshell.api.run("material.add_material_set", self.file, set_type="IfcMaterialProfileSet")
+        ifcopenshell.api.run("material.add_profile", self.file, profile_set=material_set, material=material)
+        ifcopenshell.api.run("material.assign_material", self.file, products=[wall], material=material_set)
+        assert len(self.file.by_type("IfcMaterialProfileSet")[0].MaterialProfiles) == 1
+        ifcopenshell.api.run("material.remove_material", self.file, material=material)
+        assert len(self.file.by_type("IfcMaterial")) == 0
+        assert len(self.file.by_type("IfcRelAssociatesMaterial")) == 1
+        assert len(self.file.by_type("IfcMaterialProfileSet")[0].MaterialProfiles) == 0
+
+    def test_removing_material_in_constituent(self):
+        wall = ifcopenshell.api.run("root.create_entity", self.file, ifc_class="IfcWall")
+        material = ifcopenshell.api.run("material.add_material", self.file)
+        material_set = ifcopenshell.api.run(
+            "material.add_material_set", self.file, set_type="IfcMaterialConstituentSet"
+        )
+        ifcopenshell.api.run("material.add_constituent", self.file, constituent_set=material_set, material=material)
+        ifcopenshell.api.run("material.assign_material", self.file, products=[wall], material=material_set)
+        assert len(self.file.by_type("IfcMaterialConstituentSet")[0].MaterialConstituents) == 1
+        ifcopenshell.api.run("material.remove_material", self.file, material=material)
+        assert len(self.file.by_type("IfcMaterial")) == 0
+        assert len(self.file.by_type("IfcRelAssociatesMaterial")) == 1
+        assert self.file.by_type("IfcMaterialConstituentSet")[0].MaterialConstituents is None

src/ifcopenshell-python/test/api/material/test_remove_material_set.py

@@ -20,7 +20,7 @@ import test.bootstrap
 import ifcopenshell.api
 
 
-class TestRemoveMaterialSet(test.bootstrap.IFC4):
+class TestRemoveMaterialSetIFC2X3(test.bootstrap.IFC2X3):
     def test_removing_material_set(self):
         material = ifcopenshell.api.run("material.add_material_set", self.file, set_type="IfcMaterialLayerSet")
         ifcopenshell.api.run("material.remove_material_set", self.file, material=material)
@@ -43,6 +43,9 @@ class TestRemoveMaterialSet(test.bootstrap.IFC4):
         assert len(self.file.by_type("IfcMaterialLayer")) == 0
         assert len(self.file.by_type("IfcMaterial")) == 1
 
+
+class TestRemoveMaterialSetIFC4(test.bootstrap.IFC4, TestRemoveMaterialSetIFC2X3):
+    # IFC2X3 doesn't support adding a pset to IfcMaterialLayerSet
     def test_removing_a_material_set_with_properties(self):
         material = ifcopenshell.api.run("material.add_material_set", self.file, set_type="IfcMaterialLayerSet")
         pset = ifcopenshell.api.run("pset.add_pset", self.file, product=material, name="Foo_Bar")