Index: suite_leahi/shared/scripts/configuration/config.py =================================================================== diff -u -r75e3ab588237239452761d2ec90e8b3aec6a916b -rb6aa1adafbc0b279e012c904ecde7774fb0000ea --- suite_leahi/shared/scripts/configuration/config.py (.../config.py) (revision 75e3ab588237239452761d2ec90e8b3aec6a916b) +++ suite_leahi/shared/scripts/configuration/config.py (.../config.py) (revision b6aa1adafbc0b279e012c904ecde7774fb0000ea) @@ -87,8 +87,10 @@ COMPLETE = 'Complete' HEPARIN = "Heparin" CREATERX = "Rx" -VALIDATE = "VALIDATE" -CONFIRM = "CONFIRM" +VALIDATE = "Validate" +CONFIRM = "Confirm" NEXT ="Next" +ISOLATED_UF_VOLUME_REMOVED = "Isolated UF Volume Removed" +ISOLATED_UF_VOLUME_GOAL ="Isolated UF Volume Goal" Index: suite_leahi/shared/scripts/configuration/navigation.py =================================================================== diff -u -rc7d96b722594bb29a7bbc3689715b90af6e3d616 -rb6aa1adafbc0b279e012c904ecde7774fb0000ea --- suite_leahi/shared/scripts/configuration/navigation.py (.../navigation.py) (revision c7d96b722594bb29a7bbc3689715b90af6e3d616) +++ suite_leahi/shared/scripts/configuration/navigation.py (.../navigation.py) (revision b6aa1adafbc0b279e012c904ecde7774fb0000ea) @@ -4,6 +4,8 @@ from leahi_dialin.ui.td_messaging import TD_Messaging from leahi_dialin.common.td_defs import TDOpModes, TDStandbyStates from configuration import config, utility +from configparser import ConfigParser +from pathlib import Path td_simulator = TD_Messaging() @@ -34,6 +36,23 @@ ), ) +def get_ini_value(conf_path: str , section: str, key: str): + """ + Method to get the advanced option from the System.conf file + """ + path = Path(conf_path) + if not path.exists(): + raise FileNotFoundError(f"Not found: {path}") + parser = ConfigParser() + # Preserve case if needed: + # parser.optionxform = str + parser.read(path, encoding="utf-8") + if not parser.has_section(section): + raise KeyError(f"Section [{section}] not found in {path}") + if not parser.has_option(section, key): + raise KeyError(f"Key '{key}' not found in section [{section}]") + return parser.get(section, key) + def navigation_pageIndicator_step(vStep_name): """ Navigate to the specified page using the step indicator component. @@ -46,15 +65,29 @@ """ test.startSection("Method to navigation in the pretreatment page ") stepId = squish.waitForObjectExists(names.o_preTreatmentStack_stepIndicator_StepIndicator) + stepnames = utility.findAllObjectsById(stepId, "_text") + value = get_ini_value("/home/denali/Public/luis/config/configurations/Settings/System.conf", section ="AdvancedMode", key ="AdvancedMode") + standard = stepnames[1:] + if value == "0": + standard = stepnames[3:] + Nextbutton = utility.setObjectText(obj =names.o_preTreatmentStack_Text, text =config.NEXT) + squish.mouseClick(squish.waitForObject(Nextbutton)) + + autoLoadbutton = utility.setObjectText(obj =names.o_preTreatmentStack_Text, text ="Auto Load") + squish.mouseClick(squish.waitForObject(autoLoadbutton)) + td_simulator.td_blood_set_auto_load_response(vRejectionReason = 0) + stepId = squish.waitForObjectExists(names.o_preTreatmentStack_stepIndicator_StepIndicator) values = utility.findAllObjectsById(stepId, "_text") - for index, input_field in enumerate(values[2:]): - test.log(str(index)); + for input_field in standard: test.log(str(input_field.text)) + if str(input_field.text) == "Water Sample": + squish.mouseClick(squish.waitForObject(names.o_PreTreatmentSampleStack_button_TouchRect)) + if str(input_field.text) == vStep_name: - test.log("Reached the target step") break else: Nextbutton = utility.setObjectText(obj =names.o_preTreatmentStack_Text, text =config.NEXT) squish.mouseClick(Nextbutton) - test.endSection() + + test.endSection() \ No newline at end of file Index: suite_leahi/shared/scripts/configuration/utility.py =================================================================== diff -u -rc7d96b722594bb29a7bbc3689715b90af6e3d616 -rb6aa1adafbc0b279e012c904ecde7774fb0000ea --- suite_leahi/shared/scripts/configuration/utility.py (.../utility.py) (revision c7d96b722594bb29a7bbc3689715b90af6e3d616) +++ suite_leahi/shared/scripts/configuration/utility.py (.../utility.py) (revision b6aa1adafbc0b279e012c904ecde7774fb0000ea) @@ -136,14 +136,16 @@ 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) - 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) + 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) select_different_dropdown(names.o_PreTreatmentCreate_acidConcentrateComboBox_BaseComboBox,config.ACID_CONCENTRATE,2) set_value_based_on_target(names.o_PreTreatmentCreate_dialysateTemperatureControl_ValueAdjuster,37.0) select_different_dropdown(names.o_PreTreatmentCreate_dialyzerTypeComboBox_BaseComboBox,config.DIALYZER_TYPE,2) set_value_based_on_target(names.o_PreTreatmentCreate_salineBolusVolumeControl_ValueAdjuster, 200) - select_different_dropdown(names.o_PreTreatment_vitalsCombobox_BaseCombobox,config.VITALS,1) + set_value_based_on_target(names.o_PreTreatmentCreate_bpMeasurementIntervalControl_ValueAdjusterCustom,2.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)) @@ -167,10 +169,9 @@ vDialysateTempRejectReason = 0, vHeparinDispensingRateRejectReason = 0, vHeparinBolusVolumeRejectReason = 0 - ) - - confirmButton = setObjectText(obj = names.o_preTreatmentStack_Text,text = config.CONFIRM ) - squish.mouseClick(squish.waitForObject(confirmButton)) + ) + confirm = squish.waitForObjectExists(names.o_preTreatmentStack_confirmButton_ConfirmButton, 3000) + squish.mouseClick(confirm) test.endSection() def findAllObjectsById(parent, target_id): @@ -201,7 +202,7 @@ """ try: - value_field = waitForObject(value_field_obj,1000) + value_field = squish.waitForObject(value_field_obj,1000) test.log(f"Opening slider for {parameter}...") squish.mousePress(value_field, squish.Qt.LeftButton) value = value_field.value @@ -214,17 +215,17 @@ if not object.exists(slider_obj): test.fail(f"{parameter}: Slider did not appear.") - slider = waitForObject(slider_obj) + slider = squish.waitForObject(slider_obj) test.log(f"{parameter}: Slider appeared successfully.") squish.mousePress(slider,squish.Qt.LeftButton) - final_value = waitForObject(value_field_obj).value + final_value = squish.waitForObject(value_field_obj).value test.verify(final_value!= value, f"{parameter} slider adjusted correctly to {final_value}") squish.mouseRelease(slider, squish.Qt.LeftButton) if object.exists(slider_obj): test.log(f"Waiting for {parameter} slider to close...") - waitFor(lambda: not object.exists(slider_obj), 1000) + squish.waitFor(lambda: not object.exists(slider_obj), 1000) except LookupError as e: test.fail(f"{parameter}: LookupError - {e}") Index: suite_leahi/shared/scripts/names.py =================================================================== diff -u -r0e16f6d7e1f8349a7ccf945c666f6fdab7752d16 -rb6aa1adafbc0b279e012c904ecde7774fb0000ea --- suite_leahi/shared/scripts/names.py (.../names.py) (revision 0e16f6d7e1f8349a7ccf945c666f6fdab7752d16) +++ suite_leahi/shared/scripts/names.py (.../names.py) (revision b6aa1adafbc0b279e012c904ecde7774fb0000ea) @@ -90,8 +90,8 @@ o_editButton_TouchRect = {"container": o_Overlay, "objectName": "_editButton", "type": "TouchRect" } o_volumeGoalAdjuster_ValueAdjuster = {"container": o_Overlay, "objectName": "_volumeGoalAdjuster", "type": "ValueAdjuster" } o_continueButton_TouchRect = {"container": o_Overlay, "objectName": "_continueButton", "type": "TouchRect" } -o_newVolumeContainer_ValueContainer = {"container": o_Overlay, "objectName": "_newVolumeContainer", "type": "ValueContainer" } -o_newRateContainer_ValueContainer = {"container": o_Overlay, "objectName": "_newRateContainer", "type": "ValueContainer" } +o_left_LabelUnitText = {"container": o_Overlay, "objectName": "_left", "type": "LabelUnitText" } +o_right_LabelUnitText = {"container": o_Overlay, "objectName": "_right", "type": "LabelUnitText" } o_confirmButton_TouchRect = {"container": o_Overlay, "objectName": "_confirmButton", "type": "TouchRect" } o_backButton_BackButton = {"container": o_Overlay, "id": "_backButton", "type": "BackButton", "unnamed": 1 } o_notificationBar_NotificationBarSmall = {"container": o_Overlay, "objectName": "NotificationBar", "type": "NotificationBarSmall" } @@ -124,43 +124,57 @@ o_PreTreatmentCreateStack_PreTreatmentCreate_PreTreatmentCreate = {"container": o_PreTreatmentCreateStack_PreTreatmentCreateStack, "objectName": "_PreTreatmentCreate", "type": "PreTreatmentCreate" , } o_bullet_object = { "type": "StepBullet", "unnamed": 1 } o_text_object = { "type": "Text", "unnamed": 1 } -o_PreTreatmentCreate_gridSteps_Grid = {"container": o_PreTreatmentCreateStack_PreTreatmentCreate_PreTreatmentCreate, "id": "_gridSteps", "type": "Grid", "unnamed": 1 } -o_PreTreatmentCreate_bloodFlowRate_LabelUnitContainer = {"container": o_PreTreatmentCreateStack_PreTreatmentCreate_PreTreatmentCreate, "id": "_bloodFlowRate", "type": "LabelUnitContainer", "unnamed": 1 } -o_PreTreatmentCreate_bloodFlowRateControl_ValueAdjuster = {"container": o_PreTreatmentCreateStack_PreTreatmentCreate_PreTreatmentCreate, "id": "_bloodFlowRateControl", "type": "ValueAdjuster", "unnamed": 1 } -o_PatientIDEntry_TextEntry = {"container": o_PreTreatmentCreateStack_PreTreatmentCreate_PreTreatmentCreate, "id": "_pretreatmentPatientIDEntry", "type": "TextEntry", "unnamed": 1 } -o_PreTreatmentCreate_dialysateFlowRateControl_ValueAdjuster = {"container": o_PreTreatmentCreateStack_PreTreatmentCreate_PreTreatmentCreate, "id": "_dialysateFlowRateControl", "type": "ValueAdjuster", "unnamed": 1 } -o_PreTreatmentCreate_durationControl_ValueAdjuster = {"container": o_PreTreatmentCreateStack_PreTreatmentCreate_PreTreatmentCreate, "id": "_durationControl", "type": "ValueAdjuster", "unnamed": 1 } -o_PreTreatmentCreate_heparinBolusVolumeControl_ValueAdjuster = {"container": o_PreTreatmentCreateStack_PreTreatmentCreate_PreTreatmentCreate, "id": "_heparinBolusVolumeControl", "type": "ValueAdjuster", "unnamed": 1 } -o_PreTreatmentCreate_heparinDispensingRateControl_ValueAdjuster = {"container": o_PreTreatmentCreateStack_PreTreatmentCreate_PreTreatmentCreate, "id": "_heparinDispensingRateControl", "type": "ValueAdjuster", "unnamed": 1 } -o_PreTreatmentCreate_heparinDispensingRate_LabelUnitContainer = {"container": o_PreTreatmentCreateStack_PreTreatmentCreate_PreTreatmentCreate, "id": "_heparinDispensingRate", "type": "LabelUnitContainer", "unnamed": 1 } -o_PreTreatmentCreate_heparinDispensingRateControl_OffText = {"container": o_PreTreatmentCreate_heparinDispensingRateControl_ValueAdjuster, "type": "Text", "unnamed": 1 } -o_PreTreatmentCreate_heparinStopTimeControl_ValueAdjuster = {"container": o_PreTreatmentCreateStack_PreTreatmentCreate_PreTreatmentCreate, "id": "_heparinStopTimeControl", "type": "ValueAdjuster", "unnamed": 1 } -o_PreTreatmentCreate_dialysateTemperatureControl_ValueAdjuster = {"container": o_PreTreatmentCreateStack_PreTreatmentCreate_PreTreatmentCreate, "id": "_dialysateTemperatureControl", "type": "ValueAdjuster", "unnamed": 1 } -o_PreTreatmentCreate_salineBolusVolumeControl_ValueAdjuster = {"container": o_PreTreatmentCreateStack_PreTreatmentCreate_PreTreatmentCreate, "id": "_salineBolusVolumeControl", "type": "ValueAdjuster", "unnamed": 1 } -o_PreTreatmentCreate_heparinBolusVolume_LabelUnitContainer = {"container": o_PreTreatmentCreateStack_PreTreatmentCreate_PreTreatmentCreate, "id": "_heparinBolusVolume", "type": "LabelUnitContainer", "unnamed": 1 } -o_PreTreatmentCreate_heparinBolusVolume_Off_Text = {"container": o_PreTreatmentCreate_heparinBolusVolumeControl_ValueAdjuster, "type": "Text", "unnamed": 1 } -o_PreTreatmentCreate_dialyzerTypeComboBox_BaseComboBox = {"container": o_PreTreatmentCreateStack_PreTreatmentCreate_PreTreatmentCreate, "id": "_dialyzerTypeComboBox", "type": "BaseComboBox", "unnamed": 1 } +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_gridSteps_Grid = {"container": o_preTreatmentStack_PreTreatmentCreate_PreTreatmentCreate, "id": "_gridSteps", "type": "Grid", "unnamed": 1 } +o_PreTreatmentCreate_bloodFlowRate_LabelUnitContainer = {"container": o_preTreatmentStack_PreTreatmentCreate_PreTreatmentCreate, "id": "_bloodFlowRate", "type": "LabelUnitContainer", "unnamed": 1 } +o_PatientIDEntry_TextEntry = {"container": o_preTreatmentStack_PreTreatmentCreate_PreTreatmentCreate, "id": "_pretreatmentPatientIDEntry", "type": "TextEntry", "unnamed": 1 } +o_PreTreatmentCreate_heparinDispensingRate_LabelUnitContainer = {"container": o_preTreatmentStack_PreTreatmentCreate_PreTreatmentCreate, "id": "_heparinDispensingRate", "type": "LabelUnitContainer", "unnamed": 1 } +o_PreTreatmentCreate_heparinBolusVolume_LabelUnitContainer = {"container": o_preTreatmentStack_PreTreatmentCreate_PreTreatmentCreate, "id": "_heparinBolusVolume", "type": "LabelUnitContainer", "unnamed": 1 } +o_PreTreatmentCreate_heparinBolusVolume_Off_Text = {"container": o_preTreatmentStack_PreTreatmentCreate_PreTreatmentCreate, "type": "Text", "unnamed": 1 } +o_PreTreatmentCreate_dialyzerTypeComboBox_BaseComboBox = {"container": o_preTreatmentStack_PreTreatmentCreate_PreTreatmentCreate, "id": "_dialyzerTypeComboBox", "type": "BaseComboBox", "unnamed": 1 } o_saveButton_TouchRect = {"container": o_Overlay, "id": "_saveButton", "type": "TouchRect", "unnamed": 1 } -o_PreTreatmentCreate_acidConcentrateComboBox_BaseComboBox = {"container": o_PreTreatmentCreateStack_PreTreatmentCreate_PreTreatmentCreate, "id": "_acidConcentrateComboBox", "type": "BaseComboBox", "unnamed": 1 } -o_PreTreatmentCreate_acidConcentrate_LabelUnitContainer = {"container": o_PreTreatmentCreateStack_PreTreatmentCreate_PreTreatmentCreate, "id": "_acidConcentrate", "type": "LabelUnitContainer", "unnamed": 1 } -o_acidConcentrate_editbutton = {"container": o_PreTreatmentCreate_acidConcentrate_LabelUnitContainer, "id": "_editButton", "type": "IconButton", "unnamed": 1 } +o_PreTreatmentCreate_acidConcentrateComboBox_BaseComboBox = {"container": o_preTreatmentStack_PreTreatmentCreate_PreTreatmentCreate, "id": "_acidConcentrateComboBox", "type": "BaseComboBox", "unnamed": 1 } +o_PreTreatmentCreate_acidConcentrate_LabelUnitContainer = {"container": o_preTreatmentStack_PreTreatmentCreate_PreTreatmentCreate, "id": "_acidConcentrate", "type": "LabelUnitContainer", "unnamed": 1 } +o_acidConcentrate_editbutton = {"container": o_preTreatmentStack_PreTreatmentCreate_PreTreatmentCreate, "id": "_editButton", "type": "IconButton", "unnamed": 1 } o_PreTreatmentCreate_acidConcentrate_Popup_Text = {"container": o_Overlay, "type": "TitleText", "unnamed": 1 } -o_PreTreatmentCreate_qrCode_Image = {"container": o_PreTreatmentCreateStack_PreTreatmentCreate_PreTreatmentCreate, "id": "_qrCode", "type": "Image", "unnamed": 1 } -o_PreTreatmentButton = {"container": o_PreTreatmentCreateStack_PreTreatmentCreate_PreTreatmentCreate, "objectName": "_confirmButton", "type": "ConfirmButton", } -o_prescription_menuButton = {"container": o_PreTreatmentCreateStack_PreTreatmentCreate_PreTreatmentCreate, "id": "_prescriptionMenu", "type": "BaseComboBox", "unnamed": 1 } -o_PreTreatmentCreate_dialysateFlowRate_LabelUnitContainer = {"container": o_PreTreatmentCreateStack_PreTreatmentCreate_PreTreatmentCreate, "id": "_dialysateFlowRate", "type": "LabelUnitContainer", "unnamed": 1 } -o_PreTreatmentCreate_duration_LabelUnitContainer = {"container": o_PreTreatmentCreateStack_PreTreatmentCreate_PreTreatmentCreate, "id": "_duration", "type": "LabelUnitContainer", "unnamed": 1 } -o_PreTreatmentCreate_heparinStopTime_LabelUnitContainer = {"container": o_PreTreatmentCreateStack_PreTreatmentCreate_PreTreatmentCreate, "id": "_heparinStopTime", "type": "LabelUnitContainer", "unnamed": 1 } -o_PreTreatmentCreate_heparinStopTime_OFF_Text = {"container": o_PreTreatmentCreate_heparinStopTimeControl_ValueAdjuster, "type": "Text", "unnamed": 1 } -o_PreTreatmentCreate_bicarbonateConcentrate_LabelUnitContainer = {"container": o_PreTreatmentCreateStack_PreTreatmentCreate_PreTreatmentCreate, "id": "_bicarbonateConcentrate", "type": "LabelUnitContainer", "unnamed": 1 } -o_PreTreatmentCreate_dialyzerType_LabelUnitContainer = {"container": o_PreTreatmentCreateStack_PreTreatmentCreate_PreTreatmentCreate, "id": "_dialyzerType", "type": "LabelUnitContainer", "unnamed": 1 } -o_PreTreatmentCreate_dialysateTemperature_LabelUnitContainer = {"container": o_PreTreatmentCreateStack_PreTreatmentCreate_PreTreatmentCreate, "id": "_dialysateTemperature", "type": "LabelUnitContainer", "unnamed": 1 } -o_PreTreatmentCreate_salineBolusVolume_LabelUnitContainer = {"container": o_PreTreatmentCreateStack_PreTreatmentCreate_PreTreatmentCreate, "id": "_salineBolusVolume", "type": "LabelUnitContainer", "unnamed": 1 } +o_PreTreatmentCreate_qrCode_Image = {"container": o_preTreatmentStack_PreTreatmentCreate_PreTreatmentCreate, "id": "_qrCode", "type": "Image", "unnamed": 1 } +o_PreTreatmentButton = {"container": o_preTreatmentStack_PreTreatmentCreate_PreTreatmentCreate, "objectName": "_confirmButton", "type": "ConfirmButton", } +o_prescription_menuButton = {"container": o_preTreatmentStack_PreTreatmentCreate_PreTreatmentCreate, "id": "_prescriptionMenu", "type": "BaseComboBox", "unnamed": 1 } +o_PreTreatmentCreate_dialysateFlowRate_LabelUnitContainer = {"container": o_preTreatmentStack_PreTreatmentCreate_PreTreatmentCreate, "id": "_dialysateFlowRate", "type": "LabelUnitContainer", "unnamed": 1 } +o_PreTreatmentCreate_duration_LabelUnitContainer = {"container": o_preTreatmentStack_PreTreatmentCreate_PreTreatmentCreate, "id": "_duration", "type": "LabelUnitContainer", "unnamed": 1 } +o_PreTreatmentCreate_heparinStopTime_LabelUnitContainer = {"container": o_preTreatmentStack_PreTreatmentCreate_PreTreatmentCreate, "id": "_heparinStopTime", "type": "LabelUnitContainer", "unnamed": 1 } +# o_PreTreatmentCreate_heparinStopTime_OFF_Text = {"container": o_PreTreatmentCreate_heparinStopTimeControl_ValueAdjuster, "type": "Text", "unnamed": 1 } +o_PreTreatmentCreate_bicarbonateConcentrate_LabelUnitContainer = {"container": o_preTreatmentStack_PreTreatmentCreate_PreTreatmentCreate, "id": "_bicarbonateConcentrate", "type": "LabelUnitContainer", "unnamed": 1 } +o_PreTreatmentCreate_dialyzerType_LabelUnitContainer = {"container": o_preTreatmentStack_PreTreatmentCreate_PreTreatmentCreate, "id": "_dialyzerType", "type": "LabelUnitContainer", "unnamed": 1 } +o_PreTreatmentCreate_dialysateTemperature_LabelUnitContainer = {"container": o_preTreatmentStack_PreTreatmentCreate_PreTreatmentCreate, "id": "_dialysateTemperature", "type": "LabelUnitContainer", "unnamed": 1 } +o_PreTreatmentCreate_salineBolusVolume_LabelUnitContainer = {"container": o_preTreatmentStack_PreTreatmentCreate_PreTreatmentCreate, "id": "_salineBolusVolume", "type": "LabelUnitContainer", "unnamed": 1 } o_potassium_LabelUnitContainer = {"container": o_Overlay, "id": "_potassium", "type": "LabelUnitContainer", "unnamed": 1 } o_potassium_leftArrow_IconButton = {"container": o_potassium_LabelUnitContainer, "id": "_leftArrow", "type": "IconButton", "unnamed": 1 } o_calcium_LabelUnitContainer = {"container": o_Overlay, "id": "_calcium", "type": "LabelUnitContainer", "unnamed": 1 } o_calcium_leftArrow_IconButton = {"container": o_calcium_LabelUnitContainer, "id": "_leftArrow", "type": "IconButton", "unnamed": 1 } o_option_combo_box = {"container": o_Overlay, "type": "Text", "unnamed": 1 } + +o_PreTreatmentCreate_pretreatmentPatientIDEntry_TextEntry = {"container": o_preTreatmentStack_PreTreatmentCreate_PreTreatmentCreate, "id": "_pretreatmentPatientIDEntry", "type": "TextEntry", "unnamed": 1 } +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_PreTreatmentCreate_pretreatmentPatientIDEntry_TextEntry = {"container": o_preTreatmentStack_PreTreatmentCreate_PreTreatmentCreate, "id": "_pretreatmentPatientIDEntry", "type": "TextEntry", "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 } +o_PreTreatmentCreate_bpMeasurementIntervalControl_ValueAdjusterCustom= {"container": o_preTreatmentStack_PreTreatmentCreate_PreTreatmentCreate, "id": "_bpMeasurementIntervalControl", "type": "ValueAdjusterCustom", "unnamed": 1 } +o_preTreatmentStack_confirmButton_ConfirmButton = {"container": o_preTreatmentStack_PreTreatmentStack, "objectName": "_confirmButton", "type": "ConfirmButton", "visible": True } + o_PreTreatmentCreate_bloodFlowRate_slider_Slider = {"container": o_PreTreatmentCreate_bloodFlowRateControl_ValueAdjuster, "id": "_slider", "type": "Slider", "unnamed": 1 } o_PreTreatmentCreate_dialysateFlowRate_slider_Slider = {"container": o_PreTreatmentCreate_dialysateFlowRateControl_ValueAdjuster, "id": "_slider", "type": "Slider", "unnamed": 1 } o_PreTreatmentCreate_duration_slider_Slider = {"container": o_PreTreatmentCreate_durationControl_ValueAdjuster, "id": "_slider", "type": "Slider", "unnamed": 1 } @@ -216,11 +230,30 @@ 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_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_PreTreatmentCreate_pretreatmentPatientIDEntry_TextEntry = {"container": o_preTreatmentStack_PreTreatmentCreate_PreTreatmentCreate, "id": "_pretreatmentPatientIDEntry", "type": "TextEntry", "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 } - +o_PreTreatmentCreate_bpMeasurementIntervalControl_ValueAdjusterCustom= {"container": o_preTreatmentStack_PreTreatmentCreate_PreTreatmentCreate, "id": "_bpMeasurementIntervalControl", "type": "ValueAdjusterCustom", "unnamed": 1 } +o_preTreatmentStack_confirmButton_ConfirmButton = {"container": o_preTreatmentStack_PreTreatmentStack, "objectName": "_confirmButton", "type": "ConfirmButton", "visible": True } + +#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" } + + + + + Index: suite_leahi/suite.conf =================================================================== diff -u -r1a3dc7aeb6c2998c4480a9c58c522c293c1389f5 -rb6aa1adafbc0b279e012c904ecde7774fb0000ea --- suite_leahi/suite.conf (.../suite.conf) (revision 1a3dc7aeb6c2998c4480a9c58c522c293c1389f5) +++ suite_leahi/suite.conf (.../suite.conf) (revision b6aa1adafbc0b279e012c904ecde7774fb0000ea) @@ -1,6 +1,6 @@ AUT=leahi LANGUAGE=Python OBJECTMAPSTYLE=script -TEST_CASES=tst_solution_infusion tst_main_treatment tst_service_export_logs tst_device_settings_information_version tst_headerbar_information_popup tst_headerbar_wifi_indicator tst_device_settings_wifi tst_ultrafiltration tst_create_treatment tst_general_alarm_requirements_instruction tst_headerbar_prescription tst_heparin +TEST_CASES=tst_solution_infusion tst_main_treatment tst_service_export_logs tst_device_settings_information_version tst_headerbar_information_popup tst_headerbar_wifi_indicator tst_device_settings_wifi tst_ultrafiltration tst_create_treatment tst_general_alarm_requirements_instruction tst_headerbar_prescription tst_heparin tst_isolated_uf VERSION=3 WRAPPERS=Qt Index: suite_leahi/tst_heparin/test.py =================================================================== diff -u -r1a3dc7aeb6c2998c4480a9c58c522c293c1389f5 -rb6aa1adafbc0b279e012c904ecde7774fb0000ea --- suite_leahi/tst_heparin/test.py (.../test.py) (revision 1a3dc7aeb6c2998c4480a9c58c522c293c1389f5) +++ suite_leahi/tst_heparin/test.py (.../test.py) (revision b6aa1adafbc0b279e012c904ecde7774fb0000ea) @@ -90,7 +90,7 @@ utility.set_value_based_on_target(names.o_PreTreatmentCreate_salineBolusVolumeControl_ValueAdjuster, 100) 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.select_different_dropdown(names.o_PreTreatment_vitalsCombobox_BaseCombobox,config.VITALS,1) + 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)) @@ -116,8 +116,8 @@ vHeparinBolusVolumeRejectReason = 0 ) - confirmButton = utility.setObjectText(obj = names.o_preTreatmentStack_Text, text = config.CONFIRM) - mouseClick(waitForObject(confirmButton)) + confirm = waitForObjectExists(names.o_preTreatmentStack_confirmButton_ConfirmButton, 3000) + mouseClick(confirm) test.endSection() def main(): Index: suite_leahi/tst_isolated_uf/test.py =================================================================== diff -u --- suite_leahi/tst_isolated_uf/test.py (revision 0) +++ suite_leahi/tst_isolated_uf/test.py (revision b6aa1adafbc0b279e012c904ecde7774fb0000ea) @@ -0,0 +1,213 @@ +# Subject/Title: LDT-3210 Isolated UF - SW - 02 - Q&R - 15: SIT - Software Integration Tests - Squish Qt +# +# Functionalities: Testing all functionalities of Isolated UF in main treatment page +# +# Steps: +# 1. Navigate to Main Treatment and Perform the edit button on the Ultrafiltration area +# 2. Press the Isolated UF button and check the following +# a. Check the values in the popup +# b. Change the value in the slider +# 3. Mouse click on Continue button +# a.Check FW receives request with the correct value +# 1.Test rejection status +# 2.Test no rejection status +# 4. Navigate to the next screen change the Isolated UF VOlume goal +# a.Verify values updated in the screen +# b.Verify Progress bar values +# c,Verify minimum range and maximum range +# 1. Minimum has to be greater than Volume removed +# 2. Max has to be the set Volume Goal max set responded from FW +# 5.Mouse click on Continue button +# a.Verify Volume Goal Change request is received by FW with values +# 1..Test Rejection status +# 2. Test no rejection with response from fw +# a. Verify FW sends Volume goal, Duration, Rate values to the UI +# 6. Mouse click on the Confirm button +# a.Confirm values sent from FW are shown on UI +# 7. Navigate to the next page +# a.Verify FW gets request with values +# b.Test Rejection status +# c.Test no rejection and verify the popup is closed + + +import names +import can + +from configuration import config,utility +from leahi_dialin.ui import utils +from leahi_dialin.ui.td_messaging import TD_Messaging +from leahi_dialin.common.td_defs import TDOpModes,TDTreatmentStates +from leahi_dialin.common import MsgIds,MsgFieldPositions +from leahi_dialin.protocols import CAN +from leahi_dialin.utils import conversions +from configuration.getrejectiontext import ScopedRejectionRepository + + +td =TD_Messaging() +can_interface = td.can_interface +isolatedufdurationrequest = None +isolatedvolumerequest = None +confirmrequest = "0" + +def handle_isolated_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 isolatedufdurationrequest + isolatedufdurationrequest = state + +def handle_isolated_volume_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 isolatedvolumerequest + isolatedvolumerequest = state + +def handle_confirm_isolated_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.integer_to_bytearray( message, index) + global confirmrequest + confirmrequest = str(state) + +def main(): + utils.tstStart(__file__) + conf_path = "/home/denali/Public/luis/config/configurations/Alarms/Rejections.conf" + repo = ScopedRejectionRepository(path=conf_path) + startApplication(config.AUT_NAME) + td.td_operation_mode(TDOpModes.MODE_STAN.value) + td.td_tx_state(TDTreatmentStates.TREATMENT_DIALYSIS_STATE.value , + 0 , + 0 , + 0 , + 0 , + 0 , + 0 , + 0 , + 0 , + 0) + td.td_ultrafiltration(set_volume = 1.36 , + target_rate = 0.30, + volume_delivered = 0.39 , + state = 0 ) + + mouseClick(waitForObject(names.o_editButton_ultrafiltration_IconButton)) + test.startSection("Verify the values in the Isolated UF page") + td.td_isolated_uf( duration = 143 , + set_volume = 1957 , + volume_delivered = 936 , + rate = 115 ) + mouseClick(waitForObject(names.o_isolatedUfButton_TouchRect)) + test.log("Check the values in the Isolated UF Page") + isolated_uf_volume_removed = waitForObject(names.o_treatmentAdjustmentIsolatedUFDurationEdit) + isolated_uf_volume_removed =utility.findObjectById(isolated_uf_volume_removed, "_left") + test.compare(isolated_uf_volume_removed.label, config.ISOLATED_UF_VOLUME_REMOVED, "Isolated Uf Volume removed label text should be"+str(isolated_uf_volume_removed.label)) + test.compare(isolated_uf_volume_removed.value,"0.94","Isolated Uf Volume removed value text should be"+str(isolated_uf_volume_removed.value)) + isolated_uf_volume_goal = waitForObject(names.o_treatmentAdjustmentIsolatedUFDurationEdit) + isolated_uf_volume_goal = utility.findObjectById(isolated_uf_volume_goal, "_right") + test.compare(isolated_uf_volume_goal.label,config.ISOLATED_UF_VOLUME_GOAL,"Isolated Uf Volume goal label text should be"+str(isolated_uf_volume_goal.label)) + test.compare(isolated_uf_volume_goal.value,"1.96","Isolated Uf Volume goal label text should be"+str(isolated_uf_volume_goal.value)) + 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 + message_id = MsgIds.MSG_ID_UI_ISOLATED_UF_DURATION_CHANGE_REQUEST.value + can_interface.register_receiving_publication_function(channel_id, + message_id, + handle_isolated_duration_request) + test.verify(waitFor( lambda: isolatedufdurationrequest == 90, 3000), "Testing FW -> Check the Isolated Uf duration Request") + td.td_isolated_uf_duration_change_response(vRejectionReason = 13, + vVolumeMax = 0 ) + reject_text = waitForObject(names.o_notificationBar_NotificationBarSmall).text + REJECT_TEXT = repo.get("13", "Title") + test.compare(reject_text,"[13] "+REJECT_TEXT ,"Text should be ->" +str(REJECT_TEXT)) + test.endSection() + + test.startSection("Verify the values Isolated Ultra filtration Volume page") + td.td_isolated_uf_duration_change_response(vRejectionReason = 0, + vVolumeMax = 2826 ) + isolated_uf_volume_removed = waitForObject(names.o_treatmentAdjustmentIsolatedUFVolumeEdit) + isolated_uf_volume_removed =utility.findObjectById(isolated_uf_volume_removed,"_left") + test.compare(isolated_uf_volume_removed.value,"0.94","Isolated volume removed value should be"+str(isolated_uf_volume_removed.value)) + progress_bar = waitForObject(names.o_treatmentAdjustmentIsolatedUFVolumeEdit) + progress_bar =utility.findObjectById(progress_bar,"_volumeProgress") + test.verify(progress_bar.visible, "Progress bar is visible") + isolated_uf_volume_goal = waitForObject(names.o_volumeAdjuster_LabelUnitValueAdjuster) + utility.set_value_with_slider(names.o_valueAdjuster_ValueAdjuster_2,names.o_PreTreatmentCreate_volumeAdjuster_slider_Slider, "Isolated UF Volume Goal") + test.log("Verify the minimum and maximum range") + utility.set_value_based_on_target(names.o_valueAdjuster_ValueAdjuster_2,1) + isolated_uf_volume_goal_value = waitForObject(names.o_valueAdjuster_ValueAdjuster_2) + test.log(str(isolated_uf_volume_goal_value.value)) + utility.set_value_based_on_target(names.o_valueAdjuster_ValueAdjuster_2,2.80) + isolated_uf_volume_goal_value = waitForObject(names.o_valueAdjuster_ValueAdjuster_2) + test.log(str(isolated_uf_volume_goal_value.value)) + test.log("Click on the continue button") + continueButton = waitForObject(names.o_treatmentAdjustmentIsolatedUFVolumeEdit) + continueButton =utility.findObjectById(continueButton,"_continueButton") + mouseClick(waitForObject(continueButton)) + if can_interface is not None: + channel_id = CAN.DenaliChannels.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, + handle_isolated_volume_request) + + test.verify(waitFor( lambda: isolatedvolumerequest == 90, 2000), "Testing FW received Arterial Window Value") + test.log("Test the rejection reason 1") + td.td_isolated_uf_volume_change_response(vRejectionReason= 13, + vVolume= 2300, + vDuration= 546, + vRate= 175) + reject_text = waitForObject(names.o_notificationBar_NotificationBarSmall).text + REJECT_TEXT = repo.get("13", "Title") + test.compare(reject_text,"[13] "+REJECT_TEXT ,"Text should be ->" +str(REJECT_TEXT)) + td.td_isolated_uf_volume_change_response(vRejectionReason= 0, + vVolume= 2300, + vDuration= 546, + vRate= 175) + + test.endSection() + + test.startSection("Verify the values in the confirm isolated ultrafiltration pages") + isolated_uf_volume = waitForObject(names.o_volumeGoal_LabelUnitText) + test.compare(str(isolated_uf_volume.value),"2.30","Isolated Uf volume goal value should be"+str(isolated_uf_volume.value)) + isolated_uf_duration = waitForObject(names.o_duration_LabelUnitText) + test.compare(str(isolated_uf_duration.value),"546","Isolated UF duration value should be"+str(isolated_uf_duration.value)) + isolated_uf_rate = waitForObject(names.o_rate_LabelUnitText) + test.compare(str(isolated_uf_rate.value),"0.17","Isolated UF rate value should be"+str(isolated_uf_rate.value)) + 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 + message_id = MsgIds.MSG_ID_UI_ISOLATED_UF_CONFIRM_REQUEST.value + can_interface.register_receiving_publication_function(channel_id, + message_id, + handle_confirm_isolated_request) + + + test.verify(waitFor("'confirmrequest == 1'", 5000), "Testing UI -> TD message confirm request") + td.td_isolated_uf_confirm_response(vRejectionReason= 13) + reject_text = waitForObject(names.o_notificationBar_NotificationBarSmall).text + REJECT_TEXT = repo.get("13", "Title") + test.compare(reject_text,"[13] "+REJECT_TEXT ,"Text should be ->" +str(REJECT_TEXT)) + td.td_isolated_uf_confirm_response(vRejectionReason = 0) + confirmpopup = waitFor(lambda: not object.exists(names.o_HeaderBar_WiFi_Popup), 3000) + test.compare(confirmpopup, True, "Popup is not present") + test.endSection() + + utils.tstDone() + + + \ No newline at end of file Index: suite_leahi/tst_main_treatment/test.py =================================================================== diff -u -rf9812770166a529dd87003269cb05d12153e57de -rb6aa1adafbc0b279e012c904ecde7774fb0000ea --- suite_leahi/tst_main_treatment/test.py (.../test.py) (revision f9812770166a529dd87003269cb05d12153e57de) +++ suite_leahi/tst_main_treatment/test.py (.../test.py) (revision b6aa1adafbc0b279e012c904ecde7774fb0000ea) @@ -267,11 +267,11 @@ bloodFlow = utility.get_object_from_names(names.o_blood_flow_value) bloodFlow_properties = object.properties(bloodFlow) - test.compare(str(bloodFlow_properties["value"]), str(target_blood_flow), "Blood Flow value should be :" + str(target_blood_flow)) + test.compare(bloodFlow_properties["value"], 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(str(dialFlow_properties["value"]), str(target_dial_flow), "Dialyste flow value should be :" + str(target_dial_flow)) + test.compare(dialFlow_properties["value"], 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) Index: suite_leahi/tst_ultrafiltration/test.py =================================================================== diff -u -r6d83d7cbea9b040ee4717d7b90fdc44bf618bdcf -rb6aa1adafbc0b279e012c904ecde7774fb0000ea --- suite_leahi/tst_ultrafiltration/test.py (.../test.py) (revision 6d83d7cbea9b040ee4717d7b90fdc44bf618bdcf) +++ suite_leahi/tst_ultrafiltration/test.py (.../test.py) (revision b6aa1adafbc0b279e012c904ecde7774fb0000ea) @@ -106,7 +106,7 @@ # verify Standby screen test.verify(waitForObjectExists(names.o_standByScreen_MainHome), "In Standby") - td.td_operation_mode(TDOpModes.MODE_TPAR.value, 0) + # td.td_operation_mode(TDOpModes.MODE_TPAR.value, 0) td.td_operation_mode(TDOpModes.MODE_TREA.value, 0) td.td_tx_state(TDTreatmentStates.TREATMENT_DIALYSIS_STATE.value , 0 , @@ -149,13 +149,13 @@ title = waitForObjectExists(utility.setObjectText(obj=names.o_title_Text,text = ULTRAFILTRATION_VOLUME)) test.compare(title.text, ULTRAFILTRATION_VOLUME, "Title text should be -> "+ str(ULTRAFILTRATION_VOLUME)) #check the value in the edit popup - uf_volume_removed_text = waitForObjectExists(names.o_ufVolumeRemovedItem_ValueItem).label + uf_volume_removed_text = waitForObjectExists(names.o_left_LabelUnitText).label test.compare(uf_volume_removed_text,UF_VOLUME_REMOVED ,"Text Value should be ->" +str(UF_VOLUME_REMOVED)) - uf_volume_removed_value = waitForObjectExists(names.o_ufVolumeRemovedItem_ValueItem).value + uf_volume_removed_value = waitForObjectExists(names.o_left_LabelUnitText).value test.compare(str(uf_volume_removed_value), str(MIN_VOLUME_DELIVERED), "UF Volume Removed value should be ->"+str(uf_volume_removed_value)) - uf_volume_goal_text =waitForObjectExists(names.o_ufVolumeGoalItem_ValueItem).label + uf_volume_goal_text =waitForObjectExists(names.o_right_LabelUnitText).label test.compare(uf_volume_goal_text,UF_VOLUME_GOAL ,"Text Value should be ->" +str(UF_VOLUME_GOAL)) - uf_volume_goal_value = waitForObjectExists(names.o_ufVolumeGoalItem_ValueItem).value + uf_volume_goal_value = waitForObjectExists(names.o_right_LabelUnitText).value test.compare(str(uf_volume_goal_value), str(MIN_UF_VOLUME), "UF Volume Removed value should be ->"+str(uf_volume_goal_value)) test.endSection() @@ -174,11 +174,11 @@ confirm_ultrafiltrationtitle = waitForObjectExists(utility.setObjectText(text="Confirm Ultrafiltration Volume (L)",obj = names.o_title_Text)) test.compare(confirm_ultrafiltrationtitle.text, "Confirm Ultrafiltration Volume (L)", "Title text should be -> "+ str("Confirm Ultrafiltration Volume (L)")) - new_uf_volume_text = waitForObjectExists(names.o_newVolumeContainer_ValueContainer).text + new_uf_volume_text = waitForObjectExists(names.o_left_LabelUnitText).label test.compare(new_uf_volume_text,NEW_UF_VOLUME ,"Text Value should be ->" +str(NEW_UF_VOLUME)) - new_uf_rate_text = waitForObjectExists(names.o_newRateContainer_ValueContainer).text + new_uf_rate_text = waitForObjectExists(names.o_right_LabelUnitText).label test.compare(new_uf_rate_text,NEW_UF_RATE ,"Text Value should be ->" +str(NEW_UF_RATE)) - new_uf_volume_value = waitForObjectExists(names.o_newRateContainer_ValueContainer).value + new_uf_volume_value = waitForObjectExists(names.o_right_LabelUnitText).value test.compare(new_uf_volume_value, "0.04","Text Value should be ->" +str("0.04")) #click on the continue button