Index: shared/scripts/configuration/strings.py =================================================================== diff -u -re7f8ae16883b598da38add7ab5cd3bfa48ab408e -r5c6792cd99a0c34a362a7d6ba8f12418327346d9 --- shared/scripts/configuration/strings.py (.../strings.py) (revision e7f8ae16883b598da38add7ab5cd3bfa48ab408e) +++ shared/scripts/configuration/strings.py (.../strings.py) (revision 5c6792cd99a0c34a362a7d6ba8f12418327346d9) @@ -33,7 +33,9 @@ HEPARIN_SYRINGE_EMPTY_TEXT = "Syringe Empty" VOLUME_DELIVERED_TEXT = "Volume Delivered" VOLUME_DELIVERED = "0.0" - +TREATMENT_TEXT = "Treatment" +TRENDING_TEXT = "Trending" +SETTINGS_TEXT = "Settings" # dictionary of rejection reason from application source code. # message location -> denali-> Headers-> common-> MsgDefs.h REJECTION_REASON = { Index: shared/scripts/names.py =================================================================== diff -u -re7f8ae16883b598da38add7ab5cd3bfa48ab408e -r5c6792cd99a0c34a362a7d6ba8f12418327346d9 --- shared/scripts/names.py (.../names.py) (revision e7f8ae16883b598da38add7ab5cd3bfa48ab408e) +++ shared/scripts/names.py (.../names.py) (revision 5c6792cd99a0c34a362a7d6ba8f12418327346d9) @@ -72,3 +72,9 @@ #Heparin Rejection Message o_rejection_msg = {"container": o_treatmentStack_treatmentHome_TreatmentHome, "type": "Text", "unnamed": 1, "visible": True} o_volume_delivered_text = {"container": o_treatmentStack_treatmentHome_TreatmentHome, "occurrence": 2, "text": "Volume Delivered", "type": "Text", "unnamed": 1, "visible": True} +o_treatmentHome_mouseArea_MouseArea_2 = {"container": o_treatmentStack_treatmentHome_TreatmentHome, "id": "_mouseArea", "occurrence": 15, "type": "MouseArea", "unnamed": 1, "visible": True} +o_treatmentStack_TreatmentStack = {"container": o_Gui_MainView, "objectName": "TreatmentStack", "type": "TreatmentStack", "visible": True} +o_treatmentStack_modal_MouseArea = {"container": o_treatmentStack_TreatmentStack, "id": "_modal", "type": "MouseArea", "unnamed": 1, "visible": False} +o_treatment_text = {"container": o_treatmentStack_TreatmentStack, "text": "Treatment", "type": "Text", "unnamed": 1, "visible": True} +o_trending_text = {"container": o_treatmentStack_TreatmentStack, "text": "Trending", "type": "Text", "unnamed": 1, "visible": True} +o_main_settings_text = {"container": o_treatmentStack_TreatmentStack, "text": "Settings", "type": "Text", "unnamed": 1, "visible": True} \ No newline at end of file Index: tst_main_treatment_heparin/test.py =================================================================== diff -u -re7f8ae16883b598da38add7ab5cd3bfa48ab408e -r5c6792cd99a0c34a362a7d6ba8f12418327346d9 --- tst_main_treatment_heparin/test.py (.../test.py) (revision e7f8ae16883b598da38add7ab5cd3bfa48ab408e) +++ tst_main_treatment_heparin/test.py (.../test.py) (revision 5c6792cd99a0c34a362a7d6ba8f12418327346d9) @@ -37,6 +37,14 @@ hd_simulator.cmd_set_treatment_states_data(sub_mode=TreatmentStates.TREATMENT_DIALYSIS_STATE.value, uf_state=TreatmentStates.TREATMENT_START_STATE.value, saline_state=TreatmentStates.TREATMENT_START_STATE.value, heparin_state=HeparinStates.HEPARIN_STATE_INITIAL_BOLUS.value, rinseback_state=TreatmentStates.TREATMENT_START_STATE.value, recirculate_state=TreatmentStates.TREATMENT_START_STATE.value, blood_prime_state=TreatmentStates.TREATMENT_START_STATE.value, treatment_end_state=TreatmentStates.TREATMENT_START_STATE.value, treatment_stop_state=TreatmentStates.TREATMENT_START_STATE.value, dialysis_state=TreatmentStates.TREATMENT_START_STATE.value) + mouseClick(waitForObject(names.o_treatmentHome_mouseArea_MouseArea_2)) + test.compare(str(waitForObjectExists(names.o_treatment_text).text), config.TREATMENT_TEXT, utility.msg("Treatment title Text should be {}".format(config.TREATMENT_TEXT))) + mouseClick(waitForObject(names.o_trending_text)) + mouseClick(waitForObject(names.o_treatmentHome_mouseArea_MouseArea_2)) + test.compare(str(waitForObjectExists(names.o_trending_text).text), config.TRENDING_TEXT, utility.msg("Trending title Text should be {}".format(config.TRENDING_TEXT))) + mouseClick(waitForObject(names.o_main_settings_text)) + mouseClick(waitForObject(names.o_treatmentHome_mouseArea_MouseArea_2)) + test.compare(str(waitForObjectExists(names.o_main_settings_text).text), config.SETTINGS_TEXT, utility.msg("Trending title Text should be {}".format(config.SETTINGS_TEXT))) 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 @@ -65,6 +73,7 @@ test.compare(str(waitForObjectExists(names.o_state2_heparin_state_paused_text).text),config.HEPARIN_RESUME_DELIVERY_TEXT, utility.msg("Heparin Resume Delivery Text should be {}".format(config.HEPARIN_RESUME_DELIVERY_TEXT))) test.compare( waitForObjectExists(names.o_state2_heparin_state_paused_text).enabled, True, utility.msg("Resume Delivery Button is enabled")) mouseClick(waitForObject(names.o_state2_heparin_state_paused_text)) + mouseClick(waitForObject(names.o_treatmentHome_mouseArea_MouseArea_2)) test.log("Heparin delivery is paused, resume delivery to start") utils.waitForGUI(1) @@ -77,6 +86,7 @@ test.compare(str(waitForObjectExists(names.o_state4_heparin_state_dispensing_text).text), config.HEPARIN_PAUSE_DELIVERY_TEXT, utility.msg("Heparin Pause Delivery Text should be {}".format(config.HEPARIN_PAUSE_DELIVERY_TEXT))) test.compare( waitForObjectExists(names.o_state4_heparin_state_dispensing_text).enabled , True, utility.msg("Pause Delivery Button is enabled")) mouseClick(waitForObject(names.o_state4_heparin_state_dispensing_text)) + mouseClick(waitForObject(names.o_treatmentHome_mouseArea_MouseArea_2)) test.compare(str(waitForObjectExists(names.o_state4_heparin_state_dispensing_active_text).text), config.HEPARIN_BOLUS_DISPENSING_TEXT, utility.msg("Heparin Pause Delivery Text should be {}".format(config.HEPARIN_BOLUS_DISPENSING_TEXT))) test.log("Heparin delivery is in dispensing state") test.endSection()