Index: shared/scripts/configuration/config.py =================================================================== diff -u -rc79559a8ecd6dc676c7aed956ba1a5d1e45534a0 -r9ef78246744be74035d8521b7ee71dc84a623883 --- shared/scripts/configuration/config.py (.../config.py) (revision c79559a8ecd6dc676c7aed956ba1a5d1e45534a0) +++ shared/scripts/configuration/config.py (.../config.py) (revision 9ef78246744be74035d8521b7ee71dc84a623883) @@ -144,7 +144,7 @@ "saline_bolus" : [100, 100, 425], "dialysate_temperature" : [35, 0.5, 187.5], "arterial_pressure_limit_high" : [20, 10, 11.931], - "blood_pressure_measurement_interval" : [0, 5, 50], + "blood_pressure_measurement_interval" : [5, 5, 50], } #Alarms location @@ -156,6 +156,21 @@ #Service password location SERVICE_CONF_LOCATION ="".join([str(HOME_DIR_PATH),'/Projects/application/resources/settings/Settings/System.conf']) +DEFAULT_SERVICE_PASSWORD_RAW = "Atal.Matal.22leh" # TODO need to update if we ever change the default +SERVICE_SCREEN_SUBSCREEN_INDEX = { + "INFORMATION_SUBSCREEN" :2, + "VOLUME_AND_BRIGHTNESS_SUBSCREEN":3, + "WIFI_SUBSCREEN" : 4, + "BLUETOOTH_CUFF_SUBSCREEN" :5, + "DG_CLEANING_SUBSCREEN" : 6, + "SET_DATETIME_SUBSCREEN" : 7, + "EXPORT_LOGS_SUBSCREEN" : 8, + "WATER_INPUT_MODE_SUBSCREEN" : 9, + # ONLY ACCESSIBLE WITH SERVICE LOG-IN + "ENABLE_ROOT_SUBSCREEN" : 10, + "FACTORY_RESET_SUBSCREEN" :11, + "DECOMMISSION_SUBSCREEN" :12 + } #alarm colors ALARMS_COLORS_HEADER = { Index: shared/scripts/configuration/strings.py =================================================================== diff -u -r6f1e1819d6605964e7ba8366d0408cc26890be99 -r9ef78246744be74035d8521b7ee71dc84a623883 --- shared/scripts/configuration/strings.py (.../strings.py) (revision 6f1e1819d6605964e7ba8366d0408cc26890be99) +++ shared/scripts/configuration/strings.py (.../strings.py) (revision 9ef78246744be74035d8521b7ee71dc84a623883) @@ -200,7 +200,6 @@ DEVICE_SETTINGS_SCREEN_PARAMETER = ["Information", "Volume And Brightness", "Wi-Fi", "Bluetooth Cuff", "DG Cleaning", "Service", "Export Logs"] #Service -DEFAULT_SERVICE_PASSWORD_RAW = "Atal.Matal.22leh" # TODO need to update if we ever change the default CLEAR_ALARM_CONDITION_TEXT = "Clear Alarm Condition" EXPORT_LOGS ="Export Logs" EXPORT_LOG_TEXT ="Export Logs" @@ -216,8 +215,8 @@ SettingsHome_Settings_Text = "Settings" SERVICE_SCREEN_TITLE_TEXT = "Service" SERVICES_TITLE_TEXT = "Service Password" +SERVICES_ENABLE_ROOT_SSH_TITLE="Enable Root SSH" - #main treatment screen VITALS_TITLE = "VITALS" PATIENT_ID = "demopatientid" Index: shared/scripts/names.py =================================================================== diff -u -r6f1e1819d6605964e7ba8366d0408cc26890be99 -r9ef78246744be74035d8521b7ee71dc84a623883 --- shared/scripts/names.py (.../names.py) (revision 6f1e1819d6605964e7ba8366d0408cc26890be99) +++ shared/scripts/names.py (.../names.py) (revision 9ef78246744be74035d8521b7ee71dc84a623883) @@ -246,7 +246,7 @@ # 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} o_PreTreatmentBase_Continue_Text = {"container": o_PreTreatmentConnectionStack_PreTreatmentBase_TreatmentFlowBase_2, "text": "CONTINUE", "type": "Text", "unnamed": 1, "visible": True} -o_PreTreatmentBase_input_TextInput_2 = {"container": o_PreTreatmentConnectionStack_PreTreatmentBase_TreatmentFlowBase_2, "echoMode": 0, "id": "_input", "type": "TextInput", "unnamed": 1, "visible": True} +o_PreTreatmentBase_input_TextInput_2 = {"container": o_PreTreatmentConnectionStack_PreTreatmentBase_TreatmentFlowBase_2, "id": "_input", "type": "TextInput", "unnamed": 1, "visible": True} o_PreTreatmentBase_BP_HR_Text = {"container": o_PreTreatmentConnectionStack_PreTreatmentBase_TreatmentFlowBase_2, "occurrence": 2, "text": "BP/HR", "type": "Text", "unnamed": 1, "visible": True} o_PreTreatmentBase_Blood_Pressure_Text = {"container": o_PreTreatmentConnectionStack_PreTreatmentBase_TreatmentFlowBase_2, "text": "Blood Pressure", "type": "Text", "unnamed": 1, "visible": True} o_PreTreatmentBase_mmHg_Label = {"container": o_PreTreatmentConnectionStack_PreTreatmentBase_TreatmentFlowBase_2, "text": "mmHg", "type": "Label", "unnamed": 1, "visible": True} @@ -872,6 +872,7 @@ o_export_logs_text = {"container": o_SettingsBase_SettingsBase, "text": "Export Logs", "type": "Text", "unnamed": 1, "visible": True} o_combo_box = {"container": o_SettingsBase_SettingsBase, "id": "_logTypeCombo", "type": "ComboBox", "unnamed": 1, "visible": True} o_option_combo_box = {"container": o_Overlay, "type": "Text", "unnamed": 1, "visible": True} +o_serviceScreen_subscreen_menu = {"container": o_SettingsHome_SettingsHome_2, "id": "_mouseArea", "occurrence": 0, "type": "MouseArea", "unnamed": 1, "visible": True} # service information screen o_SettingsHome_touchItem_TouchRect_service_information = {"container": o_SettingsHome_SettingsHome_2, "id": "_touchItem", "type": "TouchRect", "unnamed": 1, "visible": True} @@ -1101,3 +1102,13 @@ o_SettingsBase_serviceScreen_TextInput_month = {"container": o_SettingsHome_SettingsHome, "echoMode": 0, "id": "_input", "occurrence":3, "type": "TextInput", "unnamed": 1, "visible": True} o_SettingsBase_serviceScreen_TextInput_year = {"container": o_SettingsHome_SettingsHome, "echoMode": 0, "id": "_input", "occurrence": 5, "type": "TextInput", "unnamed": 1, "visible": True} +o_SettingsBase_SettingsROInput = {"container": o_Gui_MainView, "objectName": "_SettingsBase", "type": "SettingsROInput", "visible": True} +o_SettingsBase_settingsRoInputSwitch_Switch = {"checkable": True, "container": o_SettingsBase_SettingsROInput, "id": "_settingsRoInputSwitch", "type": "Switch", "unnamed": 1, "visible": True} +o_SettingsBase_Water_Input_Mode_Text = {"container": o_SettingsBase_SettingsROInput, "text": "Water Input Mode", "type": "Text", "unnamed": 1, "visible": True} +o_SettingsBase_SettingsRootSSHAccess = {"container": o_Gui_MainView, "objectName": "_SettingsBase", "type": "SettingsRootSSHAccess", "visible": True} +o_SettingsBase_Enable_Root_SSH_Screen_Text = {"container": o_SettingsBase_SettingsRootSSHAccess, "text": "Enable SSH Login", "type": "Text", "unnamed": 1, "visible": True} +o_SettingsBase_settingsRootSSHAccess_SSHDSwitch_Switch = {"checkable": True, "container": o_SettingsBase_SettingsRootSSHAccess, "id": "_settingsRootSSHAccess_SSHDSwitch", "type": "Switch", "unnamed": 1, "visible": True} +o_SettingsBase_settingsRootSSHAccess_RootSwitch_Switch = {"checkable": True, "container": o_SettingsBase_SettingsRootSSHAccess, "id": "_settingsRootSSHAccess_RootSwitch", "type": "Switch", "unnamed": 1, "visible": True} +o_SettingsBase_Enable_Root_SSH_Text = {"container": o_SettingsBase_SettingsRootSSHAccess, "text": "Enable Root SSH", "type": "Text", "unnamed": 1, "visible": True} +o_treatmentHome_Saline_Rejection_Text = {"container": o_treatmentHome, "text": "", "type": "Text", "unnamed": 1, "visible": True} + Index: tst_main_treatment_vitals/test.py =================================================================== diff -u -rc79559a8ecd6dc676c7aed956ba1a5d1e45534a0 -r9ef78246744be74035d8521b7ee71dc84a623883 --- tst_main_treatment_vitals/test.py (.../test.py) (revision c79559a8ecd6dc676c7aed956ba1a5d1e45534a0) +++ tst_main_treatment_vitals/test.py (.../test.py) (revision 9ef78246744be74035d8521b7ee71dc84a623883) @@ -16,9 +16,10 @@ import time from configuration import config, utility +from configuration import application_init as application_init from dialin.ui import utils from dialin.ui.hd_simulator import HDSimulator -from dialin.common.hd_defs import PreTreatmentSubModes, HDOpModes, HDStandbyStates, PreTreatmentSampleWaterStates, PreTreatmentConsumableSelfTestStates, PreTreatmentNoCartSelfTestStates, PreTreatmentCartridgeInstallStates, PreTreatmentDrySelfTestsStates, PreTreatmentPrimeStates, PreTreatmentRecircStates, PreTreatmentPatientConnectionStates, TreatmentStates, UFStates, SalineBolusStates, HeparinStates +from dialin.common.hd_defs import PreTreatmentSubModes, HDOpModes, HDStandbyStates, PreTreatmentSampleWaterStates, PreTreatmentConsumableSelfTestStates, PreTreatmentNoCartSelfTestStates, PreTreatmentCartridgeInstallStates, PreTreatmentDrySelfTestsStates, PreTreatmentPrimeStates, PreTreatmentRecircStates, PreTreatmentPatientConnectionStates, TreatmentStates, UFStates, SalineBolusStates, HeparinStates,PreTreatmentWetSelfTestStates,HDPreTreatmentReservoirMgmtStates from time import strftime # from dialin.ui.utils import waitForGUI @@ -336,18 +337,23 @@ test.startSection("Verify the entered systolic, diastolic and heart rate value updated in main-treatement screen") systolic = waitForObject(names.o_pop_up_systolic_input_field) mouseClick(systolic) + utils.waitForGUI(1) utility.erase_entered_value(systolic) mouseClick(systolic) + utils.waitForGUI(1) utility.enter_keypad_value(str(sys_val)) verify_entered_value_in_pop_up(value=str(sys_val), input_field=systolic, vital=config.SYSTOLIC_TEXT) verify_color_of_entry(entry=sys_val, vital_parameter=config.SYSTOLIC_TEXT, input_field=systolic) + diastolic = waitForObject(names.o_pop_up_diastolic_input_field) mouseClick(diastolic) + utils.waitForGUI(0.5) utility.erase_entered_value(diastolic) utils.waitForGUI(1) utility.enter_keypad_value(str(dia_val)) verify_entered_value_in_pop_up(value=str(dia_val), input_field=diastolic, vital=config.DIASTOLIC_TEXT) verify_color_of_entry(entry=dia_val, vital_parameter=config.DIASTOLIC_TEXT, input_field=diastolic) + utils.waitForGUI(0.5) hr = waitForObject(names.o_pop_up_heart_rate_input_field) mouseClick(hr) utility.erase_entered_value(hr) @@ -509,7 +515,7 @@ mouseClick(names.o_PreTreatmentCreate_BPInterval_Switch) utils.waitForGUI(1) test.compare(waitForObject(names.o_PreTreatmentCreate_bloodPressureMeasurementInterval_SliderCreateTreatment).label, config.BLOOD_PRESSURE_MEASUREMENT_INTERVAL, "Parameter should be -> "+str(config.BLOOD_PRESSURE_MEASUREMENT_INTERVAL)) - test_custom_treatment_slider(names.o_PreTreatmentCreate_bloodPressureMeasurementIntervalSlider_Slider, 25, config.CREATE_TREATMENT_SLIDER_VALUES["blood_pressure_measurement_interval"], config.BLOOD_PRESSURE_MEASUREMENT_INTERVAL) + test_custom_treatment_slider(names.o_PreTreatmentCreate_bloodPressureMeasurementIntervalSlider_Slider, 5, config.CREATE_TREATMENT_SLIDER_VALUES["blood_pressure_measurement_interval"], config.BLOOD_PRESSURE_MEASUREMENT_INTERVAL) test.endSection() test.endSection() @@ -582,8 +588,8 @@ 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.") + test.compare(waitForObjectExists(names.o_PreTreatmentBase_CONFIRM_Text_2).text, config.CONFIRM_TEXT, "BP/HR button text should be " + str(config.CONFIRM_TEXT)) + test.compare(waitForObjectExists(names.o_PreTreatmentBase_CONFIRM_Text_2).enabled, False, "BP/HR button should disabled.") test.compare(waitForObjectExists(names.o_PreTreatmentBase_Blood_Pressure_Text).text, config.BLOOD_PRESSURE_TITLE, "BP title text should be :" + str(config.BLOOD_PRESSURE_TITLE)) test.compare(waitForObjectExists(names.o_PreTreatmentBase_mmHg_Label).text, config.BLOOD_PRESSURE_UNIT, "BP unit should be " + str(config.BLOOD_PRESSURE_UNIT)) test.compare(waitForObjectExists(names.o_PreTreatmentBase_Heart_Rate_Text).text, config.HEART_RATE_TITLE, "HR text should be :" + str(config.HEART_RATE_TITLE)) @@ -655,22 +661,14 @@ 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=PreTreatmentNoCartSelfTestStates.NO_CART_SELF_TESTS_HOME_IDLE_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_WAIT_FOR_USER_START_STATE.value,recirculate_state=PreTreatmentRecircStates.PRE_TREATMENT_RECIRC_STATE.value, patient_connection_state=PreTreatmentPatientConnectionStates.PRE_TREATMENT_PAT_CONN_WAIT_FOR_USER_CONFIRM_STATE.value) - hd_simulator.cmd_send_uf_treatment_response(accepted=True, reason=0, volume=0.00) - + prime_state=PreTreatmentPrimeStates.HD_PRIME_WAIT_FOR_USER_START_STATE.value,recirculate_state=PreTreatmentRecircStates.PRE_TREATMENT_RECIRC_STATE.value, patient_connection_state=PreTreatmentPatientConnectionStates.PRE_TREATMENT_PAT_CONN_WAIT_FOR_USER_CONFIRM_STATE.value, + wet_selftests_state=PreTreatmentWetSelfTestStates.WET_SELF_TESTS_START_STATE.value, + pretreatment_rsrvr_state=HDPreTreatmentReservoirMgmtStates.PRE_TREATMENT_RESERVOIR_MGMT_START_STATE.value) verify_entered_vitals_in_patient_connection_screen() utils.waitForGUI(1) hd_simulator.cmd_send_hd_operation_mode(op_mode=HDOpModes.MODE_TREA.value, sub_mode=TreatmentStates.TREATMENT_DIALYSIS_STATE.value) utils.waitForGUI(1) - hd_simulator.cmd_set_treatment_states_data(sub_mode = TreatmentStates.TREATMENT_BLOOD_PRIME_STATE.value, uf_state= UFStates.UF_START_STATE.value, saline_state= SalineBolusStates.SALINE_BOLUS_STATE_IDLE.value, heparin_state= HeparinStates.HEPARIN_STATE_OFF.value, - rinseback_state= TreatmentStates.TREATMENT_RINSEBACK_STATE.value, recirculate_state= TreatmentStates.TREATMENT_RECIRC_STATE.value, blood_prime_state= TreatmentStates.TREATMENT_BLOOD_PRIME_STATE.value, - treatment_end_state= TreatmentStates.TREATMENT_END_STATE.value, treatment_stop_state= TreatmentStates.TREATMENT_STOP_STATE.value, dialysis_state= TreatmentStates.TREATMENT_DIALYSIS_STATE.value) - hd_simulator.cmd_set_treatment_states_data(sub_mode = TreatmentStates.TREATMENT_DIALYSIS_STATE.value, uf_state= UFStates.UF_START_STATE.value, saline_state= SalineBolusStates.SALINE_BOLUS_STATE_IDLE.value, heparin_state= HeparinStates.HEPARIN_STATE_OFF.value, - rinseback_state= TreatmentStates.TREATMENT_RINSEBACK_STATE.value, recirculate_state= TreatmentStates.TREATMENT_RECIRC_STATE.value, blood_prime_state= TreatmentStates.TREATMENT_BLOOD_PRIME_STATE.value, - treatment_end_state= TreatmentStates.TREATMENT_END_STATE.value, treatment_stop_state= TreatmentStates.TREATMENT_STOP_STATE.value, dialysis_state= TreatmentStates.TREATMENT_DIALYSIS_STATE.value) - mouseClick(waitForObject(names.o_vitals_close_btn)) - utils.waitForGUI(1) verify_vitals_pop_up_is_opened_automatically_after_an_interval(interval=5) test.endSection() @@ -683,10 +681,10 @@ """ hd_simulator.cmd_send_hd_operation_mode(op_mode=HDOpModes.MODE_TREA.value, sub_mode=TreatmentStates.TREATMENT_DIALYSIS_STATE.value) utils.waitForGUI(1) - hd_simulator.cmd_set_treatment_states_data(sub_mode = TreatmentStates.TREATMENT_BLOOD_PRIME_STATE.value, uf_state= UFStates.UF_START_STATE.value, saline_state= SalineBolusStates.SALINE_BOLUS_STATE_IDLE.value, heparin_state= HeparinStates.HEPARIN_STATE_OFF.value, + hd_simulator.cmd_set_treatment_states_data(sub_mode = TreatmentStates.TREATMENT_BLOOD_PRIME_STATE.value, uf_state= UFStates.UF_PAUSED_STATE.value, saline_state= SalineBolusStates.SALINE_BOLUS_STATE_IDLE.value, heparin_state= HeparinStates.HEPARIN_STATE_OFF.value, rinseback_state= TreatmentStates.TREATMENT_RINSEBACK_STATE.value, recirculate_state= TreatmentStates.TREATMENT_RECIRC_STATE.value, blood_prime_state= TreatmentStates.TREATMENT_BLOOD_PRIME_STATE.value, treatment_end_state= TreatmentStates.TREATMENT_END_STATE.value, treatment_stop_state= TreatmentStates.TREATMENT_STOP_STATE.value, dialysis_state= TreatmentStates.TREATMENT_DIALYSIS_STATE.value) - hd_simulator.cmd_set_treatment_states_data(sub_mode = TreatmentStates.TREATMENT_DIALYSIS_STATE.value, uf_state= UFStates.UF_START_STATE.value, saline_state= SalineBolusStates.SALINE_BOLUS_STATE_IDLE.value, heparin_state= HeparinStates.HEPARIN_STATE_OFF.value, + hd_simulator.cmd_set_treatment_states_data(sub_mode = TreatmentStates.TREATMENT_DIALYSIS_STATE.value, uf_state= UFStates.UF_PAUSED_STATE.value, saline_state= SalineBolusStates.SALINE_BOLUS_STATE_IDLE.value, heparin_state= HeparinStates.HEPARIN_STATE_OFF.value, rinseback_state= TreatmentStates.TREATMENT_RINSEBACK_STATE.value, recirculate_state= TreatmentStates.TREATMENT_RECIRC_STATE.value, blood_prime_state= TreatmentStates.TREATMENT_BLOOD_PRIME_STATE.value, treatment_end_state= TreatmentStates.TREATMENT_END_STATE.value, treatment_stop_state= TreatmentStates.TREATMENT_STOP_STATE.value, dialysis_state= TreatmentStates.TREATMENT_DIALYSIS_STATE.value) @@ -760,23 +758,24 @@ def main(): utils.tstStart(__file__) + application_init.setup_post_log_successful_start() startApplication(config.AUT_NAME) hd_simulator.cmd_send_power_on_self_test_version_request() hd_simulator.cmd_set_treatment_states_data(sub_mode=TreatmentStates.TREATMENT_DIALYSIS_STATE.value, uf_state=TreatmentStates.TREATMENT_START_STATE.value, saline_state=TreatmentStates.TREATMENT_START_STATE.value, heparin_state=TreatmentStates.TREATMENT_START_STATE.value, rinseback_state=TreatmentStates.TREATMENT_START_STATE.value, recirculate_state=TreatmentStates.TREATMENT_START_STATE.value, blood_prime_state=TreatmentStates.TREATMENT_START_STATE.value, treatment_end_state=TreatmentStates.TREATMENT_START_STATE.value, treatment_stop_state=TreatmentStates.TREATMENT_START_STATE.value, dialysis_state=TreatmentStates.TREATMENT_START_STATE.value) - + hd_simulator.cmd_set_treatment_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) @@ -800,7 +799,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_treatment_saline_data/test.py =================================================================== diff -u -r6bb43117bca2673c5de877f5b70b094da344418a -r9ef78246744be74035d8521b7ee71dc84a623883 --- tst_treatment_saline_data/test.py (.../test.py) (revision 6bb43117bca2673c5de877f5b70b094da344418a) +++ tst_treatment_saline_data/test.py (.../test.py) (revision 9ef78246744be74035d8521b7ee71dc84a623883) @@ -81,6 +81,9 @@ """ test.compare(waitForObjectExists(names.o_treatmentHome_ultrafiltrationTouchArea_TreatmentUltrafiltration).isTouchable, enabled_status,"uf touchable area is visible") +def saline_rejection_text_object(text): + names.o_treatmentHome_Saline_Rejection_Text["text"] = text + return names.o_treatmentHome_Saline_Rejection_Text def test_state(accept_status, button_text, target, saline_states): """ @@ -95,7 +98,7 @@ # when rejected reason set 16 -> saline bolus in progress if (not accept_status): rejection_reason = rejectReason.REQUEST_REJECT_REASON_SALINE_BOLUS_IN_PROGRESS.value hd_simulator.cmd_set_saline_bolus_response(accepted = accept_status, reason = rejection_reason, target = target) - 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])) + if (not accept_status): test.compare(waitForObjectExists(saline_rejection_text_object(config.REJECTION_REASON[rejection_reason])).text, config.REJECTION_REASON[rejection_reason], "expected rejection {msg} displayed".format(msg=config.REJECTION_REASON[rejection_reason])) #set saline transition state. hd_simulator.cmd_set_treatment_states_data(sub_mode=HDStandbyStates.STANDBY_WAIT_FOR_DISINFECT_STATE.value, uf_state=TreatmentStates.TREATMENT_START_STATE.value, saline_state=saline_states, heparin_state=TreatmentStates.TREATMENT_START_STATE.value, @@ -117,9 +120,11 @@ test.startSection("verification of rejection messages on saline bolus") for rejection in range(1, config.NUM_OF_REQUEST_REJECT_REASONS): hd_simulator.cmd_set_saline_bolus_response(accepted=accept_status, reason=rejection, target=target) - rejection_message = waitForObjectExists(utility.rejection_msg(config.REJECTION_REASON[rejection])) - test.compare(rejection_message.text, config.REJECTION_REASON[rejection], "expected rejection {msg} displayed".format(msg=config.REJECTION_REASON[rejection])) - + try: + rejection_message = waitForObjectExists(saline_rejection_text_object(config.REJECTION_REASON[rejection]), 256) #256ms timeout + test.compare(rejection_message.text, config.REJECTION_REASON[rejection], "expected rejection {msg} displayed".format(msg=config.REJECTION_REASON[rejection])) + except LookupError: + test.fail("expected rejection {msg} message object not found".format(msg=config.REJECTION_REASON[rejection])) test.endSection() @@ -141,8 +146,8 @@ test.log("verification of saline values from dialysis state for target value :" + str(target_value)+ " cumulative value :" +str(cumulative_value)+" and delivered value :"+ str(delivered_value)) verify_target_value(expected_target_value = format(target_value, '.1f')) - verify_delivered_value(expected_delivered_value = format(delivered_value, '.0f')) - verify_cumulative_value(expected_cumulative_value = format(cumulative_value, '.0f')) + verify_delivered_value(expected_delivered_value = format(delivered_value, '.1f')) + verify_cumulative_value(expected_cumulative_value = format(cumulative_value, '.1f')) test.endSection()