Index: shared/scripts/names.py =================================================================== diff -u -r63cc4b670684b2269a9617fea1910dacdff7bc28 -r2027a145f926b326b05974d8f643e3593ade85b7 --- shared/scripts/names.py (.../names.py) (revision 63cc4b670684b2269a9617fea1910dacdff7bc28) +++ shared/scripts/names.py (.../names.py) (revision 2027a145f926b326b05974d8f643e3593ade85b7) @@ -64,7 +64,7 @@ #Rinseback Instruction Title in INIT state 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_button_text = {"container": o_EndTreatmentEndStack_EndTreatmentBase_EndTreatmentBase, "text": "START RINSEBACK", "type": "Text", "unnamed": 1, "visible": True} +o_start_rinseback_button_text = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinsebackInit_EndTreatmentRinsebackInit, "text": "START RINSEBACK", "type": "Text", "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} #Decelerate Image text and button text Index: tst_rinseback_setup/test.py =================================================================== diff -u -r63cc4b670684b2269a9617fea1910dacdff7bc28 -r2027a145f926b326b05974d8f643e3593ade85b7 --- tst_rinseback_setup/test.py (.../test.py) (revision 63cc4b670684b2269a9617fea1910dacdff7bc28) +++ tst_rinseback_setup/test.py (.../test.py) (revision 2027a145f926b326b05974d8f643e3593ade85b7) @@ -26,7 +26,7 @@ hd_simulator = HDSimulator() SCREEN_OBJ = names.o_EndTreatmentRinsebackStack_EndTreatmentRinsebackInit_EndTreatmentRinsebackInit -COUNT_DOWN_VALUE = 121 +COUNT_DOWN_VALUE = 120 COUNT_DOWN_DEFAULT_VALUE = 0 TIMER_DEFAULT_VALUE = 1 NUM_OF_INSTRUCTION = 3 @@ -62,9 +62,9 @@ test.compare(str(waitForObject(names.o_EndTreatmentRinsebackInit_TimeText_hour_Text).text),str(min), "Verifying minutes on timer in" + config.RINSE_BACK_SETUP_TEXT) test.endSection() - test.compare(str(waitForObject(names.o_rinse_back_text).text),config.RINSE_BACK_SETUP_TEXT, "Rinseback Setup text must be {}".format(config.RINSE_BACK_SETUP_TEXT)) - test.verify(waitForObjectExists(names.o_rinse_back_text).enabled, " Start Rinseback button must be active") - mouseClick(waitForObject(names.o_rinse_back_text)) + test.compare(str(waitForObject(names.o_start_rinseback_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_button_text).enabled, " Start Rinseback button must be active") + mouseClick(waitForObject(names.o_start_rinseback_button_text)) 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)