Index: tst_pre_treatment_consumables/test.py =================================================================== diff -u -r8599e463aedf05d6a36824ca4eba62d914a5db5c -rf0c11d72bb64ea042f2245f57bdca7d67cf56aaf --- tst_pre_treatment_consumables/test.py (.../test.py) (revision 8599e463aedf05d6a36824ca4eba62d914a5db5c) +++ tst_pre_treatment_consumables/test.py (.../test.py) (revision f0c11d72bb64ea042f2245f57bdca7d67cf56aaf) @@ -85,23 +85,23 @@ bullet_circle_color = bullet_children[0].color.name bullet_border_color = bullet_children[0].border.color.name if instruction <= num: - test.compare(bullet_circle_color, strings.COMPLETE_COLOR) - test.compare(bullet_border_color,strings.COMPLETE_COLOR) + 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") else: - test.compare(bullet_circle_color, strings.CURRENT_COLOR) - test.compare(bullet_border_color,strings.INCOMPLETE_COLOR) + 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.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 ,strings.CONSUMABLE_SELF_TEST_TEXT," text must be " + strings.CONSUMABLE_SELF_TEST_TEXT) - test.compare(waitForObjectExists(names.o_PreTreatmentBase_BiCarb_Pump_Check_Text).text, strings.BICARB_PUMP_CHECK_TEXT," text must be " + strings.BICARB_PUMP_CHECK_TEXT) - test.compare(waitForObjectExists(names.o_PreTreatmentBase_Acid_Pump_Check_Text).text,strings.ACID_PUMP_CHECK_TEXT, " text must be from" + strings.ACID_PUMP_CHECK_TEXT) - test.compare(waitForObjectExists(names.o_PreTreatmentBase_Self_Test_Complete_Text).text,strings.SELF_TEST_COMPLETE_TEXT," must be " + strings.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(): """ @@ -116,8 +116,8 @@ 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,strings.BICARB_PUMP_CHECK_TEXT) - acid_indicator=utility.get_indicators(SCREEN_OBJ,strings.ACID_PUMP_CHECK_TEXT) + 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") @@ -130,8 +130,8 @@ 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,strings.BICARB_PUMP_CHECK_TEXT) - acid_indicator=utility.get_indicators(SCREEN_OBJ,strings.ACID_PUMP_CHECK_TEXT) + 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") @@ -140,8 +140,8 @@ 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) - bicarb_indicator=utility.get_indicators(SCREEN_OBJ,strings.BICARB_PUMP_CHECK_TEXT) - acid_indicator=utility.get_indicators(SCREEN_OBJ,strings.ACID_PUMP_CHECK_TEXT) + 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[1]).visible,"The check indicator for Bicarb Pump must be visible") test.log("BiCarb Pump Check is completed") @@ -153,13 +153,13 @@ 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.log("Verification for Acid Pump check is done") - bicarb_indicator=utility.get_indicators(SCREEN_OBJ,strings.BICARB_PUMP_CHECK_TEXT) - acid_indicator=utility.get_indicators(SCREEN_OBJ,strings.ACID_PUMP_CHECK_TEXT) + 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(bicarb_indicator[1].visible) 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,strings.SELF_TEST_COMPLETE_TEXT," text must be " + strings.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(): @@ -184,7 +184,7 @@ test.endSection() test.startSection("verification of consumable self test ") - test.verify(not object.exists(names.o_PreTreatmentBase_Self_Test_Complete_Text),strings.SELF_TEST_COMPLETE_TEXT + " must not be present ") + 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()