system.assign_system - support batching #4474

src/ifcopenshell-python/test/api/group/test_assign_group.py

@@ -18,28 +18,30 @@
 
 import test.bootstrap
 import ifcopenshell.api
+import ifcopenshell.util.element
 
 
 class TestAssignGroup(test.bootstrap.IFC4):
     def test_assign_group_for_multiple_elements(self):
-        element = ifcopenshell.api.run("root.create_entity", self.file, ifc_class="IfcPump")
-        element2 = ifcopenshell.api.run("root.create_entity", self.file, ifc_class="IfcPump")
+        element = ifcopenshell.api.run("root.create_entity", self.file, ifc_class="IfcWall")
+        element2 = ifcopenshell.api.run("root.create_entity", self.file, ifc_class="IfcWall")
         group = ifcopenshell.api.run("group.add_group", self.file)
 
         # assign group for multiple elements
         ifcopenshell.api.run("group.assign_group", self.file, products=[element, element2], group=group)
-        assert len(rels := self.file.by_type("IfcRelAssignsToGroup")) == 1
-        rel = rels[0]
-        assert rel.RelatingGroup == group
-        assert rel.RelatedObjects == (element, element2)
+        assert len(self.file.by_type("IfcRelAssignsToGroup")) == 1
+        assert set(ifcopenshell.util.element.get_grouped_by(group)) == set(self.file.by_type("IfcWall"))
 
     def test_reuse_existing_relationship(self):
         self.test_assign_group_for_multiple_elements()
         rel = self.file.by_type("IfcRelAssignsToGroup")[0]
-        element = ifcopenshell.api.run("root.create_entity", self.file, ifc_class="IfcPump")
+        element = ifcopenshell.api.run("root.create_entity", self.file, ifc_class="IfcWall")
         group = self.file.by_type("IfcGroup")[0]
         ifcopenshell.api.run("group.assign_group", self.file, products=[element], group=group)
 
         assert len(self.file.by_type("IfcRelAssignsToGroup")) == 1
-        assert rel.RelatingGroup == group
-        assert set(rel.RelatedObjects) == set(self.file.by_type("IfcPump"))
+        assert set(ifcopenshell.util.element.get_grouped_by(group)) == set(self.file.by_type("IfcWall"))
+
+
+class TestAssignGroupIFC2X3(test.bootstrap.IFC2X3, TestAssignGroup):
+    pass

src/ifcopenshell-python/test/api/system/test_assign_system.py

@@ -0,0 +1,45 @@
+# IfcOpenShell - IFC toolkit and geometry engine
+# Copyright (C) 2022 Dion Moult <dion@thinkmoult.com>
+#
+# This file is part of IfcOpenShell.
+#
+# IfcOpenShell is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# IfcOpenShell is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with IfcOpenShell.  If not, see <http://www.gnu.org/licenses/>.
+
+import pytest
+import test.bootstrap
+import ifcopenshell.api
+import ifcopenshell.util.system
+
+
+class TestAssignSystem(test.bootstrap.IFC4):
+    def test_assign_system(self):
+        element = ifcopenshell.api.run("root.create_entity", self.file, ifc_class="IfcFlowSegment")
+        element2 = ifcopenshell.api.run("root.create_entity", self.file, ifc_class="IfcFlowSegment")
+        system = ifcopenshell.api.run("system.add_system", self.file)
+        ifcopenshell.api.run("system.assign_system", self.file, products=[element, element2], system=system)
+        assert len(self.file.by_type("IfcRelAssignsToGroup")) == 1
+        assert set(ifcopenshell.util.system.get_system_elements(system)) == set(self.file.by_type("IfcFlowSegment"))
+
+    def test_exception_on_unassignable_elements(self):
+        element = ifcopenshell.api.run("root.create_entity", self.file, ifc_class="IfcFlowSegment")
+        proj = self.file.createIfcProject()
+        system = ifcopenshell.api.run("system.add_system", self.file)
+        with pytest.raises(TypeError):
+            ifcopenshell.api.run("system.assign_system", self.file, products=[element, proj], system=system)
+        with pytest.raises(TypeError):
+            ifcopenshell.api.run("system.assign_system", self.file, products=[element], system=proj)
+
+
+class TestAssignSystemIFC2X3(test.bootstrap.IFC2X3, TestAssignSystem):
+    pass

src/ifcopenshell-python/test/api/test_api.py

@@ -139,3 +139,15 @@ class TestTemporarySupportForDeprecatedAPIArguments(test.bootstrap.IFC4):
         ifcopenshell.api.run("type.assign_type", self.file, related_objects=[element], relating_type=element_type)
         ifcopenshell.api.run("type.unassign_type", self.file, related_object=element)
         assert ifcopenshell.util.element.get_type(element) is None
+
+    @deprecation_check
+    def test_assign_system(self):
+        element = ifcopenshell.api.run("root.create_entity", self.file, ifc_class="IfcPump")
+        system = ifcopenshell.api.run("system.add_system", self.file)
+
+        # assign group for multiple elements
+        ifcopenshell.api.run("system.assign_system", self.file, product=element, system=system)
+        assert len(rels := self.file.by_type("IfcRelAssignsToGroup")) == 1
+        rel = rels[0]
+        assert rel.RelatingGroup == system
+        assert rel.RelatedObjects == (element,)

src/ifcopenshell-python/test/util/test_system.py

@@ -22,11 +22,21 @@ import ifcopenshell.api
 import ifcopenshell.util.system as subject
 
 
+class TestIsAssignable(test.bootstrap.IFC4):
+    def test_run(self):
+        project = self.file.createIfcProject()
+        system = self.file.createIfcSystem()
+        pump = self.file.createIfcPump()
+        assert subject.is_assignable(pump, system)
+        assert not subject.is_assignable(project, system)
+        assert not subject.is_assignable(pump, project)
+
+
 class TestGetSystemElements(test.bootstrap.IFC4):
     def test_run(self):
         element = ifcopenshell.api.run("root.create_entity", self.file, ifc_class="IfcPump")
         system = ifcopenshell.api.run("system.add_system", self.file, ifc_class="IfcSystem")
-        ifcopenshell.api.run("system.assign_system", self.file, product=element, system=system)
+        ifcopenshell.api.run("system.assign_system", self.file, products=[element], system=system)
         assert subject.get_system_elements(system) == [element]
 
 
@@ -34,7 +44,7 @@ class TestGetElementSystems(test.bootstrap.IFC4):
     def test_run(self):
         element = ifcopenshell.api.run("root.create_entity", self.file, ifc_class="IfcPump")
         system = ifcopenshell.api.run("system.add_system", self.file, ifc_class="IfcSystem")
-        ifcopenshell.api.run("system.assign_system", self.file, product=element, system=system)
+        ifcopenshell.api.run("system.assign_system", self.file, products=[element], system=system)
         assert subject.get_element_systems(element) == [system]
 
     def test_do_not_get_non_services_groups(self):
@@ -42,7 +52,7 @@ class TestGetElementSystems(test.bootstrap.IFC4):
         ifcopenshell.api.run(
             "system.assign_system",
             self.file,
-            product=element,
+            products=[element],
             system=self.file.createIfcGroup(),
         )
         for not_assignable_system_class in ("IfcZone", "IfcStructuralAnalysisModel"):
@@ -50,7 +60,7 @@ class TestGetElementSystems(test.bootstrap.IFC4):
                 ifcopenshell.api.run(
                     "system.assign_system",
                     self.file,
-                    product=element,
+                    products=[element],
                     system=self.file.create_entity(not_assignable_system_class),
                 )
         assert not subject.get_element_systems(element)