Index: suite_leahi/shared/scripts/configuration/config.py =================================================================== diff -u -r2807dd5593235d0424ec9ba288bfc56f7e5c1226 -r7fa3503b0eeaf8e05f4f885d7af4ea2947d90e0a --- suite_leahi/shared/scripts/configuration/config.py (.../config.py) (revision 2807dd5593235d0424ec9ba288bfc56f7e5c1226) +++ suite_leahi/shared/scripts/configuration/config.py (.../config.py) (revision 7fa3503b0eeaf8e05f4f885d7af4ea2947d90e0a) @@ -82,8 +82,8 @@ "Stop Time" :"OFF"} heparin_values = { "Heparin Type" :"Unfractionated 1,000", - "Dispensing Rate" :"0.5", - "Bolus Volume" :"0.4", + "Dispensing Rate" :"0.3", + "Bolus Volume" :"0.2", "Stop Time" :"60"} PAUSE = 'Pause' @@ -198,6 +198,10 @@ MID_UF_RATE = 5.00 MID_VOLUME_DELIVERED = 4.00 +MIN_UF_VOLUME = 0.35 +MIN_UF_RATE = 0.22 +MIN_VOLUME_DELIVERED = 0.09 + ULTRAFILTRATION_VOLUME = "Ultrafiltration Volume (L)" UF_VOLUME_REMOVED = "UF Volume Removed" UF_VOLUME_GOAL = "UF Volume Goal" @@ -207,12 +211,23 @@ MAX_NEW_UF_VOLUME = 8.0 MAX_NEW_UF_RATE = 2.0 +ULTRAFILTRATION_PAUSED_STATE = "Ultrafiltration Paused" +ULTRAFILTRATION_COMPLETE_STATE = "Ultrafiltration Complete" + #Rinseback BLOOD_RETURN_SETUP = "Blood Return Setup" RINSEBACK_PAUSED = "Rinseback Paused" BLOOD_RETURN_COUNTDOWN_DESCRIPTION_TEXT = "Blood return will NOT be allowed in:" BLOOD_RETURN_COMPLETE = "Blood Return Complete!" TEST_PRIMARY ="Test the primary carbon filter and enter the result below" TEST_SECONDARY ="Test the secondary carbon filter and enter the result below" +ISOLATED_UF_VOLUME_REMOVED = "Isolated UF Volume Removed" +ISOLATED_UF_VOLUME_GOAL ="Isolated UF Volume Goal" +PRESSURE_TREATMENT_PARAMETERS = ["Arterial Pressure", "Venous High Pressure", "Venous Low Pressure","TMP Pressure"] +COLOR_CODES = "#ffa500" +PRESCRIPTION_SETTINGS_PARAMETERS = ["Blood Flow Rate", "Dialysate Flow Rate" ,"Dialysate Temperature"] +RED_COLOR = "#c53b33" +WHITE_COLOR = "#fefefe" + Index: suite_leahi/shared/scripts/configuration/utility.py =================================================================== diff -u -r4045057acb2ebda3ca38376e140baa6c48b7231a -r7fa3503b0eeaf8e05f4f885d7af4ea2947d90e0a --- suite_leahi/shared/scripts/configuration/utility.py (.../utility.py) (revision 4045057acb2ebda3ca38376e140baa6c48b7231a) +++ suite_leahi/shared/scripts/configuration/utility.py (.../utility.py) (revision 7fa3503b0eeaf8e05f4f885d7af4ea2947d90e0a) @@ -14,6 +14,7 @@ td =TD_Messaging() from leahi_dialin.ui import utils from builtins import int as pyInt +from PySide2.QtCore import Qt def aut(*args): """ @@ -171,7 +172,7 @@ test.log(f"Updated value: {current_value}") - test.log(f"✅ Target value reached: {current_value}") + test.log(f"Target value reached: {current_value}") def select_different_dropdown(object,type,whichTypeIndex): @@ -372,46 +373,72 @@ def verify_create_treatment_parameters(): test.startSection("Pre treatment parameters") navigation.navigation_pageIndicator_step(config.CREATERX) - squish.mouseClick(squish.waitForObject(names.o_PreTreatmentCreate_pretreatmentPatientIDEntry_TextEntry)) - squish.waitForObject(names.o_PreTreatmentCreate_pretreatmentPatientIDEntry_TextEntry).text ="abcd" - set_value_based_on_target(names.o_PreTreatmentCreate_bloodFlowRateControl_ValueAdjuster, 60) - set_value_based_on_target(names.o_PreTreatmentCreate_dialysateFlowRateControl_ValueAdjuster, 75) - set_value_based_on_target(names.o_PreTreatmentCreate_durationControl_ValueAdjuster, 75) - heparinValue =navigation.get_ini_value("/home/denali/Public/luis/config/configurations/Settings/System.conf", section ="Feature Configurations", key ="HeparinSyringePump") - if heparinValue == "1": - set_value_based_on_target(names.o_PreTreatmentCreate_heparinBolusVolumeControl_ValueAdjuster, 0.4) - set_value_based_on_target(names.o_PreTreatmentCreate_heparinDispensingRateControl_ValueAdjuster, 0.5) - set_value_based_on_target(names.o_PreTreatmentCreate_heparinStopTimeControl_ValueAdjuster, 60) + patient_id = squish.waitForObject(names.o_PreTreatmentCreate_patientID_LabelUnitContainer) + patient_id_edit = findObjectById(patient_id, "_editButton") + squish.mouseClick(patient_id_edit) + squish.mouseClick(squish.waitForObject(names.o_pretreatmentPatientIDEntry_TextEntry)) + squish.waitForObject(names.o_pretreatmentPatientIDEntry_TextEntry).text ="abcd" + squish.mouseClick(squish.waitForObject(names.o_secondaryPatientID_LabelUnitContainer)) + squish.waitForObject(names.o_secondaryPatientID_LabelUnitContainer).text ="Test1" + squish.type(names.o_pretreatmentPatientIDEntry_TextEntry, "") + squish.mouseClick(squish.waitForObject(names.o_confirmButton_ConfirmButton)) + parent_obj = squish.waitForObject(names.o_PreTreatmentCreate_leftColumn_Column) + blood_flow_rate = findObjectById(parent_obj, "_bloodFlowRate") + set_value_based_on_target(blood_flow_rate, 50) + dialysate_flow_rate = findObjectById(parent_obj, "_dialysateFlowRate") + set_value_based_on_target(dialysate_flow_rate, 60) + duration = findObjectById(parent_obj,"_duration") + set_value_based_on_target(duration, 75) + right_obj = squish.waitForObject(names.o_PreTreatmentCreate_rightColumn_Column) + ultrafiltration_volume = findObjectById(right_obj,"_ufVolume") + set_value_based_on_target(ultrafiltration_volume,0.30) + heparin_rx = findObjectById(right_obj,"_heparinRx") + heparin_right_arrow = findObjectById(heparin_rx, "_rightArrow") + squish.mouseClick(heparin_right_arrow) + heparin_obj = squish.waitForObject(names.o_LabelUnitValueAdjuster_LabelUnitValueAdjuster) + heparin_bolus = findObjectById(heparin_obj,"_heparinBolusVolume") + set_value_based_on_target(heparin_bolus, 0.2) + set_value_based_on_target(names.o_heparinDispensingRate_LabelUnitValueAdjuster,0.3) + set_value_based_on_target(names.o_heparinDeliveryDuration_LabelUnitValueAdjuster, 60) + squish.mouseClick(squish.waitForObject(names.o_confirmButton_ConfirmButton)) select_different_dropdown(names.o_PreTreatmentCreate_acidConcentrateComboBox_BaseComboBox,config.ACID_CONCENTRATE,2) select_different_dropdown(names.o_PreTreatmentCreate_dialyzerTypeComboBox_BaseComboBox,config.DIALYZER_TYPE,2) - set_value_based_on_target(names.o_PreTreatmentCreate_salineBolusVolumeControl_ValueAdjuster, 200) - set_value_based_on_target(names.o_PreTreatmentCreate_bpMeasurementIntervalControl_ValueAdjusterCustom,5.0) select_different_dropdown(names.o_PreTreatmentCreate_bicarbonateConcentrateComboBox_BaseComboBox,config.BICARBONATE,0) - Validatebutton = setObjectText(obj = names.o_preTreatmentStack_Text, text =config.VALIDATE) - squish.mouseClick(squish.waitForObject(Validatebutton)) - td.td_Treatment_Parameters_Validation( vAccepted = 1, - vBloodFlowRateRejectReason = 0, - vDialysateFlowRateRejectReason = 0, - vTreatmentDurationRejectReason = 0, - vSalineBolusVolumeRejectReason = 0, - vHeparinStopTimeRejectReason = 0, - vHeparinTypeRejectReason = 0, - vAcidConcentrateRejectReason = 0, - vBicarbonateConcentrateRejectReason = 0, - vDialyzerTypeRejectReason = 0, - vBloodPressureMeasureIntervalRejectReason = 0, - vRinsebackFlowRateRejectReason = 0, - vRinsebackVolumeRejectReason = 0, - vArterialPressureLimitWindowRejectReason = 0, - vVenousPressureLimitWindowRejectReason = 0, - vVenousPressureLimitAsymtrcRejectReason = 0, - vTransmembranePressureLimitWindowRejectReason = 0, - vDialysateTempRejectReason = 0, - vHeparinDispensingRateRejectReason = 0, - vHeparinBolusVolumeRejectReason = 0 - ) - confirm = squish.waitForObjectExists(names.o_preTreatmentStack_confirmButton_ConfirmButton, 3000) - squish.mouseClick(confirm) + Nextbutton = setObjectText(obj =names.o_preTreatmentStack_Text, text =config.NEXT) + squish.mouseClick(squish.waitForObject(Nextbutton)) + set_value_based_on_target(names.o_PreTreatmentCreate_sodium_LabelUnitValueAdjuster, 139) + set_value_based_on_target(names.o_PreTreatmentCreate_bicarbonate_LabelUnitValueAdjuster, 35) + set_value_based_on_target(names.o_PreTreatmentCreate_fluidBolusVolume_LabelUnitValueAdjuster,300) + set_value_based_on_target(names.o_PreTreatmentCreate_primeRinsebackVolume_LabelUnitValueAdjuster,310) + set_value_based_on_target(names.o_PreTreatmentCreate_bpMeasurementIntervalControl_ValueAdjusterCustom,0) + confirm_button = squish.waitForObjectExists(names.o_preTreatmentStack_confirmButton_ConfirmButton) + squish.mouseClick(confirm_button) + td.td_Treatment_Parameters_Validation( vAccepted = 1, + vTreatmentModalityRejectReason = 1, + vHDFTreatmentModeRejectReason = 0, + vBloodFlowRateRejectReason = 0, + vDialysateFlowRateRejectReason = 0, + vTreatmentDurationRejectReason = 0, + vHeparinDeliveryDurationRejectReason = 0, + vHeparinTypeRejectReason = 0, + vDryBicarbCartSizeRejectReason = 0, + vSodiumRejectReason = 0, + vBicarbonateRejectReason = 0, + vDialyzerTypeRejectReason = 0, + vFluidBolusVolumeRejectReason = 0, + vBloodPressureMeasureIntervalRejecteason = 0, + vRinsebackVolumeRejectReason = 0, + vHepatitusBStatusRejectReason = 0, + vAcidConcentrateIndextRejectReason = 0, + vSubstitutionFluidVolumeRejecteason = 0, + vHeparinBolusVolumeRejectReason = 0, + vHeparinDispensingRateRejecteason = 0, + vDialysateTempRejectReason = 0, + vAcidConcentrateConversionFactorRejectReason = 0, + vUFPreWeightRejectReason = 0, + vUFEstimatedTargetWeightRejectReason = 0, + vUFVolumeRejectReason = 0 + ) test.endSection() def findAllObjectsById(parent, target_id): Index: suite_leahi/shared/scripts/names.py =================================================================== diff -u -r2807dd5593235d0424ec9ba288bfc56f7e5c1226 -r7fa3503b0eeaf8e05f4f885d7af4ea2947d90e0a --- suite_leahi/shared/scripts/names.py (.../names.py) (revision 2807dd5593235d0424ec9ba288bfc56f7e5c1226) +++ suite_leahi/shared/scripts/names.py (.../names.py) (revision 7fa3503b0eeaf8e05f4f885d7af4ea2947d90e0a) @@ -38,11 +38,12 @@ o_dialyste_flow_title_Text = {"container": mainTreatmentScreen, "objectName": "dialysateFlowComponent", "type": "TreatmentFlowsComponent" } o_dialyste_tmp_title_Text = {"container": mainTreatmentScreen, "id": "_dialysateTemp", "objectName": "dialysateTempComponent", "type": "TreatmentFlowsComponent" } o_dialyste_cond_title_Text = {"container": mainTreatmentScreen, "id": "_dialysateCond", "objectName": "dialysateCondComponent", "type": "TreatmentFlowsComponent" } - +o_treatmentHome_iconImage_Image_main = {"container": mainTreatmentScreen, "id": "_iconImage", "source": "qrc:/images/iPause", "type": "Image", "unnamed": 1 } +o_treatmentHome_vitals_IconButton = {"container": mainTreatmentScreen, "id": "_vitals", "type": "IconButton", "unnamed": 1,"visible":True} o_newTreatmentDuration_ValueAdjuster = {"container": o_Overlay, "objectName": "_valueAdjuster", "type": "ValueAdjuster", } o_newTreatmentDuration = {"container": o_Overlay, "objectName": "_newTreatmentDuration", "type": "LabelUnitText", } o_Popup_CloseButton = {"container": o_Overlay, "id": "_closeButton", "type": "CloseButton", "unnamed": 1 } - +o_treatmentHome_notification_NotificationBarSmall = {"container": mainTreatmentScreen, "objectName": "notification", "type": "NotificationBarSmall" } # settings_service_export_logs o_listView_ListView = {"container": o_Gui_MainView, "id": "_listView", "type": "ListView", "unnamed": 1 } o_listView_delegateControl = {"container": o_listView_ListView, "index": 2, "objectName": "delegateControl", "type": "Item" } @@ -226,20 +227,20 @@ o_treatmentHeparin_heparinButton_TouchRect = {"container": o_treatmentHeparin_TreatmentHeparin, "id": "_heparinButton", "type": "TouchRect", "unnamed": 1 } o_treatmentHeparin_status_Rectangle = {"container": o_treatmentHeparin_TreatmentHeparin, "id": "_status", "type": "Rectangle", "unnamed": 1 } o_option_combo_box = {"container": o_Overlay, "type": "Text", "unnamed": 1 } -o_preTreatmentStack_PreTreatmentCreate_PreTreatmentCreate = {"container": o_preTreatmentStack_PreTreatmentStack, "objectName": "_PreTreatmentCreate", "type": "PreTreatmentCreate" } -o_PreTreatmentCreate_bloodFlowRateControl_ValueAdjuster = {"container": o_preTreatmentStack_PreTreatmentCreate_PreTreatmentCreate, "id": "_bloodFlowRateControl", "type": "ValueAdjuster", "unnamed": 1 } -o_PreTreatmentCreate_dialysateFlowRateControl_ValueAdjuster = {"container": o_preTreatmentStack_PreTreatmentCreate_PreTreatmentCreate, "id": "_dialysateFlowRateControl", "type": "ValueAdjuster", "unnamed": 1 } -o_PreTreatmentCreate_durationControl_ValueAdjuster = {"container": o_preTreatmentStack_PreTreatmentCreate_PreTreatmentCreate, "id": "_durationControl", "type": "ValueAdjuster", "unnamed": 1 } -o_PreTreatmentCreate_heparinBolusVolumeControl_ValueAdjuster = {"container": o_preTreatmentStack_PreTreatmentCreate_PreTreatmentCreate, "id": "_heparinBolusVolumeControl", "type": "ValueAdjuster", "unnamed": 1 } -o_PreTreatmentCreate_heparinDispensingRateControl_ValueAdjuster = {"container": o_preTreatmentStack_PreTreatmentCreate_PreTreatmentCreate, "id": "_heparinDispensingRateControl", "type": "ValueAdjuster", "unnamed": 1 } -o_PreTreatmentCreate_heparinStopTimeControl_ValueAdjuster = {"container": o_preTreatmentStack_PreTreatmentCreate_PreTreatmentCreate, "id": "_heparinStopTimeControl", "type": "ValueAdjuster", "unnamed": 1 } -o_PreTreatmentCreate_dialysateTemperatureControl_ValueAdjuster = {"container": o_preTreatmentStack_PreTreatmentCreate_PreTreatmentCreate, "id": "_dialysateTemperatureControl", "type": "ValueAdjuster", "unnamed": 1 } -o_PreTreatmentCreate_salineBolusVolumeControl_ValueAdjuster = {"container": o_preTreatmentStack_PreTreatmentCreate_PreTreatmentCreate, "id": "_salineBolusVolumeControl", "type": "ValueAdjuster", "unnamed": 1 } -o_PreTreatmentCreate_bicarbonateConcentrateComboBox_BaseComboBox= {"container": o_preTreatmentStack_PreTreatmentCreate_PreTreatmentCreate, "id": "_bicarbonateConcentrateComboBox", "type": "BaseComboBox", "unnamed": 1 } -o_createTreatmentRect_TouchRect = {"container": o_standByScreen_MainHome, "id": "_createTreatmentRect", "type": "TouchRect", "unnamed": 1 } -o_PreTreatment_vitalsCombobox_BaseCombobox = {"container": o_preTreatmentStack_PreTreatmentCreate_PreTreatmentCreate, "id": "_bpMeasurementIntervalControl", "type": "BaseComboBox", "unnamed": 1 } -o_PreTreatmentCreate_acidConcentrateComboBox_BaseComboBox = {"container": o_preTreatmentStack_PreTreatmentCreate_PreTreatmentCreate, "id": "_acidConcentrateComboBox", "type": "BaseComboBox", "unnamed": 1 } -o_PreTreatmentCreate_dialyzerTypeComboBox_BaseComboBox = {"container": o_preTreatmentStack_PreTreatmentCreate_PreTreatmentCreate, "id": "_dialyzerTypeComboBox", "type": "BaseComboBox", "unnamed": 1 } +# o_preTreatmentStack_PreTreatmentCreate_PreTreatmentCreate = {"container": o_preTreatmentStack_PreTreatmentStack, "objectName": "_PreTreatmentCreate", "type": "PreTreatmentCreate" } +# o_PreTreatmentCreate_bloodFlowRateControl_ValueAdjuster = {"container": o_preTreatmentStack_PreTreatmentCreate_PreTreatmentCreate, "id": "_bloodFlowRateControl", "type": "ValueAdjuster", "unnamed": 1 } +# o_PreTreatmentCreate_dialysateFlowRateControl_ValueAdjuster = {"container": o_preTreatmentStack_PreTreatmentCreate_PreTreatmentCreate, "id": "_dialysateFlowRateControl", "type": "ValueAdjuster", "unnamed": 1 } +# o_PreTreatmentCreate_durationControl_ValueAdjuster = {"container": o_preTreatmentStack_PreTreatmentCreate_PreTreatmentCreate, "id": "_durationControl", "type": "ValueAdjuster", "unnamed": 1 } +# o_PreTreatmentCreate_heparinBolusVolumeControl_ValueAdjuster = {"container": o_preTreatmentStack_PreTreatmentCreate_PreTreatmentCreate, "id": "_heparinBolusVolumeControl", "type": "ValueAdjuster", "unnamed": 1 } +# o_PreTreatmentCreate_heparinDispensingRateControl_ValueAdjuster = {"container": o_preTreatmentStack_PreTreatmentCreate_PreTreatmentCreate, "id": "_heparinDispensingRateControl", "type": "ValueAdjuster", "unnamed": 1 } +# o_PreTreatmentCreate_heparinStopTimeControl_ValueAdjuster = {"container": o_preTreatmentStack_PreTreatmentCreate_PreTreatmentCreate, "id": "_heparinStopTimeControl", "type": "ValueAdjuster", "unnamed": 1 } +# o_PreTreatmentCreate_dialysateTemperatureControl_ValueAdjuster = {"container": o_preTreatmentStack_PreTreatmentCreate_PreTreatmentCreate, "id": "_dialysateTemperatureControl", "type": "ValueAdjuster", "unnamed": 1 } +# o_PreTreatmentCreate_salineBolusVolumeControl_ValueAdjuster = {"container": o_preTreatmentStack_PreTreatmentCreate_PreTreatmentCreate, "id": "_salineBolusVolumeControl", "type": "ValueAdjuster", "unnamed": 1 } +# o_PreTreatmentCreate_bicarbonateConcentrateComboBox_BaseComboBox= {"container": o_preTreatmentStack_PreTreatmentCreate_PreTreatmentCreate, "id": "_bicarbonateConcentrateComboBox", "type": "BaseComboBox", "unnamed": 1 } +# o_createTreatmentRect_TouchRect = {"container": o_standByScreen_MainHome, "id": "_createTreatmentRect", "type": "TouchRect", "unnamed": 1 } +# o_PreTreatment_vitalsCombobox_BaseCombobox = {"container": o_preTreatmentStack_PreTreatmentCreate_PreTreatmentCreate, "id": "_bpMeasurementIntervalControl", "type": "BaseComboBox", "unnamed": 1 } +# o_PreTreatmentCreate_acidConcentrateComboBox_BaseComboBox = {"container": o_preTreatmentStack_PreTreatmentCreate_PreTreatmentCreate, "id": "_acidConcentrateComboBox", "type": "BaseComboBox", "unnamed": 1 } +# o_PreTreatmentCreate_dialyzerTypeComboBox_BaseComboBox = {"container": o_preTreatmentStack_PreTreatmentCreate_PreTreatmentCreate, "id": "_dialyzerTypeComboBox", "type": "BaseComboBox", "unnamed": 1 } o_preTreatmentStack_Text = {"container": o_preTreatmentStack_PreTreatmentStack, "type": "Text", "unnamed": 1 } o_preTreatmentStack_stepIndicator_StepIndicator = {"container": o_preTreatmentStack_PreTreatmentStack, "id": "_stepIndicator", "type": "StepIndicator", "unnamed": 1 } @@ -292,7 +293,97 @@ o_LabelUnitValueAdjuster_LabelUnitValueAdjuster = {"container": o_Overlay, "objectName": "_LabelUnitValueAdjuster", "type": "LabelUnitValueAdjuster" } +#New design create Rx +o_preTreatmentStack_PreTreatmentStack = {"container": o_Gui_MainView, "id": "_preTreatmentStack", "type": "PreTreatmentStack", "unnamed": 1 } +o_preTreatmentStack_PreTreatmentCreate_PreTreatmentCreate = {"container": o_preTreatmentStack_PreTreatmentStack, "objectName": "_PreTreatmentCreate", "type": "PreTreatmentCreate" } +o_PreTreatmentCreate_pretreatmentPatientIDEntry_TextEntry = {"container": o_preTreatmentStack_PreTreatmentCreate_PreTreatmentCreate, "id": "_pretreatmentPatientIDEntry", "type": "TextEntry", "unnamed": 1 } +o_createHDTreatment_TouchRect = {"container": o_standByScreen_MainHome, "id": "_createHDTreatment", "type": "TouchRect", "unnamed": 1 } +o_PreTreatmentCreate_leftColumn_Column = {"container": o_preTreatmentStack_PreTreatmentCreate_PreTreatmentCreate, "id": "_leftColumn", "type": "Column", "unnamed": 1 } +o_PreTreatmentCreate_rightColumn_Column = {"container": o_preTreatmentStack_PreTreatmentCreate_PreTreatmentCreate, "id": "_rightColumn", "type": "Column", "unnamed": 1 } +o_LabelUnitValueAdjuster_LabelUnitValueAdjuster = {"container": o_Overlay, "objectName": "_LabelUnitValueAdjuster", "type": "LabelUnitValueAdjuster" } +o_heparinDispensingRate_LabelUnitValueAdjuster = {"container": o_Overlay, "objectName": "_LabelUnitValueAdjuster", "id": "_heparinDispensingRate", "type": "LabelUnitValueAdjuster" } +o_heparinDeliveryDuration_LabelUnitValueAdjuster = {"container": o_Overlay, "objectName": "_LabelUnitValueAdjuster", "id": "_heparinDeliveryDuration", "type": "LabelUnitValueAdjuster" } +o_PreTreatmentCreate_leftColumn_Column_2 = {"container": o_preTreatmentStack_PreTreatmentCreate_PreTreatmentCreate, "id": "_leftColumn", "type": "Column", "unnamed": 1 } +o_PreTreatmentCreate_rightColumn_Column_2 = {"container": o_preTreatmentStack_PreTreatmentCreate_PreTreatmentCreate, "id": "_rightColumn", "type": "Column", "unnamed": 1 } +o_PreTreatmentCreate_sodium_LabelUnitValueAdjuster = {"container": o_preTreatmentStack_PreTreatmentCreate_PreTreatmentCreate, "id": "_sodium", "objectName": "_LabelUnitValueAdjuster", "type": "LabelUnitValueAdjuster" } +o_PreTreatmentCreate_bicarbonate_LabelUnitValueAdjuster = {"container": o_preTreatmentStack_PreTreatmentCreate_PreTreatmentCreate, "id": "_bicarbonate", "objectName": "_LabelUnitValueAdjuster", "type": "LabelUnitValueAdjuster" } +o_PreTreatmentCreate_fluidBolusVolume_LabelUnitValueAdjuster = {"container": o_preTreatmentStack_PreTreatmentCreate_PreTreatmentCreate, "id": "_fluidBolusVolume", "objectName": "_LabelUnitValueAdjuster", "type": "LabelUnitValueAdjuster" } +o_PreTreatmentCreate_primeRinsebackVolume_LabelUnitValueAdjuster= {"container": o_preTreatmentStack_PreTreatmentCreate_PreTreatmentCreate, "id": "_primeRinsebackVolume", "objectName": "_LabelUnitValueAdjuster", "type": "LabelUnitValueAdjuster" } +o_PreTreatmentCreate_listView_ListView = {"container": o_preTreatmentStack_PreTreatmentCreate_PreTreatmentCreate, "id": "_listView", "type": "ListView", "unnamed": 1 } +o_createHDFTreatment_TouchRect = {"container": o_standByScreen_MainHome, "id": "_createHDFTreatment", "type": "TouchRect", "unnamed": 1 } +o_PreTreatmentCreate_hdfTreatmentMode_LabelUnitContainer = {"container": o_preTreatmentStack_PreTreatmentCreate_PreTreatmentCreate, "id": "_hdfTreatmentMode", "type": "LabelUnitContainer", "unnamed": 1 } +o_PreTreatmentCreate_acidConcentrateComboBox_BaseComboBox = {"container": o_preTreatmentStack_PreTreatmentCreate_PreTreatmentCreate, "id": "_acidConcentrateComboBox", "type": "BaseComboBox", "unnamed": 1 } +o_PreTreatmentCreate_dialyzerTypeComboBox_BaseComboBox = {"container": o_preTreatmentStack_PreTreatmentCreate_PreTreatmentCreate, "id": "_dialyzerTypeComboBox", "type": "BaseComboBox", "unnamed": 1 } +o_PreTreatmentCreate_bicarbonateConcentrateComboBox_BaseComboBox= {"container": o_preTreatmentStack_PreTreatmentCreate_PreTreatmentCreate, "id": "_bicarbonateConcentrateComboBox", "type": "BaseComboBox", "unnamed": 1 } +o_PreTreatmentCreate_treatmentModalityComboBox_BaseComboBox = {"container": o_preTreatmentStack_PreTreatmentCreate_PreTreatmentCreate, "id": "_treatmentModalityComboBox", "type": "BaseComboBox", "unnamed": 1 } +o_PreTreatmentCreate_bpMeasurementIntervalControl_ValueAdjusterCustom = {"container": o_preTreatmentStack_PreTreatmentCreate_PreTreatmentCreate, "id": "_bpMeasurementIntervalControl", "type": "ValueAdjusterCustom", "unnamed": 1 } +o_headerMenu_MainMenu = {"container": o_Gui_MainView, "id": "_headerMenu", "type": "MainMenu", "unnamed": 1 } +o_secondaryPatientID_LabelUnitContainer = {"container": o_Overlay, "id": "_secondaryPatientID", "type": "LabelUnitContainer", "unnamed": 1 } +o_patientID_LabelUnitContainer = {"container": o_Overlay, "id": "_patientID", "type": "LabelUnitContainer", "unnamed": 1 } +#end of treatment +o_cancelTouch_TouchRect = {"container": o_Overlay, "id": "_cancelTouch", "type": "TouchRect", "unnamed": 1 } +o_treatmentCompleteButton_TreatmentCompleteButton = {"container": o_Gui_MainView, "id": "_treatmentCompleteButton", "type": "TreatmentCompleteButton", "unnamed": 1 } +o_treatmentHome_iconImage_Image = {"container": mainTreatmentScreen, "id": "_iconImage", "source": "qrc:/images/iEditDisabled", "type": "Image", "unnamed": 1 } +o_treatmentHome_editButton_IconButton = {"container": mainTreatmentScreen, "id": "_editButton", "type": "IconButton", "unnamed": 1 } +o_vitalsButton_VitalsButton = {"container": o_Gui_MainView, "id": "_vitalsButton", "type": "VitalsButton", "unnamed": 1 } +o_isolatedUfButton_TouchRect = {"container": o_Overlay, "objectName": "_isolatedUfButton", "type": "TouchRect" } +o_pauseResumeButton_TouchRect = {"container": o_Overlay, "objectName": "_pauseResumeButton", "type": "TouchRect" } +o_treatmentHome_editButton_IconButton_2 = {"container": mainTreatmentScreen, "id": "_editButton", "type": "IconButton", "unnamed": 1 } +o_image_Image = {"container": o_Overlay, "id": "_image", "source": "qrc:/images/iClose", "type": "Image", "unnamed": 1 } +o_treatmentHome_upArrowIcon_ArrowButton = {"container": mainTreatmentScreen, "objectName": "upArrowIcon", "type": "ArrowButton" } +o_treatmentHome_downArrowIcon_ArrowButton = {"container": mainTreatmentScreen, "objectName": "downArrowIcon", "type": "ArrowButton" } +o_confirmTouch_ConfirmButton = {"container": o_Overlay, "id": "_confirmTouch", "type": "ConfirmButton", "unnamed": 1 } +o_bloodPressureSystolic_TextEntry = {"container": o_Overlay, "id": "_bloodPressureSystolic", "type": "TextEntry", "unnamed": 1 } +o_bloodPressureDiastolic_TextEntry = {"container": o_Overlay, "id": "_bloodPressureDiastolic", "type": "TextEntry", "unnamed": 1 } +o_heartRate_TextEntry = {"container": o_Overlay, "id": "_heartRate", "type": "TextEntry", "unnamed": 1 } +o_confirm_button = {"container": o_Overlay, "id": "_confirmButton", "type": "ConfirmButton", "unnamed": 1 } +keyboard_input = {"container": o_Overlay, "type": "Text", "unnamed": 1 } +o_treatmentHome_bloodPressure_LabelValue = {"container": mainTreatmentScreen, "id": "_bloodPressure", "type": "LabelValue", "unnamed": 1 } +o_treatmentHome_heartBeat_LabelValue = {"container": mainTreatmentScreen, "id": "_heartBeat", "type": "LabelValue", "unnamed": 1 } +o_preTreatmentStack_repeater_Repeater = {"container": o_preTreatmentStack_PreTreatmentStack, "id": "repeater", "type": "Repeater", "unnamed": 1 } +o_preTreatmentStack_PreTreatmentSampleStack_PreTreatmentWaterSample = {"container": o_preTreatmentStack_PreTreatmentStack, "objectName": "_PreTreatmentSampleStack", "type": "PreTreatmentWaterSample" } +o_PreTreatmentSampleStack_failContainer_WaterSampleContainer = {"container": o_preTreatmentStack_PreTreatmentSampleStack_PreTreatmentWaterSample, "id": "_failContainer", "type": "WaterSampleContainer", "unnamed": 1 } +o_PreTreatmentSampleStack_button_TouchRect = {"container": o_preTreatmentStack_PreTreatmentSampleStack_PreTreatmentWaterSample, "id": "_button", "type": "TouchRect", "unnamed": 1 } +o_PreTreatmentCreate_bpMeasurementIntervalControl_ValueAdjusterCustom = {"container": o_preTreatmentStack_PreTreatmentCreate_PreTreatmentCreate, "id": "_bpMeasurementIntervalControl", "type": "ValueAdjusterCustom", "unnamed": 1 } +#The `visible` property must remain in place. It ensures the element is rendered and interactable; without it, the element may not be clickable, which impactsboth user interaction and automated test execution. +o_preTreatmentStack_confirmButton_ConfirmButton = {"container": o_preTreatmentStack_PreTreatmentStack, "objectName": "_confirmButton", "type": "ConfirmButton", "visible": True } +o_arterialWindow_LabelUnitValueAdjuster = {"container": o_Overlay, "objectName": "_arterialWindow", "type": "LabelUnitValueAdjuster" } +o_venousWindow_LabelUnitValueAdjuster = {"container": o_Overlay, "objectName": "_venousWindow", "type": "LabelUnitValueAdjuster" } +o_venousAsymmetricWindow_LabelUnitValueAdjuster = {"container": o_Overlay, "objectName": "_venousAsymmetricWindow", "type": "LabelUnitValueAdjuster" } +o_tmpWindow_LabelUnitValueAdjuster = {"container": o_Overlay, "objectName": "_tmpWindow", "type": "LabelUnitValueAdjuster" } +o_treatmentHome_editButton_IconButton = {"container": mainTreatmentScreen, "id": "_editButton", "type": "IconButton", "unnamed": 1 } +o_treatmentHome_treatmentPressures_TreatmentPressures = {"container": mainTreatmentScreen, "objectName": "treatmentPressures", "type": "TreatmentPressures" } +o_valueAdjuster_ValueAdjuster = {"container": o_Overlay, "objectName": "_valueAdjuster", "type": "ValueAdjuster", } +o_treatmentHome_editButton_IconButton_2 = {"container": mainTreatmentScreen, "id": "_editButton", "type": "IconButton", "unnamed": 1 } +o_treatmentHome_treatmentFlows_TreatmentFlows = {"container": mainTreatmentScreen, "objectName": "treatmentFlows", "type": "TreatmentFlows" } +o_dialysateFlowRate_LabelUnitValueAdjuster = {"container": o_Overlay, "objectName": "_dialysateFlowRate", "type": "LabelUnitValueAdjuster" } +o_bloodFlowRate_LabelUnitValueAdjuster = {"container": o_Overlay, "objectName": "_bloodFlowRate", "type": "LabelUnitValueAdjuster" } +o_dialysateTemperature_LabelUnitValueAdjuster = {"container": o_Overlay, "objectName": "_dialysateTemperature", "type": "LabelUnitValueAdjuster" } +o_treatmentHome_upArrowIcon_ArrowButton = {"container": mainTreatmentScreen, "objectName": "upArrowIcon", "type": "ArrowButton" } +o_treatmentHome_downArrowIcon_ArrowButton = {"container": mainTreatmentScreen, "objectName": "downArrowIcon", "type": "ArrowButton" } +o_treatmentHome_notification_NotificationBarSmall = {"container": mainTreatmentScreen, "objectName": "_notification", "type": "NotificationBarSmall" } +o_ufVolumeRemoved_LabelUnitText = {"container": o_Overlay, "objectName": "_ufVolumeRemoved", "type": "LabelUnitText" } +o_ufVolumeGoal_LabelUnitText = {"container": o_Overlay, "objectName": "_ufVolumeGoal", "type": "LabelUnitText" } +o_timeElapsed_LabelUnitText = {"container": o_Overlay, "objectName": "_timeElapsed", "type": "LabelUnitText" } +o_newTreatmentDuration_LabelUnitValueAdjuster = {"container": o_Overlay, "objectName": "_newTreatmentDuration", "type": "LabelUnitValueAdjuster" } +o_preTreatmentStack_confirmButton_ConfirmButton = {"container": o_preTreatmentStack_PreTreatmentStack, "objectName": "_confirmButton", "type": "ConfirmButton" , "visible": True } +o_ufRate_LabelUnitText = {"container": o_Overlay, "objectName": "_ufRate", "type": "LabelUnitText" } +o_newTreatmentDuration_LabelUnitText = {"container": o_Overlay, "objectName": "_newTreatmentDuration", "type": "LabelUnitText" } +#Isolated UF +o_isolatedUfButton_TouchRect = {"container": o_Overlay, "objectName": "_isolatedUfButton", "type": "TouchRect" } +o_valueAdjuster_ValueAdjuster = {"container": o_Overlay, "objectName": "_valueAdjuster", "type": "ValueAdjuster" } +o_volumeProgress_ProgressBarEx = {"container": o_Overlay, "objectName": "_volumeProgress", "type": "ProgressBarEx" } +o_volumeAdjuster_LabelUnitValueAdjuster = {"container": o_Overlay, "objectName": "_volumeAdjuster", "type": "LabelUnitValueAdjuster" } +o_PreTreatmentCreate_volumeAdjuster_slider_Slider = {"container": o_volumeAdjuster_LabelUnitValueAdjuster, "id": "_slider", "type": "Slider", "unnamed": 1 } +o_valueAdjuster_ValueAdjuster_2 = {"container": o_volumeAdjuster_LabelUnitValueAdjuster, "objectName": "_valueAdjuster", "type": "ValueAdjuster" } +o_volumeGoal_LabelUnitText = {"container": o_Overlay, "objectName": "_volumeGoal", "type": "LabelUnitText" } +o_duration_LabelUnitText = {"container": o_Overlay, "objectName": "_duration", "type": "LabelUnitText" } +o_rate_LabelUnitText = {"container": o_Overlay, "objectName": "_rate", "type": "LabelUnitText" } +o_treatmentAdjustmentIsolatedUFDurationEdit = {"container": o_Overlay, "objectName": "_treatmentAdjustmentIsolatedUFDurationEdit", "type": "TreatmentAdjustmentIsolatedUFDurationEdit" } +o_treatmentAdjustmentIsolatedUFVolumeEdit = {"container": o_Overlay, "objectName": "_treatmentAdjustmentIsolatedUFVolumeEdit", "type": "TreatmentAdjustmentIsolatedUFVolumeEdit" } +o_vitals_close_btn = {"container": o_Overlay, "id": "_image", "source": "qrc:/images/iClose", "type": "Image", "unnamed": 1 } +o_treatmentHome_notification_NotificationBarSmall = {"container": mainTreatmentScreen, "objectName": "_notification", "type": "NotificationBarSmall" } Index: suite_leahi/tst_edit_parameters/test.py =================================================================== diff -u -re79975dc325f90441f70e114390d1adf4e7d58f9 -r7fa3503b0eeaf8e05f4f885d7af4ea2947d90e0a --- suite_leahi/tst_edit_parameters/test.py (.../test.py) (revision e79975dc325f90441f70e114390d1adf4e7d58f9) +++ suite_leahi/tst_edit_parameters/test.py (.../test.py) (revision 7fa3503b0eeaf8e05f4f885d7af4ea2947d90e0a) @@ -43,15 +43,16 @@ import squish import can from leahi_dialin.ui import utils -from configuration import utility,config,navigation -from configuration import config +from configuration import utility,config,navigation,application_init from leahi_dialin.ui.td_messaging import TD_Messaging from leahi_dialin.common.ui_defs import TXStates from leahi_dialin.common.td_defs import TDOpModes,TDTreatmentStates from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions from leahi_dialin.utils import conversions from leahi_dialin.protocols import CAN +from configuration.getrejectiontext import ScopedRejectionRepository + td = TD_Messaging() can_interface = td.can_interface ArterialWindow = None @@ -68,17 +69,20 @@ durationvalue = 0 durationconfirm = None -PRESSURE_TREATEMENT_OBJ = [names.o_arterialWindow_LabelUnitValueAdjuster, +PRESSURE_TREATEMENT_OBJ = [names.o_arterialWindow_LabelUnitValueAdjuster, names.o_venousWindow_LabelUnitValueAdjuster, names.o_venousAsymmetricWindow_LabelUnitValueAdjuster, names.o_tmpWindow_LabelUnitValueAdjuster] -PRESCRIPTION_SETTINGS_OBJ =[names.o_bloodFlowRate_LabelUnitValueAdjuster, +PRESCRIPTION_SETTINGS_OBJ =[names.o_bloodFlowRate_LabelUnitValueAdjuster, names.o_dialysateFlowRate_LabelUnitValueAdjuster, names.o_dialysateTemperature_LabelUnitValueAdjuster] +conf_path = application_init.configuration_folder_path() + "Alarms/Rejections.conf" +repo = ScopedRejectionRepository(path=conf_path) + def handle_saline_request( message, timestamp = 0.0): """ Called when the user requests to firmware from UI @@ -219,15 +223,15 @@ tmpwindow_value = waitForObject(names.o_tmpWindow_LabelUnitValueAdjuster) tmp_value =tmpwindow_value.value test.log(str(tmp_value)) - utility.set_value_based_on_target(names.o_arterialWindow_LabelUnitValueAdjuster,200) + utility.set_value_based_on_target(names.o_arterialWindow_LabelUnitValueAdjuster,70) arterialwindow_value = waitForObject(names.o_arterialWindow_LabelUnitValueAdjuster) change_arterialwindow_value =arterialwindow_value.value test.log(str(change_arterialwindow_value)) - utility.set_value_based_on_target(names.o_venousWindow_LabelUnitValueAdjuster,140) + utility.set_value_based_on_target(names.o_venousWindow_LabelUnitValueAdjuster,80) venouswindow_value = waitForObject(names.o_venousWindow_LabelUnitValueAdjuster) change_venouswindow_value =venouswindow_value.value test.log(str(change_venouswindow_value)) - utility.set_value_based_on_target(names.o_tmpWindow_LabelUnitValueAdjuster,100) + utility.set_value_based_on_target(names.o_tmpWindow_LabelUnitValueAdjuster,50) tmpwindow_value = waitForObject(names.o_tmpWindow_LabelUnitValueAdjuster) change_tmpwindow_value =tmpwindow_value.value test.log(str(change_tmpwindow_value)) @@ -266,11 +270,10 @@ def check_saline_edit_maintreatment(): test.startSection("Saline data") td.td_saline( - 100 , # target_volume - 150 , # cumulative_volume - 75 , # bolus_volume - 0 - ) + 100, # target_volume + 150, # cumulative_volume + 75 , # bolus_volume + 0 ) mouseClick(waitForObject(names.o_treatmentHome_editButton_IconButton)) fluidbolusvolume_value = waitForObject(names.o_valueAdjuster_ValueAdjuster) @@ -289,7 +292,8 @@ parameters_payload= payload) rejectionReason = waitForObject(names.o_notificationBar_NotificationBarSmall).text - test.compare(rejectionReason, "[1] Request is not allowed in the current operating mode", "Rejection Reason text should be :" + str("[1] Request is not allowed in the current operating mode")) + REJECT_TEXT = repo.get("1", "Title") + test.compare(rejectionReason, "[1] "+REJECT_TEXT, "Rejection Reason text should be :" + str(rejectionReason)) #rejection reason 0 mouseClick(waitForObject(names.o_confirmButton_TouchRect)) payload = conversions.integer_to_bytearray(1) @@ -441,7 +445,7 @@ message_id, handle_dialflow_request) - test.verify(waitFor( lambda: dialflow == changeddialflow+5, 3000), "Testing FW received dial flow Value in main treatment screen") + test.verify(waitFor( lambda: dialflow == changeddialflow+10, 3000), "Testing FW received dial flow Value in main treatment screen") dialysateflowdownarrowbutton = utility.findObjectById(dialysateflowuparrow,"_downArrowIcon") mouseClick(dialysateflowdownarrowbutton) @@ -454,7 +458,7 @@ message_id, handle_dialflow_request) - test.verify(waitFor( lambda: dialflow == changeddialflow-20, 3000), "Testing FW received dial flow Value in main treatment screen") + test.verify(waitFor( lambda: dialflow == changeddialflow-10, 3000), "Testing FW received dial flow Value in main treatment screen") dialysatetmpuparrow = waitForObject(names.o_dial_tmp_value) @@ -484,7 +488,6 @@ test.verify(waitFor( lambda: dialtemperature == changeddialtmp-0.5, 3000), "Testing FW received dial tmp Value in main treatment screen") - #rejection reason is 1 payload = conversions.integer_to_bytearray(0) payload += conversions.integer_to_bytearray(1) @@ -495,9 +498,10 @@ has_parameters = True, parameters_payload= payload) - rejectionReason = utility.get_object_from_names(names.o_treatmentHome_notification_NotificationBarSmall) - test.compare(rejectionReason.text, "[1] Request is not allowed in the current operating mode", "Rejection Reason text should be :" + str("[1] Request is not allowed in the current operating mode")) + REJECT_TEXT = repo.get("1", "Title") + rejectionReason = waitForObjectExists(names.o_treatmentHome_notification_NotificationBarSmall) + test.compare(rejectionReason.text,"[1] "+ REJECT_TEXT, "Rejection Reason text should be :" + str(rejectionReason.text)) #rejection reason is 0 payload = conversions.integer_to_bytearray(1) payload += conversions.integer_to_bytearray(0) @@ -589,7 +593,8 @@ vUFRate= 0.0) rejectionReason = waitForObject(names.o_notificationBar_NotificationBarSmall).text - test.compare(rejectionReason, "[1] Request is not allowed in the current operating mode", "Rejection Reason text should be :" + str("[1] Request is not allowed in the current operating mode")) + REJECT_TEXT = repo.get("1", "Title") + test.compare(rejectionReason,"[1] "+REJECT_TEXT, "Rejection Reason text should be :" + str(rejectionReason)) td.td_duration_validate_response(vRejectionReason =0, vDuration= 78, vHeparinDuration = 0, @@ -611,7 +616,8 @@ parameters_payload= payload) rejectionReason = waitForObject(names.o_notificationBar_NotificationBarSmall).text - test.compare(rejectionReason, "[1] Request is not allowed in the current operating mode", "Rejection Reason text should be :" + str("[1] Request is not allowed in the current operating mode")) + REJECT_TEXT = repo.get("1", "Title") + test.compare(rejectionReason,"[1] "+REJECT_TEXT, "Rejection Reason text should be :" + str(rejectionReason)) #rejection reason is 0 mouseClick(waitForObject(names.o_confirmButton_TouchRect)) payload = conversions.integer_to_bytearray(1) Index: suite_leahi/tst_end_of_treatment/test.py =================================================================== diff -u -ra41aef5f49d9aed41b1d846a4c388459a7c5eed1 -r7fa3503b0eeaf8e05f4f885d7af4ea2947d90e0a --- suite_leahi/tst_end_of_treatment/test.py (.../test.py) (revision a41aef5f49d9aed41b1d846a4c388459a7c5eed1) +++ suite_leahi/tst_end_of_treatment/test.py (.../test.py) (revision 7fa3503b0eeaf8e05f4f885d7af4ea2947d90e0a) @@ -117,7 +117,7 @@ test.compare(config.MIN_SYSTOLIC+"/"+config.MIN_DIASTOLIC, blood_pressure,"Blood pressure value should be ->"+str(config.MIN_SYSTOLIC+"/"+config.MIN_DIASTOLIC)) heart_rate = waitForObjectExists(names.o_treatmentHome_heartBeat_LabelValue).topText test.compare(config.MIN_HEARTRATE, heart_rate,"Heart Rate value should be ->"+str(config.MIN_HEARTRATE)) - ultrafiltration_edit =waitForObjectExists(names.o_editButton_ultrafiltration_IconButton) + ultrafiltration_edit = waitForObjectExists(names.o_editButton_ultrafiltration_IconButton) test.compare(ultrafiltration_edit.enabled,True,"Ultrafiltration edit button is enabled") mouseClick(waitForObject(names.o_editButton_ultrafiltration_IconButton)) #check isolated,pause uf and edit uf button state @@ -148,19 +148,22 @@ # handle sent messages from UI if can_interface is not None: - channel_id = CAN.DenaliChannels.ui_to_td_ch_id + channel_id = CAN.CanChannels.ui_to_td_ch_id message_id = MsgIds.MSG_ID_TD_END_TREATMENT_REQUEST.value can_interface.register_receiving_publication_function(channel_id, message_id, handle_end_of_treatment_request) - startApplication(config.AUT_NAME) - td.td_operation_mode(TDOpModes.MODE_STAN.value) + startApplication(utility.aut("-q")) # verify Standby screen test.verify(waitForObjectExists(names.o_standByScreen_MainHome), "In Standby") - mouseClick(waitForObject(names.o_createTreatmentRect_TouchRect)) + td.td_operation_mode(TDOpModes.MODE_STAN.value) + hemodialysis = waitForObject(names.o_createHDTreatment_TouchRect) + hemodialysis_btn = utility.findChildByText(hemodialysis, "Hemodialysis") + mouseClick(hemodialysis_btn) + td.td_Treatment_Parameters_CreateRx(vRejectionReason =0) td.td_operation_mode(TDOpModes.MODE_PRET.value) utility.verify_create_treatment_parameters() change_treatmentstates(TDTreatmentStates.TREATMENT_DIALYSIS_STATE.value) Index: suite_leahi/tst_heparin/test.py =================================================================== diff -u -rb6aa1adafbc0b279e012c904ecde7774fb0000ea -r7fa3503b0eeaf8e05f4f885d7af4ea2947d90e0a --- suite_leahi/tst_heparin/test.py (.../test.py) (revision b6aa1adafbc0b279e012c904ecde7774fb0000ea) +++ suite_leahi/tst_heparin/test.py (.../test.py) (revision 7fa3503b0eeaf8e05f4f885d7af4ea2947d90e0a) @@ -79,76 +79,95 @@ def verify_create_treatment_parameters_Heparin_OFF(): test.startSection("Pre treatment parameters") navigation.navigation_pageIndicator_step(config.CREATERX) - mouseClick(waitForObject(names.o_PreTreatmentCreate_pretreatmentPatientIDEntry_TextEntry)) - waitForObject(names.o_PreTreatmentCreate_pretreatmentPatientIDEntry_TextEntry).text ="abcd" - utility.set_value_based_on_target(names.o_PreTreatmentCreate_bloodFlowRateControl_ValueAdjuster, 50) - utility.set_value_based_on_target(names.o_PreTreatmentCreate_dialysateFlowRateControl_ValueAdjuster, 50) - utility.set_value_based_on_target(names.o_PreTreatmentCreate_durationControl_ValueAdjuster, 60) - mouseClick(names.o_PreTreatmentCreate_heparinBolusVolumeControl_ValueAdjuster) - mouseClick(names.o_PreTreatmentCreate_heparinDispensingRateControl_ValueAdjuster) - utility.set_value_based_on_target(names.o_PreTreatmentCreate_dialysateTemperatureControl_ValueAdjuster,37.5) - utility.set_value_based_on_target(names.o_PreTreatmentCreate_salineBolusVolumeControl_ValueAdjuster, 100) + patient_id = waitForObject(names.o_PreTreatmentCreate_patientID_LabelUnitContainer) + patient_id_edit = utility.findObjectById(patient_id, "_editButton") + mouseClick(patient_id_edit) + mouseClick(waitForObject(names.o_patientID_LabelUnitContainer)) + waitForObject(names.o_patientID_LabelUnitContainer).text ="abcd" + mouseClick(waitForObject(names.o_HeaderBar_WiFi_Popup), 611, 343, Qt.LeftButton) + mouseClick(waitForObject(names.o_confirmButton_ConfirmButton)) + parent_obj = waitForObject(names.o_PreTreatmentCreate_leftColumn_Column) + blood_flow_rate = utility.findObjectById(parent_obj, "_bloodFlowRate") + utility.set_value_based_on_target(blood_flow_rate, 70) + dialysate_flow_rate = utility.findObjectById(parent_obj, "_dialysateFlowRate") + utility.set_value_based_on_target(dialysate_flow_rate, 50) + duration = utility.findObjectById(parent_obj,"_duration") + utility.set_value_based_on_target(duration, 60) + right_obj = waitForObject(names.o_PreTreatmentCreate_rightColumn_Column) + ultrafiltration_volume = utility.findObjectById(right_obj,"_ufVolume") + utility.set_value_based_on_target(ultrafiltration_volume,0.20) utility.select_different_dropdown(names.o_PreTreatmentCreate_acidConcentrateComboBox_BaseComboBox,config.ACID_CONCENTRATE,2) utility.select_different_dropdown(names.o_PreTreatmentCreate_dialyzerTypeComboBox_BaseComboBox,config.DIALYZER_TYPE,2) - utility.set_value_based_on_target(names.o_PreTreatmentCreate_bpMeasurementIntervalControl_ValueAdjusterCustom,5.0) utility.select_different_dropdown(names.o_PreTreatmentCreate_bicarbonateConcentrateComboBox_BaseComboBox,config.BICARBONATE,0) - Validatebutton = utility.setObjectText(obj = names.o_preTreatmentStack_Text, text =config.VALIDATE) - mouseClick(waitForObject(Validatebutton)) - td.td_Treatment_Parameters_Validation( vAccepted = 1, - vBloodFlowRateRejectReason = 0, - vDialysateFlowRateRejectReason = 0, - vTreatmentDurationRejectReason = 0, - vSalineBolusVolumeRejectReason = 0, - vHeparinStopTimeRejectReason = 0, - vHeparinTypeRejectReason = 0, - vAcidConcentrateRejectReason = 0, - vBicarbonateConcentrateRejectReason = 0, - vDialyzerTypeRejectReason = 0, - vBloodPressureMeasureIntervalRejectReason = 0, - vRinsebackFlowRateRejectReason = 0, - vRinsebackVolumeRejectReason = 0, - vArterialPressureLimitWindowRejectReason = 0, - vVenousPressureLimitWindowRejectReason = 0, - vVenousPressureLimitAsymtrcRejectReason = 0, - vTransmembranePressureLimitWindowRejectReason= 0, - vDialysateTempRejectReason = 0, - vHeparinDispensingRateRejectReason = 0, - vHeparinBolusVolumeRejectReason = 0 + Nextbutton = utility.setObjectText(obj =names.o_preTreatmentStack_Text, text =config.NEXT) + mouseClick(waitForObject(Nextbutton)) + utility.set_value_based_on_target(names.o_PreTreatmentCreate_sodium_LabelUnitValueAdjuster, 139) + utility.set_value_based_on_target(names.o_PreTreatmentCreate_bicarbonate_LabelUnitValueAdjuster, 35) + utility.set_value_based_on_target(names.o_PreTreatmentCreate_fluidBolusVolume_LabelUnitValueAdjuster,300) + utility.set_value_based_on_target(names.o_PreTreatmentCreate_primeRinsebackVolume_LabelUnitValueAdjuster,310) + utility.set_value_based_on_target(names.o_PreTreatmentCreate_bpMeasurementIntervalControl_ValueAdjusterCustom,0) + confirm_button = waitForObjectExists(names.o_preTreatmentStack_confirmButton_ConfirmButton) + mouseClick(confirm_button) + td.td_Treatment_Parameters_Validation( vAccepted = 1, + vTreatmentModalityRejectReason = 1, + vHDFTreatmentModeRejectReason = 0, + vBloodFlowRateRejectReason = 0, + vDialysateFlowRateRejectReason = 0, + vTreatmentDurationRejectReason = 0, + vHeparinDeliveryDurationRejectReason = 0, + vHeparinTypeRejectReason = 0, + vDryBicarbCartSizeRejectReason = 0, + vSodiumRejectReason = 0, + vBicarbonateRejectReason = 0, + vDialyzerTypeRejectReason = 0, + vFluidBolusVolumeRejectReason = 0, + vBloodPressureMeasureIntervalRejecteason = 0, + vRinsebackVolumeRejectReason = 0, + vHepatitusBStatusRejectReason = 0, + vAcidConcentrateIndextRejectReason = 0, + vSubstitutionFluidVolumeRejecteason = 0, + vHeparinBolusVolumeRejectReason = 0, + vHeparinDispensingRateRejecteason = 0, + vDialysateTempRejectReason = 0, + vAcidConcentrateConversionFactorRejectReason = 0, + vUFPreWeightRejectReason = 0, + vUFEstimatedTargetWeightRejectReason = 0, + vUFVolumeRejectReason = 0 ) - - confirm = waitForObjectExists(names.o_preTreatmentStack_confirmButton_ConfirmButton, 3000) - mouseClick(confirm) test.endSection() - def main(): utils.tstStart(__file__) - startApplication(config.AUT_NAME) + startApplication(utility.aut("-q")) test.startSection("Verify the heparin state is off state") td.td_operation_mode(TDOpModes.MODE_STAN.value) - mouseClick(waitForObject(names.o_createTreatmentRect_TouchRect)) + hemodialysis = waitForObject(names.o_createHDTreatment_TouchRect) + hemodialysis_btn = utility.findChildByText(hemodialysis, "Hemodialysis") + mouseClick(hemodialysis_btn) + td.td_Treatment_Parameters_CreateRx(vRejectionReason =0) td.td_operation_mode(TDOpModes.MODE_PRET.value) - td.td_blood_set_auto_load_response(vRejectionReason = 0) verify_create_treatment_parameters_Heparin_OFF() change_treatmentstates(TDTreatmentStates.TREATMENT_PAUSED_STATE.value) change_treatmentstates(TDTreatmentStates.TREATMENT_DIALYSIS_STATE.value) - waitForObject(names.o_listView_Item,1000) - heparin = utility.setObjectText(text=config.HEPARIN, obj=names.o_listView_Item) - mouseClick(waitForObject(heparin)) + parent_obj = waitForObject(names.o_headerMenu_MainMenu) + heparin_obj = utility.findChildByText(parent_obj, config.HEPARIN) + mouseClick(waitForObject(heparin_obj)) verify_heparin_precription_parameters(config.heparin_off) test.endSection() test.startSection("Verify prescription rx parameters in heparin page") td.td_operation_mode(TDOpModes.MODE_STAN.value) - mouseClick(waitForObject(names.o_createTreatmentRect_TouchRect)) + hemodialysis = waitForObject(names.o_createHDTreatment_TouchRect) + hemodialysis_btn = utility.findChildByText(hemodialysis, "Hemodialysis") + mouseClick(hemodialysis_btn) + td.td_Treatment_Parameters_CreateRx(vRejectionReason =0) td.td_operation_mode(TDOpModes.MODE_PRET.value) - td.td_blood_set_auto_load_response(vRejectionReason = 0) utility.verify_create_treatment_parameters() change_treatmentstates(TDTreatmentStates.TREATMENT_PAUSED_STATE.value) change_treatmentstates(TDTreatmentStates.TREATMENT_DIALYSIS_STATE.value) - waitForObject(names.o_listView_Item,1000) - heparin = utility.setObjectText(text=config.HEPARIN, obj=names.o_listView_Item) - mouseClick(waitForObject(heparin)) + parent_obj = waitForObject(names.o_headerMenu_MainMenu) + heparin_obj = utility.findChildByText(parent_obj, config.HEPARIN) + mouseClick(waitForObject(heparin_obj)) verify_heparin_precription_parameters(config.heparin_values) test.endSection() Index: suite_leahi/tst_isolated_uf/test.py =================================================================== diff -u -rdc3291714bae298f6ef6a879c0c38e1c22b23d09 -r7fa3503b0eeaf8e05f4f885d7af4ea2947d90e0a --- suite_leahi/tst_isolated_uf/test.py (.../test.py) (revision dc3291714bae298f6ef6a879c0c38e1c22b23d09) +++ suite_leahi/tst_isolated_uf/test.py (.../test.py) (revision 7fa3503b0eeaf8e05f4f885d7af4ea2947d90e0a) @@ -86,7 +86,7 @@ utils.tstStart(__file__) conf_path = "/home/denali/Public/luis/config/configurations/Alarms/Rejections.conf" repo = ScopedRejectionRepository(path=conf_path) - startApplication(config.AUT_NAME) + startApplication(utility.aut("-q")) td.td_operation_mode(TDOpModes.MODE_STAN.value) td.td_tx_state(TDTreatmentStates.TREATMENT_DIALYSIS_STATE.value , 0 , @@ -122,7 +122,7 @@ utility.set_value_based_on_target(names.o_valueAdjuster_ValueAdjuster, 90) mouseClick(waitForObject(names.o_continueButton_TouchRect)) if can_interface is not None: - channel_id = CAN.DenaliChannels.ui_to_td_ch_id + channel_id = CAN.CanChannels.ui_to_td_ch_id message_id = MsgIds.MSG_ID_UI_ISOLATED_UF_DURATION_CHANGE_REQUEST.value can_interface.register_receiving_publication_function(channel_id, message_id, @@ -158,7 +158,7 @@ continueButton =utility.findObjectById(continueButton,"_continueButton") mouseClick(waitForObject(continueButton)) if can_interface is not None: - channel_id = CAN.DenaliChannels.ui_to_td_ch_id + channel_id = CAN.CanChannels.ui_to_td_ch_id message_id = MsgIds.MSG_ID_UI_ISOLATED_UF_VOLUME_GOAL_CHANGE_REQUEST.value can_interface.register_receiving_publication_function(channel_id, message_id, @@ -190,7 +190,7 @@ waitForObject(names.o_confirmButton_TouchRect,2000) mouseClick(waitForObject(names.o_confirmButton_TouchRect)) if can_interface is not None: - channel_id = CAN.DenaliChannels.ui_to_td_ch_id + channel_id = CAN.CanChannels.ui_to_td_ch_id message_id = MsgIds.MSG_ID_UI_ISOLATED_UF_CONFIRM_REQUEST.value can_interface.register_receiving_publication_function(channel_id, message_id, Index: suite_leahi/tst_main_treatment/test.py =================================================================== diff -u -r14b4280d72f6b236cb2e2c3902e2dea5e10270be -r7fa3503b0eeaf8e05f4f885d7af4ea2947d90e0a --- suite_leahi/tst_main_treatment/test.py (.../test.py) (revision 14b4280d72f6b236cb2e2c3902e2dea5e10270be) +++ suite_leahi/tst_main_treatment/test.py (.../test.py) (revision 7fa3503b0eeaf8e05f4f885d7af4ea2947d90e0a) @@ -1,5 +1,5 @@ # Subject/Title: LDT -1220 Main Treatment Screen - SW - 02 - Screen Integration (MSG,QML) - Q&R - 15: SIT - Software Integration Tests - Squish Qt -# +# LDT - 3816 SW Misc & Enhc - SW - 02 - Usability Requests - Q&R - 15: SIT - Software Integration Tests - Squish Qt # Functionalities: Testing all functionalities of main treatment screen # # Steps: @@ -18,18 +18,30 @@ # -Set lower and upper bound for dialysate temp and test each limit # -Set lower and upper bound for dialysate flow and test each limit # -Set lower and upper bound for dialysate cond and test each limit +# 5 Test new UF pause/resume button +# - Click on pause button +# - Check FW gets pause request +# - Check the UF state to paused +# - Click on resume button +# - Check FW gets pause request +# +# 6 Test new vitals measurement button +# - Click on heart icon in Vitals component in main treatment +# - confirm FW gets request + import names +import can -from leahi_dialin.ui import utils + +from leahi_dialin.ui import utils +from leahi_dialin.protocols import CAN from leahi_dialin.ui.td_messaging import TD_Messaging from leahi_dialin.ui.dd_messaging import DD_Messaging -from configuration import utility, config -from leahi_dialin.common.td_defs import TDOpModes,TDTreatmentStates -from leahi_dialin.common.ui_defs import TXStates +from configuration import utility +from leahi_dialin.common.td_defs import TDOpModes,TDTreatmentStates from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions -from leahi_dialin.utils import conversions -from leahi_dialin.protocols import CAN + ART_LOW_VAL_MINUS_390 = -390 ART_HIGH_VAL_220 = 220 VENOUS_LOW_VAL_MINUS_90 = -90 @@ -49,22 +61,10 @@ td = TD_Messaging() dd = DD_Messaging() -can_interface = td.can_interface -newTreatmentDuration = None +can_interface = td.can_interface +pauseresumerequest = "-1" -def handle_new_treatment_duration_request(message, timestamp=0.0): - """ - Called when the user requests to firmware from UI - @return: None - """ - message = message["message"] - index = MsgFieldPositions.START_POS_FIELD_1 - - state, index = conversions.bytearray_to_integer(message, index) - global newTreatmentDuration - newTreatmentDuration = state - def verify_arterial_and_venous_value_in_main_treatment_screen(accepted, art_low, art_high, ven_low, ven_high,tmp_low,tmp_high): """ Method to verify Arterial low and high @@ -159,12 +159,12 @@ H14_venous_max = target_venous_max_limit, H2_arterial_long = 0 , H14_venous_long = 0 , - tmp_pressure = target_tmp_pressure, + tmp_pressure = target_tmp_pressure, tmp_long = 0.0, tmp_min = target_tmp_min_limit, tmp_max = target_tmp_max_limit, barometric = 0.0) - + # check the range bar's upper and lower bounds arterial_rangeBar = waitForObjectExists(names.o_arterial_RangeBar) if arterial_rangeBar is not None: @@ -260,11 +260,11 @@ #TX Parameter set points def verify_setPoints_from_main_treatement(): TREATMENT_PARAMETER_SETPOINTS_TD_TEST_VALUES = [ - {"blood flow": 56, "dial flow": 22, "dial tmp": 20.0, "dial cond": 100.0 }, - {"blood flow": 99, "dial flow": 78, "dial tmp": 87.0, "dial cond": 200.0 }, - {"blood flow": 34, "dial flow": 99, "dial tmp": 99.0, "dial cond": 300.0 }, - {"blood flow": 100, "dial flow": 100,"dial tmp": 100.0,"dial cond": 400.0}, - {"blood flow": 110, "dial flow": 110,"dial tmp": 110.0,"dial cond": 500.0} + {"blood flow": 56, "dial flow": 22, "dial tmp": 20.0, "dial cond": 34.0 }, + {"blood flow": 99, "dial flow": 78, "dial tmp": 87.0, "dial cond": 55.0 }, + {"blood flow": 34, "dial flow": 99, "dial tmp": 99.0, "dial cond": 99.0 }, + {"blood flow": 100, "dial flow": 100,"dial tmp": 100.0,"dial cond": 100.0}, + {"blood flow": 110, "dial flow": 110,"dial tmp": 110.0,"dial cond": 110.0} ] #Verify the title values in the set points @@ -287,15 +287,15 @@ bloodFlow = utility.get_object_from_names(names.o_blood_flow_value) bloodFlow_properties = object.properties(bloodFlow) - test.compare(bloodFlow_properties["value"], target_blood_flow, "Blood Flow value should be :" + str(target_blood_flow)) + test.compare(float(bloodFlow_properties["value"]), float(target_blood_flow), "Blood Flow value should be :" + str(target_blood_flow)) dialFlow = utility.get_object_from_names(names.o_dial_flow_value) dialFlow_properties = object.properties(dialFlow) - test.compare(dialFlow_properties["value"], target_dial_flow, "Dialyste flow value should be :" + str(target_dial_flow)) + test.compare(float(dialFlow_properties["value"]), float(target_dial_flow), "Dialyste flow value should be :" + str(target_dial_flow)) dialTmp = utility.get_object_from_names(names.o_dial_tmp_value) dialTmp_properties = object.properties(dialTmp) - test.compare(str(dialTmp_properties["value"]), str(target_dial_tmp), "Dialyste Tmp value should be :" + str(target_dial_tmp)) + test.compare(float(dialTmp_properties["value"]), float(target_dial_tmp), "Dialyste Tmp value should be :" + str(target_dial_tmp)) dd.dd_conductivity(D17 = 0, D27 = target_dial_cond, @@ -308,65 +308,34 @@ test.compare(round(float(dialCond_properties["value"]),1), round(float(target_dial_cond/1000),1), "Dialyste conductivity value should be :" + str(target_dial_cond)) test.endSection() -def edit_treatment_duration(): +def handle_pause_resume_request( message, timestamp = 0.0): """ - Verifying New Treatment Duration in Main Treatment Screen + Called when the user requests to firmware from UI + @return: None """ - td.td_treatment_time(tx_duration_s=51, tx_elapsed_s=5, tx_remaining_s=6) - td.td_ultrafiltration(10, 0.53, 0.37, 0) - - td.td_param_ranges( - min_tx_time_s=50, - max_tx_time_s=300, - min_uf_volume_mL=0.0, - max_uf_volume_mL=1790, - min_dial_rate_mLH=0, - max_dial_rate_mLH=0, - ) - - treatmentEdit = waitForObject(names.o_treatment_duration) - treatmentEditbutton = utility.findObjectById(treatmentEdit, "_editTimeIcon") - mouseClick(treatmentEditbutton) - if can_interface is not None: - channel_id = CAN.CanChannels.ui_to_td_ch_id - message_id = MsgIds.MSG_ID_UI_DURATION_VALIDATE_REQUEST.value - can_interface.register_receiving_publication_function( - channel_id, message_id, handle_new_treatment_duration_request - ) - utility.set_value_based_on_target(names.o_newTreatmentDuration_ValueAdjuster, 60) - mouseClick(waitForObject(names.o_continueButton_TouchRect, 3000)) - test.verify( - waitFor(lambda: newTreatmentDuration == 60, 5000), - "Verifying FW received New Treatment Duration", - ) + message = message['message'] + index = MsgFieldPositions.START_POS_FIELD_1 + state,index = conversions.bytearray_to_integer( message, index) + global pauseresumerequest + pauseresumerequest = state - td.td_duration_validate_response(0, 60, 0, 0, 0) - parent_object = waitForObject(names.o_newTreatmentDuration, 3000) - newTreatmentDuration_value_object = utility.findObjectById(parent_object, "_value") - test.log(f"New Treatment Duration value: {str(newTreatmentDuration_value_object.text)}") - - parent_object = waitForObject(names.o_ufVolumeGoal, 3000) - ufVolumeGoal_value_object = utility.findObjectById(parent_object, "_value") - test.log(f"UF Volume Goal value: {str(ufVolumeGoal_value_object.text)}") - - parent_object = waitForObject(names.o_ufRate, 3000) - ufRate_value_object = utility.findObjectById(parent_object, "_value") - test.log(f"New UF Rate value: {str(ufRate_value_object.text)}") - - mouseClick(waitForObject(names.o_confirmButton_TouchRect, 3000)) - mouseClick(waitForObject(names.o_Popup_CloseButton, 3000)) - def main(): utils.tstStart(__file__) - startApplication(config.AUT_NAME_ONLY + " -q") - + startApplication(utility.aut("-q")) + global pauseresumerequest + if can_interface is not None: + channel_id = CAN.CanChannels.ui_to_td_ch_id + message_id = MsgIds.MSG_ID_UI_UF_PAUSE_RESUME_REQUEST.value + can_interface.register_receiving_publication_function(channel_id, + message_id, + handle_pause_resume_request) td.td_operation_mode(TDOpModes.MODE_STAN.value,0) # verify Standby screen test.verify(waitForObjectExists(names.o_standByScreen_MainHome), "In Standby") - td.td_operation_mode( TDOpModes.MODE_TREA.value, 0 ) + td.td_operation_mode( TDOpModes.MODE_PRET.value, 0 ) td.td_tx_state(TDTreatmentStates.TREATMENT_DIALYSIS_STATE.value , 0 , 0 , @@ -377,10 +346,10 @@ 0 , 0 , 0) - + # verify main treatment screen test.verify(waitForObjectExists(names.mainTreatmentScreen), "In Main Treatment") - + # Pressure State test.startSection("Verifying Pressure values on main treatment screen") test_pressure_displayed_in_treatment_screen_range_bar() @@ -393,8 +362,8 @@ H14_venous_max = VENOUS_HIGH_VAL_410 , H2_arterial_long = 0 , H14_venous_long = 0 , - tmp_pressure = 0 , - tmp_long = 0.0, + tmp_pressure = 0 , + tmp_long = 0.0 , tmp_min = TMP_LOW_VAL_MINUS_640 , tmp_max = TMP_HIGH_VAL_210, barometric = 0.0) @@ -409,13 +378,40 @@ start_test_treatment_ultrafiltration(**value) test.endSection() + #Test New UF pause/Resume button + pauseResume = waitForObject(names.o_treatmentHome_iconImage_Image_main,1000) + mouseClick(pauseResume) + # global pauseresumerequest + test.verify(waitFor(" 'pauseresumerequest == 0'", 3000), "Testing FW received Pause Request from the UI") + td.td_ultrafiltration( set_volume = 1.2 , + target_rate = 0.5 , + volume_delivered = 0.2 , + state = 1 ) + mouseClick(pauseResume) + test.verify(waitFor(" 'pauseresumerequest == 1'", 3000), "Testing FW received Resume Request from the UI ") + td.td_ultrafiltration( set_volume = 1.2 , + target_rate = 0.5 , + volume_delivered = 0.2 , + state = 0 ) + + + #check the vitals + mouseClick(waitForObject(names.o_treatmentHome_vitals_IconButton)) + if can_interface is not None: + channel_id = CAN.CanChannels.ui_to_td_ch_id + message_id = MsgIds.MSG_ID_UI_BLOOD_PRESSURE_REQUEST.value + can_interface.register_receiving_publication_function(channel_id, + message_id, + handle_pause_resume_request) + + test.verify(waitFor(" 'pauseresumerequest == 1'", 3000), "Testing FW received Request from the UI ") + #TX Time #Calculating total seconds into minutes and passing to treatment time verification test.startSection("Verifying TX time on main treatment screen") for value in total_time_list: treatment_time_verification(value) - #Check the treatment complete text message - test.compare(waitForObjectExists(names.o_treatmentHome_notification_NotificationBarSmall,2000).text, "Treatment Complete", "Tx time completed text should be :" + str("Treatment Complete")) + td.td_treatment_time( tx_duration_s = 51 , tx_elapsed_s = 5 , tx_remaining_s = 6 ) @@ -435,10 +431,6 @@ #TX Parameter Set Points test.startSection("Verifying blood flow, dialysate temp,dialysate flow and dialyste cond on main treatment screen") verify_setPoints_from_main_treatement() - test.endSection() - test.startSection("Verifying New Treatment Duration in Main Treatment Screen") - edit_treatment_duration() - test.endSection() - utils.tstDone() + test.endSection() \ No newline at end of file Index: suite_leahi/tst_ultrafiltration/test.py =================================================================== diff -u -r4e2984559dbdc1dc708f2bdbc984ed03ea1fd8e1 -r7fa3503b0eeaf8e05f4f885d7af4ea2947d90e0a --- suite_leahi/tst_ultrafiltration/test.py (.../test.py) (revision 4e2984559dbdc1dc708f2bdbc984ed03ea1fd8e1) +++ suite_leahi/tst_ultrafiltration/test.py (.../test.py) (revision 7fa3503b0eeaf8e05f4f885d7af4ea2947d90e0a) @@ -119,7 +119,7 @@ conf_path = "/home/denali/Public/luis/config/configurations/Alarms/Rejections.conf" repo = ScopedRejectionRepository(path=conf_path) - startApplication(config.AUT_NAME) + startApplication(utility.aut("-q")) td.td_operation_mode(TDOpModes.MODE_STAN.value)