Index: shared/scripts/names.py =================================================================== diff -u -r3002a441527d3a164aa29ee0546201bd1c8c3198 -r6d88f1200865d51375bb323667e8204d1745a3cb --- shared/scripts/names.py (.../names.py) (revision 3002a441527d3a164aa29ee0546201bd1c8c3198) +++ shared/scripts/names.py (.../names.py) (revision 6d88f1200865d51375bb323667e8204d1745a3cb) @@ -168,7 +168,7 @@ o_continue_button = {"container": o_PreTreatmentCreateStack_PreTreatmentBase_TreatmentFlowBase, "text": "CONTINUE", "type": "Text", "unnamed": 1, "visible": True} o_PreTreatmentBase_swipeview_SwipeView = {"container": o_PreTreatmentStack_preTreatmentDisposablesStack_PreTreatmentDisposablesStack, "id": "_swipeview", "type": "SwipeView", "unnamed": 1, "visible": True} o_cartridge_installation_screen1_text = {"container": o_PreTreatmentBase_swipeview_SwipeView, "text": "Open the front panel door.", "type": "Text", "unnamed": 1, "visible": True} -o_heparin_syringe_screen1_text = {"container": o_PreTreatmentBase_swipeview_SwipeView, "text": "Fill a syringe with heparin and connect the cartridge heparin tubing line. \nInsert syringe into infusion pump housing.", "type": "Text", "unnamed": 1, "visible": True} +o_heparin_syringe_screen1_text = {"container": o_PreTreatmentBase_swipeview_SwipeView, "text": "Fill a syringe with heparin and connect the cartridge heparin tubing line.", "type": "Text", "unnamed": 1, "visible": True} o_cartridge_connection_screen1_text = {"container": o_PreTreatmentBase_swipeview_SwipeView, "text": "Connect the cartridge blood lines to the dialyzer.", "type": "Text", "unnamed": 1, "visible": True} #Create Custom treatment Index: tst_pre_treatment_disposables/test.py =================================================================== diff -u -r3002a441527d3a164aa29ee0546201bd1c8c3198 -r6d88f1200865d51375bb323667e8204d1745a3cb --- tst_pre_treatment_disposables/test.py (.../test.py) (revision 3002a441527d3a164aa29ee0546201bd1c8c3198) +++ tst_pre_treatment_disposables/test.py (.../test.py) (revision 6d88f1200865d51375bb323667e8204d1745a3cb) @@ -37,7 +37,7 @@ NUM_OF_SALINE_BAG_SCREENS = 3 CARTRIDGE_INSTALLATION_TEXT = "Open the front panel door." CARTRIDGE_CONNECTION_TEXT = "Connect the cartridge blood lines to the dialyzer." -HEPARIN_SYRINGE_TEXT = "Fill a syringe with heparin and connect the cartridge heparin tubing line. \nInsert syringe into infusion pump housing." +HEPARIN_SYRINGE_TEXT = "Fill a syringe with heparin and connect the cartridge heparin tubing line." time_interval = "25min" BP_HR_PRE_TREATMENT_STEPS = 6 @@ -232,7 +232,7 @@ @param condition - (bool) True/False """ test.startSection("Verifying the availability 'CONFIRM' button verify the status of the same") - if object.exists(names.o_next_button_text): + if object.exists(names.o_confirm_button_text): test.compare(str(waitForObjectExists(names.o_confirm_button_text).text), config.CONFIRM_BUTTON_TEXT,"'CONFIRM' button text should be {}".format(config.CONFIRM_BUTTON_TEXT)) if condition: test.compare(waitForObjectExists(names.o_confirm_button_text).enabled , condition, "'CONFIRM' button should be enabled") @@ -291,6 +291,8 @@ and 'NEXT', 'BACK' and 'CONFIRM' button """ test.startSection("Verifying functionality of the heparin syringe") + verify_right_instruction_navigation(NUM_OF_HEPARIN_SYRINGE_SCREENS, HEPARIN_SYRINGE) + verify_left_instruction_navigation(NUM_OF_HEPARIN_SYRINGE_SCREENS, HEPARIN_SYRINGE) click_on_back_button() verify_cartridge_connection_first_screen_displayed() click_on_back_button() @@ -299,7 +301,9 @@ click_on_next_button() verify_right_instruction_navigation(NUM_OF_CARTRIDGE_CONNECTION_SCREENS, CARTRIDGE_CONNECTION) click_on_next_button() + verify_right_instruction_navigation(NUM_OF_HEPARIN_SYRINGE_SCREENS, HEPARIN_SYRINGE) verify_next_button(config.ENABLED) + click_on_next_button() test.endSection() def verify_functionality_for_saline_bag(): @@ -309,7 +313,6 @@ and 'NEXT', 'BACK' and 'CONFIRM' button """ test.startSection("Verifying functionality of the saline bag") - click_on_next_button() verify_right_instruction_navigation(NUM_OF_SALINE_BAG_SCREENS, SALINE_BAG) verify_left_instruction_navigation(NUM_OF_SALINE_BAG_SCREENS, SALINE_BAG) click_on_back_button()