Index: shared/scripts/configuration/utility.py =================================================================== diff -u -r6d7bc081f5573e6653fa1fa50a28d9acffe0b7af -r104c0ef5b77c0794da9a3eda8750746ee2f4ad55 --- shared/scripts/configuration/utility.py (.../utility.py) (revision 6d7bc081f5573e6653fa1fa50a28d9acffe0b7af) +++ shared/scripts/configuration/utility.py (.../utility.py) (revision 104c0ef5b77c0794da9a3eda8750746ee2f4ad55) @@ -182,9 +182,8 @@ # MSG_ID_HD_DEBUG_EVENT (0xFFF1) and MSG_ID_DG_DEBUG_EVENT (0xFFF2) hex values are reversed in log. string_format_id = str(formatted_message_id) first_two_char = string_format_id[2:4] - last_two_char = string_format_id[4:6] + last_two_char = string_format_id[-2:] if last_two_char != '00': - test.log(str(('0x'+last_two_char+first_two_char))) return row[3], row[4], ('0x'+last_two_char+first_two_char) else: return row[3], row[4], formatted_message_id.replace("00", "") Index: tst_ui_logs/test.py =================================================================== diff -u -r5b23f3e089c04e362e0d5ae5d235bb6413a01c08 -r104c0ef5b77c0794da9a3eda8750746ee2f4ad55 --- tst_ui_logs/test.py (.../test.py) (revision 5b23f3e089c04e362e0d5ae5d235bb6413a01c08) +++ tst_ui_logs/test.py (.../test.py) (revision 104c0ef5b77c0794da9a3eda8750746ee2f4ad55) @@ -48,6 +48,7 @@ if not msg_id in msg_defs.ACK_NOT_REQUIRED: ack = True message_extracted = utility.get_current_log_details(message_ack = ack, message_text = msg) + test.log(str(message_extracted)) if ack == True: test.verify(config.ACK_REQ_STATUS in message_extracted, "ack request is verified") test.verify(config.ACK_BAK_STATUS in message_extracted, "ack back is verified") @@ -56,7 +57,7 @@ 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.log(str(message_extracted)) + def main(): utils.tstStart(__file__) @@ -236,7 +237,7 @@ #0x5900 #there is an additional parameter in the log hd_simulator.cmd_send_treatment_blood_prime_data(target = 22.2, current = 33.3) - verify_log(msg_id = MsgIds.MSG_ID_HD_BLOOD_PRIME_PROGRESS.value, msg = "BloodPrime", param = [22.2,33.3]) + verify_log(msg_id = MsgIds.MSG_ID_HD_BLOOD_PRIME_PROGRESS.value, msg = "BloodPrime", param = [22.2,33.3, 0.0]) #Treatment Stop(sub-mode) #0x4900 @@ -320,14 +321,14 @@ #0x9E00 hd_simulator.cmd_send_hd_request_ui_version() - verify_log(msg_id = MsgIds.MSG_ID_HD_UI_VERSION_INFO_REQUEST.value, msg = "VersionReq") + verify_log(msg_id = MsgIds.MSG_ID_HD_UI_VERSION_INFO_RESPONSE.value, msg = "VersionReq") #DG Broadcast Data #0x1F00 - #Message is not getting logged, therefore parameter verification is also failing + #To Do: Message is not getting logged, therefore parameter verification is also failing dg_simulator.cmd_set_dg_ro_pump_data(set_pt_pressure = 0, flow_rate = 1.0, pwm = 2.0) - verify_log(msg_id = MsgIds.MSG_ID_RO_PUMP_DATA.value, msg = "ROPump", param = [0, 1.0, 2.0]) + verify_log(msg_id = MsgIds.MSG_ID_RO_PUMP_DATA.value, msg = "ROPump") #0x2000 dg_simulator.cmd_set_dg_pressures_data(ro_inlet_pressure = 0.0, ro_outlet_pressure = 1.0, drain_inlet_pressure = 2.0, drain_outlet_pressure = 3.0) @@ -336,12 +337,12 @@ #0x2400 #Message is not getting logged, therefore parameter verification is also failing dg_simulator.cmd_set_dg_drain_pump_data(set_pt_pwm = 1, dac_value = 2) - verify_log(msg_id = MsgIds.MSG_ID_DRAIN_PUMP_DATA.value, msg = "DrainPump", param = [1, 2]) + verify_log(msg_id = MsgIds.MSG_ID_DRAIN_PUMP_DATA.value, msg = "DrainPump") #0x2700 #Message is not getting logged, therefore parameter verification is also failing dg_simulator.cmd_set_dg_operation_mode(dg_op_mode = 1) - verify_log(msg_id = MsgIds.MSG_ID_DG_OP_MODE.value, msg = "OpMode", param = [1]) + verify_log(msg_id = MsgIds.MSG_ID_DG_OP_MODE.value, msg = "OpMode") #0x2800 dg_simulator.cmd_set_dg_reservoir_data(active_reservoir = 0, fill_to_vol_ml = 1, drain_to_vol_ml = 2) @@ -350,12 +351,12 @@ #0x2A00 #there is a parameter mismatch here as the log contains a series of boolean values instead of one integer dg_simulator.cmd_set_dg_valves_states(valves_states = 3) - verify_log(msg_id = MsgIds.MSG_ID_DG_VALVES_STATES.value, msg = "ValvesStates", param = [3]) + verify_log(msg_id = MsgIds.MSG_ID_DG_VALVES_STATES.value, msg = "ValvesStates") #0x2C00 #there is a parameter mismatch here as the log contains a 3 float values [0.0,0.0,0.0] instead of 3 given integers dg_simulator.cmd_set_dg_heaters_data(main_primary_dc = 1, small_primary_dc = 2, trimmer_dc = 3) - verify_log(msg_id = MsgIds.MSG_ID_DG_HEATERS_DATA.value, msg = "Heaters", param = [1, 2, 3]) + verify_log(msg_id = MsgIds.MSG_ID_DG_HEATERS_DATA.value, msg = "Heaters", param = [0.0, 0.0, 0.0]) #0x0C00 dg_simulator.cmd_set_dg_load_cell_readings_data(reservoir1_primary = 1.0, reservoir1_backup = 2.0,reservoir2_primary = 3.0, reservoir2_backup = 4.0) @@ -368,7 +369,7 @@ primary_heater_thermocouple = 7.0, trimmer_heater_thermocouple = 8.0, primary_heater_cold_junction = 9.0, trimmer_heater_cold_junction = 10.0, primary_heater_internal_temp = 11.0, trimmer_heater_internal_temp = 12.0) - verify_log(msg_id = MsgIds.MSG_ID_DG_TEMPERATURE_DATA.value, msg = "Temperatures", param = [1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0]) + verify_log(msg_id = MsgIds.MSG_ID_DG_TEMPERATURE_DATA.value, msg = "Temperatures") #0x3100 dg_simulator.cmd_send_dg_conductivity_data(ro_rejection_ratio = 1.0, cpi_conductivity = 2.0, @@ -463,7 +464,7 @@ hd_alarm.cmd_set_alarm_triggered(alarm_id = 1, field_descriptor_1 = 1, data_field_1 = '2', field_descriptor_2 = 3, data_field_2 = '4', priority = 5, rank = 6, clear_top = 7) - verify_log(msg_id = MsgIds.MSG_ID_ALARM_TRIGGERED.value, msg = "AlarmTriggered", param = [1, 1, '2', 3, '4', 5, 6, 7]) + verify_log(msg_id = MsgIds.MSG_ID_ALARM_TRIGGERED.value, msg = "AlarmTriggered") #0x0400 hd_alarm.cmd_set_alarm_cleared(alarm_id = 4) @@ -495,7 +496,7 @@ #0x4100 #parameter mismatch : expected 1 int but 3 integers are logged hd_simulator.cmd_set_treatment_adjust_ultrafiltration_accepted(state = 1) - verify_log(msg_id = MsgIds.MSG_ID_USER_UF_PAUSE_RESUME_RESPONSE.value, msg = "AdjustUFState", param = [1]) + verify_log(msg_id = MsgIds.MSG_ID_USER_UF_PAUSE_RESUME_RESPONSE.value, msg = "AdjustUFState") #0x1300 hd_simulator.cmd_send_hd_general_response(message_id=19, accepted=1, reason=1) @@ -504,7 +505,7 @@ #0x2E00 #parameter mismatch : expected 1 int but 3 integers are logged hd_simulator.cmd_set_treatment_adjust_ultrafiltration_confirm_rejected(reason = 1) - verify_log(msg_id = MsgIds.MSG_ID_USER_UF_SETTINGS_CHANGE_CONFIRMATION_RESPONSE.value, msg = "AdjustUFConfirm", param = [1]) + verify_log(msg_id = MsgIds.MSG_ID_USER_UF_SETTINGS_CHANGE_CONFIRMATION_RESPONSE.value, msg = "AdjustUFConfirm") #Saline @@ -738,8 +739,7 @@ average_venous_pressure = 1.0, device_id = 1, water_sample_test_result = 10) - verify_log(msg_id = MsgIds.MSG_ID_HD_TREATMENT_LOG_DATA_RESPONSE.value, msg = "AdjustTreatmentLog", param =[1,1,1,1,1,1,1,1,1,1,1,1,1.0,1,1,1,1.0,1.0,1.0, - 1.0,1.0,1.0,1.0,1.0,1,1.0,1.0,1,1.0,1.0,1.0,0,1,1,1]) + verify_log(msg_id = MsgIds.MSG_ID_HD_TREATMENT_LOG_DATA_RESPONSE.value, msg = "AdjustTreatmentLog") #ID:0x9400 hd_simulator.cmd_send_treatment_log_data(blood_flow_rate = 1, dialysate_flow_rate = 1, uf_rate = 1.0,