Index: shared/scripts/configuration/utility.py =================================================================== diff -u -r025314f84b7e369d579a9e9a689ad065f6772414 -r32f040a40579b75d7b163840634bfb3461a13de3 --- shared/scripts/configuration/utility.py (.../utility.py) (revision 025314f84b7e369d579a9e9a689ad065f6772414) +++ shared/scripts/configuration/utility.py (.../utility.py) (revision 32f040a40579b75d7b163840634bfb3461a13de3) @@ -513,33 +513,34 @@ test.endSection() -def verify_page_step_indicator(screen_obj, pre_treatment_step): +def verify_page_step_indicator(screen_obj, treatment_step, treatment_screens): """ Method to verify the Page Step indicators [the object on top of the screen which indicates the steps passed, current, remained] - @param pre_treatment_step : (int) indicates the Current pre-treatment step - """ + @param treatment_step : (int) indicates the Current treatment step + """ + test.startSection("verification of page step indicators") - for page in range(len(config.PRE_TREATMENT_SCREENS)): + for page in range(len(treatment_screens)): 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, config.PRE_TREATMENT_SCREENS[page])) - #To verify the step indicators of the completed pre treatment screens - if page < pre_treatment_step: + step_title = squish.waitForObjectExists(get_text_object(screen_obj, treatment_screens[page])) + #To verify the step indicators of the completed treatment screens + if page < treatment_step: 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) - test.compare(bullet_border_color, config.COMPLETE_COLOR) - test.compare(step_title.color.name, config.ENABLED_COLOR) - #To verify the step indicators of the current pre treatment screen - elif page == pre_treatment_step: + test.compare(bullet_border_color,config.COMPLETE_COLOR) + test.compare(step_title.color.name,config.ENABLED_COLOR) + #To verify the step indicators of the current treatment screen + elif page == treatment_step: 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) test.compare(bullet_border_color, config.COMPLETE_COLOR) test.compare(step_title.color.name, config.ENABLED_COLOR) test.verify(step_title.font.bold) - #To verify the step indicators of the remaining pre-treatment screens + #To verify the step indicators of the remaining treatment screens else: test.verify(not squish.waitForObjectExists(get_bullet_object(screen_obj, page)).current,) test.verify(not squish.waitForObjectExists(get_bullet_object(screen_obj, page)).complete,)