Index: tst_pre_treatment_disposables/test.py =================================================================== diff -u -rc79559a8ecd6dc676c7aed956ba1a5d1e45534a0 -re3f67a6e78d267bb99596ba1ce439c6fe7d89a25 --- tst_pre_treatment_disposables/test.py (.../test.py) (revision c79559a8ecd6dc676c7aed956ba1a5d1e45534a0) +++ tst_pre_treatment_disposables/test.py (.../test.py) (revision e3f67a6e78d267bb99596ba1ce439c6fe7d89a25) @@ -16,6 +16,7 @@ from configuration import config from configuration import utility +from configuration import application_init from dialin.ui import utils from dialin.ui.hd_simulator import HDSimulator from dialin.ui.dg_simulator import DGSimulator @@ -38,7 +39,7 @@ NUM_OF_SALINE_BAG_SCREENS = 4 CARTRIDGE_INSTALLATION_TEXT = "Open the front panel door." CARTRIDGE_CONNECTION_TEXT = "Connect arterial and venous bloodlines using the recirculation connector." -HEPARIN_SYRINGE_TEXT = "Fill a syringe with heparin and connect the cartridge heparin tubing line." +HEPARIN_SYRINGE_TEXT = "Fill a syringe with {77:2:mL:1} heparin and connect to the heparin tubing line." # The {} will be replaced using utility.get_heparin_string_with_mock() in testcases time_interval = "25min" BP_HR_PRE_TREATMENT_STEPS = 6 @@ -85,6 +86,7 @@ test.startSection("verifying right arrow functionality and verify the status of left, 'BACK', 'NEXT' and 'CONFIRM' button if available") utility.verify_missing_object(names.o_disposable_leftImage_Image) for indicator in range(1, num_of_instruction, 1): + utils.waitForGUI(0.5) verify_bullet_navigation(indicator, num_of_instruction) if screen == SALINE_BAG or screen == HEPARIN_SYRINGE: verify_confirm_button(config.DISABLED) @@ -144,16 +146,16 @@ """ test.startSection("instruction bullet verification for screens") for instruction in range(1, num_of_instruction): - bullet_children = object.children(waitForObjectExists(utility.get_bullet_object(SCREEN_OBJ,(NUM_OF_PRETREATMENT_BULLETS ) - 1))) + bullet_children = object.children(waitForObjectExists(utility.get_bullet_object(SCREEN_OBJ,(NUM_OF_PRETREATMENT_BULLETS )))) bullet_circle_color = bullet_children[0].color.name bullet_border_color = bullet_children[0].border.color.name if instruction <= num: test.compare(bullet_circle_color, config.COMPLETE_COLOR) test.compare(bullet_border_color, config.COMPLETE_COLOR) test.log(str(instruction) + " Complete bullet") else: - test.compare(bullet_circle_color, config.CURRENT_COLOR) - test.compare(bullet_border_color, config.INCOMPLETE_COLOR) + test.compare(bullet_circle_color, config.CURRENT_INSTRUCTION_COLOR) + test.compare(bullet_border_color, config.INCOMPLETE_INSTRUCTION_COLOR) test.log(str(instruction) + " Incomplete bullet") test.endSection() @@ -588,6 +590,7 @@ def main(): utils.tstStart(__file__) + application_init.setup_post_log_successful_start() startApplication(config.AUT_NAME) verify_disposables_screen()