Index: shared/scripts/configuration/config.py =================================================================== diff -u -r454470a94a58be24a6fcec1263ee4af64f51a2d5 -r6c88a2beef01f7961d99b85bdf227c2d4ab79228 --- shared/scripts/configuration/config.py (.../config.py) (revision 454470a94a58be24a6fcec1263ee4af64f51a2d5) +++ shared/scripts/configuration/config.py (.../config.py) (revision 6c88a2beef01f7961d99b85bdf227c2d4ab79228) @@ -20,12 +20,22 @@ COMMON_PATH = os.environ['HOME']+"/Projects" +COLOR_CODES = {"Aqua": "#81ffff", "Blue": "#017dea", "Blue 2": "#1090d5", "Green": "#29fd2d", "Grey": "#d3d3d3", + "Lavender": "#db98f5", "Light Blue": "#acd7f1", "Light Teal": "#29f1da","Lime": "#b7fc36", + "Magenta":"#fd28fd", "Orange": "#f2721c", "Peach":"#f1979a", "Red": "#c53b33", "Rose":"#fc178d", + "Slate blue":"#7f7ffa", "Violet": "#6435c9", "White": "#ffffff", "Yellow": "#fcfc4d"} + +#standby mode +GOODMORNING_START_TIME_SEC = 0 +GOODEVENING_START_TIME_SEC = 43200 + +BLOOD_PRIMING_TEXT = "Blood Priming" +SALINE_UNIT = "mL" +BLOOD_PRIMING_DEFAULT_VALUE = "0 mL" + +#Recirculate state CURRENT_COLOR = '#000000' COMPLETE_COLOR= '#4290ec' ENABLED_COLOR = '#fcfcfc' INCOMPLETE_COLOR = '#607a91' - -RECIRCULATE_TEXT = "Recirculate" -RECONNECT_BUTTON_TEXT = "RECONNECT" -RECONNECT_TEXT = "Reconnect" NUM_OF_REQUEST_REJECT_REASONS = 43 Index: shared/scripts/configuration/strings.py =================================================================== diff -u -ra49e29aede763022e99a44f48857e20351ff127b -r6c88a2beef01f7961d99b85bdf227c2d4ab79228 --- shared/scripts/configuration/strings.py (.../strings.py) (revision a49e29aede763022e99a44f48857e20351ff127b) +++ shared/scripts/configuration/strings.py (.../strings.py) (revision 6c88a2beef01f7961d99b85bdf227c2d4ab79228) @@ -16,6 +16,7 @@ RECIRCULATE_TEXT = "Recirculate" RECONNECT_BUTTON_TEXT = "RECONNECT" RECONNECT_TEXT = "Reconnect" + # dictionary of rejection reason from application source code. # message location -> denali-> Headers-> common-> MsgDefs.h REJECTION_REASON = { Index: shared/scripts/configuration/utility.py =================================================================== diff -u -r454470a94a58be24a6fcec1263ee4af64f51a2d5 -r6c88a2beef01f7961d99b85bdf227c2d4ab79228 --- shared/scripts/configuration/utility.py (.../utility.py) (revision 454470a94a58be24a6fcec1263ee4af64f51a2d5) +++ shared/scripts/configuration/utility.py (.../utility.py) (revision 6c88a2beef01f7961d99b85bdf227c2d4ab79228) @@ -14,17 +14,12 @@ import object import names -import sys import squish -import time import test - -from builtins import str as pyStr -from builtins import int as pyInt +import time from configuration import config from dialin.ui import utils from datetime import datetime -from dialin.ui import utils def verify_bullet_navigation(num, num_of_instructions, screen_obj): Index: shared/scripts/names.py =================================================================== diff -u -rc4796ed14e7e7bbf8c17976d6da7c6a95518ddc8 -r6c88a2beef01f7961d99b85bdf227c2d4ab79228 --- shared/scripts/names.py (.../names.py) (revision c4796ed14e7e7bbf8c17976d6da7c6a95518ddc8) +++ shared/scripts/names.py (.../names.py) (revision 6c88a2beef01f7961d99b85bdf227c2d4ab79228) @@ -1,26 +1,14 @@ # encoding: UTF-8 -# Top Parents -o_QQuickView = { "type": "QQuickView"} -o_Overlay = {"container": o_QQuickView, "type": "Overlay"} -o_Gui_MainView = { "type": "Gui::MainView" } +from objectmaphelper import * - -# Modal Dialog -o_modalDialog = {"container": o_Overlay , "id": "_backgroundRect", "type": "Rectangle", "unnamed": 1, "visible": True} -o_treatmentHome = {"container": o_QQuickView , "id": "_treatmentHome" , "type": "TreatmentHome", "unnamed": 1, "visible": True} -o_treatmentHome_backgroung = {"container": o_treatmentHome, "id": "_backgroundRect" , "type": "Rectangle" , "unnamed": 1, "visible": True} -o_treatmentHome_startTreatment = {"container": o_treatmentHome, "id": "_startTreatmentRect" , "type": "TouchRect" , "unnamed": 1, "visible": True} -o_treatmentHome_createTreatment = {"container": o_treatmentHome, "id": "_createTreatmentRect", "type": "TouchRect" , "unnamed": 1, "visible": True} - o_Gui_MainView = {"type": "Gui::MainView", "unnamed": 1, "visible": True} o_Overlay = {"container": o_Gui_MainView, "type": "Overlay", "unnamed": 1, "visible": True} o_borderRect_Rectangle = {"container": o_Overlay, "gradient": 0, "id": "_borderRect", "type": "Rectangle", "unnamed": 1, "visible": True} o_minimizeButton_UpDownButton = {"container": o_Overlay, "gradient": 0, "id": "_minimizeButton", "type": "UpDownButton", "unnamed": 1, "visible": True} o_shape_Shape = {"container": o_Gui_MainView, "id": "_shape", "type": "Shape", "unnamed": 1, "visible": True} o_PreTreatmentCreateStack_PreTreatmentCreateStack = {"container": o_Gui_MainView, "objectName": "_PreTreatmentCreateStack", "type": "PreTreatmentCreateStack", "visible": True} -o_PreTreatmentCreateStack_PreTreatmentCreate_PreTreatmentCreate = {"container": o_PreTreatmentCreateStack_PreTreatmentCreateStack, "objectName": "_PreTreatmentCreate", "type": "PreTreatmentCreate", "visible": True} o_PreTreatmentCreateStack_PreTreatmentBase_TreatmentFlowBase = {"container": o_PreTreatmentCreateStack_PreTreatmentCreateStack, "objectName": "_PreTreatmentBase", "type": "TreatmentFlowBase", "visible": True} o_PreTreatmentBase_titleBar_StepNavigationTitleBar = {"container": o_PreTreatmentCreateStack_PreTreatmentBase_TreatmentFlowBase, "gradient": 0, "id": "_titleBar", "type": "StepNavigationTitleBar", "unnamed": 1, "visible": True} o_titleBar_Rectangle = {"container": o_Overlay, "gradient": 0, "id": "_titleBar", "type": "Rectangle", "unnamed": 1, "visible": True} @@ -29,47 +17,58 @@ o_PreTreatmentBase_input_TextInput = {"container": o_PreTreatmentCreateStack_PreTreatmentBase_TreatmentFlowBase, "echoMode": 0, "id": "_input", "type": "TextInput", "unnamed": 1, "visible": True} o_PreTreatmentBase_CONFIRM_Text = {"container": o_PreTreatmentCreateStack_PreTreatmentBase_TreatmentFlowBase, "text": "CONFIRM", "type": "Text", "unnamed": 1, "visible": True} o_PreTreatmentCreateStack_PreTreatmentCreate_PreTreatmentCreate = {"container": o_PreTreatmentCreateStack_PreTreatmentCreateStack, "objectName": "_PreTreatmentCreate", "type": "PreTreatmentCreate", "visible": True} -o_PreTreatmentCreate_bloodFlowRate_SliderCreateTreatment = {"container": o_PreTreatmentCreateStack_PreTreatmentCreate_PreTreatmentCreate, "objectName": "_bloodFlowRate", "type": "SliderCreateTreatment", "visible": True} -o_PreTreatmentCreate_bloodFlowRateSlider_Slider = {"container": o_PreTreatmentCreateStack_PreTreatmentCreate_PreTreatmentCreate, "objectName": "_bloodFlowRateSlider", "type": "Slider", "visible": True} -o_PreTreatmentCreate_dialysateFlowRate_SliderCreateTreatment = {"container": o_PreTreatmentCreateStack_PreTreatmentCreate_PreTreatmentCreate, "objectName": "_dialysateFlowRate", "type": "SliderCreateTreatment", "visible": True} +o_PreTreatmentCreate_bloodFlowRate_SliderCreateTreatment = {"container": o_PreTreatmentCreateStack_PreTreatmentCreate_PreTreatmentCreate, "gradient": 0, "objectName": "_bloodFlowRate", "type": "SliderCreateTreatment", "visible": True} +o_PreTreatmentCreate_bloodFlowRateSlider_Slider = {"container": o_PreTreatmentCreateStack_PreTreatmentCreate_PreTreatmentCreate, "gradient": 0, "objectName": "_bloodFlowRateSlider", "type": "Slider", "visible": True} +o_PreTreatmentCreate_dialysateFlowRate_SliderCreateTreatment = {"container": o_PreTreatmentCreateStack_PreTreatmentCreate_PreTreatmentCreate, "gradient": 0, "objectName": "_dialysateFlowRate", "type": "SliderCreateTreatment", "visible": True} o_PreTreatementCreateStack_PreTreatmentBase_TreatmentFlowBase = {"container":o_PreTreatmentCreateStack_PreTreatmentBase_TreatmentFlowBase,"objectName":"_PreTreatmentBase","type":"TreatmentFlowBase", "visible": True} o_treatmentStack_treatmentHome_TreatmentHome = {"container": o_treatmentStack_TreatmentStack, "id": "_treatmentHome", "type": "TreatmentHome", "unnamed": 1, "visible": True} - 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_confirmButton_TouchRect = {"container": o_Gui_MainView, "objectName": "_confirmButton", "type": "TouchRect", "visible": False} -o_backButton_BackButton = {"container": o_Gui_MainView, "objectName": "_backButton", "type": "BackButton", "visible": False} o_NinePatchImage = {"container": o_Gui_MainView, "occurrence": 6, "type": "NinePatchImage", "unnamed": 1, "visible": False} -o_PreTreatmentBase_backgroundRect_Rectangle = {"container": o_PreTreatmentCreateStack_PreTreatmentBase_TreatmentFlowBase, "id": "_backgroundRect", "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, "objectName": "_confirmButton", "type": "TouchRect", "visible": True} +o_PreTreatmentBase_backgroundRect_Rectangle = {"container": o_PreTreatmentCreateStack_PreTreatmentBase_TreatmentFlowBase, "gradient": 0, "id": "_backgroundRect", "type": "Rectangle", "unnamed": 1, "visible": True} +o_PreTreatmentBase_confirmButton_TouchRect = {"container": o_PreTreatmentCreateStack_PreTreatmentBase_TreatmentFlowBase, "gradient": 0, "objectName": "_confirmButton", "type": "TouchRect", "visible": True} + #standbymode o_MainHome_MainHome = {"container": o_Gui_MainView, "objectName": "_MainHome", "type": "MainHome", "visible": True} o_standby_page = {"container": o_MainHome_MainHome, "type": "Column", "unnamed": 1, "visible": True} - + + #in-treatment o_blood_priming = {"container": o_treatmentStack_TreatmentBloodPrime_ScreenItem, "text": "Blood Priming", "type": "Text", "unnamed": 1, "visible": True} o_blood_priming_value_by_default = {"container": o_treatmentStack_TreatmentBloodPrime_ScreenItem, "text": "0 mL", "type": "Text", "unnamed": 1, "visible": True} +o_uf_minimum_value = {"container": o_treatmentStack_treatmentHome_TreatmentHome, "text": "0.000", "type": "Text", "unnamed": 1, "visible": True} +o_uf_maximum_value = {"container": o_treatmentStack_treatmentHome_TreatmentHome, "text": "0.600", "type": "Text", "unnamed": 1, "visible": True} +o_uf_minimum_value_pop_up = {"container": o_Overlay, "text": "0.000", "type": "Text", "unnamed": 1, "visible": True} +o_uf_maximum_value_pop_up = {"container": o_Overlay, "text": "0.600", "type": "Text", "unnamed": 1, "visible": True} o_edit_uf_value = {"container": o_Overlay, "text": "EDIT ULTRAFILTRATION VOLUME", "type": "Text", "unnamed": 1, "visible": True} o_uf_back_button = {"container": o_Overlay, "text": "BACK", "type": "Text", "unnamed": 1, "visible": True} o_uf_close_button = {"container": o_Overlay, "id": "_image", "source": "qrc:/images/iClose", "type": "Image", "unnamed": 1, "visible": True} +o_fluid_text = {"container": o_treatmentStack_treatmentHome_TreatmentHome, "text": "Volume Delivered", "type": "Text", "unnamed": 1, "visible": True} o_cumulative_fluid_text = {"container": o_treatmentStack_treatmentHome_TreatmentHome, "text": "Cumulative Delivered", "type": "Text", "unnamed": 1, "visible": True} -#Recirculate + +#Recirculate State o_text_object = {"type": "Text", "unnamed": 1, "visible": True} o_bullet_object = {"type": "StepBullet", "unnamed": 1, "visible": True} +#Containers for recirculate state o_EndTreatmentRecirculateStack_EndTreatmentRecirculateStack = {"container": o_Gui_MainView, "objectName": "_EndTreatmentRecirculateStack", "type": "EndTreatmentRecirculateStack", "visible": True} o_EndTreatmentRecirculateStack_EndTreatmentBase_EndTreatmentBase = {"container": o_EndTreatmentRecirculateStack_EndTreatmentRecirculateStack, "objectName": "_EndTreatmentBase", "type": "EndTreatmentBase", "visible": True} -o_recirculate_text = {"container": o_EndTreatmentRecirculateStack_EndTreatmentBase_EndTreatmentBase, "text": "Recirculate", "type": "Text", "unnamed": 1, "visible": True} o_EndTreatmentEndStack_EndTreatmentEndStack = {"container": o_Gui_MainView, "objectName": "_EndTreatmentEndStack", "type": "EndTreatmentEndStack", "visible": True} o_EndTreatmentEndStack_EndTreatmentBase_EndTreatmentBase = {"container": o_EndTreatmentEndStack_EndTreatmentEndStack, "objectName": "_EndTreatmentBase", "type": "EndTreatmentBase", "visible": True} -o_reconnect_button = {"container": o_EndTreatmentRecirculateStack_EndTreatmentBase_EndTreatmentBase, "gradient": 0, "type": "TouchRect", "unnamed": 1, "visible": True} +#Recirculate title text +o_recirculate_text = {"container": o_EndTreatmentRecirculateStack_EndTreatmentBase_EndTreatmentBase, "text": "Recirculate", "type": "Text", "unnamed": 1, "visible": True} +#Recirculate Right arrow image button o_EndTreatmentBase_rightImage_Image = {"container": o_EndTreatmentRecirculateStack_EndTreatmentBase_EndTreatmentBase, "id": "_rightImage", "source": "qrc:/images/iArrowRight", "type": "Image", "unnamed": 1, "visible": True} +#Recirculate Left arrow image button o_EndTreatmentBase_leftImage_Image = {"container": o_EndTreatmentRecirculateStack_EndTreatmentBase_EndTreatmentBase, "id": "_leftImage", "source": "qrc:/images/iArrowLeft", "type": "Image", "unnamed": 1, "visible": True} -o_EndTreatmentBase_TouchRect = {"container": o_EndTreatmentEndStack_EndTreatmentBase_EndTreatmentBase,"gradient": 0, "objectName": "_rinsebackButton", "type": "TouchRect", "unnamed": 1, "visible": True} +#Reconnect text o_EndTreatmentBase_RECONNECT_Text = {"container": o_EndTreatmentRecirculateStack_EndTreatmentBase_EndTreatmentBase, "text": "RECONNECT", "type": "Text", "unnamed": 1, "visible": True} +#Reconnect button text o_EndTreatmentBase_Reconnect_Text = {"container": o_EndTreatmentRecirculateStack_EndTreatmentBase_EndTreatmentBase, "text": "Reconnect", "type": "Text", "unnamed": 1, "visible": True} +#Recirculate timer seconds object o_EndTreatmentBase_TimeText_minute_Text = {"container": o_EndTreatmentRecirculateStack_EndTreatmentBase_EndTreatmentBase, "objectName": "_TimeText_minute", "type": "Text", "visible": True} +#Recirculate timer minutes object o_EndTreatmentBase_TimeText_hour_Text = {"container": o_EndTreatmentRecirculateStack_EndTreatmentBase_EndTreatmentBase, "objectName": "_TimeText_hour", "type": "Text", "visible": True} +#Recirculate rejection messages o_recirculate_rejection_msg = {"container": o_EndTreatmentRecirculateStack_EndTreatmentRecirculateStack, "type": "Text", "unnamed": 1, "visible": True} Index: tst_recirculate/test.py =================================================================== diff -u -ra49e29aede763022e99a44f48857e20351ff127b -r6c88a2beef01f7961d99b85bdf227c2d4ab79228 --- tst_recirculate/test.py (.../test.py) (revision a49e29aede763022e99a44f48857e20351ff127b) +++ tst_recirculate/test.py (.../test.py) (revision 6c88a2beef01f7961d99b85bdf227c2d4ab79228) @@ -17,19 +17,18 @@ # This test contradicts verification of post treatment section. import names -import builtins from dialin.ui import utils from dialin.ui.hd_simulator import HDSimulator from configuration import config from configuration import utility from dialin.common.hd_defs import TreatmentStates, TreatmentRinsebackStates, TreatmentRecircStates hd_simulator = HDSimulator() -SCREEN_OBJ1 = names.o_EndTreatmentRecirculateStack_EndTreatmentBase_EndTreatmentBase +SCREEN_OBJ = names.o_EndTreatmentRecirculateStack_EndTreatmentBase_EndTreatmentBase -count_down_value = 121 #change it to capitals -timer_default_value = 1 -num_of_instructions = 3 +COUNT_DOWN_VALUE = 121 +TIMER_DEFAULT_VALUE = 1 +NUM_OF_INSTRUCTION = 3 def verification_of_recirculate_recirculate_state(): """ @@ -41,21 +40,21 @@ rinseback_state= TreatmentStates.TREATMENT_START_STATE.value, recirculate_state = TreatmentRecircStates.TREATMENT_RECIRC_RECIRC_STATE.value, blood_prime_state = TreatmentStates.TREATMENT_START_STATE.value,treatment_end_state = TreatmentStates.TREATMENT_START_STATE.value, treatment_stop_state = TreatmentStates.TREATMENT_START_STATE.value, dialysis_state = TreatmentStates.TREATMENT_START_STATE.value) - test.startSection("Verifying Timer count down timer") - for num in range(timer_default_value,count_down_value): - hd_simulator.cmd_send_treatment_recirculate_data(timeout_total = num, timeout_count_down = num) + test.startSection("Verifying Timer count down timer " + config.RECIRCULATE_TEXT) + for num in range(TIMER_DEFAULT_VALUE, COUNT_DOWN_VALUE): + hd_simulator.cmd_send_treatment_recirculate_data(timeout_total=num, timeout_count_down=num) min = utility.convert_seconds_into_min_and_sec(num, time_format="%M") sec = utility.convert_seconds_into_min_and_sec(num, time_format="%S") - test.compare(str(waitForObject(names.o_EndTreatmentBase_TimeText_minute_Text).text),str(sec),"Verifying seconds appearing on UI")# log need to be changed - test.compare(str(waitForObject(names.o_EndTreatmentBase_TimeText_hour_Text).text),str(min),"Verifying minutes appearing on UI") + test.compare(str(waitForObject(names.o_EndTreatmentBase_TimeText_minute_Text).text), str(sec),"Verifying seconds on Timer in " + config.RECIRCULATE_TEXT) + test.compare(str(waitForObject(names.o_EndTreatmentBase_TimeText_hour_Text).text), str(min),"Verifying minutes on Timer in " + config.RECIRCULATE_TEXT) test.endSection() - test.compare(str(waitForObject(names.o_recirculate_text).text),config.RECIRCULATE_TEXT, "Recirculate text must be {}".format(config.RECIRCULATE_TEXT)) + test.compare(str(waitForObject(names.o_recirculate_text).text), config.RECIRCULATE_TEXT, "Recirculate text must be {}".format(config.RECIRCULATE_TEXT)) test.compare(str(waitForObjectExists(names.o_EndTreatmentBase_RECONNECT_Text).text), config.RECONNECT_BUTTON_TEXT, "Reconnect button text must be {}".format(config.RECONNECT_BUTTON_TEXT)) test.verify(waitForObjectExists(names.o_EndTreatmentBase_RECONNECT_Text).enabled, "Reconnect button must be active") mouseClick(waitForObject(names.o_EndTreatmentBase_RECONNECT_Text)) - verify_right_instruction_in_recirculate_state(num_of_instructions) - verify_left_instruction_in_recirculate_state(num_of_instructions) - verify_right_instruction_in_recirculate_state(num_of_instructions) + verify_right_instruction_in_recirculate_state(NUM_OF_INSTRUCTION) + verify_left_instruction_in_recirculate_state(NUM_OF_INSTRUCTION) + verify_right_instruction_in_recirculate_state(NUM_OF_INSTRUCTION) verify_rejection_messages_for_recirculate() test.endSection() @@ -64,34 +63,34 @@ Method to verify Treatment Recirculate stopped state screens """ test.startSection("verifying Treatment Recirculate stopped state screens") - hd_simulator.cmd_set_treatment_states_data(sub_mode = TreatmentStates.TREATMENT_RECIRC_STATE.value , uf_state = TreatmentStates.TREATMENT_START_STATE.value, - saline_state = TreatmentStates.TREATMENT_START_STATE.value, heparin_state = TreatmentStates.TREATMENT_START_STATE.value, - rinseback_state= TreatmentRinsebackStates.RINSEBACK_STOP_INIT_STATE.value, recirculate_state = TreatmentRecircStates.TREATMENT_RECIRC_STOPPED_STATE.value, - blood_prime_state = TreatmentStates.TREATMENT_START_STATE.value,treatment_end_state = TreatmentStates.TREATMENT_START_STATE.value, - treatment_stop_state = TreatmentStates.TREATMENT_START_STATE.value, dialysis_state = TreatmentStates.TREATMENT_START_STATE.value) - test.startSection("Verifying Timer count down timer") - for num in range(timer_default_value,count_down_value): - hd_simulator.cmd_send_treatment_recirculate_data(timeout_total = num, timeout_count_down = num) + hd_simulator.cmd_set_treatment_states_data(sub_mode=TreatmentStates.TREATMENT_RECIRC_STATE.value, uf_state=TreatmentStates.TREATMENT_START_STATE.value, + saline_state=TreatmentStates.TREATMENT_START_STATE.value, heparin_state=TreatmentStates.TREATMENT_START_STATE.value, + rinseback_state=TreatmentRinsebackStates.RINSEBACK_STOP_INIT_STATE.value, recirculate_state=TreatmentRecircStates.TREATMENT_RECIRC_STOPPED_STATE.value, + blood_prime_state=TreatmentStates.TREATMENT_START_STATE.value,treatment_end_state=TreatmentStates.TREATMENT_START_STATE.value, + treatment_stop_state=TreatmentStates.TREATMENT_START_STATE.value, dialysis_state=TreatmentStates.TREATMENT_START_STATE.value) + test.startSection("Verifying Timer count down timer on Recirculate Stopped state") + for num in range(TIMER_DEFAULT_VALUE, COUNT_DOWN_VALUE): + hd_simulator.cmd_send_treatment_recirculate_data(timeout_total=num, timeout_count_down=num) min = utility.convert_seconds_into_min_and_sec(num, time_format="%M") sec = utility.convert_seconds_into_min_and_sec(num, time_format="%S") - test.compare(str(waitForObject(names.o_EndTreatmentBase_TimeText_minute_Text).text),str(sec),"Verifying seconds appearing on UI")#og need to be changed - test.compare(str(waitForObject(names.o_EndTreatmentBase_TimeText_hour_Text).text),str(min),"Verifying minutes appearing on UI") + test.compare(str(waitForObject(names.o_EndTreatmentBase_TimeText_minute_Text).text), str(sec),"Verifying seconds on Timer in recirculate stopped state") + test.compare(str(waitForObject(names.o_EndTreatmentBase_TimeText_hour_Text).text), str(min),"Verifying minutes on Timer in recirculate stopped state") test.endSection() - test.compare(str(waitForObject(names.o_EndTreatmentBase_Reconnect_Text).text),config.RECONNECT_TEXT, "Reconnect text must be {}".format(config.RECONNECT_TEXT)) + test.compare(str(waitForObject(names.o_EndTreatmentBase_Reconnect_Text).text), config.RECONNECT_TEXT, "Reconnect text must be {}".format(config.RECONNECT_TEXT)) verify_rejection_messages_for_recirculate() test.endSection() -def verify_right_instruction_in_recirculate_state(num_of_instructions): +def verify_right_instruction_in_recirculate_state(NUM_OF_INSTRUCTION): """. Method to verify right arrow functionality @param num_of_instructions - (int) count the number of instructions """ test.startSection("verifying right arrow functionality for recirculate state Screen") utility.verify_missing_object(names.o_EndTreatmentBase_leftImage_Image) - for indicator in range(1, num_of_instructions, 1): - utility.verify_bullet_navigation(indicator, num_of_instructions, SCREEN_OBJ1) - if indicator != num_of_instructions: + for indicator in range(1, NUM_OF_INSTRUCTION, 1): + utility.verify_bullet_navigation(indicator, NUM_OF_INSTRUCTION, SCREEN_OBJ) + if indicator != NUM_OF_INSTRUCTION: mouseClick(waitForObject(names.o_EndTreatmentBase_rightImage_Image)) test.compare(str(waitForObjectExists(names.o_recirculate_text).text), config.RECIRCULATE_TEXT, "Recirculate text must be {}".format(config.RECIRCULATE_TEXT)) utility.verify_missing_object(names.o_EndTreatmentBase_rightImage_Image) @@ -104,8 +103,8 @@ """ test.startSection("verifying left arrow functionality for recirculate state screens") utility.verify_missing_object(names.o_EndTreatmentBase_rightImage_Image) - for indicator in range(num_of_instructions, 0, -1): - utility.verify_bullet_navigation(indicator, num_of_instructions, SCREEN_OBJ1) + for indicator in range(NUM_OF_INSTRUCTION, 0, -1): + utility.verify_bullet_navigation(indicator, NUM_OF_INSTRUCTION, SCREEN_OBJ) if indicator != 1: mouseClick(waitForObject(names.o_EndTreatmentBase_leftImage_Image)) test.compare(str(waitForObjectExists(names.o_recirculate_text).text), config.RECIRCULATE_TEXT, "Recirculate text must be {}".format(config.RECIRCULATE_TEXT))