Index: shared/scripts/configuration/utility.py =================================================================== diff -u -r1360b54e0f3f64259e03e1b1700fcd04dec9d384 -r88021b78150355dab24a99207a98cf16801b1c1b --- shared/scripts/configuration/utility.py (.../utility.py) (revision 1360b54e0f3f64259e03e1b1700fcd04dec9d384) +++ shared/scripts/configuration/utility.py (.../utility.py) (revision 88021b78150355dab24a99207a98cf16801b1c1b) @@ -21,13 +21,8 @@ from configuration import config from builtins import int as pyInt from configuration.config import * -from dialin.ui.hd_simulator import HDSimulator -from dialin.ui.dg_simulator import DGSimulator -hd_simulator = HDSimulator() -dg_simulator = DGSimulator() - - + def check_if_object_is_within_the_container(obj=None, container=None): """ check if an object is inside a container @@ -107,12 +102,15 @@ 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 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): @@ -197,15 +195,5 @@ names.o_bullet_object["container"] = screen_obj names.o_bullet_object["occurrence"] = num + 1 return names.o_bullet_object - -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(5,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) + Index: tst_pre_treatment_water_sample/test.py =================================================================== diff -u -r9bc82c26de1298853f53e3807a5c5cf56f2aa85e -r88021b78150355dab24a99207a98cf16801b1c1b --- tst_pre_treatment_water_sample/test.py (.../test.py) (revision 9bc82c26de1298853f53e3807a5c5cf56f2aa85e) +++ tst_pre_treatment_water_sample/test.py (.../test.py) (revision 88021b78150355dab24a99207a98cf16801b1c1b) @@ -9,73 +9,85 @@ import names from dialin.ui import utils from dialin.ui.hd_simulator import HDSimulator +from dialin.ui.dg_simulator import DGSimulator from configuration import config from configuration import utility -from dialin.common.hd_defs import HDOpModes,PreTreatmentSampleWaterStates,PreTreatmentSubModes +from dialin.common.hd_defs import HDOpModes, HDOpSubModes, PreTreatmentSampleWaterStates, PreTreatmentConsumableSelfTestStates, PreTreatmentNoCartSelfTestsStates, PreTreatmentCartridgeInstallStates, PreTreatmentDrySelfTestsStates, PreTreatmentPrimeStates, PreTreatmentRecircStates, PreTreatmentPatientConnectionStates - hd_simulator = HDSimulator() -PRE_TREATMENT_STEP= 1 +dg_simulator = DGSimulator() -def verify_sample_water_state_screens(): +PRE_TREATMENT_STEP = 1 + +def verify_pretreatment_filter_flush_screen(): """ - Method to verify the text and current state of the buttons and verify navigation within screen + Method to navigate to sub mode under pre-treatment screen + Navigating to Filter Flush screen """ + test.startSection("Verify the Filter Flush screen") hd_simulator.cmd_set_hd_operation_mode_data(HDOpModes.MODE_PRET.value,PreTreatmentSampleWaterStates.SAMPLE_WATER_SETUP_STATE.value) - - test.log("Navigating to water sample main screen for verification") - hd_simulator.cmd_send_pre_treatment_state_data(sub_mode=1, water_sample_state=1,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) + hd_simulator.cmd_send_pre_treatment_state_data(sub_mode=HDOpSubModes.SUBMODE_WAIT_FOR_TREATMENT.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) + utility.verify_page_step_indicator(names.o_preTreatmentWaterSampleStack_PreTreatmentBase_TreatmentFlowBase_2,PRE_TREATMENT_STEP) + utility.verify_countdown(config.FILTER_FLUSH_TITLE, config.TIME_OUT_DURATION_100, hd_simulator, dg_simulator) + utility.verify_countdown(config.FILTER_FLUSH_TITLE, config.TIME_OUT_DURATION_200, hd_simulator, dg_simulator) + utility.verify_countdown(config.FILTER_FLUSH_TITLE, config.TIME_OUT_DURATION_300, hd_simulator, dg_simulator) + test.endSection() +def verify_sample_water_state_screens(): + """ + Method to verify the text and current state of the buttons and verify navigation within screen + """ + test.startSection("Verify the water sample main screen") + hd_simulator.cmd_set_hd_operation_mode_data(HDOpModes.MODE_PRET.value,PreTreatmentSampleWaterStates.SAMPLE_WATER_SETUP_STATE.value) + hd_simulator.cmd_send_pre_treatment_state_data(sub_mode=HDOpSubModes.SUBMODE_WAIT_FOR_TREATMENT.value, water_sample_state=PreTreatmentSampleWaterStates.SAMPLE_WATER_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) utility.verify_page_step_indicator(names.o_preTreatmentWaterSampleStack_PreTreatmentBase_TreatmentFlowBase_2,PRE_TREATMENT_STEP) test.compare(str(waitForObjectExists(names.o_water_sample_button).text), config.WATER_SAMPLE_BUTTON_TEXT,"Water Sample button text should be {}".format(config.WATER_SAMPLE_BUTTON_TEXT)) test.compare(waitForObjectExists(names.o_water_sample_button).enabled , True, "Water Sample button should be enabled") mouseClick(waitForObject(names.o_water_sample_button)) test.compare(waitForObjectExists(names.o_stephead_indicator).enabled, True,"Water Sample indicator should be enabled") - - test.log("Navigating to water sample result screen") + test.endSection() + + test.startSection("Verify the water sample result screen") test.compare(str(waitForObjectExists(names.o_next_button).text), config.NEXT_BUTTON_TEXT, "Next Button text should be {}".format(config.NEXT_BUTTON_TEXT)) test.compare(waitForObjectExists(names.o_next_button).enabled , True,"Next button should be enabled") - mouseClick(waitForObject(names.o_next_button)) - + mouseClick(waitForObject(names.o_next_button)) utility.verify_page_step_indicator(names.o_preTreatmentWaterSampleStack_PreTreatmentBase_TreatmentFlowBase_2,PRE_TREATMENT_STEP) test.compare(str(waitForObjectExists(names.o_pass_button).text), config.PASS_TEXT,"Pass button text should be {}".format(config.PASS_TEXT)) test.compare(waitForObjectExists(names.o_pass_button).enabled , True, "Pass button should be enabled") mouseClick(waitForObject(names.o_pass_button)) test.compare(waitForObjectExists(names.o_stephead_indicator).enabled, True,"Verifying Water Sample result indicator should be enabled") - - test.log("Navigating to water sample screen for verification of back button") + test.endSection() + + test.startSection("Verify the water sample screen for verification of BACK Button and NEXT Button") test.compare(str(waitForObjectExists(names.o_back_button).text), config.BACK_BUTTON_TEXT,"Back button text should be {}".format(config.BACK_BUTTON_TEXT)) test.compare(waitForObjectExists(names.o_back_button).enabled , True, "Back button should be enabled") mouseClick(waitForObject(names.o_back_button)) - - test.log("Navigating to water sample result screen") test.compare(str(waitForObjectExists(names.o_next_button).text), config.NEXT_BUTTON_TEXT, "Next Button text should be {}".format(config.NEXT_BUTTON_TEXT)) test.compare(waitForObjectExists(names.o_next_button).enabled , True,"Next button should be enabled") mouseClick(waitForObject(names.o_next_button)) + test.endSection() - test.log("Navigating to water sample result failed screen") + test.startSection("Verify the water sample result failed screen") test.compare(str(waitForObjectExists(names.o_fail_button).text), config.FAIL_TEXT,"Fail button text should be {}".format(config.FAIL_TEXT)) test.compare(waitForObjectExists(names.o_fail_button).enabled , True, "Fail button should be enabled") mouseClick(waitForObject(names.o_fail_button)) - utility.verify_page_step_indicator(names.o_preTreatmentWaterSampleStack_PreTreatmentBase_TreatmentFlowBase_2,PRE_TREATMENT_STEP) test.compare(str(waitForObjectExists(names.o_ok_button).text), config.OK_TEXT,"OK button text should be {}".format(config.OK_TEXT)) test.compare(waitForObjectExists(names.o_ok_button).enabled , True, "OK button should be enabled") mouseClick(waitForObject(names.o_ok_button)) test.compare(waitForObjectExists(names.o_stephead_indicator).enabled, True,"Verifying Water result failed indicator should be enabled") hd_simulator.cmd_send_pre_treatment_water_sample_response(accepted=config.ACCEPTED, reason=0) + test.endSection() + def main(): utils.tstStart(__file__) startApplication(config.AUT_NAME) - test.log("Navigating to Filter Flush screen") - utility.navigate_to_pretreatment_screen(PreTreatmentSubModes.HD_PRE_TREATMENT_WATER_SAMPLE_STATE.value) - utility.verify_page_step_indicator(names.o_preTreatmentWaterSampleStack_PreTreatmentBase_TreatmentFlowBase_2,PRE_TREATMENT_STEP) - utility.verify_countdown(config.FILTER_FLUSH_TITLE, config.TIME_OUT_DURATION_100) - utility.verify_countdown(config.FILTER_FLUSH_TITLE, config.TIME_OUT_DURATION_200) - utility.verify_countdown(config.FILTER_FLUSH_TITLE, config.TIME_OUT_DURATION_300) + verify_pretreatment_filter_flush_screen() verify_sample_water_state_screens() utils.tstDone()