Index: shared/scripts/configuration/utility.py =================================================================== diff -u -r0fdeffb58000cb41173dbe68e18d2cffc9f708fa -r43912429fcbd404b5a7820deb13fb69dfd61cb62 --- shared/scripts/configuration/utility.py (.../utility.py) (revision 0fdeffb58000cb41173dbe68e18d2cffc9f708fa) +++ shared/scripts/configuration/utility.py (.../utility.py) (revision 43912429fcbd404b5a7820deb13fb69dfd61cb62) @@ -14,23 +14,15 @@ # ############################################################################ -import object -import names -import sys import squish import test from squish import * from builtins import int as pyInt from configuration import config -from dialin.ui.hd_simulator import HDSimulator -#from builtins import str as pyStr -#from builtins import float as pyFloat -hd = HDSimulator() - def color_verification(exp_val = "Red", act_val = "#c53b33"): """ Function to verify item color verification Index: shared/scripts/names.py =================================================================== diff -u -r2fd7c2532e3576a9864955d0e286ada9e35cdd55 -r43912429fcbd404b5a7820deb13fb69dfd61cb62 --- shared/scripts/names.py (.../names.py) (revision 2fd7c2532e3576a9864955d0e286ada9e35cdd55) +++ shared/scripts/names.py (.../names.py) (revision 43912429fcbd404b5a7820deb13fb69dfd61cb62) @@ -24,13 +24,12 @@ conform_c={"container": o_Gui_MainView, "gradient": 0, "objectName": "_confirmButton", "type": "TouchRect", "visible": False} o_confirmButton_TouchRect = {"container": o_Gui_MainView, "gradient": 0, "objectName": "_confirmButton", "type": "TouchRect", "visible": False} o_backButton_BackButton = {"container": o_Gui_MainView, "gradient": 0, "objectName": "_backButton", "type": "BackButton", "visible": False} -o_NinePatchImage = {"container": o_Gui_MainView, "occurrence": 6, "type": "NinePatchImage", "unnamed": 1, "visible": False} +o_NinePatchImage = {"container": o_Gui_MainView, "type": "NinePatchImage", "unnamed": 1, "visible": False} o_PreTreatmentBase_backgroundRect_Rectangle = {"container": o_PreTreatmentCreateStack_PreTreatmentBase_TreatmentFlowBase, "gradient": 0, "id": "_backgroundRect", "type": "Rectangle", "unnamed": 1, "visible": True} keyBackground_Rectangle = {"container": o_Gui_MainView, "gradient": 0, "id": "keyBackground", "type": "Rectangle", "unnamed": 1, "visible": True} t_Text = {"container": o_Gui_MainView, "text": "t", "type": "Text", "unnamed": 1, "visible": True} o_PreTreatmentBase_confirmButton_TouchRect = {"container": o_PreTreatmentCreateStack_PreTreatmentBase_TreatmentFlowBase, "gradient": 0, "objectName": "_confirmButton", "type": "TouchRect", "visible": True} - #standbymode patient_id = {"container": o_PreTreatmentCreateStack_PreTreatmentBase_TreatmentFlowBase, "echoMode": 0, "id": "_input", "type": "TextInput", "unnamed": 1, "visible": True} o_MainHome_MainHome = {"container": o_Gui_MainView, "objectName": "_MainHome", "type": "MainHome", "visible": True} Index: tst_post/test.py =================================================================== diff -u -rc399bf92be552a4377bbec7533af272a91f3e32b -r43912429fcbd404b5a7820deb13fb69dfd61cb62 --- tst_post/test.py (.../test.py) (revision c399bf92be552a4377bbec7533af272a91f3e32b) +++ tst_post/test.py (.../test.py) (revision 43912429fcbd404b5a7820deb13fb69dfd61cb62) @@ -20,7 +20,6 @@ hd_simulator = HDSimulator() dg_simulator = DGSimulator() - MSGS_AND_CONDITIONS = { 9: [True, False], 5: [True, False], 2: [True, False], 4: [True, False], 8: [True, False], 1: [False, False], 3: [True, False], 13: [True, False], 15: [True, False], @@ -69,9 +68,11 @@ """ progress_bar = object.parent(waitForObjectExists(names.o_progress_bar)) progress_bar_children = object.children(progress_bar) - progress_bar_val_parent = progress_bar_children[3] + PROGRESS_BAR_VAL_PARENT_INDEX = 3 + progress_bar_val_parent = progress_bar_children[PROGRESS_BAR_VAL_PARENT_INDEX] progress_bar_val_parents_children = object.children(progress_bar_val_parent) - progress_bar_val = progress_bar_val_parents_children[1] + PROGRESS_VALUE = 1 + progress_bar_val = progress_bar_val_parents_children[PROGRESS_VALUE] return progress_bar_val.text.toUtf8().constData() def verify_final_message_posted(final_msg=None, final_msg_posted=None) -> None: