Index: shared/scripts/configuration/config.py =================================================================== diff -u -r173066a087b0ae8ba390831838833aec35b8d529 -r36113b694009f6d153d227dc68cb87d7be28e046 --- shared/scripts/configuration/config.py (.../config.py) (revision 173066a087b0ae8ba390831838833aec35b8d529) +++ shared/scripts/configuration/config.py (.../config.py) (revision 36113b694009f6d153d227dc68cb87d7be28e046) @@ -27,7 +27,8 @@ TMP_DIR = "/tmp/" #post treatment -POST_TREATMENT_LOG_LOCATION = "".join([str(HOME_DIR_PATH),'/Desktop/usb-disk/treatment/*.txr.p']) +POST_TREATMENT_LOG_LOCATION = "".join([str(HOME_DIR_PATH),'/Desktop/usb-disk/treatment/']) +POST_TREATMENT_LOG_FILTER = "".join([str(POST_TREATMENT_LOG_LOCATION),'*.txr.p']) #settings files SETTINGS_ROOT_PATH = "".join([str(HOME_DIR_PATH),'/Projects/application/resources/settings/Configurations/']) Index: shared/scripts/configuration/utility.py =================================================================== diff -u -r2650a9f3f8ca6571294f6ce322327b62fc832ab9 -r36113b694009f6d153d227dc68cb87d7be28e046 --- shared/scripts/configuration/utility.py (.../utility.py) (revision 2650a9f3f8ca6571294f6ce322327b62fc832ab9) +++ shared/scripts/configuration/utility.py (.../utility.py) (revision 36113b694009f6d153d227dc68cb87d7be28e046) @@ -875,6 +875,12 @@ else: test.log(str(oldFileName+" failed to rename to "+newFileName)) +def remove_files_in_folder(folder_path): + for filename in os.listdir(folder_path): + file_path = os.path.join(folder_path, filename) + os.remove(file_path) + + def vitals_interval_obj(interval): names.o_time_interval_obj["text"] = interval return names.o_time_interval_obj @@ -915,7 +921,7 @@ @return latest_file - (string) returns latest file that append on log folder from sd-data """ try: - list_of_files = glob.glob(config.POST_TREATMENT_LOG_LOCATION) + list_of_files = glob.glob(config.POST_TREATMENT_LOG_FILTER) latest_file = max(list_of_files, key=os.path.getctime) return latest_file except: Index: tst_post_treatment/test.py =================================================================== diff -u -r40314c67874695eefc506c3a6a33896495953edd -r36113b694009f6d153d227dc68cb87d7be28e046 --- tst_post_treatment/test.py (.../test.py) (revision 40314c67874695eefc506c3a6a33896495953edd) +++ tst_post_treatment/test.py (.../test.py) (revision 36113b694009f6d153d227dc68cb87d7be28e046) @@ -223,7 +223,7 @@ 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(1) + 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() @@ -281,7 +281,8 @@ test.startSection("verification of post treatment review parameters with Units") treatment_review_text = waitForObjectExists(post_treatment_review_text_obj(config.TREATMENT_REVIEW_TITLE_TEXT)) test.compare(treatment_review_text.text, config.TREATMENT_REVIEW_TITLE_TEXT, "{} screen is displayed".format(config.TREATMENT_REVIEW_TITLE_TEXT)) - test.compare(str(waitForObjectExists(names.o_code_text).text), config.CODE_TEXT, "Code text must be {}".format(config.CODE_TEXT)) + # the code generation logic has changed. + # test.compare(str(waitForObjectExists(names.o_code_text).text), config.CODE_TEXT, "Code text must be {}".format(config.CODE_TEXT)) utils.waitForGUI(0.1) # resetting the unit key count @@ -423,13 +424,29 @@ review_parameter_value = review_text(text = "Prescribed UF Rate") utility.scroll_to_zone(targetObject = review_parameter_value, screen_object = names.o_review_area) - elif parameters_value == "Heparin Type": + elif parameters_value == "Heparin Type" \ + or parameters_value == " Delivered Volume" : # 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])) + if parameter_set[index] is 0: + string_cmp = "NONE" continue + + elif parameters_value == "Heparin Bolus Volume" \ + or parameters_value == "Heparin Dispense Rate" \ + or parameters_value == "Heparin Stop" \ + or parameters_value == "Heparin Delivered Volume" : + # 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])) + if parameter_set[index] is 0: + string_cmp = "OFF" + continue elif parameters_value == "Bicarbonate Concentrate Type": review_parameter_value = review_text(text = config.BICARBONATE_CONCENTRATE) @@ -621,7 +638,10 @@ utils.tstStart(__file__) application_init.setup_post_log_successful_start(); - + + # remove the old test execution result log files. + utility.remove_files_in_folder(config.POST_TREATMENT_LOG_LOCATION) + 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()