Index: tst_pre_treatment_consumables/test.py =================================================================== diff -u -rb3bcf1a0d38ee7b8884a94e70fa6adec8482ad36 -r603975795daa75d928e6da235be9074f3bba9c1d --- tst_pre_treatment_consumables/test.py (.../test.py) (revision b3bcf1a0d38ee7b8884a94e70fa6adec8482ad36) +++ tst_pre_treatment_consumables/test.py (.../test.py) (revision 603975795daa75d928e6da235be9074f3bba9c1d) @@ -23,13 +23,11 @@ from dialin.ui import utils from configuration import config, utility, strings from dialin.ui.hd_simulator import HDSimulator -from dialin.ui.utils import waitForGUI from dialin.common.hd_defs import PreTreatmentSubModes, PreTreatmentConsumableSelfTestStates, HDOpModes, HDOpSubModes, PreTreatmentSampleWaterStates, PreTreatmentConsumableSelfTestStates, PreTreatmentNoCartSelfTestsStates, PreTreatmentCartridgeInstallStates, PreTreatmentDrySelfTestsStates, PreTreatmentPrimeStates, PreTreatmentRecircStates, PreTreatmentPatientConnectionStates, PreTreatmentModeStates hd_simulator = HDSimulator() PRE_TREATMENT_STEP = PreTreatmentModeStates.HD_PRE_TREATMENT_SELF_TEST_CONSUMABLE_STATE.value -num_of_instructions = 0 SCREEN_OBJ= names.o_PreTreatmentStack_preTreatmentConsumablesStack_PreTreatmentConsumablesStack @@ -86,21 +84,21 @@ if instruction <= num: test.compare(bullet_circle_color, config.COMPLETE_COLOR) test.compare(bullet_border_color,config.COMPLETE_COLOR) - test.log("The bullet " + str(instruction) + " must be a complete bullet") + test.log("The bullet" + str(instruction) + "must be a complete bullet") else: test.compare(bullet_circle_color, config.CURRENT_COLOR) test.compare(bullet_border_color,config.INCOMPLETE_COLOR) - test.log("The bullet " + str(instruction) + " must be a incomplete bullet") + test.log("The bullet" + str(instruction) + "must be a incomplete bullet") test.endSection() def verify_consumable_states_text(): """ Method is to verify the Consumables Self test states' text. """ - test.compare(waitForObjectExists(names.o_PreTreatmentBase_Consumables_Self_Test_Text).text ,config.CONSUMABLE_SELF_TEST_TEXT," text must be " + config.CONSUMABLE_SELF_TEST_TEXT) - test.compare(waitForObjectExists(names.o_PreTreatmentBase_BiCarb_Pump_Check_Text).text, config.BICARB_PUMP_CHECK_TEXT," text must be " + config.BICARB_PUMP_CHECK_TEXT) - test.compare(waitForObjectExists(names.o_PreTreatmentBase_Acid_Pump_Check_Text).text,config.ACID_PUMP_CHECK_TEXT, " text must be from" + config.ACID_PUMP_CHECK_TEXT) - test.compare(waitForObjectExists(names.o_PreTreatmentBase_Self_Test_Complete_Text).text,config.SELF_TEST_COMPLETE_TEXT," must be " + config.SELF_TEST_COMPLETE_TEXT ) + test.compare(waitForObjectExists(names.o_PreTreatmentBase_Consumables_Self_Test_Text).text ,config.CONSUMABLE_SELF_TEST_TEXT,"text must be" + config.CONSUMABLE_SELF_TEST_TEXT) + test.compare(waitForObjectExists(names.o_PreTreatmentBase_BiCarb_Pump_Check_Text).text, config.BICARB_PUMP_CHECK_TEXT,"text must be" + config.BICARB_PUMP_CHECK_TEXT) + test.compare(waitForObjectExists(names.o_PreTreatmentBase_Acid_Pump_Check_Text).text,config.ACID_PUMP_CHECK_TEXT, "text must be from" + config.ACID_PUMP_CHECK_TEXT) + test.compare(waitForObjectExists(names.o_PreTreatmentBase_Self_Test_Complete_Text).text,config.SELF_TEST_COMPLETE_TEXT,"must be" + config.SELF_TEST_COMPLETE_TEXT ) def verify_consumables_states(): """ @@ -111,31 +109,31 @@ """ test.startSection("Check and busy indicator shouldn't be present initially") for states in range (PreTreatmentConsumableSelfTestStates.CONSUMABLE_SELF_TESTS_ACID_PUMP_CHECK_STATE.value): - test.startSection(" consumable self test state = " + PreTreatmentConsumableSelfTestStates(states).name) + test.startSection("consumable self test state =" + PreTreatmentConsumableSelfTestStates(states).name) hd_simulator.cmd_send_pre_treatment_state_data(sub_mode=HDOpSubModes.SUBMODE_WAIT_FOR_DISINFECT.value, water_sample_state=PreTreatmentSampleWaterStates.SAMPLE_WATER_SETUP_STATE.value,consumables_self_test_state=PreTreatmentConsumableSelfTestStates.CONSUMABLE_SELF_TESTS_BICARB_PUMP_CHECK_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) bicarb_indicator=utility.get_indicators(SCREEN_OBJ,config.BICARB_PUMP_CHECK_TEXT) acid_indicator=utility.get_indicators(SCREEN_OBJ,config.ACID_PUMP_CHECK_TEXT) - test.verify(not bicarb_indicator[0].visible, " busy indicator for bicarb pump must not be present") - test.verify(not bicarb_indicator[1].visible, " check indicator for bicarb pump must not be present") - test.verify(not acid_indicator[0].visible , " busy indicator for acid pump must not be present") - test.verify(not acid_indicator[1].visible, " check indicator for acid pump must not be present") + test.verify(not bicarb_indicator[0].visible, "busy indicator for bicarb pump must not be present") + test.verify(not bicarb_indicator[1].visible, "check indicator for bicarb pump must not be present") + test.verify(not acid_indicator[0].visible , "busy indicator for acid pump must not be present") + test.verify(not acid_indicator[1].visible, "check indicator for acid pump must not be present") test.endSection() test.endSection() test.startSection("Verification of Check and busy indicators") - test.log(" consumable self test state = " + PreTreatmentConsumableSelfTestStates.CONSUMABLE_SELF_TESTS_ACID_PUMP_CHECK_STATE.name) + test.log("consumable self test state =" + PreTreatmentConsumableSelfTestStates.CONSUMABLE_SELF_TESTS_ACID_PUMP_CHECK_STATE.name) hd_simulator.cmd_send_pre_treatment_state_data(sub_mode=HDOpSubModes.SUBMODE_WAIT_FOR_DISINFECT.value, water_sample_state=PreTreatmentSampleWaterStates.SAMPLE_WATER_SETUP_STATE.value,consumables_self_test_state=PreTreatmentConsumableSelfTestStates.CONSUMABLE_SELF_TESTS_ACID_PUMP_CHECK_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) bicarb_indicator=utility.get_indicators(SCREEN_OBJ,config.BICARB_PUMP_CHECK_TEXT) acid_indicator=utility.get_indicators(SCREEN_OBJ,config.ACID_PUMP_CHECK_TEXT) test.verify(waitForObject(bicarb_indicator[0]).visible,"The Busy indicator for BiCarb Pump must be visible") - test.verify(not acid_indicator[0].visible," busy indicator for acid pump must not be present") - test.verify(not acid_indicator[1].visible," check indicator for acid pump must not be present") + test.verify(not acid_indicator[0].visible,"busy indicator for acid pump must not be present") + test.verify(not acid_indicator[1].visible,"check indicator for acid pump must not be present") - test.log(" consumable self test state = " + PreTreatmentConsumableSelfTestStates.CONSUMABLE_SELF_TESTS_COMPLETE_STATE.name) + test.log("consumable self test state =" + PreTreatmentConsumableSelfTestStates.CONSUMABLE_SELF_TESTS_COMPLETE_STATE.name) hd_simulator.cmd_send_pre_treatment_state_data(sub_mode=HDOpSubModes.SUBMODE_WAIT_FOR_DISINFECT.value, water_sample_state=PreTreatmentSampleWaterStates.SAMPLE_WATER_SETUP_STATE.value,consumables_self_test_state=PreTreatmentConsumableSelfTestStates.CONSUMABLE_SELF_TESTS_COMPLETE_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) @@ -145,7 +143,7 @@ test.verify(waitForObject(bicarb_indicator[1]).visible,"The check indicator for Bicarb Pump must be visible") test.log("BiCarb Pump Check is completed") test.verify(waitForObject(acid_indicator[0]).visible,"The Busy indicator for Acid Pump must be visible") - test.log(" consumable self test state = " + PreTreatmentConsumableSelfTestStates.NUM_OF_CONSUMABLE_SELF_TESTS_STATES.name) + test.log("consumable self test state = " + PreTreatmentConsumableSelfTestStates.NUM_OF_CONSUMABLE_SELF_TESTS_STATES.name) hd_simulator.cmd_send_pre_treatment_state_data(sub_mode=HDOpSubModes.SUBMODE_WAIT_FOR_DISINFECT.value, water_sample_state=PreTreatmentSampleWaterStates.SAMPLE_WATER_SETUP_STATE.value,consumables_self_test_state=PreTreatmentConsumableSelfTestStates.NUM_OF_CONSUMABLE_SELF_TESTS_STATES.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, @@ -158,7 +156,7 @@ test. verify(acid_indicator[1].visible) test.verify(waitForObjectExists(names.o_PreTreatmentBase_Self_Test_Complete_Text).visible) test.log("Self test complete for consumables is done") - test.compare(waitForObjectExists(names.o_PreTreatmentBase_Self_Test_Complete_Text).text,config.SELF_TEST_COMPLETE_TEXT," text must be " + config.SELF_TEST_COMPLETE_TEXT ) + test.compare(waitForObjectExists(names.o_PreTreatmentBase_Self_Test_Complete_Text).text,config.SELF_TEST_COMPLETE_TEXT,"text must be" + config.SELF_TEST_COMPLETE_TEXT ) test.endSection() def main(): @@ -172,18 +170,18 @@ names.o_bullet_object.pop("occurrence") list_of_bullets = findAllObjects(names.o_bullet_object) num_of_instructions = len(list_of_bullets) - config.NUM_OF_PRETREATMENT_BULLETS - test.verify(not waitForObjectExists(names.o_confirm_button_enabled).enabled, " confirm button must not be active") + test.verify(not waitForObjectExists(names.o_confirm_button_enabled).enabled, "confirm button must not be active") verify_right_instruction_navigation() - test.verify(waitForObjectExists(names.o_confirm_button_enabled).enabled, " confirm button must be active") + test.verify(waitForObjectExists(names.o_confirm_button_enabled).enabled, "confirm button must be active") verify_left_instruction_navigation() - test.verify(not waitForObjectExists(names.o_confirm_button_enabled).enabled ," confirm button must not be active") + test.verify(not waitForObjectExists(names.o_confirm_button_enabled).enabled ,"confirm button must not be active") for right_arrow in range(1, num_of_instructions): mouseClick(waitForObject(names.o_PreTreatmentBase_rightImage_Image)) mouseClick(waitForObject(names.o_confirm_button_enabled)) test.endSection() - test.startSection("verification of consumable self test ") - test.verify(not object.exists(names.o_PreTreatmentBase_Self_Test_Complete_Text),config.SELF_TEST_COMPLETE_TEXT + " must not be present ") + test.startSection("verification of consumable self test") + test.verify(not object.exists(names.o_PreTreatmentBase_Self_Test_Complete_Text),config.SELF_TEST_COMPLETE_TEXT + "must not be present") verify_consumables_states() verify_consumable_states_text() test.endSection()