From b4b334145f166d326ac818874df84a6a04c27440 Mon Sep 17 00:00:00 2001 From: Bernd Hahnebach Date: Tue, 23 Nov 2021 15:18:01 +0100 Subject: [PATCH] BIMTester: steps, improve imports in the regard of rebases --- src/ifcbimtester/bimtester/features/steps/aggregation/en.py | 3 ++- .../bimtester/features/steps/attributes_psets/de.py | 3 --- .../bimtester/features/steps/attributes_psets/en.py | 4 ++-- .../bimtester/features/steps/classification/en.py | 1 + .../bimtester/features/steps/element_classes/en.py | 1 + src/ifcbimtester/bimtester/features/steps/geocoding/en.py | 1 + src/ifcbimtester/bimtester/features/steps/geolocation/en.py | 2 ++ .../bimtester/features/steps/geometric_detail/en.py | 1 + .../bimtester/features/steps/model_federation/en.py | 2 ++ src/ifcbimtester/bimtester/features/steps/project_setup/en.py | 1 + 10 files changed, 13 insertions(+), 6 deletions(-) diff --git a/src/ifcbimtester/bimtester/features/steps/aggregation/en.py b/src/ifcbimtester/bimtester/features/steps/aggregation/en.py index 4ca1122173..9897128252 100644 --- a/src/ifcbimtester/bimtester/features/steps/aggregation/en.py +++ b/src/ifcbimtester/bimtester/features/steps/aggregation/en.py @@ -1,7 +1,8 @@ from behave import step, given, when, then, use_step_matcher + +from bimtester import util from bimtester.ifc import IfcStore from bimtester.table import TableModel -from bimtester import util use_step_matcher("parse") diff --git a/src/ifcbimtester/bimtester/features/steps/attributes_psets/de.py b/src/ifcbimtester/bimtester/features/steps/attributes_psets/de.py index 9e4677a4b7..7f509c9192 100644 --- a/src/ifcbimtester/bimtester/features/steps/attributes_psets/de.py +++ b/src/ifcbimtester/bimtester/features/steps/attributes_psets/de.py @@ -1,7 +1,4 @@ from behave import step -from behave import use_step_matcher - -use_step_matcher("parse") @step('Alle "{ifc_class}" Bauteile haben das Attribut "{aproperty}" im PSet "{pset}"') diff --git a/src/ifcbimtester/bimtester/features/steps/attributes_psets/en.py b/src/ifcbimtester/bimtester/features/steps/attributes_psets/en.py index ecae7717e1..2489ae9072 100644 --- a/src/ifcbimtester/bimtester/features/steps/attributes_psets/en.py +++ b/src/ifcbimtester/bimtester/features/steps/attributes_psets/en.py @@ -1,8 +1,8 @@ from behave import step from behave import use_step_matcher +from bimtester import util from bimtester.ifc import IfcStore -from bimtester.util import assert_elements from bimtester.lang import _ @@ -78,7 +78,7 @@ def eleclass_has_property_in_pset( context.elemcount = len(elements) context.falsecount = len(context.falseelems) - assert_elements( + util.assert_elements( ifc_class, context.elemcount, context.falsecount, diff --git a/src/ifcbimtester/bimtester/features/steps/classification/en.py b/src/ifcbimtester/bimtester/features/steps/classification/en.py index 81e54e6ad7..3291dce971 100644 --- a/src/ifcbimtester/bimtester/features/steps/classification/en.py +++ b/src/ifcbimtester/bimtester/features/steps/classification/en.py @@ -1,5 +1,6 @@ import json from behave import step + from bimtester import util from bimtester.ifc import IfcStore from bimtester.lang import _ diff --git a/src/ifcbimtester/bimtester/features/steps/element_classes/en.py b/src/ifcbimtester/bimtester/features/steps/element_classes/en.py index ab4031f5bc..869e2a2c1c 100644 --- a/src/ifcbimtester/bimtester/features/steps/element_classes/en.py +++ b/src/ifcbimtester/bimtester/features/steps/element_classes/en.py @@ -1,4 +1,5 @@ from behave import step + from bimtester import util from bimtester.ifc import IfcStore from bimtester.lang import _ diff --git a/src/ifcbimtester/bimtester/features/steps/geocoding/en.py b/src/ifcbimtester/bimtester/features/steps/geocoding/en.py index ed3c8ae5f8..a842cf8619 100644 --- a/src/ifcbimtester/bimtester/features/steps/geocoding/en.py +++ b/src/ifcbimtester/bimtester/features/steps/geocoding/en.py @@ -1,4 +1,5 @@ from behave import step, use_step_matcher + from bimtester import util from bimtester.ifc import IfcStore from bimtester.lang import _ diff --git a/src/ifcbimtester/bimtester/features/steps/geolocation/en.py b/src/ifcbimtester/bimtester/features/steps/geolocation/en.py index cd7704bca8..cbdf7d4ce5 100644 --- a/src/ifcbimtester/bimtester/features/steps/geolocation/en.py +++ b/src/ifcbimtester/bimtester/features/steps/geolocation/en.py @@ -4,7 +4,9 @@ import ifcopenshell import ifcopenshell.util.element import ifcopenshell.util.placement import ifcopenshell.util.geolocation + from behave import step + from bimtester import util from bimtester.ifc import IfcStore from bimtester.lang import _ diff --git a/src/ifcbimtester/bimtester/features/steps/geometric_detail/en.py b/src/ifcbimtester/bimtester/features/steps/geometric_detail/en.py index c2f7a7d694..3e2e6c948b 100644 --- a/src/ifcbimtester/bimtester/features/steps/geometric_detail/en.py +++ b/src/ifcbimtester/bimtester/features/steps/geometric_detail/en.py @@ -1,4 +1,5 @@ from behave import step + from bimtester import util from bimtester.ifc import IfcStore from bimtester.lang import _ diff --git a/src/ifcbimtester/bimtester/features/steps/model_federation/en.py b/src/ifcbimtester/bimtester/features/steps/model_federation/en.py index e601bac3f0..1d12209d8e 100644 --- a/src/ifcbimtester/bimtester/features/steps/model_federation/en.py +++ b/src/ifcbimtester/bimtester/features/steps/model_federation/en.py @@ -1,6 +1,8 @@ import ifcopenshell.util.geolocation import ifcopenshell.util.placement + from behave import step + from bimtester import util from bimtester.ifc import IfcStore from bimtester.lang import _ diff --git a/src/ifcbimtester/bimtester/features/steps/project_setup/en.py b/src/ifcbimtester/bimtester/features/steps/project_setup/en.py index 184f30ac28..b7f060f6f3 100644 --- a/src/ifcbimtester/bimtester/features/steps/project_setup/en.py +++ b/src/ifcbimtester/bimtester/features/steps/project_setup/en.py @@ -1,4 +1,5 @@ from behave import step + from bimtester import util from bimtester.ifc import IfcStore from bimtester.lang import _