Index: suite_leahi/shared/scripts/configuration/config.py =================================================================== diff -u -re82a2e9bb2d083c36604e19a090f8e620ad770fb -r4554e32860b9a12d2bc94bd15f1dab4e8a436a9a --- suite_leahi/shared/scripts/configuration/config.py (.../config.py) (revision e82a2e9bb2d083c36604e19a090f8e620ad770fb) +++ suite_leahi/shared/scripts/configuration/config.py (.../config.py) (revision 4554e32860b9a12d2bc94bd15f1dab4e8a436a9a) @@ -36,9 +36,8 @@ 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 @@ -106,8 +105,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' @@ -244,7 +243,15 @@ COLOR_CODES = "#ffa500" HDF ="HDF" +SYSTOLIC = "Systolic" +DIASTOLIC = "Diastolic" +HEARTRATE = "Heart Rate" +MIN_SYSTOLIC = "60" +MIN_DIASTOLIC = "40" +MIN_HEARTRATE = "40" + + Index: suite_leahi/shared/scripts/configuration/utility.py =================================================================== diff -u -r86eb87067a913ab8f1fbaefaedc93cf00907b55c -r4554e32860b9a12d2bc94bd15f1dab4e8a436a9a --- suite_leahi/shared/scripts/configuration/utility.py (.../utility.py) (revision 86eb87067a913ab8f1fbaefaedc93cf00907b55c) +++ suite_leahi/shared/scripts/configuration/utility.py (.../utility.py) (revision 4554e32860b9a12d2bc94bd15f1dab4e8a436a9a) @@ -335,46 +335,63 @@ 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) + squish.waitForObject(names.o_PreTreatmentCreate_pretreatmentPatientIDEntry_TextEntry).text ="Patient ID" + parent_obj = squish.waitForObject(names.o_PreTreatmentCreate_leftColumn_Column) + blood_flow_rate = findObjectById(parent_obj, "_bloodFlowRate") + set_value_based_on_target(blood_flow_rate, 70) + dialysate_flow_rate = findObjectById(parent_obj, "_dialysateFlowRate") + set_value_based_on_target(dialysate_flow_rate, 50) + duration = findObjectById(parent_obj,"_duration") + set_value_based_on_target(duration, 60) + right_obj = squish.waitForObject(names.o_PreTreatmentCreate_rightColumn_Column) + ultrafiltration_volume = findObjectById(right_obj,"_ufVolume") + set_value_based_on_target(ultrafiltration_volume,0.20) + 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) - 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,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)) - 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) + 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 -re82a2e9bb2d083c36604e19a090f8e620ad770fb -r4554e32860b9a12d2bc94bd15f1dab4e8a436a9a --- suite_leahi/shared/scripts/names.py (.../names.py) (revision e82a2e9bb2d083c36604e19a090f8e620ad770fb) +++ suite_leahi/shared/scripts/names.py (.../names.py) (revision 4554e32860b9a12d2bc94bd15f1dab4e8a436a9a) @@ -178,25 +178,25 @@ #prescription header bar o_prescriptionButton_IconButton = {"container": o_Gui_MainView, "id": "_prescriptionButton", "type": "IconButton", "unnamed": 1 } -o_prescriptionMenu_BaseComboBox = {"container": o_Overlay, "id": "_prescriptionMenu", "type": "BaseComboBox", "unnamed": 1 } -o_pretreatmentPatientIDEntry_TextEntry = {"container": o_Overlay, "id": "_pretreatmentPatientIDEntry", "type": "TextEntry", "unnamed": 1 } -o_bloodFlowRateControl_ValueAdjuster = {"container": o_Overlay, "id": "_bloodFlowRateControl", "type": "ValueAdjuster", "unnamed": 1 } +# o_prescriptionMenu_BaseComboBox = {"container": o_Overlay, "id": "_prescriptionMenu", "type": "BaseComboBox", "unnamed": 1 } +# o_pretreatmentPatientIDEntry_TextEntry = {"container": o_Overlay, "id": "_pretreatmentPatientIDEntry", "type": "TextEntry", "unnamed": 1 } +o_bloodFlowRateControl_ValueAdjuster = {"container": o_Overlay, "id": "_bloodFlowRate", "type": "ValueAdjuster", "unnamed": 1 } o_dialysateFlowRateControl_ValueAdjuster = {"container": o_Overlay, "id": "_dialysateFlowRateControl", "type": "ValueAdjuster", "unnamed": 1 } o_durationControl_ValueAdjuster = {"container": o_Overlay, "id": "_durationControl", "type": "ValueAdjuster", "unnamed": 1 } -o_heparinBolusVolumeControl_ValueAdjuster = {"container": o_Overlay, "id": "_heparinBolusVolumeControl", "type": "ValueAdjuster", "unnamed": 1 } -o_heparinDispensingRateControl_ValueAdjuster = {"container": o_Overlay, "id": "_heparinDispensingRateControl", "type": "ValueAdjuster", "unnamed": 1 } -o_heparinStopTimeControl_ValueAdjuster = {"container": o_Overlay, "id": "_heparinStopTimeControl", "type": "ValueAdjuster", "unnamed": 1 } -o_acidConcentrateComboBox_BaseComboBox = {"container": o_Overlay, "id": "_acidConcentrateComboBox", "type": "BaseComboBox", "unnamed": 1 } -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_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 } -o_preTreatmentStack_PreTreatmentStack = {"container": o_Gui_MainView, "id": "_preTreatmentStack", "type": "PreTreatmentStack", "unnamed": 1 } -o_preTreatmentStack_PreTreatmentBase_PreTreatmentBase = {"container": o_preTreatmentStack_PreTreatmentStack, "objectName": "_PreTreatmentBase", "type": "PreTreatmentBase" } -o_PreTreatmentBase_instructionView_InstructionView = {"container": o_preTreatmentStack_PreTreatmentBase_PreTreatmentBase, "id": "_instructionView", "type": "InstructionView", "unnamed": 1 } +# o_heparinBolusVolumeControl_ValueAdjuster = {"container": o_Overlay, "id": "_heparinBolusVolumeControl", "type": "ValueAdjuster", "unnamed": 1 } +# o_heparinDispensingRateControl_ValueAdjuster = {"container": o_Overlay, "id": "_heparinDispensingRateControl", "type": "ValueAdjuster", "unnamed": 1 } +# o_heparinStopTimeControl_ValueAdjuster = {"container": o_Overlay, "id": "_heparinStopTimeControl", "type": "ValueAdjuster", "unnamed": 1 } +# o_acidConcentrateComboBox_BaseComboBox = {"container": o_Overlay, "id": "_acidConcentrateComboBox", "type": "BaseComboBox", "unnamed": 1 } +# 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_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 } +# o_preTreatmentStack_PreTreatmentStack = {"container": o_Gui_MainView, "id": "_preTreatmentStack", "type": "PreTreatmentStack", "unnamed": 1 } +# o_preTreatmentStack_PreTreatmentBase_PreTreatmentBase = {"container": o_preTreatmentStack_PreTreatmentStack, "objectName": "_PreTreatmentBase", "type": "PreTreatmentBase" } +# o_PreTreatmentBase_instructionView_InstructionView = {"container": o_preTreatmentStack_PreTreatmentBase_PreTreatmentBase, "id": "_instructionView", "type": "InstructionView", "unnamed": 1 } #Heparin o_listView_Item = {"container": o_Gui_MainView, "type": "Item", "unnamed": 1 } @@ -348,3 +348,6 @@ o_PreTreatmentCreate_hdfTreatmentMode_LabelUnitContainer = {"container": o_preTreatmentStack_PreTreatmentCreate_PreTreatmentCreate, "id": "_hdfTreatmentMode", "type": "LabelUnitContainer", "unnamed": 1 } o_PreTreatmentCreate_treatmentModalityComboBox_BaseComboBox = {"container": o_preTreatmentStack_PreTreatmentCreate_PreTreatmentCreate, "id": "_treatmentModalityComboBox", "type": "BaseComboBox", "unnamed": 1 } +#prescription_header_bar +o_leftColumn_Column = {"container": o_Overlay, "id": "_leftColumn", "type": "Column", "unnamed": 1} + Index: suite_leahi/tst_end_of_treatment/test.py =================================================================== diff -u -ra41aef5f49d9aed41b1d846a4c388459a7c5eed1 -r4554e32860b9a12d2bc94bd15f1dab4e8a436a9a --- suite_leahi/tst_end_of_treatment/test.py (.../test.py) (revision a41aef5f49d9aed41b1d846a4c388459a7c5eed1) +++ suite_leahi/tst_end_of_treatment/test.py (.../test.py) (revision 4554e32860b9a12d2bc94bd15f1dab4e8a436a9a) @@ -155,12 +155,14 @@ handle_end_of_treatment_request) - 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") - mouseClick(waitForObject(names.o_createTreatmentRect_TouchRect)) + hemodialysis = waitForObject(names.o_createHDTreatment_TouchRect) + hemodialysis_btn = utility.findChildByText(hemodialysis, "Hemodialysis") + mouseClick(hemodialysis_btn) td.td_operation_mode(TDOpModes.MODE_PRET.value) utility.verify_create_treatment_parameters() change_treatmentstates(TDTreatmentStates.TREATMENT_DIALYSIS_STATE.value) Index: suite_leahi/tst_headerbar_prescription/test.py =================================================================== diff -u -r4f9e56b35635368ce440e2cfffdaba7631b5d120 -r4554e32860b9a12d2bc94bd15f1dab4e8a436a9a --- suite_leahi/tst_headerbar_prescription/test.py (.../test.py) (revision 4f9e56b35635368ce440e2cfffdaba7631b5d120) +++ suite_leahi/tst_headerbar_prescription/test.py (.../test.py) (revision 4554e32860b9a12d2bc94bd15f1dab4e8a436a9a) @@ -27,8 +27,12 @@ def verify_create_treatment_parameters(): test.startSection("Create treatment parameters") - mouseClick(waitForObject(names.o_pretreatmentPatientIDEntry_TextEntry)) - waitForObject(names.o_pretreatmentPatientIDEntry_TextEntry).text ="abcd" + # mouseClick(waitForObject(names.o_patientID_LabelUnitContainer)) + # waitForObject(names.o_patientID_LabelUnitContainer).text ="abcd" + parent_obj = waitForObject(names.o_leftColumn_Column) + patient_id = utility.findObjectById(parent_obj, "_patientID") + mouseClick(patient_id) + utility.set_value_based_on_target(names.o_bloodFlowRateControl_ValueAdjuster, 50) utility.set_value_based_on_target(names.o_dialysateFlowRateControl_ValueAdjuster, 50) utility.set_value_based_on_target(names.o_durationControl_ValueAdjuster, 60) @@ -87,7 +91,8 @@ td.td_operation_mode(TDOpModes.MODE_PRET.value, 0) test.compare(waitForObject(names.o_prescriptionButton_IconButton).visible, True,"The Create Rx button is visible") mouseClick(waitForObject(names.o_prescriptionButton_IconButton)) - test.compare(waitForObject(names.o_prescriptionMenu_BaseComboBox).visible, True, "Prescription menu is visible") + prescription_obj = waitForObjectExists(names.o_PreTreatmentCreate_listView_ListView) + test.compare(prescription_obj.visible, True, "Prescription menu is visible") verify_create_treatment_parameters() test.endSection() Index: suite_leahi/tst_heparin/test.py =================================================================== diff -u -r4f9e56b35635368ce440e2cfffdaba7631b5d120 -r4554e32860b9a12d2bc94bd15f1dab4e8a436a9a --- suite_leahi/tst_heparin/test.py (.../test.py) (revision 4f9e56b35635368ce440e2cfffdaba7631b5d120) +++ suite_leahi/tst_heparin/test.py (.../test.py) (revision 4554e32860b9a12d2bc94bd15f1dab4e8a436a9a) @@ -13,12 +13,13 @@ # Completed state import names -from leahi_dialin.ui import utils -from configuration import utility,config,navigation -from configuration import config -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.ui import utils +from configuration import utility,config,navigation +from configuration import config +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 squish import * td =TD_Messaging() @@ -80,44 +81,65 @@ 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) + waitForObject(names.o_PreTreatmentCreate_pretreatmentPatientIDEntry_TextEntry).text ="Patient ID" + 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, 60) + dialysate_flow_rate = utility.findObjectById(parent_obj, "_dialysateFlowRate") + utility.set_value_based_on_target(dialysate_flow_rate, 75) + duration = utility.findObjectById(parent_obj,"_duration") + utility.set_value_based_on_target(duration, 75) + right_obj = waitForObject(names.o_PreTreatmentCreate_rightColumn_Column) + ultrafiltration_volume = utility.findObjectById(right_obj,"_ufVolume") + utility.set_value_based_on_target(ultrafiltration_volume,0.10) + heparin_rx = utility.findObjectById(right_obj,"_heparinRx") + heparin_right_arrow = utility.findObjectById(heparin_rx, "_rightArrow") + mouseClick(heparin_right_arrow) + heparin_obj = waitForObject(names.o_LabelUnitValueAdjuster_LabelUnitValueAdjuster) + heparin_bolus = utility.findObjectById(heparin_obj,"_heparinBolusVolume") + heparin_bolus_right_arrow = utility.findObjectById(heparin_bolus,"_rightArrow") + mouseClick(heparin_bolus_right_arrow) + heparin_dispensing = waitForObject(names.o_heparinDispensingRate_LabelUnitValueAdjuster) + heparin_dispensing_rignt_arrow = utility.findObjectById(heparin_dispensing,"_rightArrow") + mouseClick(heparin_dispensing_rignt_arrow) + mouseClick(waitForObject(names.o_confirmButton_ConfirmButton)) 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) + 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(): @@ -126,23 +148,27 @@ test.startSection("Verify the heparin state is off state") td.td_operation_mode(TDOpModes.MODE_STAN.value) - mouseClick(waitForObject(names.o_createTreatmentRect_TouchRect)) - td.td_operation_mode(TDOpModes.MODE_PRET.value) - td.td_blood_set_auto_load_response(vRejectionReason = 0) + 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, 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) + waitForObject(names.o_listView_Item,2000) heparin = utility.setObjectText(text=config.HEPARIN, obj=names.o_listView_Item) mouseClick(waitForObject(heparin)) 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)) - td.td_operation_mode(TDOpModes.MODE_PRET.value) - td.td_blood_set_auto_load_response(vRejectionReason = 0) + 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, 0) utility.verify_create_treatment_parameters() change_treatmentstates(TDTreatmentStates.TREATMENT_PAUSED_STATE.value) change_treatmentstates(TDTreatmentStates.TREATMENT_DIALYSIS_STATE.value) Index: suite_leahi/tst_ultrafiltration/test.py =================================================================== diff -u -r4f9e56b35635368ce440e2cfffdaba7631b5d120 -r4554e32860b9a12d2bc94bd15f1dab4e8a436a9a --- suite_leahi/tst_ultrafiltration/test.py (.../test.py) (revision 4f9e56b35635368ce440e2cfffdaba7631b5d120) +++ suite_leahi/tst_ultrafiltration/test.py (.../test.py) (revision 4554e32860b9a12d2bc94bd15f1dab4e8a436a9a) @@ -153,12 +153,10 @@ 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)) + test.compare(new_uf_volume_text,config.UF_VOLUME_REMOVED ,"Text Value should be ->" +str(config.UF_VOLUME_REMOVED)) 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")) - + test.compare(new_uf_rate_text,config.UF_VOLUME_GOAL ,"Text Value should be ->" +str(config.UF_VOLUME_GOAL)) + #click on the continue button mouseClick(waitForObject(names.o_confirmButton_TouchRect)) #perform the continue button