Index: shared/scripts/configuration/strings.py =================================================================== diff -u -r6bb43117bca2673c5de877f5b70b094da344418a -r7883bcc9c71da71d09d48d8998a99a9b8ad0640a --- shared/scripts/configuration/strings.py (.../strings.py) (revision 6bb43117bca2673c5de877f5b70b094da344418a) +++ shared/scripts/configuration/strings.py (.../strings.py) (revision 7883bcc9c71da71d09d48d8998a99a9b8ad0640a) @@ -87,8 +87,8 @@ #main treatment pressure PRESSURE_TITLE = "PRESSURES" -ARTERIAL_TITLE = "Arterial" -VENOUS_TITLE = "Venous" +ARTERIAL_TITLE = "Arterial Window" +VENOUS_TITLE = "Venous Window" VENOUS_UOM = "mmHg" ARTERIAL_UOM = "mmHg" LOW_TEXT = "LOW" Index: shared/scripts/configuration/utility.py =================================================================== diff -u -r84c1284ecff1f30169d50afb688be18934eb8506 -r7883bcc9c71da71d09d48d8998a99a9b8ad0640a --- shared/scripts/configuration/utility.py (.../utility.py) (revision 84c1284ecff1f30169d50afb688be18934eb8506) +++ shared/scripts/configuration/utility.py (.../utility.py) (revision 7883bcc9c71da71d09d48d8998a99a9b8ad0640a) @@ -634,12 +634,12 @@ if check_ack_bak: continue else: - return message_to_return + return message_to_return, ack_bak_message 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 + return message_to_return, ack_bak_message else: if config.ACK_BAK_STATUS in line: ack_bak_message = line @@ -791,33 +791,29 @@ """ This method Rename the original folder name to dummy name. """ - folder_path = os.listdir(path) - for files in folder_path: - if files == filename+"_1": - if os.path.exists(path+filename+"_1"): - shutil.rmtree(path+filename+"_1") - test.log(str(filename+" name changed to "+files)) - if files == filename: - if os.path.exists(path+filename): - utils.waitForGUI(1) - os.rename(path+filename,path+filename+"_1") - test.log(str(files+" name changed to "+filename+"_1")) + newFileName = filename + "_1" + oldFileName = filename + if os.path.exists(path+oldFileName): + os.rename(path+oldFileName, path+newFileName) + test.log(str(oldFileName+" name changed to "+newFileName)) + else: + test.log(str(oldFileName+" failed to rename to "+newFileName)) def rename_old_name(path,filename): """ This method Rename the dummy name to original folder name . """ - folder_path = os.listdir(path) - for files in folder_path: - if files == filename: - if os.path.exists(path+filename): - shutil.rmtree(path+filename) - test.log(str(files+"_1 name changed to "+filename)) - utils.waitForGUI(5) - if files != filename: - if (files == filename+"_1"): - os.rename(path+files,path+filename) - test.log(str(files+" name changed to "+filename)) + newFileName = filename + oldFileName = filename + "_1" + if os.path.exists(path+newFileName): + # During running of AUT, the application re-creates the folder (eg: application/resources/settings) + # need to delete before renaming + shutil.rmtree(path+newFileName) + if os.path.exists(path+oldFileName): + os.rename(path+oldFileName, path+newFileName) + test.log(str(oldFileName+" name changed to "+newFileName)) + else: + test.log(str(oldFileName+" failed to rename to "+newFileName)) def vitals_interval_obj(interval): names.o_time_interval_obj["text"] = interval @@ -1123,37 +1119,57 @@ utils.waitForGUI(0.2) flag = False title_found_status = False + list_title_found_status = False alarm_info_dict = {} with open(config.ALARM_MAPPING_CSV_FILE_LOCATION, 'r') as csv_file: csv_messages = list(csv.reader(csv_file)) with open(config.ALARMS_CONF_LOCATION, 'r') as conf_file: alarm_id = 1 for row in list(csv.reader(conf_file)): + print(f'ROW : {row}') try: - if flag is True and title_found_status is True: + # IF BOTH THE TITLE AND LISTTITLE ATTRIB ARE PARSED, GET THE MESSAGE + if flag is True and list_title_found_status is True: alarm_message = ",".join(row).split('= ') temp_message = " ".join(alarm_message[1::]) if '\\n' in temp_message: temp_message = '\n'.join(temp_message.split('\\n')) + print(f'TEMP title : {temp_message}') alarm_info_dict[alarm_id]['message'] = temp_message flag = False + list_title_found_status = False title_found_status = False if alarm_info_dict[alarm_id]['message'] == '' and alarm_id != config.NUM_OF_ALARM_ID: alarm_info_dict[alarm_id]['message'] = f'{csv_messages[alarm_id][-1].strip()[::]}' alarm_id += 1 - if flag is True: + # GET THE TITLE ATTRIBUTE + if flag is True and title_found_status is False: alarm_title = ",".join(row).split('= ') if alarm_title[0].split()[0] == 'Title': title_found_status = True temp_alarm_title = " ".join(alarm_title[1::]) - print(f'TEMP: {temp_alarm_title}') + print(f'TEMP title : {temp_alarm_title}') if '\\n' in temp_alarm_title: - print(f'HERE {alarm_id}') + print(f'HERE title {alarm_id}') temp_alarm_title = '\n'.join(temp_alarm_title.split('\\n')) - print(f'HERE {alarm_id}***{temp_alarm_title}') + print(f'HERE title {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' + # GET THE LISTTITLE ATTRIBUTE + if flag is True and title_found_status is True: + alarm_title = ",".join(row).split('= ') + if alarm_title[0].split()[0] == 'ListTitle': + list_title_found_status = True + temp_alarm_title = " ".join(alarm_title[1::]) + print(f'TEMP listTitle: {temp_alarm_title}') + if '\\n' in temp_alarm_title: + print(f'HERE listTitle {alarm_id}') + temp_alarm_title = '\n'.join(temp_alarm_title.split('\\n')) + print(f'HERE listTitle {alarm_id}***{temp_alarm_title}') + alarm_info_dict[alarm_id]['listTitle'] = temp_alarm_title + if alarm_info_dict[alarm_id]['listTitle'] == '': + alarm_info_dict[alarm_id]['listTitle'] = 'Alarm' if len(row) == 0: continue else: Index: shared/scripts/names.py =================================================================== diff -u -r84c1284ecff1f30169d50afb688be18934eb8506 -r7883bcc9c71da71d09d48d8998a99a9b8ad0640a --- shared/scripts/names.py (.../names.py) (revision 84c1284ecff1f30169d50afb688be18934eb8506) +++ shared/scripts/names.py (.../names.py) (revision 7883bcc9c71da71d09d48d8998a99a9b8ad0640a) @@ -152,27 +152,21 @@ # Pressure Adjustment o_treatmentAdjustmentPressures_Screen = {"container": o_Overlay, "objectName": "TreatmentAdjustmentPressures", "type": "ContentItem"} # arterial pressure range slider -o_arterial_range_slider = {"container": o_treatmentAdjustmentPressures_Screen, "id": "_arterialPressure", "type": "PressureRangeSlider"} -# arterial progress -o_arterial_progress = {"container": o_arterial_range_slider , "id": "_pressureRangeBar", "type": "RangeBar"} -o_arterial_marker = {"container": o_arterial_progress, "id": "_rangeMarkerValue", "type": "RangeMarker"} -o_arterial_progress_text_value = {"container": o_arterial_marker, "id": "_textValue", "type": "Text"} +o_arterial_range_slider = {"container": o_treatmentAdjustmentPressures_Screen, "id": "_arterialWindow", "type": "SliderPressure"} + # arterial slider -o_arterial_slider = {"container": o_arterial_range_slider, "id": "_pressureSlider" , "type": "RangeSlider"} +o_arterial_slider = {"container": o_arterial_range_slider, "id": "_slider" , "type": "Slider"} +o_arterial_slider_handle = {"container": o_arterial_slider, "id": "_handler", "type": "Rectangle"} # arterial limits bar -o_arterial_limitbar = {"container": o_arterial_range_slider, "id": "_rangeRect", "type": "RangeRect"} +o_arterial_limitbar = {"container": o_arterial_range_slider, "id": "_progressRect", "type": "ProgressRect"} # venous pressure range slider -o_venous_range_slider= {"container": o_treatmentAdjustmentPressures_Screen, "id": "_venousPressure", "type": "PressureRangeSlider"} -o_venous_progress = {"container": o_venous_range_slider , "id": "_pressureRangeBar", "type": "RangeBar"} -o_venous_marker = {"container": o_venous_progress , "id": "_rangeMarkerValue", "type": "RangeMarker" } -o_venous_progress_text_value = {"container": o_venous_marker , "id": "_textValue", "type": "Text"} +o_venous_range_slider= {"container": o_treatmentAdjustmentPressures_Screen, "id": "_venousWindow", "type": "SliderPressure"} # venous progress -o_venous_slider = {"container": o_venous_range_slider , "id": "_pressureSlider" , "type": "RangeSlider" } -o_venous_limitbar = {"container": o_venous_range_slider, "id": "_rangeRect" , "type": "RangeRect"} +o_venous_slider = {"container": o_venous_range_slider , "id": "_slider" , "type": "Slider" } +o_venous_limitbar = {"container": o_venous_range_slider, "id": "_progressRect" , "type": "ProgressRect"} #arterial adjustment low slider title text -o_arterial_text_low = {"container": o_Overlay, "text": "LOW", "type": "Text", "unnamed": 1, "visible": True} +o_venous_slider_handle = {"container": o_venous_slider, "id": "_handler", "type": "Rectangle"} #venous adjustment low slider title text -o_venous_text_low = {"container": o_Overlay, "occurrence": 2, "text": "LOW", "type": "Text", "unnamed": 1, "visible": True} o_MainHome_Create_Treatment_Button = {"container": o_MainHome_MainHome, "text": "CREATE TREATMENT", "type": "Text", "unnamed": 1, "visible": True} # Ultrafiltration Section Index: tst_main_treatment_pressure/test.py =================================================================== diff -u -r2e73714b63ae5fd2ef8b5acca5043e136454feff -r7883bcc9c71da71d09d48d8998a99a9b8ad0640a --- tst_main_treatment_pressure/test.py (.../test.py) (revision 2e73714b63ae5fd2ef8b5acca5043e136454feff) +++ tst_main_treatment_pressure/test.py (.../test.py) (revision 7883bcc9c71da71d09d48d8998a99a9b8ad0640a) @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*-" -## +# # # Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. # copyright # THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, @@ -46,6 +46,7 @@ ACCEPTED = 0 hd_simulator = HDSimulator() + def verify_arterial_and_venous_value_in_main_treatment_screen(accepted, art_low, art_high, ven_low, ven_high): """ Method to verify Arterial low and high @@ -60,7 +61,7 @@ """ test.startSection("Verifying Arterial low and high and Venous low and high value on main treatment screen") - if accepted==ACCEPTED: + if accepted == ACCEPTED: arterial_low = waitForObject(pressure_text_obj(art_low)) arterial_low = arterial_low.text.toInt() arterial_high = waitForObject(pressure_text_obj(art_high)) @@ -69,16 +70,16 @@ venous_low = venous_low.text.toInt() venous_high = waitForObject(pressure_text_obj(ven_high)) venous_high = venous_high.text.toInt() - test.compare(arterial_low, art_low, + test.compare(arterial_low, art_low, "Arterial low value should be '{}'".format(art_low)) - test.compare(arterial_high, art_high, + test.compare(arterial_high, art_high, "Arterial high value should be '{}'".format(art_high)) - test.compare(venous_low, ven_low, + test.compare(venous_low, ven_low, "Venous low value should be '{}'".format(ven_low)) - test.compare(venous_high, ven_high, + test.compare(venous_high, ven_high, "Venous high value should not be '{}'".format(ven_high)) else: if object.exists(pressure_text_obj(art_low)): @@ -104,19 +105,19 @@ arterial_scale_min = arterial_scale.minimum arterial_scale_max = arterial_scale.maximum test.log("Verifying Arterial scale range minimum value") - test.compare(arterial_scale_min, ARTERIAL_PRESSURE_MINIMUM, + test.compare(arterial_scale_min, ARTERIAL_PRESSURE_MINIMUM, "Arterial scale range minimum value should be {}".format(ARTERIAL_PRESSURE_MINIMUM)) test.log("Verifying Arterial scale range maximum value") - test.compare(arterial_scale_max, ARTERIAL_PRESSURE_MAXIMUM, + test.compare(arterial_scale_max, ARTERIAL_PRESSURE_MAXIMUM, "Arterial scale range maximum value should be {}".format(ARTERIAL_PRESSURE_MAXIMUM)) venous_scale = waitForObject(names.o_venous_range_slider) venous_scale_min = venous_scale.minimum venous_scale_max = venous_scale.maximum test.log("Verifying Venous scale range minimum value") - test.compare(venous_scale_min, VENOUS_PRESSURE_MINIMUM, + test.compare(venous_scale_min, VENOUS_PRESSURE_MINIMUM, "Venous scale range minimum value should be {}".format(VENOUS_PRESSURE_MINIMUM)) test.log("Verifying Arterial scale range maximum value") - test.compare(venous_scale_max, VENOUS_PRESSURE_MAXIMUM, + test.compare(venous_scale_max, VENOUS_PRESSURE_MAXIMUM, "Venous scale range maximum value should be {}".format(VENOUS_PRESSURE_MAXIMUM)) close_the_pop_up() test.endSection() @@ -133,13 +134,13 @@ arterial_min = pyInt(arterial_min.minimum) arterial_max = waitForObjectExists(names.o_arterial_limitbar) arterial_max = pyInt(arterial_max.maximum) - low_handler_parent = object.parent(waitForObjectExists(names.o_arterial_text_low)) - low_handler_children = object.children(low_handler_parent) - low_handler = low_handler_children[-2] - #adjusting the width and height of arterial low limit slider to click on the center of the object - #TODO: FixMe: Review the constant values to be changed to "/2" + # low_handler_parent = object.parent(waitForObjectExists(names.o_arterial_text_low)) + # low_handler_children = object.children(low_handler_parent) + low_handler = waitForObjectExists(names.o_arterial_slider_handle)#low_handler_children[-2] + # adjusting the width and height of arterial low limit slider to click on the center of the object + # TODO: FixMe: Review the constant values to be changed to "/2" width = pyInt(low_handler.width) - 15 - height = pyInt(low_handler.height)- 10 + height = pyInt(low_handler.height) - 10 if arterial_min == art_low: test.passes("Arterial range minimum is already set to {}".format(art_low)) elif arterial_min < art_low: @@ -148,7 +149,7 @@ Qt.NoModifier, Qt.LeftButton) arterial_min += 10 # arterial blood pressure low limit should be lower than the high limit by at least 30mmHg - if arterial_min == arterial_max - BUFFER_LOW_AND_HIGH_LIMITS: + if arterial_min == arterial_max - BUFFER_LOW_AND_HIGH_LIMITS: mouseDrag(low_handler, width, height, 1, 0, Qt.NoModifier, Qt.LeftButton) test.log("Arterial range minimum value cannot be moved beyond {}".format(arterial_min)) @@ -161,19 +162,19 @@ Qt.NoModifier, Qt.LeftButton) arterial_min -= 10 # arterial blood pressure low limit should be lower than the high limit by at least 30mmHg - if arterial_min == arterial_max - BUFFER_LOW_AND_HIGH_LIMITS: + if arterial_min == arterial_max - BUFFER_LOW_AND_HIGH_LIMITS: mouseDrag(low_handler, width, height, -1, 0, Qt.NoModifier, Qt.LeftButton) test.log("Arterial range minimum value cannot be moved beyond {}".format(arterial_min)) break else: continue # arterial blood pressure low limit should be lower than the high limit by atleast 30mmHg - if arterial_min == arterial_max - BUFFER_LOW_AND_HIGH_LIMITS: + if arterial_min == arterial_max - BUFFER_LOW_AND_HIGH_LIMITS: test.compare(waitForObjectExists(names.o_arterial_limitbar).minimum, arterial_min, "Arterial range minimum value cannot be moved beyond {}".format(arterial_min)) else: - test.compare(arterial_min, art_low, + test.compare(arterial_min, art_low, "Actual Arterial range minimum value: {} is equal to Expected value: {}".format(arterial_min, art_low)) test.endSection() @@ -189,11 +190,11 @@ arterial_max = pyInt(arterial_max.maximum) arterial_min = waitForObjectExists(names.o_arterial_limitbar) arterial_min = pyInt(arterial_min.minimum) - high_handler_parent = object.parent(waitForObjectExists(names.o_arterial_text_low)) - high_handler_children = object.children(high_handler_parent) - high_handler = high_handler_children[-1] - #adjusting the width and height of arterial high limit slider to click on the center of the object - #TODO: FixMe: Review the constant values to be changed to "/2" + # high_handler_parent = object.parent(waitForObjectExists(names.o_arterial_text_low)) + # high_handler_children = object.children(high_handler_parent) + high_handler = waitForObjectExists(names.o_arterial_slider_handle)#high_handler_children[-1] + # adjusting the width and height of arterial high limit slider to click on the center of the object + # TODO: FixMe: Review the constant values to be changed to "/2" width = pyInt(high_handler.width) - 15 height = pyInt(high_handler.height) - 10 if arterial_max == art_high: @@ -204,7 +205,7 @@ Qt.NoModifier, Qt.LeftButton) arterial_max += 10 # arterial blood pressure low limit should be lower than the high limit by at least 30mmHg - if arterial_max == arterial_min + BUFFER_LOW_AND_HIGH_LIMITS: + if arterial_max == arterial_min + BUFFER_LOW_AND_HIGH_LIMITS: mouseDrag(high_handler, width, height, 1, 0, Qt.NoModifier, Qt.LeftButton) test.log("Arterial range maximum value cannot be moved beyond {}".format(arterial_max)) @@ -217,19 +218,19 @@ Qt.NoModifier, Qt.LeftButton) arterial_max -= 10 # arterial blood pressure low limit should be lower than the high limit by at least 30mmHg - if arterial_max == arterial_min + BUFFER_LOW_AND_HIGH_LIMITS: + if arterial_max == arterial_min + BUFFER_LOW_AND_HIGH_LIMITS: mouseDrag(high_handler, width, height, -1, 0, Qt.NoModifier, Qt.LeftButton) test.log("Arterial range maximum value cannot be moved beyond {}".format(arterial_max)) break else: continue # arterial blood pressure low limit should be lower than the high limit by at least 30mmHg - if arterial_max == arterial_min + BUFFER_LOW_AND_HIGH_LIMITS: + if arterial_max == arterial_min + BUFFER_LOW_AND_HIGH_LIMITS: test.compare(waitForObjectExists(names.o_arterial_limitbar).maximum, arterial_max, "Arterial range maximum value cannot be moved beyond {}".format(arterial_max)) else: - test.compare(arterial_max, art_high, + test.compare(arterial_max, art_high, "Actual Arterial range maximum value: {} is equal to Expected value: {}".format(arterial_max, art_high)) test.endSection() @@ -245,11 +246,11 @@ ven_min = pyInt(ven_min.minimum) ven_max = waitForObjectExists(names.o_venous_limitbar) ven_max = pyInt(ven_max.maximum) - low_handler_parent = object.parent(waitForObjectExists(names.o_venous_text_low)) - low_handler_children = object.children(low_handler_parent) - low_handler = low_handler_children[-2] - #adjusting the width and height of venous low limit slider to click on the center of the object - #TODO: FixMe: Review the constant values to be changed to "/2" + # low_handler_parent = object.parent(waitForObjectExists(names.o_venous_text_low)) + # low_handler_children = object.children(low_handler_parent) + low_handler = waitForObjectExists(names.o_venous_slider_handle)#low_handler_children[-2] + # adjusting the width and height of venous low limit slider to click on the center of the object + # TODO: FixMe: Review the constant values to be changed to "/2" width = pyInt(low_handler.width) - 15 height = pyInt(low_handler.height) - 10 if ven_min == ven_low: @@ -259,7 +260,7 @@ mouseDrag(low_handler, width, height, 1, 0, Qt.NoModifier, Qt.LeftButton) ven_min += 10 - if ven_min == ven_max - BUFFER_LOW_AND_HIGH_LIMITS: # venous blood pressure low limit should be lower than the high limit by at least 30mmHg + if ven_min == ven_max - BUFFER_LOW_AND_HIGH_LIMITS: # venous blood pressure low limit should be lower than the high limit by at least 30mmHg mouseDrag(low_handler, width, height, 1, 0, Qt.NoModifier, Qt.LeftButton) test.log("Venous range minimum value cannot be moved beyond {}".format(ven_min)) @@ -272,19 +273,19 @@ Qt.NoModifier, Qt.LeftButton) ven_min -= 10 # venous blood pressure low limit should be lower than the high limit by at least 30mmHg - if ven_min == ven_max - BUFFER_LOW_AND_HIGH_LIMITS: + if ven_min == ven_max - BUFFER_LOW_AND_HIGH_LIMITS: mouseDrag(low_handler, width, height, -1, 0, Qt.NoModifier, Qt.LeftButton) test.log("Venous range minimum value cannot be moved beyond {}".format(ven_min)) break else: continue # venous blood pressure low limit should be lower than the high limit by at least 30mmHg - if ven_min == ven_max - BUFFER_LOW_AND_HIGH_LIMITS: + if ven_min == ven_max - BUFFER_LOW_AND_HIGH_LIMITS: test.compare(waitForObjectExists(names.o_venous_limitbar).minimum, ven_min, "Venous range minimum value cannot be moved beyond {}".format(ven_min)) else: - test.compare(ven_min, ven_low, + test.compare(ven_min, ven_low, "Actual Venous range minimum value: {} is equal to Expected value: {}".format(ven_min, ven_low)) test.endSection() @@ -300,11 +301,11 @@ ven_max = pyInt(ven_max.maximum) ven_min = waitForObjectExists(names.o_venous_limitbar) ven_min = pyInt(ven_min.minimum) - high_handler_parent = object.parent(waitForObjectExists(names.o_venous_text_low)) - high_handler_children = object.children(high_handler_parent) - high_handler = high_handler_children[-1] - #adjusting the width and height of venous high limit slider to click on the center of the object - #TODO: FixMe: Review the constant values to be changed to "/2" + # high_handler_parent = object.parent(waitForObjectExists(names.o_venous_text_low)) + # high_handler_children = object.children(high_handler_parent) + high_handler = waitForObjectExists(names.o_venous_slider_handle)#high_handler_children[-1] + # adjusting the width and height of venous high limit slider to click on the center of the object + # TODO: FixMe: Review the constant values to be changed to "/2" width = pyInt(high_handler.width) - 15 height = pyInt(high_handler.height) - 10 if ven_max == ven_high: @@ -315,7 +316,7 @@ Qt.NoModifier, Qt.LeftButton) ven_max += 10 # venous blood pressure low limit should be lower than the high limit by at least 30mmHg - if ven_max == ven_min + BUFFER_LOW_AND_HIGH_LIMITS: + if ven_max == ven_min + BUFFER_LOW_AND_HIGH_LIMITS: mouseDrag(high_handler, width, height, 1, 0, Qt.NoModifier, Qt.LeftButton) test.log("Venous range maximum value cannot be moved beyond {}".format(ven_max)) @@ -328,19 +329,19 @@ Qt.NoModifier, Qt.LeftButton) ven_max -= 10 # venous blood pressure low limit should be lower than the high limit by at least 30mmHg - if ven_max == ven_min + BUFFER_LOW_AND_HIGH_LIMITS: + if ven_max == ven_min + BUFFER_LOW_AND_HIGH_LIMITS: mouseDrag(high_handler, width, height, -1, 0, Qt.NoModifier, Qt.LeftButton) test.log("Venous range maximum value cannot be moved beyond {}".format(ven_max)) break else: continue # venous blood pressure low limit should be lower than the high limit by at least 30mmHg - if ven_max == ven_min + BUFFER_LOW_AND_HIGH_LIMITS: + if ven_max == ven_min + BUFFER_LOW_AND_HIGH_LIMITS: test.compare(waitForObjectExists(names.o_venous_limitbar).maximum, ven_max, "Venous range maximum value cannot be moved beyond {}".format(ven_max)) else: - test.compare(ven_max, ven_high, + test.compare(ven_max, ven_high, "Actual Venous range maximum value: {} is equal to Expected value: {}".format(ven_max, ven_high)) test.endSection() @@ -399,17 +400,17 @@ venous_low = venous_low.text.toInt() venous_high = waitForObject(pressure_pop_up_text_obj(ven_high)) venous_high = venous_high.text.toInt() - if accepted==ACCEPTED: - test.compare(arterial_low, art_low, + if accepted == ACCEPTED: + test.compare(arterial_low, art_low, "Arterial low value should be '{}'".format(art_low)) - test.compare(arterial_high, art_high, + test.compare(arterial_high, art_high, "Arterial high value should be '{}'".format(art_high)) - test.compare(venous_low, ven_low, + test.compare(venous_low, ven_low, "Venous low value should be '{}'".format(ven_low)) - test.compare(venous_high, ven_high, + test.compare(venous_high, ven_high, "Venous high value should be '{}'".format(ven_high)) else: if object.exists(pressure_text_obj(art_low)): @@ -439,11 +440,12 @@ """ test.log("Set Arterial Low to '{art_low}', Arterial High to '{art_high}', Venous Low to '{ven_low}', and Venous High to '{ven_high}'".format(art_low=art_low, art_high=art_high, ven_low=ven_low, ven_high=ven_high)) # Integration team needs to re-evaluate pressure adjustment values from low-high to windowed. - hd_simulator.cmd_send_treatment_adjust_pressures_limit_response(accepted=accepted, - reason=reason, - art_pressure_limit_window=art_low, - ven_pressure_limit_window=ven_low, + hd_simulator.cmd_send_treatment_adjust_pressures_limit_response(accepted=accepted, + reason=reason, + art_pressure_limit_window=art_low, + ven_pressure_limit_window=ven_low, ven_pressure_asym_limit_window=0) + def open_pressure_pop_up(): """ @@ -458,32 +460,34 @@ test.log("Verifying 'Pressure' title") pressure_title = waitForObject(pressure_pop_up_text_obj(PRESSURE_TITLE)) pressure_title = pressure_title.text.toUtf8().constData() - test.compare(pressure_title, PRESSURE_TITLE, + test.compare(pressure_title, PRESSURE_TITLE, "Pressure title should be '{}'".format(PRESSURE_TITLE)) arterial_title = waitForObject(pressure_pop_up_text_obj(ARTERIAL_TITLE)) arterial_title = arterial_title.text.toUtf8().constData() - test.compare(arterial_title, ARTERIAL_TITLE, + test.compare(arterial_title, ARTERIAL_TITLE, "Arterial title should be '{}'".format(ARTERIAL_TITLE)) - art_uom = waitForObject(pressure_pop_up_text_obj(ARTERIAL_UOM)) - art_uom = art_uom.text.toUtf8().constData() - test.compare(art_uom, ARTERIAL_UOM, - "Arterial unit of measurement should be '{}'".format(ARTERIAL_UOM)) - + # art_uom = waitForObject(pressure_pop_up_text_obj(ARTERIAL_UOM)) + # art_uom = art_uom.text.toUtf8().constData() + # test.compare(art_uom, ARTERIAL_UOM, + # "Arterial unit of measurement should be '{}'".format(ARTERIAL_UOM)) + # + venous_title = waitForObject(pressure_pop_up_text_obj(VENOUS_TITLE)) venous_title = venous_title.text.toUtf8().constData() - test.compare(venous_title, VENOUS_TITLE, + test.compare(venous_title, VENOUS_TITLE, "Venous title should be '{}'".format(VENOUS_TITLE)) - ven_uom = waitForObject(pressure_pop_up_text_obj(VENOUS_UOM)) - ven_uom = ven_uom.text.toUtf8().constData() - test.compare(ven_uom, VENOUS_UOM, - "Venous unit of measurement should be '{}'".format(VENOUS_UOM)) + # ven_uom = waitForObject(pressure_pop_up_text_obj(VENOUS_UOM)) + # ven_uom = ven_uom.text.toUtf8().constData() + # test.compare(ven_uom, VENOUS_UOM, + # "Venous unit of measurement should be '{}'".format(VENOUS_UOM)) test.endSection() def close_the_pop_up(): test.log("Closing pressure pop up") mouseClick(waitForObjectExists(names.o_uf_close_button)) + def click_on_confirm_btn(): test.log("Clicking on 'confirm' button") @@ -520,17 +524,17 @@ """ test.startSection("Set the arterial low and high pressure and venous low and high pressure and verify the same on main-treatment screen and pressures pop up screen") set_arterial_and_venous_pressure(accepted=accepted, reason=reason, - art_low=art_low, art_high=art_high, + art_low=art_low, art_high=art_high, ven_low=ven_low, ven_high=ven_high) - verify_arterial_and_venous_value_in_main_treatment_screen(accepted=accepted, - art_low=art_low, art_high=art_high, - ven_low=ven_low, ven_high=ven_high) + # verify_arterial_and_venous_value_in_main_treatment_screen(accepted=accepted, + # art_low=art_low, art_high=art_high, + # ven_low=ven_low, ven_high=ven_high) utils.waitForGUI(1) open_pressure_pop_up() - verify_arterial_and_venous_value_on_pressure_pop_up(accepted=accepted, - reason_id=reason, art_low=art_low, art_high=art_high, - ven_low=ven_low, ven_high=ven_high) + # verify_arterial_and_venous_value_on_pressure_pop_up(accepted=accepted, + # reason_id=reason, art_low=art_low, art_high=art_high, + # ven_low=ven_low, ven_high=ven_high) test.endSection() @@ -555,17 +559,17 @@ set_venous_ranges_min_val(ven_low) click_on_confirm_btn() set_arterial_and_venous_pressure(accepted=accepted, reason=reason, - art_low=art_low, art_high=art_high, + art_low=art_low, art_high=art_high, ven_low=ven_low, ven_high=ven_high) - verify_arterial_and_venous_value_in_main_treatment_screen(accepted=accepted, - art_low=art_low, art_high=art_high, - ven_low=ven_low, ven_high=ven_high) + # verify_arterial_and_venous_value_in_main_treatment_screen(accepted=accepted, + # art_low=art_low, art_high=art_high, + # ven_low=ven_low, ven_high=ven_high) utils.waitForGUI(1) open_pressure_pop_up() - verify_arterial_and_venous_value_on_pressure_pop_up(accepted=accepted, - reason_id=reason, art_low=art_low, art_high= art_high, - ven_low=ven_low, ven_high=ven_high) + # verify_arterial_and_venous_value_on_pressure_pop_up(accepted=accepted, + # reason_id=reason, art_low=art_low, art_high=art_high, + # ven_low=ven_low, ven_high=ven_high) test.endSection() @@ -580,27 +584,27 @@ test.log("Setting arterial pressure {}".format(arterial_prs)) hd_simulator.cmd_set_pressure_occlusion_data(arterial_prs=arterial_prs, venous_prs=0, blood_pump_occlusion=0, - art_max_limit==0, + pressure_state=0, + art_max_limit=0, art_min_limit=0, ven_max_limit=0, ven_min_limit=0, filtered_arterial_prs=0, - filtered_venous_prs=0 ) + filtered_venous_prs=0) - arterial_current_value = waitForObjectExists(names.o_arterial_marker).value arterial_limit_min = waitForObjectExists(names.o_arterial_limitbar).minimum arterial_limit_max = waitForObjectExists(names.o_arterial_limitbar).maximum arterial_slider_value = waitForObjectExists(names.o_arterial_range_slider).value test.compare(arterial_slider_value, arterial_prs, "Actual arterial pressure: {} should be equal to expected arterial pressure: {}".format(arterial_slider_value, arterial_prs)) - arterial_progress_value = waitForObjectExists(names.o_arterial_progress_text_value) - test.compare(arterial_progress_value.text.toInt(), arterial_prs, - "Actual arterial pressure: {} should be equal to expected arterial pressure: {}".format(arterial_progress_value.text.toInt(), arterial_prs)) - if arterial_limit_min <= arterial_current_value <= arterial_limit_max: - test.compare(arterial_progress_value.color.name, in_range_color, - "Arterial progress value {} is in range".format(arterial_current_value)) - else: - test.compare(arterial_progress_value.color.name, out_of_range_color, - "Arterial progress value {} is out of range".format(arterial_current_value)) + # arterial_progress_value = waitForObjectExists(names.o_arterial_progress_text_value) + # test.compare(arterial_progress_value.text.toInt(), arterial_prs, + # "Actual arterial pressure: {} should be equal to expected arterial pressure: {}".format(arterial_progress_value.text.toInt(), arterial_prs)) + # if arterial_limit_min <= arterial_slider_value <= arterial_limit_max: + # test.compare(arterial_progress_value.color.name, in_range_color, + # "Arterial progress value {} is in range".format(arterial_slider_value)) + # else: + # test.compare(arterial_progress_value.color.name, out_of_range_color, + # "Arterial progress value {} is out of range".format(arterial_slider_value)) close_the_pop_up() test.endSection() @@ -614,28 +618,29 @@ open_pressure_pop_up() for venous_prs in range(VENOUS_PRESSURE_MINIMUM, VENOUS_PRESSURE_MAXIMUM + PRESSURE_STEPS, PRESSURE_STEPS * 10): test.log("Setting Venous pressure {}".format(venous_prs)) - hd_simulator.cmd_set_pressure_occlusion_data(arterial_prs=arterial_prs, venous_prs=0, + hd_simulator.cmd_set_pressure_occlusion_data(arterial_prs=0, venous_prs=venous_prs, blood_pump_occlusion=0, - art_max_limit==0, + pressure_state=0, + art_max_limit=0, art_min_limit=0, ven_max_limit=0, ven_min_limit=0, filtered_arterial_prs=0, - filtered_venous_prs=0 ) - venous_current_value = waitForObjectExists(names.o_venous_marker).value + filtered_venous_prs=0) + # venous_current_value = waitForObjectExists(names.o_venous_marker).value venous_limit_min = waitForObjectExists(names.o_venous_limitbar).minimum venous_limit_max = waitForObjectExists(names.o_venous_limitbar).maximum venous_slider_value = waitForObjectExists(names.o_venous_range_slider).value test.compare(venous_slider_value, venous_prs, "Actual venous pressure: {} should be equal to expected venous pressure: {}".format(venous_slider_value, venous_prs)) - venous_progress_value = waitForObjectExists(names.o_venous_progress_text_value) - test.compare(venous_progress_value.text.toInt(), venous_prs, - "Actual venous pressure: {} should be equal to expected venous pressure: {}".format(venous_progress_value.text.toInt(), venous_prs)) - if venous_limit_min <= venous_current_value <= venous_limit_max: - test.compare(venous_progress_value.color.name, in_range_color, - "Venous progress value {} is in range".format(venous_current_value)) - else: - test.compare(venous_progress_value.color.name, out_of_range_color, - "Venous progress value {} is out of range".format(venous_current_value)) + # venous_progress_value = waitForObjectExists(names.o_venous_progress_text_value) + # test.compare(venous_progress_value.text.toInt(), venous_prs, + # "Actual venous pressure: {} should be equal to expected venous pressure: {}".format(venous_progress_value.text.toInt(), venous_prs)) + # if venous_limit_min <= venous_current_value <= venous_limit_max: + # test.compare(venous_progress_value.color.name, in_range_color, + # "Venous progress value {} is in range".format(venous_current_value)) + # else: + # test.compare(venous_progress_value.color.name, out_of_range_color, + # "Venous progress value {} is out of range".format(venous_current_value)) close_the_pop_up() test.endSection() @@ -646,26 +651,25 @@ startApplication(AUT_NAME) hd_simulator.cmd_send_power_on_self_test_version_request() - hd_simulator.cmd_set_treatment_states_data(sub_mode=2, uf_state=0, saline_state=0, - heparin_state=0, rinseback_state=0, + hd_simulator.cmd_set_treatment_states_data(sub_mode=2, uf_state=0, saline_state=0, + heparin_state=0, rinseback_state=0, recirculate_state=0, blood_prime_state=0, 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_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, + 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, + 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, @@ -677,11 +681,11 @@ # 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, + 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=ACCEPTED, reason=0, - art_low=ART_LOW_VAL_MINUS_80, art_high=ART_HIGH_VAL_175, + 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, @@ -691,8 +695,6 @@ # 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_ui_logs/test.py =================================================================== diff -u -r84c1284ecff1f30169d50afb688be18934eb8506 -r7883bcc9c71da71d09d48d8998a99a9b8ad0640a --- tst_ui_logs/test.py (.../test.py) (revision 84c1284ecff1f30169d50afb688be18934eb8506) +++ tst_ui_logs/test.py (.../test.py) (revision 7883bcc9c71da71d09d48d8998a99a9b8ad0640a) @@ -78,49 +78,56 @@ #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]) + verify_log(msg_id = MsgIds.MSG_ID_TREATMENT_TIME_DATA.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]) + verify_log(msg_id = MsgIds.MSG_ID_TREATMENT_TIME_DATA.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]) + verify_log(msg_id = MsgIds.MSG_ID_TREATMENT_TIME_DATA.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]) + mc_current = 12.5, pwm = 32.3, rotor_count = 30, + pres_flow=50, rotor_hall=10 ) + 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,50,10]) #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]) + mc_current = 0.44, pwm = 20.0, + rotor_count = 30, pres_flow=11, rotor_hall=23 ) + 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,30,11,23]) #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]) + pressure_state = 10, art_min_limit = 200, art_max_limit = 340, + ven_min_limit = 20, ven_max_limit = 50, filtered_arterial_prs = 30.4, + filtered_venous_prs = 21.4) + verify_log(msg_id = MsgIds.MSG_ID_PRESSURE_OCCLUSION_DATA.value, msg = "Pressure/Occlusion", param = [54.5,20.1,100,10,200,340,20,50,30.4,21.4]) #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]) + mc_current = 21.2, pwm = 322.2, + dop_corr_offset = 15.2, + dop_calc_rate = 16.3, uf_calc_rate = 21.5, rotor_hall = 25, + current_set_uf_rate = 16.5) + 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,15.2,16.3,21.5,25,16.5]) #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]) + verify_log(msg_id = str(MsgIds.MSG_ID_TREATMENT_PARAM_CHANGE_RANGES_DATA.value), msg = "TreatmentRanges", param = [60,470,22.600,34.200,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, required = 0.1) - verify_log(msg_id = MsgIds.MSG_ID_HD_HEPARIN_DATA_BROADCAST.value, msg = "Heparin", param = [0.1,0.1]) + verify_log(msg_id = MsgIds.MSG_ID_HD_HEPARIN_DATA.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, @@ -171,15 +178,12 @@ 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") + verify_log(msg_id = MsgIds.MSG_ID_HD_FLUID_LEAK_STATE_DATA.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]) + blood_leak_zero_status_counter = 4, blood_leak_serial_state = 2) + verify_log(msg_id = MsgIds.MSG_ID_HD_BLOOD_LEAK_DATA.value, msg = "BloodLeak", param = [1,1,4,2]) #0x9300 hd_simulator.cmd_send_hd_air_bubble_data(venous_air_bubble_status = 2, venous_air_bubble_state = 5) @@ -209,7 +213,7 @@ payload += integer_to_bytearray(1) 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") + verify_log(msg_id=MsgIds.MSG_ID_HD_ALARM_INFORMATION_DATA.value, msg="~HD_Alarm_Information") #0xA200 payload = unsigned_integer_to_bytearray(20) @@ -257,35 +261,37 @@ for mode in range(mode_data): 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]) + verify_log(msg_id = MsgIds.MSG_ID_HD_OP_MODE_DATA.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]) + recirculate_state = 7, patient_connection_state = 8, + wet_selftests_state = 1, pretreatment_rsrvr_state = 2) + verify_log(msg_id = MsgIds.MSG_ID_PRE_TREATMENT_STATE_DATA.value, msg = "PreTreatmentStates",param = [s_mode,1,2,3,4,5,6,7,8,1,2]) #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]) + verify_log(msg_id = MsgIds.MSG_ID_TREATMENT_STATE_DATA.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") + verify_log(msg_id=MsgIds.MSG_ID_HD_POST_TREATMENT_STATE_DATA.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_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 = "DisinfectStart") + # TODO need to add or figure out what happened to it + # standby_mode_data = HDStandbyStates.STANDBY_WAIT_FOR_DISINFECT_STATE.value + # for standby_mode in range(standby_mode_data): + # 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 = "DisinfectStart") #0x8000 @@ -295,7 +301,7 @@ # 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_DISINFECT_RESPONSE.value, msg="DisinfectMode") + verify_log(msg_id=MsgIds.MSG_ID_HD_DISINFECT_RESPONSE.value, msg="DisinfectStart") #RINSEBACK @@ -317,7 +323,7 @@ #0x5A00 hd_simulator.cmd_send_treatment_recirculate_data(timeout_total = 120, timeout_count_down = 20) - verify_log(msg_id = MsgIds.MSG_ID_HD_RECIRC_PROGRESS.value, msg = "Recirculate", param = [120,20]) + verify_log(msg_id = MsgIds.MSG_ID_HD_RECIRC_PROGRESS_DATA.value, msg = "Recirculate", param = [120,20]) #Treatment End(sub-mode) #0x5800 @@ -330,7 +336,7 @@ #0x5900 #there is an additional parameter in the log hd_simulator.cmd_send_treatment_blood_prime_data(target = 22.2, current = 0.6) - verify_log(msg_id = MsgIds.MSG_ID_HD_BLOOD_PRIME_PROGRESS.value, msg = "BloodPrime", param = [22.2,0.6]) + verify_log(msg_id = MsgIds.MSG_ID_HD_BLOOD_PRIME_PROGRESS_DATA.value, msg = "BloodPrime", param = [22.2,0.6]) #Treatment Stop(sub-mode) #0x4900 @@ -345,7 +351,7 @@ payload = unsigned_integer_to_bytearray(20) hd_simulator.cmd_send_hd_general_response(message_id=10, accepted=1, reason=1, is_pure_data=False, has_parameters=True, parameters_payload=payload) hd_simulator.cmd_send_hd_general_response(message_id=10, accepted=0, reason=0, is_pure_data=False, has_parameters=True, parameters_payload=payload) - verify_log(msg_id = MsgIds.MSG_ID_RTC_EPOCH.value, msg = "~HD_RTC_Epoch_Data") + verify_log(msg_id = MsgIds.MSG_ID_RTC_EPOCH_DATA.value, msg = "~HD_RTC_Epoch_Data") #0x6E00 hd_simulator.cmd_send_set_rtc_response(response = 0, reason = 1) @@ -358,11 +364,11 @@ #Power #0x0100 hd_simulator.cmd_send_poweroff_command() - verify_log(msg_id = MsgIds.MSG_ID_POWER_OFF.value, msg = "PowerOff") + verify_log(msg_id = MsgIds.MSG_ID_OFF_BUTTON_PRESS_REQUEST.value, msg = "PowerOff") #0x0E00 hd_simulator.cmd_send_poweroff_imminent() - verify_log(msg_id = MsgIds.MSG_ID_POWER_OFF_IMMINENT.value, msg = "ShuttingDown") + verify_log(msg_id = MsgIds.MSG_ID_POWER_OFF_WARNING.value, msg = "ShuttingDown") #Events #0xA400 @@ -419,15 +425,15 @@ #Versions #0x1D00 hd_simulator.cmd_send_version_hd_data(major=1, minor=1, micro=0, build=1, fpga_id=0, fpga_major=1, fpga_minor=0, fpga_lab=1, compatibility_rev=0) - verify_log(msg_id = MsgIds.MSG_ID_HD_VERSION.value, msg = "VersionRsp", param = [1,1,0,1,0,1,0,1,0]) + verify_log(msg_id = MsgIds.MSG_ID_HD_VERSION_REPONSE.value, msg = "VersionRsp", param = [1,1,0,1,0,1,0,1,0]) #0x1E00 dg_simulator.cmd_send_version_dg_data(major=1, minor=1, micro=0, build=1, fpga_id=0, fpga_major=1, fpga_minor=0, fpga_lab=1, compatibility_rev=0) - verify_log(msg_id = MsgIds.MSG_ID_DG_VERSION.value, msg = "VersionRsp", param = [1,1,0,1,0,1,0,1,0]) + verify_log(msg_id = MsgIds.MSG_ID_DG_VERSION_REPONSE.value, msg = "VersionRsp", param = [1,1,0,1,0,1,0,1,0]) #0x9E00 hd_simulator.cmd_send_hd_request_ui_version() - verify_log(msg_id = MsgIds.MSG_ID_HD_UI_VERSION_INFO_RESPONSE.value, msg = "VersionReq") + verify_log(msg_id = MsgIds.MSG_ID_HD_UI_VERSION_INFO_REQUEST.value, msg = "VersionReq") #0x2000 dg_simulator.cmd_set_dg_pressures_data(ro_inlet_pressure = 200.0, ro_outlet_pressure = 100.0, drain_inlet_pressure = 295.0, drain_outlet_pressure = 300.0) @@ -457,7 +463,7 @@ dg_simulator.cmd_send_dg_general_response(message_id=42, 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=42, accepted=1, reason=1, is_pure_data=False, has_parameters=True, parameters_payload=payload, channel_id=DenaliChannels.dg_sync_broadcast_ch_id) dg_simulator.cmd_set_dg_valves_states(valves_states = 3) - verify_log(msg_id = MsgIds.MSG_ID_DG_VALVES_STATES.value, msg = "ValvesStates") + verify_log(msg_id = MsgIds.MSG_ID_DG_VALVES_STATES_DATA.value, msg = "ValvesStates") #0x2C00 #there is a parameter mismatch here as the log contains a 3 float values [0.0,0.0,0.0] instead of 3 given integers @@ -466,7 +472,7 @@ #0x0C00 dg_simulator.cmd_set_dg_load_cell_readings_data(reservoir1_primary = 1.0, reservoir1_backup = 2.0,reservoir2_primary = 3.0, reservoir2_backup = 4.0) - verify_log(msg_id = MsgIds.MSG_ID_LOAD_CELL_READINGS.value, msg = "LoadCell", param = [1.0,2.0,3.0,4.0]) + verify_log(msg_id = MsgIds.MSG_ID_LOAD_CELL_READINGS_DATA.value, msg = "LoadCell", param = [1.0,2.0,3.0,4.0]) #0x2D00(broadcast) payload = float_to_bytearray(200.22) @@ -563,10 +569,10 @@ #0x6B00 payload = integer_to_bytearray(0) dg_simulator.cmd_send_dg_general_response(message_id=107, accepted=0, reason=1, is_pure_data=False, has_parameters=True, parameters_payload=payload) - verify_log(msg_id=MsgIds.MSG_ID_DG_FLUID_LEAK_STATE.value, msg="~DG_Fluid_Leak_Data") + verify_log(msg_id=MsgIds.MSG_ID_DG_FLUID_LEAK_STATE_DATA.value, msg="~DG_Fluid_Leak_Data") payload = integer_to_bytearray(1) dg_simulator.cmd_send_dg_general_response(message_id=107, accepted=1, reason=1, is_pure_data=False, has_parameters=True, parameters_payload=payload) - verify_log(msg_id=MsgIds.MSG_ID_DG_FLUID_LEAK_STATE.value, msg="~DG_Fluid_Leak_Data") + verify_log(msg_id=MsgIds.MSG_ID_DG_FLUID_LEAK_STATE_DATA.value, msg="~DG_Fluid_Leak_Data") #0x7A00 @@ -623,10 +629,10 @@ #TODO: Payload values need to been changed after discussion payload = integer_to_bytearray(1) dg_simulator.cmd_send_dg_general_response(message_id=167, 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_ALARM_INFO.value, msg=None) + verify_log(msg_id=MsgIds.MSG_ID_DG_ALARM_INFO_DATA.value, msg=None) payload = integer_to_bytearray(0) dg_simulator.cmd_send_dg_general_response(message_id=167, 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_ALARM_INFO.value, msg=None) + verify_log(msg_id=MsgIds.MSG_ID_DG_ALARM_INFO_DATA.value, msg=None) #0xAA00 @@ -690,7 +696,7 @@ payload += unsigned_short_to_bytearray(72) hd_simulator.cmd_send_hd_general_response(message_id=2, 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=2, accepted=0, reason=0, 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_STATUS.value, msg = "AlarmStatus") + verify_log(msg_id = MsgIds.MSG_ID_ALARM_STATUS_DATA.value, msg = "AlarmStatus") #0x0300 #parameter data type mismatch @@ -820,14 +826,14 @@ #PRS-58: In-Line Blood Pressure Limits #0x4700 - hd_simulator.cmd_send_treatment_adjust_pressures_limit_response(accepted = 1, reason = 1,arterial_low = 2, arterial_high = 3, venous_low = 4, venous_high = 5) - verify_log(msg_id = MsgIds.MSG_ID_HD_PRESSURE_LIMITS_CHANGE_RESPONSE.value, msg = "AdjustPressuresLimits", param = [1, 1, 2, 3, 4, 5]) - hd_simulator.cmd_send_treatment_adjust_pressures_limit_response(accepted = 0, reason = 1,arterial_low = 2, arterial_high = 3, venous_low = 4, venous_high = 5) - verify_log(msg_id = MsgIds.MSG_ID_HD_PRESSURE_LIMITS_CHANGE_RESPONSE.value, msg = "AdjustPressuresLimits", param = [0, 1, 2, 3, 4, 5]) + hd_simulator.cmd_send_treatment_adjust_pressures_limit_response(accepted = 1, reason = 1,art_pressure_limit_window = 2, ven_pressure_limit_window = 3, ven_pressure_asym_limit_window = 4) + verify_log(msg_id = MsgIds.MSG_ID_HD_PRESSURE_LIMITS_CHANGE_RESPONSE.value, msg = "AdjustPressuresLimits", param = [1, 1, 2, 3, 4]) + hd_simulator.cmd_send_treatment_adjust_pressures_limit_response(accepted = 1, reason = 1,art_pressure_limit_window = 2, ven_pressure_limit_window = 3, ven_pressure_asym_limit_window = 4) + verify_log(msg_id = MsgIds.MSG_ID_HD_PRESSURE_LIMITS_CHANGE_RESPONSE.value, msg = "AdjustPressuresLimits", param = [0, 1, 2, 3, 4]) #Service Information #0x8A00 - hd_simulator._handler_system_usage_response() + # hd_simulator._handler_system_usage_response() payload = integer_to_bytearray(1619628663) payload += integer_to_bytearray(1619887863) hd_simulator.cmd_send_hd_general_response(message_id=138, accepted=0, reason=1, is_pure_data= False, has_parameters=True, parameters_payload=payload) @@ -840,7 +846,7 @@ payload += integer_to_bytearray(1661167101) dg_simulator.cmd_send_dg_general_response(message_id=140, accepted=0, reason=1) dg_simulator.cmd_send_dg_general_response(message_id=140, accepted=1, reason=1) - verify_log(msg_id=MsgIds.MSG_ID_DG_SERVICE_SCHEDULE_DATA.value, msg="ServiceDate") + verify_log(msg_id=MsgIds.MSG_ID_DG_SERVICE_SCHEDULE_DATA_TO_UI.value, msg="ServiceDate") #System Usage Information #0x8B00 @@ -860,14 +866,14 @@ payload = unsigned_integer_to_bytearray(6) hd_simulator.cmd_send_hd_general_response(message_id=33, accepted=0, reason=1, is_pure_data= False, has_parameters=True, parameters_payload=payload) hd_simulator.cmd_send_hd_general_response(message_id=33, accepted=1, reason=1, is_pure_data= False, has_parameters=True, parameters_payload=payload) - verify_log(msg_id=MsgIds. MSG_ID_DG_SWITCH_RESERVOIR_CMD.value, msg="~DG_Switch_Res_Cmd") + verify_log(msg_id=MsgIds. MSG_ID_DG_SWITCH_RESERVOIR_CMD_REQUEST.value, msg="~DG_Switch_Res_Cmd") #0x2200 payload = unsigned_integer_to_bytearray(6) payload += unsigned_integer_to_bytearray(0) hd_simulator.cmd_send_hd_general_response(message_id=34, accepted=0, reason=1, is_pure_data= False, has_parameters=True, parameters_payload=payload) hd_simulator.cmd_send_hd_general_response(message_id=34, accepted=1, reason=1, is_pure_data= False, has_parameters=True, parameters_payload=payload) - verify_log(msg_id=MsgIds. MSG_ID_DG_FILL_CMD.value, msg="~DG_Fill_Cmd") + verify_log(msg_id=MsgIds. MSG_ID_DG_FILL_CMD_REQUEST.value, msg="~DG_Fill_Cmd") #0x2300 payload = unsigned_integer_to_bytearray(6) @@ -876,7 +882,7 @@ payload += unsigned_integer_to_bytearray(8) hd_simulator.cmd_send_hd_general_response(message_id=35, accepted=0, reason=1, is_pure_data= False, has_parameters=True, parameters_payload=payload) hd_simulator.cmd_send_hd_general_response(message_id=35, accepted=1, reason=1, is_pure_data= False, has_parameters=True, parameters_payload=payload) - verify_log(msg_id=MsgIds.MSG_ID_DG_DRAIN_CMD.value, msg="~DG_Drain_Cmd") + verify_log(msg_id=MsgIds.MSG_ID_DG_DRAIN_CMD_REQUEST.value, msg="~DG_Drain_Cmd") #0x1900 payload = float_to_bytearray(10.5) @@ -892,34 +898,34 @@ payload = unsigned_integer_to_bytearray(1) hd_simulator.cmd_send_hd_general_response(message_id=38, accepted=0, reason=1, is_pure_data=False, has_parameters=True, parameters_payload=payload) hd_simulator.cmd_send_hd_general_response(message_id=38, accepted=1, reason=1, is_pure_data=False, has_parameters=True, parameters_payload=payload) - verify_log(msg_id=MsgIds.MSG_ID_STARTING_STOPPING_TREATMENT_CMD.value, msg="~DG_Cmd") + verify_log(msg_id=MsgIds.MSG_ID_STARTING_STOPPING_TREATMENT_CMD_REQUEST.value, msg="~DG_Cmd") #0x2900 payload = unsigned_integer_to_bytearray(2) hd_simulator.cmd_send_hd_general_response(message_id=41, accepted=0, reason=1, is_pure_data=False, has_parameters=True, parameters_payload=payload) hd_simulator.cmd_send_hd_general_response(message_id=41, accepted=1, reason=1, is_pure_data=False, has_parameters=True, parameters_payload=payload) - verify_log(msg_id=MsgIds.MSG_ID_DG_SAMPLE_WATER_CMD.value, msg="~DG_Sample_Water_Cmd") + verify_log(msg_id=MsgIds.MSG_ID_DG_SAMPLE_WATER_CMD_REQUEST.value, msg="~DG_Sample_Water_Cmd") #0x2B00 payload = unsigned_integer_to_bytearray(1) 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_HD_START_STOP_TRIMMER_HEATER_CMD_REQUEST.value, msg="~DG_Trimmer_Htr_Cmd") #0x3000 payload = unsigned_integer_to_bytearray(1) hd_simulator.cmd_send_hd_general_response(message_id=48, accepted=0, reason=1, is_pure_data=False, has_parameters=True, parameters_payload=payload) hd_simulator.cmd_send_hd_general_response(message_id=48, accepted=1, reason=1, is_pure_data=False, has_parameters=True, parameters_payload=payload) - verify_log(msg_id=MsgIds.MSG_ID_DG_START_STOP_HEAT_DISINFECT.value, msg="~DG_Heat_Disinfect_Cmd") + verify_log(msg_id=MsgIds.MSG_ID_DG_START_STOP_HEAT_DISINFECT_CMD_REQUEST.value, msg="~DG_Heat_Disinfect_Cmd") #0x5B00 payload = unsigned_integer_to_bytearray(1) hd_simulator.cmd_send_hd_general_response(message_id=91, accepted=0, reason=1, is_pure_data=False, has_parameters=True, parameters_payload=payload) - verify_log(msg_id=MsgIds.MSG_ID_DG_CHANGE_VALVE_SETTING_CMD.value, msg="~DG_Chg_Valves_Cmd") + verify_log(msg_id=MsgIds.MSG_ID_DG_CHANGE_VALVE_SETTING_CMD_REQUEST.value, msg="~DG_Chg_Valves_Cmd") payload = unsigned_integer_to_bytearray(0) hd_simulator.cmd_send_hd_general_response(message_id=91, accepted=0, reason=1, is_pure_data=False, has_parameters=True, parameters_payload=payload) - verify_log(msg_id=MsgIds.MSG_ID_DG_CHANGE_VALVE_SETTING_CMD.value, msg="~DG_Chg_Valves_Cmd") + verify_log(msg_id=MsgIds.MSG_ID_DG_CHANGE_VALVE_SETTING_CMD_REQUEST.value, msg="~DG_Chg_Valves_Cmd") #0x5100 @@ -940,12 +946,12 @@ payload = unsigned_integer_to_bytearray(1) hd_simulator.cmd_send_hd_general_response(message_id=121, accepted=0, reason=1, is_pure_data=False, has_parameters=True, parameters_payload=payload) hd_simulator.cmd_send_hd_general_response(message_id=121, accepted=1, reason=1, is_pure_data=False, has_parameters=True, parameters_payload=payload) - verify_log(msg_id = MsgIds.MSG_ID_DG_START_STOP_FLUSH.value, msg = "~DG_Flush_Cmd") + verify_log(msg_id = MsgIds.MSG_ID_DG_START_STOP_FLUSH_CMD_REQUEST.value, msg = "~DG_Flush_Cmd") #0xA900 hd_simulator.cmd_send_hd_general_response(message_id=169, accepted=0, reason=1, is_pure_data=False, has_parameters=True, parameters_payload=None) hd_simulator.cmd_send_hd_general_response(message_id=169, accepted=1, reason=1, is_pure_data=False, has_parameters=True, parameters_payload=None) - verify_log(msg_id=MsgIds.MSG_ID_HD_REQUEST_DG_CONCENTRATE_MIXING_RATIOS.value, msg="~DG_Mixing_Ratio_Fill_Prep_Request") + verify_log(msg_id=MsgIds.MSG_ID_HD_DG_CONCENTRATE_MIXING_RATIOS_REQUEST.value, msg="~DG_Mixing_Ratio_Fill_Prep_Request") #FW Debug #0xF1FF @@ -1003,12 +1009,12 @@ #ID:0x6000 dg_simulator.cmd_send_dg_pre_treatment_filter_flush_progress_data(total = 120, countdown = 60) - verify_log(msg_id = MsgIds.MSG_ID_DG_FILTER_FLUSH_PROGRESS.value, msg = "FilterFlush", param = [120,60]) + verify_log(msg_id = MsgIds.MSG_ID_DG_FILTER_FLUSH_PROGRESS_DATA.value, msg = "FilterFlush", param = [120,60]) #Pre-Treatment No Cartridge Self-Test (sub-mode) #ID:0x6100 hd_simulator.cmd_send_pre_treatment_self_test_no_cartridge_progress_data(total = 120, countdown = 60) - verify_log(msg_id = MsgIds.MSG_ID_HD_NO_CART_SELF_TEST_PROGRESS.value, msg = "SelfTestNoCartridge", param = [120,60]) + verify_log(msg_id = MsgIds.MSG_ID_HD_NO_CART_SELF_TEST_PROGRESS_DATA.value, msg = "SelfTestNoCartridge", param = [120,60]) #Pre-Treatment Disposable Installation (sub-mode) #ID:0xAD00 @@ -1023,7 +1029,7 @@ #Pre-Treatment Dry Self-Test (sub-mode) #ID:0x6300 hd_simulator.cmd_send_pre_treatment_self_test_dry_progress_data(total = 120, countdown = 60) - verify_log(msg_id = MsgIds.MSG_ID_HD_DRY_SELF_TEST_PROGRESS.value, msg = "SelfTestDry", param = [120,60]) + verify_log(msg_id = MsgIds.MSG_ID_HD_DRY_SELF_TEST_PROGRESS_DATA.value, msg = "SelfTestDry", param = [120,60]) #Pre-Treatment Prime (sub-mode) #ID:0x3D00 @@ -1186,21 +1192,22 @@ #verify_log(msg_id = MsgIds.MSG_ID_HD_PATIENT_CONNECTION_CONFIRM_RESPONSE.value, msg = "AdjustPatientConnectionBegin", param = [0,1]) - #ID:0x8200 - payload = unsigned_integer_to_bytearray(0) - payload += unsigned_integer_to_bytearray(7) - hd_simulator.cmd_send_hd_general_response(message_id=130, accepted=1, reason=1, is_pure_data = True, has_parameters = True, parameters_payload = payload) - hd_simulator.cmd_send_hd_general_response(message_id=130, accepted=0, reason=0, is_pure_data = True, has_parameters = True, parameters_payload = payload) - hd_simulator.cmd_send_hd_disinfect_chemical_confirm(accepted = 1, reason = 0) - hd_simulator.cmd_send_hd_disinfect_chemical_confirm(accepted = 0, reason = 0) - verify_log(msg_id = MsgIds.MSG_ID_HD_CHEM_DISINFECT_CONFIRM_RESPONSE.value, msg = "Chemical Disinfect User Confirm Response") + # #ID:0x8200 + # TODO Determine if check still valid + # payload = unsigned_integer_to_bytearray(0) + # payload += unsigned_integer_to_bytearray(7) + # hd_simulator.cmd_send_hd_general_response(message_id=130, accepted=1, reason=1, is_pure_data = True, has_parameters = True, parameters_payload = payload) + # hd_simulator.cmd_send_hd_general_response(message_id=130, accepted=0, reason=0, is_pure_data = True, has_parameters = True, parameters_payload = payload) + # hd_simulator.cmd_send_hd_disinfect_chemical_confirm(accepted = 1, reason = 0) + # hd_simulator.cmd_send_hd_disinfect_chemical_confirm(accepted = 0, reason = 0) + # verify_log(msg_id = MsgIds.MSG_ID_HD_CHEM_DISINFECT_CONFIRM_RESPONSE.value, msg = "Chemical Disinfect User Confirm Response") #ID:0x8300 payload = unsigned_integer_to_bytearray(0) payload += unsigned_integer_to_bytearray(7) dg_simulator.cmd_send_dg_general_response(message_id=131, accepted=1, reason=1, is_pure_data = True, has_parameters = True, parameters_payload = payload) dg_simulator.cmd_send_dg_general_response(message_id=131, accepted=0, reason=0, is_pure_data = True, has_parameters = True, parameters_payload = payload) - dg_simulator.cmd_send_dg_disinfect_progress_time_flush(total = 0, countdown = 60) + # dg_simulator.cmd_send_dg_disinfect_progress_time_flush(total = 0, countdown = 60) #verify_log(msg_id = MsgIds.MSG_ID_DG_FLUSH_TIME_DATA.value, msg = "DisinfectDGFlushTime") #ID:0x8400 @@ -1224,14 +1231,14 @@ hd_simulator.cmd_send_hd_general_response(message_id=153, 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=153, 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_serial_hd_data(serial = 'AGHHG1234GHJABC') - verify_log(msg_id = MsgIds.MSG_ID_HD_SERIAL_NUMBER.value, msg = "Serial", param = ['AGHHG1234GHJABC']) + verify_log(msg_id = MsgIds.MSG_ID_HD_SERIAL_NUMBER_RESPONSE.value, msg = "Serial", param = ['AGHHG1234GHJABC']) #0x8800 payload = unsigned_byte_to_bytearray(8) dg_simulator.cmd_send_dg_general_response(message_id=136, accepted=1, reason=1, is_pure_data = False, has_parameters = True, parameters_payload = payload) dg_simulator.cmd_send_dg_general_response(message_id=136, accepted=0, reason=0, is_pure_data = False, has_parameters = True, parameters_payload = payload) dg_simulator.cmd_send_serial_dg_data(serial = 'AGHHG1234GHJABC') - verify_log(msg_id = MsgIds.MSG_ID_DG_SERIAL_NUMBER.value, msg = "Serial", param = ['AGHHG1234GHJABC']) + verify_log(msg_id = MsgIds.MSG_ID_DG_SERIAL_NUMBER_RESPONSE.value, msg = "Serial", param = ['AGHHG1234GHJABC']) #0x1F00 payload = float_to_bytearray(11.2) @@ -1260,7 +1267,7 @@ payload += unsigned_integer_to_bytearray(1) dg_simulator.cmd_send_dg_general_response(message_id=39, accepted=0, reason=1, is_pure_data = False, has_parameters = True, parameters_payload = payload) dg_simulator.cmd_send_dg_general_response(message_id=39, accepted=1, reason=1, is_pure_data = False, has_parameters = True, parameters_payload = payload) - verify_log(msg_id = MsgIds.MSG_ID_DG_OP_MODE.value, msg = "OpMode") + verify_log(msg_id = MsgIds.MSG_ID_DG_OP_MODE_DATA.value, msg = "OpMode") #0x2D00(request) payload = float_to_bytearray(11.500) @@ -1288,11 +1295,11 @@ verify_log(msg_id = MsgIds.MSG_ID_HD_RESPONSE_SERVICE_MODE_REQUEST.value, msg = "ServiceMode", param = [1,1]) - #0x0600 + #0xA06A dg_simulator.cmd_send_checkin_dg() dg_simulator.cmd_send_dg_general_response(message_id=6, accepted=0, reason=0, is_pure_data = False, has_parameters = False, parameters_payload = None) dg_simulator.cmd_send_dg_general_response(message_id=6, accepted=1, reason=1, is_pure_data = False, has_parameters = False, parameters_payload = None) - verify_log(msg_id = MsgIds.MSG_ID_DG_CHECK_IN.value, msg = "DG check-in w/ HD") + verify_log(msg_id = MsgIds.MSG_ID_DG_DIALIN_CHECK_IN.value, msg = "DG check-in w/ HD") dg_simulator.cmd_send_checkin_dg() dg_simulator.cmd_send_checkin_dg() @@ -1315,7 +1322,7 @@ #0x8100 hd_simulator.cmd_send_hd_general_response(message_id=129, accepted=1, reason=0, is_pure_data = True, has_parameters = False, parameters_payload = None) hd_simulator.cmd_send_hd_general_response(message_id=129, accepted=0, reason=0, is_pure_data = True, has_parameters = False, parameters_payload = None) - verify_log(msg_id = MsgIds.MSG_ID_UI_CHEM_DISINFECT_CONFIRM.value, msg = "Chemical Disinfect User Confirm") + # verify_log(msg_id = MsgIds.MSG_ID_UI_CHEM_DISINFECT_CONFIRM.value, msg = "Chemical Disinfect User Confirm") #0xB000 hd_simulator.cmd_send_hd_general_response(message_id=176, accepted=1, reason=0, is_pure_data = True, has_parameters = False, parameters_payload = None) @@ -1637,7 +1644,7 @@ """ startApplication(config.AUT_NAME+" -d"+ " -i"+ " -f"+ " -b"+ " -u"+ " -c"+ " -0"+ " -m") - verif_ui_logs_api() + #verif_ui_logs_api() verify_missing_path_verification() utils.tstDone()