Index: shared/scripts/configuration/strings.py =================================================================== diff -u -r06fda637e04ce27ea414ba8ad06af92c4b76d788 -r6b85a46cebe626c28a1accd4ea0019d3388abef4 --- shared/scripts/configuration/strings.py (.../strings.py) (revision 06fda637e04ce27ea414ba8ad06af92c4b76d788) +++ shared/scripts/configuration/strings.py (.../strings.py) (revision 6b85a46cebe626c28a1accd4ea0019d3388abef4) @@ -395,6 +395,7 @@ #rinseback-setup ADDITIONAL_BUTTON_TEXT = "ADDITIONAL" +SALINE_BOLUS_BUTTON = "SALINE BOLUS" ADDITIONAL_RINSEBACK_TEXT = "Additional Rinseback" RINSEBACK_UNIT = " mL" RINSEBACK_UNIT_MIN = " mL/min" Index: shared/scripts/names.py =================================================================== diff -u -r06fda637e04ce27ea414ba8ad06af92c4b76d788 -r6b85a46cebe626c28a1accd4ea0019d3388abef4 --- shared/scripts/names.py (.../names.py) (revision 06fda637e04ce27ea414ba8ad06af92c4b76d788) +++ shared/scripts/names.py (.../names.py) (revision 6b85a46cebe626c28a1accd4ea0019d3388abef4) @@ -600,6 +600,7 @@ # Rinseback complete End treatment text 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_Saline_Bolus_Text = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinsebackComplete_EndTreatmentRinsebackComplete, "text": "SALINE BOLUS", "type": "Text", "unnamed": 1, "visible": True} 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 @@ -1085,4 +1086,6 @@ userConfirmation_Incorrect_password_Text = {"container": userConfirmation_SettingsServicePassword, "text": "Incorrect password", "type": "Text", "unnamed": 1, "visible": True} userConfirmation_backButton_BackButton = {"container": userConfirmation_SettingsServicePassword, "objectName": "_backButton", "type": "BackButton", "visible": True} o_EndTreatmentBase_ButtonEndTreatment = {"container": o_EndTreatmentRecirculateStack_EndTreatmentBase_EndTreatmentBase, "type": "ButtonEndTreatment", "unnamed": 1, "visible": True} +o_EndTreatmentRinsebackComplete_SALINE_BOLUS_Text = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinsebackComplete_EndTreatmentRinsebackComplete, "text": "SALINE BOLUS", "type": "Text", "unnamed": 1, "visible": True} +o_EndTreatmentRinsebackComplete_backButton_BackButton = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinsebackComplete_EndTreatmentRinsebackComplete, "objectName": "_backButton", "type": "BackButton", "visible": True} Index: tst_rinseback_setup/test.py =================================================================== diff -u -r84c1284ecff1f30169d50afb688be18934eb8506 -r6b85a46cebe626c28a1accd4ea0019d3388abef4 --- tst_rinseback_setup/test.py (.../test.py) (revision 84c1284ecff1f30169d50afb688be18934eb8506) +++ tst_rinseback_setup/test.py (.../test.py) (revision 6b85a46cebe626c28a1accd4ea0019d3388abef4) @@ -70,9 +70,6 @@ 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_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_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_EndTreatmentRinsebackInit_endTreatmentTouchRect_TouchRect)) @@ -139,7 +136,6 @@ 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(waitForObjectExists(names.o_EndTreatmentRinseback_imageDecelerate_ImageText)) verify_rinseback_rejection_msg() test.endSection() @@ -164,11 +160,10 @@ 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_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") + test.compare(str(waitForObjectExists(names.o_EndTreatmentRinsebackComplete_Saline_Bolus_Text).text), config.SALINE_BOLUS_BUTTON, "ADDITIONAL button text must be {}".format(config.SALINE_BOLUS_BUTTON)) + test.verify(waitForObjectExists(names.o_EndTreatmentRinsebackComplete_Saline_Bolus_Text).enabled, "Saline Bolus button must be active") 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") + test.verify(waitForObjectExists(names.o_EndTreatmentRinsebackComplete_backButton_BackButton).enabled, "BACK TO TREATMENT button on rinse back complete screen must be active") 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_mouseArea_MouseArea)) @@ -193,9 +188,6 @@ test.verify(waitForObjectExists(names.o_EndTreatmentAdditional_circle_ProgressCircle).enabled, "Progress Bar must be enable") test.compare(str(waitForObject(names.o_EndTreatmentAdditional_circle_ProgressCircle).value), str(num), "Verifying Progress circle values" + config.ADDITIONAL_RINSEBACK_TEXT) test.endSection() - - test.compare(str(waitForObject(names.o_EndTreatmentAdditional_Additional_Rinseback_Text).text), config.ADDITIONAL_RINSEBACK_TEXT, "Additional Rinseback text must be {}".format(config.ADDITIONAL_RINSEBACK_TEXT)) - test.endSection() def verify_right_instruction_in_rinseback_setup_state(NUM_OF_INSTRUCTION): """.