Index: shared/scripts/configuration/config.py =================================================================== diff -u -r0b1139d9980d1be6636f318a00eace285dd5ba45 -r6ca4df173f6d947a5715418ea1f0d5823bf67c63 --- shared/scripts/configuration/config.py (.../config.py) (revision 0b1139d9980d1be6636f318a00eace285dd5ba45) +++ shared/scripts/configuration/config.py (.../config.py) (revision 6ca4df173f6d947a5715418ea1f0d5823bf67c63) @@ -17,7 +17,7 @@ from configuration.strings import * -AUT_NAME = "denaliSquish" +AUT_NAME = "denaliSquish -k -K -S" COMMON_PATH = os.environ['HOME']+"/Projects" Index: shared/scripts/names.py =================================================================== diff -u -rcd99a82bc00592c2cb11e87b8969c8625833fa99 -r6ca4df173f6d947a5715418ea1f0d5823bf67c63 --- shared/scripts/names.py (.../names.py) (revision cd99a82bc00592c2cb11e87b8969c8625833fa99) +++ shared/scripts/names.py (.../names.py) (revision 6ca4df173f6d947a5715418ea1f0d5823bf67c63) @@ -52,19 +52,18 @@ o_fluid_text = {"container": o_treatmentStack_treatmentHome_TreatmentHome, "text": "Volume Delivered", "type": "Text", "unnamed": 1, "visible": True} o_cumulative_fluid_text = {"container": o_treatmentStack_treatmentHome_TreatmentHome, "text": "Cumulative Delivered", "type": "Text", "unnamed": 1, "visible": True} - - #vitals #vitals title text on main-treatment screen -o_vitals_title = {"container": o_treatmentStack_treatmentHome_TreatmentHome, "text": "VITALS", "type": "Text", "unnamed": 1, "visible": True} +o_vitals_toucharea = {"container": o_treatmentStack_treatmentHome_TreatmentHome, "id": "_mouseArea", "occurrence": 2, "type": "MouseArea", "unnamed": 1, "visible": True} #unit of measurement for blood pressure and heart rate o_bp_uom = {"container": o_treatmentStack_treatmentHome_TreatmentHome, "text": "mmHg", "type": "Text", "unnamed": 1, "visible": True} o_hr_uom = {"container": o_treatmentStack_treatmentHome_TreatmentHome, "text": "BPM", "type": "Text", "unnamed": 1, "visible": True} #reading of vitals o_vitals_reading = {"container": o_treatmentStack_treatmentHome_TreatmentHome, "type": "Text", "unnamed": 1, "visible": True} #vitals pop up confirm and close button -o_vitals_confrim_btn = {"container": o_treatmentStack_TreatmentStack, "text": "CONFIRM", "type": "Text", "unnamed": 1, "visible": True} +o_treatmentStack_vitals_confirmButton_TouchRect = {"container": o_treatmentStack_TreatmentStack, "id": "_confirmButton", "type": "TouchRect", "unnamed": 1, "visible": True} o_vitals_close_btn = {"container": o_treatmentStack_TreatmentStack, "id": "_image", "source": "qrc:/images/iClose", "type": "Image", "unnamed": 1, "visible": True} + #vitals title text vitals pop up o_vitals_pop_up_title = {"container": o_treatmentStack_TreatmentStack, "text": "VITALS", "type": "Text", "unnamed": 1, "visible": True} o_pop_up_bp_title = {"container": o_treatmentStack_TreatmentStack, "text": "Blood Pressure", "type": "Text", "unnamed": 1, "visible": True} Index: tst_main_treatment_vitals/test.py =================================================================== diff -u -r56bad3fffaba793a32c3d8989288c9a8a818ec5e -r6ca4df173f6d947a5715418ea1f0d5823bf67c63 --- tst_main_treatment_vitals/test.py (.../test.py) (revision 56bad3fffaba793a32c3d8989288c9a8a818ec5e) +++ tst_main_treatment_vitals/test.py (.../test.py) (revision 6ca4df173f6d947a5715418ea1f0d5823bf67c63) @@ -117,7 +117,7 @@ and verify 'Vitals' pop is opened """ test.startSection("Opening 'Vitals' pop up") - vitals_touch_area = object.parent(waitForObject(names.o_vitals_title)) + vitals_touch_area = object.parent(waitForObject(names.o_vitals_toucharea)) start_time = time.time() mouseClick(vitals_touch_area) test.log("Verifying the 'Vitals' pop up is displayed") @@ -344,7 +344,7 @@ if save: test.log("Clicking confirm button") - confirm_button = waitForObjectExists(names.o_vitals_confrim_btn) + confirm_button = waitForObjectExists(names.o_treatmentStack_vitals_confirmButton_TouchRect) test.compare(confirm_button.enabled, True, "Valid Blood Pressure and Heart is entered therefore confirm button is enabled") saved_time = utility.get_current_date_and_time(date_format='%m/%d/%Y %H:%M:%S')