Replace all ifcopenshell.api.run with ifcopenshell.api static functions.

src/ifcopenshell-python/test/api/nest/test_assign_object.py

@@ -18,68 +18,69 @@
 
 import pytest
 import test.bootstrap
-import ifcopenshell.api
+import ifcopenshell.api.nest
+import ifcopenshell.api.root
 import ifcopenshell.util.element
 import ifcopenshell.util.placement
 
 
 class TestAssignObject(test.bootstrap.IFC4):
     def test_assigning_a_nesting(self):
-        element = ifcopenshell.api.run("root.create_entity", self.file, ifc_class="IfcTask")
-        subelement1 = ifcopenshell.api.run("root.create_entity", self.file, ifc_class="IfcTask")
-        subelement2 = ifcopenshell.api.run("root.create_entity", self.file, ifc_class="IfcTask")
-        rel = ifcopenshell.api.run(
-            "nest.assign_object", self.file, related_objects=[subelement1, subelement2], relating_object=element
+        element = ifcopenshell.api.root.create_entity(self.file, ifc_class="IfcTask")
+        subelement1 = ifcopenshell.api.root.create_entity(self.file, ifc_class="IfcTask")
+        subelement2 = ifcopenshell.api.root.create_entity(self.file, ifc_class="IfcTask")
+        rel = ifcopenshell.api.nest.assign_object(
+            self.file, related_objects=[subelement1, subelement2], relating_object=element
         )
         assert ifcopenshell.util.element.get_nest(subelement1) == element
         assert ifcopenshell.util.element.get_nest(subelement2) == element
         assert rel.is_a("IfcRelNests")
 
     def test_doing_nothing_if_the_nesting_is_already_assigned(self):
-        element = ifcopenshell.api.run("root.create_entity", self.file, ifc_class="IfcTask")
-        subelement = ifcopenshell.api.run("root.create_entity", self.file, ifc_class="IfcTask")
-        ifcopenshell.api.run("nest.assign_object", self.file, related_objects=[subelement], relating_object=element)
+        element = ifcopenshell.api.root.create_entity(self.file, ifc_class="IfcTask")
+        subelement = ifcopenshell.api.root.create_entity(self.file, ifc_class="IfcTask")
+        ifcopenshell.api.nest.assign_object(self.file, related_objects=[subelement], relating_object=element)
         total_elements = len([e for e in self.file])
-        ifcopenshell.api.run("nest.assign_object", self.file, related_objects=[subelement], relating_object=element)
+        ifcopenshell.api.nest.assign_object(self.file, related_objects=[subelement], relating_object=element)
         assert len([e for e in self.file]) == total_elements
 
     def test_that_old_nesting_relationships_are_updated_if_they_still_have_elements(self):
-        element1 = ifcopenshell.api.run("root.create_entity", self.file, ifc_class="IfcTask")
-        element2 = ifcopenshell.api.run("root.create_entity", self.file, ifc_class="IfcTask")
-        subelement1 = ifcopenshell.api.run("root.create_entity", self.file, ifc_class="IfcTask")
-        subelement2 = ifcopenshell.api.run("root.create_entity", self.file, ifc_class="IfcTask")
-        ifcopenshell.api.run(
-            "nest.assign_object", self.file, related_objects=[subelement1, subelement2], relating_object=element1
+        element1 = ifcopenshell.api.root.create_entity(self.file, ifc_class="IfcTask")
+        element2 = ifcopenshell.api.root.create_entity(self.file, ifc_class="IfcTask")
+        subelement1 = ifcopenshell.api.root.create_entity(self.file, ifc_class="IfcTask")
+        subelement2 = ifcopenshell.api.root.create_entity(self.file, ifc_class="IfcTask")
+        ifcopenshell.api.nest.assign_object(
+            self.file, related_objects=[subelement1, subelement2], relating_object=element1
         )
         rel = subelement1.Decomposes[0] if self.file.schema == "IFC2X3" else subelement1.Nests[0]
         assert len(rel.RelatedObjects) == 2
-        ifcopenshell.api.run("nest.assign_object", self.file, related_objects=[subelement1], relating_object=element2)
+        ifcopenshell.api.nest.assign_object(self.file, related_objects=[subelement1], relating_object=element2)
         assert len(rel.RelatedObjects) == 1
 
     def test_that_old_nesting_relationships_are_purged_if_no_more_elements_are_nested(self):
-        element1 = ifcopenshell.api.run("root.create_entity", self.file, ifc_class="IfcTask")
-        element2 = ifcopenshell.api.run("root.create_entity", self.file, ifc_class="IfcTask")
-        subelement1 = ifcopenshell.api.run("root.create_entity", self.file, ifc_class="IfcTask")
-        ifcopenshell.api.run("nest.assign_object", self.file, related_objects=[subelement1], relating_object=element1)
+        element1 = ifcopenshell.api.root.create_entity(self.file, ifc_class="IfcTask")
+        element2 = ifcopenshell.api.root.create_entity(self.file, ifc_class="IfcTask")
+        subelement1 = ifcopenshell.api.root.create_entity(self.file, ifc_class="IfcTask")
+        ifcopenshell.api.nest.assign_object(self.file, related_objects=[subelement1], relating_object=element1)
         rel_id = (subelement1.Decomposes[0] if self.file.schema == "IFC2X3" else subelement1.Nests[0]).id()
-        ifcopenshell.api.run("nest.assign_object", self.file, related_objects=[subelement1], relating_object=element2)
+        ifcopenshell.api.nest.assign_object(self.file, related_objects=[subelement1], relating_object=element2)
         with pytest.raises(RuntimeError):
             self.file.by_id(rel_id)
 
     def test_maintain_assignment_order_in_related_objects(self):
-        element = ifcopenshell.api.run("root.create_entity", self.file, ifc_class="IfcTask")
-        subelements = [ifcopenshell.api.run("root.create_entity", self.file, ifc_class="IfcTask") for _ in range(5)]
+        element = ifcopenshell.api.root.create_entity(self.file, ifc_class="IfcTask")
+        subelements = [ifcopenshell.api.root.create_entity(self.file, ifc_class="IfcTask") for _ in range(5)]
         for i in range(5):
-            ifcopenshell.api.run(
-                "nest.assign_object", self.file, related_objects=subelements[: i + 1], relating_object=element
+            ifcopenshell.api.nest.assign_object(
+                self.file, related_objects=subelements[: i + 1], relating_object=element
             )
             rel = self.file.by_type("IfcRelNests")[0]
             assert rel.RelatedObjects == tuple(subelements[: i + 1])
 
         # maintain the order in the affected relationships too
-        element2 = ifcopenshell.api.run("root.create_entity", self.file, ifc_class="IfcTask")
-        ifcopenshell.api.run(
-            "nest.assign_object", self.file, related_objects=subelements[2:3], relating_object=element2
+        element2 = ifcopenshell.api.root.create_entity(self.file, ifc_class="IfcTask")
+        ifcopenshell.api.nest.assign_object(
+            self.file, related_objects=subelements[2:3], relating_object=element2
         )
         assert rel.RelatedObjects == tuple(subelements[:2] + subelements[3:])
 

src/ifcopenshell-python/test/api/nest/test_unassign_object.py

@@ -16,43 +16,43 @@
 # 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.api.nest
+import ifcopenshell.api.root
 import ifcopenshell.util.element
 
 
 class TestUnassignObject(test.bootstrap.IFC4):
     def test_unassigning_an_object(self):
-        element = ifcopenshell.api.run("root.create_entity", self.file, ifc_class="IfcTask")
-        subelement1 = ifcopenshell.api.run("root.create_entity", self.file, ifc_class="IfcTask")
-        subelement2 = ifcopenshell.api.run("root.create_entity", self.file, ifc_class="IfcTask")
-        ifcopenshell.api.run(
-            "nest.assign_object", self.file, related_objects=[subelement1, subelement2], relating_object=element
+        element = ifcopenshell.api.root.create_entity(self.file, ifc_class="IfcTask")
+        subelement1 = ifcopenshell.api.root.create_entity(self.file, ifc_class="IfcTask")
+        subelement2 = ifcopenshell.api.root.create_entity(self.file, ifc_class="IfcTask")
+        ifcopenshell.api.nest.assign_object(
+            self.file, related_objects=[subelement1, subelement2], relating_object=element
         )
-        ifcopenshell.api.run("nest.unassign_object", self.file, related_objects=[subelement1, subelement2])
+        ifcopenshell.api.nest.unassign_object(self.file, related_objects=[subelement1, subelement2])
         assert ifcopenshell.util.element.get_nest(subelement1) is None
         assert ifcopenshell.util.element.get_nest(subelement2) is None
 
     def test_the_rel_is_kept_if_there_are_more_nested_elements(self):
-        element = ifcopenshell.api.run("root.create_entity", self.file, ifc_class="IfcTask")
-        subelement2 = ifcopenshell.api.run("root.create_entity", self.file, ifc_class="IfcTask")
-        subelement1 = ifcopenshell.api.run("root.create_entity", self.file, ifc_class="IfcTask")
-        ifcopenshell.api.run("nest.assign_object", self.file, related_objects=[subelement1], relating_object=element)
-        ifcopenshell.api.run("nest.assign_object", self.file, related_objects=[subelement2], relating_object=element)
-        ifcopenshell.api.run("nest.unassign_object", self.file, related_objects=[subelement1])
+        element = ifcopenshell.api.root.create_entity(self.file, ifc_class="IfcTask")
+        subelement2 = ifcopenshell.api.root.create_entity(self.file, ifc_class="IfcTask")
+        subelement1 = ifcopenshell.api.root.create_entity(self.file, ifc_class="IfcTask")
+        ifcopenshell.api.nest.assign_object(self.file, related_objects=[subelement1], relating_object=element)
+        ifcopenshell.api.nest.assign_object(self.file, related_objects=[subelement2], relating_object=element)
+        ifcopenshell.api.nest.unassign_object(self.file, related_objects=[subelement1])
         assert len(self.file.by_type("IfcRelNests")) == 1
 
     def test_the_rel_is_purged_if_there_are_no_more_nested_elements(self):
-        element = ifcopenshell.api.run("root.create_entity", self.file, ifc_class="IfcTask")
-        subelement = ifcopenshell.api.run("root.create_entity", self.file, ifc_class="IfcTask")
-        ifcopenshell.api.run("nest.assign_object", self.file, related_objects=[subelement], relating_object=element)
-        ifcopenshell.api.run("nest.unassign_object", self.file, related_objects=[subelement])
+        element = ifcopenshell.api.root.create_entity(self.file, ifc_class="IfcTask")
+        subelement = ifcopenshell.api.root.create_entity(self.file, ifc_class="IfcTask")
+        ifcopenshell.api.nest.assign_object(self.file, related_objects=[subelement], relating_object=element)
+        ifcopenshell.api.nest.unassign_object(self.file, related_objects=[subelement])
         assert len(self.file.by_type("IfcRelNests")) == 0
 
     def test_maintain_assignment_order_in_related_objects(self):
-        element = ifcopenshell.api.run("root.create_entity", self.file, ifc_class="IfcTask")
-        subelements = [ifcopenshell.api.run("root.create_entity", self.file, ifc_class="IfcTask") for _ in range(5)]
+        element = ifcopenshell.api.root.create_entity(self.file, ifc_class="IfcTask")
+        subelements = [ifcopenshell.api.root.create_entity(self.file, ifc_class="IfcTask") for _ in range(5)]
         rel = self.file.create_entity("IfcRelNests", RelatingObject=element, RelatedObjects=subelements)
 
         original_order = subelements.copy()
@@ -61,7 +61,7 @@ class TestUnassignObject(test.bootstrap.IFC4):
         removed_elements = set()
         for i in (0, 3, 2, 4):
             subelement = subelements[i]
-            ifcopenshell.api.run("nest.unassign_object", self.file, related_objects=[subelement])
+            ifcopenshell.api.nest.unassign_object(self.file, related_objects=[subelement])
             removed_elements.add(subelement)
             assert rel.RelatedObjects == tuple([o for o in original_order if o not in removed_elements])