Index: shared/scripts/configuration/config.py =================================================================== diff -u -r30b3e1a07f940f488bc749e2d39438ce2a3f5168 -r4e552f84fba0a7f176c92b20d397e789a9e56529 --- shared/scripts/configuration/config.py (.../config.py) (revision 30b3e1a07f940f488bc749e2d39438ce2a3f5168) +++ shared/scripts/configuration/config.py (.../config.py) (revision 4e552f84fba0a7f176c92b20d397e789a9e56529) @@ -36,56 +36,59 @@ #main-treatment heparin HEPARIN_UNIT = "mL" HEPARIN_DELIVERY_TEXT = "HEPARIN DELIVERY" -HEPARIN_DELIVERY_OFF_TEXT = "Heparin Delivery Off" -HEPARIN_STOP_TEXT = "Heparin Delivery Stopped" +HEPARIN_DELIVERY_OFF_TEXT = "OFF" +HEPARIN_STOP_TEXT = "Delivery Stopped" HEPARIN_RESUME_DELIVERY_TEXT = "RESUME DELIVERY" -HEPARIN_BOLUS_ACTIVE_TEXT = "Heparin Bolus Active" +HEPARIN_BOLUS_ACTIVE_TEXT = "Bolus Active" HEPARIN_PAUSE_DELIVERY_TEXT = "PAUSE DELIVERY" HEPARIN_MAXIMUM_VOLUME_DELIVERED_TEXT = "Maximum Cumulative Heparin Volume Delivered" -HEPARIN_SYRINGE_EMPTY_TEXT = "Heparin Syringe Empty" +HEPARIN_SYRINGE_EMPTY_TEXT = "Syringe Empty" - REJECTION_REASON = { - 0: "No Active Alarm List", - 1: "REQUEST_REJECT_REASON_NOT_ALLOWED_IN_CURRENT_MODE", - 2: "REQUEST_REJECT_REASON_TIMEOUT_WAITING_FOR_USER_CONFIRM", - 3: "REQUEST_REJECT_REASON_NOT_IN_TREATMENT_MODE", - 4: "REQUEST_REJECT_REASON_INVALID_TREATMENT_STATE", - 5: "REQUEST_REJECT_REASON_TREATMENT_TOO_CLOSE_TO_FINISHED", - 6: "REQUEST_REJECT_REASON_TREATMENT_TIME_OUT_OF_RANGE", - 7: "REQUEST_REJECT_REASON_TREATMENT_TIME_LESS_THAN_CURRENT", - 8: "REQUEST_REJECT_REASON_BLOOD_FLOW_OUT_OF_RANGE", - 9: "REQUEST_REJECT_REASON_DIAL_FLOW_OUT_OF_RANGE", - 10: "REQUEST_REJECT_REASON_DIAL_VOLUME_OUT_OF_RANGE", - 11: "REQUEST_REJECT_REASON_UF_VOLUME_OUT_OF_RANGE", - 12: "REQUEST_REJECT_REASON_UF_RATE_OUT_OF_RANGE", - 13: "REQUEST_REJECT_REASON_TREATMENT_TIME_LESS_THAN_MINIMUM", - 14: "REQUEST_REJECT_REASON_UF_NOT_IN_PROGESS", - 15: "REQUEST_REJECT_REASON_UF_NOT_PAUSED", - 16: "REQUEST_REJECT_REASON_SALINE_BOLUS_IN_PROGRESS", - 17: "REQUEST_REJECT_REASON_PARAM_OUT_OF_RANGE", - 18: "REQUEST_REJECT_REASON_HEPARIN_PRESTOP_EXCEEDS_DURATION", - 19: "REQUEST_REJECT_REASON_ARTERIAL_PRESSURE_LOW_VS_HIGH", - 20: "REQUEST_REJECT_REASON_VENOUS_PRESSURE_LOW_VS_HIGH", - 21: "REQUEST_REJECT_REASON_SALINE_MAX_VOLUME_REACHED", - 22: "REQUEST_REJECT_REASON_SALINE_BOLUS_NOT_IN_PROGRESS", - 23: "REQUEST_REJECT_REASON_ACTION_DISABLED_IN_CURRENT_STATE", - 24: "REQUEST_REJECT_REASON_ALARM_IS_ACTIVE", - 25: "REQUEST_REJECT_REASON_INVALID_COMMAND", - 26: "REQUEST_REJECT_REASON_TREATMENT_IS_COMPLETED", - 27: "REQUEST_REJECT_REASON_ADDL_RINSEBACK_MAX_VOLUME_REACHED", - 28: "REQUEST_REJECT_REASON_UF_VOLUME_NOT_SET", - 29: "REQUEST_REJECT_REASON_NO_PATIENT_CONNECTION_CONFIRM", - 30: "REQUEST_REJECT_REASON_HEPARIN_PAUSE_INVALID_IN_THIS_STATE", - 31: "REQUEST_REJECT_REASON_HEPARIN_NOT_PAUSED", - 32: "REQUEST_REJECT_REASON_DG_COMM_LOST", - 33: "REQUEST_REJECT_REASON_DRAIN_NOT_COMPLETE", - 34: "REQUEST_REJECT_REASON_DG_NOT_IN_STANDBY_IDLE_STATE", - 35: "REQUEST_REJECT_REASON_INVALID_REQUEST_FORMAT", - 36: "REQUEST_REJECT_REASON_INVALID_DATE_OR_TIME", - 37: "REQUEST_REJECT_REASON_NO_NEW_TREATMENT_ALARM_TRIGGERED", - 38: "REQUEST_REJECT_REASON_BATTERY_IS_NOT_CHARGED", - 39: "REQUEST_REJECT_REASON_RINSEBACK_NOT_COMPLETED", - } + 0: "No Active Alarm List", + 1: "REQUEST_REJECT_REASON_NOT_ALLOWED_IN_CURRENT_MODE", # Request is not allowed in the current operating mode + 2: "REQUEST_REJECT_REASON_TIMEOUT_WAITING_FOR_USER_CONFIRM", # Validated request was not confirmed by user in reasonable time + 3: "REQUEST_REJECT_REASON_NOT_IN_TREATMENT_MODE", # Request is not allowed if not in treatment mode + 4: "REQUEST_REJECT_REASON_INVALID_TREATMENT_STATE", # Request is not allowed in current treatment state + 5: "REQUEST_REJECT_REASON_TREATMENT_TOO_CLOSE_TO_FINISHED", # Request is not allowed so near end of treatment + 6: "REQUEST_REJECT_REASON_TREATMENT_TIME_OUT_OF_RANGE", # Treatment duration is out of range + 7: "REQUEST_REJECT_REASON_TREATMENT_TIME_LESS_THAN_CURRENT", # Treatment time change is less than currently elapsed treatment time + 8: "REQUEST_REJECT_REASON_BLOOD_FLOW_OUT_OF_RANGE", # Blood flow is out of range + 9: "REQUEST_REJECT_REASON_DIAL_FLOW_OUT_OF_RANGE", # Dialysate flow is out of range + 10: "REQUEST_REJECT_REASON_DIAL_VOLUME_OUT_OF_RANGE", # Dialysate flow rate or treatment duration causes dialysate volume to exceed limit + 11: "REQUEST_REJECT_REASON_UF_VOLUME_OUT_OF_RANGE", # Ultrafiltration volume is out of range + 12: "REQUEST_REJECT_REASON_UF_RATE_OUT_OF_RANGE", # Ultrafiltration rate is out of range + 13: "REQUEST_REJECT_REASON_TREATMENT_TIME_LESS_THAN_MINIMUM", # Treatment time change is less than minimum treatment time + 14: "REQUEST_REJECT_REASON_UF_NOT_IN_PROGESS", # Ultrafiltration is not currently in progress + 15: "REQUEST_REJECT_REASON_UF_NOT_PAUSED", # Ultrafiltration is not currently paused + 16: "REQUEST_REJECT_REASON_SALINE_BOLUS_IN_PROGRESS", # A saline bolus is in progress + 17: "REQUEST_REJECT_REASON_PARAM_OUT_OF_RANGE", # A treatment parameter is out of range + 18: "REQUEST_REJECT_REASON_HEPARIN_PRESTOP_EXCEEDS_DURATION", # The Heparin pre-stop setting is greater than the treatment duration + 19: "REQUEST_REJECT_REASON_ARTERIAL_PRESSURE_LOW_VS_HIGH", # Arterial pressure low and high alarm limits are not inconsistent + 20: "REQUEST_REJECT_REASON_VENOUS_PRESSURE_LOW_VS_HIGH", # Venous pressure low and high alarm limits are inconsistent + 21: "REQUEST_REJECT_REASON_SALINE_MAX_VOLUME_REACHED", # Saline bolus volume maximum has been reached - no more saline allowed + 22: "REQUEST_REJECT_REASON_SALINE_BOLUS_NOT_IN_PROGRESS", # A saline bolus is not in progress + 23: "REQUEST_REJECT_REASON_ACTION_DISABLED_IN_CURRENT_STATE", # Requested user action is disabled in current state + 24: "REQUEST_REJECT_REASON_ALARM_IS_ACTIVE", # Requested user action not allowed while alarm is active + 25: "REQUEST_REJECT_REASON_INVALID_COMMAND", # Requested user action invalid + 26: "REQUEST_REJECT_REASON_TREATMENT_IS_COMPLETED", # The treatment has been completed + 27: "REQUEST_REJECT_REASON_ADDL_RINSEBACK_MAX_VOLUME_REACHED", # Rinseback additional volume maximum has been reached - no more additional rinsebacks allowed + 28: "REQUEST_REJECT_REASON_UF_VOLUME_NOT_SET", # Ultrafiltration volume is not set yet + 29: "REQUEST_REJECT_REASON_NO_PATIENT_CONNECTION_CONFIRM", # The user has not confirmed patient connection + 30: "REQUEST_REJECT_REASON_HEPARIN_PAUSE_INVALID_IN_THIS_STATE", # Heparin cannot be paused if not currently deliverying Heparin + 31: "REQUEST_REJECT_REASON_HEPARIN_NOT_PAUSED", # Heparin cannot be resumed if not paused + 32: "REQUEST_REJECT_REASON_DG_COMM_LOST", # Treatment cannot initiate if DG comm is lost + 33: "REQUEST_REJECT_REASON_DRAIN_NOT_COMPLETE", # Post-treatment reservoirs drain not complete + 34: "REQUEST_REJECT_REASON_DG_NOT_IN_STANDBY_IDLE_STATE", # Treatment cannot initiate if DG is not in standby idle state + 35: "REQUEST_REJECT_REASON_INVALID_REQUEST_FORMAT", # Request message not formatted properly + 36: "REQUEST_REJECT_REASON_INVALID_DATE_OR_TIME", # Given date/time is invalid + 37: "REQUEST_REJECT_REASON____AVAILABLE_1", # Not used - available for use + 38: "REQUEST_REJECT_REASON_BATTERY_IS_NOT_CHARGED", # Battery does not have enough charge to start treatment + 39: "REQUEST_REJECT_REASON_RINSEBACK_NOT_COMPLETED", # Cannot move on to recirculate without completing full rinseback. + 40: "REQUEST_REJECT_REASON_RESERVOIR_ONE_IS_NOT_READY", # Reservoir one fill is not complete + 41: "REQUEST_REJECT_REASON_PUMP_TRACK_NOT_CLOSED", # Pump track is not ready / closed + 42: "REQUEST_REJECT_REASON_DOOR_NOT_CLOSED", # Door is not closed + 43: "REQUEST_REJECT_REASON_SYRINGE_NOT_PRESENT", # Syringe is not present + } -NUM_OF_REQUEST_REJECT_REASONS = 39 +NUM_OF_REQUEST_REJECT_REASONS = 43 Index: shared/scripts/names.py =================================================================== diff -u -r30b3e1a07f940f488bc749e2d39438ce2a3f5168 -r4e552f84fba0a7f176c92b20d397e789a9e56529 --- shared/scripts/names.py (.../names.py) (revision 30b3e1a07f940f488bc749e2d39438ce2a3f5168) +++ shared/scripts/names.py (.../names.py) (revision 4e552f84fba0a7f176c92b20d397e789a9e56529) @@ -48,21 +48,29 @@ o_cumulative_fluid_text = {"container": o_treatmentStack_treatmentHome_TreatmentHome, "text": "Cumulative Delivered", "type": "Text", "unnamed": 1, "visible": True} #Heparin -o_heparin_value = {"container": o_treatmentStack_treatmentHome_TreatmentHome, "text": "Volume Delivered", "type": "Text", "unnamed": 1, "visible": True} +#o_heparin_value = {"container": o_treatmentStack_treatmentHome_TreatmentHome, "text": "Volume Delivered", "type": "Text", "unnamed": 1, "visible": True} +o_heparin_value_text = {"container": o_treatmentStack_treatmentHome_TreatmentHome, "text":" Volume Delivered " ,"type": "Text", "unnamed": 1, "visible": True} +o_heparin_value = {"container": o_treatmentStack_treatmentHome_TreatmentHome,"type": "Text", "unnamed": 1, "visible": True} o_QQuickView = {"type": "QQuickView"} o_treatmentStart_TreatmentStart = {"container": o_QQuickView, "id": "_treatmentStart", "type": "TreatmentStart", "unnamed": 1, "visible": True} o_treatmentStart_HeparinSection = {"container": o_treatmentStart_TreatmentStart , "id": "_heparinTouchArea", "type": "TreatmentFluid" } + #Heparin_Messages_on_Button -o_state0_heparin_delivery_text = {"container": o_treatmentStack_treatmentHome_TreatmentHome, "text": "HEPARIN DELIVERY", "type": "Text", "unnamed": 1, "visible": True} +o_state0_heparin_delivery_Off_text = {"container": o_treatmentStack_treatmentHome_TreatmentHome, "text": "OFF", "type": "Text", "unnamed": 1, "visible": True} +o_state1_heparin_delivery_text = {"container": o_treatmentStack_treatmentHome_TreatmentHome, "text": "HEPARIN DELIVERY", "type": "Text", "unnamed": 1, "visible": True} o_state2_heparin_state_paused_text = {"container": o_treatmentStack_treatmentHome_TreatmentHome, "text": "RESUME DELIVERY", "type": "Text", "unnamed": 1, "visible": True} o_state4_heparin_state_dispensing_text = {"container": o_treatmentStack_treatmentHome_TreatmentHome, "text": "PAUSE DELIVERY", "type": "Text", "unnamed": 1, "visible": True} + #Heparin_Statewise_Messages -o_state0_heparin_delivery_Off_text = {"container": o_treatmentStack_treatmentHome_TreatmentHome, "text": "Heparin Delivery Off", "type": "Text", "unnamed": 1, "visible": True} -o_state_one_text = {"container": o_treatmentStack_treatmentHome_TreatmentHome, "text": "Heparin Delivery Stopped", "type": "Text", "unnamed": 1, "visible": True} -o_state3_heparin_state_initial_bolus_text = {"container": o_treatmentStack_treatmentHome_TreatmentHome, "text": "Heparin Bolus Active", "type": "Text", "unnamed": 1, "visible": True} +#o_state0_heparin_delivery_Off_text = {"container": o_treatmentStack_treatmentHome_TreatmentHome, "text": "OFF", "type": "Text", "unnamed": 1, "visible": True} +o_state_one_text = {"container": o_treatmentStack_treatmentHome_TreatmentHome, "text": "Delivery Stopped", "type": "Text", "unnamed": 1, "visible": True} +o_state2_resume_delivery_text = {"container": o_treatmentStack_treatmentHome_TreatmentHome, "text": "Delivery Paused", "type": "Text", "unnamed": 1, "visible": True} +o_state3_heparin_state_initial_bolus_text = {"container": o_treatmentStack_treatmentHome_TreatmentHome, "text": "Bolus Active", "type": "Text", "unnamed": 1, "visible": True} +o_state4_heparin_state_dispensing_active_text ={"container": o_treatmentStack_treatmentHome_TreatmentHome, "text": "Dispensing Active", "type": "Text", "unnamed": 1, "visible": True} o_state5_heparin_state_completed_text = {"container": o_treatmentStack_treatmentHome_TreatmentHome, "text": "Maximum Cumulative Heparin Volume Delivered", "type": "Text", "unnamed": 1, "visible": True} -o_state6_heparin_state_empty_text = {"container": o_treatmentStack_treatmentHome_TreatmentHome, "text": "Heparin Syringe Empty", "type": "Text", "unnamed": 1, "visible": True} +o_state6_heparin_state_empty_text = {"container": o_treatmentStack_treatmentHome_TreatmentHome, "text": "Syringe Empty", "type": "Text", "unnamed": 1, "visible": True} #Heparin Rejection Message o_rejection_msg = {"container": o_treatmentStack_treatmentHome_TreatmentHome, "type": "Text", "unnamed": 1, "visible": True} + Index: tst_main_treatment_heparin/test.py =================================================================== diff -u -rb98a26754d9f171df91a444374c4eb9a6f15450f -r4e552f84fba0a7f176c92b20d397e789a9e56529 --- tst_main_treatment_heparin/test.py (.../test.py) (revision b98a26754d9f171df91a444374c4eb9a6f15450f) +++ tst_main_treatment_heparin/test.py (.../test.py) (revision 4e552f84fba0a7f176c92b20d397e789a9e56529) @@ -12,22 +12,23 @@ from configuration import config, utility from dialin.ui import utils from dialin.ui.hd_simulator import HDSimulator +from configuration.utility import expected_heparin_value +from dialin.ui.utils import waitForGUI HIGHER_RANGE = 20 STEP_VALUE = 1 LOWER_RANGE = 0 - hd_simulator = HDSimulator() def verification_of_cumulative_value(expected_cumulative_value): """ Verifying cumulative values from heparin delivery section. @param expected_cumulative_value - (str) expected cumulative value. """ - expected_cumulative_value = str(expected_cumulative_value).replace(".0","") + expected_cumulative_value =str(expected_cumulative_value).replace(".0","") heparin_value = waitForObjectExists(utility.expected_heparin_value(expected_cumulative_value)) - test.compare(heparin_value.text, expected_cumulative_value, utility.msg("Actual heparin cumulative value: {} should be equal to expected heparin cumulative value: {}".format(heparin_value.text, expected_cumulative_value))) + test.compare(heparin_value.text,expected_cumulative_value, utility.msg("Actual heparin cumulative value: {} should be equal to expected heparin cumulative value: {}".format(heparin_value.text, expected_cumulative_value))) def constants_for_cumulative_value(): """ @@ -37,18 +38,17 @@ hd_simulator.cmd_set_treatment_states_data(sub_mode= 2, uf_state= 0, saline_state= 0, heparin_state= 3, rinseback_state= 0, recirculate_state= 0, blood_prime_state= 0, treatment_end_state= 0, treatment_stop_state=0, dialysis_state= 0) - test.compare(str(waitForObjectExists(names.o_state0_heparin_delivery_text).text), config.HEPARIN_DELIVERY_TEXT, utility.msg("Heparin Delivery Text should be {}".format(config.HEPARIN_DELIVERY_TEXT))) - test.compare((waitForObjectExists(names.o_state0_heparin_delivery_text)).enabled, False, utility.msg("Heparin Delivery should be disabled")) + test.compare(str(waitForObjectExists(names.o_state1_heparin_delivery_text).text), config.HEPARIN_DELIVERY_TEXT, utility.msg("Heparin Delivery Text should be {}".format(config.HEPARIN_DELIVERY_TEXT))) + test.compare((waitForObjectExists(names.o_state1_heparin_delivery_text)).enabled, False, utility.msg("Heparin Delivery should be disabled")) initial_bolus_text = waitForObjectExists(names.o_state3_heparin_state_initial_bolus_text).text test.compare(str(initial_bolus_text), config.HEPARIN_BOLUS_ACTIVE_TEXT, utility.msg("Notification Message should be {}".format(config.HEPARIN_BOLUS_ACTIVE_TEXT))) + utils.waitForGUI(1) HIGHER_VALUE = HIGHER_RANGE * 10 #conversion of decaliter to liter for heparin_cumulative in range(LOWER_RANGE, HIGHER_VALUE+1, STEP_VALUE): heparin_cumulative = format(heparin_cumulative/10, ".1f") - test.log(str(heparin_cumulative)) heparin_cumulative = float(heparin_cumulative) hd_simulator.cmd_set_treatment_heparin_data(heparin_cumulative) - verification_of_cumulative_value(heparin_cumulative) utils.waitForGUI(1) test.endSection() @@ -64,8 +64,8 @@ hd_simulator.cmd_set_treatment_states_data(sub_mode= 2, uf_state= 0, saline_state= 0, heparin_state= 0, rinseback_state= 0, recirculate_state= 0, blood_prime_state= 0, treatment_end_state= 0, treatment_stop_state= 0, dialysis_state= 0) - test.compare(str(waitForObjectExists(names.o_state0_heparin_delivery_text).text), config.HEPARIN_DELIVERY_TEXT, utility.msg("Heparin Delivery Text should be {}".format(config.HEPARIN_DELIVERY_TEXT))) - test.compare((waitForObjectExists(names.o_state0_heparin_delivery_text)).enabled, False, utility.msg("Heparin Delivery should be disabled")) + test.compare(str(waitForObjectExists(names.o_state0_heparin_delivery_Off_text).text), config.HEPARIN_DELIVERY_OFF_TEXT, utility.msg("Heparin Delivery Text should be {}".format(config.HEPARIN_DELIVERY_TEXT))) + test.compare((waitForObjectExists(names.o_state0_heparin_delivery_Off_text)).enabled, False, utility.msg("Heparin Delivery should be disabled")) test.log("Verifying Notification Message") test.compare(str(findObject(names.o_state0_heparin_delivery_Off_text).text ), config.HEPARIN_DELIVERY_OFF_TEXT, utility.msg("Notification Message should be {}".format(config.HEPARIN_DELIVERY_OFF_TEXT))) utils.waitForGUI(1) @@ -74,8 +74,8 @@ hd_simulator.cmd_set_treatment_states_data(sub_mode= 2, uf_state= 0, saline_state=0, heparin_state= 1, rinseback_state= 0, recirculate_state= 0, blood_prime_state= 0, treatment_end_state=0, treatment_stop_state= 0, dialysis_state= 0) - test.compare(str(waitForObjectExists(names.o_state0_heparin_delivery_text).text), config.HEPARIN_DELIVERY_TEXT, utility.msg("Heparin Delivery Text should be {}".format(config.HEPARIN_DELIVERY_TEXT))) - test.compare((waitForObjectExists(names.o_state0_heparin_delivery_text)).enabled, False, utility.msg("Heparin Delivery should be disabled")) + test.compare(str(waitForObjectExists(names.o_state1_heparin_delivery_text).text), config.HEPARIN_DELIVERY_TEXT, utility.msg("Heparin Delivery Text should be {}".format(config.HEPARIN_DELIVERY_TEXT))) + test.compare((waitForObjectExists(names.o_state1_heparin_delivery_text)).enabled, False, utility.msg("Heparin Delivery should be disabled")) test.log("Verifying Notification Message") test.compare(str(waitForObjectExists(names.o_state_one_text).text), config.HEPARIN_STOP_TEXT, utility.msg("Notification Message should be {}".format(config.HEPARIN_STOP_TEXT))) utils.waitForGUI(1) @@ -88,8 +88,8 @@ rinseback_state= 0, recirculate_state= 0, blood_prime_state= 0, treatment_end_state=0, treatment_stop_state= 0, dialysis_state= 0) - test.compare(str(waitForObjectExists(names.o_state0_heparin_delivery_text).text), config.HEPARIN_DELIVERY_TEXT, utility.msg("Heparin Delivery Text should be {}".format(config.HEPARIN_DELIVERY_TEXT))) - test.compare((waitForObjectExists(names.o_state0_heparin_delivery_text)).enabled, False, utility.msg("Heparin Delivery should be disabled")) + test.compare(str(waitForObjectExists(names.o_state0_heparin_delivery_Off_text).text), config.HEPARIN_DELIVERY_OFF_TEXT, utility.msg("Heparin Delivery Text should be {}".format(config.HEPARIN_DELIVERY_TEXT))) + test.compare((waitForObjectExists(names.o_state0_heparin_delivery_Off_text)).enabled, False, utility.msg("Heparin Delivery should be disabled")) test.log("Verifying Notification Message") test.compare(str(waitForObjectExists(names.o_state5_heparin_state_completed_text).text), config.HEPARIN_MAXIMUM_VOLUME_DELIVERED_TEXT, utility.msg("Notification Message should be {}".format(config.HEPARIN_MAXIMUM_VOLUME_DELIVERED_TEXT))) utils.waitForGUI(1) @@ -99,8 +99,8 @@ rinseback_state= 0, recirculate_state= 0, blood_prime_state= 0, treatment_end_state=0, treatment_stop_state= 0, dialysis_state= 0) - test.compare(str(waitForObjectExists(names.o_state0_heparin_delivery_text).text), config.HEPARIN_DELIVERY_TEXT, utility.msg("Heparin Delivery Text should be {}".format(config.HEPARIN_DELIVERY_TEXT))) - test.compare((waitForObjectExists(names.o_state0_heparin_delivery_text)).enabled, False, utility.msg("Heparin Delivery should be disabled")) + test.compare(str(waitForObjectExists(names.o_state6_heparin_state_empty_text).text), config.HEPARIN_SYRINGE_EMPTY_TEXT, utility.msg("Heparin Delivery Text should be {}".format(config.HEPARIN_DELIVERY_TEXT))) + test.compare((waitForObjectExists(names.o_state6_heparin_state_empty_text)).enabled, True, utility.msg("Heparin Delivery should be disabled")) test.log("Verifying Notification Message") test.compare(str(waitForObjectExists(names.o_state6_heparin_state_empty_text).text), config.HEPARIN_SYRINGE_EMPTY_TEXT, utility.msg("Notification Message should be {}".format(config.HEPARIN_SYRINGE_EMPTY_TEXT))) utils.waitForGUI(1) @@ -150,7 +150,9 @@ utils.tstStart(__file__) startApplication(config.AUT_NAME) heparin_stop_states_in_main_treatment() - verify_the_rejection_msg() + #TODO + #verify_the_rejection_msg() utils.tstDone() + \ No newline at end of file