Index: tst_rinseback_setup/test.py =================================================================== diff -u -r6bb43117bca2673c5de877f5b70b094da344418a -r84c1284ecff1f30169d50afb688be18934eb8506 --- tst_rinseback_setup/test.py (.../test.py) (revision 6bb43117bca2673c5de877f5b70b094da344418a) +++ tst_rinseback_setup/test.py (.../test.py) (revision 84c1284ecff1f30169d50afb688be18934eb8506) @@ -64,7 +64,9 @@ test.compare(str(waitForObject(names.o_EndTreatmentRinsebackInit_TimeText_minute_Text).text),str(sec), "Verifying seconds on timer in" + config.RINSE_BACK_SETUP_TEXT) 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() - + 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) 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)) @@ -74,9 +76,7 @@ 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)) - 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) + verify_rinseback_rejection_msg() test.endSection() @@ -111,7 +111,7 @@ 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_MouseArea_3)) + mouseClick(waitForObject(names.o_EndTreatmentRinseback_imageAccelerate_ImageText)) 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") @@ -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_MouseArea_3)) + mouseClick(waitForObjectExists(names.o_EndTreatmentRinseback_imageDecelerate_ImageText)) verify_rinseback_rejection_msg() test.endSection()