Index: shared/scripts/configuration/utility.py =================================================================== diff -u -rf92b275542e472a43c421d87dffb76af9dd49b26 -r11de8286fb08a96a491dd6b1e8b92953987f76dc --- shared/scripts/configuration/utility.py (.../utility.py) (revision f92b275542e472a43c421d87dffb76af9dd49b26) +++ shared/scripts/configuration/utility.py (.../utility.py) (revision 11de8286fb08a96a491dd6b1e8b92953987f76dc) @@ -20,10 +20,6 @@ from configuration.config import * from configuration import config from builtins import int as pyInt -from dialin.common.hd_defs import HDOpModes -from dialin.ui.hd_simulator import HDSimulator - -hd_simulator = HDSimulator() def check_if_object_is_within_the_container(obj=None, container=None): """ @@ -75,18 +71,6 @@ raise LookupError("zone object is not in view to the user after " + \ "trying 100 times") - - -def navigate_to_pretreatment_screen(mode): - """ - Method to navigate to sub mode under pre-treatment screen - @param mode - (int) pre treatment state - """ - hd_simulator.cmd_set_hd_operation_mode_data(HDOpModes.MODE_PRET.value,0) - hd_simulator.cmd_send_pre_treatment_state_data(sub_mode=mode, water_sample_state=0, - consumables_self_test_state=0, no_cartridge_self_test_state=0, - installation_state=0, dry_self_test_state=0, prime_state=0, - recirculate_state=0, patient_connection_state=0) def convert_seconds_into_min_and_sec(seconds): @@ -121,12 +105,14 @@ return time_text.time -def verify_countdown(screen_title, time_out): +def verify_countdown(screen_title, time_out, hd_simulator, dg_simulator): """ Method to verify the count down time in application @param screen_title - (str) current title of the screen @param time_out - (int) time out duration in secs + @Param hd_simulator - Instance of class HDSimulator + @Param dg_simulator - Instance of class DGSimulator """ test.startSection("Verify the count down time in application") for count_down in range(COUNT_DOWN_TIME_100, MINIMUM_COUNTDOWN_TIME-1, -1): Index: tst_pre_treatment_priming/test.py =================================================================== diff -u -rd1c1efe860f241926dd1a5265e4d85794becb141 -r11de8286fb08a96a491dd6b1e8b92953987f76dc --- tst_pre_treatment_priming/test.py (.../test.py) (revision d1c1efe860f241926dd1a5265e4d85794becb141) +++ tst_pre_treatment_priming/test.py (.../test.py) (revision 11de8286fb08a96a491dd6b1e8b92953987f76dc) @@ -15,15 +15,16 @@ # section import names - from configuration import config, utility from dialin.common.hd_defs import PreTreatmentSubModes 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() PRE_TREATMENT_STEP = 4 @@ -54,7 +55,11 @@ is displayed """ test.startSection("Navigating to self test dry screen and verify the 'Begin Prime' title is displayed") - utility.navigate_to_pretreatment_screen(PreTreatmentSubModes.HD_PRE_TREATMENT_SELF_TEST_DRY_STATE.value) + hd_simulator.cmd_set_hd_operation_mode_data(HDOpModes.MODE_PRET.value,PreTreatmentPrimeStates.HD_PRIME_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=PreTreatmentNoCartSelfTestsStates.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) + 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) @@ -68,7 +73,10 @@ is displayed """ test.startSection("Navigating to priming screen and verify the begin 'Priming' title is displayed") - utility.navigate_to_pretreatment_screen(PreTreatmentSubModes.HD_PRE_TREATMENT_PRIME_STATE.value) + 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=PreTreatmentNoCartSelfTestsStates.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) + 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) @@ -84,10 +92,10 @@ 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=5, water_sample_state=0, - consumables_self_test_state=0, no_cartridge_self_test_state=0, - installation_state=0, dry_self_test_state=index, prime_state=0, - recirculate_state=0, patient_connection_state=0) + 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=PreTreatmentNoCartSelfTestsStates.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) + if (state == "DRY_SELF_TESTS_STATE") or (state == "DRY_SELF_TESTS_WAIT_FOR_DOOR_CLOSE_STATE"): verify_indicators(None, TEST_DRY_STEPS) elif state == "DRY_SELF_TESTS_USED_CARTIDGE_CHECK_STATE": @@ -129,10 +137,10 @@ test.startSection("Simulating different states of priming recirculate states and verifying the busy and check indicator") 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=0, - consumables_self_test_state=0, no_cartridge_self_test_state=0, - installation_state=0, dry_self_test_state=0, prime_state=0, - recirculate_state=index, patient_connection_state=0) + 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=PreTreatmentNoCartSelfTestsStates.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) + verify_indicators(config.CHECK, "Blood Circuit Priming") verify_indicators(config.CHECK, "Dialysate Circuit Priming") verify_indicators(config.BUSY, "Wet Self Tests") @@ -152,10 +160,10 @@ test.startSection("Simulating different states of priming and verifying the busy and check indicator") 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=0, consumables_self_test_state=0, no_cartridge_self_test_state=0, - installation_state=0, dry_self_test_state=0, prime_state=index, - recirculate_state=0, patient_connection_state=0) + 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=PreTreatmentNoCartSelfTestsStates.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) + if (state == "HD_PRIME_START_STATE") or (state == "HD_PRIME_WAIT_FOR_USER_START_STATE") : verify_indicators(None, PRIMING_STEPS) if state == "HD_PRIME_WAIT_FOR_USER_START_STATE": @@ -287,17 +295,17 @@ test.startSection("Verifying 'Self Dry Test' screen") navigate_self_test_dry_screen() - utility.verify_countdown(config.BEGIN_PRIME_TITLE, TIME_OUT_DURATION_100) - utility.verify_countdown(config.BEGIN_PRIME_TITLE, TIME_OUT_DURATION_200) - utility.verify_countdown(config.BEGIN_PRIME_TITLE, TIME_OUT_DURATION_300) + 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) verify_dry_states() test.endSection() test.startSection("Verifying 'Priming' screen") navigate_to_priming_screen() - utility.verify_countdown(config.PRIMING_TITLE, TIME_OUT_DURATION_100) - utility.verify_countdown(config.PRIMING_TITLE, TIME_OUT_DURATION_200) - utility.verify_countdown(config.PRIMING_TITLE, TIME_OUT_DURATION_300) + 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) verify_priming_states() verify_priming_recirculate_states() test.endSection()