Index: shared/scripts/names.py =================================================================== diff -u -r66579e2dfbba8c77673add25b3fa6ebaba4b4f10 -r472731060f96a73795f8feefe2b81969490e6ce1 --- shared/scripts/names.py (.../names.py) (revision 66579e2dfbba8c77673add25b3fa6ebaba4b4f10) +++ shared/scripts/names.py (.../names.py) (revision 472731060f96a73795f8feefe2b81969490e6ce1) @@ -598,18 +598,25 @@ o_rinse_back_text = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinsebackInit_EndTreatmentRinsebackInit, "text": "Rinseback Setup", "type": "Text", "unnamed": 1, "visible": True} #Rinseback Start button text o_start_rinseback_init_button_text = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinsebackInit_EndTreatmentRinsebackInit, "text": "START RINSEBACK", "type": "Text", "unnamed": 1, "visible": True} +o_EndTreatmentRinsebackInit_beginRinsebackTouchRect_TouchRect = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinsebackInit_EndTreatmentRinsebackInit, "id": "_beginRinsebackTouchRect", "type": "TouchRect", "unnamed": 1, "visible": True} #Rinseback back to treatment button text o_init_rinseback_back_to_treatment_button_text = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinsebackInit_EndTreatmentRinsebackInit, "text": "BACK TO TREATMENT", "type": "Text", "unnamed": 1, "visible": True} +o_EndTreatmentRinsebackInit_backTreatmentTouchRect_TouchRect = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinsebackInit_EndTreatmentRinsebackInit, "id": "_backTreatmentTouchRect", "type": "TouchRect", "unnamed": 1, "visible": True} #Rinseback end treatment button text o_init_rinseback_end_treatment_button_text = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinsebackInit_EndTreatmentRinsebackInit, "text": "END TREATMENT", "type": "Text", "unnamed": 1, "visible": True} +o_EndTreatmentRinsebackInit_endTreatmentTouchRect_TouchRect = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinsebackInit_EndTreatmentRinsebackInit, "id": "_endTreatmentTouchRect", "type": "TouchRect", "unnamed": 1, "visible": True} #Rinseback END image and button text o_EndTreatmentRinseback_imageEnd_ImageText = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinseback_EndTreatmentRinseback, "id": "_imageEnd", "source": "qrc:/images/iRedCrossWCircle", "type": "ImageText", "unnamed": 1, "visible": True} +o_EndTreatmentRinseback_MouseArea = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinseback_EndTreatmentRinseback, "type": "MouseArea", "unnamed": 1, "visible": True} #Decelerate Image text and button text o_EndTreatmentRinseback_imageDecelerate_ImageText = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinseback_EndTreatmentRinseback, "id": "_imageDecelerate", "source": "qrc:/images/iDecelerate", "type": "ImageText", "unnamed": 1, "visible": True} +o_EndTreatmentRinseback_MouseArea_2 = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinseback_EndTreatmentRinseback, "occurrence": 2, "type": "MouseArea", "unnamed": 1, "visible": True} #Accelerate Image text and button text o_EndTreatmentRinseback_imageAccelerate_ImageText = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinseback_EndTreatmentRinseback, "id": "_imageAccelerate", "source": "qrc:/images/iAccelerate", "type": "ImageText", "unnamed": 1, "visible": True} +o_EndTreatmentRinseback_MouseArea_3 = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinseback_EndTreatmentRinseback, "occurrence": 4, "type": "MouseArea", "unnamed": 1, "visible": True} #Pause Image text and button text o_EndTreatmentRinseback_imagePause_ImageText = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinseback_EndTreatmentRinseback, "id": "_imagePause", "source": "qrc:/images/iPauseLightBlue", "type": "ImageText", "unnamed": 1, "visible": True} +o_EndTreatmentRinseback_MouseArea_4 = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinseback_EndTreatmentRinseback, "occurrence": 3, "type": "MouseArea", "unnamed": 1, "visible": True} #Rinseback Title text o_EndTreatmentRinseback_Rinseback_Text = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinseback_EndTreatmentRinseback, "text": "Rinseback", "type": "Text", "unnamed": 1, "visible": True} #Resume Image text and button text @@ -620,12 +627,16 @@ o_EndTreatmentRinsebackComplete_END_TREATMENT_Text = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinsebackComplete_EndTreatmentRinsebackComplete, "text": "END TREATMENT", "type": "Text", "unnamed": 1, "visible": True} #Rinseback complete Additional text o_EndTreatmentRinsebackComplete_ADDITIONAL_Text = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinsebackComplete_EndTreatmentRinsebackComplete, "text": "ADDITIONAL", "type": "Text", "unnamed": 1, "visible": True} +o_EndTreatmentRinsebackComplete_beginRinsebackTouchRect_TouchRect = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinsebackComplete_EndTreatmentRinsebackComplete, "id": "_beginRinsebackTouchRect", "type": "TouchRect", "unnamed": 1, "visible": True} #Rinseback complete back to treatment text o_EndTreatmentRinsebackComplete_Back_to_treatment_Text = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinsebackComplete_EndTreatmentRinsebackComplete, "text": "BACK TO TREATMENT", "type": "Text", "unnamed": 1, "visible": True} +o_EndTreatmentRinsebackComplete_backTreatmentTouchRect_TouchRect = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinsebackComplete_EndTreatmentRinsebackComplete, "id": "_backTreatmentTouchRect", "type": "TouchRect", "unnamed": 1, "visible": True} #Rinseback Additional rinseback text o_EndTreatmentAdditional_Additional_Rinseback_Text = {"container": o_EndTreatmentRinsebackStack_EndTreatmentAdditional_EndTreatmentBase, "text": "Additional Rinseback", "type": "Text", "unnamed": 1, "visible": True} +o_EndTreatmentRinsebackComplete_endTreatmentTouchRect_TouchRect = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinsebackComplete_EndTreatmentRinsebackComplete, "id": "_endTreatmentTouchRect", "type": "TouchRect", "unnamed": 1, "visible": True} #Rinseback complete confirm button o_EndTreatmentRinsebackComplete_Confirm_Button = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinsebackStack, "type": "Text", "unnamed": 1, "visible": True} +o_EndTreatmentRinsebackComplete_mouseArea_MouseArea = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinsebackComplete_EndTreatmentRinsebackComplete, "id": "_mouseArea", "type": "MouseArea", "unnamed": 1, "visible": True} #Rinseback setup Progress circle o_rinseback_setup_progress = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinseback_EndTreatmentRinseback, "id": "_Circle", "type": "ProgressCircle", "visible": True} #Rinseback Title text @@ -651,7 +662,6 @@ #Rinseback rejection messages o_rinseback_rejection_msg = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinsebackStack, "type": "Text", "unnamed": 1, "visible": True} - #heparin syringe disposables o_preTreatmentDisposablesStack_preTreatmentDisposablesHeparinSyringe_TreatmentFlowBase = {"container": o_PreTreatmentStack_preTreatmentDisposablesStack_PreTreatmentDisposablesStack, "objectName": "_preTreatmentDisposablesHeparinSyringe", "type": "TreatmentFlowBase", "visible": True} o_blood_flow_minimum_value = {"container": o_Overlay, "text": "100mL/min", "type": "Text", "unnamed": 1, "visible": True} @@ -661,7 +671,6 @@ o_handler_Rectangle = {"container": o_Overlay, "id": "_handler", "type": "Rectangle", "unnamed": 1, "visible": True} o_treatment_saline_notification_msg = {"container": o_treatmentHome, "id": "_text", "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} @@ -955,7 +964,6 @@ o_postModeScreen_ScreenItem = {"container": o_Gui_MainView, "id": "_postModeScreen", "type": "ScreenItem", "unnamed": 1, "visible": True} - #alarm minimize button o_minimize_button = {"container": o_Overlay, "id": "_image", "source": "qrc:/images/iChevronDown", "type": "Image", "unnamed": 1, "visible": True} o_SettingsHome_SettingsHome = {"container": o_Gui_MainView, "objectName": "_SettingsHome", "type": "SettingsHome", "visible": True} Index: tst_rinseback_setup/test.py =================================================================== diff -u -r9cb11764afa19aceb5bf9b0ba606d6c27b5da974 -r472731060f96a73795f8feefe2b81969490e6ce1 --- tst_rinseback_setup/test.py (.../test.py) (revision 9cb11764afa19aceb5bf9b0ba606d6c27b5da974) +++ tst_rinseback_setup/test.py (.../test.py) (revision 472731060f96a73795f8feefe2b81969490e6ce1) @@ -67,13 +67,13 @@ test.compare(str(waitForObject(names.o_start_rinseback_init_button_text).text),config.RINSEBACK_BUTTON_TEXT, "Start Rinseback button text must be {}".format(config.RINSEBACK_BUTTON_TEXT)) test.verify(waitForObjectExists(names.o_start_rinseback_init_button_text).enabled, " Start Rinseback button must be active") - mouseClick(waitForObject(names.o_start_rinseback_init_button_text)) + mouseClick(waitForObject(names.o_EndTreatmentRinsebackInit_beginRinsebackTouchRect_TouchRect)) test.compare(str(waitForObject(names.o_init_rinseback_back_to_treatment_button_text).text),config.BACK_TO_TREATMENT_BUTTON_TEXT, "Back to treatment button text on rinseback init state screen must be {}".format(config.BACK_TO_TREATMENT_BUTTON_TEXT)) test.verify(waitForObjectExists(names.o_init_rinseback_back_to_treatment_button_text).enabled, " Back to treatment button on rinseback init state screen must be active") - mouseClick(waitForObject(names.o_init_rinseback_back_to_treatment_button_text)) + mouseClick(waitForObject(names.o_EndTreatmentRinsebackInit_backTreatmentTouchRect_TouchRect)) test.compare(str(waitForObject(names.o_init_rinseback_end_treatment_button_text).text),config.END_TREATMENT_BUTTON_TEXT, "End treatment button text on rinseback init state screen must be {}".format(config.END_TREATMENT_BUTTON_TEXT)) test.verify(waitForObjectExists(names.o_init_rinseback_end_treatment_button_text).enabled, " End treatment button on rinseback init state screen must be active") - mouseClick(waitForObject(names.o_init_rinseback_end_treatment_button_text)) + mouseClick(waitForObject(names.o_EndTreatmentRinsebackInit_endTreatmentTouchRect_TouchRect)) verify_right_instruction_in_rinseback_setup_state(NUM_OF_INSTRUCTION) verify_left_instruction_in_rinseback_setup_state(NUM_OF_INSTRUCTION) verify_right_instruction_in_rinseback_setup_state(NUM_OF_INSTRUCTION) @@ -103,19 +103,19 @@ test.compare(str(waitForObject(names.o_EndTreatmentRinseback_Rinseback_Text).text), config.RINSEBACK_TEXT, "Rinseback text must be {}".format(config.RINSEBACK_TEXT)) test.compare(str(waitForObject(names.o_EndTreatmentRinseback_imageEnd_ImageText).text), config.END_IMAGE_BUTTON_TEXT, "END button text must be {}".format(config.END_IMAGE_BUTTON_TEXT)) test.verify(waitForObjectExists(names.o_EndTreatmentRinseback_imageEnd_ImageText).enabled, " END button must be active") - mouseClick(waitForObject(names.o_EndTreatmentRinseback_imageEnd_ImageText)) + mouseClick(waitForObject(names.o_EndTreatmentRinseback_MouseArea)) test.compare(str(waitForObject(names.o_EndTreatmentRinseback_imageDecelerate_ImageText).text), config.DECELERATE_BUTTON_TEXT, "Decelerate button text must be {}".format(config.DECELERATE_BUTTON_TEXT)) test.verify(waitForObjectExists(names.o_EndTreatmentRinseback_imageDecelerate_ImageText).enabled, " Decelerate button must be active") - mouseClick(waitForObject(names.o_EndTreatmentRinseback_imageDecelerate_ImageText)) + mouseClick(waitForObject(names.o_EndTreatmentRinseback_MouseArea_2)) test.compare(str(waitForObject(names.o_EndTreatmentRinseback_imageAccelerate_ImageText).text), config.ACCELERATE_BUTTON_TEXT, "Accelerate button text must be {}".format(config.ACCELERATE_BUTTON_TEXT)) test.verify(waitForObjectExists(names.o_EndTreatmentRinseback_imageAccelerate_ImageText).enabled, " Accelerate button must be active") - mouseClick(waitForObject(names.o_EndTreatmentRinseback_imageAccelerate_ImageText)) + mouseClick(waitForObject(names.o_EndTreatmentRinseback_MouseArea_3)) test.compare(str(waitForObject(names.o_EndTreatmentRinseback_imagePause_ImageText).text), config.PAUSE_BUTTON_TEXT, "Pause button text must be {}".format(config.PAUSE_BUTTON_TEXT)) test.verify(waitForObjectExists(names.o_EndTreatmentRinseback_imagePause_ImageText).enabled, " Pause button must be active") - mouseClick(waitForObject(names.o_EndTreatmentRinseback_imagePause_ImageText)) + mouseClick(waitForObject(names.o_EndTreatmentRinseback_MouseArea_4)) verify_rinseback_rejection_msg() test.endSection() @@ -130,7 +130,7 @@ test.compare(str(waitForObject(names.o_EndTreatmentRinseback_Rinseback_Text).text), config.RINSEBACK_TEXT, "Rinseback text must be {}".format(config.RINSEBACK_TEXT)) test.compare(str(waitForObject(names.o_EndTreatmentRinseback_imageEnd_ImageText).text), config.END_IMAGE_BUTTON_TEXT, "END button text must be {}".format(config.END_IMAGE_BUTTON_TEXT)) test.verify(waitForObjectExists(names.o_EndTreatmentRinseback_imageEnd_ImageText).enabled, " END button must be active") - mouseClick(waitForObject(names.o_EndTreatmentRinseback_imageEnd_ImageText)) + mouseClick(waitForObject(names.o_EndTreatmentRinseback_MouseArea)) accelerator = waitForObjectExists(names.o_EndTreatmentRinseback_imageAccelerate_ImageText).enabled test.compare(accelerator,False, " Accelerate button must be disabled") @@ -139,7 +139,7 @@ test.compare(str(waitForObject(names.o_EndTreatmentRinseback_imageResume_ImageText).text), config.RESUME_BUTTON_TEXT, "Resume button text must be {}".format(config.RESUME_BUTTON_TEXT)) test.verify(waitForObjectExists(names.o_EndTreatmentRinseback_imageResume_ImageText).enabled, " Resume button must be active") - mouseClick(waitForObject(names.o_EndTreatmentRinseback_imageResume_ImageText)) + mouseClick(waitForObject(names.o_EndTreatmentRinseback_MouseArea_3)) verify_rinseback_rejection_msg() test.endSection() @@ -163,15 +163,15 @@ test.compare(str(waitForObject(names.o_EndTreatmentRinsebackComplete_Rinseback_Complete_Text).text), config.RINSEBACK_COMPLETE_TEXT, "Rinseback Complete text must be {}".format(config.RINSEBACK_COMPLETE_TEXT)) test.compare(str(waitForObjectExists(names.o_EndTreatmentRinsebackComplete_END_TREATMENT_Text).text), config.END_TREATMENT_BUTTON_TEXT, "END TREATMENT button text must be {}".format(config.END_TREATMENT_BUTTON_TEXT)) test.verify(waitForObjectExists(names.o_EndTreatmentRinsebackComplete_END_TREATMENT_Text).enabled, "END TREATMENT button must be active") - mouseClick(waitForObject(names.o_EndTreatmentRinsebackComplete_END_TREATMENT_Text)) + mouseClick(waitForObject(names.o_EndTreatmentRinsebackComplete_endTreatmentTouchRect_TouchRect)) test.compare(str(waitForObjectExists(names.o_EndTreatmentRinsebackComplete_ADDITIONAL_Text).text), config.ADDITIONAL_BUTTON_TEXT, "ADDITIONAL button text must be {}".format(config.ADDITIONAL_BUTTON_TEXT)) test.verify(waitForObjectExists(names.o_EndTreatmentRinsebackComplete_ADDITIONAL_Text).enabled, "ADDITIONAL button must be active") - mouseClick(waitForObject(names.o_EndTreatmentRinsebackComplete_ADDITIONAL_Text)) + mouseClick(waitForObject(names.o_EndTreatmentRinsebackComplete_beginRinsebackTouchRect_TouchRect)) test.compare(str(waitForObjectExists(names.o_EndTreatmentRinsebackComplete_Back_to_treatment_Text).text), config.BACK_TO_TREATMENT_BUTTON_TEXT, "BACK TO TREATMENT button text must be {}".format(config.BACK_TO_TREATMENT_BUTTON_TEXT)) test.verify(waitForObjectExists(names.o_EndTreatmentRinsebackComplete_Back_to_treatment_Text).enabled, "BACK TO TREATMENT button on rinse back complete screen must be active") - mouseClick(waitForObject(names.o_EndTreatmentRinsebackComplete_Back_to_treatment_Text)) + mouseClick(waitForObject(names.o_EndTreatmentRinsebackComplete_beginRinsebackTouchRect_TouchRect)) test.verify(waitForObjectExists(names.o_EndTreatmentRinsebackComplete_Confirm_Button).enabled, "Confirm button on rinse back complete screen must be enabled") - mouseClick(waitForObject(names.o_EndTreatmentRinsebackComplete_Confirm_Button)) + mouseClick(waitForObject(names.o_EndTreatmentRinsebackComplete_mouseArea_MouseArea)) verify_rinseback_rejection_msg() test.endSection()