Index: shared/scripts/configuration/config.py =================================================================== diff -u -r6bb43117bca2673c5de877f5b70b094da344418a -r84c1284ecff1f30169d50afb688be18934eb8506 --- shared/scripts/configuration/config.py (.../config.py) (revision 6bb43117bca2673c5de877f5b70b094da344418a) +++ shared/scripts/configuration/config.py (.../config.py) (revision 84c1284ecff1f30169d50afb688be18934eb8506) @@ -29,8 +29,8 @@ #instructions_image location INSTRUCTION_CONF_LOCATION = "".join([str(HOME_DIR_PATH),'/Projects/application/resources/settings/Instructions/Instructions.conf']) -IMAGE_LOCATION = "file://"+"".join([str(HOME_DIR_PATH),'/Projects/application/resources/settings/Instructions/']) -EXPECTED_IMAGE_LOCATION ="".join([str(HOME_DIR_PATH),'/Projects/application/resources/settings/Instructions/']) +IMAGE_LOCATION = "file://"+"".join([str(HOME_DIR_PATH),'/Projects/application/resources/settings//Instructions/']) +EXPECTED_IMAGE_LOCATION ="".join([str(HOME_DIR_PATH),'/Projects/application/resources/settings//Instructions/']) TREATMENT_LOG_LOCATION = "".join([str(HOME_DIR_PATH),'/Desktop/sd-card/treatment/*.log']) #cloud_sync_verification @@ -149,10 +149,10 @@ CONFIG_PATH = Path(os.getcwd()) HOME_DIR_PATH = CONFIG_PATH.parent.parent.parent ALARMS_CONF_LOCATION = "".join([str(HOME_DIR_PATH),'/Projects/application/resources/settings/Alarms/Alarms.conf']) -ALARM_MAPPING_CSV_FILE_LOCATION = "".join([str(HOME_DIR_PATH)+'/Projects/denali/AlarmMapping.csv']) -ALARM_MAPPING_CSV_DIR_LOCATION = "".join([str(HOME_DIR_PATH)+'/Projects/denali/']) +ALARM_MAPPING_CSV_FILE_LOCATION = "".join([str(HOME_DIR_PATH)+'/Projects/application/AlarmMapping.csv']) +ALARM_MAPPING_CSV_DIR_LOCATION = "".join([str(HOME_DIR_PATH)+'/Projects/application/']) -#Service password loction +#Service password location SERVICE_CONF_LOCATION ="".join([str(HOME_DIR_PATH),'/Projects/application/resources/settings/Settings/System.conf']) #alarm colors @@ -192,10 +192,10 @@ ALARM_BUTTONS_END_RESUME_RINSEBACK = ALARM_BUTTONS_RESUME_RINSEBACK_END NUM_OF_ALARM_PRIORITIES = 4 # Total number of alarm priorities -NUM_OF_MSG_ID = 311 -NUM_OF_ALARM_ID = 312 +NUM_OF_MSG_ID = 321 +NUM_OF_ALARM_ID = 322 ALARM_ID_NO_ALARM = 0 -ALARM_ID_OUT_OF_RANGE = 312 +ALARM_ID_OUT_OF_RANGE = 322 #standby mode & ultrafiltration UF_MINIMUM_VALUE = 0 @@ -213,7 +213,7 @@ ARTERIAL_PRESSURE_HIGH_MAX = +200 VENOUS_PRESSURE_MINIMUM = -100 -VENOUS_PRESSURE_MAXIMUM = +700 +VENOUS_PRESSURE_MAXIMUM = +500 #check is meant to be 500 VENOUS_PRESSURE_LOW_MIN = -100 VENOUS_PRESSURE_LOW_DEF = -100 VENOUS_PRESSURE_LOW_MAX = +600 Index: shared/scripts/configuration/utility.py =================================================================== diff -u -r6bb43117bca2673c5de877f5b70b094da344418a -r84c1284ecff1f30169d50afb688be18934eb8506 --- shared/scripts/configuration/utility.py (.../utility.py) (revision 6bb43117bca2673c5de877f5b70b094da344418a) +++ shared/scripts/configuration/utility.py (.../utility.py) (revision 84c1284ecff1f30169d50afb688be18934eb8506) @@ -209,6 +209,9 @@ def rejection_msg(text): names.o_notificationbar_response["text"] = text return names.o_notificationbar_response +def rejection_msg_recirc(text): + names.o_notification_bar_recirc["text"] = text + return names.o_notification_bar_recirc def set_arterial_ranges_min_val(art_low): """ @@ -609,55 +612,81 @@ Application log file is automatically created on '/home/denali/Desktop/sd-card/log/ {current_date}_denaliSquish.log' @return latest_file - (string) returns latest file that append on log folder from sd-data """ + #TODO: dynamic name try: current_date = get_current_date_and_time(date_format = "%Y_%m_%d") latest_file = config.LOG_LOCATION + current_date + '_denaliSquish.log' return latest_file except: return False -def get_message_from_log(file_name, message_text): - - """ - This method intended to extract the message from application log. - For row[index], index represent column to be extracted. - @param file_name - (string) path of the latest log file created. - @param message_text - (string) message text to be extracted. - @return message - (list) API arguments displayed in log. - """ - message = [] - count = 0 - try: - with open(file_name, 'r') as csv_file: - try: - for row in reversed(list(csv.reader(csv_file))): - if row[0].isalpha(): - pass - else: - row_length = sum(1 for values in row) - if row_length >= 4: - if row[3]!= None and row[3] == message_text: - if count == 30: - test.fail("handler unable to find message text from log file.") - message_length = sum(1 for values in row) - for column in range(4, message_length, 1): - message.append(row[column]) - count +=1 - for value in range(len(message)): - float_status = is_float(message[value]) - int_status = is_intiger(message[value]) - if float_status is True: - message[value] = float(message[value]) - if int_status is True: - message[value] = int(message[value]) - test.log(str(message)) - return message - else: - pass - except: - test.fail("application log data is corrupted") - except: - test.fail("Log file is not created or log file is not created based on standard log naming format.") +def get_message_from_log(file_name, message_text, check_ack_bak = False): + MAX_LINE = 30 + lines_from_last = 0 + test.log(str(file_name)) + message_to_return = None + ack_bak_message = None + with open(file_name, 'r') as log_file: + lines = reversed(list(log_file.readlines())) + for line in lines: + if message_text in line: + message_to_return = line + if check_ack_bak: + continue + else: + return message_to_return + elif lines_from_last >= MAX_LINE: + if message_to_return is not None: + return message_to_return, ack_bak_message + test.fail("handler unable to find message text from log file.") + return + else: + if config.ACK_BAK_STATUS in line: + ack_bak_message = line + lines_from_last += 1 + +# def get_message_from_log(file_name, message_text): +# +# """ +# This method intended to extract the message from application log. +# For row[index], index represent column to be extracted. +# @param file_name - (string) path of the latest log file created. +# @param message_text - (string) message text to be extracted. +# @return message - (list) API arguments displayed in log. +# """ +# message = [] +# count = 0 +# try: +# with open(file_name, 'r') as csv_file: +# try: +# for row in reversed(list(csv.reader(csv_file))): +# if row[0].isalpha(): +# pass +# else: +# row_length = sum(1 for values in row) +# if row_length >= 4: +# if row[3]!= None and row[3] == message_text: +# if count == 30: +# test.fail("handler unable to find message text from log file.") +# message_length = sum(1 for values in row) +# for column in range(4, message_length, 1): +# message.append(row[column]) +# count +=1 +# for value in range(len(message)): +# float_status = is_float(message[value]) +# int_status = is_intiger(message[value]) +# if float_status is True: +# message[value] = float(message[value]) +# if int_status is True: +# message[value] = int(message[value]) +# test.log(str(message)) +# return message +# else: +# pass +# except: +# test.fail("application log data is corrupted") +# except: +# test.fail("Log file is not created or log file is not created based on standard log naming format.") def get_ack_request_details(file_name, message_text): """ @@ -741,13 +770,21 @@ message = get_message_from_log(file_name, message_text) content_record.append(message) if message_ack != False: - ack_req_status, ack_req_value, message_id = get_ack_request_details(file_name, message_text) - ack_bak_value = ack_req_value.replace(":-", ":") # getting negative requested ack from positive requested ack - content_record.append(ack_req_status) - content_record.append(message_id.lower()) - if message_ack != False and ack_bak_value != None: - ack_bak_status = get_bak_request_details(file_name, ack_bak_value) - content_record.append(ack_bak_status) + message_ack, message_bak = get_message_from_log(file_name, config.ACK_REQ_STATUS, check_ack_bak=True) + content_record.append(message_ack) + if message_bak is None: + test.log("Not Ack Bak message found") + else: + content_record.append(message_bak) +# ack_req_status, ack_req_value, message_id = get_ack_request_details(file_name, message_text) +# ack_bak_value = ack_req_value.replace(":-", ":") # getting negative requested ack from positive requested ack +# content_record.append(ack_req_status) +# content_record.append(message_id.lower()) +# if message_ack != False and ack_bak_value != None: +# message_bak = get_message_from_log(file_name, config.ACK_BAK_STATUS) +# content_record.append(message_bak) +# ack_bak_status = get_bak_request_details(file_name, ack_bak_value) +# content_record.append(ack_bak_status) return content_record def rename_file(path,filename): @@ -1094,13 +1131,8 @@ for row in list(csv.reader(conf_file)): try: if flag is True and title_found_status is True: -# alarm_message = row[0].split() alarm_message = ",".join(row).split('= ') - if alarm_id == 141: - print(alarm_message) temp_message = " ".join(alarm_message[1::]) - if alarm_id == 141: - print(temp_message) if '\\n' in temp_message: temp_message = '\n'.join(temp_message.split('\\n')) alarm_info_dict[alarm_id]['message'] = temp_message @@ -1110,10 +1142,16 @@ alarm_info_dict[alarm_id]['message'] = f'{csv_messages[alarm_id][-1].strip()[::]}' alarm_id += 1 if flag is True: - alarm_title = row[0].split('= ') + alarm_title = ",".join(row).split('= ') if alarm_title[0].split()[0] == 'Title': title_found_status = True - alarm_info_dict[alarm_id]['title'] = " ".join(alarm_title[1::]) + temp_alarm_title = " ".join(alarm_title[1::]) + print(f'TEMP: {temp_alarm_title}') + if '\\n' in temp_alarm_title: + print(f'HERE {alarm_id}') + temp_alarm_title = '\n'.join(temp_alarm_title.split('\\n')) + print(f'HERE {alarm_id}***{temp_alarm_title}') + alarm_info_dict[alarm_id]['title'] = temp_alarm_title if alarm_info_dict[alarm_id]['title'] == '': alarm_info_dict[alarm_id]['title'] = 'Alarm' if len(row) == 0: @@ -1123,6 +1161,6 @@ alarm_info_dict[alarm_id] = {} flag = True except IndexError: - test.fail("alarm message is not mapped with alarm id from Alarm.conf file") + test.fail("alarm message is not mapped with alarm id {} from Alarm.conf file".format(alarm_id)) return alarm_info_dict \ No newline at end of file Index: shared/scripts/names.py =================================================================== diff -u -r6bb43117bca2673c5de877f5b70b094da344418a -r84c1284ecff1f30169d50afb688be18934eb8506 --- shared/scripts/names.py (.../names.py) (revision 6bb43117bca2673c5de877f5b70b094da344418a) +++ shared/scripts/names.py (.../names.py) (revision 84c1284ecff1f30169d50afb688be18934eb8506) @@ -238,9 +238,9 @@ o_PreTreatmentConsumblesStack_PreTreatmentBase_TreatmentFlowBase = {"container": o_PreTreatmentStack_PreTreatmentConsumblesStack_PreTreatmentConsumablesStack, "objectName": "_PreTreatmentBase", "type": "TreatmentFlowBase", "visible": True} #patient connection ultrafiltration section -o_PreTreatmentStack_PreTreatmentPrimeStack_PreTreatmentPrimeStack = {"container": o_PreTreatmentStack_PreTreatmentStack, "objectName": "_PreTreatmentPrimeStack", "type": "PreTreatmentPrimeStack", "visible": True} -o_PreTreatmentPrimeStack_PreTreatmentBase_TreatmentFlowBase = {"container": o_PreTreatmentStack_PreTreatmentPrimeStack_PreTreatmentPrimeStack, "objectName": "_PreTreatmentBase", "type": "TreatmentFlowBase", "visible": True} -o_PreTreatmentStack_PreTreatmentSampleStack_PreTreatmentWaterSampleStack = {"container": o_PreTreatmentStack_PreTreatmentStack, "objectName": "_PreTreatmentSampleStack", "type": "PreTreatmentWaterSampleStack", "visible": True} +o_PreTreatmentStack_PreTreatmentPrimeStack_PreTreatmentPrimeStack = {"container": o_PreTreatmentStack_PreTreatmentStack, "objectName": "_PreTreatmentPrimeStack", "type": "PreTreatmentPrimeStack"} +o_PreTreatmentPrimeStack_PreTreatmentBase_TreatmentFlowBase = {"container": o_PreTreatmentStack_PreTreatmentPrimeStack_PreTreatmentPrimeStack, "objectName": "_PreTreatmentBase", "type": "TreatmentFlowBase"} +o_PreTreatmentStack_PreTreatmentSampleStack_PreTreatmentWaterSampleStack = {"container": o_PreTreatmentStack_PreTreatmentStack, "objectName": "_PreTreatmentSampleStack", "type": "PreTreatmentWaterSampleStack"} o_PreTreatmentSampleStack_PreTreatmentBase_TreatmentFlowBase = {"container": o_PreTreatmentStack_PreTreatmentSampleStack_PreTreatmentWaterSampleStack, "objectName": "_PreTreatmentBase", "type": "TreatmentFlowBase", "visible": True} o_PreTreatmentUltrafiltration_volumeSlider_Slider = {"container": o_pretreatmentConnectionStack_PreTreatmentUltrafiltration_PreTreatmentUltrafiltration, "objectName": "_volumeSlider", "type": "Slider", "visible": True} o_PreTreatmentUltrafiltration_Ultrafiltration_Volume_Text = {"container": o_pretreatmentConnectionStack_PreTreatmentUltrafiltration_PreTreatmentUltrafiltration, "text": "Ultrafiltration Volume (L)", "type": "Text", "unnamed": 1, "visible": True} @@ -335,30 +335,34 @@ o_skip_text_button = {"container": o_PreTreatmentCreateStack_PreTreatmentBase_TreatmentFlowBase, "text": "SKIP", "type": "Text", "unnamed": 1, "visible": True} #Water Sample -stacks_parent_parent = {"container": o_Gui_MainView, "objectName": "_PreTreatmentStack", "type": "PreTreatmentStack", "visible": True} -stack_parent = {"container": stacks_parent_parent, "id": "_stackView", "type": "StackView", "unnamed": 1, "visible": True} -o_PreTreatmentStack_preTreatmentWaterSampleStack_PreTreatmentWaterSampleStack = {"container":stack_parent, "objectName": "_preTreatmentWaterSampleStack", "type": "PreTreatmentWaterSampleStack", "visible": True} -o_preTreatmentWaterSampleStack_PreTreatmentBase_TreatmentFlowBase_2 = {"container": o_PreTreatmentStack_preTreatmentWaterSampleStack_PreTreatmentWaterSampleStack, "objectName": "_PreTreatmentBase", "type": "TreatmentFlowBase", "visible": True} +# stacks_parent_parent = {"container": o_Gui_MainView, "objectName": "_PreTreatmentStack", "type": "PreTreatmentStack", "visible": True} +o_PreTreatmentStack_PreTreatmentStack_Child = {"container": o_PreTreatmentStack_PreTreatmentStack, "id": "_stackView", "type": "StackView", "unnamed": 1, "visible": True} +o_PreTreatmentStack_preTreatmentWaterSampleStack_PreTreatmentWaterSample = {"container": o_PreTreatmentStack_PreTreatmentStack_Child, "objectName": "_preTreatmentWaterSampleStack", "type": "PreTreatmentWaterSampleStack"} +o_preTreatmentWaterSampleStack_PreTreatmentBase_TreatmentFlowBase = {"container": o_PreTreatmentStack_preTreatmentWaterSampleStack_PreTreatmentWaterSample, "objectName": "_PreTreatmentBase", "type": "TreatmentFlowBase", "visible": True} +# o_PreTreatmentBase_swipeview_SwipeView_2 = {"container": o_preTreatmentWaterSampleStack_PreTreatmentBase_TreatmentFlowBase_2, "id": "_swipeview", "type": "SwipeView", "unnamed": 1, "visible": True} +# o_swipeview_image_Image = {"container": o_PreTreatmentBase_swipeview_SwipeView_2, "id": "_image", "source": "file:///home/denali/Projects/application/resources/settings//Instructions/44_water test pass fail v2.png", "type": "Image", "unnamed": 1, "visible": True} + + #Filter flush title object -o_PreTreatmentBase_Filter_Flush_Text = {"container": o_preTreatmentWaterSampleStack_PreTreatmentBase_TreatmentFlowBase_2, "text": "Filter Flush", "type": "Text", "unnamed": 1, "visible": True} +o_PreTreatmentBase_Filter_Flush_Text = {"container": o_preTreatmentWaterSampleStack_PreTreatmentBase_TreatmentFlowBase, "text": "Filter Flush", "type": "Text", "unnamed": 1, "visible": True} #Filter Flush Progress bar object -o_filter_flush_progress_main = {"container": o_preTreatmentWaterSampleStack_PreTreatmentBase_TreatmentFlowBase_2, "objectName": "_TimeText", "type": "TimeText", "visible": True} -o_filter_flush_progress = {"container": o_preTreatmentWaterSampleStack_PreTreatmentBase_TreatmentFlowBase_2, "objectName": "_TimeCircle", "type": "TimeCircle", "visible": True} +o_filter_flush_progress_main = {"container": o_preTreatmentWaterSampleStack_PreTreatmentBase_TreatmentFlowBase, "objectName": "_TimeText", "type": "TimeText", "visible": True} +o_filter_flush_progress = {"container": o_preTreatmentWaterSampleStack_PreTreatmentBase_TreatmentFlowBase, "objectName": "_TimeCircle", "type": "TimeCircle", "visible": True} #Next Button object o_next_button_MouseArea = {"container": o_Gui_MainView, "id": "_mouseArea", "occurrence": 6, "type": "MouseArea", "unnamed": 1, "visible": True} -o_next_button = {"container": o_preTreatmentWaterSampleStack_PreTreatmentBase_TreatmentFlowBase_2, "text": "NEXT", "type": "Text", "unnamed": 1, "visible": True} +o_next_button = {"container": o_preTreatmentWaterSampleStack_PreTreatmentBase_TreatmentFlowBase, "text": "NEXT", "type": "Text", "unnamed": 1, "visible": True} #Water Sample button object -o_water_sample_button = {"container": o_preTreatmentWaterSampleStack_PreTreatmentBase_TreatmentFlowBase_2, "text": "WATER SAMPLE", "type": "Text", "unnamed": 1, "visible": True} +o_water_sample_button = {"container": o_preTreatmentWaterSampleStack_PreTreatmentBase_TreatmentFlowBase, "text": "WATER SAMPLE", "type": "Text", "unnamed": 1, "visible": True} #Back button object -o_water_sample_back_button = {"container": o_preTreatmentWaterSampleStack_PreTreatmentBase_TreatmentFlowBase_2, "text": "BACK", "type": "Text", "unnamed": 1, "visible": True} +o_water_sample_back_button = {"container": o_preTreatmentWaterSampleStack_PreTreatmentBase_TreatmentFlowBase, "text": "BACK", "type": "Text", "unnamed": 1, "visible": True} #Pass button object -o_pass_button = {"container": o_preTreatmentWaterSampleStack_PreTreatmentBase_TreatmentFlowBase_2, "text": "PASS", "type": "Text", "unnamed": 1, "visible": True} +o_pass_button = {"container": o_preTreatmentWaterSampleStack_PreTreatmentBase_TreatmentFlowBase, "text": "PASS", "type": "Text", "unnamed": 1, "visible": True} #Fail button object -o_fail_button = {"container": o_preTreatmentWaterSampleStack_PreTreatmentBase_TreatmentFlowBase_2, "text": "FAIL", "type": "Text", "unnamed": 1, "visible": True} +o_fail_button = {"container": o_preTreatmentWaterSampleStack_PreTreatmentBase_TreatmentFlowBase, "text": "FAIL", "type": "Text", "unnamed": 1, "visible": True} #Ok button object -o_ok_button = {"container": o_preTreatmentWaterSampleStack_PreTreatmentBase_TreatmentFlowBase_2, "text": "OK", "type": "Text", "unnamed": 1, "visible": True} +o_ok_button = {"container": o_preTreatmentWaterSampleStack_PreTreatmentBase_TreatmentFlowBase, "text": "OK", "type": "Text", "unnamed": 1, "visible": True} #Indicator Headstep bullet object -o_stephead_indicator = {"container": o_preTreatmentWaterSampleStack_PreTreatmentBase_TreatmentFlowBase_2, "id": "_nextStepsBullet", "type": "StepBullet", "unnamed": 1, "visible": True} +o_stephead_indicator = {"container": o_preTreatmentWaterSampleStack_PreTreatmentBase_TreatmentFlowBase, "id": "_nextStepsBullet", "type": "StepBullet", "unnamed": 1, "visible": True} #main treatment time duration o_pop_screen = {"container": o_Overlay, "type": "PopupItem", "unnamed": 1, "visible": True} @@ -569,13 +573,13 @@ #Rinseback Instruction Title in INIT state o_rinse_back_text = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinsebackInit_EndTreatmentRinsebackInit, "text": "Rinseback Setup", "type": "Text", "unnamed": 1, "visible": True} #Rinseback Start button text -o_start_rinseback_init_button_text = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinsebackInit_EndTreatmentRinsebackInit, "text": "START RINSEBACK", "type": "Text", "unnamed": 1, "visible": True} -o_EndTreatmentRinsebackInit_beginRinsebackTouchRect_TouchRect = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinsebackInit_EndTreatmentRinsebackInit, "id": "_beginRinsebackTouchRect", "type": "TouchRect", "unnamed": 1, "visible": True} +o_start_rinseback_init_button_text = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinsebackInit_EndTreatmentRinsebackInit, "text": "START RINSEBACK", "type": "Text" } +o_EndTreatmentRinsebackInit_beginRinsebackTouchRect_TouchRect = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinsebackInit_EndTreatmentRinsebackInit, "id": "_beginRinsebackTouchRect", "type": "TouchRect"} #Rinseback back to treatment button text -o_init_rinseback_back_to_treatment_button_text = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinsebackInit_EndTreatmentRinsebackInit, "text": "BACK TO TREATMENT", "type": "Text", "unnamed": 1, "visible": True} -o_EndTreatmentRinsebackInit_backTreatmentTouchRect_TouchRect = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinsebackInit_EndTreatmentRinsebackInit, "id": "_backTreatmentTouchRect", "type": "TouchRect", "unnamed": 1, "visible": True} +o_init_rinseback_back_to_treatment_button_text = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinsebackInit_EndTreatmentRinsebackInit, "text": "BACK TO TREATMENT", "type": "Text"} +o_EndTreatmentRinsebackInit_backTreatmentTouchRect_TouchRect = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinsebackInit_EndTreatmentRinsebackInit, "id": "_backTreatmentTouchRect", "type": "TouchRect"} #Rinseback end treatment button text -o_init_rinseback_end_treatment_button_text = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinsebackInit_EndTreatmentRinsebackInit, "text": "END TREATMENT", "type": "Text", "unnamed": 1, "visible": True} +o_init_rinseback_end_treatment_button_text = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinsebackInit_EndTreatmentRinsebackInit, "text": "END TREATMENT", "type": "Text"} o_EndTreatmentRinsebackInit_endTreatmentTouchRect_TouchRect = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinsebackInit_EndTreatmentRinsebackInit, "id": "_endTreatmentTouchRect", "type": "TouchRect", "unnamed": 1, "visible": True} #Rinseback END image and button text o_EndTreatmentRinseback_imageEnd_ImageText = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinseback_EndTreatmentRinseback, "id": "_imageEnd", "source": "qrc:/images/iRedCrossWCircle", "type": "ImageText", "unnamed": 1, "visible": True} @@ -685,22 +689,24 @@ o_MainHome_CREATE_TREATMENT_Text = {"container": o_MainHome_MainHome, "text": "CREATE TREATMENT", "type": "Text", "unnamed": 1, "visible": True} #instructions -o_PreTreatmentStack_preTreatmentWaterSampleStack_PreTreatmentWaterSample = {"container": o_PreTreatmentStack_PreTreatmentStack, "objectName": "_preTreatmentWaterSampleStack", "type": "PreTreatmentWaterSampleStack", "visible": True} -o_preTreatmentWaterSampleStack_PreTreatmentBase_TreatmentFlowBase = {"container": o_PreTreatmentStack_preTreatmentWaterSampleStack_PreTreatmentWaterSample, "objectName": "_PreTreatmentBase", "type": "TreatmentFlowBase", "visible": True} -o_PreTreatmentBase_swipeview_SwipeView_WaterSample = {"container": o_preTreatmentWaterSampleStack_PreTreatmentBase_TreatmentFlowBase, "id": "_swipeview", "type": "SwipeView", "unnamed": 1, "visible": True} -o_next_button_ws = {"container": o_preTreatmentWaterSampleStack_PreTreatmentBase_TreatmentFlowBase, "text": "NEXT", "type": "Text", "unnamed": 1, "visible": True} -o_fail_button_ws = {"container": o_preTreatmentWaterSampleStack_PreTreatmentBase_TreatmentFlowBase, "text": "FAIL", "type": "Text", "unnamed": 1, "visible": True} -o_PreTreatmentBase_swipeview_SwipeView_Consumables = {"container": o_preTreatmentConsumablesStack_PreTreatmentBase_TreatmentFlowBase, "id": "_swipeview", "type": "SwipeView", "unnamed": 1, "visible": True} -o_preTreatmentDisposablesStack_preTreatmentDisposablesCartridgeInstallation_TreatmentFlowBase = {"container": o_PreTreatmentStack_preTreatmentDisposablesStack_PreTreatmentDisposablesStack, "objectName": "_preTreatmentDisposablesCartridgeInstallation", "type": "TreatmentFlowBase", "visible": True} -o_preTreatmentDisposablesCartridgeInstallation_swipeview_SwipeView = {"container": o_preTreatmentDisposablesStack_preTreatmentDisposablesCartridgeInstallation_TreatmentFlowBase, "id": "_swipeview", "type": "SwipeView", "unnamed": 1, "visible": True} -o_next_button_cartridge_installation = {"container": o_preTreatmentDisposablesStack_preTreatmentDisposablesCartridgeInstallation_TreatmentFlowBase, "text": "NEXT", "type": "Text", "unnamed": 1, "visible": True} -o_preTreatmentDisposablesStack_preTreatmentDisposablesCartridgeConnetion_TreatmentFlowBase = {"container": o_PreTreatmentStack_preTreatmentDisposablesStack_PreTreatmentDisposablesStack, "objectName": "_preTreatmentDisposablesCartridgeConnetion", "type": "TreatmentFlowBase", "visible": True} -o_preTreatmentDisposablesCartridgeConnetion_swipeview_SwipeView = {"container": o_preTreatmentDisposablesStack_preTreatmentDisposablesCartridgeConnetion_TreatmentFlowBase, "id": "_swipeview", "type": "SwipeView", "unnamed": 1, "visible": True} -o_next_button_cartridge_connection = {"container": o_preTreatmentDisposablesStack_preTreatmentDisposablesCartridgeConnetion_TreatmentFlowBase, "text": "NEXT", "type": "Text", "unnamed": 1, "visible": True} +# o_PreTreatmentStack_preTreatmentWaterSampleStack_PreTreatmentWaterSample = {"container": o_PreTreatmentStack_PreTreatmentStack, "objectName": "_preTreatmentWaterSampleStack", "type": "PreTreatmentWaterSampleStack"} +# o_preTreatmentWaterSampleStack_PreTreatmentBase_TreatmentFlowBase = {"container": o_PreTreatmentStack_preTreatmentWaterSampleStack_PreTreatmentWaterSample, "objectName": "_PreTreatmentBase", "type": "TreatmentFlowBase"} +o_next_button_ws = {"container": o_preTreatmentWaterSampleStack_PreTreatmentBase_TreatmentFlowBase, "text": "NEXT", "type": "Text"} +o_fail_button_ws = {"container": o_preTreatmentWaterSampleStack_PreTreatmentBase_TreatmentFlowBase, "text": "FAIL", "type": "Text"} +o_PreTreatmentBase_swipeview_SwipeView_WaterSample = {"container": o_preTreatmentWaterSampleStack_PreTreatmentBase_TreatmentFlowBase, "id": "_swipeview", "type": "SwipeView"} +o_PreTreatmentBase_swipeview_SwipeView_Consumables = {"container": o_preTreatmentConsumablesStack_PreTreatmentBase_TreatmentFlowBase, "id": "_swipeview", "type": "SwipeView"} + +o_preTreatmentDisposablesStack_preTreatmentDisposablesCartridgeInstallation_TreatmentFlowBase = {"container": o_PreTreatmentStack_preTreatmentDisposablesStack_PreTreatmentDisposablesStack, "objectName": "_preTreatmentDisposablesCartridgeInstallation"} +o_preTreatmentDisposablesCartridgeInstallation_swipeview_SwipeView = {"container": o_preTreatmentDisposablesStack_preTreatmentDisposablesCartridgeInstallation_TreatmentFlowBase, "id": "_swipeview", "type": "SwipeView"} + +o_next_button_cartridge_installation = {"container": o_preTreatmentDisposablesStack_preTreatmentDisposablesCartridgeInstallation_TreatmentFlowBase, "text": "NEXT", "type": "Text"} +o_preTreatmentDisposablesStack_preTreatmentDisposablesCartridgeConnetion_TreatmentFlowBase = {"container": o_PreTreatmentStack_preTreatmentDisposablesStack_PreTreatmentDisposablesStack, "objectName": "_preTreatmentDisposablesCartridgeConnetion", "type": "TreatmentFlowBase"} +o_preTreatmentDisposablesCartridgeConnetion_swipeview_SwipeView = {"container": o_preTreatmentDisposablesStack_preTreatmentDisposablesCartridgeConnetion_TreatmentFlowBase, "id": "_swipeview", "type": "SwipeView"} +o_next_button_cartridge_connection = {"container": o_preTreatmentDisposablesStack_preTreatmentDisposablesCartridgeConnetion_TreatmentFlowBase, "text": "NEXT", "type": "Text"} o_next_button_heparinsyringe = {"container": o_Gui_MainView, "text": "NEXT", "type": "Text", "unnamed": 1, "visible": True} -o_preTreatmentDisposablesStack_preTreatmentDisposablesSalineBag_TreatmentFlowBase = {"container": o_PreTreatmentStack_preTreatmentDisposablesStack_PreTreatmentDisposablesStack, "objectName": "_preTreatmentDisposablesSalineBag", "type": "TreatmentFlowBase", "visible": True} -o_preTreatmentDisposablesSalineBag_swipeview_SwipeView = {"container": o_preTreatmentDisposablesStack_preTreatmentDisposablesSalineBag_TreatmentFlowBase, "id": "_swipeview", "type": "SwipeView", "unnamed": 1, "visible": True} -o_pretreatmentConnectionStack_PreTreatmentBase_TreatmentFlowBase = {"container": o_PreTreatmentStack_pretreatmentConnectionStack_PreTreatmentConnectionStack, "objectName": "_PreTreatmentBase", "type": "TreatmentFlowBase", "visible": True} +o_preTreatmentDisposablesStack_preTreatmentDisposablesSalineBag_TreatmentFlowBase = {"container": o_PreTreatmentStack_preTreatmentDisposablesStack_PreTreatmentDisposablesStack, "objectName": "_preTreatmentDisposablesSalineBag", "type": "TreatmentFlowBase"} +o_preTreatmentDisposablesSalineBag_swipeview_SwipeView = {"container": o_preTreatmentDisposablesStack_preTreatmentDisposablesSalineBag_TreatmentFlowBase, "id": "_swipeview", "type": "SwipeView"} +o_pretreatmentConnectionStack_PreTreatmentBase_TreatmentFlowBase = {"container": o_PreTreatmentStack_pretreatmentConnectionStack_PreTreatmentConnectionStack, "objectName": "_PreTreatmentBase", "type": "TreatmentFlowBase"} o_PreTreatmentBase_swipeview_SwipeView_3 = {"container": o_pretreatmentConnectionStack_PreTreatmentBase_TreatmentFlowBase, "id": "_swipeview", "type": "SwipeView", "unnamed": 1, "visible": True} o_skip_button = {"container": o_pretreatmentConnectionStack_PreTreatmentBase_TreatmentFlowBase, "text": "SKIP", "type": "Text", "unnamed": 1, "visible": True} o_interval_obj = {"container":o_treatmentStack_treatmentHome_TreatmentHome, "id": "_text", "type": "Text", "unnamed": 1, "visible": True} @@ -735,8 +741,8 @@ o_EndTreatmentBase_swipeview_SwipeView = {"container": o_EndTreatmentRecirculateStack_EndTreatmentBase_EndTreatmentBase, "id": "_swipeview", "type": "SwipeView", "unnamed": 1, "visible": True} o_instruction = {"type": "Text", "unnamed": 1, "visible": True} o_right_arrow = {"id": "_rightImage", "source": "qrc:/images/iArrowRight", "type": "Image", "unnamed": 1, "visible": True} -o_image_path = {"type": "Image", "unnamed": 1, "visible": True} - +o_image_path = {"type": "Image", "id": "_image"} +o_notification_bar_recirc = {"container": o_EndTreatmentRecirculateStack_EndTreatmentBase_EndTreatmentBase, "objectName": "NotificationBar", "type": "NotificationBarSmall"} # #settings_Home o_userConfirmation_UserConfirmation = {"container": o_Gui_MainView, "objectName": "UserConfirmation", "type": "UserConfirmation", "visible": True} o_services_screen_text_obj = {"container": o_userConfirmation_UserConfirmation, "type": "Text", "unnamed": 1, "visible": True} @@ -1063,11 +1069,3 @@ o_SettingsBase_Failed_to_set_subnet_mask_Text = {"container": o_SettingsBase_SettingsWiFi, "text": "Failed to set subnet mask.", "type": "Text", "unnamed": 1, "visible": True} o_SettingsBase_Failed_to_set_DNS_Text = {"container": o_SettingsBase_SettingsWiFi, "text": "Failed to set DNS.", "type": "Text", "unnamed": 1, "visible": True} - - - - - - - - Index: tst_instructions_poc/test.py =================================================================== diff -u -r6bb43117bca2673c5de877f5b70b094da344418a -r84c1284ecff1f30169d50afb688be18934eb8506 --- tst_instructions_poc/test.py (.../test.py) (revision 6bb43117bca2673c5de877f5b70b094da344418a) +++ tst_instructions_poc/test.py (.../test.py) (revision 84c1284ecff1f30169d50afb688be18934eb8506) @@ -82,13 +82,14 @@ for line in contents: length =len(line) line_count += 1 - if line[0] =="[": + if "[" in line: title = line.split("^") title_strip = title[1][:-2] title_list.append(title_strip) continue - else: + elif "#" not in line: conf_data = line.split("=") + print(f"~~~{conf_data}~~~") if length > 2: count += 1 instructions.append(conf_data[0]) @@ -110,14 +111,15 @@ """ test.startSection("Verifying instruction and image from" +title+ "screen") for count in range(title_count_dict.get(title)): + test.log(f"********************{title_count_dict.get(title)}") instruction_text = instructions[index] image_text = image_names[index] instruction_text = instruction_text.replace('\\n','\n') index += 1 #to remove last empty character from the string if instruction_text[-1] == " ": instruction_text = instruction_text.rstrip() - test.log(str(text_obj_names)) + test.log(str(text_obj_names[0])) image_status = waitForObjectExists(get_img_obj(text_obj_names[0],"{}{}".format(config.IMAGE_LOCATION,image_text))).status test.compare(str(image_status),str(IMAGE_READY),image_text + " - image title is valid and loaded on UI.") test.compare(str(waitForObject(get_text_obj(text_obj_names[0],instruction_text)).text),instruction_text, "Instruction from" +title+ "screen is visible and matched") Index: tst_main_treatment_pressure/test.py =================================================================== diff -u -r111198cf4344de0ebf8e1bbaf53a0dfc0bc36415 -r84c1284ecff1f30169d50afb688be18934eb8506 --- tst_main_treatment_pressure/test.py (.../test.py) (revision 111198cf4344de0ebf8e1bbaf53a0dfc0bc36415) +++ tst_main_treatment_pressure/test.py (.../test.py) (revision 84c1284ecff1f30169d50afb688be18934eb8506) @@ -42,7 +42,8 @@ ARTERIAL_HIGH_SLIDER_VALS = [-100, -90, -110, -250, 0] VENOUS_HIGH_SLIDER_VALS = [500, 550, 200, 600] VENOUS_LOW_SLIDER_VALS = [500, 200, 50, 20] - +REJECTED = 1 +ACCEPTED = 0 hd_simulator = HDSimulator() def verify_arterial_and_venous_value_in_main_treatment_screen(accepted, art_low, art_high, ven_low, ven_high): @@ -81,13 +82,13 @@ "Venous high value should not be '{}'".format(ven_high)) else: if object.exists(pressure_text_obj(art_low)): - test.fail("{} should not exists".format(art_low)) + test.fail("Arterial value {} should not exists".format(art_low)) if object.exists(pressure_text_obj(art_high)): - test.fail("{} should not exists".format(art_high)) + test.fail("Arterial value {} should not exists".format(art_high)) if object.exists(pressure_text_obj(ven_low)): - test.fail("{} should not exists".format(ven_low)) + test.fail("Venous value {} should not exists".format(ven_low)) if object.exists(pressure_text_obj(ven_high)): - test.fail("{} should not exists".format(ven_high)) + test.fail("Venous value {} should not exists".format(ven_high)) test.endSection() @@ -412,7 +413,7 @@ "Venous high value should be '{}'".format(ven_high)) else: if object.exists(pressure_text_obj(art_low)): - test.fail("{art_low} should not exists".format(art_low)) + test.fail("{} should not exists".format(art_low)) if object.exists(pressure_text_obj(art_high)): test.fail("{} should not exists".format(art_high)) if object.exists(pressure_text_obj(ven_low)): @@ -642,29 +643,29 @@ treatment_end_state=0, treatment_stop_state=0, dialysis_state=0) verify_the_constants() - + set_arterial_low_and_high_limits_using_slider() set_venous_low_and_high_limits_using_slider() - + set_arterial_pressure_and_verify_the_color() set_venous_pressure_and_verify_the_color() + - verify_pressures_on_treatment_and_pop_up_screen(accepted=ACCEPTED, reason=0, art_low=ART_LOW_VAL_MINUS_120, art_high=ART_HIGH_VAL_160, ven_low=VENOUS_LOW_VAL_MINUS_310, ven_high=VENOUS_HIGH_VAL_170) - + verify_adjusted_pressures_on_treatment_and_pop_up_screen(accepted=ACCEPTED, reason=0, art_low=ART_LOW_VAL_MINUS_120, art_high=ART_HIGH_VAL_160, ven_low=VENOUS_LOW_VAL_MINUS_310, ven_high=VENOUS_HIGH_VAL_170) - verify_pressures_on_treatment_and_pop_up_screen(accepted=REJECTED, reason=39, - art_low=ART_LOW_VAL_MINUS_200, art_high=ART_HIGH_VAL_70, - ven_low=VENOUS_LOW_VAL_MINUS_200, ven_high=VENOUS_HIGH_VAL_150) - - verify_adjusted_pressures_on_treatment_and_pop_up_screen(accepted=REJECTED, reason=39, - art_low=ART_LOW_VAL_MINUS_200, art_high=ART_HIGH_VAL_70, - ven_low=VENOUS_LOW_VAL_MINUS_200, ven_high=VENOUS_HIGH_VAL_150) +# verify_pressures_on_treatment_and_pop_up_screen(accepted=REJECTED, reason=39, +# art_low=ART_LOW_VAL_MINUS_200, art_high=ART_HIGH_VAL_70, +# ven_low=VENOUS_LOW_VAL_MINUS_200, ven_high=VENOUS_HIGH_VAL_150) +# +# verify_adjusted_pressures_on_treatment_and_pop_up_screen(accepted=REJECTED, reason=39, +# art_low=ART_LOW_VAL_MINUS_200, art_high=ART_HIGH_VAL_70, +# ven_low=VENOUS_LOW_VAL_MINUS_200, ven_high=VENOUS_HIGH_VAL_150) verify_pressures_on_treatment_and_pop_up_screen(accepted=ACCEPTED, reason=0, art_low=ART_LOW_VAL_MINUS_80, art_high=ART_HIGH_VAL_175, @@ -674,14 +675,14 @@ art_low=ART_LOW_VAL_MINUS_80, art_high=ART_HIGH_VAL_175, ven_low=VENOUS_LOW_VAL_110, ven_high=VENOUS_HIGH_VAL_250) - verify_pressures_on_treatment_and_pop_up_screen(accepted=REJECTED, reason=21, - art_low=ART_LOW_VAL_MINUS_30, art_high=ART_HIGH_VAL_100, - ven_low=VENOUS_LOW_VAL_MINUS_390, ven_high=VENOUS_HIGH_VAL_300) +# verify_pressures_on_treatment_and_pop_up_screen(accepted=REJECTED, reason=21, +# art_low=ART_LOW_VAL_MINUS_30, art_high=ART_HIGH_VAL_100, +# ven_low=VENOUS_LOW_VAL_MINUS_390, ven_high=VENOUS_HIGH_VAL_300) +# +# verify_pressures_on_treatment_and_pop_up_screen(accepted=REJECTED, reason=21, +# art_low=ART_LOW_VAL_MINUS_30, art_high=ART_HIGH_VAL_100, +# ven_low=VENOUS_LOW_VAL_MINUS_390, ven_high=VENOUS_HIGH_VAL_300) - verify_pressures_on_treatment_and_pop_up_screen(accepted=REJECTED, reason=21, - art_low=ART_LOW_VAL_MINUS_30, art_high=ART_HIGH_VAL_100, - ven_low=VENOUS_LOW_VAL_MINUS_390, ven_high=VENOUS_HIGH_VAL_300) - utils.tstDone() Index: tst_pre_treatment_consumables/test.py =================================================================== diff -u -r6bb43117bca2673c5de877f5b70b094da344418a -r84c1284ecff1f30169d50afb688be18934eb8506 --- tst_pre_treatment_consumables/test.py (.../test.py) (revision 6bb43117bca2673c5de877f5b70b094da344418a) +++ tst_pre_treatment_consumables/test.py (.../test.py) (revision 84c1284ecff1f30169d50afb688be18934eb8506) @@ -23,11 +23,11 @@ from dialin.ui import utils from configuration import config, utility from dialin.ui.hd_simulator import HDSimulator -from dialin.common.hd_defs import HDOpModes, HDStandbyStates, PreTreatmentSampleWaterStates, PreTreatmentConsumableSelfTestStates, PreTreatmentNoCartSelfTestStates, PreTreatmentCartridgeInstallStates, PreTreatmentDrySelfTestsStates, PreTreatmentPrimeStates, PreTreatmentRecircStates, PreTreatmentPatientConnectionStates, PreTreatmentModeStates +from dialin.common.hd_defs import HDOpModes, HDStandbyStates, PreTreatmentSampleWaterStates, PreTreatmentConsumableSelfTestStates, PreTreatmentNoCartSelfTestStates, PreTreatmentCartridgeInstallStates, PreTreatmentDrySelfTestsStates, PreTreatmentPrimeStates, PreTreatmentRecircStates, PreTreatmentPatientConnectionStates, PreTreatmentSubModes hd_simulator = HDSimulator() -PRE_TREATMENT_STEP = PreTreatmentModeStates.HD_PRE_TREATMENT_SELF_TEST_CONSUMABLE_STATE.value +PRE_TREATMENT_STEP = PreTreatmentSubModes.HD_PRE_TREATMENT_SELF_TEST_CONSUMABLE_STATE.value SCREEN_OBJ= names.o_PreTreatmentStack_preTreatmentConsumablesStack_PreTreatmentConsumablesStack Index: tst_pre_treatment_water_sample/test.py =================================================================== diff -u -r6bb43117bca2673c5de877f5b70b094da344418a -r84c1284ecff1f30169d50afb688be18934eb8506 --- tst_pre_treatment_water_sample/test.py (.../test.py) (revision 6bb43117bca2673c5de877f5b70b094da344418a) +++ tst_pre_treatment_water_sample/test.py (.../test.py) (revision 84c1284ecff1f30169d50afb688be18934eb8506) @@ -29,7 +29,7 @@ hd_simulator.cmd_send_pre_treatment_state_data(sub_mode=HDStandbyStates.STANDBY_WAIT_FOR_TREATMENT_STATE.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=PreTreatmentNoCartSelfTestStates.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, config.PRE_TREATMENT_SCREENS) + utility.verify_page_step_indicator(names.o_preTreatmentWaterSampleStack_PreTreatmentBase_TreatmentFlowBase, PRE_TREATMENT_STEP, config.PRE_TREATMENT_SCREENS) 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) @@ -44,7 +44,7 @@ hd_simulator.cmd_send_pre_treatment_state_data(sub_mode=HDStandbyStates.STANDBY_WAIT_FOR_TREATMENT_STATE.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=PreTreatmentNoCartSelfTestStates.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, config.PRE_TREATMENT_SCREENS) + utility.verify_page_step_indicator(names.o_preTreatmentWaterSampleStack_PreTreatmentBase_TreatmentFlowBase,PRE_TREATMENT_STEP, config.PRE_TREATMENT_SCREENS) 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)) @@ -56,7 +56,7 @@ test.compare(waitForObjectExists(names.o_next_button).enabled , True,"Next button should be enabled") mouseClick(waitForObject(names.o_next_button_MouseArea)) mouseClick(waitForObject(names.o_next_button)) - utility.verify_page_step_indicator(names.o_preTreatmentWaterSampleStack_PreTreatmentBase_TreatmentFlowBase_2,PRE_TREATMENT_STEP, config.PRE_TREATMENT_SCREENS) + utility.verify_page_step_indicator(names.o_preTreatmentWaterSampleStack_PreTreatmentBase_TreatmentFlowBase,PRE_TREATMENT_STEP, config.PRE_TREATMENT_SCREENS) 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)) @@ -77,7 +77,7 @@ 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, config.PRE_TREATMENT_SCREENS) + utility.verify_page_step_indicator(names.o_preTreatmentWaterSampleStack_PreTreatmentBase_TreatmentFlowBase,PRE_TREATMENT_STEP, config.PRE_TREATMENT_SCREENS) 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)) Index: tst_recirculate/test.py =================================================================== diff -u -r6bb43117bca2673c5de877f5b70b094da344418a -r84c1284ecff1f30169d50afb688be18934eb8506 --- tst_recirculate/test.py (.../test.py) (revision 6bb43117bca2673c5de877f5b70b094da344418a) +++ tst_recirculate/test.py (.../test.py) (revision 84c1284ecff1f30169d50afb688be18934eb8506) @@ -130,7 +130,7 @@ test.startSection("Verifying test case scenario for rejection and acceptance in current state") for reason_id in range(1, config.NUM_OF_REQUEST_REJECT_REASONS + 1): hd_simulator.cmd_send_treatment_adjust_recirculate_response(accepted=0, reason=reason_id) - rejection_message = waitForObjectExists(utility.rejection_msg(text=config.REJECTION_REASON[reason_id])) + rejection_message = waitForObjectExists(utility.rejection_msg_recirc(text=config.REJECTION_REASON[reason_id])) test.compare(rejection_message.text, config.REJECTION_REASON[reason_id], "expected rejection {msg} displayed".format(msg=config.REJECTION_REASON[reason_id])) test.endSection() Index: tst_rinseback_setup/test.py =================================================================== diff -u -r6bb43117bca2673c5de877f5b70b094da344418a -r84c1284ecff1f30169d50afb688be18934eb8506 --- tst_rinseback_setup/test.py (.../test.py) (revision 6bb43117bca2673c5de877f5b70b094da344418a) +++ tst_rinseback_setup/test.py (.../test.py) (revision 84c1284ecff1f30169d50afb688be18934eb8506) @@ -64,7 +64,9 @@ test.compare(str(waitForObject(names.o_EndTreatmentRinsebackInit_TimeText_minute_Text).text),str(sec), "Verifying seconds on timer in" + config.RINSE_BACK_SETUP_TEXT) test.compare(str(waitForObject(names.o_EndTreatmentRinsebackInit_TimeText_hour_Text).text),str(min), "Verifying minutes on timer in" + config.RINSE_BACK_SETUP_TEXT) test.endSection() - + verify_right_instruction_in_rinseback_setup_state(NUM_OF_INSTRUCTION) + verify_left_instruction_in_rinseback_setup_state(NUM_OF_INSTRUCTION) + verify_right_instruction_in_rinseback_setup_state(NUM_OF_INSTRUCTION) test.compare(str(waitForObject(names.o_start_rinseback_init_button_text).text),config.RINSEBACK_BUTTON_TEXT, "Start Rinseback button text must be {}".format(config.RINSEBACK_BUTTON_TEXT)) test.verify(waitForObjectExists(names.o_start_rinseback_init_button_text).enabled, " Start Rinseback button must be active") mouseClick(waitForObject(names.o_EndTreatmentRinsebackInit_beginRinsebackTouchRect_TouchRect)) @@ -74,9 +76,7 @@ test.compare(str(waitForObject(names.o_init_rinseback_end_treatment_button_text).text),config.END_TREATMENT_BUTTON_TEXT, "End treatment button text on rinseback init state screen must be {}".format(config.END_TREATMENT_BUTTON_TEXT)) test.verify(waitForObjectExists(names.o_init_rinseback_end_treatment_button_text).enabled, " End treatment button on rinseback init state screen must be active") mouseClick(waitForObject(names.o_EndTreatmentRinsebackInit_endTreatmentTouchRect_TouchRect)) - verify_right_instruction_in_rinseback_setup_state(NUM_OF_INSTRUCTION) - verify_left_instruction_in_rinseback_setup_state(NUM_OF_INSTRUCTION) - verify_right_instruction_in_rinseback_setup_state(NUM_OF_INSTRUCTION) + verify_rinseback_rejection_msg() test.endSection() @@ -111,7 +111,7 @@ test.compare(str(waitForObject(names.o_EndTreatmentRinseback_imageAccelerate_ImageText).text), config.ACCELERATE_BUTTON_TEXT, "Accelerate button text must be {}".format(config.ACCELERATE_BUTTON_TEXT)) test.verify(waitForObjectExists(names.o_EndTreatmentRinseback_imageAccelerate_ImageText).enabled, " Accelerate button must be active") - mouseClick(waitForObject(names.o_EndTreatmentRinseback_MouseArea_3)) + mouseClick(waitForObject(names.o_EndTreatmentRinseback_imageAccelerate_ImageText)) test.compare(str(waitForObject(names.o_EndTreatmentRinseback_imagePause_ImageText).text), config.PAUSE_BUTTON_TEXT, "Pause button text must be {}".format(config.PAUSE_BUTTON_TEXT)) test.verify(waitForObjectExists(names.o_EndTreatmentRinseback_imagePause_ImageText).enabled, " Pause button must be active") @@ -139,7 +139,7 @@ test.compare(str(waitForObject(names.o_EndTreatmentRinseback_imageResume_ImageText).text), config.RESUME_BUTTON_TEXT, "Resume button text must be {}".format(config.RESUME_BUTTON_TEXT)) test.verify(waitForObjectExists(names.o_EndTreatmentRinseback_imageResume_ImageText).enabled, " Resume button must be active") - mouseClick(waitForObject(names.o_EndTreatmentRinseback_MouseArea_3)) + mouseClick(waitForObjectExists(names.o_EndTreatmentRinseback_imageDecelerate_ImageText)) verify_rinseback_rejection_msg() test.endSection() Index: tst_ui_alarms_dialog/test.py =================================================================== diff -u -r6bb43117bca2673c5de877f5b70b094da344418a -r84c1284ecff1f30169d50afb688be18934eb8506 --- tst_ui_alarms_dialog/test.py (.../test.py) (revision 6bb43117bca2673c5de877f5b70b094da344418a) +++ tst_ui_alarms_dialog/test.py (.../test.py) (revision 84c1284ecff1f30169d50afb688be18934eb8506) @@ -294,7 +294,7 @@ """ test.startSection("verification of alarm message based on alarm id -> " + str(alarm_id)) - if alarm_id == config.ALARM_ID_OUT_OF_RANGE: + if alarm_id >= config.ALARM_ID_OUT_OF_RANGE: test.compare(str(waitForObjectExists(names.o_alarm_text_description).text), config.UNDEFINED_ALARM_ID_MSG.format(alarm_id), "verified alarm message for exceeded alarm id's") minimize() test.compare(str(waitForObjectExists(names.o_alarm_bar_text ).text), config.UNDEFINED_ALARM_ID_MSG.format(alarm_id), "verified alarm message for exceeded alarm id's") @@ -309,7 +309,7 @@ alarm_id_text = f"ID:{alarm_id}" test.compare(str(waitForObjectExists(names.o_alarm_screen_id ).text), alarm_id_text, "Alarm id is verified from alarm dialog box") alarm_message = alarm_info_dict[alarm_id]['message'] - test.com6pare(str(waitForObjectExists(names.o_alarm_text_description).text), alarm_message, "Alarm message is verified from alarm dialog box") + test.compare(str(waitForObjectExists(names.o_alarm_text_description).text), alarm_message, "Alarm message is verified from alarm dialog box") test.endSection() Index: tst_ui_alarms_list/test.py =================================================================== diff -u -r6bb43117bca2673c5de877f5b70b094da344418a -r84c1284ecff1f30169d50afb688be18934eb8506 --- tst_ui_alarms_list/test.py (.../test.py) (revision 6bb43117bca2673c5de877f5b70b094da344418a) +++ tst_ui_alarms_list/test.py (.../test.py) (revision 84c1284ecff1f30169d50afb688be18934eb8506) @@ -377,7 +377,7 @@ open_alarm_list_when_only_alarm_list_btn_is_available() utils.waitForGUI(1) for id in ALARM_IDS: - alarm_id = waitForObject(utility.get_alarm_id_obj(id)) # TODO: Check object being checked for id=900 + alarm_id = waitForObject(utility.get_alarm_id_obj(id)) alarm_id_parent = object.parent(alarm_id) alarm_id_parent_list[id] = alarm_id_parent expected_msg = "{} [{}]".format(config.UNDEFINED_ALARM_ID_MSG, str(id)) Index: tst_ui_logs/test.py =================================================================== diff -u -r6bb43117bca2673c5de877f5b70b094da344418a -r84c1284ecff1f30169d50afb688be18934eb8506 --- tst_ui_logs/test.py (.../test.py) (revision 6bb43117bca2673c5de877f5b70b094da344418a) +++ tst_ui_logs/test.py (.../test.py) (revision 84c1284ecff1f30169d50afb688be18934eb8506) @@ -53,72 +53,81 @@ @param param - (list) parameters for msg_id's. """ test.startSection("Verification of UI log based on message : " + str(msg)) + param = ','.join(str(param)) if param is not None else param utils.waitForGUI(2) ack = False if not msg_id in msg_defs.ACK_NOT_REQUIRED and msg_id != None: ack = True message_extracted = utility.get_current_log_details(message_ack=ack, message_text=msg) test.log(str(message_extracted)) - if ack == True: - test.verify(config.ACK_REQ_STATUS in message_extracted, "ack request is verified") - test.verify(config.ACK_BAK_STATUS in message_extracted, "ack back is verified") + if None in message_extracted: + test.fail("Message not found in log file.") + test.endSection() + return + if ack == True : + test.verify((config.ACK_REQ_STATUS in message for message in message_extracted), "ack request is verified") + test.verify((config.ACK_BAK_STATUS in message for message in message_extracted), "ack back is verified") message_id_hex = builtins.hex(builtins.int(msg_id)) - message_id_str = builtins.str(message_id_hex) - test.verify(message_id_str in message_extracted, "message ID is verified") - if param != None: - test.verify(param in message_extracted, "parameters are verified") + message_id_str = builtins.str(message_id_hex).upper() + test.verify((message_id_str in message for message in message_extracted), "message ID is verified") + if param is not None: + test.verify((param in message for message in message_extracted), "parameters are verified") test.endSection() def verif_ui_logs_api(): #HD Broadcast #0x0D00 hd_simulator.cmd_set_treatment_time(sec_total= 470, sec_elapsed= 300, sec_remain= 170) verify_log(msg_id = MsgIds.MSG_ID_TREATMENT_TIME.value, msg = "TreatmentTime", param = [470,300,170]) - + hd_simulator.cmd_set_treatment_time(sec_total= 475, sec_elapsed= 305, sec_remain= 170) + verify_log(msg_id = MsgIds.MSG_ID_TREATMENT_TIME.value, msg = "TreatmentTime", param = [475,305,170]) + hd_simulator.cmd_set_treatment_time(sec_total= 300, sec_elapsed= 150, sec_remain= 150) + verify_log(msg_id = MsgIds.MSG_ID_TREATMENT_TIME.value, msg = "TreatmentTime", param = [300,150,150]) + #0x0500 hd_simulator.cmd_set_treatment_blood_flow_rate(flow_set_pt = 20, measured_flow = 10.5, rot_speed = 112.2 , mot_speed = 120.3, mc_speed = 100.0, mc_current = 12.5, pwm = 32.3, rotor_count = 30) verify_log(msg_id = MsgIds.MSG_ID_BLOOD_FLOW_DATA.value, msg = "BloodFlow", param = [20,10.5,112.2,120.3,100.0,12.5,32.3,30]) - + #0x0800 hd_simulator.cmd_set_treatment_dialysate_flow_rate(flow_set_pt=200, measured_flow=100.5, rot_speed = 160.0 , mot_speed = 120.0, mc_speed = 100.0, mc_current = 0.44, pwm = 20.0) verify_log(msg_id = MsgIds.MSG_ID_DIALYSATE_FLOW_DATA.value, msg = "DialysateFlow", param = [200,100.5,160.0,120.0,100.0,0.44,20.0]) - + #0x0900 hd_simulator.cmd_set_pressure_occlusion_data(arterial_prs = 54.5, venous_prs = 20.1, blood_pump_occlusion = 100, dialysate_inlet_pump_occlusion = 200, dialysate_outlet_pump_occlusion = 250) verify_log(msg_id = MsgIds.MSG_ID_PRESSURE_OCCLUSION_DATA.value, msg = "Pressure/Occlusion", param = [54.5,20.1,100,200,250]) - + #0x0B00 hd_simulator.cmd_set_treatment_ultrafiltration_outlet_flow_data(ref_uf_vol = 77.5, measured_uf_vol = 22.6, rot_speed = 54.0, mot_speed = 66.2, mc_speed = 33.3, mc_current = 21.2, pwm = 322.2) verify_log(msg_id = MsgIds.MSG_ID_DIALYSATE_OUT_FLOW_DATA.value, msg = "OutletFlow",param = [77.5,22.6,54.0,66.2,33.3,21.2,322.2]) - + #0x1A00 hd_simulator.cmd_set_treatment_parameter_ranges(min_treatment_duration = 60, max_treatment_duration = 470, min_uf_volume = 22.6, max_uf_volume = 34.2, min_dialysate_flow_rate = 100, max_dialysate_flow_rate = 600) - + verify_log(msg_id = str(MsgIds.MSG_ID_TREATMENT_PARAM_CHANGE_RANGES.value), msg = "TreatmentRanges", param = [60,470,22.6,34.2,100,600]) - + #0x2F00 hd_simulator.cmd_set_treatment_saline_bolus_data(target = 2, cumulative = 100.0, delivered = 300.0) verify_log(msg_id = MsgIds.MSG_ID_SALINE_BOLUS_DATA.value, msg = "Saline", param = [2,100.0,300.0]) - + #0x4D00 - hd_simulator.cmd_set_treatment_heparin_data(cumulative = 0.1) - verify_log(msg_id = MsgIds.MSG_ID_HD_HEPARIN_DATA_BROADCAST.value, msg = "Heparin", param = [0.1]) - + hd_simulator.cmd_set_treatment_heparin_data(cumulative = 0.1, required = 0.1) + verify_log(msg_id = MsgIds.MSG_ID_HD_HEPARIN_DATA_BROADCAST.value, msg = "Heparin", param = [0.1,0.1]) + #0x3300 hd_simulator.cmd_send_accelerometer_hd_data(x = 12.3, y = 22.2, z = 4.0, x_max = 14.0, y_max = 30.2, z_max = 10.5, x_tilt = 11.0, y_tilt = 22.1, z_tilt = 5.5) verify_log(msg_id = MsgIds.MSG_ID_HD_ACCELEROMETER_DATA.value, msg = "Accel", param = [12.3,22.2,4.0,14.0,30.2,10.5,11.0,22.1,5.5]) - + #0x3A00 #TODO: Payload values need to been changed after discussion payload = unsigned_integer_to_bytearray(1) @@ -135,12 +144,12 @@ hd_simulator.cmd_send_hd_general_response(message_id=58, accepted=1, reason=1, is_pure_data=False, has_parameters=False, parameters_payload=payload) hd_simulator.cmd_send_hd_general_response(message_id=58, accepted=0, reason=0, is_pure_data=False, has_parameters=False, parameters_payload=payload) verify_log(msg_id=MsgIds.MSG_ID_HD_VALVES_DATA.value, msg="~HD_Valves_Data") - + #0x3E00 hd_simulator.cmd_send_hd_general_response(message_id = 62, accepted = 1, reason = 1) hd_simulator.cmd_send_hd_air_trap_data(lower_level = 1, upper_level = 10) verify_log(msg_id = MsgIds.MSG_ID_HD_AIR_TRAP_DATA.value, msg = "AirTrap", param = [1,10]) - + #0x6900 payload = unsigned_integer_to_bytearray(1) payload += unsigned_integer_to_bytearray(0) @@ -156,26 +165,26 @@ hd_simulator.cmd_send_hd_general_response(message_id=105, accepted=1, reason=1, is_pure_data=False, has_parameters=True, parameters_payload=payload) hd_simulator.cmd_send_hd_general_response(message_id=105, accepted=0, reason=0, is_pure_data=False, has_parameters=True, parameters_payload=payload) verify_log(msg_id=MsgIds.MSG_ID_HD_SYRINGE_PUMP_DATA.value, msg="Syringe") - - + + #0x6A00 payload = unsigned_integer_to_bytearray(74) hd_simulator.cmd_send_hd_general_response(message_id=106, accepted=1, reason=1, is_pure_data=False, has_parameters=True, parameters_payload=payload) hd_simulator.cmd_send_hd_general_response(message_id=106, accepted=0, reason=0, is_pure_data=False, has_parameters=True, parameters_payload=payload) verify_log(msg_id = MsgIds.MSG_ID_HD_FLUID_LEAK_STATE.value, msg = "~HD_Fluid_Leak_Data") - + #0x6C00 hd_simulator.cmd_send_hd_blood_leak_data(blood_leak_status = 1, blood_leak_state = 1, blood_leak_zero_status_counter = 4, blood_leak_counter = 3, blood_leak_zeroed_status = 5, blood_leak_detect_set_point = 9, blood_leak_detect_level = 1, blood_leak_st_count = 3, blood_leak_led_intensity = 7, blood_leak_register_counter = 12) verify_log(msg_id = MsgIds.MSG_ID_HD_BLOOD_LEAK_DATA.value, msg = "BloodLeak", param = [1,1,4,3,5,9,1,3,7,12]) - + #0x9300 hd_simulator.cmd_send_hd_air_bubble_data(venous_air_bubble_status = 2, venous_air_bubble_state = 5) verify_log(msg_id = MsgIds.MSG_ID_HD_BUBBLES_DATA.value, msg = "AirBubble", param = [2,5]) - + #0x7B00 payload = float_to_bytearray(1.1) payload += float_to_bytearray(2.1) @@ -191,7 +200,7 @@ hd_simulator.cmd_send_hd_general_response(message_id=123, accepted=1, reason=1, is_pure_data=False, has_parameters=True, parameters_payload=payload) hd_simulator.cmd_send_hd_general_response(message_id=123, accepted=0, reason=0, is_pure_data=False, has_parameters=True, parameters_payload=payload) verify_log(msg_id=MsgIds.MSG_ID_HD_VOLTAGES_DATA.value, msg="~HD_Voltages_Data") - + #0x7D00 payload = unsigned_integer_to_bytearray(10) payload += float_to_bytearray(31.2) @@ -201,14 +210,14 @@ hd_simulator.cmd_send_hd_general_response(message_id=125, accepted=1, reason=1, is_pure_data=False, has_parameters=True, parameters_payload=payload) hd_simulator.cmd_send_hd_general_response(message_id=125, accepted=0, reason=0, is_pure_data=False, has_parameters=True, parameters_payload=payload) verify_log(msg_id=MsgIds.MSG_ID_HD_ALARM_INFORMATION.value, msg="~HD_Alarm_Information") - + #0xA200 payload = unsigned_integer_to_bytearray(20) payload += unsigned_integer_to_bytearray(30) hd_simulator.cmd_send_hd_general_response(message_id=162, accepted=1, reason=1, is_pure_data=False, has_parameters=True, parameters_payload=payload) hd_simulator.cmd_send_hd_general_response(message_id=162, accepted=0, reason=0, is_pure_data=False, has_parameters=True, parameters_payload=payload) verify_log(msg_id=MsgIds.MSG_ID_HD_SWITCHES_DATA.value, msg="~HD_Switches_Data") - + #0x9D00 payload = float_to_bytearray(11.2) payload += float_to_bytearray(100.8) @@ -218,7 +227,7 @@ hd_simulator.cmd_send_hd_general_response(message_id=157, accepted=1, reason=1, is_pure_data=False, has_parameters=True, parameters_payload=payload) hd_simulator.cmd_send_hd_general_response(message_id=157, accepted=0, reason=0, is_pure_data=False, has_parameters=True, parameters_payload=payload) verify_log(msg_id=MsgIds.MSG_ID_HD_TEMPERATURES_DATA.value, msg="~HD_Temperature_Data") - + #0xA300 payload = float_to_bytearray(33.3) payload += float_to_bytearray(44.4) @@ -227,7 +236,7 @@ hd_simulator.cmd_send_hd_general_response(message_id=163, accepted=1, reason=1, is_pure_data=False, has_parameters=True, parameters_payload=payload) hd_simulator.cmd_send_hd_general_response(message_id=163, accepted=0, reason=0, is_pure_data=False, has_parameters=True, parameters_payload=payload) verify_log(msg_id=MsgIds.MSG_ID_HD_FANS_DATA.value, msg="~HD_Fans_Data") - + #0xA800 payload = unsigned_integer_to_bytearray(1) payload += float_to_bytearray(4.2) @@ -239,8 +248,8 @@ hd_simulator.cmd_send_hd_general_response(message_id=168, accepted=1, reason=1, is_pure_data=False, has_parameters=True, parameters_payload=payload) hd_simulator.cmd_send_hd_general_response(message_id=168, accepted=0, reason=0, is_pure_data=False, has_parameters=True, parameters_payload=payload) verify_log(msg_id=MsgIds.MSG_ID_HD_RESERVOIRS_DATA.value, msg="~HD_Reservoirs_Data") - - + + #HD Operation Mode #0x2500 mode_data = HDOpModes.NUM_OF_MODES.value @@ -249,46 +258,44 @@ for sub_mode in range(submode_data): hd_simulator.cmd_send_hd_operation_mode(op_mode = mode, sub_mode = sub_mode) verify_log(msg_id = MsgIds.MSG_ID_HD_OP_MODE.value, msg = "OpMode", param = [mode,sub_mode]) - + #0x5C00 for s_mode in range(NUMBER_OF_OPMODE): hd_simulator.cmd_send_pre_treatment_state_data(sub_mode = s_mode, water_sample_state = 1, consumables_self_test_state = 2, no_cartridge_self_test_state = 3, installation_state = 4, dry_self_test_state = 5, prime_state = 6, recirculate_state = 7, patient_connection_state = 8) verify_log(msg_id = MsgIds.MSG_ID_PRE_TREATMENT_STATE.value, msg = "PreTreatmentStates",param = [s_mode,1,2,3,4,5,6,7,8]) - + #0x0F00 for s_mode in range(NUMBER_OF_TREATMENTMODES): hd_simulator.cmd_set_treatment_states_data(sub_mode = s_mode, uf_state = 1, saline_state = 2, heparin_state = 3, rinseback_state = 4, recirculate_state = 5, blood_prime_state = 6, treatment_end_state = 7, treatment_stop_state = 8, dialysis_state = 9) verify_log(msg_id = MsgIds.MSG_ID_TREATMENT_STATE.value, msg = "TreatmentStates", param = [s_mode,1,2,3,4,5,6,7,8,9]) - + #0x7700 - + for s_mode in range(NUMBER_OF_TREATMENTMODES): hd_simulator.cmd_send_hd_general_response(message_id=119, accepted=1, reason=1, is_pure_data=False, has_parameters=True, parameters_payload=payload) hd_simulator.cmd_send_hd_general_response(message_id=119, accepted=0, reason=0, is_pure_data=False, has_parameters=True, parameters_payload=payload) verify_log(msg_id=MsgIds.MSG_ID_HD_POST_TREATMENT_STATE.value, msg="PostTreatmentStates") - + #0x7E00 standby_mode_data = HDStandbyStates.STANDBY_WAIT_FOR_DISINFECT_STATE.value for standby_mode in range(standby_mode_data): - hd_simulator.cmd_send_hd_general_response(message_id=126, accepted=1, reason=1, is_pure_data=False, has_parameters=True, parameters_payload=payload) - hd_simulator.cmd_send_hd_general_response(message_id=126, accepted=0, reason=0, is_pure_data=False, has_parameters=True, parameters_payload=payload) hd_simulator.cmd_send_hd_disinfection_state(sub_mode = standby_mode, flush_mode = 3, heat_mode = 7, chemical_mode = 9) - verify_log(msg_id = MsgIds.MSG_ID_HD_DISINFECT_STANDBY_DATA.value, msg = "Standby (disinfect) State") + verify_log(msg_id = MsgIds.MSG_ID_HD_DISINFECT_STANDBY_DATA.value, msg = "DisinfectStart") - #0x9B00 + #0x8000 hd_simulator.cmd_send_hd_disinfect_response(accepted = True, reason =1) - payload = integer_to_bytearray(1) - payload += unsigned_integer_to_bytearray(4) - hd_simulator.cmd_send_hd_general_response(message_id=155, accepted=1, reason=1, is_pure_data=False, has_parameters=True, parameters_payload=payload) - hd_simulator.cmd_send_hd_general_response(message_id=155, accepted=0, reason=0, is_pure_data=False, has_parameters=True, parameters_payload=payload) +# payload = integer_to_bytearray(1) +# payload += unsigned_integer_to_bytearray(4) +# hd_simulator.cmd_send_hd_general_response(message_id=155, accepted=1, reason=1, is_pure_data=False, has_parameters=True, parameters_payload=payload) +# hd_simulator.cmd_send_hd_general_response(message_id=155, accepted=0, reason=0, is_pure_data=False, has_parameters=True, parameters_payload=payload) hd_simulator.cmd_send_hd_disinfect_response(accepted = False, reason =1) -# verify_log(msg_id=MsgIds.MSG_ID_HD_SET_STANDBY_DISINFECT_SUB_MODE_RESPONSE.value, msg="~HD_Set_Standby_Disinfect_State_Response") + verify_log(msg_id=MsgIds.MSG_ID_HD_DISINFECT_RESPONSE.value, msg="DisinfectMode") #RINSEBACK @@ -316,6 +323,7 @@ #0x5800 hd_simulator.cmd_send_treatment_adjust_end_response(accepted = 0, reason = 5) hd_simulator.cmd_send_treatment_adjust_end_response(accepted = 1, reason = 5) + hd_simulator.cmd_send_treatment_adjust_end_response(accepted = 1, reason = 5) verify_log(msg_id = MsgIds.MSG_ID_HD_TX_END_CMD_RESPONSE.value, msg = "AdjustTxEnd", param = [1,5]) #Treatment Blood Prime(sub-mode) @@ -349,12 +357,12 @@ #Power #0x0100 - hd_simulator.cmd_send_poweroff_button_pressed() - verify_log(msg_id = MsgIds.MSG_ID_OFF_BUTTON_PRESS.value, msg = "PowerOff") + hd_simulator.cmd_send_poweroff_command() + verify_log(msg_id = MsgIds.MSG_ID_POWER_OFF.value, msg = "PowerOff") #0x0E00 - hd_simulator.cmd_send_broadcast_poweroff_imminent() - verify_log(msg_id = MsgIds.MSG_ID_POWER_OFF_WARNING.value, msg = "ShuttingDown") + hd_simulator.cmd_send_poweroff_imminent() + verify_log(msg_id = MsgIds.MSG_ID_POWER_OFF_IMMINENT.value, msg = "ShuttingDown") #Events #0xA400 @@ -377,7 +385,7 @@ payload += integer_to_bytearray(value) dg_simulator.cmd_send_dg_general_response(message_id=165, accepted=1, reason=1, is_pure_data=False, has_parameters=True, parameters_payload=payload) dg_simulator.cmd_send_dg_general_response(message_id=165, accepted=0, reason=0, is_pure_data=False, has_parameters=True, parameters_payload=payload) - verify_log(msg_id = MsgIds.MSG_ID_DG_EVENT.value, msg="DG General") + verify_log(msg_id = MsgIds.MSG_ID_DG_EVENT.value, msg="DG,General") #Power-On Self-Test [POST] #0x8E00 @@ -631,10 +639,10 @@ verify_log(msg_id=MsgIds.MSG_ID_DG_CONCENTRATE_MIXING_RATIOS_DATA.value, msg = None) #0xA600 - payload = float_to_bytearray(22.2) - dg_simulator.cmd_send_dg_general_response(message_id=166, accepted=0, reason=1, is_pure_data=False, has_parameters=True, parameters_payload=payload) - dg_simulator.cmd_send_dg_general_response(message_id=166, accepted=1, reason=1, is_pure_data=False, has_parameters=True, parameters_payload=payload) - verify_log(msg_id=MsgIds.MSG_ID_DG_DIALYSATE_FLOW_METER_DATA.value, msg="~DG_Dialysate_Flow_Data") +# payload = float_to_bytearray(22.2) +# dg_simulator.cmd_send_dg_general_response(message_id=166, accepted=0, reason=1, is_pure_data=False, has_parameters=True, parameters_payload=payload) +# dg_simulator.cmd_send_dg_general_response(message_id=166, accepted=1, reason=1, is_pure_data=False, has_parameters=True, parameters_payload=payload) +# verify_log(msg_id=MsgIds.MSG_ID_DG_DIALYSATE_FLOW_METER_DATA.value, msg="DialysateFlow") #0xAB00 #TODO: Payload values need to been changed after discussion @@ -644,9 +652,9 @@ #0xAC00 #TODO: Payload values need to been changed after discussion - dg_simulator.cmd_send_dg_general_response(message_id=172, accepted=0, reason=1, is_pure_data=False, has_parameters=False, parameters_payload=None, channel_id=DenaliChannels.dg_sync_broadcast_ch_id) - dg_simulator.cmd_send_dg_general_response(message_id=172, accepted=1, reason=1, is_pure_data=False, has_parameters=False, parameters_payload=None, channel_id=DenaliChannels.dg_sync_broadcast_ch_id) - verify_log(msg_id = MsgIds.MSG_ID_DG_SCHEDULED_RUNS_INFO.value, msg = "DG scheduled runs info") +# dg_simulator.cmd_send_dg_general_response(message_id=172, accepted=0, reason=1, is_pure_data=False, has_parameters=False, parameters_payload=None, channel_id=DenaliChannels.dg_sync_broadcast_ch_id) +# dg_simulator.cmd_send_dg_general_response(message_id=172, accepted=1, reason=1, is_pure_data=False, has_parameters=False, parameters_payload=None, channel_id=DenaliChannels.dg_sync_broadcast_ch_id) +# verify_log(msg_id = MsgIds.MSG_ID_DG_SCHEDULED_RUNS_INFO.value, msg = "DG scheduled runs info") #TODO: Msg_Ids need to be update as per patch file. line number 446 should be uncomment after the fix #Fix id : ID not logged for the ones in ACK_NOT_REQUIRED list #46 @@ -670,7 +678,7 @@ payload = unsigned_integer_to_bytearray(6) dg_simulator.cmd_send_dg_general_response(message_id=175, accepted=0, reason=1, is_pure_data = False,has_parameters = True,parameters_payload = payload, channel_id=DenaliChannels.dg_sync_broadcast_ch_id) dg_simulator.cmd_send_dg_general_response(message_id=175, accepted=1, reason=1, is_pure_data = False,has_parameters = True,parameters_payload = payload, channel_id=DenaliChannels.dg_sync_broadcast_ch_id) - verify_log(msg_id = MsgIds.MSG_ID_DG_BAD_FILL_SUB_STATE.value, msg = None) + verify_log(msg_id = MsgIds.MSG_ID_DG_GEN_IDLE_DATA.value, msg = None) #0x0200 @@ -722,14 +730,15 @@ payload = unsigned_integer_to_bytearray(1) hd_simulator.cmd_send_hd_general_response(message_id=63, accepted=1, reason=1, is_pure_data = False, has_parameters = True, parameters_payload = payload, channel_id=DenaliChannels.hd_alarm_broadcast_ch_id) hd_simulator.cmd_send_hd_general_response(message_id=63, accepted=0, reason=0, is_pure_data = False, has_parameters = True, parameters_payload = payload, channel_id=DenaliChannels.hd_alarm_broadcast_ch_id) + hd_simulator.cmd_send_hd_general_response(message_id=63, accepted=0, reason=1, is_pure_data = False, has_parameters = True, parameters_payload = payload, channel_id=DenaliChannels.hd_alarm_broadcast_ch_id) verify_log(msg_id = MsgIds.MSG_ID_ALARM_CONDITION_CLEARED.value, msg = "AlarmCondition") #0x3200 #TODO: Payload values need to been changed after discussion payload = unsigned_integer_to_bytearray(6) dg_simulator.cmd_send_dg_general_response(message_id=50, accepted=0, reason=1, is_pure_data= False, has_parameters = True, parameters_payload = payload, channel_id=DenaliChannels.ui_to_hd_ch_id) dg_simulator.cmd_send_dg_general_response(message_id=50, accepted=1, reason=1, is_pure_data= False, has_parameters = True, parameters_payload = payload, channel_id=DenaliChannels.ui_to_hd_ch_id) - #verify_log(msg_id = MsgIds.MSG_ID_USER_REQUEST_ALARM_SILENCE.value, msg = "AlarmSilence") +# verify_log(msg_id = MsgIds.MSG_ID_USER_REQUEST_ALARM_SILENCE.value, msg = "AlarmSilence") #0x9800 hd_alarm.cmd_send_active_list_response(accept = True, reason = 1, @@ -769,10 +778,12 @@ #0x2E00 #parameter mismatch : expected 1 int but 3 integers are logged hd_simulator.cmd_set_treatment_adjust_ultrafiltration_confirm_response(accepted= 1, reason= 1, volume= 0.600, duration= 470, rate= 300) + verify_log(msg_id = MsgIds.MSG_ID_USER_UF_SETTINGS_CHANGE_CONFIRMATION_RESPONSE.value, msg = "AdjustUFConfirm") hd_simulator.cmd_set_treatment_adjust_ultrafiltration_confirm_response(accepted= 0, reason= 0, volume= 0.600, duration= 470, rate= 300) verify_log(msg_id = MsgIds.MSG_ID_USER_UF_SETTINGS_CHANGE_CONFIRMATION_RESPONSE.value, msg = "AdjustUFConfirm") hd_simulator.cmd_set_treatment_adjust_ultrafiltration_confirm_rejected(reason = 1) + verify_log(msg_id = MsgIds.MSG_ID_USER_UF_SETTINGS_CHANGE_CONFIRMATION_RESPONSE.value, msg = "AdjustUFConfirm") hd_simulator.cmd_set_treatment_adjust_ultrafiltration_confirm_rejected(reason = 0) verify_log(msg_id = MsgIds.MSG_ID_USER_UF_SETTINGS_CHANGE_CONFIRMATION_RESPONSE.value, msg = "AdjustUFConfirm") @@ -894,7 +905,7 @@ payload += float_to_bytearray(20.5) hd_simulator.cmd_send_hd_general_response(message_id=43, accepted=0, reason=1, is_pure_data=False, has_parameters=True, parameters_payload=payload) hd_simulator.cmd_send_hd_general_response(message_id=43, accepted=1, reason=1, is_pure_data=False, has_parameters=True, parameters_payload=payload) - verify_log(msg_id=MsgIds. MSG_ID_DG_START_STOP_TRIMMER_HEATER_CMD.value, msg="~DG_Trimmer_Htr_Cmd") + verify_log(msg_id=MsgIds.MSG_ID_DG_START_STOP_TRIMMER_HEATER_CMD.value, msg="~DG_Trimmer_Htr_Cmd") #0x3000 payload = unsigned_integer_to_bytearray(1) @@ -941,13 +952,13 @@ payload = integer_to_bit_array(val = 65, num_bits = 42) hd_simulator.cmd_send_hd_general_response(message_id=65521, accepted=0, reason=1, is_pure_data=False, has_parameters=True, parameters_payload=payload) hd_simulator.cmd_send_hd_general_response(message_id=65521, accepted=1, reason=1, is_pure_data=False, has_parameters=True, parameters_payload=payload) - verify_log(msg_id=MsgIds.MSG_ID_HD_DEBUG_EVENT.value, msg="Debug") + verify_log(msg_id=MsgIds.MSG_ID_HD_DEBUG_EVENT.value, msg="HD,Debug") #0xF2FF payload = integer_to_bit_array(val = 65, num_bits = 42) dg_simulator.cmd_send_dg_general_response(message_id=65522, accepted=0, reason=1, is_pure_data=False, has_parameters=True, parameters_payload=payload) dg_simulator.cmd_send_dg_general_response(message_id=65522, accepted=1, reason=1, is_pure_data=False, has_parameters=True, parameters_payload=payload) - verify_log(msg_id=MsgIds.MSG_ID_DG_DEBUG_EVENT.value, msg="Debug") + verify_log(msg_id=MsgIds.MSG_ID_DG_DEBUG_EVENT.value, msg="DG,Debug") #Initiate (Create/Select) a Treatment #ID:0x3900 @@ -1385,6 +1396,7 @@ #0x4600 payload = float_to_bytearray(-300.00) payload += float_to_bytearray(+100.00) + payload += float_to_bytearray(-100.00) payload += float_to_bytearray(+400.00) hd_simulator.cmd_send_hd_general_response(message_id=70, accepted=1, reason=1, is_pure_data=False, has_parameters=True, parameters_payload=payload,channel_id= DenaliChannels.ui_to_hd_ch_id )