Index: suite_leahi/shared/scripts/configuration/config.py =================================================================== diff -u -r4b929ef6eef32479f10e84325b0ad12173474a4d -r4f9e56b35635368ce440e2cfffdaba7631b5d120 --- suite_leahi/shared/scripts/configuration/config.py (.../config.py) (revision 4b929ef6eef32479f10e84325b0ad12173474a4d) +++ suite_leahi/shared/scripts/configuration/config.py (.../config.py) (revision 4f9e56b35635368ce440e2cfffdaba7631b5d120) @@ -11,6 +11,37 @@ EXPORT_LOG_PROGRESS_STATUS = "Service log export to USB in progress ... " SERVICE_SCREEN_TITLE_TEXT = "Service" +#Main Treatement +UF_VOLUME_GOAL = "UF Volume Goal" +UF_RATE = "UF Rate" +BLOOD_FLOW = "Blood Flow" +DIALYSATE_FLOW = "Dialysate Flow" +DIALYSATE_TEMP = "Dialysate Temp." +DIALYSATE_COND = "Dialysate Cond." + +#ultrafiltration + +MAX_UF_VOLUME = 10.00 +MAX_UF_RATE = 10.00 +MAX_VOLUME_DELIVERED = 8.00 + +MIN_UF_VOLUME = 0.35 +MIN_UF_RATE = 0.22 +MIN_VOLUME_DELIVERED = 0.09 + +MID_UF_VOLUME = 5.00 +MID_UF_RATE = 5.00 +MID_VOLUME_DELIVERED = 4.00 + +ULTRAFILTRATION_VOLUME = "Ultrafiltration Volume (L)" +UF_VOLUME_REMOVED = "UF Volume Removed" +UF_VOLUME_GOAL = "UF Volume Goal" +NEW_UF_VOLUME = "New UF Volume" +NEW_UF_RATE = "New UF Rate" + +MAX_NEW_UF_VOLUME = 8.0 +MAX_NEW_UF_RATE = 2.0 + # Headerbar_information_popup INFORMATION_PARAMETERS = [ "OS Version", "UI Version", "TD Version", "TD FPGA Version", @@ -85,8 +116,8 @@ COMPLETE = 'Complete' HEPARIN = 'Heparin' CREATERX = 'Rx' -VALIDATE = 'VALIDATE' -CONFIRM = 'CONFIRM' +VALIDATE = 'Validate' +CONFIRM = 'Confirm' NEXT = 'Next' AUTO_LOAD = 'Auto Load' WATER_SAMPLE = 'Water Sample' Index: suite_leahi/shared/scripts/configuration/utility.py =================================================================== diff -u -r4b929ef6eef32479f10e84325b0ad12173474a4d -r4f9e56b35635368ce440e2cfffdaba7631b5d120 --- suite_leahi/shared/scripts/configuration/utility.py (.../utility.py) (revision 4b929ef6eef32479f10e84325b0ad12173474a4d) +++ suite_leahi/shared/scripts/configuration/utility.py (.../utility.py) (revision 4f9e56b35635368ce440e2cfffdaba7631b5d120) @@ -348,7 +348,7 @@ 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) - set_value_based_on_target(names.o_PreTreatmentCreate_bpMeasurementIntervalControl_ValueAdjusterCustom,5.0) + set_value_based_on_target(names.o_PreTreatmentCreate_bpMeasurementIntervalControl_ValueAdjusterCustom,1) 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)) Index: suite_leahi/shared/scripts/names.py =================================================================== diff -u -r4b929ef6eef32479f10e84325b0ad12173474a4d -r4f9e56b35635368ce440e2cfffdaba7631b5d120 --- suite_leahi/shared/scripts/names.py (.../names.py) (revision 4b929ef6eef32479f10e84325b0ad12173474a4d) +++ suite_leahi/shared/scripts/names.py (.../names.py) (revision 4f9e56b35635368ce440e2cfffdaba7631b5d120) @@ -90,8 +90,9 @@ o_uf_Volume_LabelValue = {"container": mainTreatmentScreen, "id": "_ufVolume", "type": "LabelValue", "unnamed": 1 } o_uf_Rate_LabelValue = {"container": mainTreatmentScreen, "id": "_ufRate", "type": "LabelValue", "unnamed": 1 } o_volume_Delivered = {"container": mainTreatmentScreen, "id": "_valueText", "type": "Text", "unnamed": 1 } -o_ufVolumeRemovedItem_ValueItem = {"container": o_Overlay, "id": "_ufVolumeRemovedItem", "type": "ValueItem", "unnamed": 1 } -o_ufVolumeGoalItem_ValueItem = {"container": o_Overlay, "id": "_ufVolumeGoalItem", "type": "ValueItem", "unnamed": 1 } +o_left_LabelUnitText = {"container": o_Overlay, "objectName": "_left", "type": "LabelUnitText" } +o_right_LabelUnitText = {"container": o_Overlay, "objectName": "_right", "type": "LabelUnitText" } +o_newValues_TreatmentAdjustmentUltrafiltrationMetrics = {"container": o_Overlay, "objectName": "_newValues", "type": "TreatmentAdjustmentUltrafiltrationMetrics" } 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" } @@ -188,7 +189,7 @@ o_dialysateTemperatureControl_ValueAdjuster = {"container": o_Overlay, "id": "_dialysateTemperatureControl", "type": "ValueAdjuster", "unnamed": 1 } o_dialyzerTypeComboBox_BaseComboBox = {"container": o_Overlay, "id": "_dialyzerTypeComboBox", "type": "BaseComboBox", "unnamed": 1 } o_salineBolusVolumeControl_ValueAdjuster = {"container": o_Overlay, "id": "_salineBolusVolumeControl", "type": "ValueAdjuster", "unnamed": 1 } -o_bpMeasurementIntervalControl_BaseComboBox = {"container": o_Overlay, "id": "_bpMeasurementIntervalControl", "type": "BaseComboBox", "unnamed": 1 } +o_bpMeasurementIntervalControl_ValueAdjusterCustom = {"container": o_Overlay, "id": "_bpMeasurementIntervalControl", "type": "ValueAdjusterCustom", "unnamed": 1 } o_bicarbonateConcentrateComboBox_BaseComboBox = {"container": o_Overlay, "id": "_bicarbonateConcentrateComboBox", "type": "BaseComboBox", "unnamed": 1 } o_confirmButton_ConfirmButton = {"container": o_Overlay, "id": "_confirmButton", "type": "ConfirmButton", "unnamed": 1 } o_qrCode_Image = {"container": o_Overlay, "id": "_qrCode", "type": "Image", "unnamed": 1 } @@ -300,7 +301,7 @@ 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 } +# 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 } Index: suite_leahi/tst_headerbar_prescription/test.py =================================================================== diff -u -r52a9613285f4930aa71dc8bce55f50409b73e50f -r4f9e56b35635368ce440e2cfffdaba7631b5d120 --- suite_leahi/tst_headerbar_prescription/test.py (.../test.py) (revision 52a9613285f4930aa71dc8bce55f50409b73e50f) +++ suite_leahi/tst_headerbar_prescription/test.py (.../test.py) (revision 4f9e56b35635368ce440e2cfffdaba7631b5d120) @@ -25,14 +25,6 @@ td = TD_Messaging() -DIALYZER_TYPE = ["Diacap Pro 13H","Diacap Pro 16H", "Diacap Pro 19H", "Optiflux F160NRe", "Optiflux F180NRe", "Optiflux F200NRe","Optiflux F250NRe"] -ACID_CONCENTRATE = ["2.0 K, 2.00 Ca, 1 Mg", "1.0 K, 2.50 Ca, 1 Mg","2.0 K, 2.50 Ca, 1 Mg","3.0 K, 2.50 Ca, 1 Mg"] - -VITALS = ["OFF","5","10","15","20","30","60"] -BICARBONATE = ["Sodium Bicarbonate"] -VALIDATE = "VALIDATE" -CONFIRM = "CONFIRM" - def verify_create_treatment_parameters(): test.startSection("Create treatment parameters") mouseClick(waitForObject(names.o_pretreatmentPatientIDEntry_TextEntry)) @@ -43,12 +35,12 @@ utility.set_value_based_on_target(names.o_heparinBolusVolumeControl_ValueAdjuster, 0.2) utility.set_value_based_on_target(names.o_heparinDispensingRateControl_ValueAdjuster, 0.2) utility.set_value_based_on_target(names.o_heparinStopTimeControl_ValueAdjuster, 60) - utility.select_different_dropdown(names.o_acidConcentrateComboBox_BaseComboBox,ACID_CONCENTRATE,2) + utility.select_different_dropdown(names.o_acidConcentrateComboBox_BaseComboBox,config.ACID_CONCENTRATE,2) utility.set_value_based_on_target(names.o_dialysateTemperatureControl_ValueAdjuster,37.0) - utility.select_different_dropdown(names.o_dialyzerTypeComboBox_BaseComboBox,DIALYZER_TYPE,2) + utility.select_different_dropdown(names.o_dialyzerTypeComboBox_BaseComboBox,config.DIALYZER_TYPE,2) utility.set_value_based_on_target(names.o_salineBolusVolumeControl_ValueAdjuster, 100) - utility.select_different_dropdown(names.o_bpMeasurementIntervalControl_BaseComboBox,VITALS,1) - utility.select_different_dropdown(names.o_bicarbonateConcentrateComboBox_BaseComboBox,BICARBONATE,0) + utility.set_value_based_on_target(names.o_bpMeasurementIntervalControl_ValueAdjusterCustom,5.0) + utility.select_different_dropdown(names.o_bicarbonateConcentrateComboBox_BaseComboBox,config.BICARBONATE,0) mouseClick(waitForObject(names.o_confirmButton_ConfirmButton)) td.td_Treatment_Parameters_Validation( vAccepted = 1, vBloodFlowRateRejectReason = 0, @@ -76,7 +68,7 @@ #Check the confirm button text and perform the mouse click confirmButton = waitForObject(names.o_confirmButton_ConfirmButton) confirmText = utility.findObjectById(confirmButton, "_text") - test.compare(confirmText.text, CONFIRM, "Button text should be"+str(CONFIRM)) + test.compare(confirmText.text, config.CONFIRM, "Button text should be"+str(config.CONFIRM)) test.compare(confirmButton.enabled, True, "Confirm button is enabled") mouseClick(confirmText) test.compare(waitForObject(names.o_PreTreatmentBase_instructionView_InstructionView,2000).visible, True, "After click on confirm button Popup is closed") @@ -85,7 +77,7 @@ def main(): utils.tstStart(__file__) - startApplication(config.AUT_NAME + " -q") + startApplication(utility.aut("-q")) td.td_operation_mode(TDOpModes.MODE_STAN.value) # verify Standby screen Index: suite_leahi/tst_heparin/test.py =================================================================== diff -u -r1a3dc7aeb6c2998c4480a9c58c522c293c1389f5 -r4f9e56b35635368ce440e2cfffdaba7631b5d120 --- suite_leahi/tst_heparin/test.py (.../test.py) (revision 1a3dc7aeb6c2998c4480a9c58c522c293c1389f5) +++ suite_leahi/tst_heparin/test.py (.../test.py) (revision 4f9e56b35635368ce440e2cfffdaba7631b5d120) @@ -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,13 +116,13 @@ 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(): 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) Index: suite_leahi/tst_main_treatment/test.py =================================================================== diff -u -rf9812770166a529dd87003269cb05d12153e57de -r4f9e56b35635368ce440e2cfffdaba7631b5d120 --- suite_leahi/tst_main_treatment/test.py (.../test.py) (revision f9812770166a529dd87003269cb05d12153e57de) +++ suite_leahi/tst_main_treatment/test.py (.../test.py) (revision 4f9e56b35635368ce440e2cfffdaba7631b5d120) @@ -38,10 +38,7 @@ total_time_list = [90,120] uf_filtration = [ {"uf_volume": 1, "uf_rate": 0.53, "vol_delivered": 0.37 }, - {"uf_volume": 10, "uf_rate": 5.05, "vol_delivered": 2.37 }, - {"uf_volume": 20, "uf_rate": 10.0, "vol_delivered": 5.0 }, - {"uf_volume": 100,"uf_rate": 140.0,"vol_delivered": 156.0 }, - {"uf_volume": 0, "uf_rate": 0.0, "vol_delivered": 0.0 } + {"uf_volume": 10, "uf_rate": 5.05, "vol_delivered": 2.37 } ] td = TD_Messaging() @@ -192,8 +189,8 @@ @return: N/A """ test.compare(utility.get_object_from_names(names.o_treatmentUltrafiltration).visible, True, "UltraFiltration section is visible") - test.compare(waitForObjectExists(names.o_UF_Volume_Text).topText, "UF Volume", "UF Volume text verified") - test.compare(waitForObjectExists(names.o_UF_Rate_Text).topText, "UF Rate", "UF Rate text verified") + test.compare(waitForObjectExists(names.o_UF_Volume_Text).topText, config.UF_VOLUME_GOAL, "UF Volume text verified") + test.compare(waitForObjectExists(names.o_UF_Rate_Text).topText, config.UF_RATE, "UF Rate text verified") def start_test_treatment_ultrafiltration(uf_volume,uf_rate,vol_delivered): """ @@ -248,10 +245,10 @@ ] #Verify the title values in the set points - test.compare(utility.get_object_from_names(names.o_blood_flow_title_Text).title, "Blood Flow", "Blood flow text verified" ) - test.compare(utility.get_object_from_names(names.o_dialyste_flow_title_Text).title, "Dialysate Flow", "Dialysate Flow text verified" ) - test.compare(utility.get_object_from_names(names.o_dialyste_tmp_title_Text).title, "Dialysate Temp.", "Dialysate trancememberance text verified" ) - test.compare(utility.get_object_from_names(names.o_dialyste_cond_title_Text).title, "Dialysate Cond.", "Dialysate cond text verified" ) + test.compare(utility.get_object_from_names(names.o_blood_flow_title_Text).title, config.BLOOD_FLOW, "Blood flow text verified" ) + test.compare(utility.get_object_from_names(names.o_dialyste_flow_title_Text).title, config.DIALYSATE_FLOW, "Dialysate Flow text verified" ) + test.compare(utility.get_object_from_names(names.o_dialyste_tmp_title_Text).title, config.DIALYSATE_TEMP, "Dialysate trancememberance text verified" ) + test.compare(utility.get_object_from_names(names.o_dialyste_cond_title_Text).title, config.DIALYSATE_COND, "Dialysate cond text verified" ) for index in range(0, len(TREATMENT_PARAMETER_SETPOINTS_TD_TEST_VALUES), 1): test.startSection("Checking the value of the set points".format(index)) @@ -267,11 +264,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) @@ -290,7 +287,7 @@ def main(): utils.tstStart(__file__) - startApplication(config.AUT_NAME_ONLY + " -q") + startApplication(utility.aut("-q")) td.td_operation_mode(TDOpModes.MODE_STAN.value,0) Index: suite_leahi/tst_ultrafiltration/test.py =================================================================== diff -u -r6d83d7cbea9b040ee4717d7b90fdc44bf618bdcf -r4f9e56b35635368ce440e2cfffdaba7631b5d120 --- suite_leahi/tst_ultrafiltration/test.py (.../test.py) (revision 6d83d7cbea9b040ee4717d7b90fdc44bf618bdcf) +++ suite_leahi/tst_ultrafiltration/test.py (.../test.py) (revision 4f9e56b35635368ce440e2cfffdaba7631b5d120) @@ -29,29 +29,7 @@ td =TD_Messaging() -MAX_UF_VOLUME = 10.00 -MAX_UF_RATE = 10.00 -MAX_VOLUME_DELIVERED = 8.00 -MIN_UF_VOLUME = 0.35 -MIN_UF_RATE = 0.22 -MIN_VOLUME_DELIVERED = 0.09 - -MID_UF_VOLUME = 5.00 -MID_UF_RATE = 5.00 -MID_VOLUME_DELIVERED = 4.00 - -ULTRAFILTRATION_VOLUME = "Ultrafiltration Volume (L)" -UF_VOLUME_REMOVED = "UF Volume Removed" -UF_VOLUME_GOAL = "UF Volume Goal" -NEW_UF_VOLUME = "New UF Volume" -NEW_UF_RATE = "New UF Rate" - - - -MAX_NEW_UF_VOLUME = 8.0 -MAX_NEW_UF_RATE = 2.0 - def continue_edit_changes(accept,rejectionReason): payload = conversions.integer_to_bytearray(accept) payload += conversions.integer_to_bytearray(rejectionReason) @@ -100,13 +78,12 @@ 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) # 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_TREA.value, 0) td.td_tx_state(TDTreatmentStates.TREATMENT_DIALYSIS_STATE.value , 0 , @@ -126,37 +103,37 @@ max_dial_rate_mLH = 0) test.startSection("Check the maximum values in Ultrafiltration") - check_values_ultrfiltration_main_treatment(uf_volume = MAX_UF_VOLUME, - uf_rate = MAX_UF_RATE, - volume_delivered = MAX_VOLUME_DELIVERED) + check_values_ultrfiltration_main_treatment(uf_volume = config.MAX_UF_VOLUME, + uf_rate = config.MAX_UF_RATE, + volume_delivered = config.MAX_VOLUME_DELIVERED) test.endSection() test.startSection("Check the mid values in Ultrafiltration") - check_values_ultrfiltration_main_treatment(uf_volume = MID_UF_VOLUME, - uf_rate = MID_UF_RATE, - volume_delivered = MID_VOLUME_DELIVERED) + check_values_ultrfiltration_main_treatment(uf_volume = config.MID_UF_VOLUME, + uf_rate = config.MID_UF_RATE, + volume_delivered = config.MID_VOLUME_DELIVERED) test.endSection() test.startSection("Check the minimum values in Ultrafiltration") - check_values_ultrfiltration_main_treatment(uf_volume = MIN_UF_VOLUME, - uf_rate = MIN_UF_RATE, - volume_delivered = MIN_VOLUME_DELIVERED) + check_values_ultrfiltration_main_treatment(uf_volume = config.MIN_UF_VOLUME, + uf_rate = config.MIN_UF_RATE, + volume_delivered = config.MIN_VOLUME_DELIVERED) test.endSection() test.startSection("Check the values in the Ultrafiltration Volume Popup") mouseClick(waitForObject(names.o_editButton_ultrafiltration_IconButton)) #check the title in edit popup - 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)) + title = waitForObjectExists(utility.setObjectText(obj=names.o_title_Text,text = config.ULTRAFILTRATION_VOLUME)) + test.compare(title.text, config.ULTRAFILTRATION_VOLUME, "Title text should be -> "+ str(config.ULTRAFILTRATION_VOLUME)) #check the value in the edit popup - uf_volume_removed_text = waitForObjectExists(names.o_ufVolumeRemovedItem_ValueItem).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 - 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 - 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 - test.compare(str(uf_volume_goal_value), str(MIN_UF_VOLUME), "UF Volume Removed value should be ->"+str(uf_volume_goal_value)) + uf_volume_removed_text = waitForObjectExists(names.o_left_LabelUnitText).label + test.compare(uf_volume_removed_text,config.UF_VOLUME_REMOVED ,"Text Value should be ->" +str(config.UF_VOLUME_REMOVED)) + uf_volume_removed_value = waitForObjectExists(names.o_left_LabelUnitText).value + test.compare(str(uf_volume_removed_value), str(config.MIN_VOLUME_DELIVERED), "UF Volume Removed value should be ->"+str(uf_volume_removed_value)) + uf_volume_goal_text =waitForObjectExists(names.o_right_LabelUnitText).label + test.compare(uf_volume_goal_text,config.UF_VOLUME_GOAL ,"Text Value should be ->" +str(config.UF_VOLUME_GOAL)) + uf_volume_goal_value = waitForObjectExists(names.o_right_LabelUnitText).value + test.compare(str(uf_volume_goal_value), str(config.MIN_UF_VOLUME), "UF Volume Removed value should be ->"+str(uf_volume_goal_value)) test.endSection() test.startSection("Check the values in the Confirm Ultrafiltration Volume Popup ") @@ -174,11 +151,12 @@ 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 - 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 - 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 = waitForObject(names.o_newValues_TreatmentAdjustmentUltrafiltrationMetrics) + new_uf_volume_text = utility.findObjectById(new_uf_volume, "_left").label + test.compare(new_uf_volume_text,config.NEW_UF_VOLUME ,"Text Value should be ->" +str(config.NEW_UF_VOLUME)) + new_uf_rate_text = utility.findObjectById(new_uf_volume, "_right").label + test.compare(new_uf_rate_text,config.NEW_UF_RATE ,"Text Value should be ->" +str(config.NEW_UF_RATE)) + new_uf_volume_value = utility.findObjectById(new_uf_volume, "_right").value test.compare(new_uf_volume_value, "0.04","Text Value should be ->" +str("0.04")) #click on the continue button