From d83295d3c30bf936a37323f8371d3389ad57a761 Mon Sep 17 00:00:00 2001 From: Dion Moult Date: Thu, 30 Sep 2021 20:27:38 +1000 Subject: [PATCH] Minor fix --- .../test/bim/module/sequence/test_operator.py | 75 +++++++++++-------- 1 file changed, 43 insertions(+), 32 deletions(-) diff --git a/src/blenderbim/test/bim/module/sequence/test_operator.py b/src/blenderbim/test/bim/module/sequence/test_operator.py index e697071e32..a84c3acb26 100644 --- a/src/blenderbim/test/bim/module/sequence/test_operator.py +++ b/src/blenderbim/test/bim/module/sequence/test_operator.py @@ -25,13 +25,14 @@ class TestVisualiseWorkScheduleDateRange(test.bim.bootstrap.NewFile): return """ Given an empty IFC project And I press "bim.add_work_schedule" - And I press "bim.enable_editing_tasks(work_schedule=72)" + And the variable "work_schedule" is "IfcStore.get_file().by_type("IfcWorkSchedule")[0].id()" + And I press "bim.enable_editing_tasks(work_schedule={work_schedule})" And I set "scene.BIMWorkScheduleProperties.visualisation_start" to "01/01/21" And I set "scene.BIMWorkScheduleProperties.visualisation_finish" to "01/02/21" And I set "scene.BIMWorkScheduleProperties.speed_types" to "FRAME_SPEED" And I set "scene.BIMWorkScheduleProperties.speed_animation_frames" to "7" And I set "scene.BIMWorkScheduleProperties.speed_real_duration" to "P1W" - And I press "bim.visualise_work_schedule_date_range(work_schedule=72)" + And I press "bim.visualise_work_schedule_date_range(work_schedule={work_schedule})" When I am on frame "1" Then the object "Timeline" has a body of "2021-01-01" When I am on frame "2" @@ -43,12 +44,14 @@ class TestVisualiseWorkScheduleDateRange(test.bim.bootstrap.NewFile): return """ Given an empty IFC project And I press "bim.add_work_schedule" - And I press "bim.enable_editing_tasks(work_schedule=72)" - And I press "bim.add_summary_task(work_schedule=72)" - And I press "bim.enable_editing_task(task=76)" + And the variable "work_schedule" is "IfcStore.get_file().by_type("IfcWorkSchedule")[0].id()" + And I press "bim.enable_editing_tasks(work_schedule={work_schedule})" + And I press "bim.add_summary_task(work_schedule={work_schedule})" + And the variable "task" is "IfcStore.get_file().by_type("IfcTask")[0].id()" + And I press "bim.enable_editing_task(task={task})" And I set "scene.BIMWorkScheduleProperties.task_attributes.get("PredefinedType").enum_value" to "CONSTRUCTION" And I press "bim.edit_task" - And I press "bim.enable_editing_task_time(task=76)" + And I press "bim.enable_editing_task_time(task={task})" And I set "scene.BIMWorkScheduleProperties.task_time_attributes.get("ScheduleStart").string_value" to "2021-01-02" And I set "scene.BIMWorkScheduleProperties.task_time_attributes.get("ScheduleFinish").string_value" to "2021-01-06" And I press "bim.edit_task_time" @@ -57,13 +60,13 @@ class TestVisualiseWorkScheduleDateRange(test.bim.bootstrap.NewFile): And I set "scene.BIMRootProperties.ifc_class" to "IfcWall" And I press "bim.assign_class" And the object "IfcWall/Cube" is selected - And I press "bim.assign_product(task=76, relating_product='')" + And I press "bim.assign_product(task={task}, relating_product='')" And I set "scene.BIMWorkScheduleProperties.visualisation_start" to "01/01/21" And I set "scene.BIMWorkScheduleProperties.visualisation_finish" to "01/02/21" And I set "scene.BIMWorkScheduleProperties.speed_types" to "FRAME_SPEED" And I set "scene.BIMWorkScheduleProperties.speed_animation_frames" to "7" And I set "scene.BIMWorkScheduleProperties.speed_real_duration" to "P1W" - And I press "bim.visualise_work_schedule_date_range(work_schedule=72)" + And I press "bim.visualise_work_schedule_date_range(work_schedule={work_schedule})" When I am on frame "1" Then "scene.objects.get('IfcWall/Cube').hide_viewport" is "True" And "scene.objects.get('IfcWall/Cube').hide_render" is "True" @@ -80,12 +83,14 @@ class TestVisualiseWorkScheduleDateRange(test.bim.bootstrap.NewFile): return """ Given an empty IFC project And I press "bim.add_work_schedule" - And I press "bim.enable_editing_tasks(work_schedule=72)" - And I press "bim.add_summary_task(work_schedule=72)" - And I press "bim.enable_editing_task(task=76)" + And the variable "work_schedule" is "IfcStore.get_file().by_type("IfcWorkSchedule")[0].id()" + And I press "bim.enable_editing_tasks(work_schedule={work_schedule})" + And I press "bim.add_summary_task(work_schedule={work_schedule})" + And the variable "task" is "IfcStore.get_file().by_type("IfcTask")[0].id()" + And I press "bim.enable_editing_task(task={task})" And I set "scene.BIMWorkScheduleProperties.task_attributes.get("PredefinedType").enum_value" to "DEMOLITION" And I press "bim.edit_task" - And I press "bim.enable_editing_task_time(task=76)" + And I press "bim.enable_editing_task_time(task={task})" And I set "scene.BIMWorkScheduleProperties.task_time_attributes.get("ScheduleStart").string_value" to "2021-01-02" And I set "scene.BIMWorkScheduleProperties.task_time_attributes.get("ScheduleFinish").string_value" to "2021-01-06" And I press "bim.edit_task_time" @@ -94,13 +99,13 @@ class TestVisualiseWorkScheduleDateRange(test.bim.bootstrap.NewFile): And I set "scene.BIMRootProperties.ifc_class" to "IfcWall" And I press "bim.assign_class" And the object "IfcWall/Cube" is selected - And I press "bim.assign_product(task=76, relating_product='')" + And I press "bim.assign_product(task={task}, relating_product='')" And I set "scene.BIMWorkScheduleProperties.visualisation_start" to "01/01/21" And I set "scene.BIMWorkScheduleProperties.visualisation_finish" to "01/02/21" And I set "scene.BIMWorkScheduleProperties.speed_types" to "FRAME_SPEED" And I set "scene.BIMWorkScheduleProperties.speed_animation_frames" to "7" And I set "scene.BIMWorkScheduleProperties.speed_real_duration" to "P1W" - And I press "bim.visualise_work_schedule_date_range(work_schedule=72)" + And I press "bim.visualise_work_schedule_date_range(work_schedule={work_schedule})" When I am on frame "1" Then "scene.objects.get('IfcWall/Cube').hide_viewport" is "False" And "scene.objects.get('IfcWall/Cube').hide_render" is "False" @@ -120,12 +125,14 @@ class TestVisualiseWorkScheduleDateRange(test.bim.bootstrap.NewFile): return """ Given an empty IFC project And I press "bim.add_work_schedule" - And I press "bim.enable_editing_tasks(work_schedule=72)" - And I press "bim.add_summary_task(work_schedule=72)" - And I press "bim.enable_editing_task(task=76)" + And the variable "work_schedule" is "IfcStore.get_file().by_type("IfcWorkSchedule")[0].id()" + And I press "bim.enable_editing_tasks(work_schedule={work_schedule})" + And I press "bim.add_summary_task(work_schedule={work_schedule})" + And the variable "task" is "IfcStore.get_file().by_type("IfcTask")[0].id()" + And I press "bim.enable_editing_task(task={task})" And I set "scene.BIMWorkScheduleProperties.task_attributes.get("PredefinedType").enum_value" to "OPERATION" And I press "bim.edit_task" - And I press "bim.enable_editing_task_time(task=76)" + And I press "bim.enable_editing_task_time(task={task})" And I set "scene.BIMWorkScheduleProperties.task_time_attributes.get("ScheduleStart").string_value" to "2021-01-02" And I set "scene.BIMWorkScheduleProperties.task_time_attributes.get("ScheduleFinish").string_value" to "2021-01-06" And I press "bim.edit_task_time" @@ -134,13 +141,13 @@ class TestVisualiseWorkScheduleDateRange(test.bim.bootstrap.NewFile): And I set "scene.BIMRootProperties.ifc_class" to "IfcWall" And I press "bim.assign_class" And the object "IfcWall/Cube" is selected - And I press "bim.assign_product(task=76, relating_product='')" + And I press "bim.assign_product(task={task}, relating_product='')" And I set "scene.BIMWorkScheduleProperties.visualisation_start" to "01/01/21" And I set "scene.BIMWorkScheduleProperties.visualisation_finish" to "01/02/21" And I set "scene.BIMWorkScheduleProperties.speed_types" to "FRAME_SPEED" And I set "scene.BIMWorkScheduleProperties.speed_animation_frames" to "7" And I set "scene.BIMWorkScheduleProperties.speed_real_duration" to "P1W" - And I press "bim.visualise_work_schedule_date_range(work_schedule=72)" + And I press "bim.visualise_work_schedule_date_range(work_schedule={work_schedule})" When I am on frame "1" Then "scene.objects.get('IfcWall/Cube').color" is "[1.0, 1.0, 1.0, 1]" When I am on frame "2" @@ -154,12 +161,14 @@ class TestVisualiseWorkScheduleDateRange(test.bim.bootstrap.NewFile): return """ Given an empty IFC project And I press "bim.add_work_schedule" - And I press "bim.enable_editing_tasks(work_schedule=72)" - And I press "bim.add_summary_task(work_schedule=72)" - And I press "bim.enable_editing_task(task=76)" + And the variable "work_schedule" is "IfcStore.get_file().by_type("IfcWorkSchedule")[0].id()" + And I press "bim.enable_editing_tasks(work_schedule={work_schedule})" + And I press "bim.add_summary_task(work_schedule={work_schedule})" + And the variable "task" is "IfcStore.get_file().by_type("IfcTask")[0].id()" + And I press "bim.enable_editing_task(task={task})" And I set "scene.BIMWorkScheduleProperties.task_attributes.get("PredefinedType").enum_value" to "MOVE" And I press "bim.edit_task" - And I press "bim.enable_editing_task_time(task=76)" + And I press "bim.enable_editing_task_time(task={task})" And I set "scene.BIMWorkScheduleProperties.task_time_attributes.get("ScheduleStart").string_value" to "2021-01-02" And I set "scene.BIMWorkScheduleProperties.task_time_attributes.get("ScheduleFinish").string_value" to "2021-01-06" And I press "bim.edit_task_time" @@ -169,19 +178,19 @@ class TestVisualiseWorkScheduleDateRange(test.bim.bootstrap.NewFile): And I set "scene.BIMRootProperties.ifc_class" to "IfcWall" And I press "bim.assign_class" And the object "IfcWall/ToObject" is selected - And I press "bim.assign_product(task=76, relating_product='')" + And I press "bim.assign_product(task={task}, relating_product='')" When I add a cube And I rename the object "Cube" to "FromObject" And the object "FromObject" is selected And I press "bim.assign_class" And the object "IfcWall/FromObject" is selected - And I press "bim.assign_process(task=76, related_object_type="PRODUCT", related_object='')" + And I press "bim.assign_process(task={task}, related_object_type="PRODUCT", related_object='')" And I set "scene.BIMWorkScheduleProperties.visualisation_start" to "01/01/21" And I set "scene.BIMWorkScheduleProperties.visualisation_finish" to "01/02/21" And I set "scene.BIMWorkScheduleProperties.speed_types" to "FRAME_SPEED" And I set "scene.BIMWorkScheduleProperties.speed_animation_frames" to "7" And I set "scene.BIMWorkScheduleProperties.speed_real_duration" to "P1W" - And I press "bim.visualise_work_schedule_date_range(work_schedule=72)" + And I press "bim.visualise_work_schedule_date_range(work_schedule={work_schedule})" When I am on frame "1" Then "scene.objects.get('IfcWall/FromObject').color" is "[1.0, 1.0, 1.0, 1]" And "scene.objects.get('IfcWall/FromObject').hide_viewport" is "False" @@ -209,9 +218,11 @@ class TestVisualiseWorkScheduleDateRange(test.bim.bootstrap.NewFile): return """ Given an empty IFC project And I press "bim.add_work_schedule" - And I press "bim.enable_editing_tasks(work_schedule=72)" - And I press "bim.add_summary_task(work_schedule=72)" - And I press "bim.enable_editing_task_time(task=76)" + And the variable "work_schedule" is "IfcStore.get_file().by_type("IfcWorkSchedule")[0].id()" + And I press "bim.enable_editing_tasks(work_schedule={work_schedule})" + And I press "bim.add_summary_task(work_schedule={work_schedule})" + And the variable "task" is "IfcStore.get_file().by_type("IfcTask")[0].id()" + And I press "bim.enable_editing_task_time(task={task})" And I set "scene.BIMWorkScheduleProperties.task_time_attributes.get("ScheduleStart").string_value" to "2021-01-02" And I set "scene.BIMWorkScheduleProperties.task_time_attributes.get("ScheduleFinish").string_value" to "2021-01-06" And I press "bim.edit_task_time" @@ -220,13 +231,13 @@ class TestVisualiseWorkScheduleDateRange(test.bim.bootstrap.NewFile): And I set "scene.BIMRootProperties.ifc_class" to "IfcWall" And I press "bim.assign_class" And the object "IfcWall/Cube" is selected - And I press "bim.assign_process(task=76, related_object_type="PRODUCT", related_object='')" + And I press "bim.assign_process(task={task}, related_object_type="PRODUCT", related_object='')" And I set "scene.BIMWorkScheduleProperties.visualisation_start" to "01/01/21" And I set "scene.BIMWorkScheduleProperties.visualisation_finish" to "01/02/21" And I set "scene.BIMWorkScheduleProperties.speed_types" to "FRAME_SPEED" And I set "scene.BIMWorkScheduleProperties.speed_animation_frames" to "7" And I set "scene.BIMWorkScheduleProperties.speed_real_duration" to "P1W" - And I press "bim.visualise_work_schedule_date_range(work_schedule=72)" + And I press "bim.visualise_work_schedule_date_range(work_schedule={work_schedule})" When I am on frame "1" Then "scene.objects.get('IfcWall/Cube').color" is "[1.0, 1.0, 1.0, 1]" And "scene.objects.get('IfcWall/Cube').hide_viewport" is "False"