Index: tst_post_treatment/test.py =================================================================== diff -u -rdaf16428627302767972a5525dd02b8303f9d39a -rc79559a8ecd6dc676c7aed956ba1a5d1e45534a0 --- tst_post_treatment/test.py (.../test.py) (revision daf16428627302767972a5525dd02b8303f9d39a) +++ tst_post_treatment/test.py (.../test.py) (revision c79559a8ecd6dc676c7aed956ba1a5d1e45534a0) @@ -26,6 +26,7 @@ from dialin.ui import utils from datetime import * from configuration import config +from configuration import application_init as application_init from dialin.ui.hd_simulator import HDSimulator from configuration import utility from dialin.common.hd_defs import HDOpModes, HDStandbyStates, PostTreatmentStates @@ -214,10 +215,13 @@ mouseClick(waitForObject(names.o_PostTreatment_Export_mousearea)) test.compare(str(waitForObjectExists(names.o_treatmentlog_msg_export_btn).text), config.EXPORT_LOG_MSG,"Treatment log message on clicking Export button text must be {}".format(config.EXPORT_LOG_MSG)) test.verify(waitForObjectExists(names.o_treatmentlog_msg_export_btn).visible, "Treatment log message should be visible") - mouseClick(waitForObject(names.o_eject_button)) - test.verify(not waitForObjectExists(names.o_treatmentReviewConfirm_Export_Text).enabled, " Export button should be disabled") + utils.waitForGUI(1) + # mouseClick(waitForObject(names.o_eject_button)) + # test.verify(not waitForObjectExists(names.o_treatmentReviewConfirm_Export_Text).enabled, " Export button should be disabled") verify_post_treatment_review_parameters() + verify_post_treatment_review_log_data() + test.verify(waitForObject(names.o_treatment_review_next_button).enabled, "NEXT button must be enabled") mouseClick(waitForObject(names.o_treatment_review_next_button)) test.endSection() @@ -228,14 +232,21 @@ Method to verify parameters under 'Disposables screens' """ test.startSection("verification of Disposable Screen") - utils.waitForGUI(0.3) #Delay given for screen navigation + mouseClick(waitForObject(names.o_next_button_review)) + utils.waitForGUI(1) + # HD Response to confirm/next click + hd_simulator.cmd_send_confirm_post_tx_next(accepted = 1, reason=0) + utils.waitForGUI(1) #Delay given for screen navigation mouseClick(waitForObjectExists(names.o_disposablesRemovalConfirm_BACK_Text)) utils.waitForGUI(0.3) #Delay given for screen navigation mouseClick(waitForObject(names.o_treatment_review_next_button)) - DISPOSABLES_STEP = 2 + hd_simulator.cmd_send_confirm_post_tx_next(accepted = 1, reason=0) + utils.waitForGUI(1) #Delay given for screen navigation + + DISPOSABLES_STEP = 10 utility.verify_page_step_indicator(SCREEN_OBJ3, DISPOSABLES_STEP, config.POST_TREATMENT_SCREENS) names.o_bullet_object.pop("occurrence") - NUM_OF_DISPOSABLE_INSTALLATION_SCREENS = 8 + NUM_OF_DISPOSABLE_INSTALLATION_SCREENS = 10 verify_right_instruction_navigation_disposables(NUM_OF_DISPOSABLE_INSTALLATION_SCREENS) test.verify(waitForObjectExists(names.o_disposables_removal_confirm_button).enabled, " confirm button must be active") verify_left_instruction_navigation_disposables(NUM_OF_DISPOSABLE_INSTALLATION_SCREENS) @@ -331,6 +342,7 @@ average_venous_pressure = config.POST_TREATMENT_REVIEW_PARAMETER_RANGE["Average Venous Pressure"][index] ) utils.waitForGUI(1) + hd_simulator.cmd_send_treatment_log_data(blood_flow_rate = config.TREATMENT_DATA_PARAMETER["Blood flow rate"][index], dialysate_flow_rate = config.TREATMENT_DATA_PARAMETER["Dialysate flow rate"][index], uf_rate = config.TREATMENT_DATA_PARAMETER["Uf rate"][index], @@ -341,9 +353,15 @@ parameter2 = config.TREATMENT_ALARM_PARAMETER["Parameter2"][index]) hd_simulator.cmd_send_treatment_log_event(event_id = config.TREATMENT_EVENT_PARAMETER["Event id"][index], old_value = config.TREATMENT_EVENT_PARAMETER["Old Value"][index], - new_value = config.TREATMENT_EVENT_PARAMETER["New Value"][index]) + new_value = config.TREATMENT_EVENT_PARAMETER["New Value"][index]) + mouseClick(waitForObject(names.o_PostTreatment_Export_mousearea)) + # test.compare(str(waitForObjectExists(names.o_treatmentlog_msg_export_btn).text), config.EXPORT_LOG_MSG,"Treatment log message on clicking Export button text must be {}".format(config.EXPORT_LOG_MSG)) + # test.verify(waitForObjectExists(names.o_treatmentlog_msg_export_btn).visible, "Treatment log message should be visible") + utils.waitForGUI(3) # wait for export to happen + test.compare(str(waitForObjectExists(names.o_code_text_after_passing_log_values).text), config.CODE_TEXT_AFTER_LOGGING, "Code text must be {}".format(config.CODE_TEXT_AFTER_LOGGING)) + test.startSection("verification of post treatment review values for iteration -> "+str(index+1)) test.log("###verification of post treatment UI data based on config data") @@ -373,10 +391,11 @@ utility.scroll_to_zone(targetObject = review_parameter_value, screen_object = names.o_review_area) elif parameters_value == "Heparin Type": - review_parameter_value = review_text(text = config.HEPARIN_TYPE) - parameter_text = waitForObject(review_parameter_value) - test.log("verification of values for parameter ->" + parameters_value) - test.compare(config.HEPARIN_TYPE, parameter_text.text, "parameter value should be "+str(parameter_set[index])) + # review_parameter_value = review_text(text = config.HEPARIN_TYPE) + # utility.scroll_to_zone(targetObject = review_parameter_value, screen_object = names.o_review_area) + # parameter_text = waitForObject(review_parameter_value) + # test.log("verification of values for parameter ->" + parameters_value) + # test.compare(config.HEPARIN_TYPE, parameter_text.text, "parameter value should be "+str(parameter_set[index])) continue elif parameters_value == "Bicarbonate Concentrate Type": @@ -401,11 +420,15 @@ continue elif parameters_value == 'Water Sample Test Result': + string_cmp = "Pass" + if parameter_set[index] is 0: + string_cmp = "Fail" + test.log("verification of values for parameter ->" + parameters_value) - review_parameter_value = review_text(text = str(parameter_set[index])) + review_parameter_value = review_text(text = string_cmp) test.log(str(review_parameter_value)) parameter_text = waitForObjectExists(review_parameter_value) - test.compare(str(parameter_set[index]), str(parameter_text.text), "parameter value should be "+str(parameter_set[index])) + test.compare(string_cmp, str(parameter_text.text), "parameter value should be "+str(string_cmp)) continue if parameters_value == 'Treatment Start DateTime': @@ -438,11 +461,11 @@ test.log(str(time_duration)) parameter_to_scroll = str(time_duration) - review_parameter_value = review_text(text = parameter_to_scroll) - parameter_text = waitForObjectExists(review_parameter_value) - test.log("###verification of values for parameter - >" + parameters_value + " from UI screen") - parameter_set[index] = parameter_to_scroll - test.compare(str(parameter_set[index]), str(parameter_text.text), "parameter value should be "+str(parameter_set[index])) + # review_parameter_value = review_text(text = parameter_to_scroll) + # parameter_text = waitForObjectExists(review_parameter_value) + # test.log("###verification of values for parameter - >" + parameters_value + " from UI screen") + # parameter_set[index] = parameter_to_scroll + # test.compare(str(parameter_set[index]), str(parameter_text.text), "parameter value should be "+str(parameter_set[index])) test.log("verification of post treatment log file data") parameter_value, parameter_unit = verify_parameter_from_post_treatment_log(parameters_value) @@ -547,13 +570,17 @@ except: test.fail("Treatment log data is corrupted") except: - test.fail("Log file is not created or log file is not created based on standard log naming format.") + test.fail("Log file is not created or log file is not created based on standard log naming format.") + return (-1, -1) + def main(): utils.tstStart(__file__) + application_init.setup_post_log_successful_start(); + startApplication(config.AUT_NAME+ " -l") hd_simulator.cmd_send_hd_operation_mode(op_mode=HDOpModes.MODE_POST.value, sub_mode=PostTreatmentStates.HD_POST_TREATMENT_PATIENT_DISCONNECTION_STATE.value) verify_patient_disconnection_screens()