Index: shared/scripts/configuration/utility.py =================================================================== diff -u -r4346cb9ced50b3a6444997cde14e850c8313e72f -r603975795daa75d928e6da235be9074f3bba9c1d --- shared/scripts/configuration/utility.py (.../utility.py) (revision 4346cb9ced50b3a6444997cde14e850c8313e72f) +++ shared/scripts/configuration/utility.py (.../utility.py) (revision 603975795daa75d928e6da235be9074f3bba9c1d) @@ -67,8 +67,7 @@ squish.mouseWheel(ScreenObj, screenWidth-1000, screenHeight-10, 0, -50, squish.Qt.NoModifier) - raise LookupError("zone object is not in view to the user after " + \ - "trying 100 times") + raise LookupError("zone object is not in view to the user after trying 100 times") def verify_page_step_indicator(screen_obj, treatment_step, treatment_screens): """ @@ -83,29 +82,29 @@ step_title = squish.waitForObjectExists(get_text_object(screen_obj, treatment_screens[page])) if page < treatment_step: - test.log("To verify the step indicator of the completed treatment screen " + treatment_screens[page]) + test.log("To verify the step indicator of the completed treatment screen" + treatment_screens[page]) test.verify(squish.waitForObjectExists(get_bullet_object(screen_obj, page)).complete) test.verify(not squish.waitForObjectExists(get_bullet_object(screen_obj, page)).current) - test.compare(bullet_circle_color, config.COMPLETE_COLOR, " the bullet color must be " + str(config.COMPLETE_COLOR)) - test.compare(bullet_border_color, config.COMPLETE_COLOR," the bullet border color must be " + str(config.COMPLETE_COLOR)) - test.compare(step_title.color.name, config.ENABLED_COLOR, " the text color must be " + str(config.ENABLED_COLOR)) + test.compare(bullet_circle_color, config.COMPLETE_COLOR, "the bullet color must be" + str(config.COMPLETE_COLOR)) + test.compare(bullet_border_color, config.COMPLETE_COLOR,"the bullet border color must be" + str(config.COMPLETE_COLOR)) + test.compare(step_title.color.name, config.ENABLED_COLOR, "the text color must be" + str(config.ENABLED_COLOR)) elif page == treatment_step: - test.log("To verify the step indicators of the current treatment screen " + treatment_screens[page]) + test.log("To verify the step indicators of the current treatment screen" + treatment_screens[page]) test.verify(squish.waitForObjectExists(get_bullet_object(screen_obj, page)).current) test.verify(not squish.waitForObjectExists(get_bullet_object(screen_obj, page)).complete) - test.compare(bullet_circle_color,config.CURRENT_COLOR," the bullet color must be " + str(config.CURRENT_COLOR)) - test.compare(bullet_border_color,config.COMPLETE_COLOR, " the bullet border color must be " + str(config.COMPLETE_COLOR)) - test.compare(step_title.color.name,config.ENABLED_COLOR, " the text color must be " + str(config.ENABLED_COLOR)) - test.verify(step_title.font.bold, " the current text must be in bold") + test.compare(bullet_circle_color,config.CURRENT_COLOR,"the bullet color must be" + str(config.CURRENT_COLOR)) + test.compare(bullet_border_color,config.COMPLETE_COLOR, "the bullet border color must be" + str(config.COMPLETE_COLOR)) + test.compare(step_title.color.name,config.ENABLED_COLOR, "the text color must be" + str(config.ENABLED_COLOR)) + test.verify(step_title.font.bold, "the current text must be in bold") else: test.log("To verify the step indicators of the remaining treatment screen " + treatment_screens[page]) test.verify(not squish.waitForObjectExists(get_bullet_object(screen_obj, page)).current,) test.verify(not squish.waitForObjectExists(get_bullet_object(screen_obj, page)).complete,) - test.compare(step_title.color.name,config.INCOMPLETE_COLOR, " the text color must be " + str(config.INCOMPLETE_COLOR)) - test.compare(bullet_circle_color,config.CURRENT_COLOR," the bullet color must be " + str(config.CURRENT_COLOR)) - test.compare(bullet_border_color,config.INCOMPLETE_COLOR, " the bullet border color must be " + str(config.INCOMPLETE_COLOR)) + test.compare(step_title.color.name,config.INCOMPLETE_COLOR, "the text color must be" + str(config.INCOMPLETE_COLOR)) + test.compare(bullet_circle_color,config.CURRENT_COLOR,"the bullet color must be" + str(config.CURRENT_COLOR)) + test.compare(bullet_border_color,config.INCOMPLETE_COLOR, "the bullet border color must be" + str(config.INCOMPLETE_COLOR)) test.endSection() def get_text_object(screen_obj, txt):