From 94e9e945d77ed7cf1fc5b1e7074ccf7311fb2ed7 Mon Sep 17 00:00:00 2001 From: Andrej730 Date: Fri, 2 Aug 2024 12:41:12 +0500 Subject: [PATCH] fix system/qto tool tests after e6ac012 --- src/blenderbim/test/tool/test_qto.py | 9 +++++++++ src/blenderbim/test/tool/test_system.py | 10 ++++------ 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/src/blenderbim/test/tool/test_qto.py b/src/blenderbim/test/tool/test_qto.py index 4687eb8556..5cd6720ba8 100644 --- a/src/blenderbim/test/tool/test_qto.py +++ b/src/blenderbim/test/tool/test_qto.py @@ -24,6 +24,7 @@ import test.bim.bootstrap import blenderbim.core.tool import blenderbim.core.root import blenderbim.tool as tool +import blenderbim.bim.import_ifc as import_ifc import blenderbim.bim.module.qto.calculator as calculator from blenderbim.tool.qto import Qto as subject @@ -53,9 +54,17 @@ class TestGetRoundedValue(test.bim.bootstrap.NewFile): class TestGetCalculatedObjectQuantities(test.bim.bootstrap.NewFile): def setup_file(self): + import logging + self.ifc = ifcopenshell.file() tool.Ifc.set(self.ifc) ifcopenshell.api.run("root.create_entity", self.ifc, ifc_class="IfcProject", name="My Project") + ifc_import_settings = import_ifc.IfcImportSettings.factory( + bpy.context, tool.Ifc.get_path(), logging.getLogger("ImportIFC") + ) + ifc_importer = import_ifc.IfcImporter(ifc_import_settings) + ifc_importer.file = self.ifc + ifc_importer.create_project() def setup_units(self, units): ifcopenshell.api.run("unit.assign_unit", self.ifc, **units) diff --git a/src/blenderbim/test/tool/test_system.py b/src/blenderbim/test/tool/test_system.py index e7d80e565a..ca5bf4023c 100644 --- a/src/blenderbim/test/tool/test_system.py +++ b/src/blenderbim/test/tool/test_system.py @@ -230,16 +230,14 @@ class TestImportSystems(NewFile): class TestLoadPorts(NewFile): def test_run(self): - ifc = ifcopenshell.api.run("project.create_file") - ifcopenshell.api.run("root.create_entity", ifc, ifc_class="IfcProject") - ifcopenshell.api.run("unit.assign_unit", ifc) - tool.Ifc().set(ifc) + bpy.ops.bim.create_project() + ifc = tool.Ifc.get() - element = ifc.createIfcChiller() + element = ifc.create_entity("IfcChiller") obj = bpy.data.objects.new("Object", None) tool.Ifc.link(element, obj) - port = ifc.createIfcDistributionPort() + port = ifc.create_entity("IfcDistributionPort") subject.load_ports(element, [port]) obj = tool.Ifc.get_object(port) assert obj