Index: tst_pre_treatment_priming/test.py =================================================================== diff -u -r2e73714b63ae5fd2ef8b5acca5043e136454feff -rc79559a8ecd6dc676c7aed956ba1a5d1e45534a0 --- tst_pre_treatment_priming/test.py (.../test.py) (revision 2e73714b63ae5fd2ef8b5acca5043e136454feff) +++ tst_pre_treatment_priming/test.py (.../test.py) (revision c79559a8ecd6dc676c7aed956ba1a5d1e45534a0) @@ -13,7 +13,7 @@ import names from configuration import config, utility -from dialin.common.hd_defs import PreTreatmentSubModes, HDOpModes, HDStandbyStates, PreTreatmentSampleWaterStates, PreTreatmentConsumableSelfTestStates, PreTreatmentNoCartSelfTestStates, PreTreatmentCartridgeInstallStates, PreTreatmentDrySelfTestsStates, PreTreatmentPrimeStates, PreTreatmentRecircStates, PreTreatmentPatientConnectionStates, PreTreatmentWetSelfTestStates +from dialin.common.hd_defs import PreTreatmentSubModes, HDOpModes, HDStandbyStates, PreTreatmentSampleWaterStates, PreTreatmentConsumableSelfTestStates, PreTreatmentNoCartSelfTestStates, PreTreatmentCartridgeInstallStates, PreTreatmentDrySelfTestsStates, PreTreatmentPrimeStates, PreTreatmentRecircStates, PreTreatmentPatientConnectionStates, PreTreatmentWetSelfTestStates, HDPreTreatmentReservoirMgmtStates from dialin.hd.reservoirs import HDReservoirStates from dialin.ui import utils from dialin.ui.hd_simulator import HDSimulator @@ -53,9 +53,11 @@ prime_state=PreTreatmentPrimeStates.HD_PRIME_WAIT_FOR_USER_START_STATE.value,recirculate_state=PreTreatmentRecircStates.PRE_TREATMENT_RECIRC_STATE.value, patient_connection_state=PreTreatmentPatientConnectionStates.PRE_TREATMENT_PAT_CONN_WAIT_FOR_UF_VOL_STATE.value, wet_selftests_state=PreTreatmentWetSelfTestStates.WET_SELF_TESTS_START_STATE.value, pretreatment_rsrvr_state=HDReservoirStates.TREATMENT_RESERVOIR_MGMT_START_STATE.value) - title = (waitForObjectExists(utility.self_test_dry_check_list_text(config.BEGIN_PRIME_TITLE))).text - test.compare(title, config.BEGIN_PRIME_TITLE, "{} title should be displayed when user is navigating to self test dry screen".format(config.BEGIN_PRIME_TITLE)) - utility.verify_page_step_indicator(names.o_PreTreatmentStack_pretreatmentPrimeStack_PreTreatmentPrimeStack, PRE_TREATMENT_STEP, config.PRE_TREATMENT_SCREENS) + # title = (waitForObjectExists(utility.self_test_dry_check_list_text(config.BEGIN_PRIME_TITLE))).text + # + # test.compare(title, config.BEGIN_PRIME_TITLE, "{} title should be displayed when user is navigating to self test dry screen".format(config.BEGIN_PRIME_TITLE)) + SCREEN_OBJ = names.o_PreTreatmentStack_pretreatmentPrimeStack_PreTreatmentPrimeStack + utility.verify_page_step_indicator(SCREEN_OBJ, PRE_TREATMENT_STEP, config.PRE_TREATMENT_SCREENS) test.endSection() @@ -65,17 +67,25 @@ screen and verify the 'Priming' title is displayed """ - test.startSection("Navigating to priming screen and verify the begin 'Priming' title is displayed") - hd_simulator.cmd_send_pre_treatment_state_data(sub_mode=PreTreatmentSubModes.HD_PRE_TREATMENT_PRIME_STATE.value, water_sample_state=PreTreatmentSampleWaterStates.SAMPLE_WATER_SETUP_STATE.value,consumables_self_test_state=PreTreatmentConsumableSelfTestStates.CONSUMABLE_SELF_TESTS_INSTALL_STATE.value, - no_cartridge_self_test_state=PreTreatmentNoCartSelfTestStates.NO_CART_SELF_TESTS_START_STATE.value,installation_state=PreTreatmentCartridgeInstallStates.CARTRIDGE_INSTALL_STATE.value, dry_self_test_state=PreTreatmentDrySelfTestsStates.DRY_SELF_TESTS_START_STATE.value, - prime_state=PreTreatmentPrimeStates.HD_PRIME_START_STATE.value,recirculate_state=PreTreatmentRecircStates.PRE_TREATMENT_RECIRC_STATE.value, patient_connection_state=PreTreatmentPatientConnectionStates.PATIENT_CONNECTION_STATE.value) - + # test.startSection("Navigating to priming screen and verify the begin 'Priming' title is displayed") + # hd_simulator.cmd_send_pre_treatment_state_data(sub_mode=PreTreatmentSubModes.HD_PRE_TREATMENT_PRIME_STATE.value, water_sample_state=PreTreatmentSampleWaterStates.SAMPLE_WATER_SETUP_STATE.value,consumables_self_test_state=PreTreatmentConsumableSelfTestStates.CONSUMABLE_SELF_TESTS_INSTALL_STATE.value, + # no_cartridge_self_test_state=PreTreatmentNoCartSelfTestStates.NO_CART_SELF_TESTS_HOME_IDLE_STATE.value,installation_state=PreTreatmentCartridgeInstallStates.CARTRIDGE_INSTALL_STATE.value, dry_self_test_state=PreTreatmentDrySelfTestsStates.DRY_SELF_TESTS_START_STATE.value, + # prime_state=PreTreatmentPrimeStates.HD_PRIME_WAIT_FOR_USER_START_STATE.value,recirculate_state=PreTreatmentRecircStates.PRE_TREATMENT_RECIRC_STATE.value, patient_connection_state=PreTreatmentPatientConnectionStates.PRE_TREATMENT_PAT_CONN_WAIT_FOR_USER_CONFIRM_STATE.value, + # wet_selftests_state = PreTreatmentWetSelfTestStates.WET_SELF_TESTS_START_STATE.value, + # pretreatment_rsrvr_state = HDPreTreatmentReservoirMgmtStates.PRE_TREATMENT_RESERVOIR_MGMT_START_STATE.value) + test.startSection("Navigating to self test dry screen and verify the 'Begin Prime' title is displayed") + hd_simulator.cmd_set_hd_operation_mode_data(HDOpModes.MODE_PRET.value,PreTreatmentPrimeStates.HD_PRIME_WAIT_FOR_USER_START_STATE .value) + hd_simulator.cmd_send_pre_treatment_state_data(sub_mode=HDOpModes.MODE_PRET.value, water_sample_state=PreTreatmentSampleWaterStates.SAMPLE_WATER_SETUP_STATE.value,consumables_self_test_state=PreTreatmentConsumableSelfTestStates.CONSUMABLE_SELF_TESTS_INSTALL_STATE.value, + no_cartridge_self_test_state=PreTreatmentNoCartSelfTestStates.NO_CART_SELF_TESTS_WAIT_FOR_DOOR_CLOSE_STATE.value,installation_state=PreTreatmentCartridgeInstallStates.CARTRIDGE_INSTALL_STATE.value, dry_self_test_state=PreTreatmentDrySelfTestsStates.DRY_SELF_TESTS_START_STATE.value, + prime_state=PreTreatmentPrimeStates.HD_PRIME_WAIT_FOR_USER_START_STATE.value,recirculate_state=PreTreatmentRecircStates.PRE_TREATMENT_RECIRC_STATE.value, patient_connection_state=PreTreatmentPatientConnectionStates.PRE_TREATMENT_PAT_CONN_WAIT_FOR_UF_VOL_STATE.value, + wet_selftests_state=PreTreatmentWetSelfTestStates.WET_SELF_TESTS_START_STATE.value, pretreatment_rsrvr_state=HDReservoirStates.TREATMENT_RESERVOIR_MGMT_START_STATE.value) + title = (waitForObject(utility.self_test_dry_check_list_text(config.PRIMING_TITLE))).text test.compare(title, config.PRIMING_TITLE, "{} title should be displayed when user is navigating to 'Priming' screen".format(config.PRIMING_TITLE)) utility.verify_page_step_indicator(names.o_PreTreatmentStack_pretreatmentPrimeStack_PreTreatmentPrimeStack, PRE_TREATMENT_STEP, config.PRE_TREATMENT_SCREENS) test.endSection() - - + + def verify_dry_states(): """ Method to simulating different states @@ -85,9 +95,17 @@ test.startSection("Simulating different states of self dry test and verifying the busy and check indicator") for state, index in SELF_TEST_DRY_STATES.items(): test.startSection("Passing {} state".format(state)) - hd_simulator.cmd_send_pre_treatment_state_data(sub_mode=HDOpModes.MODE_PRET.value, water_sample_state=PreTreatmentSampleWaterStates.SAMPLE_WATER_SETUP_STATE.value,consumables_self_test_state=PreTreatmentConsumableSelfTestStates.CONSUMABLE_SELF_TESTS_INSTALL_STATE.value, - no_cartridge_self_test_state=PreTreatmentNoCartSelfTestStates.NO_CART_SELF_TESTS_START_STATE.value,installation_state=PreTreatmentCartridgeInstallStates.CARTRIDGE_INSTALL_STATE.value, dry_self_test_state=index, - prime_state=PreTreatmentPrimeStates.HD_PRIME_START_STATE.value,recirculate_state=PreTreatmentRecircStates.PRE_TREATMENT_RECIRC_STATE.value, patient_connection_state=PreTreatmentPatientConnectionStates.PATIENT_CONNECTION_STATE.value) + hd_simulator.cmd_send_pre_treatment_state_data(sub_mode=HDOpModes.MODE_PRET.value, + water_sample_state=PreTreatmentSampleWaterStates.SAMPLE_WATER_SETUP_STATE.value, + consumables_self_test_state=PreTreatmentConsumableSelfTestStates.CONSUMABLE_SELF_TESTS_INSTALL_STATE.value, + no_cartridge_self_test_state=PreTreatmentNoCartSelfTestStates.NO_CART_SELF_TESTS_HOME_IDLE_STATE.value, + installation_state=PreTreatmentCartridgeInstallStates.CARTRIDGE_INSTALL_STATE.value, + dry_self_test_state=index, + prime_state=PreTreatmentPrimeStates.HD_PRIME_WAIT_FOR_USER_START_STATE.value, + recirculate_state=PreTreatmentRecircStates.PRE_TREATMENT_RECIRC_STATE.value, + patient_connection_state=PreTreatmentPatientConnectionStates.PRE_TREATMENT_PAT_CONN_WAIT_FOR_USER_CONFIRM_STATE.value, + wet_selftests_state = PreTreatmentWetSelfTestStates.WET_SELF_TESTS_START_STATE.value, + pretreatment_rsrvr_state = HDPreTreatmentReservoirMgmtStates.PRE_TREATMENT_RESERVOIR_MGMT_START_STATE.value) if (state == "DRY_SELF_TESTS_STATE") or (state == "DRY_SELF_TESTS_WAIT_FOR_DOOR_CLOSE_STATE"): verify_indicators(None, config.TEST_DRY_STEPS) @@ -131,8 +149,11 @@ for state, index in RECIRCULATE_STATES.items(): test.startSection("Passing {} state".format(state)) hd_simulator.cmd_send_pre_treatment_state_data(sub_mode=PreTreatmentSubModes.HD_PRE_TREATMENT_RECIRCULATE_STATE.value, water_sample_state=PreTreatmentSampleWaterStates.SAMPLE_WATER_SETUP_STATE.value,consumables_self_test_state=PreTreatmentConsumableSelfTestStates.CONSUMABLE_SELF_TESTS_INSTALL_STATE.value, - no_cartridge_self_test_state=PreTreatmentNoCartSelfTestStates.NO_CART_SELF_TESTS_START_STATE.value,installation_state=PreTreatmentCartridgeInstallStates.CARTRIDGE_INSTALL_STATE.value, dry_self_test_state=PreTreatmentDrySelfTestsStates.DRY_SELF_TESTS_START_STATE.value, - prime_state=PreTreatmentPrimeStates.HD_PRIME_START_STATE.value,recirculate_state=index, patient_connection_state=PreTreatmentPatientConnectionStates.PATIENT_CONNECTION_STATE.value) + no_cartridge_self_test_state=PreTreatmentNoCartSelfTestStates.NO_CART_SELF_TESTS_HOME_IDLE_STATE.value,installation_state=PreTreatmentCartridgeInstallStates.CARTRIDGE_INSTALL_STATE.value, dry_self_test_state=PreTreatmentDrySelfTestsStates.DRY_SELF_TESTS_START_STATE.value, + prime_state=PreTreatmentPrimeStates.HD_PRIME_WAIT_FOR_USER_START_STATE.value,recirculate_state=index, patient_connection_state=PreTreatmentPatientConnectionStates.PRE_TREATMENT_PAT_CONN_WAIT_FOR_USER_CONFIRM_STATE.value, + wet_selftests_state = PreTreatmentWetSelfTestStates.WET_SELF_TESTS_START_STATE.value, + pretreatment_rsrvr_state = HDPreTreatmentReservoirMgmtStates.PRE_TREATMENT_RESERVOIR_MGMT_START_STATE.value) + verify_indicators(config.CHECK, "Blood Circuit Priming") verify_indicators(config.CHECK, "Dialysate Circuit Priming") @@ -154,8 +175,10 @@ for state, index in PRIMING_STATES.items(): test.startSection("Passing {} state".format(state)) hd_simulator.cmd_send_pre_treatment_state_data(sub_mode=PreTreatmentSubModes.HD_PRE_TREATMENT_PRIME_STATE.value, water_sample_state=PreTreatmentSampleWaterStates.SAMPLE_WATER_SETUP_STATE.value,consumables_self_test_state=PreTreatmentConsumableSelfTestStates.CONSUMABLE_SELF_TESTS_INSTALL_STATE.value, - no_cartridge_self_test_state=PreTreatmentNoCartSelfTestStates.NO_CART_SELF_TESTS_START_STATE.value,installation_state=PreTreatmentCartridgeInstallStates.CARTRIDGE_INSTALL_STATE.value, dry_self_test_state=PreTreatmentDrySelfTestsStates.DRY_SELF_TESTS_START_STATE.value, - prime_state=index,recirculate_state=PreTreatmentRecircStates.PRE_TREATMENT_RECIRC_STATE.value, patient_connection_state=PreTreatmentPatientConnectionStates.PATIENT_CONNECTION_STATE.value) + no_cartridge_self_test_state=PreTreatmentNoCartSelfTestStates.NO_CART_SELF_TESTS_HOME_IDLE_STATE.value,installation_state=PreTreatmentCartridgeInstallStates.CARTRIDGE_INSTALL_STATE.value, dry_self_test_state=PreTreatmentDrySelfTestsStates.DRY_SELF_TESTS_START_STATE.value, + prime_state=index,recirculate_state=PreTreatmentRecircStates.PRE_TREATMENT_RECIRC_STATE.value, patient_connection_state=PreTreatmentPatientConnectionStates.PRE_TREATMENT_PAT_CONN_WAIT_FOR_USER_CONFIRM_STATE.value, + wet_selftests_state = PreTreatmentWetSelfTestStates.WET_SELF_TESTS_START_STATE.value, + pretreatment_rsrvr_state = HDPreTreatmentReservoirMgmtStates.PRE_TREATMENT_RESERVOIR_MGMT_START_STATE.value) if (state == "HD_PRIME_START_STATE") or (state == "HD_PRIME_WAIT_FOR_USER_START_STATE") : verify_indicators(None, config.PRIMING_STEPS) @@ -259,8 +282,12 @@ test.startSection("Verifying the 'Start Prime' button is enabled or disabled") start_prime_btn = waitForObjectExists(names.o_start_prime_btn) if expected_state: - test.compare(start_prime_btn.enabled, config.ENABLED, "'Start Prime' should be enabled") - mouseClick(waitForObjectExists(names.o_preTreatmentDisposablesPrime_startPrimeButton_TouchRect)) + if object.exists(names.o_preTreatmentDisposablesPrime_startPrimeButton_TouchRect): + testPassed = test.compare(start_prime_btn.enabled, config.ENABLED, "'Start Prime' should be enabled") + if testPassed: + mouseClick(waitForObjectExists(names.o_preTreatmentDisposablesPrime_startPrimeButton_TouchRect)) + else: + test.fail("Start prime button does not exist") else: test.compare(start_prime_btn.enabled, config.DISABLED, "'Start Prime' should be disabled") test.endSection() @@ -286,13 +313,13 @@ utils.tstStart(__file__) startApplication(config.AUT_NAME) - test.startSection("Verifying 'Self Dry Test' screen") - navigate_self_test_dry_screen() - utility.verify_countdown(config.BEGIN_PRIME_TITLE, config.TIME_OUT_DURATION_100, hd_simulator, dg_simulator) - utility.verify_countdown(config.BEGIN_PRIME_TITLE, config.TIME_OUT_DURATION_200, hd_simulator, dg_simulator) - utility.verify_countdown(config.BEGIN_PRIME_TITLE, config.TIME_OUT_DURATION_300, hd_simulator, dg_simulator) - verify_dry_states() - test.endSection() + # test.startSection("Verifying 'Self Dry Test' screen") + # navigate_self_test_dry_screen() + # # utility.verify_countdown(config.BEGIN_PRIME_TITLE, config.TIME_OUT_DURATION_100, hd_simulator, dg_simulator) + # # utility.verify_countdown(config.BEGIN_PRIME_TITLE, config.TIME_OUT_DURATION_200, hd_simulator, dg_simulator) + # # utility.verify_countdown(config.BEGIN_PRIME_TITLE, config.TIME_OUT_DURATION_300, hd_simulator, dg_simulator) + # verify_dry_states() + # test.endSection() test.startSection("Verifying 'Priming' screen") navigate_to_priming_screen()