Index: shared/scripts/configuration/utility.py =================================================================== diff -u -rfb0cd1adaf0297a23ee5ef06cb9e1663ac7851af -r049da74584fa3b0d57eae735de41e3324fd122db --- shared/scripts/configuration/utility.py (.../utility.py) (revision fb0cd1adaf0297a23ee5ef06cb9e1663ac7851af) +++ shared/scripts/configuration/utility.py (.../utility.py) (revision 049da74584fa3b0d57eae735de41e3324fd122db) @@ -135,7 +135,7 @@ elif screen_title == SYSTEM_SELF_TEST_TITLE: parent_object = object.parent(squish.waitForObjectExists(names.o_system_self_test)) else: - parent_object = object.parent(squish.waitForObjectExists(names.Filter_Flush_Text)) + parent_object = object.parent(squish.waitForObjectExists(names.o_PreTreatmentBase_Filter_Flush_Text)) time_parent_children = object.children(parent_object) progress_circle_parent = time_parent_children[4] progress_circle_parent = object.children(progress_circle_parent) @@ -222,15 +222,15 @@ def get_text_object(screen_obj, txt): - names.text_object["container"] = screen_obj - names.text_object["text"] = txt - return names.text_object + names.o_text_object["container"] = screen_obj + names.o_text_object["text"] = txt + return names.o_text_object def get_bullet_object(screen_obj, num): - names.bullet_object["container"] = screen_obj - names.bullet_object["occurrence"] = num + 1 - return names.bullet_object + names.o_bullet_object["container"] = screen_obj + names.o_bullet_object["occurrence"] = num + 1 + return names.o_bullet_object Index: shared/scripts/names.py =================================================================== diff -u -rfb0cd1adaf0297a23ee5ef06cb9e1663ac7851af -r049da74584fa3b0d57eae735de41e3324fd122db --- shared/scripts/names.py (.../names.py) (revision fb0cd1adaf0297a23ee5ef06cb9e1663ac7851af) +++ shared/scripts/names.py (.../names.py) (revision 049da74584fa3b0d57eae735de41e3324fd122db) @@ -33,42 +33,6 @@ o_MainHome_MainHome = {"container": o_Gui_MainView, "objectName": "_MainHome", "type": "MainHome", "visible": True} o_standby_page = {"container": o_MainHome_MainHome, "type": "Column", "unnamed": 1, "visible": True} - - -#pre_treatment_water_sample - -o_Gui_MainView = {"type": "Gui::MainView", "unnamed": 1, "visible": True} -o_PreTreatmentStack_PreTreatmentStack = {"container": o_Gui_MainView, "objectName": "_PreTreatmentStack", "type": "PreTreatmentStack", "visible": True} -o_PreTreatmentStack_PreTreatmentSampleStack_PreTreatmentWaterSampleStack = {"container": o_PreTreatmentStack_PreTreatmentStack, "objectName": "_PreTreatmentSampleStack", "type": "PreTreatmentWaterSampleStack", "visible": True} -o_PreTreatmentSampleStack_PreTreatmentBase_TreatmentFlowBase = {"container": o_PreTreatmentStack_PreTreatmentSampleStack_PreTreatmentWaterSampleStack, "objectName": "_PreTreatmentBase", "type": "TreatmentFlowBase", "visible": True} -o_PreTreatmentBase_WATER_SAMPLE_Text = {"container": o_PreTreatmentSampleStack_PreTreatmentBase_TreatmentFlowBase, "text": "WATER SAMPLE", "type": "Text", "unnamed": 1, "visible": True} -o_PreTreatmentBase_NEXT_Text = {"container": o_PreTreatmentSampleStack_PreTreatmentBase_TreatmentFlowBase, "text": "FAIL", "type": "Text", "unnamed": 1, "visible": True} -o_PreTreatmentBase_Sample_Text = {"container": o_PreTreatmentSampleStack_PreTreatmentBase_TreatmentFlowBase, "text": "Sample", "type": "Text", "unnamed": 1, "visible": True} -o_PreTreatmentBase_headStepBullet_StepBullet = {"container": o_PreTreatmentSampleStack_PreTreatmentBase_TreatmentFlowBase, "id": "_headStepBullet", "type": "StepBullet", "unnamed": 1, "visible": True} -o_PreTreatmentBase_indicator_StepIndicator = {"container": o_PreTreatmentSampleStack_PreTreatmentBase_TreatmentFlowBase, "gradient": 0, "id": "_indicator", "type": "StepIndicator", "unnamed": 1, "visible": True} -o_PreTreatmentBase_FAIL_Text = {"container": o_PreTreatmentSampleStack_PreTreatmentBase_TreatmentFlowBase, "text": "OK", "type": "Text", "unnamed": 1, "visible": True} -o_PreTreatmentBase_PASS_Text = {"container": o_PreTreatmentSampleStack_PreTreatmentBase_TreatmentFlowBase, "text": "PASS", "type": "Text", "unnamed": 1, "visible": True} -o_PreTreatmentBase_BACK_Text = {"container": o_PreTreatmentSampleStack_PreTreatmentBase_TreatmentFlowBase, "text": "BACK", "type": "Text", "unnamed": 1, "visible": True} -o_PreTreatmentBase_OK_Text = {"container": o_PreTreatmentSampleStack_PreTreatmentBase_TreatmentFlowBase, "text": "OK", "type": "Text", "unnamed": 1, "visible": True} -o_PreTreatmentBase_TimeText = {"container": o_PreTreatmentSampleStack_PreTreatmentBase_TreatmentFlowBase, "id": "_shape", "type": "Shape", "unnamed": 1, "visible": True} -o_PreTreatmentBase_Filter_Flush_Text = {"container": o_PreTreatmentSampleStack_PreTreatmentBase_TreatmentFlowBase, "text": "Filter Flush", "type": "Text", "unnamed": 1, "visible": True} -o_PreTreatmentBase_rectangle_Rectangle = {"container": o_PreTreatmentSampleStack_PreTreatmentBase_TreatmentFlowBase, "id": "_rectangle", "type": "Rectangle", "unnamed": 1, "visible": True} -o_PreTreatmentBase_TimeText_hour_Text = {"container": o_PreTreatmentSampleStack_PreTreatmentBase_TreatmentFlowBase, "objectName": "_TimeText_hour", "type": "Text", "visible": True} -o_PreTreatmentBase_progressCircle_ProgressCircle = {"container": o_PreTreatmentSampleStack_PreTreatmentBase_TreatmentFlowBase, "id": "_progressCircle", "type": "ProgressCircle", "unnamed": 1, "visible": True} - -Time_text={"container": o_PreTreatmentSampleStack_PreTreatmentBase_TreatmentFlowBase, "objectName": "_TimeText", "type": "TimeText", "visible": True} -progress_circle={"container": o_PreTreatmentSampleStack_PreTreatmentBase_TreatmentFlowBase, "id": "_progressCircle", "type": "ProgressCircle", "unnamed": 1, "visible": True} -o_PreTreatmentBase_Create_Text = {"container": o_PreTreatmentSampleStack_PreTreatmentBase_TreatmentFlowBase, "text": "Create", "type": "Text", "unnamed": 1, "visible": True} -o_PreTreatmentBase_Disposables_Text = {"container": o_PreTreatmentSampleStack_PreTreatmentBase_TreatmentFlowBase, "text": "Disposables", "type": "Text", "unnamed": 1, "visible": True} -o_PreTreatmentBase_Prime_Text = {"container": o_PreTreatmentSampleStack_PreTreatmentBase_TreatmentFlowBase, "text": "Prime", "type": "Text", "unnamed": 1, "visible": True} -o_PreTreatmentBase_Ultrafiltration_Text = {"container": o_PreTreatmentSampleStack_PreTreatmentBase_TreatmentFlowBase, "text": "Ultrafiltration", "type": "Text", "unnamed": 1, "visible": True} -o_PreTreatmentBase_BP_HR_Text = {"container": o_PreTreatmentSampleStack_PreTreatmentBase_TreatmentFlowBase, "text": "BP/HR", "type": "Text", "unnamed": 1, "visible": True} -o_PreTreatmentBase_Connection_Text = {"container": o_PreTreatmentSampleStack_PreTreatmentBase_TreatmentFlowBase, "text": "Connection", "type": "Text", "unnamed": 1, "visible": True} -o_PreTreatmentBase_Start_Text = {"container": o_PreTreatmentSampleStack_PreTreatmentBase_TreatmentFlowBase, "text": "Start", "type": "Text", "unnamed": 1, "visible": True} -o_PreTreatmentBase_Consumables_Text = {"container": o_PreTreatmentSampleStack_PreTreatmentBase_TreatmentFlowBase, "text": "Consumables", "type": "Text", "unnamed": 1, "visible": True} - - - #in-treatment o_blood_priming = {"container": o_treatmentStack_TreatmentBloodPrime_ScreenItem, "text": "Blood Priming", "type": "Text", "unnamed": 1, "visible": True} o_blood_priming_value_by_default = {"container": o_treatmentStack_TreatmentBloodPrime_ScreenItem, "text": "0 mL", "type": "Text", "unnamed": 1, "visible": True} @@ -82,43 +46,44 @@ o_fluid_text = {"container": o_treatmentStack_treatmentHome_TreatmentHome, "text": "Volume Delivered", "type": "Text", "unnamed": 1, "visible": True} o_cumulative_fluid_text = {"container": o_treatmentStack_treatmentHome_TreatmentHome, "text": "Cumulative Delivered", "type": "Text", "unnamed": 1, "visible": True} -#Filter Flush +#Water Sample Pretreatment +#Filter Flush screen o_Gui_MainView = {"type": "Gui::MainView", "unnamed": 1, "visible": True} o_PreTreatmentStack_PreTreatmentStack = {"container": o_Gui_MainView, "objectName": "_PreTreatmentStack", "type": "PreTreatmentStack", "visible": True} o_PreTreatmentStack_PreTreatmentSampleStack_PreTreatmentWaterSampleStack = {"container": o_PreTreatmentStack_PreTreatmentStack, "objectName": "_PreTreatmentSampleStack", "type": "PreTreatmentWaterSampleStack", "visible": True} o_PreTreatmentSampleStack_PreTreatmentBase_TreatmentFlowBase = {"container": o_PreTreatmentStack_PreTreatmentSampleStack_PreTreatmentWaterSampleStack, "objectName": "_PreTreatmentBase", "type": "TreatmentFlowBase", "visible": True} -Filter_Flush_Text = {"container": o_PreTreatmentSampleStack_PreTreatmentBase_TreatmentFlowBase, "text": "Filter Flush", "type": "Text", "unnamed": 1, "visible": True} -o_filter_flush_progress = {"container": o_PreTreatmentSampleStack_PreTreatmentBase_TreatmentFlowBase, "objectName": "_TimeCircle", "type": "TimeCircle", "visible": True} +#Water sample sub screen +o_text_object = {"type": "Text", "unnamed": 1, "visible": True} +o_bullet_object = {"type": "StepBullet", "unnamed": 1, "visible": True} -#Water Sample Pretreatment -text_object = {"type": "Text", "unnamed": 1, "visible": True} -bullet_object = {"type": "StepBullet", "unnamed": 1, "visible": True} - o_Gui_MainView = {"type": "Gui::MainView", "unnamed": 1, "visible": True} -o_PreTreatmentStack_PreTreatmentStack = {"container": o_Gui_MainView, "objectName": "_PreTreatmentStack", "type": "PreTreatmentStack", "visible": True} -o_PreTreatmentStack_PreTreatmentSampleStack_PreTreatmentWaterSampleStack = {"container": o_PreTreatmentStack_PreTreatmentStack, "objectName": "_PreTreatmentSampleStack", "type": "PreTreatmentWaterSampleStack", "visible": True} -o_PreTreatmentSampleStack_PreTreatmentBase_TreatmentFlowBase = {"container": o_PreTreatmentStack_PreTreatmentSampleStack_PreTreatmentWaterSampleStack, "objectName": "_PreTreatmentBase", "type": "TreatmentFlowBase", "visible": True} +stacks_parent_parent = {"container": o_Gui_MainView, "objectName": "_PreTreatmentStack", "type": "PreTreatmentStack", "visible": True} +stack_parent = {"container": stacks_parent_parent, "id": "_stackView", "type": "StackView", "unnamed": 1, "visible": True} + +o_PreTreatmentStack_preTreatmentWaterSampleStack_PreTreatmentWaterSampleStack = {"container":stack_parent, "objectName": "_preTreatmentWaterSampleStack", "type": "PreTreatmentWaterSampleStack", "visible": True} +o_preTreatmentWaterSampleStack_PreTreatmentBase_TreatmentFlowBase_2 = {"container": o_PreTreatmentStack_preTreatmentWaterSampleStack_PreTreatmentWaterSampleStack, "objectName": "_PreTreatmentBase", "type": "TreatmentFlowBase", "visible": True} + #Filter flush title object -o_filter_flush_text = {"container": o_PreTreatmentSampleStack_PreTreatmentBase_TreatmentFlowBase, "text": "Filter Flush", "type": "Text", "unnamed": 1, "visible": True} +o_PreTreatmentBase_Filter_Flush_Text = {"container": o_preTreatmentWaterSampleStack_PreTreatmentBase_TreatmentFlowBase_2, "text": "Filter Flush", "type": "Text", "unnamed": 1, "visible": True} #Filter Flush Progress bar object -o_filter_flush_progress = {"container": o_PreTreatmentSampleStack_PreTreatmentBase_TreatmentFlowBase, "objectName": "_TimeCircle", "type": "TimeCircle", "visible": True} +o_filter_flush_progress_main = {"container": o_preTreatmentWaterSampleStack_PreTreatmentBase_TreatmentFlowBase_2, "objectName": "_TimeText", "type": "TimeText", "visible": True} +o_filter_flush_progress = {"container": o_preTreatmentWaterSampleStack_PreTreatmentBase_TreatmentFlowBase_2, "objectName": "_TimeCircle", "type": "TimeCircle", "visible": True} #Next Button object -o_next_button = {"container": o_Gui_MainView, "type": "Text", "unnamed": 1, "visible": True} +o_next_button = {"container": o_preTreatmentWaterSampleStack_PreTreatmentBase_TreatmentFlowBase_2, "text": "NEXT", "type": "Text", "unnamed": 1, "visible": True} #Water Sample button object -o_water_sample_button = {"container": o_PreTreatmentSampleStack_PreTreatmentBase_TreatmentFlowBase, "text": "WATER SAMPLE", "type": "Text", "unnamed": 1, "visible": True} +o_water_sample_button = {"container": o_preTreatmentWaterSampleStack_PreTreatmentBase_TreatmentFlowBase_2, "text": "WATER SAMPLE", "type": "Text", "unnamed": 1, "visible": True} #Back button object -o_back_button = {"container": o_Gui_MainView, "type": "Text", "unnamed": 1, "visible": True} +o_back_button = {"container": o_preTreatmentWaterSampleStack_PreTreatmentBase_TreatmentFlowBase_2, "text": "BACK", "type": "Text", "unnamed": 1, "visible": True} #Pass button object -o_pass_button = {"container": o_PreTreatmentSampleStack_PreTreatmentBase_TreatmentFlowBase, "text": "PASS", "type": "Text", "unnamed": 1, "visible": True} +o_pass_button = {"container": o_preTreatmentWaterSampleStack_PreTreatmentBase_TreatmentFlowBase_2, "text": "PASS", "type": "Text", "unnamed": 1, "visible": True} #Fail button object -o_fail_button = {"container": o_PreTreatmentSampleStack_PreTreatmentBase_TreatmentFlowBase, "text": "FAIL", "type": "Text", "unnamed": 1, "visible": True} +o_fail_button = {"container": o_preTreatmentWaterSampleStack_PreTreatmentBase_TreatmentFlowBase_2, "text": "FAIL", "type": "Text", "unnamed": 1, "visible": True} #Ok button object -o_ok_button = {"container": o_PreTreatmentSampleStack_PreTreatmentBase_TreatmentFlowBase, "text": "OK", "type": "Text", "unnamed": 1, "visible": True} +o_ok_button = {"container": o_preTreatmentWaterSampleStack_PreTreatmentBase_TreatmentFlowBase_2, "text": "OK", "type": "Text", "unnamed": 1, "visible": True} #Indicator Headstep bullet object -o_stephead_indicator = {"container": o_PreTreatmentSampleStack_PreTreatmentBase_TreatmentFlowBase, "id": "_headStepBullet", "occurrence": 2, "type": "StepBullet", "unnamed": 1, "visible": True} +o_stephead_indicator = {"container": o_preTreatmentWaterSampleStack_PreTreatmentBase_TreatmentFlowBase_2, "id": "_nextStepsBullet", "type": "StepBullet", "unnamed": 1, "visible": True} - Index: tst_pre_treatment_water_sample/test.py =================================================================== diff -u -rfb0cd1adaf0297a23ee5ef06cb9e1663ac7851af -r049da74584fa3b0d57eae735de41e3324fd122db --- tst_pre_treatment_water_sample/test.py (.../test.py) (revision fb0cd1adaf0297a23ee5ef06cb9e1663ac7851af) +++ tst_pre_treatment_water_sample/test.py (.../test.py) (revision 049da74584fa3b0d57eae735de41e3324fd122db) @@ -26,7 +26,7 @@ no_cartridge_self_test_state=0,installation_state=0, dry_self_test_state=0, prime_state=0,recirculate_state=0, patient_connection_state=0) - utility.page_step_indicator_verification(names.o_PreTreatmentSampleStack_PreTreatmentBase_TreatmentFlowBase,PRE_TREATMENT_STEP) + utility.page_step_indicator_verification(names.o_preTreatmentWaterSampleStack_PreTreatmentBase_TreatmentFlowBase_2,PRE_TREATMENT_STEP) test.compare(str(waitForObjectExists(names.o_water_sample_button).text), config.WATER_SAMPLE_BUTTON_TEXT,"Water Sample button text should be {}".format(config.WATER_SAMPLE_BUTTON_TEXT)) test.compare(waitForObjectExists(names.o_water_sample_button).enabled , True, "Water Sample button should be enabled") mouseClick(waitForObject(names.o_water_sample_button)) @@ -37,7 +37,7 @@ test.compare(waitForObjectExists(names.o_next_button).enabled , True,"Next button should be enabled") mouseClick(waitForObject(names.o_next_button)) - utility.page_step_indicator_verification(names.o_PreTreatmentSampleStack_PreTreatmentBase_TreatmentFlowBase,PRE_TREATMENT_STEP) + utility.page_step_indicator_verification(names.o_preTreatmentWaterSampleStack_PreTreatmentBase_TreatmentFlowBase_2,PRE_TREATMENT_STEP) test.compare(str(waitForObjectExists(names.o_pass_button).text), config.PASS_TEXT,"Pass button text should be {}".format(config.PASS_TEXT)) test.compare(waitForObjectExists(names.o_pass_button).enabled , True, "Pass button should be enabled") mouseClick(waitForObject(names.o_pass_button)) @@ -58,7 +58,7 @@ test.compare(waitForObjectExists(names.o_fail_button).enabled , True, "Fail button should be enabled") mouseClick(waitForObject(names.o_fail_button)) - utility.page_step_indicator_verification(names.o_PreTreatmentSampleStack_PreTreatmentBase_TreatmentFlowBase,PRE_TREATMENT_STEP) + utility.page_step_indicator_verification(names.o_preTreatmentWaterSampleStack_PreTreatmentBase_TreatmentFlowBase_2,PRE_TREATMENT_STEP) test.compare(str(waitForObjectExists(names.o_ok_button).text), config.OK_TEXT,"OK button text should be {}".format(config.OK_TEXT)) test.compare(waitForObjectExists(names.o_ok_button).enabled , True, "OK button should be enabled") mouseClick(waitForObject(names.o_ok_button)) @@ -70,8 +70,12 @@ startApplication(config.AUT_NAME) test.log("Navigating to Filter Flush screen") utility.navigate_to_pretreatment_screen(mode=1) - utility.page_step_indicator_verification(names.o_PreTreatmentSampleStack_PreTreatmentBase_TreatmentFlowBase,PRE_TREATMENT_STEP) + utility.page_step_indicator_verification(names.o_preTreatmentWaterSampleStack_PreTreatmentBase_TreatmentFlowBase_2,PRE_TREATMENT_STEP) utility.verify_the_countdown(config.FILTER_FLUSH_TITLE) - utility.page_step_indicator_verification(names.o_PreTreatmentSampleStack_PreTreatmentBase_TreatmentFlowBase,PRE_TREATMENT_STEP) verification_of_sample_water_state_screens() - utils.tstDone() \ No newline at end of file + utils.tstDone() + + + + + \ No newline at end of file