Index: shared/scripts/configuration/utility.py =================================================================== diff -u -r8599e463aedf05d6a36824ca4eba62d914a5db5c -rf8060c14b5c90ebd48576d210e9b1803f5fa807a --- shared/scripts/configuration/utility.py (.../utility.py) (revision 8599e463aedf05d6a36824ca4eba62d914a5db5c) +++ shared/scripts/configuration/utility.py (.../utility.py) (revision f8060c14b5c90ebd48576d210e9b1803f5fa807a) @@ -16,7 +16,7 @@ import names import test import squish -from configuration import config, strings +from configuration import config from builtins import int as pyInt def check_if_object_is_within_the_container(obj=None, container=None): @@ -80,32 +80,32 @@ bullet_children = object.children(squish.waitForObjectExists(get_bullet_object(screen_obj, page))) bullet_circle_color = bullet_children[0].color.name bullet_border_color = bullet_children[0].border.color.name - step_title = squish.waitForObjectExists(get_text_object(screen_obj, strings.PRE_TREATMENT_SCREENS[page])) + step_title = squish.waitForObjectExists(get_text_object(screen_obj, config.PRE_TREATMENT_SCREENS[page])) if page < pre_treatment_step: - test.log("To verify the step indicator of the completed pre-treatment screen " + strings.PRE_TREATMENT_SCREENS[page]) + test.log("To verify the step indicator of the completed pre-treatment screen " + config.PRE_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, strings.COMPLETE_COLOR, " the bullet color must be " + str(strings.COMPLETE_COLOR)) - test.compare(bullet_border_color, strings.COMPLETE_COLOR," the bullet border color must be " + str(strings.COMPLETE_COLOR)) - test.compare(step_title.color.name, strings.ENABLED_COLOR, " the text color must be " + str(strings.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 == pre_treatment_step: - test.log("To verify the step indicators of the current pre-treatment screen " + strings.PRE_TREATMENT_SCREENS[page]) + test.log("To verify the step indicators of the current pre-treatment screen " + config.PRE_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,strings.CURRENT_COLOR," the bullet color must be " + str(strings.CURRENT_COLOR)) - test.compare(bullet_border_color,strings.COMPLETE_COLOR, " the bullet border color must be " + str(strings.COMPLETE_COLOR)) - test.compare(step_title.color.name,strings.ENABLED_COLOR, " the text color must be " + str(strings.ENABLED_COLOR)) + 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 pre-treatment screen " + strings.PRE_TREATMENT_SCREENS[page]) + test.log("To verify the step indicators of the remaining pre-treatment screen " + config.PRE_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,strings.INCOMPLETE_COLOR, " the text color must be " + str(strings.INCOMPLETE_COLOR)) - test.compare(bullet_circle_color,strings.CURRENT_COLOR," the bullet color must be " + str(strings.CURRENT_COLOR)) - test.compare(bullet_border_color,strings.INCOMPLETE_COLOR, " the bullet border color must be " + str(strings.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):