Index: config.xml =================================================================== diff -u -r6e75182cc6ad599e14d5db87db617f68663678ab -r6dea78f296538eaec9a3478608f5ba0be9e9c954 --- config.xml (.../config.xml) (revision 6e75182cc6ad599e14d5db87db617f68663678ab) +++ config.xml (.../config.xml) (revision 6dea78f296538eaec9a3478608f5ba0be9e9c954) @@ -1,7 +1,8 @@ - - - - - + + + + + + Index: shared/scripts/configuration/config.py =================================================================== diff -u -r40314c67874695eefc506c3a6a33896495953edd -r6dea78f296538eaec9a3478608f5ba0be9e9c954 --- shared/scripts/configuration/config.py (.../config.py) (revision 40314c67874695eefc506c3a6a33896495953edd) +++ shared/scripts/configuration/config.py (.../config.py) (revision 6dea78f296538eaec9a3478608f5ba0be9e9c954) @@ -22,63 +22,63 @@ # -K, --enable-acknow-log Enables Acknowledgment Log AUT_NAME = "denaliSquish -k -K -S -q" -AUT_NAME_ONLY = "denaliSquish" # Need only the AUT name for tst_ui_logs, do not add options +AUT_NAME_ONLY = "denaliSquish" # Need only the AUT name for tst_ui_logs, do not add options HOME_DIR_PATH = "/home/denali" TMP_DIR = "/tmp/" -#post treatment -POST_TREATMENT_LOG_LOCATION = "".join([str(HOME_DIR_PATH),'/Desktop/usb-disk/treatment/*.txr.p']) +# post treatment +POST_TREATMENT_LOG_LOCATION = "".join([str(HOME_DIR_PATH), '/Desktop/usb-disk/treatment/']) +POST_TREATMENT_LOG_FILTER = "".join([str(POST_TREATMENT_LOG_LOCATION), '*.txr.p']) -#settings files -SETTINGS_ROOT_PATH = "".join([str(HOME_DIR_PATH),'/Projects/application/resources/settings/Configurations/']) +# settings files +SETTINGS_ROOT_PATH = "".join([str(HOME_DIR_PATH), '/Projects/unittests/resources/settings/Configurations/']) TREATMENT_DATA_SETTINGS_FILENAME = "DataList.conf" +# instructions_image location +INSTRUCTION_CONF_LOCATION = "".join([str(HOME_DIR_PATH), '/Projects/unittests/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/']) +TREATMENT_LOG_LOCATION = "".join([str(HOME_DIR_PATH), '/Desktop/sd-card/treatment/*.log']) -#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/']) -TREATMENT_LOG_LOCATION = "".join([str(HOME_DIR_PATH),'/Desktop/sd-card/treatment/*.log']) +# cloud_sync_verification +INP_BUF_FILE_LOCATION = "".join([str(HOME_DIR_PATH), '/Desktop/sd-card/cloudsync/']) +CLOUD_CREDENTIALS_LOCATION = "".join([str(HOME_DIR_PATH) + '/Desktop/cloudsync/credentials']) +ERROR_FILE_LOCATION = "".join([str(HOME_DIR_PATH) + '/Desktop/sd-card/service/']) -#cloud_sync_verification -INP_BUF_FILE_LOCATION = "".join([str(HOME_DIR_PATH),'/Desktop/sd-card/cloudsync/']) -CLOUD_CREDENTIALS_LOCATION = "".join([str(HOME_DIR_PATH)+'/Desktop/cloudsync/credentials']) -ERROR_FILE_LOCATION = "".join([str(HOME_DIR_PATH)+'/Desktop/sd-card/service/']) - -#ui_logs -APP_POST_LOG_LOCATION = "".join([str(TMP_DIR),'/post.log']) -LOG_LOCATION = "".join([str(HOME_DIR_PATH),'/Desktop/sd-card/log/']) -CLOUDSYNC_FOLDER_PATH = "".join([str(HOME_DIR_PATH)+'/Desktop/']) -SD_CARD_CLOUDSYNC_FOLDER_PATH = "".join([str(HOME_DIR_PATH)+'/Desktop/sd-card/']) -SD_CARD_LOCATION = "".join([str(HOME_DIR_PATH)+'/Desktop/']) -USB_DISK_FOLDER_LOCATION = "".join([str(HOME_DIR_PATH)+'/Desktop/usb-disk/']) -SETTINGS_FOLDER_LOCATION = "".join([str(HOME_DIR_PATH)+'/Projects/application/resources/']) -APPLICATION_FOLDER_LOCATION = "".join([str(HOME_DIR_PATH)+'/Projects/']) -CANBUS_FOLDER_LOCATION = "".join([str(HOME_DIR_PATH)+'/Projects/application/sources/']) +# ui_logs +APP_POST_LOG_LOCATION = "".join([str(TMP_DIR), '/post.log']) +LOG_LOCATION = "".join([str(HOME_DIR_PATH), '/Desktop/sd-card/log/']) +CLOUDSYNC_FOLDER_PATH = "".join([str(HOME_DIR_PATH) + '/Desktop/']) +SD_CARD_CLOUDSYNC_FOLDER_PATH = "".join([str(HOME_DIR_PATH) + '/Desktop/sd-card/']) +SD_CARD_LOCATION = "".join([str(HOME_DIR_PATH) + '/Desktop/']) +USB_DISK_FOLDER_LOCATION = "".join([str(HOME_DIR_PATH) + '/Desktop/usb-disk/']) +SETTINGS_FOLDER_LOCATION = "".join([str(HOME_DIR_PATH) + '/Projects/unittests/resources/']) +APPLICATION_FOLDER_LOCATION = "".join([str(HOME_DIR_PATH) + '/Projects/']) +CANBUS_FOLDER_LOCATION = "".join([str(HOME_DIR_PATH) + '/Projects/unittests/sources/']) PEM_FILES = ['1.pem', '2.pem', '3.pem' ] -#standby mode +# standby mode GOODMORNING_START_TIME_SEC = 0 GOODEVENING_START_TIME_SEC = 43200 -NUM_OF_REQUEST_REJECT_REASONS = 48 #Number of settings change reject codes +NUM_OF_REQUEST_REJECT_REASONS = 48 # Number of settings change reject codes -COLOR_CODES = {"Aqua": "#81ffff", "Blue": "#017dea", "Blue 2": "#1090d5", "Green": "#29fd2d", "Grey": "#d3d3d3", - "Lavender": "#db98f5", "Light Blue": "#acd7f1", "Light Teal": "#29f1da","Lime": "#b7fc36", - "Magenta":"#fd28fd", "Orange": "#f2721c", "Peach":"#f1979a", "Red": "#c53b33", "Rose":"#fc178d", +COLOR_CODES = {"Aqua": "#81ffff", "Blue": "#017dea", "Blue 2": "#1090d5", "Green": "#29fd2d", "Grey": "#d3d3d3", + "Lavender": "#db98f5", "Light Blue": "#acd7f1", "Light Teal": "#29f1da", "Lime": "#b7fc36", + "Magenta":"#fd28fd", "Orange": "#f2721c", "Peach":"#f1979a", "Red": "#c53b33", "Rose":"#fc178d", "Slate blue":"#7f7ffa", "Violet": "#6435c9", "White": "#ffffff", "Yellow": "#fcfc4d"} CURRENT_INSTRUCTION_COLOR = '#4290ec' CURRENT_COLOR = '#000000' -COMPLETE_COLOR = '#4290ec' +COMPLETE_COLOR = '#4290ec' ENABLED_COLOR = '#fcfcfc' -INCOMPLETE_COLOR = '#607a91' -INCOMPLETE_INSTRUCTION_COLOR = '#4290ec' +INCOMPLETE_COLOR = '#607a91' +INCOMPLETE_INSTRUCTION_COLOR = '#4290ec' OUT_OF_RANGE_COLOR = "#c53b33" -#Disinfection -DISINFECT_TREATMENT_ID = ["_headStepBullet","_nextStepsBullet"] +# Disinfection +DISINFECT_TREATMENT_ID = ["_headStepBullet", "_nextStepsBullet"] -#main treatment screen +# main treatment screen IN_RANGE_COLOR = "#fcfcfc" SYSTOLIC_LOWER_LIMIT = 60 SYSTOLIC_UPPER_LIMIT = 250 @@ -88,9 +88,9 @@ HEART_RATE_UPPER_LIMIT = 180 TREATMENT_UNHIGHLIGHTED_COLOR = "#000000" TREATMENT_HIGHLIGHTED_COLOR = "#135088" -TREATMENT_PRESSURE_IN_RANGE_COLOR="#ffffff" # for the range bar marker text +TREATMENT_PRESSURE_IN_RANGE_COLOR = "#ffffff" # for the range bar marker text -#create custom treatment +# create custom treatment HIGHER_VALUE_OF_BLOOD_FLOW_RATE = 500 LOWER_VALUE_OF_BLOOD_FLOW_RATE = 100 STEP_VALUE_OF_BLOOD_FLOW_RATE = 25 @@ -106,135 +106,135 @@ POSITIVE_BUFFER = 10 NEGATIVE_BUFFER = -10 -#dictionary consist of custom treatment values +# dictionary consist of custom treatment values CREATE_CUSTOM_TREATMENT = { - "Blood Flow Rate": 250, + "Blood Flow Rate": 250, "Dialysate Flow Rate": 400, - "Duration": 270, - "Heparin Dispensing Rate": 0.5, + "Duration": 270, + "Heparin Dispensing Rate": 0.5, "Heparin Bolus Volume": 1, - "Heparin Stop Time": 100, + "Heparin Stop Time": 100, "Saline Bolus Volume": 200, "Dialysate Temperature": 37, "Blood Pressure Measurement Interval": 40, - "Rinseback Flow Rate": 100, - "Arterial Pressure Limit Low" : -30, - "Arterial Pressure Limit High" : 0, - "Blood Pressure Measure Interval" : 40, - "Rinseback Rate" : 100, - "Venous Pressure Limit High" : 590, + "Rinseback Flow Rate": 100, + "Arterial Pressure Limit Low":-30, + "Arterial Pressure Limit High": 0, + "Blood Pressure Measure Interval": 40, + "Rinseback Rate": 100, + "Venous Pressure Limit High": 590, "Venous Pressure Limit Low": 560 } -#dictionary consist of slider values of treatment parameters +# dictionary consist of slider values of treatment parameters CREATE_TREATMENT_PARAMETER_RANGE = { "Blood Flow Rate": [100, 125, 150, 175, 200, 225, 250, 275, 300, 325, 350, 375, 400, 425, 450, 475, 500], "Dialysate Flow Rate": [100, 150, 200, 250, 300, 350, 400, 450, 500, 550, 600], "Duration": [60, 75, 90, 105, 120, 135, 150, 165, 180, 195, 210, 225, 240, 255, 270, 285, 300, 315, 330, 345, 360, 375, 390, 405, 420, 435, 450, 465, 480], "Heparin Dispensing Rate": [0.2, 0.3, 0.4, 0.5, 0.6, 0.7, 0.8, 0.9, 1], "Heparin Bolus Volume": [0.2, 0.3, 0.4, 0.5, 0.6, 0.7, 0.8, 0.9, 1, 1.1, 1.2, 1.3, 1.4, 1.5, 1.6, 1.7, 1.8, 1.9, 2], - "Heparin Stop Time": [0, 10, 20, 30, 40, 50, 60, 70, 80, 90, 100, 110, 120, 130, 140, 150, 160, 170, 180, 190, 200, 210, 220, 230, 240, 250, 260, 270, 280, 290, 300, 310, 320, 330, 340, 350, 360, 370, 380, 390, 400, 410, 420, 430, 440, 450, 460, 470, 480], + "Heparin Stop Time": [0, 10, 20, 30, 40, 50, 60, 70, 80, 90, 100, 110, 120, 130, 140, 150, 160, 170, 180, 190, 200, 210, 220, 230, 240, 250, 260, 270, 280, 290, 300, 310, 320, 330, 340, 350, 360, 370, 380, 390, 400, 410, 420, 430, 440, 450, 460, 470, 480], "Saline Bolus Volume": [100, 200, 300], "Dialysate Temperature": [35.0, 35.5, 36.0, 36.5, 37.0], "Blood Pressure Measurement Interval": [5, 10, 15, 20, 25, 30, 35, 40, 45, 50, 55, 60], - "Rinseback Flow Rate": [50, 75, 100, 125, 150], + "Rinseback Flow Rate": [50, 75, 100, 125, 150], } -#dictionary consist of slider [minimum value, slider buffer value, width buffer of slider] +# dictionary consist of slider [minimum value, slider buffer value, width buffer of slider] CREATE_TREATMENT_SLIDER_VALUES = { - "blood_flow_rate" : [100, 25, 46], - "dialysate_flow_rate" : [100, 50, 75], - "duration" : [60, 15, 28], - "heparin_dispensing_rate" : [0.2, 0.1, 93], - "heparin_bolus_volume" : [0.2, 0.1, 41], - "heparin_stop_time" : [0, 10, 15.75], - "saline_bolus" : [100, 100, 425], - "dialysate_temperature" : [35, 0.5, 187.5], - "arterial_pressure_limit_high" : [20, 10, 11.931], - "blood_pressure_measurement_interval" : [5, 5, 60], + "blood_flow_rate": [100, 25, 46], + "dialysate_flow_rate": [100, 50, 74], + "duration": [60, 15, 28], + "heparin_dispensing_rate": [0.2, 0.1, 93], + "heparin_bolus_volume": [0.2, 0.1, 41], + "heparin_stop_time": [0, 10, 15.75], + "saline_bolus": [100, 100, 350], + "dialysate_temperature": [35, 0.5, 187.5], + "arterial_pressure_limit_high": [20, 10, 11.931], + "blood_pressure_measurement_interval": [5, 5, 60], } # NOTE this is for the sliders specifically on the Treatment screen's pressure dialog (tst_main_treatment_pressure) -#dictionary consist of slider [minimum value, slider buffer value, width buffer of slider] +# dictionary consist of slider [minimum value, slider buffer value, width buffer of slider] TREATMENT_PRESSURE_ADJUSTMENT_VALUES = { - "arterial_window" : [120, 40, 300], - "venous_window" : [100, 20, 150], - "venous_asymmetric" : [20, 5, 225] + "arterial_window": [120, 40, 300], + "venous_window": [100, 20, 150], + "venous_asymmetric": [20, 5, 225] } TREATMENT_PRESSURE_ADJUSTMENT_TITLE = "PRESSURES" - -#Alarms location + +# Alarms location 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/application/AlarmMapping.csv']) -ALARM_MAPPING_CSV_DIR_LOCATION = "".join([str(HOME_DIR_PATH)+'/Projects/application/']) +ALARMS_CONF_LOCATION = "".join([str(HOME_DIR_PATH), '/Projects/unittests/resources/settings/Alarms/Alarms.conf']) +ALARM_MAPPING_CSV_FILE_LOCATION = "".join([str(HOME_DIR_PATH) + '/Projects/unittests/AlarmMapping.csv']) +ALARM_MAPPING_CSV_DIR_LOCATION = "".join([str(HOME_DIR_PATH) + '/Projects/unittests/']) -#Service password location -SERVICE_CONF_LOCATION ="".join([str(HOME_DIR_PATH),'/Projects/application/resources/settings/Settings/System.conf']) -DEFAULT_SERVICE_PASSWORD_RAW = "Atal.Matal.22leh" # TODO need to update if we ever change the default -SERVICE_SCREEN_SUBSCREEN_INDEX = { #these indices are only valid for the service screen accessed after password entered - "INFORMATION_SUBSCREEN" :2, +# Service password location +SERVICE_CONF_LOCATION = "".join([str(HOME_DIR_PATH), '/Projects/unittests/resources/settings/Settings/System.conf']) +DEFAULT_SERVICE_PASSWORD_RAW = "Atal.Matal.22leh" # TODO need to update if we ever change the default +SERVICE_SCREEN_SUBSCREEN_INDEX = { # these indices are only valid for the service screen accessed after password entered + "INFORMATION_SUBSCREEN":2, "VOLUME_AND_BRIGHTNESS_SUBSCREEN":3, - "WIFI_SUBSCREEN" : 4, - "BLUETOOTH_CUFF_SUBSCREEN" :5, - "DG_CLEANING_SUBSCREEN" : 6, - "SET_DATETIME_SUBSCREEN" : 7, - "EXPORT_LOGS_SUBSCREEN" : 8, - "WATER_INPUT_MODE_SUBSCREEN" : 9, + "WIFI_SUBSCREEN": 4, + "BLUETOOTH_CUFF_SUBSCREEN":5, + "DG_CLEANING_SUBSCREEN": 6, + "SET_DATETIME_SUBSCREEN": 7, + "EXPORT_LOGS_SUBSCREEN": 8, + "WATER_INPUT_MODE_SUBSCREEN": 9, # ONLY ACCESSIBLE WITH SERVICE LOG-IN - "ENABLE_ROOT_SUBSCREEN" : 10, - "FACTORY_RESET_SUBSCREEN" :11, - "DECOMMISSION_SUBSCREEN" :12 + "ENABLE_ROOT_SUBSCREEN": 10, + "FACTORY_RESET_SUBSCREEN":11, + "DECOMMISSION_SUBSCREEN":12 } -#alarm colors +# alarm colors ALARMS_COLORS_HEADER = { - "ALARM_PRIORITY_NONE" : "#438feb", - "ALARM_PRIORITY_LOW" : "#db8f00", - "ALARM_PRIORITY_MEDIUM" : "#db8f00", - "ALARM_PRIORITY_HIGH" : "#831913" + "ALARM_PRIORITY_NONE": "#438feb", + "ALARM_PRIORITY_LOW": "#db8f00", + "ALARM_PRIORITY_MEDIUM": "#db8f00", + "ALARM_PRIORITY_HIGH": "#831913" } ALARMS_COLORS_BODY = { - "ALARM_PRIORITY_NONE" : "#254670", - "ALARM_PRIORITY_LOW" : "#f5a623", - "ALARM_PRIORITY_MEDIUM" : "#f5a623", - "ALARM_PRIORITY_HIGH" : "#c53b33" + "ALARM_PRIORITY_NONE": "#254670", + "ALARM_PRIORITY_LOW": "#f5a623", + "ALARM_PRIORITY_MEDIUM": "#f5a623", + "ALARM_PRIORITY_HIGH": "#c53b33" } -ALARM_MUTE_FLAG = 0B0000001000000000 -ALARM_UNMUTE_FLAG = 0B0000000000000000 +ALARM_MUTE_FLAG = 0B0000001000000000 +ALARM_UNMUTE_FLAG = 0B0000000000000000 -ALARM_BUTTONS_OK = 0B0000000010111000 +ALARM_BUTTONS_OK = 0B0000000010111000 -ALARM_BUTTONS_RESUME = 0B0000000000110000 -ALARM_BUTTONS_RESUME_RINSEBACK = 0B0000000000100000 -ALARM_BUTTONS_RESUME_END = 0B0000000000010000 +ALARM_BUTTONS_RESUME = 0B0000000000110000 +ALARM_BUTTONS_RESUME_RINSEBACK = 0B0000000000100000 +ALARM_BUTTONS_RESUME_END = 0B0000000000010000 -ALARM_BUTTONS_RINSEBACK = 0B0000000000101000 -ALARM_BUTTONS_RINSEBACK_RESUME = ALARM_BUTTONS_RESUME_RINSEBACK -ALARM_BUTTONS_RINSEBACK_END = 0B0000000000001000 +ALARM_BUTTONS_RINSEBACK = 0B0000000000101000 +ALARM_BUTTONS_RINSEBACK_RESUME = ALARM_BUTTONS_RESUME_RINSEBACK +ALARM_BUTTONS_RINSEBACK_END = 0B0000000000001000 -ALARM_BUTTONS_END = 0B0000000000011000 -ALARM_BUTTONS_END_RESUME = ALARM_BUTTONS_RESUME_END -ALARM_BUTTONS_END_RINSEBACK = ALARM_BUTTONS_RINSEBACK_END +ALARM_BUTTONS_END = 0B0000000000011000 +ALARM_BUTTONS_END_RESUME = ALARM_BUTTONS_RESUME_END +ALARM_BUTTONS_END_RINSEBACK = ALARM_BUTTONS_RINSEBACK_END ALARM_BUTTONS_RESUME_RINSEBACK_END = 0B0000000000000000 ALARM_BUTTONS_RINSEBACK_RESUME_END = ALARM_BUTTONS_RESUME_RINSEBACK_END ALARM_BUTTONS_END_RESUME_RINSEBACK = ALARM_BUTTONS_RESUME_RINSEBACK_END -NUM_OF_ALARM_PRIORITIES = 4 # Total number of alarm priorities +NUM_OF_ALARM_PRIORITIES = 4 # Total number of alarm priorities NUM_OF_MSG_ID = 321 NUM_OF_ALARM_ID = 322 ALARM_ID_NO_ALARM = 0 ALARM_ID_OUT_OF_RANGE = 322 -#standby mode & ultrafiltration +# standby mode & ultrafiltration UF_MINIMUM_VALUE = 0 UF_MAXIMUM_VALUE = 600 -#pressure +# pressure PRESSURE_STEPS = 10 ARTERIAL_PRESSURE_MINIMUM = +120 ARTERIAL_PRESSURE_MAXIMUM = +200 @@ -246,15 +246,15 @@ ARTERIAL_PRESSURE_HIGH_MAX = +200 VENOUS_PRESSURE_MINIMUM = +100 -VENOUS_PRESSURE_MAXIMUM = +200 #check is meant to be 500 +VENOUS_PRESSURE_MAXIMUM = +200 # check is meant to be 500 VENOUS_PRESSURE_LOW_MIN = -100 VENOUS_PRESSURE_LOW_DEF = -100 VENOUS_PRESSURE_LOW_MAX = +600 VENOUS_PRESSURE_HIGH_MIN = +100 VENOUS_PRESSURE_HIGH_DEF = +400 VENOUS_PRESSURE_HIGH_MAX = +600 -#main_treatment_flows +# main_treatment_flows BLOOD_FLOW_MINIMUM_VALUE = 100 BLOOD_FLOW_BUFFER = 25 FLOW_SLIDER_WIDTH_BUFFER = 37 @@ -264,66 +264,66 @@ DIALYSATE_FLOW_BUFFER = 50 DIALYSATE_FLOW_SLIDER_WIDTH_BUFFER = 60 -#main treatment screen +# main treatment screen RED_COLOR = "#ff0000" GREEN_COLOR = "#008000" BLOOD_PRIMING_RANGE = 300 BLOOD_PRIMING_TARGET_MAXIMUM = 300 -#tst_pretreatment_screens +# tst_pretreatment_screens NUM_OF_PRETREATMENT_BULLETS = len(PRE_TREATMENT_SCREENS) SALINE_BOLUS_CUMULATIVE = 300 -#patient id +# patient id KEYBOARD_SWITCH = ["ABC", "&123"] PATIENT_ID_COMBINATION = { - "qwerty" : "qwerty", - "sampleid" : "sampleid", - "abcdefghijklmnop" : "abcdefghijklmnop", - "patientid" : "patientid", - "username" : "username", - "sA@MpLE#123" : "sAMpLE123", - "A@BH&321" : "ABH321", - "5432@qwerty" : "5432qwerty" + "qwerty": "qwerty", + "sampleid": "sampleid", + "abcdefghijklmnop": "abcdefghijklmnop", + "patientid": "patientid", + "username": "username", + "sA@MpLE#123": "sAMpLE123", + "A@BH&321": "ABH321", + "5432@qwerty": "5432qwerty" } -#Random selection for operational parameter for custom dta +# Random selection for operational parameter for custom dta OPERATIONAL_PARAMETERS = {"Heparin Type": HEPARIN_TYPE, "Acid Concentrate": "1.0 K 2.5 Ca", "Bicarbonate Concentrate": BICARBONATE_CONCENTRATE, "Dialyzer Type": "BB Diacap Pro 16H"} -#ultrafilteration volume based on flow parameters. Python list contains Rotational speed, Motor speed, +# ultrafilteration volume based on flow parameters. Python list contains Rotational speed, Motor speed, # MC speed, MC current and PWM. TREATMENT_ULTRAFILTRATION_FLOW_PARAMETERS = { - 0 : [100, 0, 0, 0, 0, 0, 0], - 1 : [220, 1.45, 1.45, 1.45, 1.45, 1.45, 1.45], + 0: [100, 0, 0, 0, 0, 0, 0], + 1: [220, 1.45, 1.45, 1.45, 1.45, 1.45, 1.45], } -#dictionary contains uf maximum and minimum value's to set. +# dictionary contains uf maximum and minimum value's to set. TREATMENT_ULTRAFILTRATION_TESTING_OPTION = { - 0 : {"uf_maximum" : 600, "uf_minimum" : 0}, - 1 : {"uf_maximum" : 480, "uf_minimum" : 250}, + 0: {"uf_maximum": 600, "uf_minimum": 0}, + 1: {"uf_maximum": 480, "uf_minimum": 250}, } -#dictionary contains saline cumulative and saline delivered value -#key : saline cumulative value. -#value: saline delivered value +# dictionary contains saline cumulative and saline delivered value +# key : saline cumulative value. +# value: saline delivered value SALINE_BOLUS_VALUES = { - 0 : 0, - 1.0 : 1.0, - 125.56 : 100.54, - 165.87 : 145.87, - 220.64 : 220.64, - 325.26 : 300.24, - 400.86 : 380.86, - 500.00 : 500.24, - 634.76 : 634.76, - 823.67 : 800.64, - 999.99 : 999.99, - 1000 : 1000 + 0: 0, + 1.0: 1.0, + 125.56: 100.54, + 165.87: 145.87, + 220.64: 220.64, + 325.26: 300.24, + 400.86: 380.86, + 500.00: 500.24, + 634.76: 634.76, + 823.67: 800.64, + 999.99: 999.99, + 1000: 1000 } -#testing options for main treatment saline -SALINE_BOLUS_TARGET = [0, 1, 150, 155, 299, 300] #Boundary Value Analysis +# testing options for main treatment saline +SALINE_BOLUS_TARGET = [0, 1, 150, 155, 299, 300] # Boundary Value Analysis # pretreatment_patient_connection SYSTOLIC_PRESSSURE_120 = 120 @@ -357,22 +357,21 @@ UF_VALID_RANGE = 700 TRAINING_INDICATOR_SCREEN = 4 ULTRAFILTRATION_VOLUME_COMBINATION_FROM_ULTRAFILTRATION_SETUP_SCREEN = { - "OPTION_1" : {"uf_maximum" : 800, "uf_minimum" : 0}, - "OPTION_2" : {"uf_maximum" : 500, "uf_minimum" : 0}, - "OPTION_3" : {"uf_maximum" : 550, "uf_minimum" : 0}, - "OPTION_4" : {"uf_maximum" : 300, "uf_minimum" : 0}, - "OPTION_5" : {"uf_maximum" : 280, "uf_minimum" : 0}, - "OPTION_6" : {"uf_maximum" : 765, "uf_minimum" : 0}, - "OPTION_7" : {"uf_maximum" : 680, "uf_minimum" : 0}, - "OPTION_8" : {"uf_maximum" : 1500, "uf_minimum" : 0}, - "OPTION_9" : {"uf_maximum" : 390, "uf_minimum" : 0}, - "OPTION_10" : {"uf_maximum" : 800, "uf_minimum" : 0}, - "OPTION_11" : {"uf_maximum" : 1000, "uf_minimum" : 0}, - "OPTION_12" : {"uf_maximum" : 1250, "uf_minimum" : 0}, + "OPTION_1": {"uf_maximum": 800, "uf_minimum": 0}, + "OPTION_2": {"uf_maximum": 500, "uf_minimum": 0}, + "OPTION_3": {"uf_maximum": 550, "uf_minimum": 0}, + "OPTION_4": {"uf_maximum": 300, "uf_minimum": 0}, + "OPTION_5": {"uf_maximum": 280, "uf_minimum": 0}, + "OPTION_6": {"uf_maximum": 765, "uf_minimum": 0}, + "OPTION_7": {"uf_maximum": 680, "uf_minimum": 0}, + "OPTION_8": {"uf_maximum": 1500, "uf_minimum": 0}, + "OPTION_9": {"uf_maximum": 390, "uf_minimum": 0}, + "OPTION_10": {"uf_maximum": 800, "uf_minimum": 0}, + "OPTION_11": {"uf_maximum": 1000, "uf_minimum": 0}, + "OPTION_12": {"uf_maximum": 1250, "uf_minimum": 0}, } - -#pre-treatment_priming +# pre-treatment_priming NOT_VISIBLE = False VISIBLE = True FOCUS = True @@ -385,30 +384,30 @@ ENABLED = True DISABLED = False -#pre-treatment_priming +# pre-treatment_priming ACCEPTED = True REJECTED = False -#Filter Flush +# Filter Flush MAXIMUM_COUNTDOWN_TIME = 300 CONSUMABLE_SELF_TEST_BICARB_PUMP_CHECK_STATE = 3 -#settings information +# settings information BRIGHTNESS_MIN_VAL = 20 BRIGHTNESS_MAX_VAL = 100 VOLUME_MIN_VAL = 20 VOLUME_MAX_VAL = 100 -#service screen +# service screen PASSWORD = 123 -#wifi screen -IP_ADDRESS = {"valid" : "192.168.1.1","invalid" : "1.2.2.3"} -GATEWAY = {"valid" : "255.255.255.0", "invalid" : "1.2.3.4"} -SUBNET_MASK = {"valid" : "255.255.255.0", "invalid" : "3.4.2.1"} -DNS = {"valid" : "0.0.0.0", "invalid" : "3.2.1.3"} +# wifi screen +IP_ADDRESS = {"valid": "192.168.1.1", "invalid": "1.2.2.3"} +GATEWAY = {"valid": "255.255.255.0", "invalid": "1.2.3.4"} +SUBNET_MASK = {"valid": "255.255.255.0", "invalid": "3.4.2.1"} +DNS = {"valid": "0.0.0.0", "invalid": "3.2.1.3"} -#dictionary consist of review parameters values of post treatment +# dictionary consist of review parameters values of post treatment POST_TREATMENT_REVIEW_PARAMETER_RANGE = { "Patient ID": ["abcd", "xyz"], "Heparin Stop": [0, 101], @@ -420,7 +419,7 @@ "Treatment End DateTime": [1654519251, 1623382321], "Treatment Duration": [70, 75], "Water Sample Test Result": [0, 1], - "Actual Treatment Duration": [62, 126], + "Actual Treatment Duration": [62, 126], "Dialysate Volume Used": [4.0, 6.0], "Acid ConcentrateType": [0, 1], "Prescribed UF Volume": [0.3, 0.5], @@ -430,7 +429,7 @@ "Actual UF Volume": [0.3, 0.5], "Calcium Concentration": [3, 56], "Prescribed UF Rate": [0.1, 0.55], - "Bicarbonate Concentration": [14, 50], + "Bicarbonate Concentration": [14, 50], "Target UF Rate": [0.2, 0.56], "Sodium Concentration": [4, 6], "Actual UF Rate": [0.5, 0.6], @@ -444,60 +443,60 @@ "Heparin Bolus Volume": [0.0, 0.1], "Average Arterial Pressure": [0.0, 11.56], "Heparin Dispense Rate": [0.0, 0.1], - "Average Venous Pressure": [20.0, 101.45], + "Average Venous Pressure": [20.0, 101.45], } VALID = True INVALID = False -#cloud sync index +# cloud sync index EPOCH_INDEX = 0 SEQUENCE_INDEX = 1 CRC_INDEX = 2 CODE_INDEX = 3 PARAMETER_COUNT = 4 PARAMETER_INDEX = 5 -#cloud_sync_hd_opmodes +# cloud_sync_hd_opmodes OPMODE_INDEX = 5 SUBMODE = 6 HD_OPMODES_MSG_PARAMETER_LEN = 7 HD_OPMODES_CREDENTIAL_PARAMETER_LEN = 6 -#ui_logs +# ui_logs RESET_BINARY = "0" SET_BINARY = "1" TREATMENT_DATA_PARAMETER = { - "Blood flow rate" : [1, 2], - "Dialysate flow rate" : [3, 5], - "Uf rate" : [1.234, 3.452], - "Arterial pressure" : [10.123, 10.567], - "Venous pressure" : [10.323, 10.634], + "Blood flow rate": [1, 2], + "Dialysate flow rate": [3, 5], + "Uf rate": [1.234, 3.452], + "Arterial pressure": [10.123, 10.567], + "Venous pressure": [10.323, 10.634], } TREATMENT_ALARM_PARAMETER = { - "Alarm Id" : [2, 4], - "Alarm Id String" : ["2-HD POST: FPGA Compatibility", 4], - "Parameter1" : [2.3, 3.7], - "Parameter2" : [3.4, 4.5], + "Alarm Id": [2, 4], + "Alarm Id String": ["2-HD POST: FPGA Compatibility", 4], + "Parameter1": [2.3, 3.7], + "Parameter2": [3.4, 4.5], } TREATMENT_EVENT_PARAMETER = { - "Event id" : [2, 3], - "Event id String" : ["2 - Treatment duration change event", 3], - "Old Value" : [1.523, 1.945], - "New Value" : [2.523, 3.567], + "Event id": [2, 3], + "Event id String": ["2 - Treatment duration change event", 3], + "Old Value": [1.523, 1.945], + "New Value": [2.523, 3.567], } -#dg cleaning -WATER_FLUSH_TIME_HOUR = {"valid" : "23","invalid" : "24"} -WATER_FLUSH_TIME_MINUTE = {"valid" : "59","invalid" : "60"} -WATER_FLUSH_CYCLE = {"valid" : "1", "invalid" : "8"} -HEAT_DISINFECTION_TIME_HOUR = {"valid" : "23","invalid" : "24"} -HEAT_DISINFECTION_TIME_MINUTE = {"valid" : "59","invalid" : "60"} -HEAT_DISINFECTION_CYCLE = {"valid" : "7", "invalid" : "61"} +# dg cleaning +WATER_FLUSH_TIME_HOUR = {"valid": "23", "invalid": "24"} +WATER_FLUSH_TIME_MINUTE = {"valid": "59", "invalid": "60"} +WATER_FLUSH_CYCLE = {"valid": "1", "invalid": "8"} +HEAT_DISINFECTION_TIME_HOUR = {"valid": "23", "invalid": "24"} +HEAT_DISINFECTION_TIME_MINUTE = {"valid": "59", "invalid": "60"} +HEAT_DISINFECTION_CYCLE = {"valid": "7", "invalid": "61"} -#heparin cumualtive values +# heparin cumualtive values HEPARIN_VALUES = {"Cumulative Value": [0.0, 0.1, 0.2, 0.3, 0.4, 0.5, 1.0, 15.0, 17.8, 20.0], - "Required Value": [0.0, 0.1, 0.2, 0.3, 0.4, 0.5, 1.0, 15.0, 17.8, 20.0],} + "Required Value": [0.0, 0.1, 0.2, 0.3, 0.4, 0.5, 1.0, 15.0, 17.8, 20.0], } Index: shared/scripts/configuration/strings.py =================================================================== diff -u -r40314c67874695eefc506c3a6a33896495953edd -r6dea78f296538eaec9a3478608f5ba0be9e9c954 --- shared/scripts/configuration/strings.py (.../strings.py) (revision 40314c67874695eefc506c3a6a33896495953edd) +++ shared/scripts/configuration/strings.py (.../strings.py) (revision 6dea78f296538eaec9a3478608f5ba0be9e9c954) @@ -146,7 +146,7 @@ 16: "REQUEST_REJECT_REASON_SALINE_BOLUS_IN_PROGRESS", # A saline bolus is in progress 17: "REQUEST_REJECT_REASON_PARAM_OUT_OF_RANGE", # A treatment parameter is out of range 18: "REQUEST_REJECT_REASON_HEPARIN_PRESTOP_EXCEEDS_DURATION", # The Heparin pre-stop setting is greater than the treatment duration - 19: "REQUEST_REJECT_REASON_AVAILABLE_1", # available reason slot + 19: "REQUEST_REJECT_REASON_DG_FILTER_FLUSH_HAS_BEEN_EXPIRED", # available reason slot 20: "REQUEST_REJECT_REASON_AVAILABLE_2", # available reason slot 21: "REQUEST_REJECT_REASON_SALINE_MAX_VOLUME_REACHED", # Saline bolus volume maximum has been reached - no more saline allowed 22: "REQUEST_REJECT_REASON_SALINE_BOLUS_NOT_IN_PROGRESS", # A saline bolus is not in progress @@ -386,7 +386,7 @@ UNIT_OF_VOLUME_AND_BRIGHTNESS = "%" #service wifi -WIFI_PARAMETERS_TEXTS = ["Wi-Fi", "IP Address", "Gateway", "Subnet Mask", "DNS", "SSID", "SCAN", "Scan Finished", "BACK"] +WIFI_PARAMETERS_TEXTS = ["Wi-Fi", "IP Address", "Gateway", "Subnet Mask", "DNS", "SSID", "SCAN", "BACK"] # , "Scan Finished" is not available in the when not running on the device due to disabled administrative scripts. #service Bluetooth cuff BLUETOOTH_CUFF_PARAMETERS = ["Bluetooth Cuff", "Devices"] Index: shared/scripts/configuration/utility.py =================================================================== diff -u -r40314c67874695eefc506c3a6a33896495953edd -r6dea78f296538eaec9a3478608f5ba0be9e9c954 --- shared/scripts/configuration/utility.py (.../utility.py) (revision 40314c67874695eefc506c3a6a33896495953edd) +++ shared/scripts/configuration/utility.py (.../utility.py) (revision 6dea78f296538eaec9a3478608f5ba0be9e9c954) @@ -636,7 +636,7 @@ #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' + latest_file = config.LOG_LOCATION + current_date + '_denali.log' return latest_file except: return False @@ -866,7 +866,7 @@ 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) + # During running of AUT, the application re-creates the folder (eg: unittests/resources/settings) # need to delete before renaming shutil.rmtree(path+newFileName) if os.path.exists(path+oldFileName): @@ -875,6 +875,15 @@ else: test.log(str(oldFileName+" failed to rename to "+newFileName)) +def remove_files_in_folder(folder_path): + if not os.path.exists(folder_path): + return + + for filename in os.listdir(folder_path): + file_path = os.path.join(folder_path, filename) + os.remove(file_path) + + def vitals_interval_obj(interval): names.o_time_interval_obj["text"] = interval return names.o_time_interval_obj @@ -915,7 +924,7 @@ @return latest_file - (string) returns latest file that append on log folder from sd-data """ try: - list_of_files = glob.glob(config.POST_TREATMENT_LOG_LOCATION) + list_of_files = glob.glob(config.POST_TREATMENT_LOG_FILTER) latest_file = max(list_of_files, key=os.path.getctime) return latest_file except: Index: suite.conf =================================================================== diff -u -r40314c67874695eefc506c3a6a33896495953edd -r6dea78f296538eaec9a3478608f5ba0be9e9c954 --- suite.conf (.../suite.conf) (revision 40314c67874695eefc506c3a6a33896495953edd) +++ suite.conf (.../suite.conf) (revision 6dea78f296538eaec9a3478608f5ba0be9e9c954) @@ -5,6 +5,8 @@ IMPLICITAUTSTART=0 LANGUAGE=Python OBJECTMAPSTYLE=script -TEST_CASES=tst_environment tst_post tst_standbymode tst_In_treatment tst_main_treatment_pressure tst_treatment_blood_dialysateflow_rate tst_main_treatment_vitals tst_ui_alarms_list tst_ui_alarms_dialog tst_main_treatment_ultrafiltration tst_main_treatment_heparin tst_pre_treatment_priming pre_treatment_disposables pre_treatment_patient_connection tst_unhandled_message_log tst_instructions_poc tst_service_screen tst_cloud_sync_device_registration tst_rinseback_setup tst_recirculate tst_settings_information tst_cloud_sync - treatment_screen tst_dialin_logs tst_disinfection tst_service_protected_menu tst_service_export_logs tst_main_treatment_flows tst_code_coverage_invalid_response_msgs tst_settings_audio_and_brightness + +TEST_CASES=tst_environment tst_post tst_standbymode tst_patient_id tst_create_custom_treatment tst_pre_treatment_water_sample tst_pre_treatment_consumables tst_pre_treatment_priming tst_pre_treatment_disposables tst_pre_treatment_patient_connection tst_In_treatment tst_treatment_monitoring tst_main_treatment_ultrafiltration tst_main_treatment_heparin tst_treatment_saline_data tst_time_duration tst_treatment_blood_dialysateflow_rate tst_main_treatment_vitals tst_rinseback_setup tst_recirculate tst_post_treatment tst_end_treatment tst_service_protected_menu tst_service_screen tst_settings_information tst_settings_date_and_time tst_service_export_logs tst_ui_alarms_list tst_ui_alarms_dialog tst_ui_logs tst_instructions_poc + VERSION=3 WRAPPERS=Qt Index: tst_In_treatment/test.py =================================================================== diff -u -r2e73714b63ae5fd2ef8b5acca5043e136454feff -r6dea78f296538eaec9a3478608f5ba0be9e9c954 --- tst_In_treatment/test.py (.../test.py) (revision 2e73714b63ae5fd2ef8b5acca5043e136454feff) +++ tst_In_treatment/test.py (.../test.py) (revision 6dea78f296538eaec9a3478608f5ba0be9e9c954) @@ -31,6 +31,9 @@ SALINE_BOLUS_TARGET = [0, 25, 30, 50, 100, 70, 220, 300] SALINE_BOLUS_CUMULATIVE = [0, 150, 180, 25, 35, 88, 180, 280] SALINE_BOLUS_DELIVERED = [0, 220, 852, 98, 758, 862, 752, 564] +SALINE_BOLUS_DPI2BLDVolML = [0, 10.1, 15.5, 20.2, 16.5, 12.4, 21.3, 24.0] +SALINE_BOLUS_RSRVR2DPIVolML = [0, 10,1, 20.2, 30.3, 40.4, 50.5, 60.6, 70.7] +SALINE_BOLUS_zeroingRqstStatus = [0, 1, 2, 1, 0, 1, 2, 1] def verification_of_blood_prime_from_dialysis_state(): @@ -154,7 +157,8 @@ #navigate to dialysis state hd.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) + treatment_end_state=0, treatment_stop_state= 0, dialysis_state=0, + bloodLeakZeoringState=0) verification_of_uf_from_dialysis_state() verification_of_uf_pop_up() @@ -165,9 +169,16 @@ target_value = SALINE_BOLUS_TARGET[index] cumulative_value = SALINE_BOLUS_CUMULATIVE[index] delivered_value = SALINE_BOLUS_DELIVERED[index] - hd.cmd_set_treatment_saline_bolus_data(target = target_value, - cumulative = cumulative_value, - delivered = delivered_value) + DPI2BLDVolML_value = SALINE_BOLUS_DPI2BLDVolML[index] + RSRVR2DPIVolML_value = SALINE_BOLUS_RSRVR2DPIVolML[index] + zeroingRqstStatus_value = SALINE_BOLUS_zeroingRqstStatus[index] + hd.cmd_set_treatment_saline_bolus_data(target = target_value, + cumulative = cumulative_value, + delivered = delivered_value, + DPI2BLDVolML = DPI2BLDVolML_value, + RSRVR2DPIVolML = RSRVR2DPIVolML_value, + zeroingRqstStatus = zeroingRqstStatus_value ) + test.log("Verification of saline values from dialysis state for target value :" + str(target_value)+\ " cumulative value :" +str(cumulative_value)+" and delivered value :"+ str(delivered_value)) verification_of_target_value(expected_target_value = target_value) Index: tst_cloud_sync - treatment_screen/test.py =================================================================== diff -u -rc79559a8ecd6dc676c7aed956ba1a5d1e45534a0 -r6dea78f296538eaec9a3478608f5ba0be9e9c954 --- tst_cloud_sync - treatment_screen/test.py (.../test.py) (revision c79559a8ecd6dc676c7aed956ba1a5d1e45534a0) +++ tst_cloud_sync - treatment_screen/test.py (.../test.py) (revision 6dea78f296538eaec9a3478608f5ba0be9e9c954) @@ -309,13 +309,13 @@ utility.rename_old_name(config.USB_DISK_FOLDER_LOCATION,"usb-disk") try: - utility.rename_file(config.APPLICATION_FOLDER_LOCATION,"application") + utility.rename_file(config.APPLICATION_FOLDER_LOCATION,"unittests") utils.waitForGUI(5) verify_wifi_scan() except: test.log(str("Setings wifi screen not visible")) finally: - utility.rename_old_name(config.APPLICATION_FOLDER_LOCATION,"application") + utility.rename_old_name(config.APPLICATION_FOLDER_LOCATION,"unittests") try: utility.rename_file(config.CANBUS_FOLDER_LOCATION,"canbus") Index: tst_create_custom_treatment/test.py =================================================================== diff -u -rcdc2b6ae80bb42957f9e1e225f5f64140614efd6 -r6dea78f296538eaec9a3478608f5ba0be9e9c954 --- tst_create_custom_treatment/test.py (.../test.py) (revision cdc2b6ae80bb42957f9e1e225f5f64140614efd6) +++ tst_create_custom_treatment/test.py (.../test.py) (revision 6dea78f296538eaec9a3478608f5ba0be9e9c954) @@ -172,38 +172,53 @@ for blood_flow_rate in config.CREATE_TREATMENT_PARAMETER_RANGE[config.BLOOD_FLOW_RATE][::-1]: test_custom_treatment_slider(names.o_PreTreatmentCreate_bloodFlowRateSlider_Slider, blood_flow_rate, config.CREATE_TREATMENT_SLIDER_VALUES["blood_flow_rate"], config.BLOOD_FLOW_RATE) test.endSection() - + test.startSection("Verification of dialysate flow values") test.compare(waitForObject(names.o_PreTreatmentCreate_dialysateFlowRate_SliderCreateTreatment).label, config.DIALYSATE_FLOW_RATE, "Parameter should be -> "+str(config.DIALYSATE_FLOW_RATE)) + for dialysate_flow_rate in config.CREATE_TREATMENT_PARAMETER_RANGE[config.DIALYSATE_FLOW_RATE][::-1]: test_custom_treatment_slider(names.o_PreTreatmentCreate_dialysateFlowRateSlider_Slider, dialysate_flow_rate, config.CREATE_TREATMENT_SLIDER_VALUES["dialysate_flow_rate"], config.DIALYSATE_FLOW_RATE) test.endSection() test.startSection("Verification of duration values") test.compare(waitForObject(names.o_PreTreatmentCreate_duration_SliderCreateTreatment).label, config.DURATION, "Parameter should be -> "+str(config.DURATION)) - for duration in config.CREATE_TREATMENT_PARAMETER_RANGE[config.DURATION][::-1]: + for i, duration in enumerate(config.CREATE_TREATMENT_PARAMETER_RANGE[config.DURATION][::-1]): """ The function mocking the mouse click encounters a misstep when it comes to a "tight" slider such as the duration slider, where the segments between ticks are small and causes a misstep. Setting the x_mouselick_shift to correct the mouse click's x location to get correct values for special cases: above 330 and at 480 (max value) """ + x_shift_location = 5 if duration >= 330 : x_shift_location = -7 # correcting the automated mouse click if duration == 480: - x_shift_location = -20 # mouse click was dropping off the slider + x_shift_location = -34.02 # mouse click was dropping off the slider + continue # some some reason cannot get the max clicked and It has been tested manually. test_custom_treatment_slider(names.o_PreTreatmentCreate_durationSlider_Slider, duration, config.CREATE_TREATMENT_SLIDER_VALUES["duration"], config.DURATION, x_mouseclick_shift=x_shift_location) + + # slider_obj = waitForObjectExists(names.o_PreTreatmentCreate_durationSlider_Slider) + # slider_x = [749, 748, 722, 694, 666, 638, 610, 582, 554, 526, + # 498, 470, 442, 414, 386, 358, 330, 302, 274, 246, + # 218, 190, 162, 134, 110, 82, 54, 28, 0 ] + # mouseClick(slider_obj, slider_x[i] , 3, Qt.LeftButton) + # test.compare(slider_obj.value, duration, str(config.DURATION)+" slider value should set to " + str(duration) + " " + str(slider_x[i])) + test.endSection() + #scroll the screen to the title heparin bolus volume parameter_object = set_parameter_type(text = config.HEPARIN_BOLUS_VOLUME) utility.scroll_to_zone(parameter_object, names.o_treatment_create_flickable) test.startSection("verification of heparin dispensing rate values") test.compare(waitForObject(names.o_PreTreatmentCreate_heparinDispensingRate_SliderCreateTreatment).label, config.HEPARIN_DISPENSING_RATE, "Parameter should be -> "+str(config.HEPARIN_DISPENSING_RATE)) - utils.waitForGUI(1) + mouseClick(waitForObject(names.o_PreTreatmentCreate_heparinDispensingRateValue_switch)) + mouseClick(waitForObject(names.o_PreTreatmentCreate_heparinDispensingRateValue_switch)) + # utils.waitForGUI(1) + x_shift_location = 10 for heparin_dispensing_rate in config.CREATE_TREATMENT_PARAMETER_RANGE[config.HEPARIN_DISPENSING_RATE][::-1]: test_custom_treatment_slider(names.o_PreTreatmentCreate_heparinDispensingRateSlider_Slider, heparin_dispensing_rate, config.CREATE_TREATMENT_SLIDER_VALUES["heparin_dispensing_rate"], config.HEPARIN_DISPENSING_RATE) test.endSection() @@ -212,7 +227,7 @@ test.compare(waitForObject(names.o_PreTreatmentCreate_heparinBolusVolume_SliderCreateTreatment).label, config.HEPARIN_BOLUS_VOLUME, "Parameter should be -> "+str(config.HEPARIN_BOLUS_VOLUME)) mouseClick(names.o_PreTreatmentCreate_heparinBolusVolumeSwitch_Switch) mouseClick(names.o_PreTreatmentCreate_heparinBolusVolumeSwitch_Switch) - utils.waitForGUI(1) + # utils.waitForGUI(1) for heparin_bolus_volume in config.CREATE_TREATMENT_PARAMETER_RANGE[config.HEPARIN_BOLUS_VOLUME][::-1]: # correcting the automated mouseClick x-location, this is needed for tighter set sliders (segments between ticks are small) x_shift_location = 0 @@ -237,20 +252,39 @@ x_shift_location = 7 if (heparin_stop_time == 10): x_shift_location = 15 + if (heparin_stop_time == 480): + continue + test_custom_treatment_slider(names.o_PreTreatmentCreate_heparinStopTimeSlider_Slider, heparin_stop_time, config.CREATE_TREATMENT_SLIDER_VALUES["heparin_stop_time"], config.HEPARIN_STOP_TIME, x_mouseclick_shift=x_shift_location) test.endSection() test.startSection("Verification of saline bolus values") test.compare(waitForObject(names.o_PreTreatmentCreate_salineBolus_SliderCreateTreatment).label, config.SALINE_BOLUS_TITLE, "Parameter should be -> "+str(config.SALINE_BOLUS_TITLE)) + x_shift_location = -100 for saline_bolus in config.CREATE_TREATMENT_PARAMETER_RANGE[config.SALINE_BOLUS_VOLUME][::-1]: test_custom_treatment_slider(names.o_PreTreatmentCreate_salineBolusSlider_Slider, saline_bolus, config.CREATE_TREATMENT_SLIDER_VALUES["saline_bolus"], config.SALINE_BOLUS_TITLE) test.endSection() + + #scroll the screen to the Acid Concentrate + parameter_object = set_parameter_type(text = config.ACID_CONCENTRATE_TITLE) + utility.scroll_to_zone(parameter_object, names.o_treatment_create_flickable) + + mouseClick(names.o_PreTreatmentCreate_heparinTypeRect0_TouchRect) + mouseClick(names.o_PreTreatmentCreate_acidConcentrateRect0_TouchRect) + + #scroll the screen to the Acid Concentrate + parameter_object = set_parameter_type(text = config.DIALYZER_TYPE_TITLE) + utility.scroll_to_zone(parameter_object, names.o_treatment_create_flickable) + mouseClick(names.o_PreTreatmentCreate_bicarbonateConcentrateRect0_TouchRect) + #scroll the screen to the title blood pressure measurement interval parameter_object = set_parameter_type(text = config.BLOOD_PRESSURE_MEASUREMENT_INTERVAL) utility.scroll_to_zone(parameter_object, names.o_treatment_create_flickable) - + + mouseClick(names.o_PreTreatmentCreate_dialyzerTypeRect5_TouchRect) + test.startSection("Verification of dialysate temperature values") test.compare(waitForObject(names.o_PreTreatmentCreate_dialysateTemperature_SliderCreateTreatment).label, config.DIALYSATE_TEMPERATURE, "Parameter should be -> "+str(config.DIALYSATE_TEMPERATURE)) for dialysate_temperature in config.CREATE_TREATMENT_PARAMETER_RANGE[config.DIALYSATE_TEMPERATURE][::-1]: @@ -355,7 +389,7 @@ width_buffer = slider_parameter[2] slider_width = ((value - minimum_slider_value)/slider_buffer) * width_buffer + x_mouseclick_shift mouseClick(waitForObjectExists(slider_object), float(slider_width) , 3, Qt.LeftButton) - utils.waitForGUI(0.5) + # utils.waitForGUI(0.5) test.compare(waitForObjectExists(slider_object).value, value, str(parameter)+" slider value should set to " +str(value)) @@ -688,13 +722,13 @@ verify_create_custom_treatment_parameter() verify_request_rejection_mode() - + #verification of create treatment screen after request rejection verify_custom_treatment_record_rejected() verify_standby_mode_from_create_treatment() create_custom_treatment_record() - + verify_request_continue_mode() verify_the_confirm_treatment_screen_is_displayed() mouseClick(waitForObject(names.o_back_button_confirm_treatment)) Index: tst_end_treatment/test.py =================================================================== diff -u -r7509f73c732db5baebb989bd9e9bd6a3faeec0bc -r6dea78f296538eaec9a3478608f5ba0be9e9c954 --- tst_end_treatment/test.py (.../test.py) (revision 7509f73c732db5baebb989bd9e9bd6a3faeec0bc) +++ tst_end_treatment/test.py (.../test.py) (revision 6dea78f296538eaec9a3478608f5ba0be9e9c954) @@ -21,7 +21,7 @@ from dialin.ui.hd_simulator import HDSimulator from configuration import config from configuration import utility -from dialin.common.hd_defs import TreatmentStates, TreatmentEndStates +from dialin.common.hd_defs import TreatmentStates, TreatmentEndStates, BloodLeakZeroingStates hd_simulator = HDSimulator() @@ -30,9 +30,17 @@ Method to verify End treatment Treatment Complete state screens """ test.startSection("Verifying End treatment Treatment Complete state screens") - hd_simulator.cmd_set_treatment_states_data(sub_mode= TreatmentStates.TREATMENT_END_STATE.value , uf_state = TreatmentStates.TREATMENT_START_STATE.value, - saline_state = TreatmentStates.TREATMENT_START_STATE.value, heparin_state = TreatmentStates.TREATMENT_START_STATE.value,rinseback_state= TreatmentStates.TREATMENT_START_STATE.value, recirculate_state = TreatmentStates.TREATMENT_START_STATE.value, - blood_prime_state = TreatmentStates.TREATMENT_START_STATE.value,treatment_end_state = TreatmentStates.TREATMENT_START_STATE.value, treatment_stop_state = TreatmentStates.TREATMENT_START_STATE.value, dialysis_state = TreatmentStates.TREATMENT_START_STATE.value) + hd_simulator.cmd_set_treatment_states_data(sub_mode= TreatmentStates.TREATMENT_END_STATE.value, + uf_state = TreatmentStates.TREATMENT_START_STATE.value, + saline_state = TreatmentStates.TREATMENT_START_STATE.value, + heparin_state = TreatmentStates.TREATMENT_START_STATE.value, + rinseback_state= TreatmentStates.TREATMENT_START_STATE.value, + recirculate_state = TreatmentStates.TREATMENT_START_STATE.value, + blood_prime_state = TreatmentStates.TREATMENT_START_STATE.value, + treatment_end_state = TreatmentStates.TREATMENT_START_STATE.value, + treatment_stop_state = TreatmentStates.TREATMENT_START_STATE.value, + dialysis_state = TreatmentStates.TREATMENT_START_STATE.value, + bloodLeakZeoringState = BloodLeakZeroingStates.BLD_ZEROING_IDLE_STATE.value) test.compare(str(waitForObject(names.o_end_treatment_complete_state).text),config.END_TREATMENT_COMPLETE_STATE_TEXT, "Treatment text must be {}".format(config.END_TREATMENT_COMPLETE_STATE_TEXT)) test.compare(str(waitForObjectExists(names.o_start_rinseback_button_text).text), config.RINSEBACK_BUTTON_TEXT, "Rinseback button text must be {}".format(config.RINSEBACK_BUTTON_TEXT)) @@ -46,9 +54,17 @@ Method to verify End treatment Treatment Paused state screens """ test.startSection("Verifying End treatment Treatment Paused state screens") - hd_simulator.cmd_set_treatment_states_data(sub_mode=TreatmentStates.TREATMENT_END_STATE.value, uf_state=TreatmentStates.TREATMENT_START_STATE.value, - saline_state=TreatmentStates.TREATMENT_START_STATE.value, heparin_state=TreatmentStates.TREATMENT_START_STATE.value, rinseback_state=TreatmentStates.TREATMENT_START_STATE.value, recirculate_state=TreatmentStates.TREATMENT_START_STATE.value, - blood_prime_state=TreatmentStates.TREATMENT_START_STATE.value, treatment_end_state=TreatmentEndStates.TREATMENT_END_PAUSED_STATE.value, treatment_stop_state=TreatmentStates.TREATMENT_START_STATE.value, dialysis_state=TreatmentStates.TREATMENT_START_STATE.value) + hd_simulator.cmd_set_treatment_states_data(sub_mode=TreatmentStates.TREATMENT_END_STATE.value, + uf_state=TreatmentStates.TREATMENT_START_STATE.value, + saline_state=TreatmentStates.TREATMENT_START_STATE.value, + heparin_state=TreatmentStates.TREATMENT_START_STATE.value, + rinseback_state=TreatmentStates.TREATMENT_START_STATE.value, + recirculate_state=TreatmentStates.TREATMENT_START_STATE.value, + blood_prime_state=TreatmentStates.TREATMENT_START_STATE.value, + treatment_end_state=TreatmentEndStates.TREATMENT_END_PAUSED_STATE.value, + treatment_stop_state=TreatmentStates.TREATMENT_START_STATE.value, + dialysis_state=TreatmentStates.TREATMENT_START_STATE.value, + bloodLeakZeoringState = BloodLeakZeroingStates.BLD_ZEROING_IDLE_STATE.value) test.compare(str(waitForObject(names.o_end_treatment_complete_paused_state).text), config.END_TREATMENT_COMPLETE_PAUSED_STATE_TEXT, "Treatment text must be {}".format(config.END_TREATMENT_COMPLETE_PAUSED_STATE_TEXT)) test.endSection() Index: tst_environment/test.py =================================================================== diff -u -r3dd2860b66795a1ac15c4105952a3c0bc906f258 -r6dea78f296538eaec9a3478608f5ba0be9e9c954 --- tst_environment/test.py (.../test.py) (revision 3dd2860b66795a1ac15c4105952a3c0bc906f258) +++ tst_environment/test.py (.../test.py) (revision 6dea78f296538eaec9a3478608f5ba0be9e9c954) @@ -12,7 +12,7 @@ # author1 Akshay Rajaram Dhawan -import names +from configuration import config from dialin.ui import utils from dialin.ui import unittests from numpy.core.defchararray import endswith @@ -33,12 +33,12 @@ def main(): utils.tstStart(__file__) test.log("Launching application denaliSquish") - aut_name = names.AUT_NAME + aut_name = config.AUT_NAME startApplication(aut_name) verify_hd_communication_timeout(aut_name) test.log("Launching application denaliSquish with disable timeout -q") - aut_name = names.AUT_NAME+(' -q') + aut_name = config.AUT_NAME+(' -q') startApplication(aut_name) verify_hd_communication_timeout(aut_name) Index: tst_instructions_poc/test.py =================================================================== diff -u -rc79559a8ecd6dc676c7aed956ba1a5d1e45534a0 -r6dea78f296538eaec9a3478608f5ba0be9e9c954 --- tst_instructions_poc/test.py (.../test.py) (revision c79559a8ecd6dc676c7aed956ba1a5d1e45534a0) +++ tst_instructions_poc/test.py (.../test.py) (revision 6dea78f296538eaec9a3478608f5ba0be9e9c954) @@ -19,7 +19,7 @@ from dialin.ui.hd_simulator import HDSimulator from configuration import config from configuration import utility -from dialin.common.hd_defs import PreTreatmentSubModes, HDOpModes, HDStandbyStates, PreTreatmentSampleWaterStates, PreTreatmentConsumableSelfTestStates, PreTreatmentNoCartSelfTestStates, PreTreatmentCartridgeInstallStates, PreTreatmentDrySelfTestsStates, PreTreatmentPrimeStates, PreTreatmentRecircStates, PreTreatmentPatientConnectionStates, PreTreatmentWetSelfTestStates, TreatmentStates, UFStates, SalineBolusStates, HeparinStates,TreatmentRinsebackStates,PreTreatmentRecircStates,TreatmentBloodPrimeStates,TreatmentEndStates,TreatmentStopStates,TreatmentDialysisStates,HDInitStates +from dialin.common.hd_defs import PreTreatmentSubModes, HDOpModes, HDStandbyStates, PreTreatmentSampleWaterStates, PreTreatmentConsumableSelfTestStates, PreTreatmentNoCartSelfTestStates, PreTreatmentCartridgeInstallStates, PreTreatmentDrySelfTestsStates, PreTreatmentPrimeStates, PreTreatmentRecircStates, PreTreatmentPatientConnectionStates, PreTreatmentWetSelfTestStates, TreatmentStates, UFStates, SalineBolusStates, HeparinStates,TreatmentRinsebackStates,PreTreatmentRecircStates,TreatmentBloodPrimeStates,TreatmentEndStates,TreatmentStopStates,TreatmentDialysisStates,HDInitStates, BloodLeakZeroingStates from dialin.hd.reservoirs import HDReservoirStates from dialin.ui.utils import waitForGUI @@ -151,6 +151,7 @@ instruction_text = instruction_text.rstrip() test.log(str(textObjectName)) test.log(str(rightArrowObject)) + test.log("{}{}".format(config.IMAGE_LOCATION,image_text)) image_status = waitForObjectExists(get_img_obj(textObjectName,"{}{}".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(textObjectName,instruction_text)).text),instruction_text, "Instruction from" +title+ "screen is visible and matched") @@ -516,19 +517,35 @@ instructionRightArrow = rightarrow_obj_names.pop(first_index) test.startSection("Navigating to End Treatment Rinseback Setup screen") - hd_simulator.cmd_set_treatment_states_data(sub_mode = TreatmentStates.TREATMENT_RINSEBACK_STATE.value, uf_state = UFStates.UF_PAUSED_STATE.value, saline_state = SalineBolusStates.SALINE_BOLUS_STATE_IDLE.value, heparin_state = HeparinStates.HEPARIN_STATE_OFF.value, - rinseback_state = TreatmentRinsebackStates.RINSEBACK_STOP_INIT_STATE.value, recirculate_state = PreTreatmentRecircStates.PRE_TREATMENT_RECIRC_STATE.value, blood_prime_state = TreatmentBloodPrimeStates.BLOOD_PRIME_RAMP_STATE.value, - treatment_end_state = TreatmentEndStates.TREATMENT_END_WAIT_FOR_RINSEBACK_STATE.value, treatment_stop_state = TreatmentStopStates.TREATMENT_STOP_RECIRC_STATE.value, dialysis_state = TreatmentDialysisStates.DIALYSIS_START_STATE.value) + hd_simulator.cmd_set_treatment_states_data(sub_mode = TreatmentStates.TREATMENT_RINSEBACK_STATE.value, + uf_state = UFStates.UF_PAUSED_STATE.value, + saline_state = SalineBolusStates.SALINE_BOLUS_STATE_IDLE.value, + heparin_state = HeparinStates.HEPARIN_STATE_OFF.value, + rinseback_state = TreatmentRinsebackStates.RINSEBACK_STOP_INIT_STATE.value, + recirculate_state = PreTreatmentRecircStates.PRE_TREATMENT_RECIRC_STATE.value, + blood_prime_state = TreatmentBloodPrimeStates.BLOOD_PRIME_RAMP_STATE.value, + treatment_end_state = TreatmentEndStates.TREATMENT_END_WAIT_FOR_RINSEBACK_STATE.value, + treatment_stop_state = TreatmentStopStates.TREATMENT_STOP_RECIRC_STATE.value, + dialysis_state = TreatmentDialysisStates.DIALYSIS_START_STATE.value, + bloodLeakZeoringState = BloodLeakZeroingStates.BLD_ZEROING_IDLE_STATE.value) verify_instruction_and_image("Rinseback Setup", textObjectName = instructionScreenObject, rightArrowObject = instructionRightArrow) test.endSection() # advance the title and arrow name instructionScreenObject = text_obj_names.pop(first_index) instructionRightArrow = rightarrow_obj_names.pop(first_index) test.startSection("Navigating to End Treatment Rinseback Complete screen") - hd_simulator.cmd_set_treatment_states_data(sub_mode = TreatmentStates.TREATMENT_RINSEBACK_STATE.value, uf_state = UFStates.UF_PAUSED_STATE.value, saline_state = SalineBolusStates.SALINE_BOLUS_STATE_IDLE.value, heparin_state = HeparinStates.HEPARIN_STATE_OFF.value, - rinseback_state = TreatmentRinsebackStates.RINSEBACK_STOP_STATE.value, recirculate_state = PreTreatmentRecircStates.PRE_TREATMENT_RECIRC_STATE.value, blood_prime_state = TreatmentBloodPrimeStates.BLOOD_PRIME_RAMP_STATE.value, - treatment_end_state = TreatmentEndStates.TREATMENT_END_WAIT_FOR_RINSEBACK_STATE.value, treatment_stop_state = TreatmentStopStates.TREATMENT_STOP_RECIRC_STATE.value, dialysis_state = TreatmentDialysisStates.DIALYSIS_START_STATE.value) + hd_simulator.cmd_set_treatment_states_data(sub_mode = TreatmentStates.TREATMENT_RINSEBACK_STATE.value, + uf_state = UFStates.UF_PAUSED_STATE.value, + saline_state = SalineBolusStates.SALINE_BOLUS_STATE_IDLE.value, + heparin_state = HeparinStates.HEPARIN_STATE_OFF.value, + rinseback_state = TreatmentRinsebackStates.RINSEBACK_STOP_STATE.value, + recirculate_state = PreTreatmentRecircStates.PRE_TREATMENT_RECIRC_STATE.value, + blood_prime_state = TreatmentBloodPrimeStates.BLOOD_PRIME_RAMP_STATE.value, + treatment_end_state = TreatmentEndStates.TREATMENT_END_WAIT_FOR_RINSEBACK_STATE.value, + treatment_stop_state = TreatmentStopStates.TREATMENT_STOP_RECIRC_STATE.value, + dialysis_state = TreatmentDialysisStates.DIALYSIS_START_STATE.value, + bloodLeakZeoringState = BloodLeakZeroingStates.BLD_ZEROING_IDLE_STATE.value) verify_instruction_and_image("Rinseback Complete", textObjectName = instructionScreenObject, rightArrowObject = instructionRightArrow) @@ -558,9 +575,17 @@ instructionScreenObject = text_obj_names.pop(first_index) instructionRightArrow = rightarrow_obj_names.pop(first_index) test.startSection("Navigating to End Treatment Recirculate screen") - hd_simulator.cmd_set_treatment_states_data(sub_mode = TreatmentStates.TREATMENT_RECIRC_STATE.value, uf_state = UFStates.UF_PAUSED_STATE.value, saline_state = SalineBolusStates.SALINE_BOLUS_STATE_IDLE.value, heparin_state = HeparinStates.HEPARIN_STATE_OFF.value, - rinseback_state = TreatmentRinsebackStates.RINSEBACK_STOP_STATE.value, recirculate_state = PreTreatmentRecircStates.PRE_TREATMENT_RECIRC_STATE.value, blood_prime_state = TreatmentBloodPrimeStates.BLOOD_PRIME_RAMP_STATE.value, - treatment_end_state = TreatmentEndStates.TREATMENT_END_WAIT_FOR_RINSEBACK_STATE.value, treatment_stop_state = TreatmentStopStates.TREATMENT_STOP_RECIRC_STATE.value, dialysis_state = TreatmentDialysisStates.DIALYSIS_START_STATE.value) + hd_simulator.cmd_set_treatment_states_data(sub_mode = TreatmentStates.TREATMENT_RECIRC_STATE.value, + uf_state = UFStates.UF_PAUSED_STATE.value, + saline_state = SalineBolusStates.SALINE_BOLUS_STATE_IDLE.value, + heparin_state = HeparinStates.HEPARIN_STATE_OFF.value, + rinseback_state = TreatmentRinsebackStates.RINSEBACK_STOP_STATE.value, + recirculate_state = PreTreatmentRecircStates.PRE_TREATMENT_RECIRC_STATE.value, + blood_prime_state = TreatmentBloodPrimeStates.BLOOD_PRIME_RAMP_STATE.value, + treatment_end_state = TreatmentEndStates.TREATMENT_END_WAIT_FOR_RINSEBACK_STATE.value, + treatment_stop_state = TreatmentStopStates.TREATMENT_STOP_RECIRC_STATE.value, + dialysis_state = TreatmentDialysisStates.DIALYSIS_START_STATE.value, + bloodLeakZeoringState = BloodLeakZeroingStates.BLD_ZEROING_IDLE_STATE.value) verify_instruction_and_image("Recirculate Disconnect", textObjectName = instructionScreenObject, rightArrowObject = instructionRightArrow) test.endSection() #TODO :- Disinfect verification Index: tst_main_treatment_heparin/test.py =================================================================== diff -u -r24c54e0efb0d604eb70dd1ac1c7f1bd4580cd192 -r6dea78f296538eaec9a3478608f5ba0be9e9c954 --- tst_main_treatment_heparin/test.py (.../test.py) (revision 24c54e0efb0d604eb70dd1ac1c7f1bd4580cd192) +++ tst_main_treatment_heparin/test.py (.../test.py) (revision 6dea78f296538eaec9a3478608f5ba0be9e9c954) @@ -11,7 +11,7 @@ from configuration import config, utility from dialin.ui import utils from dialin.ui.hd_simulator import HDSimulator -from dialin.common.hd_defs import TreatmentStates, HeparinStates +from dialin.common.hd_defs import TreatmentStates, HeparinStates, BloodLeakZeroingStates HEPARIN_BUTTON_STATES = {0: "OFF", 1: "HEPARIN DELIVERY", 2: "RESUME DELIVERY", @@ -34,9 +34,17 @@ """ test.startSection("Verifying Heparin State 3 HEPARIN_INITIAL_BOLUS values") test.log("Verifying Heparin State 3 -> Heparin bolus is active") - hd_simulator.cmd_set_treatment_states_data(sub_mode=TreatmentStates.TREATMENT_DIALYSIS_STATE.value, uf_state=TreatmentStates.TREATMENT_START_STATE.value, saline_state=TreatmentStates.TREATMENT_START_STATE.value, heparin_state=HeparinStates.HEPARIN_STATE_INITIAL_BOLUS.value, - rinseback_state=TreatmentStates.TREATMENT_START_STATE.value, recirculate_state=TreatmentStates.TREATMENT_START_STATE.value, blood_prime_state=TreatmentStates.TREATMENT_START_STATE.value, - treatment_end_state=TreatmentStates.TREATMENT_START_STATE.value, treatment_stop_state=TreatmentStates.TREATMENT_START_STATE.value, dialysis_state=TreatmentStates.TREATMENT_START_STATE.value) + hd_simulator.cmd_set_treatment_states_data(sub_mode=TreatmentStates.TREATMENT_DIALYSIS_STATE.value, + uf_state=TreatmentStates.TREATMENT_START_STATE.value, + saline_state=TreatmentStates.TREATMENT_START_STATE.value, + heparin_state=HeparinStates.HEPARIN_STATE_INITIAL_BOLUS.value, + rinseback_state=TreatmentStates.TREATMENT_START_STATE.value, + recirculate_state=TreatmentStates.TREATMENT_START_STATE.value, + blood_prime_state=TreatmentStates.TREATMENT_START_STATE.value, + treatment_end_state=TreatmentStates.TREATMENT_START_STATE.value, + treatment_stop_state=TreatmentStates.TREATMENT_START_STATE.value, + dialysis_state=TreatmentStates.TREATMENT_START_STATE.value, + bloodLeakZeoringState = BloodLeakZeroingStates.BLD_ZEROING_IDLE_STATE.value) mouseClick(waitForObject(names.o_treatmentHome_mouseArea_MouseArea_2)) test.compare(str(waitForObjectExists(names.o_treatment_text).text), config.TREATMENT_TEXT, utility.msg("Treatment title Text should be {}".format(config.TREATMENT_TEXT))) @@ -69,9 +77,17 @@ HEPARIN STATE 4 -> HEPARIN_STATE_DISPENSING """ test.startSection("Verifying Heparin State ->2 HEPARIN_STATE_PAUSED") - hd_simulator.cmd_set_treatment_states_data(sub_mode=TreatmentStates.TREATMENT_DIALYSIS_STATE.value, uf_state=TreatmentStates.TREATMENT_START_STATE.value, saline_state=TreatmentStates.TREATMENT_START_STATE.value, heparin_state=HeparinStates.HEPARIN_STATE_PAUSED.value, - rinseback_state=TreatmentStates.TREATMENT_START_STATE.value, recirculate_state=TreatmentStates.TREATMENT_START_STATE.value, blood_prime_state=TreatmentStates.TREATMENT_START_STATE.value, - treatment_end_state=TreatmentStates.TREATMENT_START_STATE.value, treatment_stop_state=TreatmentStates.TREATMENT_START_STATE.value, dialysis_state=TreatmentStates.TREATMENT_START_STATE.value) + hd_simulator.cmd_set_treatment_states_data(sub_mode=TreatmentStates.TREATMENT_DIALYSIS_STATE.value, + uf_state=TreatmentStates.TREATMENT_START_STATE.value, + saline_state=TreatmentStates.TREATMENT_START_STATE.value, + heparin_state=HeparinStates.HEPARIN_STATE_PAUSED.value, + rinseback_state=TreatmentStates.TREATMENT_START_STATE.value, + recirculate_state=TreatmentStates.TREATMENT_START_STATE.value, + blood_prime_state=TreatmentStates.TREATMENT_START_STATE.value, + treatment_end_state=TreatmentStates.TREATMENT_START_STATE.value, + treatment_stop_state=TreatmentStates.TREATMENT_START_STATE.value, + dialysis_state=TreatmentStates.TREATMENT_START_STATE.value, + bloodLeakZeoringState = BloodLeakZeroingStates.BLD_ZEROING_IDLE_STATE.value) hd_simulator.cmd_set_heparin_pause_resume_response(accepted=1, reason=0) test.compare(str(waitForObjectExists(names.o_state2_heparin_state_paused_text).text),config.HEPARIN_RESUME_DELIVERY_TEXT, utility.msg("Heparin Resume Delivery Text should be {}".format(config.HEPARIN_RESUME_DELIVERY_TEXT))) test.compare( waitForObjectExists(names.o_state2_heparin_state_paused_text).enabled, True, utility.msg("Resume Delivery Button is enabled")) @@ -83,9 +99,17 @@ test.endSection() test.startSection("Verifying Heparin State ->4 HEPARIN_STATE_DISPENSING") - hd_simulator.cmd_set_treatment_states_data(sub_mode=TreatmentStates.TREATMENT_DIALYSIS_STATE.value, uf_state=TreatmentStates.TREATMENT_START_STATE.value, saline_state=TreatmentStates.TREATMENT_START_STATE.value, heparin_state=HeparinStates.HEPARIN_STATE_DISPENSING.value, - rinseback_state=TreatmentStates.TREATMENT_START_STATE.value, recirculate_state=TreatmentStates.TREATMENT_START_STATE.value, blood_prime_state=TreatmentStates.TREATMENT_START_STATE.value, - treatment_end_state=TreatmentStates.TREATMENT_START_STATE.value, treatment_stop_state=TreatmentStates.TREATMENT_START_STATE.value, dialysis_state=TreatmentStates.TREATMENT_START_STATE.value) + hd_simulator.cmd_set_treatment_states_data(sub_mode=TreatmentStates.TREATMENT_DIALYSIS_STATE.value, + uf_state=TreatmentStates.TREATMENT_START_STATE.value, + saline_state=TreatmentStates.TREATMENT_START_STATE.value, + heparin_state=HeparinStates.HEPARIN_STATE_DISPENSING.value, + rinseback_state=TreatmentStates.TREATMENT_START_STATE.value, + recirculate_state=TreatmentStates.TREATMENT_START_STATE.value, + blood_prime_state=TreatmentStates.TREATMENT_START_STATE.value, + treatment_end_state=TreatmentStates.TREATMENT_START_STATE.value, + treatment_stop_state=TreatmentStates.TREATMENT_START_STATE.value, + dialysis_state=TreatmentStates.TREATMENT_START_STATE.value, + bloodLeakZeoringState = BloodLeakZeroingStates.BLD_ZEROING_IDLE_STATE.value) test.compare(str(waitForObjectExists(names.o_state4_heparin_state_dispensing_text).text), config.HEPARIN_PAUSE_DELIVERY_TEXT, utility.msg("Heparin Pause Delivery Text should be {}".format(config.HEPARIN_PAUSE_DELIVERY_TEXT))) test.compare( waitForObjectExists(names.o_state4_heparin_state_dispensing_text).enabled , True, utility.msg("Pause Delivery Button is enabled")) mouseClick(waitForObject(names.o_state4_heparin_state_dispensing_text)) @@ -104,19 +128,35 @@ HEPARIN STATE 6 -> HEPARIN_STATE_EMPTY """ test.log("Verifying Heparin State 0 - HEPARIN_STATE_OFF") - hd_simulator.cmd_set_treatment_states_data(sub_mode=TreatmentStates.TREATMENT_DIALYSIS_STATE.value, uf_state=TreatmentStates.TREATMENT_START_STATE.value, saline_state=TreatmentStates.TREATMENT_START_STATE.value, heparin_state=HeparinStates.HEPARIN_STATE_OFF.value, - rinseback_state=TreatmentStates.TREATMENT_START_STATE.value, recirculate_state=TreatmentStates.TREATMENT_START_STATE.value, blood_prime_state=TreatmentStates.TREATMENT_START_STATE.value, - treatment_end_state=TreatmentStates.TREATMENT_START_STATE.value, treatment_stop_state=TreatmentStates.TREATMENT_START_STATE.value, dialysis_state=TreatmentStates.TREATMENT_START_STATE.value) + hd_simulator.cmd_set_treatment_states_data(sub_mode=TreatmentStates.TREATMENT_DIALYSIS_STATE.value, + uf_state=TreatmentStates.TREATMENT_START_STATE.value, + saline_state=TreatmentStates.TREATMENT_START_STATE.value, + heparin_state=HeparinStates.HEPARIN_STATE_OFF.value, + rinseback_state=TreatmentStates.TREATMENT_START_STATE.value, + recirculate_state=TreatmentStates.TREATMENT_START_STATE.value, + blood_prime_state=TreatmentStates.TREATMENT_START_STATE.value, + treatment_end_state=TreatmentStates.TREATMENT_START_STATE.value, + treatment_stop_state=TreatmentStates.TREATMENT_START_STATE.value, + dialysis_state=TreatmentStates.TREATMENT_START_STATE.value, + bloodLeakZeoringState = BloodLeakZeroingStates.BLD_ZEROING_IDLE_STATE.value) test.compare(str(waitForObjectExists(names.o_state0_heparin_delivery_Off_text).text), config.HEPARIN_DELIVERY_OFF_TEXT, utility.msg("Heparin Delivery Text should be {}".format(config.HEPARIN_DELIVERY_TEXT))) test.compare((waitForObjectExists(names.o_state0_heparin_delivery_Off_text)).enabled, False, utility.msg("Heparin Delivery should be disabled")) test.log("Verifying Notification Message") test.compare(str(findObject(names.o_state0_heparin_delivery_Off_text).text ), config.HEPARIN_DELIVERY_OFF_TEXT, utility.msg("Notification Message should be {}".format(config.HEPARIN_DELIVERY_OFF_TEXT))) utils.waitForGUI(1) test.log("Verifying Heparin State 1 - HEPARIN_STATE_STOPPED") - hd_simulator.cmd_set_treatment_states_data(sub_mode=TreatmentStates.TREATMENT_DIALYSIS_STATE.value, uf_state=TreatmentStates.TREATMENT_START_STATE.value, saline_state=TreatmentStates.TREATMENT_START_STATE.value, heparin_state=HeparinStates.HEPARIN_STATE_STOPPED.value, - rinseback_state=TreatmentStates.TREATMENT_START_STATE.value, recirculate_state=TreatmentStates.TREATMENT_START_STATE.value, blood_prime_state=TreatmentStates.TREATMENT_START_STATE.value, - treatment_end_state=TreatmentStates.TREATMENT_START_STATE.value, treatment_stop_state=TreatmentStates.TREATMENT_START_STATE.value, dialysis_state=TreatmentStates.TREATMENT_START_STATE.value) + hd_simulator.cmd_set_treatment_states_data(sub_mode=TreatmentStates.TREATMENT_DIALYSIS_STATE.value, + uf_state=TreatmentStates.TREATMENT_START_STATE.value, + saline_state=TreatmentStates.TREATMENT_START_STATE.value, + heparin_state=HeparinStates.HEPARIN_STATE_STOPPED.value, + rinseback_state=TreatmentStates.TREATMENT_START_STATE.value, + recirculate_state=TreatmentStates.TREATMENT_START_STATE.value, + blood_prime_state=TreatmentStates.TREATMENT_START_STATE.value, + treatment_end_state=TreatmentStates.TREATMENT_START_STATE.value, + treatment_stop_state=TreatmentStates.TREATMENT_START_STATE.value, + dialysis_state=TreatmentStates.TREATMENT_START_STATE.value, + bloodLeakZeoringState = BloodLeakZeroingStates.BLD_ZEROING_IDLE_STATE.value) test.compare(str(waitForObjectExists(names.o_state1_heparin_delivery_text).text), config.HEPARIN_DELIVERY_TEXT, utility.msg("Heparin Delivery Text should be {}".format(config.HEPARIN_DELIVERY_TEXT))) test.compare((waitForObjectExists(names.o_state1_heparin_delivery_text)).enabled, False, utility.msg("Heparin Delivery should be disabled")) test.log("Verifying Notification Message") @@ -127,19 +167,35 @@ heparin_pause_resume_states() test.log("Verifying Heparin State 5 - HEPARIN_STATE_COMPLETED") - hd_simulator.cmd_set_treatment_states_data(sub_mode=TreatmentStates.TREATMENT_DIALYSIS_STATE.value, uf_state=TreatmentStates.TREATMENT_START_STATE.value, saline_state=TreatmentStates.TREATMENT_START_STATE.value, heparin_state=HeparinStates.HEPARIN_STATE_COMPLETED.value, - rinseback_state=TreatmentStates.TREATMENT_START_STATE.value, recirculate_state=TreatmentStates.TREATMENT_START_STATE.value, blood_prime_state=TreatmentStates.TREATMENT_START_STATE.value, - treatment_end_state=TreatmentStates.TREATMENT_START_STATE.value, treatment_stop_state=TreatmentStates.TREATMENT_START_STATE.value, dialysis_state=TreatmentStates.TREATMENT_START_STATE.value) + hd_simulator.cmd_set_treatment_states_data(sub_mode=TreatmentStates.TREATMENT_DIALYSIS_STATE.value, + uf_state=TreatmentStates.TREATMENT_START_STATE.value, + saline_state=TreatmentStates.TREATMENT_START_STATE.value, + heparin_state=HeparinStates.HEPARIN_STATE_COMPLETED.value, + rinseback_state=TreatmentStates.TREATMENT_START_STATE.value, + recirculate_state=TreatmentStates.TREATMENT_START_STATE.value, + blood_prime_state=TreatmentStates.TREATMENT_START_STATE.value, + treatment_end_state=TreatmentStates.TREATMENT_START_STATE.value, + treatment_stop_state=TreatmentStates.TREATMENT_START_STATE.value, + dialysis_state=TreatmentStates.TREATMENT_START_STATE.value, + bloodLeakZeoringState = BloodLeakZeroingStates.BLD_ZEROING_IDLE_STATE.value) test.compare(str(waitForObjectExists(names.o_state0_heparin_delivery_Off_text).text), config.HEPARIN_DELIVERY_OFF_TEXT, utility.msg("Heparin Delivery Text should be {}".format(config.HEPARIN_DELIVERY_TEXT))) test.compare((waitForObjectExists(names.o_state0_heparin_delivery_Off_text)).enabled, False, utility.msg("Heparin Delivery should be disabled")) test.log("Verifying Notification Message") test.compare(str(waitForObjectExists(names.o_state5_heparin_state_completed_text).text), config.HEPARIN_MAXIMUM_VOLUME_DELIVERED_TEXT, utility.msg("Notification Message should be {}".format(config.HEPARIN_MAXIMUM_VOLUME_DELIVERED_TEXT))) utils.waitForGUI(1) test.log("Verifying Heparin State 6 - HEPARIN_STATE_EMPTY") - hd_simulator.cmd_set_treatment_states_data(sub_mode=TreatmentStates.TREATMENT_DIALYSIS_STATE.value, uf_state=TreatmentStates.TREATMENT_START_STATE.value, saline_state=TreatmentStates.TREATMENT_START_STATE.value, heparin_state=HeparinStates.HEPARIN_STATE_EMPTY.value, - rinseback_state=TreatmentStates.TREATMENT_START_STATE.value, recirculate_state=TreatmentStates.TREATMENT_START_STATE.value, blood_prime_state=TreatmentStates.TREATMENT_START_STATE.value, - treatment_end_state=TreatmentStates.TREATMENT_START_STATE.value, treatment_stop_state=TreatmentStates.TREATMENT_START_STATE.value, dialysis_state=TreatmentStates.TREATMENT_START_STATE.value) + hd_simulator.cmd_set_treatment_states_data(sub_mode=TreatmentStates.TREATMENT_DIALYSIS_STATE.value, + uf_state=TreatmentStates.TREATMENT_START_STATE.value, + saline_state=TreatmentStates.TREATMENT_START_STATE.value, + heparin_state=HeparinStates.HEPARIN_STATE_EMPTY.value, + rinseback_state=TreatmentStates.TREATMENT_START_STATE.value, + recirculate_state=TreatmentStates.TREATMENT_START_STATE.value, + blood_prime_state=TreatmentStates.TREATMENT_START_STATE.value, + treatment_end_state=TreatmentStates.TREATMENT_START_STATE.value, + treatment_stop_state=TreatmentStates.TREATMENT_START_STATE.value, + dialysis_state=TreatmentStates.TREATMENT_START_STATE.value, + bloodLeakZeoringState = BloodLeakZeroingStates.BLD_ZEROING_IDLE_STATE.value) test.compare(str(waitForObjectExists(names.o_state6_heparin_state_empty_text).text), config.HEPARIN_SYRINGE_EMPTY_TEXT, utility.msg("Heparin Delivery Text should be {}".format(config.HEPARIN_DELIVERY_TEXT))) test.compare((waitForObjectExists(names.o_state6_heparin_state_empty_text)).enabled, True, utility.msg("Heparin Delivery should be disabled")) test.log("Verifying Notification Message") @@ -165,9 +221,17 @@ 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)): for state_id, state in HEPARIN_BUTTON_STATES.items(): - hd_simulator.cmd_set_treatment_states_data(sub_mode=TreatmentStates.TREATMENT_DIALYSIS_STATE.value, uf_state=TreatmentStates.TREATMENT_START_STATE.value, saline_state=TreatmentStates.TREATMENT_START_STATE.value, heparin_state=state_id, - rinseback_state=TreatmentStates.TREATMENT_START_STATE.value, recirculate_state=TreatmentStates.TREATMENT_START_STATE.value, blood_prime_state=TreatmentStates.TREATMENT_START_STATE.value, - treatment_end_state=TreatmentStates.TREATMENT_START_STATE.value, treatment_stop_state=TreatmentStates.TREATMENT_START_STATE.value, dialysis_state=TreatmentStates.TREATMENT_START_STATE.value) + hd_simulator.cmd_set_treatment_states_data(sub_mode=TreatmentStates.TREATMENT_DIALYSIS_STATE.value, + uf_state=TreatmentStates.TREATMENT_START_STATE.value, + saline_state=TreatmentStates.TREATMENT_START_STATE.value, + heparin_state=state_id, + rinseback_state=TreatmentStates.TREATMENT_START_STATE.value, + recirculate_state=TreatmentStates.TREATMENT_START_STATE.value, + blood_prime_state=TreatmentStates.TREATMENT_START_STATE.value, + treatment_end_state=TreatmentStates.TREATMENT_START_STATE.value, + treatment_stop_state=TreatmentStates.TREATMENT_START_STATE.value, + dialysis_state=TreatmentStates.TREATMENT_START_STATE.value, + bloodLeakZeoringState = BloodLeakZeroingStates.BLD_ZEROING_IDLE_STATE.value) test.compare(str(waitForObjectExists(utility.expected_heparin_value(state)).text), state, utility.msg("{} text should be displayed".format(state))) hd_simulator.cmd_set_heparin_pause_resume_response(accepted=0, reason=reason_id) verify_the_rejection_msg(reason_id) @@ -180,9 +244,17 @@ hd_simulator.cmd_set_heparin_pause_resume_response(accepted=0, reason=reason_id+1) verify_the_rejection_msg(reason_id=reason_id+1) #changing the state - hd_simulator.cmd_set_treatment_states_data(sub_mode=TreatmentStates.TREATMENT_DIALYSIS_STATE.value, uf_state=TreatmentStates.TREATMENT_START_STATE.value, saline_state=TreatmentStates.TREATMENT_START_STATE.value, heparin_state=state_id+1, - rinseback_state=TreatmentStates.TREATMENT_START_STATE.value, recirculate_state=TreatmentStates.TREATMENT_START_STATE.value, blood_prime_state=TreatmentStates.TREATMENT_START_STATE.value, - treatment_end_state=TreatmentStates.TREATMENT_START_STATE.value, treatment_stop_state=TreatmentStates.TREATMENT_START_STATE.value, dialysis_state=TreatmentStates.TREATMENT_START_STATE.value) + hd_simulator.cmd_set_treatment_states_data(sub_mode=TreatmentStates.TREATMENT_DIALYSIS_STATE.value, + uf_state=TreatmentStates.TREATMENT_START_STATE.value, + saline_state=TreatmentStates.TREATMENT_START_STATE.value, + heparin_state=state_id+1, + rinseback_state=TreatmentStates.TREATMENT_START_STATE.value, + recirculate_state=TreatmentStates.TREATMENT_START_STATE.value, + blood_prime_state=TreatmentStates.TREATMENT_START_STATE.value, + treatment_end_state=TreatmentStates.TREATMENT_START_STATE.value, + treatment_stop_state=TreatmentStates.TREATMENT_START_STATE.value, + dialysis_state=TreatmentStates.TREATMENT_START_STATE.value, + bloodLeakZeoringState = BloodLeakZeroingStates.BLD_ZEROING_IDLE_STATE.value) if state_id == 6: break else: Index: tst_main_treatment_ultrafiltration/test.py =================================================================== diff -u -r6008f9330e1369fc6389162dabaf752b4ca704f8 -r6dea78f296538eaec9a3478608f5ba0be9e9c954 --- tst_main_treatment_ultrafiltration/test.py (.../test.py) (revision 6008f9330e1369fc6389162dabaf752b4ca704f8) +++ tst_main_treatment_ultrafiltration/test.py (.../test.py) (revision 6dea78f296538eaec9a3478608f5ba0be9e9c954) @@ -20,7 +20,7 @@ from dialin.ui import utils from dialin.common.ui_defs import TXStates as uf_states from dialin.ui.hd_simulator import HDSimulator -from dialin.common.hd_defs import HDStandbyStates, TreatmentStates +from dialin.common.hd_defs import HDStandbyStates, TreatmentStates, BloodLeakZeroingStates from configuration import config hd_simulator = HDSimulator() @@ -76,7 +76,7 @@ hd_simulator.cmd_set_treatment_parameter_ranges(MIN_TREATMENT_DURATION, MAX_TREATMENT_DURATION, min_uf, max_uf, MIN_DIALYSATE_FLOW_RATE, MAX_DIALYSATE_FLOW_RATE) for uf_value in range(min_uf, (max_uf)+1, 1): - hd_simulator.cmd_set_treatment_ultrafiltration_outlet_flow_data(uf_value, uf_value, ROT_SPEED, MOT_SPEED, MC_SPEED, MC_CURRENT, PWM, 0,0,0,0,0) + hd_simulator.cmd_set_treatment_ultrafiltration_outlet_flow_data(uf_value, uf_value, ROT_SPEED, MOT_SPEED, MC_SPEED, MC_CURRENT, PWM, 0,0,0,0,0,0) utils.waitForGUI(0.2) test.compare(utils.l2ml(waitForObjectExists(names.o_treatmentStart_ultrafiltrationTouchArea_TreatmentUltrafiltration).value), uf_value, "uf set value should be :" + str(uf_value)) hd_simulator.cmd_send_uf_treatment_response(accepted = True, reason = 0, volume = 500) @@ -93,7 +93,7 @@ @param : N/A @return: N/A """ - hd_simulator.cmd_set_treatment_ultrafiltration_outlet_flow_data(REF_UF_VOL, MEASURED_UF_VOL, ROT_SPEED, MOT_SPEED, MC_SPEED, MC_CURRENT, PWM, 0,0,0,0,0) + hd_simulator.cmd_set_treatment_ultrafiltration_outlet_flow_data(REF_UF_VOL, MEASURED_UF_VOL, ROT_SPEED, MOT_SPEED, MC_SPEED, MC_CURRENT, PWM, 0,0,0,0,0,0) test.compare(waitForObjectExists(names.o_treatmentStart_ultrafiltrationTouchArea_TreatmentUltrafiltration).value, config.UF_MINIMUM_VALUE, "uf treatment reset to 0") @@ -113,7 +113,7 @@ # Integration team needs to determine if the new UF parameters to the simulator need to be exercised for verification. hd_simulator.cmd_set_treatment_ultrafiltration_outlet_flow_data(ultrafiltration_flow_parameter[REF_UF_VOL_INDEX], ultrafiltration_flow_parameter[MEASURED_UF_VOL_INDEX], ultrafiltration_flow_parameter[ROT_SPEED_INDEX], ultrafiltration_flow_parameter[MOT_SPEED_INDEX], ultrafiltration_flow_parameter[MC_SPEED_INDEX], - ultrafiltration_flow_parameter[MC_CURRENT_INDEX], ultrafiltration_flow_parameter[PWM_INDEX],0,0,0,0,0) + ultrafiltration_flow_parameter[MC_CURRENT_INDEX], ultrafiltration_flow_parameter[PWM_INDEX],0,0,0,0,0,0) test.log("test to verify ultrafiltration flow parameters.") @@ -302,9 +302,17 @@ startApplication(config.AUT_NAME) #navigate to dialysis state - hd_simulator.cmd_set_treatment_states_data(sub_mode=HDStandbyStates.STANDBY_WAIT_FOR_DISINFECT_STATE.value, uf_state=TreatmentStates.TREATMENT_START_STATE.value, saline_state=TreatmentStates.TREATMENT_START_STATE.value, heparin_state=TreatmentStates.TREATMENT_START_STATE.value, - rinseback_state=TreatmentStates.TREATMENT_START_STATE.value, recirculate_state=TreatmentStates.TREATMENT_START_STATE.value, blood_prime_state=TreatmentStates.TREATMENT_START_STATE.value, - treatment_end_state=TreatmentStates.TREATMENT_START_STATE.value, treatment_stop_state=TreatmentStates.TREATMENT_START_STATE.value, dialysis_state=TreatmentStates.TREATMENT_START_STATE.value) + hd_simulator.cmd_set_treatment_states_data(sub_mode=HDStandbyStates.STANDBY_WAIT_FOR_DISINFECT_STATE.value, + uf_state=TreatmentStates.TREATMENT_START_STATE.value, + saline_state=TreatmentStates.TREATMENT_START_STATE.value, + heparin_state=TreatmentStates.TREATMENT_START_STATE.value, + rinseback_state=TreatmentStates.TREATMENT_START_STATE.value, + recirculate_state=TreatmentStates.TREATMENT_START_STATE.value, + blood_prime_state=TreatmentStates.TREATMENT_START_STATE.value, + treatment_end_state=TreatmentStates.TREATMENT_START_STATE.value, + treatment_stop_state=TreatmentStates.TREATMENT_START_STATE.value, + dialysis_state=TreatmentStates.TREATMENT_START_STATE.value, + bloodLeakZeoringState = BloodLeakZeroingStates.BLD_ZEROING_IDLE_STATE.value) verification_of_uf_from_main_treatment() Index: tst_main_treatment_vitals/test.py =================================================================== diff -u -r40314c67874695eefc506c3a6a33896495953edd -r6dea78f296538eaec9a3478608f5ba0be9e9c954 --- tst_main_treatment_vitals/test.py (.../test.py) (revision 40314c67874695eefc506c3a6a33896495953edd) +++ tst_main_treatment_vitals/test.py (.../test.py) (revision 6dea78f296538eaec9a3478608f5ba0be9e9c954) @@ -18,7 +18,7 @@ from configuration import application_init as application_init from dialin.ui import utils from dialin.ui.hd_simulator import HDSimulator -from dialin.common.hd_defs import PreTreatmentSubModes, HDOpModes, HDStandbyStates, PreTreatmentSampleWaterStates, PreTreatmentConsumableSelfTestStates, PreTreatmentNoCartSelfTestStates, PreTreatmentCartridgeInstallStates, PreTreatmentDrySelfTestsStates, PreTreatmentPrimeStates, PreTreatmentRecircStates, PreTreatmentPatientConnectionStates, TreatmentStates, UFStates, SalineBolusStates, HeparinStates,PreTreatmentWetSelfTestStates,HDPreTreatmentReservoirMgmtStates +from dialin.common.hd_defs import PreTreatmentSubModes, HDOpModes, HDStandbyStates, PreTreatmentSampleWaterStates, PreTreatmentConsumableSelfTestStates, PreTreatmentNoCartSelfTestStates, PreTreatmentCartridgeInstallStates, PreTreatmentDrySelfTestsStates, PreTreatmentPrimeStates, PreTreatmentRecircStates, PreTreatmentPatientConnectionStates, TreatmentStates, UFStates, SalineBolusStates, HeparinStates,PreTreatmentWetSelfTestStates,HDPreTreatmentReservoirMgmtStates, BloodLeakZeroingStates from time import strftime # from dialin.ui.utils import waitForGUI @@ -39,9 +39,9 @@ BLOOD_PRESSURE_DEFAULT_VAL = "__ / __" HEART_RATE_DEFAULT_VAL = "__" INVALID_VALS = {"systolic" : [260, 59, 300, 23], "diastolic": [39, 1, 210, 201], "Heart Rate": [181, 200, 39, 20]} -SYSTOLIC_VALUES = [60, 72, 85, 99, 101, 110, 111, 115, 121, 139, 150, 144, 163, 176, 188, 191, 222, 200, 230, 231, 244, 250] -DIASTOLIC_VALUES = [40, 44, 51, 53, 60, 66, 72, 89, 99, 102, 109, 112, 124, 133, 151, 147, 161, 178, 189, 192, 200] -HEART_RATE_VALUES = [40, 42, 55, 61, 77, 81, 92, 100, 107, 115, 122, 135, 142, 151, 169, 177, 180] +SYSTOLIC_VALUES = [60, 122, 250] +DIASTOLIC_VALUES = [40, 109, 200] +HEART_RATE_VALUES = [40, 107, 180] time_interval = "25min" BP_HR_PRE_TREATMENT_STEPS = 6 ven_low = -100 @@ -148,7 +148,7 @@ """ test.startSection("Verify the last read of blood pressure and heart rate") test.log("Expected last read logs on current date and time") - expected_last_read = "Interval: off , Last Read: {}".format(saved_time) + expected_last_read = "Interval: OFF , Last Read: {}".format(saved_time) expected_interval_status = (str(expected_last_read)).split(",") expected_interval_data = expected_interval_status[0] expected_last_read_data = expected_interval_status[1].split(":") @@ -669,13 +669,30 @@ """ hd_simulator.cmd_send_hd_operation_mode(op_mode=HDOpModes.MODE_TREA.value, sub_mode=TreatmentStates.TREATMENT_DIALYSIS_STATE.value) utils.waitForGUI(1) - hd_simulator.cmd_set_treatment_states_data(sub_mode = TreatmentStates.TREATMENT_BLOOD_PRIME_STATE.value, uf_state= UFStates.UF_PAUSED_STATE.value, saline_state= SalineBolusStates.SALINE_BOLUS_STATE_IDLE.value, heparin_state= HeparinStates.HEPARIN_STATE_OFF.value, - rinseback_state= TreatmentStates.TREATMENT_RINSEBACK_STATE.value, recirculate_state= TreatmentStates.TREATMENT_RECIRC_STATE.value, blood_prime_state= TreatmentStates.TREATMENT_BLOOD_PRIME_STATE.value, - treatment_end_state= TreatmentStates.TREATMENT_END_STATE.value, treatment_stop_state= TreatmentStates.TREATMENT_STOP_STATE.value, dialysis_state= TreatmentStates.TREATMENT_DIALYSIS_STATE.value) - hd_simulator.cmd_set_treatment_states_data(sub_mode = TreatmentStates.TREATMENT_DIALYSIS_STATE.value, uf_state= UFStates.UF_PAUSED_STATE.value, saline_state= SalineBolusStates.SALINE_BOLUS_STATE_IDLE.value, heparin_state= HeparinStates.HEPARIN_STATE_OFF.value, - rinseback_state= TreatmentStates.TREATMENT_RINSEBACK_STATE.value, recirculate_state= TreatmentStates.TREATMENT_RECIRC_STATE.value, blood_prime_state= TreatmentStates.TREATMENT_BLOOD_PRIME_STATE.value, - treatment_end_state= TreatmentStates.TREATMENT_END_STATE.value, treatment_stop_state= TreatmentStates.TREATMENT_STOP_STATE.value, dialysis_state= TreatmentStates.TREATMENT_DIALYSIS_STATE.value) + hd_simulator.cmd_set_treatment_states_data(sub_mode = TreatmentStates.TREATMENT_BLOOD_PRIME_STATE.value, + uf_state= UFStates.UF_PAUSED_STATE.value, + saline_state= SalineBolusStates.SALINE_BOLUS_STATE_IDLE.value, + heparin_state= HeparinStates.HEPARIN_STATE_OFF.value, + rinseback_state= TreatmentStates.TREATMENT_RINSEBACK_STATE.value, + recirculate_state= TreatmentStates.TREATMENT_RECIRC_STATE.value, + blood_prime_state= TreatmentStates.TREATMENT_BLOOD_PRIME_STATE.value, + treatment_end_state= TreatmentStates.TREATMENT_END_STATE.value, + treatment_stop_state= TreatmentStates.TREATMENT_STOP_STATE.value, + dialysis_state= TreatmentStates.TREATMENT_DIALYSIS_STATE.value, + bloodLeakZeoringState = BloodLeakZeroingStates.BLD_ZEROING_IDLE_STATE.value) + hd_simulator.cmd_set_treatment_states_data(sub_mode = TreatmentStates.TREATMENT_DIALYSIS_STATE.value, + uf_state= UFStates.UF_PAUSED_STATE.value, + saline_state= SalineBolusStates.SALINE_BOLUS_STATE_IDLE.value, + heparin_state= HeparinStates.HEPARIN_STATE_OFF.value, + rinseback_state= TreatmentStates.TREATMENT_RINSEBACK_STATE.value, + recirculate_state= TreatmentStates.TREATMENT_RECIRC_STATE.value, + blood_prime_state= TreatmentStates.TREATMENT_BLOOD_PRIME_STATE.value, + treatment_end_state= TreatmentStates.TREATMENT_END_STATE.value, + treatment_stop_state= TreatmentStates.TREATMENT_STOP_STATE.value, + dialysis_state= TreatmentStates.TREATMENT_DIALYSIS_STATE.value, + bloodLeakZeoringState = BloodLeakZeroingStates.BLD_ZEROING_IDLE_STATE.value) + def set_parameter_type(text): """ Method to set object property based on text @@ -783,9 +800,17 @@ startApplication(config.AUT_NAME) hd_simulator.cmd_send_power_on_self_test_version_request() - hd_simulator.cmd_set_treatment_states_data(sub_mode=TreatmentStates.TREATMENT_DIALYSIS_STATE.value, uf_state=TreatmentStates.TREATMENT_START_STATE.value, saline_state=TreatmentStates.TREATMENT_START_STATE.value, heparin_state=TreatmentStates.TREATMENT_START_STATE.value, - rinseback_state=TreatmentStates.TREATMENT_START_STATE.value, recirculate_state=TreatmentStates.TREATMENT_START_STATE.value, blood_prime_state=TreatmentStates.TREATMENT_START_STATE.value, - treatment_end_state=TreatmentStates.TREATMENT_START_STATE.value, treatment_stop_state=TreatmentStates.TREATMENT_START_STATE.value, dialysis_state=TreatmentStates.TREATMENT_START_STATE.value) + hd_simulator.cmd_set_treatment_states_data(sub_mode=TreatmentStates.TREATMENT_DIALYSIS_STATE.value, + uf_state=TreatmentStates.TREATMENT_START_STATE.value, + saline_state=TreatmentStates.TREATMENT_START_STATE.value, + heparin_state=TreatmentStates.TREATMENT_START_STATE.value, + rinseback_state=TreatmentStates.TREATMENT_START_STATE.value, + recirculate_state=TreatmentStates.TREATMENT_START_STATE.value, + blood_prime_state=TreatmentStates.TREATMENT_START_STATE.value, + treatment_end_state=TreatmentStates.TREATMENT_START_STATE.value, + treatment_stop_state=TreatmentStates.TREATMENT_START_STATE.value, + dialysis_state=TreatmentStates.TREATMENT_START_STATE.value, + bloodLeakZeoringState = BloodLeakZeroingStates.BLD_ZEROING_IDLE_STATE.value) hd_simulator.cmd_set_treatment_parameter_ranges(min_treatment_duration=0, max_treatment_duration=480, min_uf_volume=0.01, max_uf_volume=8.00, @@ -799,25 +824,7 @@ utils.waitForGUI(1) open_vitals_pop_up() - verify_entered_value_in_pop_up(value=SYSTOLIC_PRESSSURE_120,input_field=names.o_pop_up_systolic_input_field, vital=config.SYSTOLIC_TEXT) - verify_entered_value_in_pop_up(value=DIASTOLIC_PRESSSURE_80, input_field=names.o_pop_up_diastolic_input_field, vital=config.DIASTOLIC_TEXT) - verify_entered_value_in_pop_up(value=HEART_RATE_VAL_101, input_field=names.o_pop_up_heart_rate_input_field, vital=config.HEART_RATE_TITLE) - verify_entered_valid_vital_entries_in_main_treatment_screen(sys_val=SYSTOLIC_PRESSSURE_175, dia_val=DIASTOLIC_PRESSSURE_60, heart_rate=HEART_RATE_VAL_85, save=False) - utils.waitForGUI(1) - open_vitals_pop_up() - verify_entered_value_in_pop_up(value=SYSTOLIC_PRESSSURE_175, input_field=names.o_pop_up_systolic_input_field, vital=config.SYSTOLIC_TEXT) - verify_entered_value_in_pop_up(value=DIASTOLIC_PRESSSURE_60, input_field=names.o_pop_up_diastolic_input_field, vital=config.DIASTOLIC_TEXT) - verify_entered_value_in_pop_up(value=HEART_RATE_VAL_85, input_field=names.o_pop_up_heart_rate_input_field, vital=config.HEART_RATE_TITLE) - verify_entered_valid_vital_entries_in_main_treatment_screen(sys_val=SYSTOLIC_PRESSSURE_113, dia_val=DIASTOLIC_PRESSSURE_74, heart_rate=HEART_RATE_VAL_70, save=True) - utils.waitForGUI(1) - open_vitals_pop_up() - verify_entered_value_in_pop_up(value=SYSTOLIC_PRESSSURE_113, input_field=names.o_pop_up_systolic_input_field, vital=config.SYSTOLIC_TEXT) - verify_entered_value_in_pop_up(value=DIASTOLIC_PRESSSURE_74, input_field=names.o_pop_up_diastolic_input_field, vital=config.DIASTOLIC_TEXT) - verify_entered_value_in_pop_up(value=HEART_RATE_VAL_70, input_field=names.o_pop_up_heart_rate_input_field, vital=config.HEART_RATE_TITLE) - verify_entered_valid_vital_entries_in_main_treatment_screen(sys_val=SYSTOLIC_PRESSSURE_200,dia_val=DIASTOLIC_PRESSSURE_150, heart_rate=HEART_RATE_VAL_60, save=False) utils.waitForGUI(1) - open_vitals_pop_up() - utils.waitForGUI(1) # verify the field colors for valid values verify_ranges_of_vitals_fields_complete(vSystolic_value_set = SYSTOLIC_VALUES, vDiastolic_value_set = DIASTOLIC_VALUES, @@ -835,7 +842,6 @@ verify_ranges_of_vitals_fields_incomplete(vSystolic_value_set = INVALID_VALS["systolic"], vDiastolic_value_set = INVALID_VALS["diastolic"], vHr_value_set = INVALID_VALS["Heart Rate"]) - utils.waitForGUI(1) verify_interval_for_bpm() Index: tst_post_treatment/test.py =================================================================== diff -u -r40314c67874695eefc506c3a6a33896495953edd -r6dea78f296538eaec9a3478608f5ba0be9e9c954 --- tst_post_treatment/test.py (.../test.py) (revision 40314c67874695eefc506c3a6a33896495953edd) +++ tst_post_treatment/test.py (.../test.py) (revision 6dea78f296538eaec9a3478608f5ba0be9e9c954) @@ -223,7 +223,7 @@ mouseClick(waitForObject(names.o_PostTreatment_Export_mousearea)) test.compare(str(waitForObjectExists(names.o_treatmentlog_msg_export_btn).text), config.EXPORT_LOG_MSG,"Treatment log message on clicking Export button text must be {}".format(config.EXPORT_LOG_MSG)) test.verify(waitForObjectExists(names.o_treatmentlog_msg_export_btn).visible, "Treatment log message should be visible") - utils.waitForGUI(1) + utils.waitForGUI(1) # mouseClick(waitForObject(names.o_eject_button)) # test.verify(not waitForObjectExists(names.o_treatmentReviewConfirm_Export_Text).enabled, " Export button should be disabled") verify_post_treatment_review_parameters() @@ -281,7 +281,8 @@ test.startSection("verification of post treatment review parameters with Units") treatment_review_text = waitForObjectExists(post_treatment_review_text_obj(config.TREATMENT_REVIEW_TITLE_TEXT)) test.compare(treatment_review_text.text, config.TREATMENT_REVIEW_TITLE_TEXT, "{} screen is displayed".format(config.TREATMENT_REVIEW_TITLE_TEXT)) - test.compare(str(waitForObjectExists(names.o_code_text).text), config.CODE_TEXT, "Code text must be {}".format(config.CODE_TEXT)) + # the code generation is not necessary to check since the CS is not running therefore code won't get updated. + # test.compare(str(waitForObjectExists(names.o_code_text).text), config.CODE_TEXT, "Code text must be {}".format(config.CODE_TEXT)) utils.waitForGUI(0.1) # resetting the unit key count @@ -423,13 +424,29 @@ review_parameter_value = review_text(text = "Prescribed UF Rate") utility.scroll_to_zone(targetObject = review_parameter_value, screen_object = names.o_review_area) - elif parameters_value == "Heparin Type": + elif parameters_value == "Heparin Type" \ + or parameters_value == " Delivered Volume" : # review_parameter_value = review_text(text = config.HEPARIN_TYPE) # utility.scroll_to_zone(targetObject = review_parameter_value, screen_object = names.o_review_area) # parameter_text = waitForObject(review_parameter_value) # test.log("verification of values for parameter ->" + parameters_value) # test.compare(config.HEPARIN_TYPE, parameter_text.text, "parameter value should be "+str(parameter_set[index])) + if parameter_set[index] is 0: + string_cmp = "NONE" continue + + elif parameters_value == "Heparin Bolus Volume" \ + or parameters_value == "Heparin Dispense Rate" \ + or parameters_value == "Heparin Stop" \ + or parameters_value == "Heparin Delivered Volume" : + # review_parameter_value = review_text(text = config.HEPARIN_TYPE) + # utility.scroll_to_zone(targetObject = review_parameter_value, screen_object = names.o_review_area) + # parameter_text = waitForObject(review_parameter_value) + # test.log("verification of values for parameter ->" + parameters_value) + # test.compare(config.HEPARIN_TYPE, parameter_text.text, "parameter value should be "+str(parameter_set[index])) + if parameter_set[index] is 0: + string_cmp = "OFF" + continue elif parameters_value == "Bicarbonate Concentrate Type": review_parameter_value = review_text(text = config.BICARBONATE_CONCENTRATE) @@ -621,7 +638,10 @@ utils.tstStart(__file__) application_init.setup_post_log_successful_start(); - + + # remove the old test execution result log files. + utility.remove_files_in_folder(config.POST_TREATMENT_LOG_LOCATION) + startApplication(config.AUT_NAME+ " -l") hd_simulator.cmd_send_hd_operation_mode(op_mode=HDOpModes.MODE_POST.value, sub_mode=PostTreatmentStates.HD_POST_TREATMENT_PATIENT_DISCONNECTION_STATE.value) verify_patient_disconnection_screens() Index: tst_recirculate/test.py =================================================================== diff -u -r06fda637e04ce27ea414ba8ad06af92c4b76d788 -r6dea78f296538eaec9a3478608f5ba0be9e9c954 --- tst_recirculate/test.py (.../test.py) (revision 06fda637e04ce27ea414ba8ad06af92c4b76d788) +++ tst_recirculate/test.py (.../test.py) (revision 6dea78f296538eaec9a3478608f5ba0be9e9c954) @@ -21,7 +21,7 @@ from dialin.ui.hd_simulator import HDSimulator from configuration import config from configuration import utility -from dialin.common.hd_defs import TreatmentStates, TreatmentRinsebackStates, TreatmentRecircStates +from dialin.common.hd_defs import TreatmentStates, TreatmentRinsebackStates, TreatmentRecircStates, BloodLeakZeroingStates hd_simulator = HDSimulator() SCREEN_OBJ = names.o_EndTreatmentRecirculateStack_EndTreatmentBase_EndTreatmentBase @@ -36,11 +36,17 @@ """ test.startSection("verifying Treatment Recirculate Recirculate state screens") hd_simulator.cmd_set_treatment_time(sec_total = 120, sec_elapsed = 20, sec_remain = 100) - hd_simulator.cmd_set_treatment_states_data(sub_mode = TreatmentStates.TREATMENT_RECIRC_STATE.value , uf_state = TreatmentStates.TREATMENT_START_STATE.value, - saline_state = TreatmentStates.TREATMENT_START_STATE.value, heparin_state = TreatmentStates.TREATMENT_START_STATE.value, - rinseback_state= TreatmentStates.TREATMENT_START_STATE.value, recirculate_state = TreatmentRecircStates.TREATMENT_RECIRC_RECIRC_STATE.value, - blood_prime_state = TreatmentStates.TREATMENT_START_STATE.value,treatment_end_state = TreatmentStates.TREATMENT_START_STATE.value, - treatment_stop_state = TreatmentStates.TREATMENT_START_STATE.value, dialysis_state = TreatmentStates.TREATMENT_START_STATE.value) + hd_simulator.cmd_set_treatment_states_data(sub_mode = TreatmentStates.TREATMENT_RECIRC_STATE.value , + uf_state = TreatmentStates.TREATMENT_START_STATE.value, + saline_state = TreatmentStates.TREATMENT_START_STATE.value, + heparin_state = TreatmentStates.TREATMENT_START_STATE.value, + rinseback_state= TreatmentStates.TREATMENT_START_STATE.value, + recirculate_state = TreatmentRecircStates.TREATMENT_RECIRC_RECIRC_STATE.value, + blood_prime_state = TreatmentStates.TREATMENT_START_STATE.value, + treatment_end_state = TreatmentStates.TREATMENT_START_STATE.value, + treatment_stop_state = TreatmentStates.TREATMENT_START_STATE.value, + dialysis_state = TreatmentStates.TREATMENT_START_STATE.value, + bloodLeakZeoringState = BloodLeakZeroingStates.BLD_ZEROING_IDLE_STATE.value) test.startSection("Verifying Timer count down timer " + config.RECIRCULATE_TEXT) for num in range(TIMER_DEFAULT_VALUE, COUNT_DOWN_VALUE): hd_simulator.cmd_send_treatment_recirculate_data(timeout_total=num, timeout_count_down=num) @@ -67,11 +73,17 @@ Method to verify Treatment Recirculate stopped state screens """ test.startSection("verifying Treatment Recirculate stopped state screens") - hd_simulator.cmd_set_treatment_states_data(sub_mode=TreatmentStates.TREATMENT_RECIRC_STATE.value, uf_state=TreatmentStates.TREATMENT_START_STATE.value, - saline_state=TreatmentStates.TREATMENT_START_STATE.value, heparin_state=TreatmentStates.TREATMENT_START_STATE.value, - rinseback_state=TreatmentRinsebackStates.RINSEBACK_STOP_INIT_STATE.value, recirculate_state=TreatmentRecircStates.TREATMENT_RECIRC_STOPPED_STATE.value, - blood_prime_state=TreatmentStates.TREATMENT_START_STATE.value,treatment_end_state=TreatmentStates.TREATMENT_START_STATE.value, - treatment_stop_state=TreatmentStates.TREATMENT_START_STATE.value, dialysis_state=TreatmentStates.TREATMENT_START_STATE.value) + hd_simulator.cmd_set_treatment_states_data(sub_mode=TreatmentStates.TREATMENT_RECIRC_STATE.value, + uf_state=TreatmentStates.TREATMENT_START_STATE.value, + saline_state=TreatmentStates.TREATMENT_START_STATE.value, + heparin_state=TreatmentStates.TREATMENT_START_STATE.value, + rinseback_state=TreatmentRinsebackStates.RINSEBACK_STOP_INIT_STATE.value, + recirculate_state=TreatmentRecircStates.TREATMENT_RECIRC_STOPPED_STATE.value, + blood_prime_state=TreatmentStates.TREATMENT_START_STATE.value, + treatment_end_state=TreatmentStates.TREATMENT_START_STATE.value, + treatment_stop_state=TreatmentStates.TREATMENT_START_STATE.value, + dialysis_state=TreatmentStates.TREATMENT_START_STATE.value, + bloodLeakZeoringState = BloodLeakZeroingStates.BLD_ZEROING_IDLE_STATE.value) test.startSection("Verifying Timer count down timer on Recirculate Stopped state") for num in range(TIMER_DEFAULT_VALUE, COUNT_DOWN_VALUE): hd_simulator.cmd_send_treatment_recirculate_data(timeout_total=num, timeout_count_down=num) Index: tst_rinseback_setup/test.py =================================================================== diff -u -r6b85a46cebe626c28a1accd4ea0019d3388abef4 -r6dea78f296538eaec9a3478608f5ba0be9e9c954 --- tst_rinseback_setup/test.py (.../test.py) (revision 6b85a46cebe626c28a1accd4ea0019d3388abef4) +++ tst_rinseback_setup/test.py (.../test.py) (revision 6dea78f296538eaec9a3478608f5ba0be9e9c954) @@ -21,7 +21,7 @@ from configuration import config from dialin.ui.hd_simulator import HDSimulator from configuration import utility -from dialin.common.hd_defs import HDOpModes, HDStandbyStates, TreatmentStates, TreatmentEndStates, TreatmentRinsebackStates +from dialin.common.hd_defs import HDOpModes, HDStandbyStates, TreatmentStates, TreatmentEndStates, TreatmentRinsebackStates, BloodLeakZeroingStates hd_simulator = HDSimulator() SCREEN_OBJ = names.o_EndTreatmentRinsebackStack_EndTreatmentRinsebackInit_EndTreatmentRinsebackInit @@ -50,12 +50,19 @@ test.startSection("verifying Rinseback Stop INIT state screens") hd_simulator.cmd_set_treatment_time(sec_total = COUNT_DOWN_VALUE, sec_elapsed = SEC_ELAPSED, sec_remain = SEC_REMAINING) hd_simulator.cmd_send_hd_operation_mode(op_mode=HDOpModes.MODE_TREA.value, sub_mode=HDStandbyStates.STANDBY_START_STATE.value) - hd_simulator.cmd_set_treatment_states_data(sub_mode=TreatmentStates.TREATMENT_RINSEBACK_STATE.value, uf_state=TreatmentStates.TREATMENT_START_STATE.value, - saline_state=TreatmentStates.TREATMENT_START_STATE.value, heparin_state=TreatmentStates.TREATMENT_START_STATE.value, - rinseback_state=TreatmentRinsebackStates.RINSEBACK_STOP_INIT_STATE.value, recirculate_state=TreatmentStates.TREATMENT_START_STATE.value, - blood_prime_state=TreatmentStates.TREATMENT_START_STATE.value, treatment_end_state=TreatmentStates.TREATMENT_START_STATE.value, - treatment_stop_state=TreatmentStates.TREATMENT_START_STATE.value, dialysis_state=TreatmentStates.TREATMENT_START_STATE.value) + hd_simulator.cmd_set_treatment_states_data(sub_mode=TreatmentStates.TREATMENT_RINSEBACK_STATE.value, + uf_state=TreatmentStates.TREATMENT_START_STATE.value, + saline_state=TreatmentStates.TREATMENT_START_STATE.value, + heparin_state=TreatmentStates.TREATMENT_START_STATE.value, + rinseback_state=TreatmentRinsebackStates.RINSEBACK_STOP_INIT_STATE.value, + recirculate_state=TreatmentStates.TREATMENT_START_STATE.value, + blood_prime_state=TreatmentStates.TREATMENT_START_STATE.value, + treatment_end_state=TreatmentStates.TREATMENT_START_STATE.value, + treatment_stop_state=TreatmentStates.TREATMENT_START_STATE.value, + dialysis_state=TreatmentStates.TREATMENT_START_STATE.value, + bloodLeakZeoringState = BloodLeakZeroingStates.BLD_ZEROING_IDLE_STATE.value) + test.startSection("Verifying count down value of timer in " + config.RINSE_BACK_SETUP_TEXT) for num in range(TIMER_DEFAULT_VALUE, COUNT_DOWN_VALUE + 1): hd_simulator.cmd_send_treatment_rinseback_data(target_vol=COUNT_DOWN_DEFAULT_VALUE, current_vol=COUNT_DOWN_DEFAULT_VALUE, flow_rate=COUNT_DOWN_DEFAULT_VALUE, timeout=num, timeout_countdown=num, is_completed= 0) @@ -82,9 +89,17 @@ Method to navigate and verify to Rinseback RUN state screens """ test.startSection("Verifying Rinseback RUN state screens") - hd_simulator.cmd_set_treatment_states_data(sub_mode=TreatmentStates.TREATMENT_RINSEBACK_STATE.value, uf_state=TreatmentStates.TREATMENT_START_STATE.value, - saline_state=TreatmentStates.TREATMENT_START_STATE.value, heparin_state=TreatmentStates.TREATMENT_START_STATE.value,rinseback_state=TreatmentRinsebackStates.RINSEBACK_RUN_STATE.value, recirculate_state=TreatmentStates.TREATMENT_START_STATE.value, - blood_prime_state=TreatmentStates.TREATMENT_START_STATE.value, treatment_end_state=TreatmentEndStates.TREATMENT_END_PAUSED_STATE.value, treatment_stop_state=TreatmentStates.TREATMENT_START_STATE.value, dialysis_state=TreatmentStates.TREATMENT_START_STATE.value) + hd_simulator.cmd_set_treatment_states_data(sub_mode=TreatmentStates.TREATMENT_RINSEBACK_STATE.value, + uf_state=TreatmentStates.TREATMENT_START_STATE.value, + saline_state=TreatmentStates.TREATMENT_START_STATE.value, + heparin_state=TreatmentStates.TREATMENT_START_STATE.value, + rinseback_state=TreatmentRinsebackStates.RINSEBACK_RUN_STATE.value, + recirculate_state=TreatmentStates.TREATMENT_START_STATE.value, + blood_prime_state=TreatmentStates.TREATMENT_START_STATE.value, + treatment_end_state=TreatmentEndStates.TREATMENT_END_PAUSED_STATE.value, + treatment_stop_state=TreatmentStates.TREATMENT_START_STATE.value, + dialysis_state=TreatmentStates.TREATMENT_START_STATE.value, + bloodLeakZeoringState = BloodLeakZeroingStates.BLD_ZEROING_IDLE_STATE.value) test.startSection("Verifying count down value of timer in RUN state screen") for num in range(COUNT_DOWN_DEFAULT_VALUE, COUNT_DOWN_VALUE + 1): @@ -121,9 +136,18 @@ Method to navigate and verify to Rinseback Paused state screens """ test.startSection("verifying Rinseback Paused state screens") - hd_simulator.cmd_set_treatment_states_data(sub_mode=TreatmentStates.TREATMENT_RINSEBACK_STATE.value, uf_state=TreatmentStates.TREATMENT_START_STATE.value, - saline_state=TreatmentStates.TREATMENT_START_STATE.value, heparin_state=TreatmentStates.TREATMENT_START_STATE.value, rinseback_state=TreatmentRinsebackStates.RINSEBACK_PAUSED_STATE.value, recirculate_state=TreatmentStates.TREATMENT_START_STATE.value, - blood_prime_state=TreatmentStates.TREATMENT_START_STATE.value, treatment_end_state=TreatmentEndStates.TREATMENT_END_PAUSED_STATE.value, treatment_stop_state=TreatmentStates.TREATMENT_START_STATE.value, dialysis_state=TreatmentStates.TREATMENT_START_STATE.value) + hd_simulator.cmd_set_treatment_states_data(sub_mode=TreatmentStates.TREATMENT_RINSEBACK_STATE.value, + uf_state=TreatmentStates.TREATMENT_START_STATE.value, + saline_state=TreatmentStates.TREATMENT_START_STATE.value, + heparin_state=TreatmentStates.TREATMENT_START_STATE.value, + rinseback_state=TreatmentRinsebackStates.RINSEBACK_PAUSED_STATE.value, + recirculate_state=TreatmentStates.TREATMENT_START_STATE.value, + blood_prime_state=TreatmentStates.TREATMENT_START_STATE.value, + treatment_end_state=TreatmentEndStates.TREATMENT_END_PAUSED_STATE.value, + treatment_stop_state=TreatmentStates.TREATMENT_START_STATE.value, + dialysis_state=TreatmentStates.TREATMENT_START_STATE.value, + bloodLeakZeoringState = BloodLeakZeroingStates.BLD_ZEROING_IDLE_STATE.value) + test.compare(str(waitForObject(names.o_EndTreatmentRinseback_Rinseback_Text).text), config.RINSEBACK_TEXT, "Rinseback text must be {}".format(config.RINSEBACK_TEXT)) test.compare(str(waitForObject(names.o_EndTreatmentRinseback_imageEnd_ImageText).text), config.END_IMAGE_BUTTON_TEXT, "END button text must be {}".format(config.END_IMAGE_BUTTON_TEXT)) test.verify(waitForObjectExists(names.o_EndTreatmentRinseback_imageEnd_ImageText).enabled, " END button must be active") @@ -144,9 +168,17 @@ Method to navigate and verify to Rinseback Stop state screens """ test.startSection("verifying Rinseback Stop state screens") - hd_simulator.cmd_set_treatment_states_data(sub_mode=TreatmentStates.TREATMENT_RINSEBACK_STATE.value, uf_state=TreatmentStates.TREATMENT_START_STATE.value, - saline_state=TreatmentStates.TREATMENT_START_STATE.value, heparin_state=TreatmentStates.TREATMENT_START_STATE.value, rinseback_state=TreatmentRinsebackStates.RINSEBACK_STOP_STATE.value, recirculate_state=TreatmentStates.TREATMENT_START_STATE.value, - blood_prime_state=TreatmentStates.TREATMENT_START_STATE.value, treatment_end_state=TreatmentEndStates.TREATMENT_END_PAUSED_STATE.value, treatment_stop_state=TreatmentStates.TREATMENT_START_STATE.value, dialysis_state=TreatmentStates.TREATMENT_START_STATE.value) + hd_simulator.cmd_set_treatment_states_data(sub_mode=TreatmentStates.TREATMENT_RINSEBACK_STATE.value, + uf_state=TreatmentStates.TREATMENT_START_STATE.value, + saline_state=TreatmentStates.TREATMENT_START_STATE.value, + heparin_state=TreatmentStates.TREATMENT_START_STATE.value, + rinseback_state=TreatmentRinsebackStates.RINSEBACK_STOP_STATE.value, + recirculate_state=TreatmentStates.TREATMENT_START_STATE.value, + blood_prime_state=TreatmentStates.TREATMENT_START_STATE.value, + treatment_end_state=TreatmentEndStates.TREATMENT_END_PAUSED_STATE.value, + treatment_stop_state=TreatmentStates.TREATMENT_START_STATE.value, + dialysis_state=TreatmentStates.TREATMENT_START_STATE.value, + bloodLeakZeoringState = BloodLeakZeroingStates.BLD_ZEROING_IDLE_STATE.value) test.startSection("Verifying count down value of timer in " + config.RINSEBACK_COMPLETE_TEXT) for num in range(TIMER_DEFAULT_VALUE, COUNT_DOWN_VALUE + 1): hd_simulator.cmd_send_treatment_rinseback_data(target_vol=COUNT_DOWN_VALUE, current_vol=COUNT_DOWN_DEFAULT_VALUE, flow_rate=COUNT_DOWN_DEFAULT_VALUE, timeout=num, timeout_countdown=num, is_completed=True) @@ -175,9 +207,17 @@ Method to navigate and verify to Rinseback Run Additional State screens """ test.startSection("verifying Rinseback Run Additional State screens") - hd_simulator.cmd_set_treatment_states_data(sub_mode = TreatmentStates.TREATMENT_RINSEBACK_STATE.value , uf_state = TreatmentStates.TREATMENT_START_STATE.value, - saline_state = TreatmentStates.TREATMENT_START_STATE.value, heparin_state = TreatmentStates.TREATMENT_START_STATE.value,rinseback_state= TreatmentRinsebackStates.RINSEBACK_RUN_ADDITIONAL_STATE.value, recirculate_state = TreatmentStates.TREATMENT_START_STATE.value, - blood_prime_state = TreatmentStates.TREATMENT_START_STATE.value,treatment_end_state = TreatmentEndStates.TREATMENT_END_PAUSED_STATE.value, treatment_stop_state = TreatmentStates.TREATMENT_START_STATE.value, dialysis_state = TreatmentStates.TREATMENT_START_STATE.value) + hd_simulator.cmd_set_treatment_states_data(sub_mode = TreatmentStates.TREATMENT_RINSEBACK_STATE.value , + uf_state = TreatmentStates.TREATMENT_START_STATE.value, + saline_state = TreatmentStates.TREATMENT_START_STATE.value, + heparin_state = TreatmentStates.TREATMENT_START_STATE.value, + rinseback_state= TreatmentRinsebackStates.RINSEBACK_RUN_ADDITIONAL_STATE.value, + recirculate_state = TreatmentStates.TREATMENT_START_STATE.value, + blood_prime_state = TreatmentStates.TREATMENT_START_STATE.value, + treatment_end_state = TreatmentEndStates.TREATMENT_END_PAUSED_STATE.value, + treatment_stop_state = TreatmentStates.TREATMENT_START_STATE.value, + dialysis_state = TreatmentStates.TREATMENT_START_STATE.value, + bloodLeakZeoringState = BloodLeakZeroingStates.BLD_ZEROING_IDLE_STATE.value) test.startSection("verifying count down value of timer in" + config.ADDITIONAL_RINSEBACK_TEXT) for num in range(COUNT_DOWN_DEFAULT_VALUE, COUNT_DOWN_VALUE + 1): hd_simulator.cmd_send_treatment_rinseback_data(target_vol=COUNT_DOWN_VALUE, current_vol=num, flow_rate=num, timeout=COUNT_DOWN_DEFAULT_VALUE, timeout_countdown=COUNT_DOWN_DEFAULT_VALUE, is_completed= 0) Index: tst_service_screen/test.py =================================================================== diff -u -re3f67a6e78d267bb99596ba1ce439c6fe7d89a25 -r6dea78f296538eaec9a3478608f5ba0be9e9c954 --- tst_service_screen/test.py (.../test.py) (revision e3f67a6e78d267bb99596ba1ce439c6fe7d89a25) +++ tst_service_screen/test.py (.../test.py) (revision 6dea78f296538eaec9a3478608f5ba0be9e9c954) @@ -57,7 +57,7 @@ """ test.startSection("Navigating to 'Service' screen") hd_simulator.cmd_send_hd_operation_mode(op_mode=HDOpModes.MODE_SERV.value, sub_mode=HDStandbyStates.STANDBY_START_STATE.value) - utils.waitForGUI(1) + utils.waitForGUI(0.5) device_settings_text = waitForObjectExists(settings_text_obj(config.SERVICE_TEXT)) test.compare(device_settings_text.text, config.SERVICE_TEXT, "{} screen is displayed".format(config.SERVICE_TEXT)) test.endSection() @@ -122,7 +122,7 @@ test.compare(back_btn.enabled , True, "Back button should be enabled") utils.waitForGUI(0.5) mouseClick(waitForObjectExists(names.o_SettingsBase_backbutton_service_vandb_mouseArea_MouseArea_3)) - utils.waitForGUI(1) + utils.waitForGUI(0.5) test.endSection() @@ -232,7 +232,7 @@ utils.waitForGUI(2) log_status = get_storage_data_status(names.o_usb_folder_slider) - test.verify(log_status == False, "export data rectangles should be empty after export button click under USB drive.") + test.verify(log_status == True, "export data rectangles should NOT be empty after export button click under USB drive.") log_status = get_storage_data_status(names.o_SettingsBase_sdcFolderView_ListView) test.verify(log_status == False, "export data rectangles should be empty after export button click under SD card.") @@ -255,7 +255,7 @@ expected_screen_title = "Water Input Mode" test.startSection("Navigating 'Water Input Mode' screen") - utils.waitForGUI(1) + utils.waitForGUI(0.5) service_subScreen_menu_element = utility.get_object_from_names(names.o_service_water_input_menu_element, error_message="subscreen menu element not found") if service_subScreen_menu_element is not None: mouseClick(service_subScreen_menu_element) @@ -280,12 +280,12 @@ test.endSection() def main(): - + utils.tstStart(__file__) startApplication(config.AUT_NAME+ " -l") navigate_to_settings_screen() verify_settings_parameters() - + verify_parameters_under_information() verify_volume_and_brightness_section() verify_wifi_setting() @@ -295,9 +295,7 @@ verify_export_logs_screen() verify_export_functionality() verify_water_input_subscreen() - + #Note the protected service menu items (factory reset, decommission, etc) are in tst_service_menu - + utils.tstDone() - - Index: tst_settings_date_and_time/test.py =================================================================== diff -u -r6f1e1819d6605964e7ba8366d0408cc26890be99 -r6dea78f296538eaec9a3478608f5ba0be9e9c954 --- tst_settings_date_and_time/test.py (.../test.py) (revision 6f1e1819d6605964e7ba8366d0408cc26890be99) +++ tst_settings_date_and_time/test.py (.../test.py) (revision 6dea78f296538eaec9a3478608f5ba0be9e9c954) @@ -23,7 +23,7 @@ hd_simulator = HDSimulator() -SET_DATE_AND_TIME_TEXT = "Set Date And Time" +SET_DATE_AND_TIME_TEXT = "Set Date and Time" TIME_TITLE = "Time (HH:MM)" DATE_TITLE_TEXT = "Date (MM/DD/YYYY)" HOUR_TEXT = "Hour" @@ -105,7 +105,7 @@ Method to navigate to set date and time screen and verify its title 'Set Date And Time' """ - test.startSection("Navigating 'Set Date And Time' screen") + test.startSection("Navigating 'Set Date and Time' screen") utils.waitForGUI(0.5) mouseClick(waitForObjectExists(names.o_SettingsHome_mouseArea_MouseArea_2_set_date_time)) set_date_and_time_title = waitForObjectExists(settings_text_obj(SET_DATE_AND_TIME_TEXT)) Index: tst_settings_information/test.py =================================================================== diff -u -r6f1e1819d6605964e7ba8366d0408cc26890be99 -r6dea78f296538eaec9a3478608f5ba0be9e9c954 --- tst_settings_information/test.py (.../test.py) (revision 6f1e1819d6605964e7ba8366d0408cc26890be99) +++ tst_settings_information/test.py (.../test.py) (revision 6dea78f296538eaec9a3478608f5ba0be9e9c954) @@ -215,6 +215,7 @@ and 'DG next service date' and verify the same is displayed on UI screen """ + dateFormat = "%m/%02d/%Y" # MM/dd/yyyy test.startSection("Verify 'HD last service date', 'HD next service date', 'DG next service date' and 'DG next service date' is displayed on UI screen") hd_epoch = builtins.int(datetime.datetime(hd_year, hd_month, hd_day).timestamp()) hd_interval = hd_interval_days * 86400 @@ -223,12 +224,12 @@ hd_simulator.cmd_send_hd_general_response(message_id=138, accepted=0, reason=1, is_pure_data=False, has_parameters=True, parameters_payload=payload) utils.waitForGUI(1) hd_last_service_date = datetime.datetime(hd_year, hd_month, hd_day) - hd_last_service_date = str(hd_last_service_date.strftime("%Y/%m/%02d")) + hd_last_service_date = str(hd_last_service_date.strftime(dateFormat)) hd_last_service_date_text = waitForObjectExists(service_date_obj(hd_last_service_date)) test.compare(hd_last_service_date_text.text, hd_last_service_date, "'HD last service date' should be {}".format(hd_last_service_date)) hd_next_service_date = datetime.datetime(hd_year, hd_month, hd_day) + datetime.timedelta(days=hd_interval_days) - hd_next_service_date = str(hd_next_service_date.strftime("%Y/%m/%02d")) + hd_next_service_date = str(hd_next_service_date.strftime(dateFormat)) hd_next_service_date_text = waitForObjectExists(service_date_obj(hd_next_service_date)) test.compare(hd_next_service_date_text.text, hd_next_service_date, "'HD next service date' should be {}".format(hd_next_service_date)) @@ -239,12 +240,12 @@ dg_simulator.cmd_send_dg_general_response(message_id=140, accepted=0, reason=1, is_pure_data=False, has_parameters=True, parameters_payload=payload) utils.waitForGUI(1) dg_last_service_date = datetime.datetime(dg_year, dg_month, dg_day) - dg_last_service_date = str(dg_last_service_date.strftime("%Y/%m/%02d")) + dg_last_service_date = str(dg_last_service_date.strftime(dateFormat)) dg_last_service_date_text = waitForObjectExists(service_date_obj(dg_last_service_date)) test.compare(dg_last_service_date_text.text, dg_last_service_date, "'DG last service date' should be {}".format(dg_last_service_date)) dg_next_service_date = datetime.datetime(dg_year, dg_month, dg_day) + datetime.timedelta(days=dg_interval_days) - dg_next_service_date = str(dg_next_service_date.strftime("%Y/%m/%02d")) + dg_next_service_date = str(dg_next_service_date.strftime(dateFormat)) dg_next_service_date_text = waitForObjectExists(service_date_obj(dg_next_service_date)) test.compare(dg_next_service_date_text.text, dg_next_service_date, "'DG last service date' should be {}".format(dg_next_service_date)) test.endSection() @@ -610,7 +611,7 @@ 1)application """ try: - utility.rename_file(config.APPLICATION_FOLDER_LOCATION,"application") + utility.rename_file(config.APPLICATION_FOLDER_LOCATION,"unittests") utils.waitForGUI(0.2) test.log("Navigating to 'Volume and Brightness' screen") mouseClick(waitForObjectExists(settings_text_obj(config.VOLUME_AND_BRIGHTNESS_TEXT))) @@ -634,7 +635,7 @@ except: test.log(str("Failed to verify missing path scenario")) finally: - utility.rename_old_name(config.APPLICATION_FOLDER_LOCATION,"application") + utility.rename_old_name(config.APPLICATION_FOLDER_LOCATION,"unittests") def verify_volume_and_brightness_settings(): test.log("Navigating to 'Volume and Brightness' screen") Index: tst_time_duration/test.py =================================================================== diff -u -r2e73714b63ae5fd2ef8b5acca5043e136454feff -r6dea78f296538eaec9a3478608f5ba0be9e9c954 --- tst_time_duration/test.py (.../test.py) (revision 2e73714b63ae5fd2ef8b5acca5043e136454feff) +++ tst_time_duration/test.py (.../test.py) (revision 6dea78f296538eaec9a3478608f5ba0be9e9c954) @@ -17,7 +17,7 @@ from dialin.ui.hd_simulator import HDSimulator from configuration import config, utility from dialin.ui.utils import waitForGUI -from dialin.common.hd_defs import TreatmentStates, UFStates, SalineBolusStates, HeparinStates, TreatmentRinsebackStates, TreatmentRecircStates, TreatmentBloodPrimeStates, TreatmentEndStates, TreatmentStopStates, TreatmentDialysisStates +from dialin.common.hd_defs import TreatmentStates, UFStates, SalineBolusStates, HeparinStates, TreatmentRinsebackStates, TreatmentRecircStates, TreatmentBloodPrimeStates, TreatmentEndStates, TreatmentStopStates, TreatmentDialysisStates, BloodLeakZeroingStates MIN_TIME_RANGE = 60 MAX_TIME_RANGE = 480 @@ -129,9 +129,17 @@ startApplication(config.AUT_NAME) #navigate to dialysis state - hd_simulator.cmd_set_treatment_states_data(sub_mode= TreatmentStates.TREATMENT_DIALYSIS_STATE.value, uf_state= UFStates.UF_PAUSED_STATE.value, saline_state=SalineBolusStates.SALINE_BOLUS_STATE_IDLE.value, heparin_state= HeparinStates.HEPARIN_STATE_OFF.value, - rinseback_state= TreatmentRinsebackStates.RINSEBACK_STOP_INIT_STATE.value, recirculate_state= TreatmentRecircStates.TREATMENT_RECIRC_RECIRC_STATE.value, blood_prime_state= TreatmentBloodPrimeStates.BLOOD_PRIME_RAMP_STATE.value, - treatment_end_state= TreatmentEndStates.TREATMENT_END_WAIT_FOR_RINSEBACK_STATE.value, treatment_stop_state= TreatmentStopStates.TREATMENT_STOP_RECIRC_STATE.value, dialysis_state=TreatmentDialysisStates.DIALYSIS_START_STATE.value) + hd_simulator.cmd_set_treatment_states_data(sub_mode= TreatmentStates.TREATMENT_DIALYSIS_STATE.value, + uf_state= UFStates.UF_PAUSED_STATE.value, + saline_state=SalineBolusStates.SALINE_BOLUS_STATE_IDLE.value, + heparin_state= HeparinStates.HEPARIN_STATE_OFF.value, + rinseback_state= TreatmentRinsebackStates.RINSEBACK_STOP_INIT_STATE.value, + recirculate_state= TreatmentRecircStates.TREATMENT_RECIRC_RECIRC_STATE.value, + blood_prime_state= TreatmentBloodPrimeStates.BLOOD_PRIME_RAMP_STATE.value, + treatment_end_state= TreatmentEndStates.TREATMENT_END_WAIT_FOR_RINSEBACK_STATE.value, + treatment_stop_state= TreatmentStopStates.TREATMENT_STOP_RECIRC_STATE.value, + dialysis_state=TreatmentDialysisStates.DIALYSIS_START_STATE.value, + bloodLeakZeoringState = BloodLeakZeroingStates.BLD_ZEROING_IDLE_STATE.value) utils.waitForGUI(1) verify_pop_up() @@ -141,9 +149,17 @@ treatment_time_verification(value) #Give treatment stop response to pause remain time - hd_simulator.cmd_set_treatment_states_data(sub_mode= TreatmentStates.TREATMENT_START_STATE.value, uf_state= UFStates.UF_PAUSED_STATE.value, saline_state=SalineBolusStates.SALINE_BOLUS_STATE_IDLE.value, heparin_state= HeparinStates.HEPARIN_STATE_OFF.value, - rinseback_state= TreatmentRinsebackStates.RINSEBACK_STOP_INIT_STATE.value, recirculate_state= TreatmentRecircStates.TREATMENT_RECIRC_RECIRC_STATE.value, blood_prime_state= TreatmentBloodPrimeStates.BLOOD_PRIME_RAMP_STATE.value, - treatment_end_state= TreatmentEndStates.TREATMENT_END_WAIT_FOR_RINSEBACK_STATE.value, treatment_stop_state= TreatmentStopStates.TREATMENT_STOP_NO_RECIRC_STATE.value, dialysis_state=TreatmentDialysisStates.DIALYSIS_START_STATE.value) + hd_simulator.cmd_set_treatment_states_data(sub_mode= TreatmentStates.TREATMENT_START_STATE.value, + uf_state= UFStates.UF_PAUSED_STATE.value, + saline_state=SalineBolusStates.SALINE_BOLUS_STATE_IDLE.value, + heparin_state= HeparinStates.HEPARIN_STATE_OFF.value, + rinseback_state= TreatmentRinsebackStates.RINSEBACK_STOP_INIT_STATE.value, + recirculate_state= TreatmentRecircStates.TREATMENT_RECIRC_RECIRC_STATE.value, + blood_prime_state= TreatmentBloodPrimeStates.BLOOD_PRIME_RAMP_STATE.value, + treatment_end_state= TreatmentEndStates.TREATMENT_END_WAIT_FOR_RINSEBACK_STATE.value, + treatment_stop_state= TreatmentStopStates.TREATMENT_STOP_NO_RECIRC_STATE.value, + dialysis_state=TreatmentDialysisStates.DIALYSIS_START_STATE.value, + bloodLeakZeoringState = BloodLeakZeroingStates.BLD_ZEROING_IDLE_STATE.value) #verify treatment pause state verify_pause_treatment_text() Index: tst_treatment_blood_dialysateflow_rate/test.py =================================================================== diff -u -r52bc8f634fc08f78afc721468c23106dff15fe5a -r6dea78f296538eaec9a3478608f5ba0be9e9c954 --- tst_treatment_blood_dialysateflow_rate/test.py (.../test.py) (revision 52bc8f634fc08f78afc721468c23106dff15fe5a) +++ tst_treatment_blood_dialysateflow_rate/test.py (.../test.py) (revision 6dea78f296538eaec9a3478608f5ba0be9e9c954) @@ -14,6 +14,7 @@ import names from dialin.ui import utils +from dialin.common.hd_defs import BloodLeakZeroingStates from dialin.ui.hd_simulator import HDSimulator from configuration import config @@ -237,9 +238,17 @@ utils.waitForGUI(1) #navigate to In-treatment section - hd_simulator.cmd_set_treatment_states_data(sub_mode= 2, uf_state= 0, saline_state=1, heparin_state= 0, - rinseback_state= 0, recirculate_state= 0, blood_prime_state= 2, - treatment_end_state=0, treatment_stop_state= 0, dialysis_state=0) + hd_simulator.cmd_set_treatment_states_data(sub_mode= 2, + uf_state= 0, + saline_state=1, + heparin_state= 0, + rinseback_state= 0, + recirculate_state= 0, + blood_prime_state= 2, + treatment_end_state=0, + treatment_stop_state= 0, + dialysis_state=0, + bloodLeakZeoringState = BloodLeakZeroingStates.BLD_ZEROING_IDLE_STATE.value) utils.waitForGUI(1) #delay for fetching effect test_blood_flow_rate_and_dialysate(BLOOD_DIALYSATE_FLOW_TESTING_OPTION["OPTION_1"]) Index: tst_treatment_monitoring/test.py =================================================================== diff -u -r6bb43117bca2673c5de877f5b70b094da344418a -r6dea78f296538eaec9a3478608f5ba0be9e9c954 --- tst_treatment_monitoring/test.py (.../test.py) (revision 6bb43117bca2673c5de877f5b70b094da344418a) +++ tst_treatment_monitoring/test.py (.../test.py) (revision 6dea78f296538eaec9a3478608f5ba0be9e9c954) @@ -32,7 +32,7 @@ @param: expected_blood_prime_value - expected blood prime value. @return: N/A """ - utils.waitForGUI(0.5) + # utils.waitForGUI(0.5) expected_blood_prime_value = str(expected_blood_prime_value) +" "+config.LIQUID_UNIT test.compare(expected_blood_prime_value, waitForObject(names.o_target_value).text) @@ -52,7 +52,7 @@ for current_range in range(0, config.BLOOD_PRIMING_RANGE): hd_simulator.cmd_send_treatment_blood_prime_data(target = target_range,current = current_range) test_blood_prime_value(expected_blood_prime_value = current_range) - utils.waitForGUI(0.3) #For fetching the effect in UI + utils.waitForGUI(0.1) #For fetching the effect in UI test.endSection() @@ -66,7 +66,8 @@ test.startSection("verification of treatment parameters") hd_simulator.cmd_set_treatment_states_data(sub_mode=HDStandbyStates.STANDBY_WAIT_FOR_DISINFECT_STATE.value, uf_state=TreatmentStates.TREATMENT_START_STATE.value, saline_state=TreatmentStates.TREATMENT_START_STATE.value, heparin_state=TreatmentStates.TREATMENT_START_STATE.value, rinseback_state=TreatmentStates.TREATMENT_START_STATE.value, recirculate_state=TreatmentStates.TREATMENT_START_STATE.value, blood_prime_state=TreatmentStates.TREATMENT_START_STATE.value, - treatment_end_state=TreatmentStates.TREATMENT_START_STATE.value, treatment_stop_state=TreatmentStates.TREATMENT_START_STATE.value, dialysis_state=TreatmentStates.TREATMENT_START_STATE.value) + treatment_end_state=TreatmentStates.TREATMENT_START_STATE.value, treatment_stop_state=TreatmentStates.TREATMENT_START_STATE.value, dialysis_state=TreatmentStates.TREATMENT_START_STATE.value, + bloodLeakZeoringState=0) test.log("Test for verifying components of Flows in Main Treatment ") test.compare(str(waitForObject(names.o_Flows).text), config.FLOWS_TEXT) Index: tst_treatment_saline_data/test.py =================================================================== diff -u -re3f67a6e78d267bb99596ba1ce439c6fe7d89a25 -r6dea78f296538eaec9a3478608f5ba0be9e9c954 --- tst_treatment_saline_data/test.py (.../test.py) (revision e3f67a6e78d267bb99596ba1ce439c6fe7d89a25) +++ tst_treatment_saline_data/test.py (.../test.py) (revision 6dea78f296538eaec9a3478608f5ba0be9e9c954) @@ -18,7 +18,7 @@ import names from configuration import config, utility from dialin.ui import utils -from dialin.common.hd_defs import HDStandbyStates, TreatmentStates +from dialin.common.hd_defs import HDStandbyStates, TreatmentStates, BloodLeakZeroingStates from dialin.ui.hd_simulator import HDSimulator from dialin.common.ui_defs import TXStates as txStates from dialin.common.msg_defs import RequestRejectReasons as rejectReason @@ -101,9 +101,17 @@ if (not accept_status): test.compare(waitForObjectExists(saline_rejection_text_object(config.REJECTION_REASON[rejection_reason])).text, config.REJECTION_REASON[rejection_reason], "expected rejection {msg} displayed".format(msg=config.REJECTION_REASON[rejection_reason])) #set saline transition state. - hd_simulator.cmd_set_treatment_states_data(sub_mode=HDStandbyStates.STANDBY_WAIT_FOR_DISINFECT_STATE.value, uf_state=TreatmentStates.TREATMENT_START_STATE.value, saline_state=saline_states, heparin_state=TreatmentStates.TREATMENT_START_STATE.value, - rinseback_state=TreatmentStates.TREATMENT_START_STATE.value, recirculate_state=TreatmentStates.TREATMENT_START_STATE.value, blood_prime_state=TreatmentStates.TREATMENT_START_STATE.value, - treatment_end_state=TreatmentStates.TREATMENT_START_STATE.value, treatment_stop_state=TreatmentStates.TREATMENT_START_STATE.value, dialysis_state=TreatmentStates.TREATMENT_START_STATE.value) + hd_simulator.cmd_set_treatment_states_data(sub_mode=HDStandbyStates.STANDBY_WAIT_FOR_DISINFECT_STATE.value, + uf_state=TreatmentStates.TREATMENT_START_STATE.value, + saline_state=saline_states, + heparin_state=TreatmentStates.TREATMENT_START_STATE.value, + rinseback_state=TreatmentStates.TREATMENT_START_STATE.value, + recirculate_state=TreatmentStates.TREATMENT_START_STATE.value, + blood_prime_state=TreatmentStates.TREATMENT_START_STATE.value, + treatment_end_state=TreatmentStates.TREATMENT_START_STATE.value, + treatment_stop_state=TreatmentStates.TREATMENT_START_STATE.value, + dialysis_state=TreatmentStates.TREATMENT_START_STATE.value, + bloodLeakZeoringState = BloodLeakZeroingStates.BLD_ZEROING_IDLE_STATE.value) test.compare(str(waitForObjectExists(names.o_treatmentStart_SalineSection).buttonText), "{} BOLUS".format(button_text)) verify_target_value(expected_target_value = target) @@ -140,8 +148,11 @@ for delivered_value, cumulative_value in config.SALINE_BOLUS_VALUES.items(): hd_simulator.cmd_set_treatment_saline_bolus_data(target=target_value, - cumulative=cumulative_value, - delivered=delivered_value) + cumulative=cumulative_value, + delivered=delivered_value, + DPI2BLDVolML=0.0, + RSRVR2DPIVolML=0.0, + zeroingRqstStatus=1) test.log("verification of saline values from dialysis state for target value :" + str(target_value)+ " cumulative value :" +str(cumulative_value)+" and delivered value :"+ str(delivered_value)) @@ -217,36 +228,68 @@ test.startSection("verification of saline parameter states on main treatment screen") - hd_simulator.cmd_set_treatment_states_data(sub_mode=HDStandbyStates.STANDBY_WAIT_FOR_DISINFECT_STATE .value, uf_state=TreatmentStates.TREATMENT_START_STATE.value, saline_state=TreatmentStates.TREATMENT_START_STATE.value, heparin_state=TreatmentStates.TREATMENT_START_STATE.value, - rinseback_state=TreatmentStates.TREATMENT_START_STATE.value, recirculate_state=TreatmentStates.TREATMENT_START_STATE.value, blood_prime_state=TreatmentStates.TREATMENT_START_STATE.value, - treatment_end_state=TreatmentStates.TREATMENT_START_STATE.value, treatment_stop_state=TreatmentStates.TREATMENT_START_STATE.value, dialysis_state=TreatmentStates.TREATMENT_START_STATE.value) + hd_simulator.cmd_set_treatment_states_data(sub_mode=HDStandbyStates.STANDBY_WAIT_FOR_DISINFECT_STATE.value, + uf_state=TreatmentStates.TREATMENT_START_STATE.value, + saline_state=TreatmentStates.TREATMENT_START_STATE.value, + heparin_state=TreatmentStates.TREATMENT_START_STATE.value, + rinseback_state=TreatmentStates.TREATMENT_START_STATE.value, + recirculate_state=TreatmentStates.TREATMENT_START_STATE.value, + blood_prime_state=TreatmentStates.TREATMENT_START_STATE.value, + treatment_end_state=TreatmentStates.TREATMENT_START_STATE.value, + treatment_stop_state=TreatmentStates.TREATMENT_START_STATE.value, + dialysis_state=TreatmentStates.TREATMENT_START_STATE.value, + bloodLeakZeoringState = BloodLeakZeroingStates.BLD_ZEROING_IDLE_STATE.value) mouseClick(waitForObject(names.o_treatmentHome_startFluidButton_TouchRect)) test.compare((waitForObjectExists(names.o_treatmentHome_startFluidButton_TouchRect).enabled), True, "START BOLUS button is enable") test.compare((waitForObjectExists(names.o_treatmentHome_START_BOLUS_Text).enabled), True, "Start Bolus text is enable") - hd_simulator.cmd_set_treatment_states_data(sub_mode=HDStandbyStates.STANDBY_WAIT_FOR_DISINFECT_STATE .value, uf_state=TreatmentStates.TREATMENT_START_STATE.value, saline_state=TreatmentStates.TREATMENT_BLOOD_PRIME_STATE.value, heparin_state=TreatmentStates.TREATMENT_START_STATE.value, - rinseback_state=TreatmentStates.TREATMENT_START_STATE.value, recirculate_state=TreatmentStates.TREATMENT_START_STATE.value, blood_prime_state=TreatmentStates.TREATMENT_START_STATE.value, - treatment_end_state=TreatmentStates.TREATMENT_START_STATE.value, treatment_stop_state=TreatmentStates.TREATMENT_START_STATE.value, dialysis_state=TreatmentStates.TREATMENT_START_STATE.value) + hd_simulator.cmd_set_treatment_states_data(sub_mode=HDStandbyStates.STANDBY_WAIT_FOR_DISINFECT_STATE.value, + uf_state=TreatmentStates.TREATMENT_START_STATE.value, + saline_state=TreatmentStates.TREATMENT_BLOOD_PRIME_STATE.value, + heparin_state=TreatmentStates.TREATMENT_START_STATE.value, + rinseback_state=TreatmentStates.TREATMENT_START_STATE.value, + recirculate_state=TreatmentStates.TREATMENT_START_STATE.value, + blood_prime_state=TreatmentStates.TREATMENT_START_STATE.value, + treatment_end_state=TreatmentStates.TREATMENT_START_STATE.value, + treatment_stop_state=TreatmentStates.TREATMENT_START_STATE.value, + dialysis_state=TreatmentStates.TREATMENT_START_STATE.value, + bloodLeakZeoringState = BloodLeakZeroingStates.BLD_ZEROING_IDLE_STATE.value) test.compare((waitForObjectExists(names.o_treatmentHome_startFluidButton_TouchRect).enabled), False, "START BOLUS button is not enable") test.compare((waitForObjectExists(names.o_treatmentHome_START_BOLUS_Text).enabled), False, "Start Bolus text is not enable") test.compare((waitForObjectExists(names.o_treatmentHome_START_BOLUS_Text).enabled), False, "Start Bolus text is not enable") test.compare((waitForObjectExists(names.o_treatmentHome_image_Image).visible), True, "Pause Image is Visible") test.compare(str(waitForObjectExists(names.o_treatmentHome_Treatment_Paused_Text).text), "Treatment Paused", "Treatment Paused text is visible") - hd_simulator.cmd_set_treatment_states_data(sub_mode=HDStandbyStates.STANDBY_WAIT_FOR_DISINFECT_STATE .value, uf_state=TreatmentStates.TREATMENT_START_STATE.value, saline_state=TreatmentStates.TREATMENT_DIALYSIS_STATE.value, heparin_state=TreatmentStates.TREATMENT_START_STATE.value, - rinseback_state=TreatmentStates.TREATMENT_START_STATE.value, recirculate_state=TreatmentStates.TREATMENT_START_STATE.value, blood_prime_state=TreatmentStates.TREATMENT_START_STATE.value, - treatment_end_state=TreatmentStates.TREATMENT_START_STATE.value, treatment_stop_state=TreatmentStates.TREATMENT_START_STATE.value, dialysis_state=TreatmentStates.TREATMENT_START_STATE.value) + hd_simulator.cmd_set_treatment_states_data(sub_mode=HDStandbyStates.STANDBY_WAIT_FOR_DISINFECT_STATE.value, + uf_state=TreatmentStates.TREATMENT_START_STATE.value, + saline_state=TreatmentStates.TREATMENT_DIALYSIS_STATE.value, + heparin_state=TreatmentStates.TREATMENT_START_STATE.value, + rinseback_state=TreatmentStates.TREATMENT_START_STATE.value, + recirculate_state=TreatmentStates.TREATMENT_START_STATE.value, + blood_prime_state=TreatmentStates.TREATMENT_START_STATE.value, + treatment_end_state=TreatmentStates.TREATMENT_START_STATE.value, + treatment_stop_state=TreatmentStates.TREATMENT_START_STATE.value, + dialysis_state=TreatmentStates.TREATMENT_START_STATE.value, + bloodLeakZeoringState = BloodLeakZeroingStates.BLD_ZEROING_IDLE_STATE.value) mouseClick(waitForObjectExists(names.o_treatmentHome_stop_bolus_Text)) mouseClick(waitForObject(names.o_treatmentHome_Treatment_Paused_Text)) test.compare((waitForObjectExists(names.o_treatmentHome_image_Image).visible), True, "Pause Image is Visible") test.compare(str(waitForObjectExists(names.o_treatmentHome_Treatment_Paused_Text).text), "Treatment Paused", "Treatment Paused text is visible") - hd_simulator.cmd_set_treatment_states_data(sub_mode=HDStandbyStates.STANDBY_WAIT_FOR_DISINFECT_STATE.value, uf_state=TreatmentStates.TREATMENT_START_STATE.value, saline_state=TreatmentStates.TREATMENT_STOP_STATE.value, heparin_state=TreatmentStates.TREATMENT_START_STATE.value, - rinseback_state=TreatmentStates.TREATMENT_START_STATE.value, recirculate_state=TreatmentStates.TREATMENT_START_STATE.value, blood_prime_state=TreatmentStates.TREATMENT_START_STATE.value, - treatment_end_state=TreatmentStates.TREATMENT_START_STATE.value, treatment_stop_state=TreatmentStates.TREATMENT_START_STATE.value, dialysis_state=TreatmentStates.TREATMENT_START_STATE.value) + hd_simulator.cmd_set_treatment_states_data(sub_mode=HDStandbyStates.STANDBY_WAIT_FOR_DISINFECT_STATE.value, + uf_state=TreatmentStates.TREATMENT_START_STATE.value, + saline_state=TreatmentStates.TREATMENT_STOP_STATE.value, + heparin_state=TreatmentStates.TREATMENT_START_STATE.value, + rinseback_state=TreatmentStates.TREATMENT_START_STATE.value, + recirculate_state=TreatmentStates.TREATMENT_START_STATE.value, + blood_prime_state=TreatmentStates.TREATMENT_START_STATE.value, + treatment_end_state=TreatmentStates.TREATMENT_START_STATE.value, + treatment_stop_state=TreatmentStates.TREATMENT_START_STATE.value, + dialysis_state=TreatmentStates.TREATMENT_START_STATE.value, + bloodLeakZeoringState = BloodLeakZeroingStates.BLD_ZEROING_IDLE_STATE.value) test.compare((waitForObjectExists(names.o_treatmentHome_startFluidButton_TouchRect).enabled), False, "START BOLUS button is not enable") test.compare((waitForObjectExists(names.o_treatmentHome_START_BOLUS_Text).enabled), False, "Start Bolus text is not enable") @@ -261,9 +304,17 @@ utils.waitForGUI(1) #navigate to dialysis state - hd_simulator.cmd_set_treatment_states_data(sub_mode= HDStandbyStates.STANDBY_WAIT_FOR_DISINFECT_STATE.value, uf_state=TreatmentStates.TREATMENT_START_STATE.value, saline_state=TreatmentStates.TREATMENT_START_STATE.value, heparin_state=TreatmentStates.TREATMENT_START_STATE.value, - rinseback_state=TreatmentStates.TREATMENT_START_STATE.value, recirculate_state=TreatmentStates.TREATMENT_START_STATE.value, blood_prime_state=TreatmentStates.TREATMENT_START_STATE.value, - treatment_end_state=TreatmentStates.TREATMENT_START_STATE.value, treatment_stop_state=TreatmentStates.TREATMENT_START_STATE.value, dialysis_state=TreatmentStates.TREATMENT_START_STATE.value) + hd_simulator.cmd_set_treatment_states_data(sub_mode= HDStandbyStates.STANDBY_WAIT_FOR_DISINFECT_STATE.value, + uf_state=TreatmentStates.TREATMENT_START_STATE.value, + saline_state=TreatmentStates.TREATMENT_START_STATE.value, + heparin_state=TreatmentStates.TREATMENT_START_STATE.value, + rinseback_state=TreatmentStates.TREATMENT_START_STATE.value, + recirculate_state=TreatmentStates.TREATMENT_START_STATE.value, + blood_prime_state=TreatmentStates.TREATMENT_START_STATE.value, + treatment_end_state=TreatmentStates.TREATMENT_START_STATE.value, + treatment_stop_state=TreatmentStates.TREATMENT_START_STATE.value, + dialysis_state=TreatmentStates.TREATMENT_START_STATE.value, + bloodLeakZeoringState = BloodLeakZeroingStates.BLD_ZEROING_IDLE_STATE.value) #verification of target, cumulative and delivered value test_saline_values() Index: tst_ui_alarms_dialog/test.py =================================================================== diff -u -r40314c67874695eefc506c3a6a33896495953edd -r6dea78f296538eaec9a3478608f5ba0be9e9c954 --- tst_ui_alarms_dialog/test.py (.../test.py) (revision 40314c67874695eefc506c3a6a33896495953edd) +++ tst_ui_alarms_dialog/test.py (.../test.py) (revision 6dea78f296538eaec9a3478608f5ba0be9e9c954) @@ -109,7 +109,7 @@ @output N/A """ mouseClick(waitForObject(names.o_alarm_button_minimize)) - utils.waitForGUI(1) # this wait is necessary. Due to dialog animation it will be hide until the animation is done. + utils.waitForGUI(0.2) # this wait is necessary. Due to dialog animation it will be hide until the animation is done. def maximize(): @@ -119,7 +119,7 @@ @output N/A """ mouseClick(waitForObject(names.o_alarm_bar_maximize)) - utils.waitForGUI(1) # this wait is necessary. Due to dialog animation it will be hide until the animation is done. + utils.waitForGUI(0.2) # this wait is necessary. Due to dialog animation it will be hide until the animation is done. def test_button(flag, vButtons): @@ -155,20 +155,18 @@ if waitForObjectExists(names.o_alarm_button_ok ).visible: # Ok button obj = waitForObjectExists(names.o_ok_button_mouse_area) if obj.visible : mouseClick(obj) - utils.waitForGUI(0.5) if waitForObjectExists(names.o_alarm_button_resume ).visible: # Resume button obj = waitForObjectExists(names.o_resume_button_mouse_Area) if obj.visible : mouseClick(obj) - utils.waitForGUI(0.5) if waitForObjectExists(names.o_alarm_button_rinseback ).visible: # Rinse back button obj = waitForObjectExists(names.o_rinseback_mouse_area) if obj.visible : mouseClick(obj) - utils.waitForGUI(0.5) if waitForObjectExists(names.o_alarm_button_end ).visible: # End button obj = waitForObjectExists(names.o_end_button_mouse_area) if obj.visible : mouseClick(obj) - utils.waitForGUI(0.5) + utils.waitForGUI(0.2) + alarm.cmd_alarm_condition_cleared(alarm_id = 1) def test_all_buttons(): @@ -262,7 +260,7 @@ #enables alarm 4 and press all buttons on screen flag_status = alarm.cmd_make_alarm_flags(no_resume=0, no_rinseback=0, no_end_treatment=0, user_must_ack=1, no_minimize=1, alarms_silenced=1) alarm.cmd_activate_alarm_id(state = 2, alarm = 4, flags = flag_status) - utils.waitForGUI(1) + utils.waitForGUI(0.2) test_all_buttons() test.endSection() @@ -300,7 +298,6 @@ 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") else: test.log(str(alarm_id)) -# utils.waitForGUI(0.5) test.compare(str(waitForObjectExists(names.o_alarm_text_description).text), alarm_info_dict[alarm_id]['message'], "Alarm message is verified from alarm dialog box") minimize() test.compare(str(waitForObjectExists(names.o_alarm_bar_text ).text), alarm_info_dict[alarm_id]['title'], "Alarm title is verified from alarm bar") @@ -364,7 +361,7 @@ test.log("validate alarm condition for alarm id : 0") alarm.cmd_set_alarm_cleared_condition(alarm_id = 0) alarm.cmd_activate_alarm_id(0, 0, 0, 0, 0) - utils.waitForGUI() + utils.waitForGUI(0.2) dlg = names.o_modalDialog bar = names.o_alarm_bar dlg_exists = object.exists(dlg) Index: tst_ui_alarms_list/test.py =================================================================== diff -u -r84c1284ecff1f30169d50afb688be18934eb8506 -r6dea78f296538eaec9a3478608f5ba0be9e9c954 --- tst_ui_alarms_list/test.py (.../test.py) (revision 84c1284ecff1f30169d50afb688be18934eb8506) +++ tst_ui_alarms_list/test.py (.../test.py) (revision 6dea78f296538eaec9a3478608f5ba0be9e9c954) @@ -431,7 +431,7 @@ This method is used to execute the command for getting updated mAlarmMapping.csv file. """ current_work_dir = os.getcwd() - cmd = './alarmMapping ~/Projects/application/common/ ./' + cmd = './alarmMapping ~/Projects/unittests/common/ ./' os.chdir(config.ALARM_MAPPING_CSV_DIR_LOCATION) os.system("gnome-terminal -e 'bash -c \""+cmd+";bash\"'") os.chdir(current_work_dir) @@ -444,13 +444,13 @@ 1)application """ try: - utility.rename_file(config.APPLICATION_FOLDER_LOCATION,"application") + utility.rename_file(config.APPLICATION_FOLDER_LOCATION,"unittests") utils.waitForGUI(0.2) generate_alarm_ids(accept=config.ACCEPTED, reason_id=0) except: test.log(str("Error occured while generating alarms")) finally: - utility.rename_old_name(config.APPLICATION_FOLDER_LOCATION,"application") + utility.rename_old_name(config.APPLICATION_FOLDER_LOCATION,"unittests") def main(): Index: tst_ui_logs/test.py =================================================================== diff -u -rf5d6586401d0ae798e2d489aa3aa7d8479d9d347 -r6dea78f296538eaec9a3478608f5ba0be9e9c954 --- tst_ui_logs/test.py (.../test.py) (revision f5d6586401d0ae798e2d489aa3aa7d8479d9d347) +++ tst_ui_logs/test.py (.../test.py) (revision 6dea78f296538eaec9a3478608f5ba0be9e9c954) @@ -30,7 +30,7 @@ from configuration import config from configuration import application_init as application_init from dialin.common.msg_ids import MsgIds -from dialin.common.hd_defs import HDStandbyStates, HDOpModes +from dialin.common.hd_defs import HDStandbyStates, HDOpModes, BloodLeakZeroingStates from dialin.common import msg_defs from dialin.utils.conversions import integer_to_bytearray, float_to_bytearray, short_to_bytearray, unsigned_integer_to_bytearray, integer_to_bit_array, unsigned_short_to_bytearray, unsigned_byte_to_bytearray @@ -53,8 +53,8 @@ @param msg - (string) message to be displayed on log. @param param - (list) parameters for msg_id's. """ + test.log("Verification of UI log based on message : " + str(msg)) 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: @@ -70,9 +70,18 @@ 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).upper() - test.verify((message_id_str in message for message in message_extracted), "message ID is verified") + 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") + sParam="" + for i in param: + print(typeName(i)) + if typeName(i) == "int": + sParam += ',' + str(i) + if typeName(i) == "float": + sParam += ',' + "{:.3f}".format(i) + + test.log(sParam, message_extracted[0][0]) + test.verify((sParam in message_extracted[0][0]), "parameters are verified") test.endSection() @@ -101,21 +110,66 @@ 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, - 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 = "Occlusion", param = [54.5,20.1,100,10,200,340,20,50,30.4,21.4]) + hd_simulator.cmd_set_pressure_occlusion_data( + mArterialPressure = 54.5 , + mVenousPressure = 20.1 , + mBloodPumpOcclusion = 100 , + mPressureLimitState = 10 , + mArterialLimitLow = 200 , + mArterialLimitHigh = 340 , + mVenousLimitLow = 20 , + mVenousLimitHigh = 50 , + mArtLongFilter = 30.4 , + mVenousLongFilter = 21.4 , + mBloodOcclLongFilter = 12.6 , + mPartialOcclBaseline = 44.4 ) + verify_log(msg_id = MsgIds.MSG_ID_PRESSURE_OCCLUSION_DATA.value, + msg = "Occlusion", + param = [ + 54.5 , + 20.1 , + 100 , + 10 , + 200 , + 340 , + 20 , + 50 , + 30.4 , + 21.4 , + 12.6 , + 44.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, - 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]) + hd_simulator.cmd_set_treatment_ultrafiltration_outlet_flow_data( + mRefUFVol = 77.5, + mMeasUFVol = 22.6, + mRotorSpeed = 54.0, + mMotorSpeed = 66.2, + mMotorCtlSpeed = 33.3, + mMotorCtlCurrent = 21.2, + mPWMDtCycle = 322.2, + mDopCorrOffset = 15.2, + mDopCalcRate = 16.3, + mUfCalcRate = 21.5, + mRotorHall = 25 , + mCurrentSetUFRate = 16.5, + mDialOutPumpState = 17 ) + 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, + 17 ]) #0x1A00 hd_simulator.cmd_set_treatment_parameter_ranges(min_treatment_duration = 60, max_treatment_duration = 470, @@ -125,7 +179,12 @@ 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) + hd_simulator.cmd_set_treatment_saline_bolus_data(target = 2, + cumulative = 100.0, + delivered = 300.0, + DPI2BLDVolML = 50.5, + RSRVR2DPIVolML = 23.3, + zeroingRqstStatus = 1) verify_log(msg_id = MsgIds.MSG_ID_SALINE_BOLUS_DATA.value, msg = "Saline", param = [2,100.0,300.0]) #0x4D00 @@ -157,8 +216,18 @@ #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]) + hd_simulator.cmd_send_hd_air_trap_data( + mAirTrapLowerLevel = 10, + mAirTrapUpperLevel = 20, + mAirTrapRawLowerLevel = 30, + mAirTrapRawUpperLevel = 40) + verify_log(msg_id = MsgIds.MSG_ID_HD_AIR_TRAP_DATA.value, + msg = "AirTrap", + param = [ + 10, + 20, + 30, + 40]) #0x6900 payload = unsigned_integer_to_bytearray(1) @@ -184,8 +253,16 @@ verify_log(msg_id = MsgIds.MSG_ID_HD_FLUID_LEAK_STATE_DATA.value, msg = "~FLD_LEAK") #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_serial_state = 2) + hd_simulator.cmd_send_hd_blood_leak_data(blood_leak_status = 1, + blood_leak_state = 1, + blood_leak_error_persistent_ctr = 4, + blood_leak_serial_comm_state = 2, + blood_leak_intensity = 3, + blood_leak_blood_detect = 3, + blood_leak_intensity_moving_average =15.26, + blood_leak_time_since_last_zero_ms = 125, + blood_leak_in_range_drift_status = 1, + blood_leak_upper_range_drift_status = 0) verify_log(msg_id = MsgIds.MSG_ID_HD_BLOOD_LEAK_DATA.value, msg = "BloodLeak", param = [1,1,4,2]) #0x9300 @@ -277,9 +354,17 @@ #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) + 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, + bloodLeakZeoringState = BloodLeakZeroingStates.BLD_ZEROING_IDLE_STATE.value) 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 @@ -455,13 +540,10 @@ payload += float_to_bytearray(36.0) payload += float_to_bytearray(35.0) payload += float_to_bytearray(29.0) - payload += float_to_bytearray(36.0) - payload += float_to_bytearray(35.0) - payload += float_to_bytearray(29.0) dg_simulator.cmd_send_dg_general_response(message_id=40, 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=40, 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_reservoir_data(active_reservoir = 5, fill_to_vol_ml = 10, drain_to_vol_ml = 2) - verify_log(msg_id = MsgIds.MSG_ID_DG_RESERVOIRS_DATA.value, msg = "Reservoir", param = [5, 10, 2]) + verify_log(msg_id = MsgIds.MSG_ID_DG_RESERVOIRS_DATA.value, msg = "Reservoir", param = [1, 47, 27, 17, 7, 10.0 , 36.6 , 35.5 , 35.9 , 36.0 , 35.0 , 29.0 ]) #0x2A00 #there is a parameter mismatch here as the log contains a series of boolean values instead of one integer @@ -475,12 +557,36 @@ #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 - dg_simulator.cmd_set_dg_heaters_data(main_primary_dc = 1, small_primary_dc = 2, trimmer_dc = 3, - primary_target_temp = 4, trimmer_target_temp =5, - primary_heater_state=6, trimmer_heater_state=7, - primary_efficiency=8, primary_calc_target_temp=9, - trimmer_calc_current_temp=10, trimmer_use_last_dc=11) - verify_log(msg_id = MsgIds.MSG_ID_DG_HEATERS_DATA.value, msg = "Heaters", param = [0.0, 0.0, 0.0,0.0, 0.0, 0.0,0.0, 0.0, 0.0,0.0, 0.0]) + dg_simulator.cmd_set_dg_heaters_data( + mMainPrimayHeaterDC = 1.0, + mSmallPrimaryHeaterDC = 2.0, + mTrimmerHeaterDC = 3.0, + mPrimaryTargetTemp = 4.0, + mTrimmerTargetTemp = 5.0, + mPrimaryHeaterState = 6 , + mTrimmerHeaterState = 7 , + mPrimaryEfficiency = 8.0, + mPrimaryCalcTargetTemp = 9.0, + mTrimmerCalcCurrentTemp = 10.0, + mTrimmerUseLastDC = 11 , + mTrimmerPreviousFlow = 12.0, + mTrimmerContolCounter = 13 ) + verify_log(msg_id = MsgIds.MSG_ID_DG_HEATERS_DATA.value, + msg = "Heaters", + param = [ + 1.0, + 2.0, + 3.0, + 4.0, + 5.0, + 6 , + 7 , + 8.0, + 9.0, + 10.0, + 11 , + 12.0, + 13 ]) #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) @@ -521,7 +627,7 @@ cpo_conductivity=3.0, cd1_conductivity=4.0, cd2_conductivity=5.0, CPi_raw=6.0, CPo_raw=6.0, CD1_raw=7.0, CD2_raw=8.0, CPi_sensor_status=1, CPo_sensor_status=2, CD1_sensor_status=3, CD2_sensor_status=4) - verify_log(msg_id=MsgIds.MSG_ID_DG_CONDUCTIVITY_DATA.value, msg="Conductivity", param=[1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 1, 2, 3, 4]) + verify_log(msg_id=MsgIds.MSG_ID_DG_CONDUCTIVITY_DATA.value, msg="Conductivity", param=[1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 6.0, 7.0, 8.0, 1, 2, 3, 4]) # 0x3700 payload = integer_to_bytearray(1) @@ -769,18 +875,8 @@ verify_log(msg_id=MsgIds.MSG_ID_USER_UF_PAUSE_RESUME_RESPONSE.value, msg="AdjustUFState") # 0x1300 - # TODO: Payload values need to been changed after discussion - payload = unsigned_integer_to_bytearray(1) - payload += unsigned_integer_to_bytearray(1) - payload += float_to_bytearray(0.600) - payload += unsigned_integer_to_bytearray(300) - payload += unsigned_integer_to_bytearray(15) - payload += float_to_bytearray(100.0) - payload += float_to_bytearray(25.0) - payload += float_to_bytearray(50.0) - hd_simulator.cmd_send_hd_general_response(message_id=19, accepted=1, reason=1, is_pure_data=False, has_parameters=True, parameters_payload=payload) - hd_simulator.cmd_set_treatment_adjust_ultrafiltration_edit_response(accepted=1, reason=1, volume=0.600, duration=300, duration_diff=15, rate=100.0 , rate_diff=25.0, rate_old=50.0) - verify_log(msg_id=MsgIds.MSG_ID_USER_UF_SETTINGS_CHANGE_RESPONSE.value, msg="AdjustUFEdit", param=[1, 1, 0.600, 300, 15, 100.0, 25.0, 50.0]) + hd_simulator.cmd_set_treatment_adjust_ultrafiltration_edit_response(accepted=1, reason=1, volume=0.800, duration=300, duration_diff=15, rate=100.0 , rate_diff=25.0, rate_old=50.0) + verify_log(msg_id=MsgIds.MSG_ID_USER_UF_SETTINGS_CHANGE_RESPONSE.value, msg="AdjustUFEdit") # , param=[1, 1, 0.700, 300, 15, 100.0, 25.0, 50.0] # 0x2E00 # parameter mismatch : expected 1 int but 3 integers are logged @@ -828,7 +924,7 @@ # 0x4700 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) + hd_simulator.cmd_send_treatment_adjust_pressures_limit_response(accepted=0, 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 @@ -1073,8 +1169,9 @@ # Pre-Treatment Patient Connection Confirm # ID:0x6700 hd_simulator.cmd_send_pre_treatment_patient_connection_confirm_response(accepted=1, reason=0) - hd_simulator.cmd_send_pre_treatment_patient_connection_confirm_response(accepted=0, reason=0) verify_log(msg_id=MsgIds.MSG_ID_HD_PATIENT_CONNECTION_CONFIRM_RESPONSE.value, msg="AdjustPatientConnectionConfirm", param=[1, 0]) + hd_simulator.cmd_send_pre_treatment_patient_connection_confirm_response(accepted=0, reason=0) + verify_log(msg_id=MsgIds.MSG_ID_HD_PATIENT_CONNECTION_CONFIRM_RESPONSE.value, msg="AdjustPatientConnectionConfirm", param=[0, 0]) # Start Treatment # ID:0x7200 @@ -1168,8 +1265,8 @@ verify_log(msg_id=MsgIds.MSG_ID_HD_TREATMENT_LOG_DATA_RESPONSE.value, msg="AdjustTreatmentLog") # ID:0x9400 - hd_simulator.cmd_send_treatment_log_data(blood_flow_rate=67, dialysate_flow_rate=81, uf_rate=12.0, arterial_pressure=72.0, venous_pressure=90.0) - verify_log(msg_id=MsgIds.MSG_ID_HD_TREATMENT_LOG_PERIODIC_DATA.value, msg="TreatmentLogAvrge", param=[67, 81, 12.0, 72.0, 90.0]) + hd_simulator.cmd_send_treatment_log_data(blood_flow_rate=67.0, dialysate_flow_rate=81.0, uf_rate=12.0, arterial_pressure=72.0, venous_pressure=90.0) + verify_log(msg_id=MsgIds.MSG_ID_HD_TREATMENT_LOG_PERIODIC_DATA.value, msg="TreatmentLogAvrge", param=[67.0, 81.0, 12.0, 72.0, 90.0]) # ID:0x9500 payload = integer_to_bytearray(1) @@ -1257,16 +1354,17 @@ verify_log(msg_id=MsgIds.MSG_ID_RO_PUMP_DATA.value, msg="ROPump") # 0x2400 - payload = unsigned_integer_to_bytearray(14) - payload += unsigned_integer_to_bytearray(17) + payload = unsigned_integer_to_bytearray(12) + payload += unsigned_integer_to_bytearray(13) + payload += unsigned_integer_to_bytearray(14) + payload += unsigned_integer_to_bytearray(15) + payload += float_to_bytearray(1.6) + payload += float_to_bytearray(1.7) + payload += unsigned_integer_to_bytearray(18) payload += unsigned_integer_to_bytearray(19) - payload += unsigned_integer_to_bytearray(12) - payload += float_to_bytearray(0.0) - payload += float_to_bytearray(0.0) - payload += unsigned_integer_to_bytearray(12) dg_simulator.cmd_send_dg_general_response(message_id=36, accepted=1, reason=1, is_pure_data=False, has_parameters=True, parameters_payload=payload) dg_simulator.cmd_send_dg_general_response(message_id=36, accepted=0, reason=0, is_pure_data=False, has_parameters=True, parameters_payload=payload) - verify_log(msg_id=MsgIds.MSG_ID_DRAIN_PUMP_DATA.value, msg="DrainPump") + verify_log(msg_id=MsgIds.MSG_ID_DRAIN_PUMP_DATA.value, msg="DrainPump", param=[12,13,14,15,1.6,1.7,18,19]) # 0x2700 payload = unsigned_integer_to_bytearray(1) @@ -1276,30 +1374,55 @@ verify_log(msg_id=MsgIds.MSG_ID_DG_OP_MODE_DATA.value, msg="OpMode") # 0x2D00(request) - payload = float_to_bytearray(11.500) - payload += float_to_bytearray(11.500) - payload += float_to_bytearray(11.500) - payload += float_to_bytearray(11.500) - payload += float_to_bytearray(11.500) - payload += float_to_bytearray(11.500) - payload += float_to_bytearray(11.500) - payload += float_to_bytearray(11.500) - payload += float_to_bytearray(11.500) - payload += float_to_bytearray(11.500) - payload += float_to_bytearray(11.500) - payload += float_to_bytearray(11.500) - payload += float_to_bytearray(11.500) - payload += float_to_bytearray(11.500) - payload += float_to_bytearray(11.500) - payload += float_to_bytearray(11.500) - payload += float_to_bytearray(11.500) - payload += float_to_bytearray(11.500) - payload += float_to_bytearray(11.500) - payload += float_to_bytearray(11.500) - payload += float_to_bytearray(11.500) + payload = float_to_bytearray(11.010) + payload += float_to_bytearray(11.020) + payload += float_to_bytearray(11.030) + payload += float_to_bytearray(11.040) + payload += float_to_bytearray(11.050) + payload += float_to_bytearray(11.060) + payload += float_to_bytearray(11.070) + payload += float_to_bytearray(11.080) + payload += float_to_bytearray(11.090) + payload += float_to_bytearray(11.100) + payload += float_to_bytearray(11.110) + payload += float_to_bytearray(11.120) + payload += float_to_bytearray(11.130) + payload += float_to_bytearray(11.140) + payload += float_to_bytearray(11.150) + payload += float_to_bytearray(11.160) + payload += float_to_bytearray(11.170) + payload += float_to_bytearray(11.180) + payload += float_to_bytearray(11.190) + payload += float_to_bytearray(11.200) + payload += float_to_bytearray(11.210) + payload += float_to_bytearray(11.220) + payload += float_to_bytearray(11.230) dg_simulator.cmd_send_dg_general_response(message_id=45, accepted=1, reason=1, is_pure_data=False, has_parameters=True, parameters_payload=payload) dg_simulator.cmd_send_dg_general_response(message_id=45, accepted=0, reason=0, is_pure_data=False, has_parameters=True, parameters_payload=payload) - verify_log(msg_id=MsgIds.MSG_ID_DG_TEMPERATURE_DATA.value, msg="Temperatures") + verify_log(msg_id=MsgIds.MSG_ID_DG_TEMPERATURE_DATA.value, msg="Temperatures", + param=[ 11.010, + 11.020, + 11.030, + 11.040, + 11.050, + 11.060, + 11.070, + 11.080, + 11.090, + 11.100, + 11.110, + 11.120, + 11.130, + 11.140, + 11.150, + 11.160, + 11.170, + 11.180, + 11.190, + 11.200, + 11.210, + 11.220, + 11.230]) # 0xB100 payload = unsigned_integer_to_bytearray(1) @@ -1597,7 +1720,7 @@ try: utility.rename_file(config.USB_DISK_FOLDER_LOCATION, "usb-disk") try: - utility.rename_file(config.APPLICATION_FOLDER_LOCATION, "application") + utility.rename_file(config.APPLICATION_FOLDER_LOCATION, "unittests") utils.waitForGUI(1) verif_ui_logs_api() Index: tst_unhandled_message_log/test.py =================================================================== diff -u -r40314c67874695eefc506c3a6a33896495953edd -r6dea78f296538eaec9a3478608f5ba0be9e9c954 --- tst_unhandled_message_log/test.py (.../test.py) (revision 40314c67874695eefc506c3a6a33896495953edd) +++ tst_unhandled_message_log/test.py (.../test.py) (revision 6dea78f296538eaec9a3478608f5ba0be9e9c954) @@ -26,7 +26,7 @@ hd_simulator = HDSimulator() -LOCATION = '/home/denali/Projects/application/resources/settings/Messages/Unhandled.conf' +LOCATION = '/home/denali/Projects/unittests/resources/settings/Messages/Unhandled.conf' DUMMY_FLOAT_VALUE_1 = 1.250 DUMMY_FLOAT_VALUE_2 = 5.855 @@ -127,7 +127,7 @@ """ This function is capable to write custom API's on unhandled.conf folder. - unhandled.conf location = '/home/denali/Projects/application/resources/settings/Messages/Unhandled.conf' + unhandled.conf location = '/home/denali/Projects/unittests/resources/settings/Messages/Unhandled.conf' Through this method filereader act as a handler and it will write custom unhandled messages on Unhandled.conf NB: it is a single time callable method should only use before starting the application. it is mandatory @@ -148,7 +148,7 @@ """ This function is capable to remove custom API's which is written during method "append_unhandled_configuration_file()". - unhandled.conf location = '/home/denali/Projects/application/resources/settings/Messages/Unhandled.conf' + unhandled.conf location = '/home/denali/Projects/unittests/resources/settings/Messages/Unhandled.conf' NB: it is a single time callable method should use only after calling "append_unhandled_configuration_file()" method. """