Index: shared/scripts/configuration/config.py =================================================================== diff -u -r356cd52f232bd5c4a17d9eca7b01821fee96e471 -r6bb43117bca2673c5de877f5b70b094da344418a --- shared/scripts/configuration/config.py (.../config.py) (revision 356cd52f232bd5c4a17d9eca7b01821fee96e471) +++ shared/scripts/configuration/config.py (.../config.py) (revision 6bb43117bca2673c5de877f5b70b094da344418a) @@ -52,7 +52,7 @@ #standby mode GOODMORNING_START_TIME_SEC = 0 GOODEVENING_START_TIME_SEC = 43200 -NUM_OF_REQUEST_REJECT_REASONS = 46 #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", @@ -192,10 +192,10 @@ ALARM_BUTTONS_END_RESUME_RINSEBACK = ALARM_BUTTONS_RESUME_RINSEBACK_END NUM_OF_ALARM_PRIORITIES = 4 # Total number of alarm priorities -NUM_OF_MSG_ID = 290 -NUM_OF_ALARM_ID = 291 +NUM_OF_MSG_ID = 311 +NUM_OF_ALARM_ID = 312 ALARM_ID_NO_ALARM = 0 -ALARM_ID_OUT_OF_RANGE = 291 +ALARM_ID_OUT_OF_RANGE = 312 #standby mode & ultrafiltration UF_MINIMUM_VALUE = 0 Index: shared/scripts/configuration/strings.py =================================================================== diff -u -r142c37e172e0bf6f7508b193c0eb25efb92cfa89 -r6bb43117bca2673c5de877f5b70b094da344418a --- shared/scripts/configuration/strings.py (.../strings.py) (revision 142c37e172e0bf6f7508b193c0eb25efb92cfa89) +++ shared/scripts/configuration/strings.py (.../strings.py) (revision 6bb43117bca2673c5de877f5b70b094da344418a) @@ -173,7 +173,10 @@ 43: "REQUEST_REJECT_REASON_SYRINGE_NOT_PRESENT", # Syringe is not present 44: "REQUEST_REJECT_REASON_DG_DIALYSATE_CAP_OPEN", # Dialysate cap open 45: "REQUEST_REJECT_REASON_DG_CONCENTRATE_CAP_OPEN", # Concentrate cap open - 46: "NUM_OF_REQUEST_REJECT_REASONS" # Number of settings change reject codes + 46: "REQUEST_REJECT_REASON_DG_DISINFECT_HAS_BEEN_EXPIRED", # DG disinfect has been expired + 47: "REQUEST_REJECT_REASON_DG_SERVICE_IS_DUE", # DG Serivce is due + 48: "REQUEST_REJECT_REASON_HD_SERVICE_IS_DUE", # HD service is due + 49: "NUM_OF_REQUEST_REJECT_REASON", # Number of settings change reject codes } #Alarm List @@ -695,7 +698,7 @@ 295 :"Total number of alarms." } -ALARM_ID_AND_ALARM_MESSAGES = { +ALARM_ID_AND_ALARM_MESSAGES = { # Needs to be updated/ made dynamic using the Alarms.conf file 0: "Indication for when no alarms is a possible situation", 1: "Call service to schedule a repair.", 2: "Call service to schedule a repair.", @@ -991,7 +994,16 @@ 292: "HD processor is in Disinfect Heat mode.", 293: "HD processor is in Disinfect Chemical mode.", 294: "HD processor Disinfect Chemical mode instructions to user.", - 295: "Total number of alarms." + 295: "UI POST CloudSync failure." , + 296: "DG TDi sensors FPGA fault." , + 297: "DG TRo sensors FPGA fault." , + 298: "DG baro sensor FPGA fault.", + 299: "DG disinfect has been expired." , + 300: "DG service time interval has elapsed.", + 301: "DG primary heater power voltage out of range.", + 302: "DG processor RAM error.", + 303: "HD processor RAM error.", + 304: "Total number of alarms." } #wifi Index: shared/scripts/configuration/utility.py =================================================================== diff -u -raa83dc8b87c7970026692a8a62311f21e856b13f -r6bb43117bca2673c5de877f5b70b094da344418a --- shared/scripts/configuration/utility.py (.../utility.py) (revision aa83dc8b87c7970026692a8a62311f21e856b13f) +++ shared/scripts/configuration/utility.py (.../utility.py) (revision 6bb43117bca2673c5de877f5b70b094da344418a) @@ -199,16 +199,16 @@ def get_alarm_id_obj(id): - names.o_alarm_id["text"] = id - return names.o_alarm_id + names.o_alarm_id_text["text"] = id + return names.o_alarm_id_text def get_alarm_msg_obj(msg): names.o_alarm_message["text"] = msg return names.o_alarm_message def rejection_msg(text): - names.o_rejection_msg["text"] = text - return names.o_rejection_msg + names.o_notificationbar_response["text"] = text + return names.o_notificationbar_response def set_arterial_ranges_min_val(art_low): """ @@ -1076,5 +1076,53 @@ raise LookupError("value object is not in view to the user after trying 100 times") - +def extract_alarm_info_from_alarms_conf_file() -> dict: + """ + This method is used to extract data from Alarms.conf file. + @param (int) alarm_id: ID for specified alarm message. + @return (dict) alarm info dict + + """ + utils.waitForGUI(0.2) + flag = False + title_found_status = False + alarm_info_dict = {} + with open(config.ALARM_MAPPING_CSV_FILE_LOCATION, 'r') as csv_file: + csv_messages = list(csv.reader(csv_file)) + with open(config.ALARMS_CONF_LOCATION, 'r') as conf_file: + alarm_id = 1 + for row in list(csv.reader(conf_file)): + try: + if flag is True and title_found_status is True: +# alarm_message = row[0].split() + alarm_message = ",".join(row).split('= ') + if alarm_id == 141: + print(alarm_message) + temp_message = " ".join(alarm_message[1::]) + if alarm_id == 141: + print(temp_message) + if '\\n' in temp_message: + temp_message = '\n'.join(temp_message.split('\\n')) + alarm_info_dict[alarm_id]['message'] = temp_message + flag = False + title_found_status = False + if alarm_info_dict[alarm_id]['message'] == '' and alarm_id != config.NUM_OF_ALARM_ID: + alarm_info_dict[alarm_id]['message'] = f'{csv_messages[alarm_id][-1].strip()[::]}' + alarm_id += 1 + if flag is True: + alarm_title = row[0].split('= ') + if alarm_title[0].split()[0] == 'Title': + title_found_status = True + alarm_info_dict[alarm_id]['title'] = " ".join(alarm_title[1::]) + if alarm_info_dict[alarm_id]['title'] == '': + alarm_info_dict[alarm_id]['title'] = 'Alarm' + if len(row) == 0: + continue + else: + if row[0] == '['+str(alarm_id)+']': + alarm_info_dict[alarm_id] = {} + flag = True + except IndexError: + test.fail("alarm message is not mapped with alarm id from Alarm.conf file") + return alarm_info_dict \ No newline at end of file Index: shared/scripts/dialin =================================================================== diff -u -rffb28af3cb1ae17c31092f9f96d14c2ec82adeea -r6bb43117bca2673c5de877f5b70b094da344418a --- shared/scripts/dialin (.../dialin) (revision ffb28af3cb1ae17c31092f9f96d14c2ec82adeea) +++ shared/scripts/dialin (.../dialin) (revision 6bb43117bca2673c5de877f5b70b094da344418a) @@ -1 +1 @@ -../../../dialin \ No newline at end of file +../../../dialin/dialin \ No newline at end of file Index: shared/scripts/names.py =================================================================== diff -u -r1462b91c2ed482c9ad78fafb68953426189a5b6f -r6bb43117bca2673c5de877f5b70b094da344418a --- shared/scripts/names.py (.../names.py) (revision 1462b91c2ed482c9ad78fafb68953426189a5b6f) +++ shared/scripts/names.py (.../names.py) (revision 6bb43117bca2673c5de877f5b70b094da344418a) @@ -11,7 +11,7 @@ o_Gui_MainView = { "type": "Gui::MainView" } # Modal Dialog -o_modalDialog = {"container": o_Overlay , "id": "_backgroundRect", "type": "Rectangle", "unnamed": 1, "visible": True} +o_modalDialog = {"container": o_Overlay , "id": "_backgroundRect", "type": "Rectangle"} o_treatmentHome = {"container": o_QQuickView , "id": "_treatmentHome" , "type": "TreatmentHome", "unnamed": 1, "visible": True} o_treatmentHome_backgroung = {"container": o_treatmentHome, "id": "_backgroundRect" , "type": "Rectangle" , "unnamed": 1, "visible": True} o_treatmentHome_startTreatment = {"container": o_treatmentHome, "id": "_startTreatmentRect" , "type": "TouchRect" , "unnamed": 1, "visible": True} @@ -67,15 +67,15 @@ #alarm list minimize and maximize button o_alarm_list_minimize_maximize_button = {"container": o_Overlay, "id": "_image", "source": "qrc:/images/iList", "type": "Image", "unnamed": 1, "visible": True} #generated alarm id -o_alarm_id = {"container": o_Overlay, "type": "Text", "unnamed": 1, "visible": True} +o_alarm_id_text = {"container": o_Overlay, "type": "Text", "id": "_text"} #generated alarm message -o_alarm_message = {"container": o_Overlay, "id": "_itemsValue", "type": "Text", "unnamed": 1, "visible": True} +o_alarm_message = {"container": o_Overlay, "type": "Text", "id": "_itemsValue"} #This is intermittent #list alarm messages -o_alarm_list = {"container": o_Overlay, "id": "_grid", "type": "Grid", "unnamed": 1, "visible": True} +o_alarm_list = {"container": o_Overlay, "id": "_grid", "type": "Grid"} #Rejected alarm list -o_rejected_alarm_list_msg = {"container": o_Overlay, "id": "_desc", "objectName": "_NotificationDialog_Description", "type": "Text", "visible": True} +o_rejected_alarm_list_msg = {"container": o_Overlay, "id": "_desc", "objectName": "_NotificationDialog_Description", "type": "Text"} #Alarm list title text -o_alarm_title_text = {"container": o_Overlay, "id": "_title", "type": "Text", "unnamed": 1, "visible": True} +o_alarm_title_text = {"container": o_Overlay, "id": "_title", "type": "Text"} # Also bar title text #Alarm dialogue o_alarm_dialogue_box_msg = {"container": o_Overlay, "id": "_desc", "objectName": "_NotificationDialog_Description", "type": "Text", "visible": True} #alarm dialog @@ -89,20 +89,21 @@ o_alarm_button_row = {"container": o_alarm_dialog_content , "id" : "_buttonGroup" , "type": "Row" } o_alarm_button_resume = {"container": o_Overlay , "id" : "_resumeTouchRect" , "type": "TouchRect" } o_resume_mouse_Area = {"container": o_Overlay, "id": "_mouseArea", "occurrence": 3, "type": "MouseArea", "unnamed": 1, "visible": True} -o_resume_button_mouse_Area = {"container": o_Overlay, "id": "_mouseArea", "occurrence": 4, "type": "MouseArea", "unnamed": 1, "visible": False} +o_resume_button_mouse_Area = {"container": o_Overlay, "id": "_mouseArea", "occurrence": 4, "type": "MouseArea"} o_alarm_button_rinseback = {"container": o_Overlay , "id" : "_rinsebackTouchRect" , "type": "TouchRect" } -o_rinseback_mouse_area = {"container": o_Overlay, "id": "_mouseArea", "occurrence": 5, "type": "MouseArea", "unnamed": 1, "visible": False} -o_rinseback_button_mouse_area = {"container": o_Overlay, "id": "_mouseArea", "occurrence": 4, "type": "MouseArea", "unnamed": 1, "visible": True} +o_rinseback_mouse_area = {"container": o_Overlay, "id": "_mouseArea", "occurrence": 5, "type": "MouseArea"} +o_rinseback_button_mouse_area = {"container": o_Overlay, "id": "_mouseArea", "occurrence": 4, "type": "MouseArea"} o_alarm_button_end = {"container": o_Overlay , "id" : "_endTouchRect" , "type": "TouchRect" } o_end_mouse_area = {"container": o_Overlay, "id": "_mouseArea", "occurrence": 5, "type": "MouseArea", "unnamed": 1, "visible": True} -o_end_button_mouse_area = {"container": o_Overlay, "id": "_mouseArea", "occurrence": 6, "type": "MouseArea", "unnamed": 1, "visible": False} +o_end_button_mouse_area = {"container": o_Overlay, "id": "_mouseArea", "occurrence": 6, "type": "MouseArea"} o_alarm_button_ok = {"container": o_Overlay , "id" : "_okTouchRect" , "type": "TouchRect" } o_ok_mouse_area = {"container": o_Overlay, "id": "_mouseArea", "occurrence": 6, "type": "MouseArea", "unnamed": 1, "visible": True} -o_ok_button_mouse_area = {"container": o_Overlay, "id": "_mouseArea", "occurrence": 3, "type": "MouseArea", "unnamed": 1, "visible": True} +o_ok_button_mouse_area = {"container": o_Overlay, "id": "_mouseArea", "occurrence": 3, "type": "MouseArea"} o_alarm_text_description = {"container": o_alarm_dialog_content , "id" : "_desc" , "type": "Text" } o_alarm_bar = {"container": o_QQuickView , "id" : "_alarmBar" , "type": "NotificationBar" } o_alarm_bar_text = {"container": o_alarm_bar , "id" : "_text" , "type": "Text" } -o_alarm_bar_mute_img = {"container": o_alarm_bar , "id" : "_image" , "type": "Image", "unnamed": 1, "visible": True} +o_alarm_screen_id = {"container": o_Overlay , "id": "_alarmID" , "type": "Text" } +o_alarm_bar_mute_img = {"container": o_alarm_bar , "id" : "_image" , "type": "Image" } o_alarm_bar_mute_min = {"container": o_alarm_bar , "id" : "_hourText" , "type": "Text" } o_alarm_bar_mute_sec = {"container": o_alarm_bar , "id" : "_minuteText" , "type": "Text" } o_alarm_bar_maximize = {"container": o_alarm_bar , "id" : "_updownButton" , "type": "UpDownButton" } @@ -187,7 +188,7 @@ o_ultrafiltration_volume_text = {"container": o_Overlay, "text": "ULTRAFILTRATION VOLUME (L)", "type": "Text", "unnamed": 1, "visible": True} o_ultrafiltration_closeButton = {"container": o_Overlay, "id": "_closeButton", "type": "CloseButton", "unnamed": 1, "visible": True} o_backbutton_backbutton = {"container": o_Overlay, "id": "_backButton", "type": "BackButton", "unnamed": 1, "visible": True} -o_notificationbar_response = {"container": o_Overlay, "objectName": "NotificationBar", "type": "NotificationBar", "visible": True} +o_notificationbar_response = {"container": o_Overlay, "objectName": "NotificationBar", "type": "NotificationBarSmall"} o_ultrafiltration_pause_btn = {"container": o_Overlay, "text": "PAUSE ULTRAFILTRATION", "type": "Text", "unnamed": 1, "visible": True} o_ultrafiltration_resume_btn = {"container": o_Overlay, "text": "RESUME ULTRAFILTRATION", "type": "Text", "unnamed": 1, "visible": True} o_ultrafiltration_back_btn = {"container": o_Overlay, "text": "BACK", "type": "Text", "unnamed": 1, "visible": True} @@ -246,7 +247,7 @@ o_PreTreatmentUltrafiltration_Ultrafiltration_Setup_Text = {"container": o_pretreatmentConnectionStack_PreTreatmentUltrafiltration_PreTreatmentUltrafiltration, "text": "Ultrafiltration Setup", "type": "Text", "unnamed": 1, "visible": True} o_PreTreatmentUltrafiltration_CONFIRM_Text = {"container": o_pretreatmentConnectionStack_PreTreatmentUltrafiltration_PreTreatmentUltrafiltration, "text": "CONFIRM", "type": "Text", "unnamed": 1, "visible": True} o_PreTreatmentConnectionStack_PreTreatmentBase_TreatmentFlowBase_2 = {"container": o_PreTreatmentStack_pretreatmentConnectionStack_PreTreatmentConnectionStack, "objectName": "_PreTreatmentBase", "type": "TreatmentFlowBase", "visible": True} -o_PreTreatmentbase_skip_text = {"container": o_PreTreatmentConnectionStack_PreTreatmentBase_TreatmentFlowBase_2, "text": "SKIP", "type": "Text", "unnamed": 1, "visible": True} +o_PreTreatmentbase_skip_text = {"container": o_PreTreatmentConnectionStack_PreTreatmentBase_TreatmentFlowBase_2, "text": "SKIP", "type": "Text"} #patient connection BP/HR section part o_PreTreatmentBase_Patient_Connection_Text = {"container": o_PreTreatmentConnectionStack_PreTreatmentBase_TreatmentFlowBase_2, "text": "Patient Connection", "type": "Text", "unnamed": 1, "visible": True} @@ -272,7 +273,7 @@ o_patient_connection_PreTreatmentBase_leftImage_Image = {"container": o_PreTreatmentConnectionStack_PreTreatmentBase_TreatmentFlowBase_2, "id": "_leftImage", "source": "qrc:/images/iArrowLeft", "type": "Image", "unnamed": 1, "visible": True} o_PreTreatmentUltrafiltration_Indicators = {"container": o_pretreatmentConnectionStack_PreTreatmentUltrafiltration_PreTreatmentUltrafiltration, "id": "_nextStepsBullet", "type": "StepBullet", "unnamed": 1, "visible": True} o_PreTreatmentFlowBase_Indicators = {"container":o_PreTreatmentConnectionStack_PreTreatmentBase_TreatmentFlowBase_2, "id": "_nextStepsBullet", "type": "StepBullet", "unnamed": 1, "visible": True} -o_PreTreatmentUltrafiltration_NotificationBar_NotificationBar = {"container": o_PreTreatmentStack_pretreatmentConnectionStack_PreTreatmentConnectionStack, "objectName": "NotificationBar", "type": "NotificationBar", "visible": True} +o_PreTreatmentUltrafiltration_NotificationBar_NotificationBar = {"container": o_PreTreatmentStack_pretreatmentConnectionStack_PreTreatmentConnectionStack, "objectName": "NotificationBar", "type": "NotificationBarSmall", "visible": True} o_PreTreatmentBase_nextStepsBullet_StepBullet = {"container": o_PreTreatmentConnectionStack_PreTreatmentBase_TreatmentFlowBase_2, "id": "_nextStepsBullet", "occurrence": 7, "type": "StepBullet", "unnamed": 1, "visible": True} o_PreTreatmentBase_BACK_Text = {"container": o_PreTreatmentConnectionStack_PreTreatmentBase_TreatmentFlowBase_2, "text": "BACK", "type": "Text", "unnamed": 1, "visible": True} o_PreTreatmentBase_CONFIRM_Text_2 = {"container":o_PreTreatmentConnectionStack_PreTreatmentBase_TreatmentFlowBase_2, "text": "CONFIRM", "type": "Text", "unnamed": 1, "visible": True} @@ -501,6 +502,7 @@ #check list text common object o_PreTreatmentStack_PreTreatmentPrimeStack_PreTreatmentPrimeStack = {"container": o_PreTreatmentStack_PreTreatmentStack, "objectName": "_PreTreatmentPrimeStack", "type": "PreTreatmentPrimeStack", "visible": True} o_pretreatmentPrimeStack_preTreatmentDisposablesPrime_TreatmentFlowBase = {"container": o_PreTreatmentStack_pretreatmentPrimeStack_PreTreatmentPrimeStack, "objectName": "_preTreatmentDisposablesPrime", "type": "TreatmentFlowBase", "visible": True} +#check_this_one o_self_test_dry_check_list_text = {"container": o_PreTreatmentStack_pretreatmentPrimeStack_PreTreatmentPrimeStack, "type": "Text", "unnamed": 1, "visible": True} #Priming title o_priming_title_text = {"container": o_PreTreatmentStack_PreTreatmentPrimeStack_PreTreatmentPrimeStack, "text": "Priming", "type": "Text", "unnamed": 1, "visible": True} @@ -925,7 +927,7 @@ o_disinfectChemical_headStepBullet_StepBullet = {"container": o_DisinfectStack_disinfectChemical_TreatmentFlowBase, "id": "_headStepBullet", "occurrence": 2, "type": "StepBullet", "unnamed": 1, "visible": True} o_disinfectChemical_gridSteps_Grid = {"container": o_DisinfectStack_disinfectChemical_TreatmentFlowBase, "id": "_gridSteps", "occurrence": 2, "type": "Grid", "unnamed": 1, "visible": True} o_disinfectChemical_confirmButton_TouchRect = {"container": o_DisinfectStack_disinfectChemical_TreatmentFlowBase, "objectName": "_confirmButton", "type": "TouchRect", "visible": True} -o_disinfectChemical_NotificationBar_NotificationBar = {"container": o_DisinfectStack_disinfectChemical_TreatmentFlowBase, "objectName": "NotificationBar", "type": "NotificationBar", "visible": True} +o_disinfectChemical_NotificationBar_NotificationBar = {"container": o_DisinfectStack_disinfectChemical_TreatmentFlowBase, "objectName": "NotificationBar", "type": "NotificationBarSmall", "visible": True} o_disinfectChemical_backButton_BackButton = {"container": o_DisinfectStack_disinfectChemical_TreatmentFlowBase, "objectName": "_backButton", "type": "BackButton", "visible": True} o_disinfectChemical_back_navigation = {"container": o_DisinfectStack_disinfectChemical_TreatmentFlowBase, "objectName": "_backButton", "type": "BackButton", "visible": True} o_disinfectHome_Heat_Disinfect = {"container": o_DisinfectStack_disinfectHome_TreatmentFlowBase, "text": "Heat Disinfect", "type": "Text", "unnamed": 1, "visible": True} @@ -938,19 +940,19 @@ o_disinfectHeat_nextStepsBullet_StepBullet = {"container": o_DisinfectStack_disinfectHeat_TreatmentFlowBase, "id": "_nextStepsBullet", "type": "StepBullet", "unnamed": 1, "visible": True} o_disinfectHeat_headStepBullet_StepBullet = {"container": o_DisinfectStack_disinfectHeat_TreatmentFlowBase, "id": "_headStepBullet", "type": "StepBullet", "unnamed": 1, "visible": True} o_disinfectHeat_confirmButton_TouchRect = {"container": o_DisinfectStack_disinfectHeat_TreatmentFlowBase, "objectName": "_confirmButton", "type": "TouchRect", "visible": True} -o_disinfectHeat_NotificationBar_NotificationBar = {"container": o_DisinfectStack_disinfectHeat_TreatmentFlowBase, "objectName": "NotificationBar", "type": "NotificationBar", "visible": True} +o_disinfectHeat_NotificationBar_NotificationBar = {"container": o_DisinfectStack_disinfectHeat_TreatmentFlowBase, "objectName": "NotificationBar", "type": "NotificationBarSmall", "visible": True} o_disinfectHeat_backButton_BackButton = {"container": o_DisinfectStack_disinfectHeat_TreatmentFlowBase, "objectName": "_backButton", "type": "BackButton", "visible": True} #Flush-Disinfection o_DisinfectStack_disinfectFlush_TreatmentFlowBase = {"container": o_DisinfectStack_DisinfectStack, "objectName": "_disinfectFlush", "type": "TreatmentFlowBase", "visible": True} o_disinfectFlush_Water_Flush_Text = {"container": o_DisinfectStack_disinfectFlush_TreatmentFlowBase, "occurrence": 2, "text": "Water Flush", "type": "Text", "unnamed": 1, "visible": True} o_disinfectFlush_nextStepsBullet_StepBullet = {"container": o_DisinfectStack_disinfectFlush_TreatmentFlowBase, "id": "_nextStepsBullet", "type": "StepBullet", "unnamed": 1, "visible": True} o_disinfectFlush_headStepBullet_StepBullet = {"container": o_DisinfectStack_disinfectFlush_TreatmentFlowBase, "id": "_headStepBullet", "type": "StepBullet", "unnamed": 1, "visible": True} o_disinfectFlush_confirmButton_TouchRect = {"container": o_DisinfectStack_disinfectFlush_TreatmentFlowBase, "objectName": "_confirmButton", "type": "TouchRect", "visible": True} -o_disinfectFlush_NotificationBar_NotificationBar = {"container": o_DisinfectStack_disinfectFlush_TreatmentFlowBase, "objectName": "NotificationBar", "type": "NotificationBar", "visible": True} +o_disinfectFlush_NotificationBar_NotificationBar = {"container": o_DisinfectStack_disinfectFlush_TreatmentFlowBase, "objectName": "NotificationBar", "type": "NotificationBarSmall", "visible": True} o_disinfectHome_Disinfection_Text = {"container": o_DisinfectStack_disinfectHome_TreatmentFlowBase, "occurrence": 2, "text": "Disinfection", "type": "Text", "unnamed": 1, "visible": True} o_disinfectFlush_backButton_BackButton = {"container": o_DisinfectStack_disinfectFlush_TreatmentFlowBase, "objectName": "_backButton", "type": "BackButton", "visible": True} #Home-Disinfection -o_MainHome_NotificationBar_NotificationBar = {"container": o_MainHome_MainHome, "objectName": "NotificationBar", "type": "NotificationBar", "visible": False} +o_MainHome_NotificationBar_NotificationBar = {"container": o_MainHome_MainHome, "objectName": "NotificationBar", "type": "NotificationBarSmall", "visible": False} o_disinfectHome_gridSteps_Grid = {"container": o_DisinfectStack_disinfectHome_TreatmentFlowBase, "id": "_gridSteps", "occurrence": 2, "type": "Grid", "unnamed": 1, "visible": True} o_disinfectHome_leftImage_Image = {"container": o_DisinfectStack_disinfectHome_TreatmentFlowBase, "id": "_leftImage", "source": "qrc:/images/iArrowLeft", "type": "Image", "unnamed": 1, "visible": True} o_disinfectHome_rightImage_Image = {"container": o_DisinfectStack_disinfectHome_TreatmentFlowBase, "id": "_rightImage", "source": "qrc:/images/iArrowRight", "type": "Image", "unnamed": 1, "visible": True} Index: tst_cloud_sync - treatment_screen/test.py =================================================================== diff -u -r8e0a85bb2892e136dba36c9280bb3c9076017781 -r6bb43117bca2673c5de877f5b70b094da344418a --- tst_cloud_sync - treatment_screen/test.py (.../test.py) (revision 8e0a85bb2892e136dba36c9280bb3c9076017781) +++ tst_cloud_sync - treatment_screen/test.py (.../test.py) (revision 6bb43117bca2673c5de877f5b70b094da344418a) @@ -26,7 +26,7 @@ from dialin.ui.hd_simulator import HDSimulator from dialin.ui.dg_simulator import DGSimulator from dialin.common.hd_defs import HDOpModes, PreTreatmentSubModes, PostTreatmentStates -from dialin.common.hd_defs import HDOpModes, HDOpSubModes +from dialin.common.hd_defs import HDOpModes, HDStandbyStates from dialin.utils.conversions import float_to_bytearray, integer_to_bytearray,unsigned_integer_to_bytearray dg_simulator = DGSimulator() hd_simulator = HDSimulator() @@ -360,7 +360,7 @@ device_credentials_response = utility.retrive_log_data() verify_log_response(device_credentials_response[0], DEVICE_DG_INFO_RESPONSE) - hd_simulator.cmd_send_hd_operation_mode(op_mode=HDOpModes.MODE_STAN.value, sub_mode=HDOpSubModes.STANDBY_WAIT_FOR_TREATMENT_STATE .value) + hd_simulator.cmd_send_hd_operation_mode(op_mode=HDOpModes.MODE_STAN.value, sub_mode=HDStandbyStates.STANDBY_WAIT_FOR_TREATMENT_STATE .value) set_data_in_cloud_sync_output_file(DEVICE_STATE_REQUEST) device_credentials_response = utility.retrive_log_data() verify_log_response(device_credentials_response[0], DEVICE_STATE_RESPONSE) Index: tst_cloud_sync_hd_opmodes/test.py =================================================================== diff -u -r536556f0a4507c2729bdab3e5d6aa5509b747009 -r6bb43117bca2673c5de877f5b70b094da344418a --- tst_cloud_sync_hd_opmodes/test.py (.../test.py) (revision 536556f0a4507c2729bdab3e5d6aa5509b747009) +++ tst_cloud_sync_hd_opmodes/test.py (.../test.py) (revision 6bb43117bca2673c5de877f5b70b094da344418a) @@ -19,7 +19,7 @@ from dialin.ui import utils from configuration import utility from configuration import config -from dialin.common.hd_defs import HDOpModes, HDOpSubModes +from dialin.common.hd_defs import HDOpModes, HDStandbyStates hd_simulator = HDSimulator() @@ -44,7 +44,7 @@ @message_id 1004 - to send device credentials from UI2CS """ test.startSection("Verifying message id, opmode, submode for Intialisation and POST mode screen") - hd_simulator.cmd_send_hd_operation_mode(op_mode=HDOpModes.MODE_INIT.value, sub_mode=HDOpSubModes.STANDBY_WAIT_FOR_TREATMENT_STATE .value) + hd_simulator.cmd_send_hd_operation_mode(op_mode=HDOpModes.MODE_INIT.value, sub_mode=HDStandbyStates.STANDBY_WAIT_FOR_TREATMENT_STATE .value) utils.waitForGUI(1) test.log("Initial mode") retrive_log_data_lines = 2 @@ -56,7 +56,7 @@ test.startSection("Verifying message id, opmode, submode for Standby mode screen") - hd_simulator.cmd_send_hd_operation_mode(op_mode=HDOpModes.MODE_STAN.value, sub_mode=HDOpSubModes.STANDBY_WAIT_FOR_TREATMENT_STATE .value) + hd_simulator.cmd_send_hd_operation_mode(op_mode=HDOpModes.MODE_STAN.value, sub_mode=HDStandbyStates.STANDBY_WAIT_FOR_TREATMENT_STATE .value) utils.waitForGUI(1) test.log("Stand By mode") retrive_log_data_lines = 4 @@ -67,7 +67,7 @@ test.endSection() test.startSection("Verifying message id, opmode, submode for Treatment parameter mode screen") - hd_simulator.cmd_send_hd_operation_mode(op_mode=HDOpModes.MODE_TPAR.value, sub_mode=HDOpSubModes.STANDBY_WAIT_FOR_TREATMENT_STATE .value) + hd_simulator.cmd_send_hd_operation_mode(op_mode=HDOpModes.MODE_TPAR.value, sub_mode=HDStandbyStates.STANDBY_WAIT_FOR_TREATMENT_STATE .value) utils.waitForGUI(1) test.log("Treatment parameter mode") retrive_log_data_lines = 6 @@ -78,7 +78,7 @@ test.endSection() test.startSection("Verifying message id, opmode, submode for Pre -treatment mode screen") - hd_simulator.cmd_send_hd_operation_mode(op_mode=HDOpModes.MODE_PRET.value, sub_mode=HDOpSubModes.STANDBY_WAIT_FOR_TREATMENT_STATE .value) + hd_simulator.cmd_send_hd_operation_mode(op_mode=HDOpModes.MODE_PRET.value, sub_mode=HDStandbyStates.STANDBY_WAIT_FOR_TREATMENT_STATE .value) utils.waitForGUI(1) test.log("Pre - Treatment mode") retrive_log_data_lines = 8 @@ -89,7 +89,7 @@ test.endSection() test.startSection("Verifying message id, opmode, submode for Treatment mode screen") - hd_simulator.cmd_send_hd_operation_mode(op_mode=HDOpModes.MODE_TREA.value, sub_mode=HDOpSubModes.STANDBY_WAIT_FOR_TREATMENT_STATE .value) + hd_simulator.cmd_send_hd_operation_mode(op_mode=HDOpModes.MODE_TREA.value, sub_mode=HDStandbyStates.STANDBY_WAIT_FOR_TREATMENT_STATE .value) utils.waitForGUI(1) test.log("Treatment mode") retrive_log_data_lines = 10 @@ -100,7 +100,7 @@ test.endSection() test.startSection("Verifying message id, opmode, submode for Post treatment mode screen") - hd_simulator.cmd_send_hd_operation_mode(op_mode=HDOpModes.MODE_POST.value, sub_mode=HDOpSubModes.STANDBY_WAIT_FOR_TREATMENT_STATE .value) + hd_simulator.cmd_send_hd_operation_mode(op_mode=HDOpModes.MODE_POST.value, sub_mode=HDStandbyStates.STANDBY_WAIT_FOR_TREATMENT_STATE .value) utils.waitForGUI(1) test.log("Post - treatment mode") retrive_log_data_lines = 12 @@ -111,7 +111,7 @@ test.endSection() test.startSection("Verifying message id, opmode, submode for Illegal transition screen") - hd_simulator.cmd_send_hd_operation_mode(op_mode=HDOpModes.MODE_NLEG.value, sub_mode=HDOpSubModes.STANDBY_WAIT_FOR_TREATMENT_STATE .value) + hd_simulator.cmd_send_hd_operation_mode(op_mode=HDOpModes.MODE_NLEG.value, sub_mode=HDStandbyStates.STANDBY_WAIT_FOR_TREATMENT_STATE .value) utils.waitForGUI(1) test.log ("Illegal Transition") retrive_log_data_lines = 14 @@ -122,7 +122,7 @@ test.endSection() test.startSection("Verifying message id, opmode, submode for Fault mode screen") - hd_simulator.cmd_send_hd_operation_mode(op_mode=HDOpModes.MODE_FAUL.value, sub_mode=HDOpSubModes.STANDBY_WAIT_FOR_TREATMENT_STATE.value) + hd_simulator.cmd_send_hd_operation_mode(op_mode=HDOpModes.MODE_FAUL.value, sub_mode=HDStandbyStates.STANDBY_WAIT_FOR_TREATMENT_STATE.value) utils.waitForGUI(1) test.log("Initial mode") retrive_log_data_lines = 16 @@ -133,7 +133,7 @@ test.endSection() test.startSection("Verifying message id, opmode, submode for Service mode screen") - hd_simulator.cmd_send_hd_operation_mode(op_mode=HDOpModes.MODE_SERV.value, sub_mode=HDOpSubModes.STANDBY_WAIT_FOR_TREATMENT_STATE .value) + hd_simulator.cmd_send_hd_operation_mode(op_mode=HDOpModes.MODE_SERV.value, sub_mode=HDStandbyStates.STANDBY_WAIT_FOR_TREATMENT_STATE .value) utils.waitForGUI(1) test.log("Service mode") retrive_log_data_lines = 18 Index: tst_dialin_logs/test.py =================================================================== diff -u -r0f739e0207d288d3386a60a0bd62d56762ab5b41 -r6bb43117bca2673c5de877f5b70b094da344418a --- tst_dialin_logs/test.py (.../test.py) (revision 0f739e0207d288d3386a60a0bd62d56762ab5b41) +++ tst_dialin_logs/test.py (.../test.py) (revision 6bb43117bca2673c5de877f5b70b094da344418a) @@ -27,7 +27,7 @@ from configuration import utility from configuration import config from dialin.common.msg_ids import MsgIds -from dialin.common.hd_defs import HDOpSubModes, HDOpModes +from dialin.common.hd_defs import HDStandbyStates, HDOpModes 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, bytearray_to_value Index: tst_disinfection/test.py =================================================================== diff -u -r1462b91c2ed482c9ad78fafb68953426189a5b6f -r6bb43117bca2673c5de877f5b70b094da344418a --- tst_disinfection/test.py (.../test.py) (revision 1462b91c2ed482c9ad78fafb68953426189a5b6f) +++ tst_disinfection/test.py (.../test.py) (revision 6bb43117bca2673c5de877f5b70b094da344418a) @@ -22,7 +22,7 @@ from configuration import utility from dialin.common.dg_defs import DGHeatDisinfectStates, DGChemicalDisinfectStates, DGFlushStates from dialin.utils.conversions import integer_to_bytearray, unsigned_integer_to_bytearray -from dialin.common.hd_defs import HDOpSubModes, HDOpModes +from dialin.common.hd_defs import HDStandbyStates, HDOpModes from posix import utime @@ -195,7 +195,7 @@ @return: None """ test.startSection("Verification of Disinfection from settings path.") - hd_simulator.cmd_set_hd_operation_mode_data(HDOpModes.MODE_STAN.value,HDOpSubModes.STANDBY_WAIT_FOR_TREATMENT_STATE.value) + hd_simulator.cmd_set_hd_operation_mode_data(HDOpModes.MODE_STAN.value,HDStandbyStates.STANDBY_WAIT_FOR_TREATMENT_STATE.value) mouseClick(waitForObject(names.o_touchRect2_TouchRect)) test.log("User is navigated to DG Cleaning from settings") @@ -216,7 +216,7 @@ test.log("User clicked on 'DG Cleaning' button -> Message ID : 154") mouseClick(waitForObject(names.o_SettingsBase_image_Image)) - hd_simulator.cmd_set_hd_operation_mode_data(HDOpModes.MODE_STAN.value,HDOpSubModes.STANDBY_WAIT_FOR_DISINFECT_STATE.value) + hd_simulator.cmd_set_hd_operation_mode_data(HDOpModes.MODE_STAN.value,HDStandbyStates.STANDBY_WAIT_FOR_DISINFECT_STATE.value) utils.waitForGUI(1) test.compare(waitForObject(names.o_disinfectHome_backButton_BackButton).text.text, config.BACK_TEXT, "Message : 154 is verified from UI to HD") @@ -232,7 +232,7 @@ @return: None """ test.startSection("Verification of chemical disinfection.") - hd_simulator.cmd_set_hd_operation_mode_data(HDOpModes.MODE_STAN.value,HDOpSubModes.STANDBY_WAIT_FOR_DISINFECT_STATE.value) + hd_simulator.cmd_set_hd_operation_mode_data(HDOpModes.MODE_STAN.value,HDStandbyStates.STANDBY_WAIT_FOR_DISINFECT_STATE.value) mouseClick(waitForObject(names.o_disinfectHome_Chemical_Disinfect)) utility.verify_page_step_indicator_for_disinfect(DISINFECT_TREATMENT_OBJECT['Chemical'], config.DISINFECT_TREATMENT_ID, 1, config.CHEMICAL_DISINFECT_TREATMENT_SCREENS) @@ -271,7 +271,7 @@ @return: None """ test.startSection("Verification of heat disinfection.") - hd_simulator.cmd_set_hd_operation_mode_data(HDOpModes.MODE_STAN.value,HDOpSubModes.STANDBY_WAIT_FOR_DISINFECT_STATE.value) + hd_simulator.cmd_set_hd_operation_mode_data(HDOpModes.MODE_STAN.value,HDStandbyStates.STANDBY_WAIT_FOR_DISINFECT_STATE.value) mouseClick(waitForObject(names.o_disinfectHome_Heat_Disinfect)) utility.verify_page_step_indicator_for_disinfect(DISINFECT_TREATMENT_OBJECT['Heat'],config.DISINFECT_TREATMENT_ID, 1, config.HEAT_DISINFECT_TREATMENT_SCREENS) @@ -299,7 +299,7 @@ @return: None """ test.startSection("Verification of Water Flush.") - hd_simulator.cmd_set_hd_operation_mode_data(HDOpModes.MODE_STAN.value,HDOpSubModes.STANDBY_WAIT_FOR_DISINFECT_STATE.value) + hd_simulator.cmd_set_hd_operation_mode_data(HDOpModes.MODE_STAN.value,HDStandbyStates.STANDBY_WAIT_FOR_DISINFECT_STATE.value) mouseClick(waitForObject(names.o_disinfectHome_TouchRect)) utility.verify_page_step_indicator_for_disinfect(DISINFECT_TREATMENT_OBJECT['Flush'],config.DISINFECT_TREATMENT_ID, 1, config.FLUSH_DISINFECT_TREATMENT_SCREENS) Index: tst_instructions_poc/test.py =================================================================== diff -u -r0778c9cc04a3414612e79d1bbfe7c1aebb56c1c3 -r6bb43117bca2673c5de877f5b70b094da344418a --- tst_instructions_poc/test.py (.../test.py) (revision 0778c9cc04a3414612e79d1bbfe7c1aebb56c1c3) +++ tst_instructions_poc/test.py (.../test.py) (revision 6bb43117bca2673c5de877f5b70b094da344418a) @@ -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 HDOpModes, HDOpSubModes, HDInitStates, PreTreatmentSubModes, PreTreatmentSampleWaterStates, PreTreatmentConsumableSelfTestStates, PreTreatmentNoCartSelfTestsStates, PreTreatmentCartridgeInstallStates, PreTreatmentDrySelfTestsStates, PreTreatmentPrimeStates, PreTreatmentRecircStates, PreTreatmentPatientConnectionStates, TreatmentStates, UFStates, SalineBolusStates, HeparinStates, TreatmentRinsebackStates, PreTreatmentRecircStates, TreatmentBloodPrimeStates, TreatmentEndStates, TreatmentStopStates, TreatmentDialysisStates +from dialin.common.hd_defs import HDOpModes, HDStandbyStates, HDInitStates, PreTreatmentSubModes, PreTreatmentSampleWaterStates, PreTreatmentConsumableSelfTestStates, PreTreatmentNoCartSelfTestStates, PreTreatmentCartridgeInstallStates, PreTreatmentDrySelfTestsStates, PreTreatmentPrimeStates, PreTreatmentRecircStates, PreTreatmentPatientConnectionStates, TreatmentStates, UFStates, SalineBolusStates, HeparinStates, TreatmentRinsebackStates, PreTreatmentRecircStates, TreatmentBloodPrimeStates, TreatmentEndStates, TreatmentStopStates, TreatmentDialysisStates from dialin.ui.utils import waitForGUI hd_simulator = HDSimulator() @@ -322,8 +322,8 @@ hd_simulator.cmd_set_hd_operation_mode_data(HDOpModes.MODE_PRET.value,PreTreatmentSampleWaterStates.SAMPLE_WATER_SETUP_STATE.value) test.startSection("Navigating to Pre-Treatment Sample screen") - hd_simulator.cmd_send_pre_treatment_state_data(sub_mode=HDOpSubModes.STANDBY_WAIT_FOR_TREATMENT_STATE.value, water_sample_state=PreTreatmentSampleWaterStates.SAMPLE_WATER_STATE.value,consumables_self_test_state=PreTreatmentConsumableSelfTestStates.CONSUMABLE_SELF_TESTS_INSTALL_STATE.value, - no_cartridge_self_test_state=PreTreatmentNoCartSelfTestsStates.NO_CART_SELF_TESTS_START_STATE.value,installation_state=PreTreatmentCartridgeInstallStates.CARTRIDGE_INSTALL_STATE.value, dry_self_test_state=PreTreatmentDrySelfTestsStates.DRY_SELF_TESTS_START_STATE.value, + hd_simulator.cmd_send_pre_treatment_state_data(sub_mode=HDStandbyStates.STANDBY_WAIT_FOR_TREATMENT_STATE.value, water_sample_state=PreTreatmentSampleWaterStates.SAMPLE_WATER_STATE.value,consumables_self_test_state=PreTreatmentConsumableSelfTestStates.CONSUMABLE_SELF_TESTS_INSTALL_STATE.value, + no_cartridge_self_test_state=PreTreatmentNoCartSelfTestStates.NO_CART_SELF_TESTS_START_STATE.value,installation_state=PreTreatmentCartridgeInstallStates.CARTRIDGE_INSTALL_STATE.value, dry_self_test_state=PreTreatmentDrySelfTestsStates.DRY_SELF_TESTS_START_STATE.value, prime_state=PreTreatmentPrimeStates.HD_PRIME_START_STATE.value,recirculate_state=PreTreatmentRecircStates.PRE_TREATMENT_RECIRC_STATE.value, patient_connection_state=PreTreatmentPatientConnectionStates.PATIENT_CONNECTION_STATE.value) index = verify_instruction_and_image("Water Sample",index = 0) index = verify_instruction_and_image("Water Sample Result",index = index) @@ -332,27 +332,27 @@ test.endSection() test.startSection("Navigating to Pre-Treatment Consumables screen") - hd_simulator.cmd_send_pre_treatment_state_data(sub_mode=HDOpSubModes.STANDBY_WAIT_FOR_DISINFECT_STATE.value, water_sample_state=PreTreatmentSampleWaterStates.SAMPLE_WATER_SETUP_STATE.value,consumables_self_test_state=PreTreatmentConsumableSelfTestStates.CONSUMABLE_SELF_TESTS_INSTALL_STATE.value, - no_cartridge_self_test_state=PreTreatmentNoCartSelfTestsStates.NO_CART_SELF_TESTS_START_STATE.value,installation_state=PreTreatmentCartridgeInstallStates.CARTRIDGE_INSTALL_STATE.value, dry_self_test_state=PreTreatmentDrySelfTestsStates.DRY_SELF_TESTS_START_STATE.value, + hd_simulator.cmd_send_pre_treatment_state_data(sub_mode=HDStandbyStates.STANDBY_WAIT_FOR_DISINFECT_STATE.value, water_sample_state=PreTreatmentSampleWaterStates.SAMPLE_WATER_SETUP_STATE.value,consumables_self_test_state=PreTreatmentConsumableSelfTestStates.CONSUMABLE_SELF_TESTS_INSTALL_STATE.value, + no_cartridge_self_test_state=PreTreatmentNoCartSelfTestStates.NO_CART_SELF_TESTS_START_STATE.value,installation_state=PreTreatmentCartridgeInstallStates.CARTRIDGE_INSTALL_STATE.value, dry_self_test_state=PreTreatmentDrySelfTestsStates.DRY_SELF_TESTS_START_STATE.value, prime_state=PreTreatmentPrimeStates.HD_PRIME_START_STATE.value,recirculate_state=PreTreatmentRecircStates.PRE_TREATMENT_RECIRC_STATE.value, patient_connection_state=PreTreatmentPatientConnectionStates.PATIENT_CONNECTION_STATE.value) index = verify_instruction_and_image("Consumables Installation",index = index) rightarrow_obj_names.pop(first_index) test.endSection() test.startSection("Method to navigate to create custom treatment to set all parameters") - hd_simulator.cmd_send_hd_operation_mode(op_mode = HDOpModes.MODE_TPAR.value , sub_mode = HDOpSubModes.STANDBY_START_STATE.value) + hd_simulator.cmd_send_hd_operation_mode(op_mode = HDOpModes.MODE_TPAR.value , sub_mode = HDStandbyStates.STANDBY_START_STATE.value) mouseClick(waitForObject(names.o_input_patient_id)) type(waitForObject(names.o_input_patient_id), "abcd") mouseClick(waitForObject(names.o_continue_button)) verify_create_custom_treatment_parameter() test.endSection() test.startSection("Navigating to Pre-Treatment Disposables screen") - hd_simulator.cmd_send_hd_operation_mode(op_mode = HDOpModes.MODE_PRET.value , sub_mode = HDOpSubModes.STANDBY_START_STATE.value) - hd_simulator.cmd_send_pre_treatment_state_data(sub_mode=HDOpSubModes.STANDBY_WAIT_FOR_DG_FLUSH_TO_START_STATE.value, + hd_simulator.cmd_send_hd_operation_mode(op_mode = HDOpModes.MODE_PRET.value , sub_mode = HDStandbyStates.STANDBY_START_STATE.value) + hd_simulator.cmd_send_pre_treatment_state_data(sub_mode=HDStandbyStates.STANDBY_WAIT_FOR_DG_FLUSH_TO_START_STATE.value, water_sample_state=PreTreatmentSampleWaterStates.SAMPLE_WATER_SETUP_STATE.value, consumables_self_test_state=PreTreatmentConsumableSelfTestStates.CONSUMABLE_SELF_TESTS_INSTALL_STATE.value, - no_cartridge_self_test_state=PreTreatmentNoCartSelfTestsStates.NO_CART_SELF_TESTS_START_STATE.value, + no_cartridge_self_test_state=PreTreatmentNoCartSelfTestStates.NO_CART_SELF_TESTS_START_STATE.value, installation_state=PreTreatmentCartridgeInstallStates.CARTRIDGE_INSTALL_STATE.value, dry_self_test_state=PreTreatmentDrySelfTestsStates.DRY_SELF_TESTS_START_STATE.value, prime_state=PreTreatmentPrimeStates.HD_PRIME_START_STATE.value, @@ -381,7 +381,7 @@ test.log("Navigating to Pre-Treatment Ultrafiltration screen") hd_simulator.cmd_send_pre_treatment_state_data(sub_mode=PreTreatmentSubModes.HD_PRE_TREATMENT_PATIENT_CONNECTION_STATE.value, water_sample_state=PreTreatmentSampleWaterStates.SAMPLE_WATER_SETUP_STATE.value,consumables_self_test_state=PreTreatmentConsumableSelfTestStates.CONSUMABLE_SELF_TESTS_INSTALL_STATE.value, - no_cartridge_self_test_state=PreTreatmentNoCartSelfTestsStates.NO_CART_SELF_TESTS_START_STATE.value, + no_cartridge_self_test_state=PreTreatmentNoCartSelfTestStates.NO_CART_SELF_TESTS_START_STATE.value, installation_state=PreTreatmentCartridgeInstallStates.CARTRIDGE_INSTALL_STATE.value, dry_self_test_state=PreTreatmentDrySelfTestsStates.DRY_SELF_TESTS_START_STATE.value, prime_state=PreTreatmentPrimeStates.HD_PRIME_START_STATE.value, Index: tst_main_treatment_heparin/test.py =================================================================== diff -u -r5c6792cd99a0c34a362a7d6ba8f12418327346d9 -r6bb43117bca2673c5de877f5b70b094da344418a --- tst_main_treatment_heparin/test.py (.../test.py) (revision 5c6792cd99a0c34a362a7d6ba8f12418327346d9) +++ tst_main_treatment_heparin/test.py (.../test.py) (revision 6bb43117bca2673c5de877f5b70b094da344418a) @@ -143,7 +143,7 @@ test.compare(str(waitForObjectExists(names.o_state6_heparin_state_empty_text).text), config.HEPARIN_SYRINGE_EMPTY_TEXT, utility.msg("Notification Message should be {}".format(config.HEPARIN_SYRINGE_EMPTY_TEXT))) utils.waitForGUI(1) - +#TODO def verify_the_rejection_msg(reason_id): """ Method to verify rejection messages Index: tst_main_treatment_ultrafiltration/test.py =================================================================== diff -u -raef5d2dd35d5e35f1f68dc937a5edba1d30e2351 -r6bb43117bca2673c5de877f5b70b094da344418a --- tst_main_treatment_ultrafiltration/test.py (.../test.py) (revision aef5d2dd35d5e35f1f68dc937a5edba1d30e2351) +++ tst_main_treatment_ultrafiltration/test.py (.../test.py) (revision 6bb43117bca2673c5de877f5b70b094da344418a) @@ -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 HDOpSubModes, TreatmentStates +from dialin.common.hd_defs import HDStandbyStates, TreatmentStates from configuration import config hd_simulator = HDSimulator() @@ -258,6 +258,7 @@ for rejection in range(1, config.NUM_OF_REQUEST_REJECT_REASONS + 1): hd_simulator.cmd_set_treatment_adjust_ultrafiltration_rejected(reason = rejection, state = uf_states) + utils.waitForGUI(0.5) rejection_message = waitForObjectExists(names.o_notificationbar_response) test.compare(rejection_message.text, config.REJECTION_REASON[rejection], "expected rejection {msg} displayed".format(msg=config.REJECTION_REASON[rejection])) @@ -321,7 +322,7 @@ startApplication(config.AUT_NAME) #navigate to dialysis state - hd_simulator.cmd_set_treatment_states_data(sub_mode=HDOpSubModes.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, + 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) Index: tst_main_treatment_vitals/test.py =================================================================== diff -u -r0ff57e2fc0e614eab98b8e9ce9b73a48419fc34b -r6bb43117bca2673c5de877f5b70b094da344418a --- tst_main_treatment_vitals/test.py (.../test.py) (revision 0ff57e2fc0e614eab98b8e9ce9b73a48419fc34b) +++ tst_main_treatment_vitals/test.py (.../test.py) (revision 6bb43117bca2673c5de877f5b70b094da344418a) @@ -18,9 +18,9 @@ from configuration import config, utility from dialin.ui import utils from dialin.ui.hd_simulator import HDSimulator -from dialin.common.hd_defs import PreTreatmentSubModes, HDOpModes, HDOpSubModes, PreTreatmentSampleWaterStates, PreTreatmentConsumableSelfTestStates, PreTreatmentNoCartSelfTestsStates, PreTreatmentCartridgeInstallStates, PreTreatmentDrySelfTestsStates, PreTreatmentPrimeStates, PreTreatmentRecircStates, PreTreatmentPatientConnectionStates, TreatmentStates, UFStates, SalineBolusStates, HeparinStates +from dialin.common.hd_defs import PreTreatmentSubModes, HDOpModes, HDStandbyStates, PreTreatmentSampleWaterStates, PreTreatmentConsumableSelfTestStates, PreTreatmentNoCartSelfTestStates, PreTreatmentCartridgeInstallStates, PreTreatmentDrySelfTestsStates, PreTreatmentPrimeStates, PreTreatmentRecircStates, PreTreatmentPatientConnectionStates, TreatmentStates, UFStates, SalineBolusStates, HeparinStates from time import strftime -from dialin.ui.utils import waitForGUI +# from dialin.ui.utils import waitForGUI hd_simulator = HDSimulator() @@ -273,6 +273,19 @@ utility.erase_entered_value(hr) test.endSection() +def clear_BP_and_HR_settings(): + #clearing systolic field + systolic = waitForObject(names.o_PreTreatmentBase_input_TextInput_2) + mouseClick(systolic) + utility.erase_entered_value(input_field=systolic) + #clear diastolic field + diastolic = waitForObject(names.o_PreTreatmentBase_input_TextInput_3) + mouseClick(diastolic) + utility.erase_entered_value(diastolic) + #Clearing HR field + hr = waitForObject(names.o_PreTreatmentBase_input_TextInput_4) + mouseClick(hr) + utility.erase_entered_value(hr) def verify_the_color_of_out_of_range(vital_parameter): """ @@ -573,6 +586,8 @@ Method to verify BP/HR section from patient connection. """ test.startSection("verification of BP/HR section from patient connection") + test.log("Clearing all fields") + clear_BP_and_HR_settings() test.compare(waitForObjectExists(names.o_PreTreatmentBase_BP_HR_Text).text, config.BP_HR_TEXT, "BP/HR title text should be :" + str(config.BP_HR_TEXT)) test.compare(waitForObjectExists(names.o_PreTreatmentbase_skip_text).text, config.SKIP_TEXT, "BP/HR button text should be " + str(config.SKIP_TEXT)) test.verify(waitForObjectExists(names.o_PreTreatmentbase_skip_text).enabled, "BP/HR button should enabled.") @@ -635,7 +650,7 @@ navigate to main treatment screen to reset vital """ test.startSection("Verify last read and interval of blood pressure and heart rate") - hd_simulator.cmd_send_hd_operation_mode(op_mode=HDOpModes.MODE_TPAR.value, sub_mode=HDOpSubModes.STANDBY_START_STATE.value) + hd_simulator.cmd_send_hd_operation_mode(op_mode=HDOpModes.MODE_TPAR.value, sub_mode=HDStandbyStates.STANDBY_START_STATE.value) mouseClick(waitForObject(names.o_input_patient_id)) type(waitForObject(names.o_input_patient_id), "abcd") mouseClick(waitForObject(names.o_continue_button)) @@ -644,9 +659,9 @@ utils.waitForGUI(1) hd_simulator.cmd_initiate_treatment_response(response=1, reason=0) - hd_simulator.cmd_send_hd_operation_mode(op_mode=HDOpModes.MODE_PRET.value , sub_mode=HDOpSubModes.STANDBY_START_STATE.value) + hd_simulator.cmd_send_hd_operation_mode(op_mode=HDOpModes.MODE_PRET.value , sub_mode=HDStandbyStates.STANDBY_START_STATE.value) hd_simulator.cmd_send_pre_treatment_state_data(sub_mode=PreTreatmentSubModes.HD_PRE_TREATMENT_PATIENT_CONNECTION_STATE.value, water_sample_state=PreTreatmentSampleWaterStates.SAMPLE_WATER_SETUP_STATE.value,consumables_self_test_state=PreTreatmentConsumableSelfTestStates.CONSUMABLE_SELF_TESTS_INSTALL_STATE.value, - no_cartridge_self_test_state=PreTreatmentNoCartSelfTestsStates.NO_CART_SELF_TESTS_START_STATE.value,installation_state=PreTreatmentCartridgeInstallStates.CARTRIDGE_INSTALL_STATE.value, dry_self_test_state=PreTreatmentDrySelfTestsStates.DRY_SELF_TESTS_START_STATE.value, + no_cartridge_self_test_state=PreTreatmentNoCartSelfTestStates.NO_CART_SELF_TESTS_START_STATE.value,installation_state=PreTreatmentCartridgeInstallStates.CARTRIDGE_INSTALL_STATE.value, dry_self_test_state=PreTreatmentDrySelfTestsStates.DRY_SELF_TESTS_START_STATE.value, prime_state=PreTreatmentPrimeStates.HD_PRIME_START_STATE.value,recirculate_state=PreTreatmentRecircStates.PRE_TREATMENT_RECIRC_STATE.value, patient_connection_state=PreTreatmentPatientConnectionStates.PATIENT_CONNECTION_STATE.value) hd_simulator.cmd_send_uf_treatment_response(accepted=True, reason=0, volume=0.00) @@ -758,17 +773,17 @@ 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_parameter_ranges(min_treatment_duration=0, max_treatment_duration=480, min_uf_volume=0.01, max_uf_volume=8.00, min_dialysate_flow_rate=100, max_dialysate_flow_rate=500) - + verify_vitals_pop_up_automatic_close_functionality() - + utils.waitForGUI(1) open_vitals_pop_up() verify_entered_valid_vital_entries_in_main_treatment_screen(sys_val=SYSTOLIC_PRESSSURE_120, dia_val=DIASTOLIC_PRESSSURE_80, heart_rate=HEART_RATE_VAL_101, save=True) - + 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) @@ -792,7 +807,7 @@ verify_ranges_of_vital(vital_parameter=config.SYSTOLIC_TEXT) verify_ranges_of_vital(vital_parameter=config.DIASTOLIC_TEXT) verify_ranges_of_vital(vital_parameter=config.HEART_RATE_TITLE) - + verify_the_color_of_out_of_range(vital_parameter=config.SYSTOLIC_TEXT) verify_the_color_of_out_of_range(vital_parameter=config.DIASTOLIC_TEXT) verify_the_color_of_out_of_range(vital_parameter=config.HEART_RATE_TITLE) Index: tst_post_treatment/test.py =================================================================== diff -u -r07ccc340a76fd499a1e6912dbe7124677c88eded -r6bb43117bca2673c5de877f5b70b094da344418a --- tst_post_treatment/test.py (.../test.py) (revision 07ccc340a76fd499a1e6912dbe7124677c88eded) +++ tst_post_treatment/test.py (.../test.py) (revision 6bb43117bca2673c5de877f5b70b094da344418a) @@ -28,7 +28,7 @@ from configuration import config from dialin.ui.hd_simulator import HDSimulator from configuration import utility -from dialin.common.hd_defs import HDOpModes, HDOpSubModes, PostTreatmentStates +from dialin.common.hd_defs import HDOpModes, HDStandbyStates, PostTreatmentStates hd_simulator = HDSimulator() @@ -272,7 +272,7 @@ Method to fetch patient ID from create custom treatment in post treatment review """ test.startSection("Method for navigate to create custom treatment to set all parameters ") - hd_simulator.cmd_send_hd_operation_mode(op_mode=HDOpModes.MODE_TPAR.value, sub_mode = HDOpSubModes.STANDBY_START_STATE.value) + hd_simulator.cmd_send_hd_operation_mode(op_mode=HDOpModes.MODE_TPAR.value, sub_mode = HDStandbyStates.STANDBY_START_STATE.value) mouseClick(waitForObject(names.o_input_patient_id)) type(waitForObject(names.o_input_patient_id), patient_id) mouseClick(waitForObject(names.o_continue_button)) Index: tst_pre_treatment_consumables/test.py =================================================================== diff -u -rb69ec7638a80d1d44b522b778155189b9698884c -r6bb43117bca2673c5de877f5b70b094da344418a --- tst_pre_treatment_consumables/test.py (.../test.py) (revision b69ec7638a80d1d44b522b778155189b9698884c) +++ tst_pre_treatment_consumables/test.py (.../test.py) (revision 6bb43117bca2673c5de877f5b70b094da344418a) @@ -23,7 +23,7 @@ from dialin.ui import utils from configuration import config, utility from dialin.ui.hd_simulator import HDSimulator -from dialin.common.hd_defs import HDOpModes, HDOpSubModes, PreTreatmentSampleWaterStates, PreTreatmentConsumableSelfTestStates, PreTreatmentNoCartSelfTestsStates, PreTreatmentCartridgeInstallStates, PreTreatmentDrySelfTestsStates, PreTreatmentPrimeStates, PreTreatmentRecircStates, PreTreatmentPatientConnectionStates, PreTreatmentModeStates +from dialin.common.hd_defs import HDOpModes, HDStandbyStates, PreTreatmentSampleWaterStates, PreTreatmentConsumableSelfTestStates, PreTreatmentNoCartSelfTestStates, PreTreatmentCartridgeInstallStates, PreTreatmentDrySelfTestsStates, PreTreatmentPrimeStates, PreTreatmentRecircStates, PreTreatmentPatientConnectionStates, PreTreatmentModeStates hd_simulator = HDSimulator() @@ -37,8 +37,8 @@ @param mode - (int) pre treatment state """ hd_simulator.cmd_set_hd_operation_mode_data(HDOpModes.MODE_PRET.value,PreTreatmentConsumableSelfTestStates.CONSUMABLE_SELF_TESTS_INSTALL_STATE.value) - hd_simulator.cmd_send_pre_treatment_state_data(sub_mode=HDOpSubModes.STANDBY_WAIT_FOR_DISINFECT_STATE.value, water_sample_state=PreTreatmentSampleWaterStates.SAMPLE_WATER_SETUP_STATE.value,consumables_self_test_state=PreTreatmentConsumableSelfTestStates.CONSUMABLE_SELF_TESTS_INSTALL_STATE.value, - no_cartridge_self_test_state=PreTreatmentNoCartSelfTestsStates.NO_CART_SELF_TESTS_START_STATE.value,installation_state=PreTreatmentCartridgeInstallStates.CARTRIDGE_INSTALL_STATE.value, dry_self_test_state=PreTreatmentDrySelfTestsStates.DRY_SELF_TESTS_START_STATE.value, + hd_simulator.cmd_send_pre_treatment_state_data(sub_mode=HDStandbyStates.STANDBY_WAIT_FOR_DISINFECT_STATE.value, water_sample_state=PreTreatmentSampleWaterStates.SAMPLE_WATER_SETUP_STATE.value,consumables_self_test_state=PreTreatmentConsumableSelfTestStates.CONSUMABLE_SELF_TESTS_INSTALL_STATE.value, + no_cartridge_self_test_state=PreTreatmentNoCartSelfTestStates.NO_CART_SELF_TESTS_START_STATE.value,installation_state=PreTreatmentCartridgeInstallStates.CARTRIDGE_INSTALL_STATE.value, dry_self_test_state=PreTreatmentDrySelfTestsStates.DRY_SELF_TESTS_START_STATE.value, prime_state=PreTreatmentPrimeStates.HD_PRIME_START_STATE.value,recirculate_state=PreTreatmentRecircStates.PRE_TREATMENT_RECIRC_STATE.value, patient_connection_state=PreTreatmentPatientConnectionStates.PATIENT_CONNECTION_STATE.value) @@ -110,8 +110,8 @@ test.startSection("Check and busy indicator shouldn't be present initially") for states in range (PreTreatmentConsumableSelfTestStates.NUM_OF_CONSUMABLE_SELF_TESTS_STATES.value): test.startSection("consumable self test state =" + PreTreatmentConsumableSelfTestStates(states).name) - hd_simulator.cmd_send_pre_treatment_state_data(sub_mode=HDOpSubModes.STANDBY_WAIT_FOR_DISINFECT_STATE.value, water_sample_state=PreTreatmentSampleWaterStates.SAMPLE_WATER_SETUP_STATE.value,consumables_self_test_state=PreTreatmentConsumableSelfTestStates.CONSUMABLE_SELF_TESTS_BICARB_PUMP_CHECK_STATE.value, - no_cartridge_self_test_state=PreTreatmentNoCartSelfTestsStates.NO_CART_SELF_TESTS_START_STATE.value,installation_state=PreTreatmentCartridgeInstallStates.CARTRIDGE_INSTALL_STATE.value, dry_self_test_state=PreTreatmentDrySelfTestsStates.DRY_SELF_TESTS_START_STATE.value, + hd_simulator.cmd_send_pre_treatment_state_data(sub_mode=HDStandbyStates.STANDBY_WAIT_FOR_DISINFECT_STATE.value, water_sample_state=PreTreatmentSampleWaterStates.SAMPLE_WATER_SETUP_STATE.value,consumables_self_test_state=PreTreatmentConsumableSelfTestStates.CONSUMABLE_SELF_TESTS_BICARB_PUMP_CHECK_STATE.value, + no_cartridge_self_test_state=PreTreatmentNoCartSelfTestStates.NO_CART_SELF_TESTS_START_STATE.value,installation_state=PreTreatmentCartridgeInstallStates.CARTRIDGE_INSTALL_STATE.value, dry_self_test_state=PreTreatmentDrySelfTestsStates.DRY_SELF_TESTS_START_STATE.value, prime_state=PreTreatmentPrimeStates.HD_PRIME_START_STATE.value,recirculate_state=PreTreatmentRecircStates.PRE_TREATMENT_RECIRC_STATE.value, patient_connection_state=PreTreatmentPatientConnectionStates.PATIENT_CONNECTION_STATE.value) bicarb_indicator=utility.get_indicators(SCREEN_OBJ,config.BICARB_PUMP_CHECK_TEXT) acid_indicator=utility.get_indicators(SCREEN_OBJ,config.ACID_PUMP_CHECK_TEXT) @@ -122,8 +122,8 @@ test.startSection("Verification of Check and busy indicators") test.log("consumable self test state =" + PreTreatmentConsumableSelfTestStates.CONSUMABLE_SELF_TESTS_ACID_PUMP_CHECK_STATE.name) - hd_simulator.cmd_send_pre_treatment_state_data(sub_mode=HDOpSubModes.STANDBY_WAIT_FOR_DISINFECT_STATE.value, water_sample_state=PreTreatmentSampleWaterStates.SAMPLE_WATER_SETUP_STATE.value,consumables_self_test_state=PreTreatmentConsumableSelfTestStates.CONSUMABLE_SELF_TESTS_ACID_PUMP_CHECK_STATE.value, - no_cartridge_self_test_state=PreTreatmentNoCartSelfTestsStates.NO_CART_SELF_TESTS_START_STATE.value,installation_state=PreTreatmentCartridgeInstallStates.CARTRIDGE_INSTALL_STATE.value, dry_self_test_state=PreTreatmentDrySelfTestsStates.DRY_SELF_TESTS_START_STATE.value, + hd_simulator.cmd_send_pre_treatment_state_data(sub_mode=HDStandbyStates.STANDBY_WAIT_FOR_DISINFECT_STATE.value, water_sample_state=PreTreatmentSampleWaterStates.SAMPLE_WATER_SETUP_STATE.value,consumables_self_test_state=PreTreatmentConsumableSelfTestStates.CONSUMABLE_SELF_TESTS_ACID_PUMP_CHECK_STATE.value, + no_cartridge_self_test_state=PreTreatmentNoCartSelfTestStates.NO_CART_SELF_TESTS_START_STATE.value,installation_state=PreTreatmentCartridgeInstallStates.CARTRIDGE_INSTALL_STATE.value, dry_self_test_state=PreTreatmentDrySelfTestsStates.DRY_SELF_TESTS_START_STATE.value, prime_state=PreTreatmentPrimeStates.HD_PRIME_START_STATE.value,recirculate_state=PreTreatmentRecircStates.PRE_TREATMENT_RECIRC_STATE.value, patient_connection_state=PreTreatmentPatientConnectionStates.PATIENT_CONNECTION_STATE.value) bicarb_indicator=utility.get_indicators(SCREEN_OBJ,config.BICARB_PUMP_CHECK_TEXT) acid_indicator=utility.get_indicators(SCREEN_OBJ,config.ACID_PUMP_CHECK_TEXT) @@ -132,8 +132,8 @@ test.verify(acid_indicator[1].visible,"check indicator for acid pump should be present") test.log("consumable self test state =" + PreTreatmentConsumableSelfTestStates.CONSUMABLE_SELF_TESTS_COMPLETE_STATE.name) - hd_simulator.cmd_send_pre_treatment_state_data(sub_mode=HDOpSubModes.STANDBY_WAIT_FOR_DISINFECT_STATE.value, water_sample_state=PreTreatmentSampleWaterStates.SAMPLE_WATER_SETUP_STATE.value,consumables_self_test_state=PreTreatmentConsumableSelfTestStates.CONSUMABLE_SELF_TESTS_COMPLETE_STATE.value, - no_cartridge_self_test_state=PreTreatmentNoCartSelfTestsStates.NO_CART_SELF_TESTS_START_STATE.value,installation_state=PreTreatmentCartridgeInstallStates.CARTRIDGE_INSTALL_STATE.value, dry_self_test_state=PreTreatmentDrySelfTestsStates.DRY_SELF_TESTS_START_STATE.value, + hd_simulator.cmd_send_pre_treatment_state_data(sub_mode=HDStandbyStates.STANDBY_WAIT_FOR_DISINFECT_STATE.value, water_sample_state=PreTreatmentSampleWaterStates.SAMPLE_WATER_SETUP_STATE.value,consumables_self_test_state=PreTreatmentConsumableSelfTestStates.CONSUMABLE_SELF_TESTS_COMPLETE_STATE.value, + no_cartridge_self_test_state=PreTreatmentNoCartSelfTestStates.NO_CART_SELF_TESTS_START_STATE.value,installation_state=PreTreatmentCartridgeInstallStates.CARTRIDGE_INSTALL_STATE.value, dry_self_test_state=PreTreatmentDrySelfTestsStates.DRY_SELF_TESTS_START_STATE.value, prime_state=PreTreatmentPrimeStates.HD_PRIME_START_STATE.value,recirculate_state=PreTreatmentRecircStates.PRE_TREATMENT_RECIRC_STATE.value, patient_connection_state=PreTreatmentPatientConnectionStates.PATIENT_CONNECTION_STATE.value) bicarb_indicator=utility.get_indicators(SCREEN_OBJ,config.BICARB_PUMP_CHECK_TEXT) acid_indicator=utility.get_indicators(SCREEN_OBJ,config.ACID_PUMP_CHECK_TEXT) Index: tst_pre_treatment_disposables/test.py =================================================================== diff -u -r6d88f1200865d51375bb323667e8204d1745a3cb -r6bb43117bca2673c5de877f5b70b094da344418a --- tst_pre_treatment_disposables/test.py (.../test.py) (revision 6d88f1200865d51375bb323667e8204d1745a3cb) +++ tst_pre_treatment_disposables/test.py (.../test.py) (revision 6bb43117bca2673c5de877f5b70b094da344418a) @@ -19,7 +19,7 @@ from dialin.ui import utils from dialin.ui.hd_simulator import HDSimulator from dialin.ui.dg_simulator import DGSimulator -from dialin.common.hd_defs import HDOpModes, HDOpSubModes, PreTreatmentSampleWaterStates, PreTreatmentConsumableSelfTestStates, PreTreatmentNoCartSelfTestsStates, PreTreatmentCartridgeInstallStates, PreTreatmentDrySelfTestsStates, PreTreatmentPrimeStates, PreTreatmentRecircStates, PreTreatmentPatientConnectionStates +from dialin.common.hd_defs import HDOpModes, HDStandbyStates, PreTreatmentSampleWaterStates, PreTreatmentConsumableSelfTestStates, PreTreatmentNoCartSelfTestStates, PreTreatmentCartridgeInstallStates, PreTreatmentDrySelfTestsStates, PreTreatmentPrimeStates, PreTreatmentRecircStates, PreTreatmentPatientConnectionStates hd_simulator = HDSimulator() dg_simulator = DGSimulator() @@ -53,11 +53,11 @@ """ test.startSection("Navigating to disposables screen and verifying 'System Self Test' title is displayed") - hd_simulator.cmd_set_hd_operation_mode_data(HDOpModes.MODE_PRET.value,PreTreatmentNoCartSelfTestsStates.NO_CART_SELF_TESTS_START_STATE.value) - hd_simulator.cmd_send_pre_treatment_state_data(sub_mode=HDOpSubModes.STANDBY_WAIT_FOR_DG_FLUSH_CMD_RESPONSE_STATE.value, + hd_simulator.cmd_set_hd_operation_mode_data(HDOpModes.MODE_PRET.value,PreTreatmentNoCartSelfTestStates.NO_CART_SELF_TESTS_START_STATE.value) + hd_simulator.cmd_send_pre_treatment_state_data(sub_mode=HDStandbyStates.STANDBY_WAIT_FOR_DG_FLUSH_CMD_RESPONSE_STATE.value, water_sample_state=PreTreatmentSampleWaterStates.SAMPLE_WATER_SETUP_STATE.value, consumables_self_test_state=PreTreatmentConsumableSelfTestStates.CONSUMABLE_SELF_TESTS_INSTALL_STATE.value, - no_cartridge_self_test_state=PreTreatmentNoCartSelfTestsStates.NO_CART_SELF_TESTS_START_STATE.value, + no_cartridge_self_test_state=PreTreatmentNoCartSelfTestStates.NO_CART_SELF_TESTS_START_STATE.value, installation_state=PreTreatmentCartridgeInstallStates.CARTRIDGE_INSTALL_STATE.value, dry_self_test_state=PreTreatmentDrySelfTestsStates.DRY_SELF_TESTS_START_STATE.value, prime_state=PreTreatmentPrimeStates.HD_PRIME_START_STATE.value, @@ -250,9 +250,9 @@ and 'NEXT' button """ test.startSection("Verifying functionality of the cartridge installation screen's left, right navigation and 'NEXT' button") - hd_simulator.cmd_set_hd_operation_mode_data(HDOpModes.MODE_PRET.value, PreTreatmentNoCartSelfTestsStates.NO_CART_SELF_TESTS_START_STATE.value) - hd_simulator.cmd_send_pre_treatment_state_data(sub_mode=HDOpSubModes.STANDBY_WAIT_FOR_DG_FLUSH_TO_START_STATE.value, water_sample_state=PreTreatmentSampleWaterStates.SAMPLE_WATER_SETUP_STATE.value,consumables_self_test_state=PreTreatmentConsumableSelfTestStates.CONSUMABLE_SELF_TESTS_INSTALL_STATE.value, - no_cartridge_self_test_state=PreTreatmentNoCartSelfTestsStates.NO_CART_SELF_TESTS_START_STATE.value,installation_state=PreTreatmentCartridgeInstallStates.CARTRIDGE_INSTALL_STATE.value, dry_self_test_state=PreTreatmentDrySelfTestsStates.DRY_SELF_TESTS_START_STATE.value, + hd_simulator.cmd_set_hd_operation_mode_data(HDOpModes.MODE_PRET.value, PreTreatmentNoCartSelfTestStates.NO_CART_SELF_TESTS_START_STATE.value) + hd_simulator.cmd_send_pre_treatment_state_data(sub_mode=HDStandbyStates.STANDBY_WAIT_FOR_DG_FLUSH_TO_START_STATE.value, water_sample_state=PreTreatmentSampleWaterStates.SAMPLE_WATER_SETUP_STATE.value,consumables_self_test_state=PreTreatmentConsumableSelfTestStates.CONSUMABLE_SELF_TESTS_INSTALL_STATE.value, + no_cartridge_self_test_state=PreTreatmentNoCartSelfTestStates.NO_CART_SELF_TESTS_START_STATE.value,installation_state=PreTreatmentCartridgeInstallStates.CARTRIDGE_INSTALL_STATE.value, dry_self_test_state=PreTreatmentDrySelfTestsStates.DRY_SELF_TESTS_START_STATE.value, prime_state=PreTreatmentPrimeStates.HD_PRIME_START_STATE.value,recirculate_state=PreTreatmentRecircStates.PRE_TREATMENT_RECIRC_STATE.value, patient_connection_state=PreTreatmentPatientConnectionStates.PATIENT_CONNECTION_STATE.value) verify_right_instruction_navigation(NUM_OF_CARTRIDGE_INSTALLATION_SCREENS, CARTRIDGE_INSTALLATION) @@ -536,33 +536,33 @@ """ test.startSection("Method to navigate to create custom treatment to set all parameters ") - hd_simulator.cmd_send_hd_operation_mode(op_mode=HDOpModes.MODE_TPAR.value, sub_mode=HDOpSubModes.STANDBY_START_STATE.value) + hd_simulator.cmd_send_hd_operation_mode(op_mode=HDOpModes.MODE_TPAR.value, sub_mode=HDStandbyStates.STANDBY_START_STATE.value) mouseClick(waitForObject(names.o_input_patient_id)) type(waitForObject(names.o_input_patient_id), "abcd") mouseClick(waitForObject(names.o_continue_button)) verify_create_custom_treatment_parameter() verify_request_continue_mode() # navigation for pre-treatment screens - hd_simulator.cmd_send_hd_operation_mode(op_mode=HDOpModes.MODE_TPAR.value, sub_mode=HDOpSubModes.STANDBY_START_STATE.value) + hd_simulator.cmd_send_hd_operation_mode(op_mode=HDOpModes.MODE_TPAR.value, sub_mode=HDStandbyStates.STANDBY_START_STATE.value) utils.waitForGUI(1) - hd_simulator.cmd_set_hd_operation_mode_data(HDOpModes.MODE_PRET.value, PreTreatmentNoCartSelfTestsStates.NO_CART_SELF_TESTS_START_STATE.value) - hd_simulator.cmd_send_pre_treatment_state_data(sub_mode=HDOpSubModes.STANDBY_WAIT_FOR_TREATMENT_STATE.value, water_sample_state=PreTreatmentSampleWaterStates.SAMPLE_WATER_SETUP_STATE.value,consumables_self_test_state=PreTreatmentConsumableSelfTestStates.CONSUMABLE_SELF_TESTS_INSTALL_STATE.value, - no_cartridge_self_test_state=PreTreatmentNoCartSelfTestsStates.NO_CART_SELF_TESTS_START_STATE.value, installation_state=PreTreatmentCartridgeInstallStates.CARTRIDGE_INSTALL_STATE.value, dry_self_test_state=PreTreatmentDrySelfTestsStates.DRY_SELF_TESTS_START_STATE.value, + hd_simulator.cmd_set_hd_operation_mode_data(HDOpModes.MODE_PRET.value, PreTreatmentNoCartSelfTestStates.NO_CART_SELF_TESTS_START_STATE.value) + hd_simulator.cmd_send_pre_treatment_state_data(sub_mode=HDStandbyStates.STANDBY_WAIT_FOR_TREATMENT_STATE.value, water_sample_state=PreTreatmentSampleWaterStates.SAMPLE_WATER_SETUP_STATE.value,consumables_self_test_state=PreTreatmentConsumableSelfTestStates.CONSUMABLE_SELF_TESTS_INSTALL_STATE.value, + no_cartridge_self_test_state=PreTreatmentNoCartSelfTestStates.NO_CART_SELF_TESTS_START_STATE.value, installation_state=PreTreatmentCartridgeInstallStates.CARTRIDGE_INSTALL_STATE.value, dry_self_test_state=PreTreatmentDrySelfTestsStates.DRY_SELF_TESTS_START_STATE.value, prime_state=PreTreatmentPrimeStates.HD_PRIME_START_STATE.value,recirculate_state=PreTreatmentRecircStates.PRE_TREATMENT_RECIRC_STATE.value, patient_connection_state=PreTreatmentPatientConnectionStates.PATIENT_CONNECTION_STATE.value) utils.waitForGUI(1) hd_simulator.cmd_initiate_treatment_response(response=1, reason=0) - hd_simulator.cmd_send_hd_operation_mode(op_mode=HDOpModes.MODE_PRET.value, sub_mode=HDOpSubModes.STANDBY_START_STATE.value) + hd_simulator.cmd_send_hd_operation_mode(op_mode=HDOpModes.MODE_PRET.value, sub_mode=HDStandbyStates.STANDBY_START_STATE.value) utils.waitForGUI(1) # navigation for pre-treatment disposables screens - hd_simulator.cmd_send_hd_operation_mode(op_mode=HDOpModes.MODE_PRET.value, sub_mode=HDOpSubModes.STANDBY_START_STATE.value) + hd_simulator.cmd_send_hd_operation_mode(op_mode=HDOpModes.MODE_PRET.value, sub_mode=HDStandbyStates.STANDBY_START_STATE.value) utils.waitForGUI(1) - hd_simulator.cmd_send_pre_treatment_state_data(sub_mode=HDOpSubModes.STANDBY_WAIT_FOR_DG_FLUSH_CMD_RESPONSE_STATE.value, + hd_simulator.cmd_send_pre_treatment_state_data(sub_mode=HDStandbyStates.STANDBY_WAIT_FOR_DG_FLUSH_CMD_RESPONSE_STATE.value, water_sample_state=PreTreatmentSampleWaterStates.SAMPLE_WATER_SETUP_STATE.value, consumables_self_test_state=PreTreatmentConsumableSelfTestStates.CONSUMABLE_SELF_TESTS_INSTALL_STATE.value, - no_cartridge_self_test_state=PreTreatmentNoCartSelfTestsStates.NO_CART_SELF_TESTS_START_STATE.value, + no_cartridge_self_test_state=PreTreatmentNoCartSelfTestStates.NO_CART_SELF_TESTS_START_STATE.value, installation_state=PreTreatmentCartridgeInstallStates.CARTRIDGE_INSTALL_STATE.value, dry_self_test_state=PreTreatmentDrySelfTestsStates.DRY_SELF_TESTS_START_STATE.value, prime_state=PreTreatmentPrimeStates.HD_PRIME_START_STATE.value, Index: tst_pre_treatment_patient_connection/test.py =================================================================== diff -u -r4ee2ecca5d905bb3d871cd9ab5129b5027d8ffb0 -r6bb43117bca2673c5de877f5b70b094da344418a --- tst_pre_treatment_patient_connection/test.py (.../test.py) (revision 4ee2ecca5d905bb3d871cd9ab5129b5027d8ffb0) +++ tst_pre_treatment_patient_connection/test.py (.../test.py) (revision 6bb43117bca2673c5de877f5b70b094da344418a) @@ -16,13 +16,19 @@ import names from dialin.ui.hd_simulator import HDSimulator +from dialin.ui.hd_simulator_alarms import HDAlarmsSimulator from dialin.ui import utils from configuration import config, utility from builtins import str as pyStr from dialin.common.hd_defs import HDOpModes, PreTreatmentSubModes +from dialin.ui.utils import waitForGUI +from dialin.protocols.CAN import DenaliCanMessenger +import logging hd_simulator = HDSimulator() - +logger = logging.getLogger("INFO") +messenger = DenaliCanMessenger('can0') +alarm = HDAlarmsSimulator(can_interface=messenger, logger=logger) PRE_TREATMENT_PATIENT_CONNECTION_MODE = PreTreatmentSubModes.HD_PRE_TREATMENT_PATIENT_CONNECTION_STATE.value UF_PRE_TREATMENT_STEPS = 5 BP_HR_PRE_TREATMENT_STEPS = 6 @@ -72,6 +78,9 @@ test.startSection("verifying of rejection messages on patient connection") for rejection in range(1, config.NUM_OF_REQUEST_REJECT_REASONS): hd_simulator.cmd_send_uf_treatment_response(accepted=accept_status, reason=rejection, volume=config.UF_VALID_RANGE) + alarm.cmd_activate_alarm_id(0, 0, 0, 0, 0) + + #send alarm 0 when fixed this line can be removed rejection_message = waitForObject(names.o_PreTreatmentUltrafiltration_NotificationBar_NotificationBar) test.compare(rejection_message.text, config.REJECTION_REASON[rejection], "expected rejection {msg} displayed".format(msg=config.REJECTION_REASON[rejection])) Index: tst_pre_treatment_priming/test.py =================================================================== diff -u -r33f5a5e0045358b923c621445d2f1cc1d2bd83c4 -r6bb43117bca2673c5de877f5b70b094da344418a --- tst_pre_treatment_priming/test.py (.../test.py) (revision 33f5a5e0045358b923c621445d2f1cc1d2bd83c4) +++ tst_pre_treatment_priming/test.py (.../test.py) (revision 6bb43117bca2673c5de877f5b70b094da344418a) @@ -13,7 +13,7 @@ import names from configuration import config, utility -from dialin.common.hd_defs import PreTreatmentSubModes, HDOpModes, HDOpSubModes, PreTreatmentSampleWaterStates, PreTreatmentConsumableSelfTestStates, PreTreatmentNoCartSelfTestsStates, PreTreatmentCartridgeInstallStates, PreTreatmentDrySelfTestsStates, PreTreatmentPrimeStates, PreTreatmentRecircStates, PreTreatmentPatientConnectionStates +from dialin.common.hd_defs import PreTreatmentSubModes, HDOpModes, HDStandbyStates, PreTreatmentSampleWaterStates, PreTreatmentConsumableSelfTestStates, PreTreatmentNoCartSelfTestStates, PreTreatmentCartridgeInstallStates, PreTreatmentDrySelfTestsStates, PreTreatmentPrimeStates, PreTreatmentRecircStates, PreTreatmentPatientConnectionStates from dialin.ui import utils from dialin.ui.hd_simulator import HDSimulator from dialin.ui.dg_simulator import DGSimulator @@ -48,7 +48,7 @@ test.startSection("Navigating to self test dry screen and verify the 'Begin Prime' title is displayed") hd_simulator.cmd_set_hd_operation_mode_data(HDOpModes.MODE_PRET.value,PreTreatmentPrimeStates.HD_PRIME_START_STATE.value) hd_simulator.cmd_send_pre_treatment_state_data(sub_mode=HDOpModes.MODE_PRET.value, water_sample_state=PreTreatmentSampleWaterStates.SAMPLE_WATER_SETUP_STATE.value,consumables_self_test_state=PreTreatmentConsumableSelfTestStates.CONSUMABLE_SELF_TESTS_INSTALL_STATE.value, - no_cartridge_self_test_state=PreTreatmentNoCartSelfTestsStates.NO_CART_SELF_TESTS_START_STATE.value,installation_state=PreTreatmentCartridgeInstallStates.CARTRIDGE_INSTALL_STATE.value, dry_self_test_state=PreTreatmentDrySelfTestsStates.DRY_SELF_TESTS_START_STATE.value, + no_cartridge_self_test_state=PreTreatmentNoCartSelfTestStates.NO_CART_SELF_TESTS_START_STATE.value,installation_state=PreTreatmentCartridgeInstallStates.CARTRIDGE_INSTALL_STATE.value, dry_self_test_state=PreTreatmentDrySelfTestsStates.DRY_SELF_TESTS_START_STATE.value, prime_state=PreTreatmentPrimeStates.HD_PRIME_START_STATE.value,recirculate_state=PreTreatmentRecircStates.PRE_TREATMENT_RECIRC_STATE.value, patient_connection_state=PreTreatmentPatientConnectionStates.PATIENT_CONNECTION_STATE.value) title = (waitForObjectExists(utility.self_test_dry_check_list_text(config.BEGIN_PRIME_TITLE))).text @@ -65,7 +65,7 @@ """ test.startSection("Navigating to priming screen and verify the begin 'Priming' title is displayed") hd_simulator.cmd_send_pre_treatment_state_data(sub_mode=PreTreatmentSubModes.HD_PRE_TREATMENT_PRIME_STATE.value, water_sample_state=PreTreatmentSampleWaterStates.SAMPLE_WATER_SETUP_STATE.value,consumables_self_test_state=PreTreatmentConsumableSelfTestStates.CONSUMABLE_SELF_TESTS_INSTALL_STATE.value, - no_cartridge_self_test_state=PreTreatmentNoCartSelfTestsStates.NO_CART_SELF_TESTS_START_STATE.value,installation_state=PreTreatmentCartridgeInstallStates.CARTRIDGE_INSTALL_STATE.value, dry_self_test_state=PreTreatmentDrySelfTestsStates.DRY_SELF_TESTS_START_STATE.value, + no_cartridge_self_test_state=PreTreatmentNoCartSelfTestStates.NO_CART_SELF_TESTS_START_STATE.value,installation_state=PreTreatmentCartridgeInstallStates.CARTRIDGE_INSTALL_STATE.value, dry_self_test_state=PreTreatmentDrySelfTestsStates.DRY_SELF_TESTS_START_STATE.value, prime_state=PreTreatmentPrimeStates.HD_PRIME_START_STATE.value,recirculate_state=PreTreatmentRecircStates.PRE_TREATMENT_RECIRC_STATE.value, patient_connection_state=PreTreatmentPatientConnectionStates.PATIENT_CONNECTION_STATE.value) title = (waitForObject(utility.self_test_dry_check_list_text(config.PRIMING_TITLE))).text @@ -84,7 +84,7 @@ for state, index in SELF_TEST_DRY_STATES.items(): test.startSection("Passing {} state".format(state)) hd_simulator.cmd_send_pre_treatment_state_data(sub_mode=HDOpModes.MODE_PRET.value, water_sample_state=PreTreatmentSampleWaterStates.SAMPLE_WATER_SETUP_STATE.value,consumables_self_test_state=PreTreatmentConsumableSelfTestStates.CONSUMABLE_SELF_TESTS_INSTALL_STATE.value, - no_cartridge_self_test_state=PreTreatmentNoCartSelfTestsStates.NO_CART_SELF_TESTS_START_STATE.value,installation_state=PreTreatmentCartridgeInstallStates.CARTRIDGE_INSTALL_STATE.value, dry_self_test_state=index, + no_cartridge_self_test_state=PreTreatmentNoCartSelfTestStates.NO_CART_SELF_TESTS_START_STATE.value,installation_state=PreTreatmentCartridgeInstallStates.CARTRIDGE_INSTALL_STATE.value, dry_self_test_state=index, prime_state=PreTreatmentPrimeStates.HD_PRIME_START_STATE.value,recirculate_state=PreTreatmentRecircStates.PRE_TREATMENT_RECIRC_STATE.value, patient_connection_state=PreTreatmentPatientConnectionStates.PATIENT_CONNECTION_STATE.value) if (state == "DRY_SELF_TESTS_STATE") or (state == "DRY_SELF_TESTS_WAIT_FOR_DOOR_CLOSE_STATE"): @@ -129,7 +129,7 @@ for state, index in RECIRCULATE_STATES.items(): test.startSection("Passing {} state".format(state)) hd_simulator.cmd_send_pre_treatment_state_data(sub_mode=PreTreatmentSubModes.HD_PRE_TREATMENT_RECIRCULATE_STATE.value, water_sample_state=PreTreatmentSampleWaterStates.SAMPLE_WATER_SETUP_STATE.value,consumables_self_test_state=PreTreatmentConsumableSelfTestStates.CONSUMABLE_SELF_TESTS_INSTALL_STATE.value, - no_cartridge_self_test_state=PreTreatmentNoCartSelfTestsStates.NO_CART_SELF_TESTS_START_STATE.value,installation_state=PreTreatmentCartridgeInstallStates.CARTRIDGE_INSTALL_STATE.value, dry_self_test_state=PreTreatmentDrySelfTestsStates.DRY_SELF_TESTS_START_STATE.value, + no_cartridge_self_test_state=PreTreatmentNoCartSelfTestStates.NO_CART_SELF_TESTS_START_STATE.value,installation_state=PreTreatmentCartridgeInstallStates.CARTRIDGE_INSTALL_STATE.value, dry_self_test_state=PreTreatmentDrySelfTestsStates.DRY_SELF_TESTS_START_STATE.value, prime_state=PreTreatmentPrimeStates.HD_PRIME_START_STATE.value,recirculate_state=index, patient_connection_state=PreTreatmentPatientConnectionStates.PATIENT_CONNECTION_STATE.value) verify_indicators(config.CHECK, "Blood Circuit Priming") @@ -152,7 +152,7 @@ for state, index in PRIMING_STATES.items(): test.startSection("Passing {} state".format(state)) hd_simulator.cmd_send_pre_treatment_state_data(sub_mode=PreTreatmentSubModes.HD_PRE_TREATMENT_PRIME_STATE.value, water_sample_state=PreTreatmentSampleWaterStates.SAMPLE_WATER_SETUP_STATE.value,consumables_self_test_state=PreTreatmentConsumableSelfTestStates.CONSUMABLE_SELF_TESTS_INSTALL_STATE.value, - no_cartridge_self_test_state=PreTreatmentNoCartSelfTestsStates.NO_CART_SELF_TESTS_START_STATE.value,installation_state=PreTreatmentCartridgeInstallStates.CARTRIDGE_INSTALL_STATE.value, dry_self_test_state=PreTreatmentDrySelfTestsStates.DRY_SELF_TESTS_START_STATE.value, + no_cartridge_self_test_state=PreTreatmentNoCartSelfTestStates.NO_CART_SELF_TESTS_START_STATE.value,installation_state=PreTreatmentCartridgeInstallStates.CARTRIDGE_INSTALL_STATE.value, dry_self_test_state=PreTreatmentDrySelfTestsStates.DRY_SELF_TESTS_START_STATE.value, prime_state=index,recirculate_state=PreTreatmentRecircStates.PRE_TREATMENT_RECIRC_STATE.value, patient_connection_state=PreTreatmentPatientConnectionStates.PATIENT_CONNECTION_STATE.value) if (state == "HD_PRIME_START_STATE") or (state == "HD_PRIME_WAIT_FOR_USER_START_STATE") : Index: tst_pre_treatment_water_sample/test.py =================================================================== diff -u -rec6abbbf816f40a33f731e751db7b11004b99075 -r6bb43117bca2673c5de877f5b70b094da344418a --- tst_pre_treatment_water_sample/test.py (.../test.py) (revision ec6abbbf816f40a33f731e751db7b11004b99075) +++ tst_pre_treatment_water_sample/test.py (.../test.py) (revision 6bb43117bca2673c5de877f5b70b094da344418a) @@ -12,7 +12,7 @@ from dialin.ui.dg_simulator import DGSimulator from configuration import config from configuration import utility -from dialin.common.hd_defs import HDOpModes, HDOpSubModes, PreTreatmentSampleWaterStates, PreTreatmentConsumableSelfTestStates, PreTreatmentNoCartSelfTestsStates, PreTreatmentCartridgeInstallStates, PreTreatmentDrySelfTestsStates, PreTreatmentPrimeStates, PreTreatmentRecircStates, PreTreatmentPatientConnectionStates +from dialin.common.hd_defs import HDOpModes, HDStandbyStates, PreTreatmentSampleWaterStates, PreTreatmentConsumableSelfTestStates, PreTreatmentNoCartSelfTestStates, PreTreatmentCartridgeInstallStates, PreTreatmentDrySelfTestsStates, PreTreatmentPrimeStates, PreTreatmentRecircStates, PreTreatmentPatientConnectionStates hd_simulator = HDSimulator() dg_simulator = DGSimulator() @@ -26,8 +26,8 @@ """ test.startSection("Verify the Filter Flush screen") hd_simulator.cmd_set_hd_operation_mode_data(HDOpModes.MODE_PRET.value,PreTreatmentSampleWaterStates.SAMPLE_WATER_SETUP_STATE.value) - hd_simulator.cmd_send_pre_treatment_state_data(sub_mode=HDOpSubModes.STANDBY_WAIT_FOR_TREATMENT_STATE.value, water_sample_state=PreTreatmentSampleWaterStates.SAMPLE_WATER_SETUP_STATE.value,consumables_self_test_state=PreTreatmentConsumableSelfTestStates.CONSUMABLE_SELF_TESTS_INSTALL_STATE.value, - no_cartridge_self_test_state=PreTreatmentNoCartSelfTestsStates.NO_CART_SELF_TESTS_START_STATE.value,installation_state=PreTreatmentCartridgeInstallStates.CARTRIDGE_INSTALL_STATE.value, dry_self_test_state=PreTreatmentDrySelfTestsStates.DRY_SELF_TESTS_START_STATE.value, + hd_simulator.cmd_send_pre_treatment_state_data(sub_mode=HDStandbyStates.STANDBY_WAIT_FOR_TREATMENT_STATE.value, water_sample_state=PreTreatmentSampleWaterStates.SAMPLE_WATER_SETUP_STATE.value,consumables_self_test_state=PreTreatmentConsumableSelfTestStates.CONSUMABLE_SELF_TESTS_INSTALL_STATE.value, + no_cartridge_self_test_state=PreTreatmentNoCartSelfTestStates.NO_CART_SELF_TESTS_START_STATE.value,installation_state=PreTreatmentCartridgeInstallStates.CARTRIDGE_INSTALL_STATE.value, dry_self_test_state=PreTreatmentDrySelfTestsStates.DRY_SELF_TESTS_START_STATE.value, prime_state=PreTreatmentPrimeStates.HD_PRIME_START_STATE.value,recirculate_state=PreTreatmentRecircStates.PRE_TREATMENT_RECIRC_STATE.value, patient_connection_state=PreTreatmentPatientConnectionStates.PATIENT_CONNECTION_STATE.value) utility.verify_page_step_indicator(names.o_preTreatmentWaterSampleStack_PreTreatmentBase_TreatmentFlowBase_2, PRE_TREATMENT_STEP, config.PRE_TREATMENT_SCREENS) utility.verify_countdown(config.FILTER_FLUSH_TITLE, config.TIME_OUT_DURATION_100, hd_simulator, dg_simulator) @@ -41,8 +41,8 @@ """ test.startSection("Verify the water sample main screen") hd_simulator.cmd_set_hd_operation_mode_data(HDOpModes.MODE_PRET.value,PreTreatmentSampleWaterStates.SAMPLE_WATER_SETUP_STATE.value) - hd_simulator.cmd_send_pre_treatment_state_data(sub_mode=HDOpSubModes.STANDBY_WAIT_FOR_TREATMENT_STATE.value, water_sample_state=PreTreatmentSampleWaterStates.SAMPLE_WATER_STATE.value,consumables_self_test_state=PreTreatmentConsumableSelfTestStates.CONSUMABLE_SELF_TESTS_INSTALL_STATE.value, - no_cartridge_self_test_state=PreTreatmentNoCartSelfTestsStates.NO_CART_SELF_TESTS_START_STATE.value,installation_state=PreTreatmentCartridgeInstallStates.CARTRIDGE_INSTALL_STATE.value, dry_self_test_state=PreTreatmentDrySelfTestsStates.DRY_SELF_TESTS_START_STATE.value, + hd_simulator.cmd_send_pre_treatment_state_data(sub_mode=HDStandbyStates.STANDBY_WAIT_FOR_TREATMENT_STATE.value, water_sample_state=PreTreatmentSampleWaterStates.SAMPLE_WATER_STATE.value,consumables_self_test_state=PreTreatmentConsumableSelfTestStates.CONSUMABLE_SELF_TESTS_INSTALL_STATE.value, + no_cartridge_self_test_state=PreTreatmentNoCartSelfTestStates.NO_CART_SELF_TESTS_START_STATE.value,installation_state=PreTreatmentCartridgeInstallStates.CARTRIDGE_INSTALL_STATE.value, dry_self_test_state=PreTreatmentDrySelfTestsStates.DRY_SELF_TESTS_START_STATE.value, prime_state=PreTreatmentPrimeStates.HD_PRIME_START_STATE.value,recirculate_state=PreTreatmentRecircStates.PRE_TREATMENT_RECIRC_STATE.value, patient_connection_state=PreTreatmentPatientConnectionStates.PATIENT_CONNECTION_STATE.value) utility.verify_page_step_indicator(names.o_preTreatmentWaterSampleStack_PreTreatmentBase_TreatmentFlowBase_2,PRE_TREATMENT_STEP, config.PRE_TREATMENT_SCREENS) test.compare(str(waitForObjectExists(names.o_water_sample_button).text), config.WATER_SAMPLE_BUTTON_TEXT,"Water Sample button text should be {}".format(config.WATER_SAMPLE_BUTTON_TEXT)) Index: tst_recirculate/test.py =================================================================== diff -u -r66579e2dfbba8c77673add25b3fa6ebaba4b4f10 -r6bb43117bca2673c5de877f5b70b094da344418a --- tst_recirculate/test.py (.../test.py) (revision 66579e2dfbba8c77673add25b3fa6ebaba4b4f10) +++ tst_recirculate/test.py (.../test.py) (revision 6bb43117bca2673c5de877f5b70b094da344418a) @@ -130,7 +130,7 @@ test.startSection("Verifying test case scenario for rejection and acceptance in current state") for reason_id in range(1, config.NUM_OF_REQUEST_REJECT_REASONS + 1): hd_simulator.cmd_send_treatment_adjust_recirculate_response(accepted=0, reason=reason_id) - rejection_message = waitForObjectExists(utility.recirculate_rejection_msg(text=config.REJECTION_REASON[reason_id])) + rejection_message = waitForObjectExists(utility.rejection_msg(text=config.REJECTION_REASON[reason_id])) test.compare(rejection_message.text, config.REJECTION_REASON[reason_id], "expected rejection {msg} displayed".format(msg=config.REJECTION_REASON[reason_id])) test.endSection() Index: tst_rinseback_setup/test.py =================================================================== diff -u -r472731060f96a73795f8feefe2b81969490e6ce1 -r6bb43117bca2673c5de877f5b70b094da344418a --- tst_rinseback_setup/test.py (.../test.py) (revision 472731060f96a73795f8feefe2b81969490e6ce1) +++ tst_rinseback_setup/test.py (.../test.py) (revision 6bb43117bca2673c5de877f5b70b094da344418a) @@ -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, HDOpSubModes, TreatmentStates, TreatmentEndStates, TreatmentRinsebackStates +from dialin.common.hd_defs import HDOpModes, HDStandbyStates, TreatmentStates, TreatmentEndStates, TreatmentRinsebackStates hd_simulator = HDSimulator() SCREEN_OBJ = names.o_EndTreatmentRinsebackStack_EndTreatmentRinsebackInit_EndTreatmentRinsebackInit @@ -49,7 +49,7 @@ """ 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=HDOpSubModes.STANDBY_START_STATE.value) + 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, Index: tst_service_screen/test.py =================================================================== diff -u -raea720dc4efe66713d2b9a00a7d6a2497dbcaea4 -r6bb43117bca2673c5de877f5b70b094da344418a --- tst_service_screen/test.py (.../test.py) (revision aea720dc4efe66713d2b9a00a7d6a2497dbcaea4) +++ tst_service_screen/test.py (.../test.py) (revision 6bb43117bca2673c5de877f5b70b094da344418a) @@ -15,7 +15,7 @@ from configuration import config from dialin.ui.hd_simulator import HDSimulator -from dialin.common.hd_defs import HDOpModes, HDOpSubModes +from dialin.common.hd_defs import HDOpModes, HDStandbyStates from dialin.ui import utils hd_simulator = HDSimulator() @@ -41,7 +41,7 @@ return names.o_settings_home_text_obj -def text_obj(text): +def text_obj(text): """ Method to set custom object property for information screen. @param text : (string) parameter text @@ -55,7 +55,7 @@ Method to navigate to "Settings" screen """ test.startSection("Navigating to 'Service' screen") - hd_simulator.cmd_send_hd_operation_mode(op_mode=HDOpModes.MODE_SERV.value, sub_mode=HDOpSubModes.STANDBY_START_STATE.value) + hd_simulator.cmd_send_hd_operation_mode(op_mode=HDOpModes.MODE_SERV.value, sub_mode=HDStandbyStates.STANDBY_START_STATE.value) utils.waitForGUI(1) 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)) Index: tst_settings_date_and_time/test.py =================================================================== diff -u -r5a65472ad6b1abc3aa576ae266647957123993d5 -r6bb43117bca2673c5de877f5b70b094da344418a --- tst_settings_date_and_time/test.py (.../test.py) (revision 5a65472ad6b1abc3aa576ae266647957123993d5) +++ tst_settings_date_and_time/test.py (.../test.py) (revision 6bb43117bca2673c5de877f5b70b094da344418a) @@ -16,7 +16,7 @@ from configuration import config, utility from dialin.ui.hd_simulator import HDSimulator -from dialin.common.hd_defs import HDOpModes, HDOpSubModes +from dialin.common.hd_defs import HDOpModes, HDStandbyStates from dialin.ui import utils from calendar import isleap @@ -67,7 +67,7 @@ Method to navigate to "Service" screen """ test.startSection("Navigating to 'Service' screen") - hd_simulator.cmd_send_hd_operation_mode(op_mode=HDOpModes.MODE_SERV.value, sub_mode=HDOpSubModes.STANDBY_START_STATE.value) + hd_simulator.cmd_send_hd_operation_mode(op_mode=HDOpModes.MODE_SERV.value, sub_mode=HDStandbyStates.STANDBY_START_STATE.value) utils.waitForGUI(0.5) service_screen_text = waitForObjectExists(service_text_obj(config.SERVICE_SCREEN_TITLE_TEXT)) test.compare(service_screen_text.text, config.SERVICE_SCREEN_TITLE_TEXT, "{} screen is displayed".format(config.SERVICE_SCREEN_TITLE_TEXT)) Index: tst_settings_information/test.py =================================================================== diff -u -re82eb67fafba801c3f781eae5903a11f1ee627de -r6bb43117bca2673c5de877f5b70b094da344418a --- tst_settings_information/test.py (.../test.py) (revision e82eb67fafba801c3f781eae5903a11f1ee627de) +++ tst_settings_information/test.py (.../test.py) (revision 6bb43117bca2673c5de877f5b70b094da344418a) @@ -22,7 +22,7 @@ from dialin.ui.hd_simulator import HDSimulator from dialin.ui.dg_simulator import DGSimulator from configuration.config import SERVICE_CONF_LOCATION -from dialin.common.hd_defs import HDOpModes,HDOpSubModes +from dialin.common.hd_defs import HDOpModes,HDStandbyStates from dialin.ui import utils from builtins import float as pyfloat @@ -544,7 +544,7 @@     """ test.startSection("Navigating to 'services password' screen and enter password") utils.waitForGUI(1) - hd_simulator.cmd_send_hd_operation_mode(op_mode=HDOpModes.MODE_STAN.value, sub_mode=HDOpSubModes.STANDBY_START_STATE.value) + hd_simulator.cmd_send_hd_operation_mode(op_mode=HDOpModes.MODE_STAN.value, sub_mode=HDStandbyStates.STANDBY_START_STATE.value) utils.waitForGUI(1) mouseClick(waitForObjectExists(names.o_settings_Text)) device_settings_text = waitForObjectExists(settings_text_obj(config.DEVICE_SETTINGS_TEXT)) Index: tst_time_duration/test.py =================================================================== diff -u -r6921a6fa98a1941a7a178d0750e2aeed9f20eb6d -r6bb43117bca2673c5de877f5b70b094da344418a --- tst_time_duration/test.py (.../test.py) (revision 6921a6fa98a1941a7a178d0750e2aeed9f20eb6d) +++ tst_time_duration/test.py (.../test.py) (revision 6bb43117bca2673c5de877f5b70b094da344418a) @@ -36,6 +36,7 @@ for count in range(0,vTotal+1): hd_simulator.cmd_set_treatment_time(vTotal, count, vTotal - count) + utils.waitForGUI(0.5) test.compare(waitForObjectExists(names.o_treatment_duration).progressValue, count, "progress value should be {}".format(count)) test.compare(waitForObjectExists(names.o_treatment_duration).timeTextValue, vTotal - count, "Expected Time on UI should be in seconds {}".format(vTotal - count)) Index: tst_treatment_monitoring/test.py =================================================================== diff -u -rff4b21e2f2457981d06cddbcae432c996bcaceb3 -r6bb43117bca2673c5de877f5b70b094da344418a --- tst_treatment_monitoring/test.py (.../test.py) (revision ff4b21e2f2457981d06cddbcae432c996bcaceb3) +++ tst_treatment_monitoring/test.py (.../test.py) (revision 6bb43117bca2673c5de877f5b70b094da344418a) @@ -19,7 +19,7 @@ from dialin.ui import utils from dialin.ui.hd_simulator import HDSimulator from configuration import config -from dialin.common.hd_defs import HDOpModes, HDOpSubModes, TreatmentStates +from dialin.common.hd_defs import HDOpModes, HDStandbyStates, TreatmentStates BLOOD_PRIMING_TARGET_VALUE = 150 @@ -32,6 +32,7 @@ @param: expected_blood_prime_value - expected blood prime value. @return: N/A """ + 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) @@ -63,7 +64,7 @@ @return: N/A """ test.startSection("verification of treatment parameters") - hd_simulator.cmd_set_treatment_states_data(sub_mode=HDOpSubModes.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, + 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) Index: tst_treatment_saline_data/test.py =================================================================== diff -u -r563dcd0e14742ff0d1bc34fdd9170224bfc1c071 -r6bb43117bca2673c5de877f5b70b094da344418a --- tst_treatment_saline_data/test.py (.../test.py) (revision 563dcd0e14742ff0d1bc34fdd9170224bfc1c071) +++ tst_treatment_saline_data/test.py (.../test.py) (revision 6bb43117bca2673c5de877f5b70b094da344418a) @@ -18,7 +18,7 @@ import names from configuration import config, utility from dialin.ui import utils -from dialin.common.hd_defs import HDOpSubModes, TreatmentStates +from dialin.common.hd_defs import HDStandbyStates, TreatmentStates 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 @@ -98,7 +98,7 @@ if (not accept_status): test.compare(waitForObjectExists(utility.rejection_msg(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=HDOpSubModes.STANDBY_WAIT_FOR_DISINFECT_STATE.value, uf_state=TreatmentStates.TREATMENT_START_STATE.value, saline_state=saline_states, heparin_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) @@ -212,15 +212,15 @@ test.startSection("verification of saline parameter states on main treatment screen") - hd_simulator.cmd_set_treatment_states_data(sub_mode=HDOpSubModes.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, + 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) 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=HDOpSubModes.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, + 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) @@ -230,7 +230,7 @@ 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=HDOpSubModes.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, + 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) @@ -239,7 +239,7 @@ 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=HDOpSubModes.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, + 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) @@ -256,7 +256,7 @@ utils.waitForGUI(1) #navigate to dialysis state - hd_simulator.cmd_set_treatment_states_data(sub_mode= HDOpSubModes.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, + 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) Index: tst_ui_alarms_dialog/test.py =================================================================== diff -u -r466c4dd33fcc6f9dcd28d4d75cf6f437f1280ce5 -r6bb43117bca2673c5de877f5b70b094da344418a --- tst_ui_alarms_dialog/test.py (.../test.py) (revision 466c4dd33fcc6f9dcd28d4d75cf6f437f1280ce5) +++ tst_ui_alarms_dialog/test.py (.../test.py) (revision 6bb43117bca2673c5de877f5b70b094da344418a) @@ -15,7 +15,7 @@ import names import logging from dialin.ui import utils -from configuration import config +from configuration import config, utility from dialin.ui.hd_simulator import HDSimulator from dialin.protocols.CAN import DenaliCanMessenger from dialin.ui.hd_simulator_alarms import HDAlarmsSimulator @@ -30,7 +30,7 @@ alarms_msgs = [] count_of_alarms = [] title_count_dict = {} -text_obj_names = [names.o_alarm_title_text,names.o_alarm_id,names.o_alarm_dialogue_box_msg ] +text_obj_names = [names.o_alarm_title_text,names.o_alarm_id_text,names.o_alarm_dialogue_box_msg ] logging.basicConfig(filename='log_file.log',level=logging.INFO, datefmt='%d-%b-%y %H:%M:%S') hd_simulator = HDSimulator() logger = logging.getLogger("INFO") @@ -152,22 +152,23 @@ vButtons == config.ALARM_BUTTONS_END_RESUME_RINSEBACK , "Button visible [End]") - obj = waitForObjectExists(names.o_ok_button_mouse_area) - if obj.visible : mouseClick(obj) - utils.waitForGUI(0.5) - - obj = waitForObjectExists(names.o_resume_button_mouse_Area) - if obj.visible : mouseClick(obj) - utils.waitForGUI(0.5) + 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) - obj = waitForObjectExists(names.o_rinseback_mouse_area) - if obj.visible : mouseClick(obj) - utils.waitForGUI(0.5) - - obj = waitForObjectExists(names.o_end_button_mouse_area) - if obj.visible : mouseClick(obj) - utils.waitForGUI(0.5) - alarm.cmd_alarm_condition_cleared(alarm_id = 1) def test_all_buttons(): @@ -284,10 +285,11 @@ test.endSection() -def test_message_based_on_alarm_id(alarm_id): +def test_message_based_on_alarm_id(alarm_id, alarm_info_dict): """ Method to verify alarm message based on alarm id @param alarm id - (int) alarm id to be set. + @param alarm_info_dict - (dict) Alarm dict containing title and alarm message @output N/A """ test.startSection("verification of alarm message based on alarm id -> " + str(alarm_id)) @@ -298,21 +300,20 @@ 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)) - test.compare(str(waitForObjectExists(names.o_alarm_text_description).text), config.ALARM_ID_AND_ALARM_MESSAGES[alarm_id], "Alarm message is verified from alarm dialog box") +# 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), config.ALARM_ID_AND_ALARM_MESSAGES[alarm_id], "Alarm message is verified from alarm bar") + test.compare(str(waitForObjectExists(names.o_alarm_bar_text ).text), alarm_info_dict[alarm_id]['title'], "Alarm title is verified from alarm bar") maximize() if alarm_id < config.NUM_OF_ALARM_ID: - alarm_title = read_message_title_from_alarms_conf_file(alarm_id) - test.compare(str(waitForObjectExists(names.o_alarm_id ).text), alarm_title, "Alarm message is verified from alarm bar") - - 'TODO: Empty message discription for some of the alarm ids from Alarms.conf. Dynamic verification kept as hold.' - #alarm_message = read_alarm_message_from_alarms_conf_file(alarm_id) - #test.compare(str(waitForObjectExists(names.o_alarm_text_description).text), alarm_message, "Alarm message is verified from alarm dialog box") + alarm_id_text = f"ID:{alarm_id}" + test.compare(str(waitForObjectExists(names.o_alarm_screen_id ).text), alarm_id_text, "Alarm id is verified from alarm dialog box") + alarm_message = alarm_info_dict[alarm_id]['message'] + test.com6pare(str(waitForObjectExists(names.o_alarm_text_description).text), alarm_message, "Alarm message is verified from alarm dialog box") test.endSection() - +#Check this function def test_verify_alarm_mute(alarm_timeout = 0, v_flags = 0, alarm_status = "Mute"): """ Method to verify alarm mute and unmute characteristics. @@ -354,7 +355,9 @@ @output N/A """ test.startSection("verification of alarm bar parameters") + alarm_info_dict = utility.extract_alarm_info_from_alarms_conf_file() for alarm_id in range(0, config.NUM_OF_ALARM_ID): +# for alarm_id in [73]: if alarm_id == config.ALARM_ID_NO_ALARM: test.log("validate alarm condition for alarm id : 0") @@ -378,7 +381,7 @@ alarm.cmd_activate_alarm_id( alarm = alarm_id) #verify alarm message based on id on alarm bar section. - test_message_based_on_alarm_id(alarm_id) + test_message_based_on_alarm_id(alarm_id, alarm_info_dict) test.endSection() @@ -423,7 +426,6 @@ utils.tstStart(__file__) startApplication(config.AUT_NAME) - verification_of_alarm_messages() verification_of_alarm_parameters() verification_of_alarm_flag() Index: tst_ui_alarms_list/test.py =================================================================== diff -u -r2adb45a4e6c007e96da38093834e936105fa0f9e -r6bb43117bca2673c5de877f5b70b094da344418a --- tst_ui_alarms_list/test.py (.../test.py) (revision 2adb45a4e6c007e96da38093834e936105fa0f9e) +++ tst_ui_alarms_list/test.py (.../test.py) (revision 6bb43117bca2673c5de877f5b70b094da344418a) @@ -366,7 +366,7 @@ displayed """ test.startSection("Set undefined alarm and verify the respective message displayed") - ALARM_IDS = [900, 300, 499] + ALARM_IDS = [900, 350, 499] alarm_id_parent_list = {} for index, alarm_id in enumerate(ALARM_IDS): test.log("Setting alarm ID {}".format(alarm_id)) @@ -377,10 +377,11 @@ open_alarm_list_when_only_alarm_list_btn_is_available() utils.waitForGUI(1) for id in ALARM_IDS: - alarm_id = waitForObject(utility.get_alarm_id_obj(id)) + alarm_id = waitForObject(utility.get_alarm_id_obj(id)) # TODO: Check object being checked for id=900 alarm_id_parent = object.parent(alarm_id) alarm_id_parent_list[id] = alarm_id_parent expected_msg = "{} [{}]".format(config.UNDEFINED_ALARM_ID_MSG, str(id)) + print(f"EXPECTED: {expected_msg}") alarm_msg = waitForObject(utility.get_alarm_msg_obj(msg=expected_msg)) test.log("Verifying 'Alarm ID'") alarm_id = pyInt(alarm_id.text.toUtf8().constData()) Index: tst_ui_logs/test.py =================================================================== diff -u -r4dd19cf5f01945b49c3abbd640a3c635248f8858 -r6bb43117bca2673c5de877f5b70b094da344418a --- tst_ui_logs/test.py (.../test.py) (revision 4dd19cf5f01945b49c3abbd640a3c635248f8858) +++ tst_ui_logs/test.py (.../test.py) (revision 6bb43117bca2673c5de877f5b70b094da344418a) @@ -29,7 +29,7 @@ from configuration import utility from configuration import config from dialin.common.msg_ids import MsgIds -from dialin.common.hd_defs import HDOpSubModes, HDOpModes +from dialin.common.hd_defs import HDStandbyStates, HDOpModes 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 @@ -244,7 +244,7 @@ #HD Operation Mode #0x2500 mode_data = HDOpModes.NUM_OF_MODES.value - submode_data = HDOpSubModes.NUM_OF_STANDBY_STATES.value + submode_data = HDStandbyStates.NUM_OF_STANDBY_STATES.value for mode in range(mode_data): for sub_mode in range(submode_data): hd_simulator.cmd_send_hd_operation_mode(op_mode = mode, sub_mode = sub_mode) @@ -273,7 +273,7 @@ verify_log(msg_id=MsgIds.MSG_ID_HD_POST_TREATMENT_STATE.value, msg="PostTreatmentStates") #0x7E00 - standby_mode_data = HDOpSubModes.STANDBY_WAIT_FOR_DISINFECT_STATE.value + standby_mode_data = HDStandbyStates.STANDBY_WAIT_FOR_DISINFECT_STATE.value for standby_mode in range(standby_mode_data): hd_simulator.cmd_send_hd_general_response(message_id=126, accepted=1, reason=1, is_pure_data=False, has_parameters=True, parameters_payload=payload) hd_simulator.cmd_send_hd_general_response(message_id=126, accepted=0, reason=0, is_pure_data=False, has_parameters=True, parameters_payload=payload) Index: tst_unhandled_message_log/test.py =================================================================== diff -u -rbcc793abed8c23b99913cf4360edc200c65652f0 -r6bb43117bca2673c5de877f5b70b094da344418a --- tst_unhandled_message_log/test.py (.../test.py) (revision bcc793abed8c23b99913cf4360edc200c65652f0) +++ tst_unhandled_message_log/test.py (.../test.py) (revision 6bb43117bca2673c5de877f5b70b094da344418a) @@ -22,8 +22,8 @@ from configuration import utility from configuration import config from dialin.utils.conversions import float_to_bytearray, integer_to_bytearray,unsigned_integer_to_bytearray +from time import sleep - hd_simulator = HDSimulator() LOCATION = '/home/denali/Projects/application/resources/settings/Messages/Unhandled.conf' @@ -103,19 +103,20 @@ with open(file_name, 'r') as csv_file: try: for row in reversed(list(csv.reader(csv_file))): - if row[0].isalpha(): + print(row) +# if row[0].isalpha(): +# pass +# else: + if count == 30: + test.fail("handler unable to find message text from error file.") + break + row_length = sum(1 for values in row) + try: + if row[1] != None and row[1] != ERROR_MESSAGE['SD_CARD_STORAGE_WARNING']: + return row[1] + except: pass - else: - if count == 30: - test.fail("handler unable to find message text from error file.") - break - row_length = sum(1 for values in row) - try: - if row[1] != None and row[1] != ERROR_MESSAGE['SD_CARD_STORAGE_WARNING']: - return row[1] - except: - pass - count+=1 + count+=1 except: test.fail("application error log data is corrupted") except: @@ -189,13 +190,13 @@ #checking if the message is not in the unhandled (err) test.startSection("verify the message is not in unhandled (err)") - hd_simulator.cmd_send_hd_general_response(message_id = 275, accepted = 1, reason = 1) + hd_simulator.cmd_send_hd_general_response(message_id = 350, accepted = 1, reason = 1) unhandled_message = get_error_message_from_log() test.log(str(unhandled_message)) test.compare(unhandled_message, ERROR_MESSAGE["UNHANDLED_API"], "message is not in unhandled.conf file. verified error message from .err file") #checking if the message is not in the unhandled (err) - hd_simulator.cmd_send_hd_general_response(message_id = 276, accepted = 1, reason = 1) + hd_simulator.cmd_send_hd_general_response(message_id = 351, accepted = 1, reason = 1) unhandled_status = get_error_message_from_log() test.compare(unhandled_message, ERROR_MESSAGE["UNHANDLED_API"], "message is not in unhandled.conf file. verified error message from .err file") test.endSection()