Index: shared/scripts/configuration/utility.py =================================================================== diff -u -r28eaad74b094db5832e72f1d66f19e534045393f -rb30019a57e3711d3e3eb859fcf160cb4d9f6905d --- shared/scripts/configuration/utility.py (.../utility.py) (revision 28eaad74b094db5832e72f1d66f19e534045393f) +++ shared/scripts/configuration/utility.py (.../utility.py) (revision b30019a57e3711d3e3eb859fcf160cb4d9f6905d) @@ -19,6 +19,7 @@ from configuration import config from builtins import int as pyInt from dialin.ui.hd_simulator import HDSimulator +from dialin.ui.utils import waitForGUI hd_simulator = HDSimulator() @@ -91,7 +92,6 @@ 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 : indicates the Current pre-treatment step """ - test.startSection("verification of page step indicators") for page in range(len(config.PRE_TREATMENT_SCREENS)): bullet_children = object.children(squish.waitForObjectExists(get_bullet_object(screen_obj, page))) Index: shared/scripts/names.py =================================================================== diff -u -r28eaad74b094db5832e72f1d66f19e534045393f -rb30019a57e3711d3e3eb859fcf160cb4d9f6905d --- shared/scripts/names.py (.../names.py) (revision 28eaad74b094db5832e72f1d66f19e534045393f) +++ shared/scripts/names.py (.../names.py) (revision b30019a57e3711d3e3eb859fcf160cb4d9f6905d) @@ -50,23 +50,24 @@ # Pre treatment Consumables o_PreTreatmentStack_PreTreatmentStack = {"container": o_Gui_MainView, "objectName": "_PreTreatmentStack", "type": "PreTreatmentStack", "visible": True} -o_PreTreatmentStack_PreTreatmentConsumblesStack_PreTreatmentConsumablesStack = {"container": o_PreTreatmentStack_PreTreatmentStack, "objectName": "_PreTreatmentConsumblesStack", "type": "PreTreatmentConsumablesStack", "visible": True} -o_PreTreatmentConsumblesStack_PreTreatmentBase_TreatmentFlowBase = {"container": o_PreTreatmentStack_PreTreatmentConsumblesStack_PreTreatmentConsumablesStack, "objectName": "_PreTreatmentBase", "type": "TreatmentFlowBase", "visible": True} +o_PreTreatmentStack_preTreatmentConsumablesStack_PreTreatmentConsumablesStack = {"container": o_PreTreatmentStack_PreTreatmentStack, "objectName": "_preTreatmentConsumablesStack", "type": "PreTreatmentConsumablesStack", "visible": True} +o_preTreatmentConsumablesStack_PreTreatmentBase_TreatmentFlowBase = {"container": o_PreTreatmentStack_preTreatmentConsumablesStack_PreTreatmentConsumablesStack, "objectName": "_PreTreatmentBase", "type": "TreatmentFlowBase", "visible": True} -o_confirm_button_disabled={"container": o_PreTreatmentConsumblesStack_PreTreatmentBase_TreatmentFlowBase, "gradient": 0, "objectName": "_confirmButton", "type": "TouchRect", "visible": True} +o_confirm_button_disabled={"container": o_PreTreatmentStack_preTreatmentConsumablesStack_PreTreatmentConsumablesStack, "gradient": 0, "objectName": "_confirmButton", "type": "TouchRect", "visible": True} -o_msg_installation={"container": o_PreTreatmentConsumblesStack_PreTreatmentBase_TreatmentFlowBase, "text": "Consumables Installation", "type": "Text", "unnamed": 1, "visible": True} -o_PreTreatmentBase_rightImage_Image={"container": o_PreTreatmentConsumblesStack_PreTreatmentBase_TreatmentFlowBase, "id": "_rightImage", "source": "qrc:/images/iArrowRight", "type": "Image", "unnamed": 1, "visible": True} -o_confirm_button_enabled={"container": o_PreTreatmentConsumblesStack_PreTreatmentBase_TreatmentFlowBase, "text": "CONFIRM", "type": "Text", "unnamed": 1, "visible": True} -o_PreTreatmentBase_leftImage_Image = {"container": o_PreTreatmentConsumblesStack_PreTreatmentBase_TreatmentFlowBase, "id": "_leftImage", "source": "qrc:/images/iArrowLeft", "type": "Image", "unnamed": 1, "visible": True} +o_msg_installation={"container": o_PreTreatmentStack_preTreatmentConsumablesStack_PreTreatmentConsumablesStack, "text": "Consumables Installation", "type": "Text", "unnamed": 1, "visible": True} +o_PreTreatmentBase_rightImage_Image={"container": o_PreTreatmentStack_preTreatmentConsumablesStack_PreTreatmentConsumablesStack, "id": "_rightImage", "source": "qrc:/images/iArrowRight", "type": "Image", "unnamed": 1, "visible": True} +o_confirm_button_enabled={"container": o_PreTreatmentStack_preTreatmentConsumablesStack_PreTreatmentConsumablesStack, "text": "CONFIRM", "type": "Text", "unnamed": 1, "visible": True} +o_PreTreatmentBase_leftImage_Image = {"container": o_PreTreatmentStack_preTreatmentConsumablesStack_PreTreatmentConsumablesStack, "id": "_leftImage", "source": "qrc:/images/iArrowLeft", "type": "Image", "unnamed": 1, "visible": True} -o_PreTreatmentBase_Consumables_Self_Test_Text = {"container": o_PreTreatmentConsumblesStack_PreTreatmentBase_TreatmentFlowBase, "text": "Consumables Self Test", "type": "Text", "unnamed": 1, "visible": True} -o_PreTreatmentBase_BiCarb_Pump_Check_Text = {"container": o_PreTreatmentConsumblesStack_PreTreatmentBase_TreatmentFlowBase, "text": "BiCarb Pump Check", "type": "Text", "unnamed": 1, "visible": True} -o_PreTreatmentBase_Acid_Pump_Check_Text = {"container": o_PreTreatmentConsumblesStack_PreTreatmentBase_TreatmentFlowBase, "text": "Acid Pump Check", "type": "Text", "unnamed": 1, "visible": True} -o_PreTreatmentBase_Self_Test_Complete_Text = {"container": o_PreTreatmentConsumblesStack_PreTreatmentBase_TreatmentFlowBase, "text": "Self Test Complete!", "type": "Text", "unnamed": 1, "visible": True} +o_PreTreatmentBase_Consumables_Self_Test_Text = {"container": o_PreTreatmentStack_preTreatmentConsumablesStack_PreTreatmentConsumablesStack, "text": "Consumables Self Test", "type": "Text", "unnamed": 1, "visible": True} +o_PreTreatmentBase_BiCarb_Pump_Check_Text = {"container": o_PreTreatmentStack_preTreatmentConsumablesStack_PreTreatmentConsumablesStack, "text": "BiCarb Pump Check", "type": "Text", "unnamed": 1, "visible": True} +o_PreTreatmentBase_Acid_Pump_Check_Text = {"container": o_PreTreatmentStack_preTreatmentConsumablesStack_PreTreatmentConsumablesStack, "text": "Acid Pump Check", "type": "Text", "unnamed": 1, "visible": True} +o_PreTreatmentBase_Self_Test_Complete_Text = {"container": o_PreTreatmentStack_preTreatmentConsumablesStack_PreTreatmentConsumablesStack, "text": "Self Test Complete!", "type": "Text", "unnamed": 1, "visible": True} -o_separatorLine_text={"container": o_PreTreatmentConsumblesStack_PreTreatmentBase_TreatmentFlowBase, "gradient": 0, "id": "_separatorLine", "type": "Line", "unnamed": 1, "visible": True} +o_separatorLine_text={"container": o_PreTreatmentStack_preTreatmentConsumablesStack_PreTreatmentConsumablesStack, "gradient": 0, "id": "_separatorLine", "type": "Line", "unnamed": 1, "visible": True} o_text_object = {"type": "Text", "unnamed": 1, "visible": True} o_bullet_object = {"type": "StepBullet", "unnamed": 1, "visible": True} +o_PreTreatmentStack_preTreatmentConsumablesStack_PreTreatmentConsumablesStack = {"container": o_PreTreatmentStack_PreTreatmentStack, "objectName": "_preTreatmentConsumablesStack", "type": "PreTreatmentConsumablesStack", "visible": True} Index: tst_pre_treatment_consumables/test.py =================================================================== diff -u -r28eaad74b094db5832e72f1d66f19e534045393f -rb30019a57e3711d3e3eb859fcf160cb4d9f6905d --- tst_pre_treatment_consumables/test.py (.../test.py) (revision 28eaad74b094db5832e72f1d66f19e534045393f) +++ tst_pre_treatment_consumables/test.py (.../test.py) (revision b30019a57e3711d3e3eb859fcf160cb4d9f6905d) @@ -9,9 +9,11 @@ hd_simulator = HDSimulator() PRE_TREATMENT_STEP= 2 num_of_instructions = 0 -SCREEN_OBJ= names.o_PreTreatmentConsumblesStack_PreTreatmentBase_TreatmentFlowBase +SCREEN_OBJ= names.o_PreTreatmentStack_preTreatmentConsumablesStack_PreTreatmentConsumablesStack + + def verification_of_right_instruction_navigation(): """ The method is used to verify the functionality of the right arrow in the instruction navigation, as well as the visibility of the two arrows @@ -105,7 +107,6 @@ bicarb_indicator=utility.get_indicators(SCREEN_OBJ,config.BICARB_PUMP_CHECK_TEXT) acid_indicator=utility.get_indicators(SCREEN_OBJ,config.ACID_PUMP_CHECK_TEXT) test.verify(waitForObject(bicarb_indicator[0]).visible,"The Busy indicator for BiCarb Pump must be visible") - #test.compare(bicarb_indicator[1].visible, False, " check indicator for bicarb pump must not be present") test.verify(not acid_indicator[0].visible," busy indicator for acid pump must not be present") test.verify(not acid_indicator[1].visible," check indicator for acid pump must not be present") @@ -174,20 +175,3 @@ - - - - - - - - - - - - - - - - -