Index: tst_pre_treatment_priming/test.py =================================================================== diff -u -r11de8286fb08a96a491dd6b1e8b92953987f76dc -raf34c2149fa2bf13e1df4c6f91888194c937f223 --- tst_pre_treatment_priming/test.py (.../test.py) (revision 11de8286fb08a96a491dd6b1e8b92953987f76dc) +++ tst_pre_treatment_priming/test.py (.../test.py) (revision af34c2149fa2bf13e1df4c6f91888194c937f223) @@ -9,20 +9,14 @@ # file tst_pre_treatment_priming # date 03/31/2022 # author Papiya Mandal -# -# NOTE: -# This test contradicts verification of saline bolus data and ultrafilteration(uf) of In-treatment -# section import names + from configuration import config, utility -from dialin.common.hd_defs import PreTreatmentSubModes +from dialin.common.hd_defs import PreTreatmentSubModes, HDOpModes, HDOpSubModes, PreTreatmentSampleWaterStates, PreTreatmentConsumableSelfTestStates, PreTreatmentNoCartSelfTestsStates, PreTreatmentCartridgeInstallStates, PreTreatmentDrySelfTestsStates, PreTreatmentPrimeStates, PreTreatmentRecircStates, PreTreatmentPatientConnectionStates from dialin.ui import utils from dialin.ui.hd_simulator import HDSimulator from dialin.ui.dg_simulator import DGSimulator -from configuration.config import TIME_OUT_DURATION_100, TIME_OUT_DURATION_200,\ - TIME_OUT_DURATION_300 -from dialin.common.hd_defs import HDOpModes, HDOpSubModes, PreTreatmentSampleWaterStates, PreTreatmentConsumableSelfTestStates, PreTreatmentNoCartSelfTestsStates, PreTreatmentCartridgeInstallStates, PreTreatmentDrySelfTestsStates, PreTreatmentPrimeStates, PreTreatmentRecircStates, PreTreatmentPatientConnectionStates hd_simulator = HDSimulator() dg_simulator = DGSimulator() @@ -32,7 +26,7 @@ "DRY_SELF_TESTS_USED_CARTIDGE_CHECK_STATE": 2, "DRY_SELF_TESTS_OCCLUSION_SENSORS_STATE": 3, "DRY_SELF_TESTS_PRESSURE_SENSORS_SETUP_STATE" : 4, "DRY_SELF_TESTS_PRESSURE_SENSORS_STATE" : 5, "DRY_SELF_TESTS_PRESSURE_SENSORS_NORMAL_STATE" : 6, "DRY_SELF_TESTS_SYRINGE_PUMP_PRIME_STATE" : 7, - "DRY_SELF_TESTS__SYRINGE_PUMP_OCCLUSION_DETECTION_STATE" : 8, + "DRY_SELF_TESTS_SYRINGE_PUMP_OCCLUSION_DETECTION_STATE" : 8, "DRY_SELF_TESTS_STOPPED_STATE" : 9, "DRY_SELF_TESTS_COMPLETE_STATE" : 10} PRIMING_STATES = {"HD_PRIME_START_STATE" : 0, "HD_PRIME_WAIT_FOR_USER_START_STATE" : 1, "HD_PRIME_SALINE_SETUP_STATE" : 2, "HD_PRIME_SALINE_PURGE_AIR_STATE" : 3, @@ -41,11 +35,8 @@ "HD_PRIME_SALINE_DIALYSER_STATE": 8, "HD_PRIME_RESERVOIR_TWO_FILL_COMPLETE_STATE" : 9, "HD_PRIME_DIALYSATE_BYPASS_STATE" : 10, "HD_PRIME_WET_SELF_TESTS_STATE" : 11, "HD_PRIME_PAUSE" : 12, "HD_PRIME_COMPLETE" :13} -RECIRCULATE_STATES = {"PRE_TREATMENT_RECIRC_STATE" : 0, "PRE_TREATMENT_RECIRC_STOPPED_STATE" : 1} -TEST_DRY_STEPS = ["Used Cartridge Check", "Occlusion Sensors Check", "Pressure Sensors Check", "Syringe Pump Check"] -PRIMING_STEPS = ["Blood Circuit Priming", "Dialysate Circuit Priming", "Wet Self Tests"] -SELF_TEST_COMPLETION_MSG = "Self Test Complete!" -PRIMING_COMPLETE_MSG = "Priming Complete!" +RECIRCULATE_STATES = {"PRE_TREATMENT_RECIRC_STATE" : PreTreatmentRecircStates.PRE_TREATMENT_RECIRC_STATE.value, "PRE_TREATMENT_RECIRC_STOPPED_STATE" : PreTreatmentRecircStates.PRE_TREATMENT_RECIRC_STOPPED_STATE.value} + def navigate_self_test_dry_screen(): @@ -97,7 +88,7 @@ prime_state=PreTreatmentPrimeStates.HD_PRIME_START_STATE.value,recirculate_state=PreTreatmentRecircStates.PRE_TREATMENT_RECIRC_STATE.value, patient_connection_state=PreTreatmentPatientConnectionStates.PATIENT_CONNECTION_STATE.value) if (state == "DRY_SELF_TESTS_STATE") or (state == "DRY_SELF_TESTS_WAIT_FOR_DOOR_CLOSE_STATE"): - verify_indicators(None, TEST_DRY_STEPS) + verify_indicators(None, config.TEST_DRY_STEPS) elif state == "DRY_SELF_TESTS_USED_CARTIDGE_CHECK_STATE": verify_indicators(config.BUSY, "Used Cartridge Check") elif state == "DRY_SELF_TESTS_OCCLUSION_SENSORS_STATE": @@ -112,18 +103,18 @@ verify_indicators(config.CHECK, "Occlusion Sensors Check") verify_indicators(config.CHECK, "Pressure Sensors Check") verify_indicators(config.BUSY, "Syringe Pump Check") - elif (state == "DRY_SELF_TESTS__SYRINGE_PUMP_OCCLUSION_DETECTION_STATE") or (state == "DRY_SELF_TESTS_STOPPED_STATE"): + elif (state == "DRY_SELF_TESTS_SYRINGE_PUMP_OCCLUSION_DETECTION_STATE") or (state == "DRY_SELF_TESTS_STOPPED_STATE"): verify_indicators(config.CHECK, "Used Cartridge Check") verify_indicators(config.CHECK, "Occlusion Sensors Check") verify_indicators(config.CHECK, "Pressure Sensors Check") verify_indicators(config.CHECK, "Syringe Pump Check") - verify_completion_message_and_indicator(False, SELF_TEST_COMPLETION_MSG) + verify_completion_message_and_indicator(False, config.SELF_TEST_COMPLETION_MSG) else: verify_indicators(config.CHECK, "Used Cartridge Check") verify_indicators(config.CHECK, "Occlusion Sensors Check") verify_indicators(config.CHECK, "Pressure Sensors Check") verify_indicators(config.CHECK, "Syringe Pump Check") - verify_completion_message_and_indicator(True, SELF_TEST_COMPLETION_MSG) + verify_completion_message_and_indicator(True, config.SELF_TEST_COMPLETION_MSG) test.endSection() test.endSection() @@ -144,7 +135,7 @@ verify_indicators(config.CHECK, "Blood Circuit Priming") verify_indicators(config.CHECK, "Dialysate Circuit Priming") verify_indicators(config.BUSY, "Wet Self Tests") - verify_completion_message_and_indicator(True, PRIMING_COMPLETE_MSG) + verify_completion_message_and_indicator(True, config.PRIMING_COMPLETE_MSG) verify_continue_button(config.ENABLED) mouseClick(waitForObjectExists(names.o_continue_btn)) hd_simulator.cmd_send_hd_general_response(101, config.ACCEPTED, 0) @@ -165,7 +156,7 @@ prime_state=index,recirculate_state=PreTreatmentRecircStates.PRE_TREATMENT_RECIRC_STATE.value, patient_connection_state=PreTreatmentPatientConnectionStates.PATIENT_CONNECTION_STATE.value) if (state == "HD_PRIME_START_STATE") or (state == "HD_PRIME_WAIT_FOR_USER_START_STATE") : - verify_indicators(None, PRIMING_STEPS) + verify_indicators(None, config.PRIMING_STEPS) if state == "HD_PRIME_WAIT_FOR_USER_START_STATE": verify_start_priming_button(config.ENABLED) hd_simulator.cmd_send_pre_treatment_prime_start_response(config.ACCEPTED, 0) @@ -192,7 +183,7 @@ verify_indicators(config.CHECK, "Dialysate Circuit Priming") verify_indicators(config.CHECK, "Wet Self Tests") verify_start_priming_button(config.DISABLED) - verify_completion_message_and_indicator(False, PRIMING_COMPLETE_MSG) + verify_completion_message_and_indicator(False, config.PRIMING_COMPLETE_MSG) verify_continue_button(config.DISABLED) test.endSection() test.endSection() @@ -295,17 +286,17 @@ test.startSection("Verifying 'Self Dry Test' screen") navigate_self_test_dry_screen() - utility.verify_countdown(config.BEGIN_PRIME_TITLE, TIME_OUT_DURATION_100, hd_simulator, dg_simulator) - utility.verify_countdown(config.BEGIN_PRIME_TITLE, TIME_OUT_DURATION_200, hd_simulator, dg_simulator) - utility.verify_countdown(config.BEGIN_PRIME_TITLE, TIME_OUT_DURATION_300, hd_simulator, dg_simulator) + 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() - utility.verify_countdown(config.PRIMING_TITLE, TIME_OUT_DURATION_100, hd_simulator, dg_simulator) - utility.verify_countdown(config.PRIMING_TITLE, TIME_OUT_DURATION_200, hd_simulator, dg_simulator) - utility.verify_countdown(config.PRIMING_TITLE, TIME_OUT_DURATION_300, hd_simulator, dg_simulator) + utility.verify_countdown(config.PRIMING_TITLE, config.TIME_OUT_DURATION_100, hd_simulator, dg_simulator) + utility.verify_countdown(config.PRIMING_TITLE, config.TIME_OUT_DURATION_200, hd_simulator, dg_simulator) + utility.verify_countdown(config.PRIMING_TITLE, config.TIME_OUT_DURATION_300, hd_simulator, dg_simulator) verify_priming_states() verify_priming_recirculate_states() test.endSection()