Index: shared/scripts/configuration/utility.py =================================================================== diff -u -r4e525fac94941a1451bd54f2390f47ece7f4f1b0 -re668ae1e012a1ab6ed5b1ff62f7001f977049ded --- shared/scripts/configuration/utility.py (.../utility.py) (revision 4e525fac94941a1451bd54f2390f47ece7f4f1b0) +++ shared/scripts/configuration/utility.py (.../utility.py) (revision e668ae1e012a1ab6ed5b1ff62f7001f977049ded) @@ -24,12 +24,7 @@ from dialin.ui import utils from datetime import datetime from dialin.ui import utils -from dialin.common.hd_defs import HDOpModes -from dialin.ui.hd_simulator import HDSimulator -from dialin.ui.dg_simulator import DGSimulator -hd_simulator = HDSimulator() -dg_simulator = DGSimulator() def color_verification(exp_val = "Red", act_val = "#c53b33"): """ @@ -470,19 +465,7 @@ """ padded_str = "###"+string return padded_str - -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): min_and_sec = time.strftime("%M:%S", time.gmtime(seconds)) return min_and_sec @@ -492,17 +475,6 @@ names.o_self_test_dry_check_list_text["text"] = text return names.o_self_test_dry_check_list_text -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): min_and_sec = time.strftime("%M:%S", time.gmtime(seconds)) return min_and_sec @@ -529,12 +501,14 @@ time_text = progress_circle_children[1] 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 HDSimulator class + @Param dg_simulator - Instance of DGSimulator class """ test.startSection("Verify the count down time in application") for count_down in range(config.COUNT_DOWN_TIME_100, config.MINIMUM_COUNTDOWN_TIME-1, -1): Index: tst_pre_treatment_disposables/test.py =================================================================== diff -u -r5270bcb116e8c30d3fa871749c548cc1ffb5c771 -re668ae1e012a1ab6ed5b1ff62f7001f977049ded --- tst_pre_treatment_disposables/test.py (.../test.py) (revision 5270bcb116e8c30d3fa871749c548cc1ffb5c771) +++ tst_pre_treatment_disposables/test.py (.../test.py) (revision e668ae1e012a1ab6ed5b1ff62f7001f977049ded) @@ -14,12 +14,14 @@ from configuration.utility import * from configuration.config import * -from dialin.ui import utils +from dialin.ui import utils, dg_simulator from dialin.ui.hd_simulator import HDSimulator -from dialin.common.hd_defs import PreTreatmentSubModes - -hd_simulator = HDSimulator() +from dialin.ui.dg_simulator import DGSimulator +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 = 3 NUM_OF_PRETREATMENT_BULLETS = len(PRE_TREATMENT_SCREENS) SCREEN_OBJ = names.o_PreTreatmentStack_preTreatmentDisposablesStack_PreTreatmentDisposablesStack @@ -31,15 +33,27 @@ HEPARIN_SYRINGE_TEXT = "Connect the cartridge blood and dialysis fluid lines to the dialyzer." -def navigate_to_disposables(): +def verify_disposables_screen(): """ Method to navigate to disposables and verify 'System Self Test' title is displayed """ - test.startSection("Navigating to disposables and verifying 'System Self Test' title is displayed") - navigate_to_pretreatment_screen(PreTreatmentSubModes.HD_PRE_TREATMENT_SELF_TEST_NO_CART_STATE.value) + test.startSection("Navigating to disposables screen and verifying 'System Self Test' title is displayed") + + hd_simulator.cmd_set_hd_operation_mode_data(HDOpModes.MODE_PRET.value,PreTreatmentNoCartSelfTestsStates.NO_CART_SELF_TESTS_START_STATE.value) + hd_simulator.cmd_send_pre_treatment_state_data(sub_mode=HDOpSubModes.SUBMODE_DG_FLUSH_IN_PROGRESS.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) + + + + test.compare(SYSTEM_SELF_TEST_TITLE, waitForObject(names.o_system_test_text).text, "'{} title should displayed when user is navigated to disposable screen".format(SYSTEM_SELF_TEST_TITLE)) verify_page_step_indicator(SCREEN_OBJ, PRE_TREATMENT_STEP) + verify_countdown(SYSTEM_SELF_TEST_TITLE, TIME_OUT_DURATION_100, hd_simulator, dg_simulator) + verify_countdown(SYSTEM_SELF_TEST_TITLE, TIME_OUT_DURATION_200, hd_simulator, dg_simulator) + verify_countdown(SYSTEM_SELF_TEST_TITLE, TIME_OUT_DURATION_300, hd_simulator, dg_simulator) + test.endSection() def verify_right_instruction_navigation(num_of_instruction, screen): @@ -192,12 +206,18 @@ and 'NEXT' button """ test.startSection("Verifying functionality of the cartridge installation screen's left, right navigation and 'NEXT' button") - navigate_to_pretreatment_screen(PreTreatmentSubModes.HD_PRE_TREATMENT_CART_INSTALL_STATE.value) + hd_simulator.cmd_set_hd_operation_mode_data(HDOpModes.MODE_PRET.value,PreTreatmentNoCartSelfTestsStates.NO_CART_SELF_TESTS_START_STATE.value) + hd_simulator.cmd_send_pre_treatment_state_data(sub_mode=HDOpSubModes.SUBMODE_DG_HEAT_DISINFECT_IN_PROGRESS.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) + + verify_right_instruction_navigation(NUM_OF_CARTRIDGE_INSTALLATION_SCREENS, CARTRIDGE_INSTALLATION) verify_left_instruction_navigation(NUM_OF_CARTRIDGE_INSTALLATION_SCREENS, CARTRIDGE_INSTALLATION) verify_right_instruction_navigation(NUM_OF_CARTRIDGE_INSTALLATION_SCREENS, CARTRIDGE_INSTALLATION) click_on_next_button() test.endSection() + def verify_functionality_for_heparin_syringe(): """ @@ -245,21 +265,13 @@ def main(): utils.tstStart(__file__) startApplication(AUT_NAME) - - navigate_to_disposables() - verify_countdown(SYSTEM_SELF_TEST_TITLE, TIME_OUT_DURATION_100) - verify_countdown(SYSTEM_SELF_TEST_TITLE, TIME_OUT_DURATION_200) - verify_countdown(SYSTEM_SELF_TEST_TITLE, TIME_OUT_DURATION_300) - - + verify_disposables_screen() verify_functionality_for_cartridge_installation() - utils.waitForGUI(1) verify_functionality_for_heparin_syringe() - utils.waitForGUI(1) verify_functionality_for_saline_bag() - utils.tstDone() + \ No newline at end of file