Index: tst_ui_logs/test.py =================================================================== diff -u -r23e5a17f7d7e2edfccb39267e653da81112df76f -r909d58d594727fa3565b98ba0a08d39f566cac8c --- tst_ui_logs/test.py (.../test.py) (revision 23e5a17f7d7e2edfccb39267e653da81112df76f) +++ tst_ui_logs/test.py (.../test.py) (revision 909d58d594727fa3565b98ba0a08d39f566cac8c) @@ -43,17 +43,17 @@ NUMBER_OF_TREATMENTMODES = 3 CONDITIONS = [0,1] -def verify_log(msg_id,msg=None, param=None): +def verify_log(msg_id = None,msg=None, param=None): """ This function verifies the UI log's. @param msg_id - (string) expected message_id's. @param msg - (string) message to be displayed on log. @param param - (list) parameters for msg_id's. """ - test.startSection("Verification of UI log based on message ID : " + str(msg_id)) + test.startSection("Verification of UI log based on message : " + str(msg)) utils.waitForGUI(2) ack = False - if not msg_id in msg_defs.ACK_NOT_REQUIRED: + if not msg_id in msg_defs.ACK_NOT_REQUIRED and msg_id != None: ack = True message_extracted = utility.get_current_log_details(message_ack=ack, message_text=msg) test.log(str(message_extracted)) @@ -62,16 +62,17 @@ test.verify(config.ACK_BAK_STATUS in message_extracted, "ack back is verified") message_id_hex = builtins.hex(builtins.int(msg_id)) message_id_str = builtins.str(message_id_hex) - test.verify(message_id_str in message_extracted, "message ID is verified") + test.verify(message_id_str in message_extracted, "message ID is verified") if param != None: test.verify(param in message_extracted, "parameters are verified") test.endSection() def main(): utils.tstStart(__file__) - startApplication(config.AUT_NAME) + startApplication(config.AUT_NAME+" -d") + #HD Broadcast #0x0D00 hd_simulator.cmd_set_treatment_time(200,60,0) @@ -88,7 +89,7 @@ rot_speed = 112.2 , mot_speed = 120.3, mc_speed = 100.0, mc_current = 12.5, pwm = 32.3) verify_log(msg_id = MsgIds.MSG_ID_DIALYSATE_FLOW_DATA.value, msg = "DialysateFlow", param = [20,10.5,112.2,120.3,100.0,12.5,32.3]) - + #0x0900 hd_simulator.cmd_set_pressure_occlusion_data(arterial_prs = 54.5, venous_prs = 20.1, blood_pump_occlusion = 3, dialysate_inlet_pump_occlusion = 2, dialysate_outlet_pump_occlusion = 5) @@ -170,7 +171,7 @@ blood_leak_detect_level = 1, blood_leak_st_count = 1, blood_leak_led_intensity = 2, blood_leak_register_counter = 3) verify_log(msg_id = MsgIds.MSG_ID_HD_BLOOD_LEAK_DATA.value, msg = "BloodLeak", param = [0,1,2,3,2,1,1,1,2,3]) - + #0x9300 hd_simulator.cmd_send_hd_air_bubble_data(venous_air_bubble_status = 2, venous_air_bubble_state = 0) verify_log(msg_id = MsgIds.MSG_ID_HD_BUBBLES_DATA.value, msg = "AirBubble", param = [2,0]) @@ -1102,13 +1103,44 @@ payload = unsigned_integer_to_bytearray(1) dg_simulator.cmd_send_dg_general_response(message_id=111, accepted=0, reason=1, is_pure_data = False, has_parameters = True, parameters_payload = payload) verify_log(msg_id = MsgIds.MSG_ID_UI_DG_SET_RTC_REQUEST.value, msg = "Set RTC Date and Time") - + #0x8100 hd_simulator.cmd_send_hd_general_response(message_id=129, accepted=1, reason=0, is_pure_data = True, has_parameters = False, parameters_payload = None) - #verify_log(msg_id = MsgIds.MSG_ID_UI_CHEM_DISINFECT_CONFIRM.value, msg = "DG check-in w/ HD") + verify_log(msg_id = MsgIds.MSG_ID_UI_CHEM_DISINFECT_CONFIRM.value, msg = "DG check-in w/ HD") #0xB000 hd_simulator.cmd_send_hd_general_response(message_id=176, accepted=1, reason=0, is_pure_data = True, has_parameters = False, parameters_payload = None) - + verify_log(msg = "DG check-in w/ HD") + + #Verification of Dialin->HD API's data from unhandled.conf file channel ID: 400 + #0x8019 + payload = unsigned_integer_to_bytearray(1) + payload += unsigned_integer_to_bytearray(2) + hd_simulator.cmd_send_hd_general_response(message_id = 32770, accepted = 1, reason = 0, is_pure_data = False, has_parameters = True, parameters_payload = payload, channel_id=0x400) + verify_log(msg = "~HD_Off_Button_State", param = [1,2]) + + #0x801A + payload = unsigned_integer_to_bytearray(1) + payload += unsigned_integer_to_bytearray(2) + hd_simulator.cmd_send_hd_general_response(message_id = 32794, accepted = 1, reason = 0, is_pure_data = False, has_parameters = True, parameters_payload = payload, channel_id=0x400) + verify_log(msg = "~HD_Blood_Pump_Rotor_Count", param = [1,2]) + + + #Verification of Dialin->DG API's data from unhandled.conf file channel ID: 400 + #0xA001 + payload = unsigned_integer_to_bytearray(1) + payload += unsigned_integer_to_bytearray(1) + payload += unsigned_integer_to_bytearray(1) + hd_simulator.cmd_send_hd_general_response(message_id = 40961, accepted = 1, reason = 0, is_pure_data = False, has_parameters = True, parameters_payload = payload, channel_id=0x402) + verify_log(msg = "~DG_Alarm_State", param = [1,1,1]) + + #0xA002 + payload = unsigned_integer_to_bytearray(1) + payload += unsigned_integer_to_bytearray(1) + payload += unsigned_integer_to_bytearray(1) + hd_simulator.cmd_send_hd_general_response(message_id = 40962, accepted = 1, reason = 0, is_pure_data = False, has_parameters = True, parameters_payload = payload, channel_id=0x402) + verify_log(msg = "~DG_Watchdog_Check_In", param = [1,1,1]) + + utils.tstDone()