From bea92455dd59c25f827f1af63f05c2251d4b8945 Mon Sep 17 00:00:00 2001 From: Andrej730 Date: Wed, 31 Jul 2024 17:19:56 +0500 Subject: [PATCH] clean up bim tests from trailing spaces --- .../test/bim/feature/covering.feature | 1 - .../test/bim/feature/drawing.feature | 1 - .../test/bim/feature/geometry.feature | 1 - .../test/bim/feature/material.feature | 2 +- .../test/bim/feature/resource.feature | 98 +++++++++---------- 5 files changed, 50 insertions(+), 53 deletions(-) diff --git a/src/blenderbim/test/bim/feature/covering.feature b/src/blenderbim/test/bim/feature/covering.feature index bb7bdaf45d..baa38b21e9 100644 --- a/src/blenderbim/test/bim/feature/covering.feature +++ b/src/blenderbim/test/bim/feature/covering.feature @@ -12,4 +12,3 @@ Scenario: Execute generate flooring coverings from walls And the object "IfcWall/Wall" is selected When I press "bim.add_instance_flooring_coverings_from_walls" Then nothing happens - diff --git a/src/blenderbim/test/bim/feature/drawing.feature b/src/blenderbim/test/bim/feature/drawing.feature index 28c2b5d80c..95b10ae2fc 100644 --- a/src/blenderbim/test/bim/feature/drawing.feature +++ b/src/blenderbim/test/bim/feature/drawing.feature @@ -96,4 +96,3 @@ Scenario: Remove drawing - deleting active drawing And the object "IfcAnnotation/PLAN_VIEW" is selected When I press "bim.override_object_delete" Then the collection "IfcAnnotation/PLAN_VIEW" does not exist - diff --git a/src/blenderbim/test/bim/feature/geometry.feature b/src/blenderbim/test/bim/feature/geometry.feature index 46f5541be1..efb5e81660 100644 --- a/src/blenderbim/test/bim/feature/geometry.feature +++ b/src/blenderbim/test/bim/feature/geometry.feature @@ -609,4 +609,3 @@ Scenario: Refresh linked aggregate - after duplicating an object Then the object "IfcWall/Wall_01.001" exists And the object "IfcWall/Wall_02.001" exists And the object "IfcWall/Wall_03.001" exists - diff --git a/src/blenderbim/test/bim/feature/material.feature b/src/blenderbim/test/bim/feature/material.feature index 47d2071f83..27db393e65 100644 --- a/src/blenderbim/test/bim/feature/material.feature +++ b/src/blenderbim/test/bim/feature/material.feature @@ -157,7 +157,7 @@ Scenario: Unassign material - removing inherited material And I press "bim.assign_type(relating_type={type}, related_object='IfcWall/Cube')" Then the object "IfcWall/Cube" has a "100" thick layered material containing the material "Default" - + When I press "bim.unassign_material" Then the object "IfcWall/Cube" has no IFC materials diff --git a/src/blenderbim/test/bim/feature/resource.feature b/src/blenderbim/test/bim/feature/resource.feature index ac7522e774..e33db08c48 100644 --- a/src/blenderbim/test/bim/feature/resource.feature +++ b/src/blenderbim/test/bim/feature/resource.feature @@ -32,7 +32,7 @@ Scenario: Add Labor Resource Given an empty IFC project When I press "bim.load_resources" When I press "bim.add_resource(ifc_class="IfcCrewResource")" - And the variable "crew_resource" is "IfcStore.get_file().by_type('IfcCrewResource')[0].id()" + And the variable "crew_resource" is "IfcStore.get_file().by_type('IfcCrewResource')[0].id()" When I press "bim.add_resource(ifc_class="IfcLaborResource", parent_resource={crew_resource})" Then nothing happens @@ -41,7 +41,7 @@ Scenario: Enable Editing Resource Given an empty IFC project When I press "bim.load_resources" When I press "bim.add_resource(ifc_class="IfcCrewResource")" - And the variable "crew_resource" is "IfcStore.get_file().by_type('IfcCrewResource')[0].id()" + And the variable "crew_resource" is "IfcStore.get_file().by_type('IfcCrewResource')[0].id()" When I press "bim.enable_editing_resource(resource={crew_resource})" Then nothing happens @@ -49,7 +49,7 @@ Scenario: Edit Resource Given an empty IFC project When I press "bim.load_resources" When I press "bim.add_resource(ifc_class="IfcCrewResource")" - And the variable "crew_resource" is "IfcStore.get_file().by_type('IfcCrewResource')[0].id()" + And the variable "crew_resource" is "IfcStore.get_file().by_type('IfcCrewResource')[0].id()" When I press "bim.enable_editing_resource(resource={crew_resource})" And I set "scene.BIMResourceProperties.resource_attributes.get('Name').string_value" to "Foo" When I press "bim.edit_resource()" @@ -59,7 +59,7 @@ Scenario: Remove Resource Given an empty IFC project When I press "bim.load_resources" When I press "bim.add_resource(ifc_class="IfcCrewResource")" - And the variable "crew_resource" is "IfcStore.get_file().by_type('IfcCrewResource')[0].id()" + And the variable "crew_resource" is "IfcStore.get_file().by_type('IfcCrewResource')[0].id()" When I press "bim.enable_editing_resource(resource={crew_resource})" And I set "scene.BIMResourceProperties.resource_attributes.get('Name').string_value" to "Foo" When I press "bim.edit_resource()" @@ -70,9 +70,9 @@ Scenario: Remove Parent Resource Given an empty IFC project When I press "bim.load_resources" When I press "bim.add_resource(ifc_class="IfcCrewResource")" - And the variable "crew_resource" is "IfcStore.get_file().by_type('IfcCrewResource')[0].id()" + And the variable "crew_resource" is "IfcStore.get_file().by_type('IfcCrewResource')[0].id()" When I press "bim.add_resource(ifc_class="IfcLaborResource", parent_resource={crew_resource})" - And the variable "labor_resource" is "IfcStore.get_file().by_type('IfcLaborResource')[0].id()" + And the variable "labor_resource" is "IfcStore.get_file().by_type('IfcLaborResource')[0].id()" When I press "bim.enable_editing_resource_time(resource={labor_resource})" And I set "scene.BIMResourceProperties.resource_time_attributes.get('Name').string_value" to "TimelyFoo" When I press "bim.edit_resource_time()" @@ -83,9 +83,9 @@ Scenario: Enable Editing Resource time Given an empty IFC project When I press "bim.load_resources" When I press "bim.add_resource(ifc_class="IfcCrewResource")" - And the variable "crew_resource" is "IfcStore.get_file().by_type('IfcCrewResource')[0].id()" + And the variable "crew_resource" is "IfcStore.get_file().by_type('IfcCrewResource')[0].id()" When I press "bim.add_resource(ifc_class="IfcLaborResource", parent_resource={crew_resource})" - And the variable "labor_resource" is "IfcStore.get_file().by_type('IfcLaborResource')[0].id()" + And the variable "labor_resource" is "IfcStore.get_file().by_type('IfcLaborResource')[0].id()" When I press "bim.enable_editing_resource_time(resource={labor_resource})" Then nothing happens @@ -93,9 +93,9 @@ Scenario: Disable editing resource time Given an empty IFC project When I press "bim.load_resources" When I press "bim.add_resource(ifc_class="IfcCrewResource")" - And the variable "crew_resource" is "IfcStore.get_file().by_type('IfcCrewResource')[0].id()" + And the variable "crew_resource" is "IfcStore.get_file().by_type('IfcCrewResource')[0].id()" When I press "bim.add_resource(ifc_class="IfcLaborResource", parent_resource={crew_resource})" - And the variable "labor_resource" is "IfcStore.get_file().by_type('IfcLaborResource')[0].id()" + And the variable "labor_resource" is "IfcStore.get_file().by_type('IfcLaborResource')[0].id()" And I press "bim.enable_editing_resource_time(resource={labor_resource})" When I press "bim.disable_editing_resource()" Then nothing happens @@ -104,9 +104,9 @@ Scenario: Edit Resource time Given an empty IFC project When I press "bim.load_resources" When I press "bim.add_resource(ifc_class="IfcCrewResource")" - And the variable "crew_resource" is "IfcStore.get_file().by_type('IfcCrewResource')[0].id()" + And the variable "crew_resource" is "IfcStore.get_file().by_type('IfcCrewResource')[0].id()" When I press "bim.add_resource(ifc_class="IfcLaborResource", parent_resource={crew_resource})" - And the variable "labor_resource" is "IfcStore.get_file().by_type('IfcLaborResource')[0].id()" + And the variable "labor_resource" is "IfcStore.get_file().by_type('IfcLaborResource')[0].id()" When I press "bim.enable_editing_resource_time(resource={labor_resource})" And I set "scene.BIMResourceProperties.resource_time_attributes.get('ScheduleUsage').float_value" to "305.25" When I press "bim.edit_resource_time()" @@ -116,9 +116,9 @@ Scenario: Enable Editing Resource Costs Given an empty IFC project When I press "bim.load_resources" When I press "bim.add_resource(ifc_class="IfcCrewResource")" - And the variable "crew_resource" is "IfcStore.get_file().by_type('IfcCrewResource')[0].id()" + And the variable "crew_resource" is "IfcStore.get_file().by_type('IfcCrewResource')[0].id()" When I press "bim.add_resource(ifc_class="IfcLaborResource", parent_resource={crew_resource})" - And the variable "labor_resource" is "IfcStore.get_file().by_type('IfcLaborResource')[0].id()" + And the variable "labor_resource" is "IfcStore.get_file().by_type('IfcLaborResource')[0].id()" When I press "bim.enable_editing_resource_costs(resource={labor_resource})" Then nothing happens @@ -126,9 +126,9 @@ Scenario: Disable Editing Resource Costs Given an empty IFC project When I press "bim.load_resources" When I press "bim.add_resource(ifc_class="IfcCrewResource")" - And the variable "crew_resource" is "IfcStore.get_file().by_type('IfcCrewResource')[0].id()" + And the variable "crew_resource" is "IfcStore.get_file().by_type('IfcCrewResource')[0].id()" When I press "bim.add_resource(ifc_class="IfcLaborResource", parent_resource={crew_resource})" - And the variable "labor_resource" is "IfcStore.get_file().by_type('IfcLaborResource')[0].id()" + And the variable "labor_resource" is "IfcStore.get_file().by_type('IfcLaborResource')[0].id()" When I press "bim.enable_editing_resource_costs(resource={labor_resource})" When I press "bim.disable_editing_resource()" Then nothing happens @@ -138,9 +138,9 @@ Scenario: Add Resource Fixed Cost Value Given an empty IFC project When I press "bim.load_resources" When I press "bim.add_resource(ifc_class="IfcCrewResource")" - And the variable "crew_resource" is "IfcStore.get_file().by_type('IfcCrewResource')[0].id()" + And the variable "crew_resource" is "IfcStore.get_file().by_type('IfcCrewResource')[0].id()" When I press "bim.add_resource(ifc_class="IfcLaborResource", parent_resource={crew_resource})" - And the variable "labor_resource" is "IfcStore.get_file().by_type('IfcLaborResource')[0].id()" + And the variable "labor_resource" is "IfcStore.get_file().by_type('IfcLaborResource')[0].id()" When I press "bim.enable_editing_resource_costs(resource={labor_resource})" When I press "bim.add_cost_value(parent={labor_resource}, cost_type="FIXED")" Then nothing happens @@ -149,12 +149,12 @@ Scenario: Edit Resource Cost Value Given an empty IFC project When I press "bim.load_resources" When I press "bim.add_resource(ifc_class="IfcCrewResource")" - And the variable "crew_resource" is "IfcStore.get_file().by_type('IfcCrewResource')[0].id()" + And the variable "crew_resource" is "IfcStore.get_file().by_type('IfcCrewResource')[0].id()" When I press "bim.add_resource(ifc_class="IfcLaborResource", parent_resource={crew_resource})" - And the variable "labor_resource" is "IfcStore.get_file().by_type('IfcLaborResource')[0].id()" + And the variable "labor_resource" is "IfcStore.get_file().by_type('IfcLaborResource')[0].id()" When I press "bim.enable_editing_resource_costs(resource={labor_resource})" When I press "bim.add_cost_value(parent={labor_resource}, cost_type="FIXED")" - And the variable "cost_value" is "IfcStore.get_file().by_type('IfcCostValue')[0].id()" + And the variable "cost_value" is "IfcStore.get_file().by_type('IfcCostValue')[0].id()" When I press "bim.enable_editing_resource_cost_value(cost_value={cost_value})" Then nothing happens @@ -162,12 +162,12 @@ Scenario: Enable Editing Resource Cost Value Formula Given an empty IFC project When I press "bim.load_resources" When I press "bim.add_resource(ifc_class="IfcCrewResource")" - And the variable "crew_resource" is "IfcStore.get_file().by_type('IfcCrewResource')[0].id()" + And the variable "crew_resource" is "IfcStore.get_file().by_type('IfcCrewResource')[0].id()" When I press "bim.add_resource(ifc_class="IfcLaborResource", parent_resource={crew_resource})" - And the variable "labor_resource" is "IfcStore.get_file().by_type('IfcLaborResource')[0].id()" + And the variable "labor_resource" is "IfcStore.get_file().by_type('IfcLaborResource')[0].id()" When I press "bim.enable_editing_resource_costs(resource={labor_resource})" When I press "bim.add_cost_value(parent={labor_resource}, cost_type="FIXED")" - And the variable "cost_value" is "IfcStore.get_file().by_type('IfcCostValue')[0].id()" + And the variable "cost_value" is "IfcStore.get_file().by_type('IfcCostValue')[0].id()" When I press "bim.enable_editing_resource_cost_value(cost_value={cost_value})" Then nothing happens @@ -175,12 +175,12 @@ Scenario: Edit Resource Cost Value Formula Given an empty IFC project When I press "bim.load_resources" When I press "bim.add_resource(ifc_class="IfcCrewResource")" - And the variable "crew_resource" is "IfcStore.get_file().by_type('IfcCrewResource')[0].id()" + And the variable "crew_resource" is "IfcStore.get_file().by_type('IfcCrewResource')[0].id()" When I press "bim.add_resource(ifc_class="IfcLaborResource", parent_resource={crew_resource})" - And the variable "labor_resource" is "IfcStore.get_file().by_type('IfcLaborResource')[0].id()" + And the variable "labor_resource" is "IfcStore.get_file().by_type('IfcLaborResource')[0].id()" When I press "bim.enable_editing_resource_costs(resource={labor_resource})" When I press "bim.add_cost_value(parent={labor_resource}, cost_type="FIXED")" - And the variable "cost_value" is "IfcStore.get_file().by_type('IfcCostValue')[0].id()" + And the variable "cost_value" is "IfcStore.get_file().by_type('IfcCostValue')[0].id()" When I press "bim.enable_editing_resource_cost_value(cost_value={cost_value})" And I set "scene.BIMResourceProperties.cost_value_formula" to "220*0.2" When I press "bim.edit_resource_cost_value_formula(cost_value={cost_value})" @@ -190,12 +190,12 @@ Scenario: Edit Resource Cost Value Given an empty IFC project When I press "bim.load_resources" When I press "bim.add_resource(ifc_class="IfcCrewResource")" - And the variable "crew_resource" is "IfcStore.get_file().by_type('IfcCrewResource')[0].id()" + And the variable "crew_resource" is "IfcStore.get_file().by_type('IfcCrewResource')[0].id()" When I press "bim.add_resource(ifc_class="IfcLaborResource", parent_resource={crew_resource})" - And the variable "labor_resource" is "IfcStore.get_file().by_type('IfcLaborResource')[0].id()" + And the variable "labor_resource" is "IfcStore.get_file().by_type('IfcLaborResource')[0].id()" When I press "bim.enable_editing_resource_costs(resource={labor_resource})" When I press "bim.add_cost_value(parent={labor_resource}, cost_type="FIXED")" - And the variable "cost_value" is "IfcStore.get_file().by_type('IfcCostValue')[0].id()" + And the variable "cost_value" is "IfcStore.get_file().by_type('IfcCostValue')[0].id()" When I press "bim.enable_editing_resource_cost_value(cost_value={cost_value})" And I set "scene.BIMResourceProperties.cost_value_attributes.get('AppliedValue').float_value" to "1.00" When I press "bim.edit_resource_cost_value(cost_value={cost_value})" @@ -205,9 +205,9 @@ Scenario: Enable Editing Resource Quantity Given an empty IFC project When I press "bim.load_resources" When I press "bim.add_resource(ifc_class="IfcCrewResource")" - And the variable "crew_resource" is "IfcStore.get_file().by_type('IfcCrewResource')[0].id()" + And the variable "crew_resource" is "IfcStore.get_file().by_type('IfcCrewResource')[0].id()" When I press "bim.add_resource(ifc_class="IfcLaborResource", parent_resource={crew_resource})" - And the variable "labor_resource" is "IfcStore.get_file().by_type('IfcLaborResource')[0].id()" + And the variable "labor_resource" is "IfcStore.get_file().by_type('IfcLaborResource')[0].id()" When I press "bim.enable_editing_resource_base_quantity(resource={labor_resource})" When I press "bim.add_resource_quantity(resource={labor_resource}, ifc_class="IfcQuantityArea")" When I press "bim.enable_editing_resource_quantity(resource={labor_resource})" @@ -217,14 +217,14 @@ Scenario: Edit Resource Quantity Given an empty IFC project When I press "bim.load_resources" When I press "bim.add_resource(ifc_class="IfcCrewResource")" - And the variable "crew_resource" is "IfcStore.get_file().by_type('IfcCrewResource')[0].id()" + And the variable "crew_resource" is "IfcStore.get_file().by_type('IfcCrewResource')[0].id()" When I press "bim.add_resource(ifc_class="IfcLaborResource", parent_resource={crew_resource})" - And the variable "labor_resource" is "IfcStore.get_file().by_type('IfcLaborResource')[0].id()" + And the variable "labor_resource" is "IfcStore.get_file().by_type('IfcLaborResource')[0].id()" When I press "bim.enable_editing_resource_base_quantity(resource={labor_resource})" When I press "bim.add_resource_quantity(resource={labor_resource}, ifc_class="IfcQuantityArea")" When I press "bim.enable_editing_resource_quantity(resource={labor_resource})" And I set "scene.BIMResourceProperties.quantity_attributes.get('AreaValue').float_value" to "50.00" - And the variable "quantity_area" is "IfcStore.get_file().by_type('IfcQuantityArea')[0].id()" + And the variable "quantity_area" is "IfcStore.get_file().by_type('IfcQuantityArea')[0].id()" When I press "bim.edit_resource_quantity(physical_quantity={quantity_area})" Then nothing happens @@ -232,12 +232,12 @@ Scenario: Remove Resource Quantity Given an empty IFC project When I press "bim.load_resources" When I press "bim.add_resource(ifc_class="IfcCrewResource")" - And the variable "crew_resource" is "IfcStore.get_file().by_type('IfcCrewResource')[0].id()" + And the variable "crew_resource" is "IfcStore.get_file().by_type('IfcCrewResource')[0].id()" When I press "bim.add_resource(ifc_class="IfcLaborResource", parent_resource={crew_resource})" - And the variable "labor_resource" is "IfcStore.get_file().by_type('IfcLaborResource')[0].id()" + And the variable "labor_resource" is "IfcStore.get_file().by_type('IfcLaborResource')[0].id()" When I press "bim.enable_editing_resource_base_quantity(resource={labor_resource})" When I press "bim.add_resource_quantity(resource={labor_resource}, ifc_class="IfcQuantityArea")" - And the variable "quantity_area" is "IfcStore.get_file().by_type('IfcQuantityArea')[0].id()" + And the variable "quantity_area" is "IfcStore.get_file().by_type('IfcQuantityArea')[0].id()" When I press "bim.remove_resource_quantity(resource={labor_resource})" Then nothing happens @@ -245,9 +245,9 @@ Scenario: Add Productivity data Given an empty IFC project When I press "bim.load_resources" When I press "bim.add_resource(ifc_class="IfcCrewResource")" - And the variable "crew_resource" is "IfcStore.get_file().by_type('IfcCrewResource')[0].id()" + And the variable "crew_resource" is "IfcStore.get_file().by_type('IfcCrewResource')[0].id()" When I press "bim.add_resource(ifc_class="IfcLaborResource", parent_resource={crew_resource})" - And the variable "labor_resource" is "IfcStore.get_file().by_type('IfcLaborResource')[0].id()" + And the variable "labor_resource" is "IfcStore.get_file().by_type('IfcLaborResource')[0].id()" And I set "scene.BIMResourceProperties.active_resource_index" to "1" And I press "bim.add_productivity_data" And I set "scene.BIMResourceProperties.should_show_resource_tools" to "True" @@ -284,9 +284,9 @@ Scenario: Calculate Resource Work And I press "bim.edit_pset(obj='IfcWall/Cube', obj_type='Object')" When I press "bim.load_resources" When I press "bim.add_resource(ifc_class="IfcCrewResource")" - And the variable "crew_resource" is "IfcStore.get_file().by_type('IfcCrewResource')[0].id()" + And the variable "crew_resource" is "IfcStore.get_file().by_type('IfcCrewResource')[0].id()" When I press "bim.add_resource(ifc_class="IfcLaborResource", parent_resource={crew_resource})" - And the variable "labor_resource" is "IfcStore.get_file().by_type('IfcLaborResource')[0].id()" + And the variable "labor_resource" is "IfcStore.get_file().by_type('IfcLaborResource')[0].id()" And I set "scene.BIMResourceProperties.active_resource_index" to "1" And I press "bim.add_productivity_data" And I set "scene.BIMResourceProperties.should_show_resource_tools" to "True" @@ -294,18 +294,18 @@ Scenario: Calculate Resource Work And I set "scene.BIMResourceProductivity.quantity_produced_name" to "GrossSideArea" And I set "scene.BIMResourceProductivity.quantity_consumed[0].hours" to "5" When I press "bim.edit_productivity_data()" - And the variable "productivity_data" is "IfcStore.get_file().by_type('IfcPropertySet')[-1].id()" + And the variable "productivity_data" is "IfcStore.get_file().by_type('IfcPropertySet')[-1].id()" When I press "bim.calculate_resource_work(resource={labor_resource})" - Then nothing happens + Then nothing happens Scenario: Assign Resource Given an empty IFC project When I press "bim.load_resources" When I press "bim.add_resource(ifc_class="IfcCrewResource")" - And the variable "crew_resource" is "IfcStore.get_file().by_type('IfcCrewResource')[0].id()" + And the variable "crew_resource" is "IfcStore.get_file().by_type('IfcCrewResource')[0].id()" When I press "bim.add_resource(ifc_class="IfcLaborResource", parent_resource={crew_resource})" - And the variable "labor_resource" is "IfcStore.get_file().by_type('IfcLaborResource')[0].id()" + And the variable "labor_resource" is "IfcStore.get_file().by_type('IfcLaborResource')[0].id()" And I add a cube And the object "Cube" is selected And I set "scene.BIMRootProperties.ifc_product" to "IfcElement" @@ -315,13 +315,13 @@ Scenario: Assign Resource And I press "bim.assign_resource(resource={labor_resource}, related_object="")" Then nothing happens -Scenario: UnAssign Resource +Scenario: Unassign Resource Given an empty IFC project When I press "bim.load_resources" When I press "bim.add_resource(ifc_class="IfcCrewResource")" - And the variable "crew_resource" is "IfcStore.get_file().by_type('IfcCrewResource')[0].id()" + And the variable "crew_resource" is "IfcStore.get_file().by_type('IfcCrewResource')[0].id()" When I press "bim.add_resource(ifc_class="IfcLaborResource", parent_resource={crew_resource})" - And the variable "labor_resource" is "IfcStore.get_file().by_type('IfcLaborResource')[0].id()" + And the variable "labor_resource" is "IfcStore.get_file().by_type('IfcLaborResource')[0].id()" And I add a cube And the object "Cube" is selected And I set "scene.BIMRootProperties.ifc_product" to "IfcElement"