Index: shared/scripts/configuration/config.py =================================================================== diff -u -rc6274593f3f5a607595b95f0243313a6cf32d599 -r7cd0c21e76de3964af8178655467e82ff99ae98d --- shared/scripts/configuration/config.py (.../config.py) (revision c6274593f3f5a607595b95f0243313a6cf32d599) +++ shared/scripts/configuration/config.py (.../config.py) (revision 7cd0c21e76de3964af8178655467e82ff99ae98d) @@ -15,9 +15,9 @@ import os -APPLICATION_NAME = "denaliSquish" +AUT_NAME = "denaliSquish" -COMMON_PATH = f"{os.environ['HOME']}/Projects" +COMMON_PATH = os.environ['HOME']+"/Projects" COLOR_CODES = {"Aqua": "#81ffff", "Blue": "#017dea", "Blue 2": "#1090d5", "Green": "#29fd2d", "Grey": "#d3d3d3", Index: shared/scripts/configuration/utility.py =================================================================== diff -u -rb3524cb74d96f70808818d97e2e84957aa11e684 -r7cd0c21e76de3964af8178655467e82ff99ae98d --- shared/scripts/configuration/utility.py (.../utility.py) (revision b3524cb74d96f70808818d97e2e84957aa11e684) +++ shared/scripts/configuration/utility.py (.../utility.py) (revision 7cd0c21e76de3964af8178655467e82ff99ae98d) @@ -13,25 +13,20 @@ ############################################################################ + import sys import test import squish -import names -from configuration import config - from builtins import int as pyInt -from builtins import str as pyStr from builtins import float as pyFloat -from unicodedata import bidirectional def start_application(app_name): """ Function to start application and verify application status [running] If application does not start or running status is false, test stops Argument: - @param app_name : (str) - Name of the application - @param app_executable : (str) - Actual application + @param app_name : (str) - Name of the executable application. @return: handle for the application if the application is in running state, or error (exist the application) """ @@ -40,28 +35,28 @@ try: counter += 1 test.log("Starting {}".format(app_name)) - squish.startApplication(config.APPLICATION_NAME) + squish.startApplication(app_name) if counter == 1: - test.log(f"Application launched at the {counter}'st try.") + test.log("Application launched at the "+str(counter)+" st try.") elif counter == 2: - test.log(f"Application launched at the {counter}'nd try.") + test.log("Application launched at the "+str(counter)+" nd try.") elif counter == 3: - test.log(f"Application launched at the {counter}'rd try.") + test.log("Application launched at the "+str(counter)+" rd try.") else: - test.log(f"Application launched at the {counter}'th try.") + test.log("Application launched at the "+str(counter)+" th try.") break except RuntimeError: if counter == 1: - test.log(f"Application failed to launch after {counter} try - Please refer logs") + test.log("Application failed to launch after "+str(counter)+" try - Please refer logs") elif counter == 20: - test.log(f"Exiting after {counter} tries..") + test.log("Exiting after "+str(counter)+ " tries..") sys.exit(1) else: - test.log(f"Application failed to launch after {counter} tries - Please refer logs") + test.log("Application failed to launch after "+str(counter)+ " tries - Please refer logs") except: logErrorDetails("Failed to start the application") sys.exit(1) - + def check_if_object_is_within_the_container(obj=None, container=None): """ Index: shared/scripts/names.py =================================================================== diff -u -rc6274593f3f5a607595b95f0243313a6cf32d599 -r7cd0c21e76de3964af8178655467e82ff99ae98d --- shared/scripts/names.py (.../names.py) (revision c6274593f3f5a607595b95f0243313a6cf32d599) +++ shared/scripts/names.py (.../names.py) (revision 7cd0c21e76de3964af8178655467e82ff99ae98d) @@ -3,15 +3,6 @@ from objectmaphelper import * - -def prescription_measurement_title(text): - prescription_mesurement["text"] = text - return prescription_mesurement - -def operating_parameters_measurement_title(text): - operating_measurement["text"] = text - return operating_measurement - 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} @@ -32,61 +23,26 @@ 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_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} -standby_page = {"container": o_MainHome_MainHome, "type": "Column", "unnamed": 1, "visible": True} -displayed_time = {"container": o_Gui_MainView, "text": "01/06/2022 02:22:07", "type": "Text", "unnamed": 1, "visible": True} -create_treatment_rectangle = {"container": o_MainHome_MainHome, "gradient": 0, "id": "_createTreatmentRect", "type": "TouchRect", "unnamed": 1, "visible": True} -treatmentStack_TreatmentStack = {"container": o_Gui_MainView, "objectName": "TreatmentStack", "type": "TreatmentStack", "visible": True} -treatmentStack_TreatmentBloodPrime_ScreenItem = {"container": treatmentStack_TreatmentStack, "objectName": "_TreatmentBloodPrime", "type": "ScreenItem", "visible": True} - - -#in-treatment -blood_priming = {"container": treatmentStack_TreatmentBloodPrime_ScreenItem, "text": "Blood Priming", "type": "Text", "unnamed": 1, "visible": True} -blood_priming_value_by_default = {"container": treatmentStack_TreatmentBloodPrime_ScreenItem, "text": "0 mL", "type": "Text", "unnamed": 1, "visible": True} -treatmentStack_treatmentHome_TreatmentHome = {"container": treatmentStack_TreatmentStack, "id": "_treatmentHome", "type": "TreatmentHome", "unnamed": 1, "visible": True} -uf_minimum_value = {"container": treatmentStack_treatmentHome_TreatmentHome, "text": "0.000", "type": "Text", "unnamed": 1, "visible": True} -uf_maximum_value = {"container": treatmentStack_treatmentHome_TreatmentHome, "text": "0.600", "type": "Text", "unnamed": 1, "visible": True} -uf_minimum_value_pop_up = {"container": o_Overlay, "text": "0.000", "type": "Text", "unnamed": 1, "visible": True} -uf_maximum_value_pop_up = {"container": o_Overlay, "text": "0.600", "type": "Text", "unnamed": 1, "visible": True} -edit_uf_value = {"container": o_Overlay, "text": "EDIT ULTRAFILTRATION VOLUME", "type": "Text", "unnamed": 1, "visible": True} -uf_maximum_title = {"container": o_Overlay, "text": "0.600", "type": "Text", "unnamed": 1, "visible": True} -uf_back_button = {"container": o_Overlay, "text": "BACK", "type": "Text", "unnamed": 1, "visible": True} -uf_close_button = {"container": o_Overlay, "id": "_image", "source": "qrc:/images/iClose", "type": "Image", "unnamed": 1, "visible": True} -fluid_text = {"container": treatmentStack_treatmentHome_TreatmentHome, "text": "Volume Delivered", "type": "Text", "unnamed": 1, "visible": True} -cumulative_fluid_text = {"container": treatmentStack_treatmentHome_TreatmentHome, "text": "Cumulative Delivered", "type": "Text", "unnamed": 1, "visible": True} - - -#authentication -confirm_button = {"container": o_PreTreatmentCreateStack_PreTreatmentBase_TreatmentFlowBase, "text": "CONFIRM", "type": "Text", "unnamed": 1, "visible": True} -back_button ={"container": o_PreTreatmentCreateStack_PreTreatmentCreate_PreTreatmentCreate, "id": "_image", "source": "qrc:/images/iBack", "type": "Image", "unnamed": 1, "visible": True} +#create_treatment o_PreTreatmentBase_confirmButton_TouchRect = {"container": o_PreTreatmentCreateStack_PreTreatmentBase_TreatmentFlowBase, "text": "CONFIRM", "type": "Text", "unnamed": 1, "visible": True} o_PreTreatmentCreate_bloodFlowRate_SliderCreateTreatment = {"container": o_PreTreatmentCreateStack_PreTreatmentCreate_PreTreatmentCreate, "gradient": 0, "objectName": "_bloodFlowRate", "type": "SliderCreateTreatment", "visible": True} -input_patient_id = {"container": o_PreTreatmentCreateStack_PreTreatmentBase_TreatmentFlowBase, "echoMode": 0, "id": "_input", "type": "TextInput", "unnamed": 1, "visible": True} -keboard_input = {"container": o_Gui_MainView, "type": "Text", "unnamed": 1, "visible": True} -custom_treatment = {"container": o_PreTreatmentCreateStack_PreTreatmentCreate_PreTreatmentCreate, "text": "Create a Custom Treatment", "type": "Text", "unnamed": 1, "visible": True} -treatment_create_flickable = {"container": o_PreTreatmentCreateStack_PreTreatmentCreate_PreTreatmentCreate, "objectName": "TreatmentCreateFlickable", "type": "Flickable", "visible": True} -operating_parameters = {"container": o_PreTreatmentCreateStack_PreTreatmentCreate_PreTreatmentCreate, "type": "Text", "unnamed": 1, "visible": True} o_PreTreatmentBase_confirmButton_TouchRect_2 = {"container": o_PreTreatmentCreateStack_PreTreatmentBase_TreatmentFlowBase, "gradient": 0, "objectName": "_confirmButton", "type": "TouchRect", "visible": True} o_PreTreatmentCreate_heparinDispensingRate_SliderCreateTreatment = {"container": o_PreTreatmentCreateStack_PreTreatmentCreate_PreTreatmentCreate, "gradient": 0, "objectName": "_heparinDispensingRate", "type": "SliderCreateTreatment", "visible": True} o_PreTreatmentBase_backgroundRect_Rectangle_2 = {"container": o_PreTreatmentCreateStack_PreTreatmentBase_TreatmentFlowBase, "gradient": 0, "id": "_backgroundRect", "type": "Rectangle", "unnamed": 1, "visible": True} -create_treatment_screen = {"container": o_PreTreatmentCreateStack_PreTreatmentCreate_PreTreatmentCreate, "objectName": "TreatmentCreateFlickable", "type": "Flickable", "visible": True} o_PreTreatmentCreateStack_PreTreatmentConfirm_TreatmentFlowBase = {"container": o_PreTreatmentCreateStack_PreTreatmentCreateStack, "objectName": "_PreTreatmentConfirm", "type": "TreatmentFlowBase", "visible": True} -confirm_title_text = {"container": o_PreTreatmentCreateStack_PreTreatmentConfirm_TreatmentFlowBase, "text": "Confirm Treatment", "type": "Text", "unnamed": 1, "visible": True} -prescription_title_text = {"container": o_PreTreatmentCreateStack_PreTreatmentConfirm_TreatmentFlowBase, "objectName": "ConfirmTreatmentTable_prescription", "type": "Text", "visible": True} -operating_parameters_title_text = {"container": o_PreTreatmentCreateStack_PreTreatmentConfirm_TreatmentFlowBase, "objectName": "ConfirmTreatmentTable_operating_parameters", "type": "Text", "visible": True} -prescription_mesurement = {"container": o_PreTreatmentCreateStack_PreTreatmentConfirm_TreatmentFlowBase, "type": "Text", "visible": True} -operating_measurement = {"container": o_PreTreatmentCreateStack_PreTreatmentConfirm_TreatmentFlowBase, "type": "Text", "visible": True} -treatment_confirm_flickable = {"container": o_PreTreatmentCreateStack_PreTreatmentConfirm_TreatmentFlowBase, "objectName": "_PreTreatmentConfirmFlickable", "type": "Flickable", "visible": True} -back_button_confirm_treatment = {"container": o_Gui_MainView, "type": "Text", "unnamed": 1, "visible": True} +o_treatment_confirm_flickable = {"container": o_PreTreatmentCreateStack_PreTreatmentConfirm_TreatmentFlowBase, "objectName": "_PreTreatmentConfirmFlickable", "type": "Flickable", "visible": True} +o_prescription_mesurement = {"container": o_PreTreatmentCreateStack_PreTreatmentConfirm_TreatmentFlowBase, "type": "Text", "visible": True} +o_operating_parameters = {"container": o_PreTreatmentCreateStack_PreTreatmentCreate_PreTreatmentCreate, "type": "Text", "unnamed": 1, "visible": True} +o_treatment_create_flickable = {"container": o_PreTreatmentCreateStack_PreTreatmentCreate_PreTreatmentCreate, "objectName": "TreatmentCreateFlickable", "type": "Flickable", "visible": True} +o_create_treatment_screen = {"container": o_PreTreatmentCreateStack_PreTreatmentCreate_PreTreatmentCreate, "objectName": "TreatmentCreateFlickable", "type": "Flickable", "visible": True} +o_confirm_title_text = {"container": o_PreTreatmentCreateStack_PreTreatmentConfirm_TreatmentFlowBase, "text": "Confirm Treatment", "type": "Text", "unnamed": 1, "visible": True} +o_prescription_title_text = {"container": o_PreTreatmentCreateStack_PreTreatmentConfirm_TreatmentFlowBase, "objectName": "ConfirmTreatmentTable_prescription", "type": "Text", "visible": True} +o_input_patient_id = {"container": o_PreTreatmentCreateStack_PreTreatmentBase_TreatmentFlowBase, "echoMode": 0, "id": "_input", "type": "TextInput", "unnamed": 1, "visible": True} +o_confirm_button = {"container": o_PreTreatmentCreateStack_PreTreatmentBase_TreatmentFlowBase, "text": "CONFIRM", "type": "Text", "unnamed": 1, "visible": True} +o_back_button_confirm_treatment = {"container": o_Gui_MainView, "type": "Text", "unnamed": 1, "visible": True} - - - Index: tst_create_custom_treatment/test.py =================================================================== diff -u -rb3524cb74d96f70808818d97e2e84957aa11e684 -r7cd0c21e76de3964af8178655467e82ff99ae98d --- tst_create_custom_treatment/test.py (.../test.py) (revision b3524cb74d96f70808818d97e2e84957aa11e684) +++ tst_create_custom_treatment/test.py (.../test.py) (revision 7cd0c21e76de3964af8178655467e82ff99ae98d) @@ -70,34 +70,43 @@ def set_parameter_type(text): if isinstance(text, pyStr): - names.operating_parameters["text"] = text - return names.operating_parameters + names.o_operating_parameters["text"] = text + return names.o_operating_parameters else: - test.log(f"Invalid \"text\": {text} for object.") - names.operating_parameters["text"] = None + test.log(f"Invalid \"text\": " +text+" for object.") + names.o_operating_parameters["text"] = None - + +def prescription_measurement_title(text): + if isinstance(text, pyStr): + names.o_prescription_mesurement["text"] = text + return names.o_prescription_mesurement + else: + test.log(f"Invalid \"text\": " +text+" for object.") + names.o_prescription_mesurement["text"] = None + + def set_operating_parameters(heparin_type, acid_concentrate, bicarbonate_concentrate, dialyzer_type): """ Tests that all possible non-slider options are shown. @Param : operating parameters value @return: None """ heparin_parameter_object = set_parameter_type(text = heparin_type) - utility.scroll_to_zone(heparin_parameter_object, names.treatment_create_flickable) + utility.scroll_to_zone(heparin_parameter_object, names.o_treatment_create_flickable) tapObject(waitForObject(heparin_parameter_object)) object_on_zone = set_parameter_type(text = ACID_CONCENTRATE[3]) - utility.scroll_to_zone(object_on_zone, names.treatment_create_flickable) + utility.scroll_to_zone(object_on_zone, names.o_treatment_create_flickable) acid_concentrate_box_obj = set_parameter_type(text = acid_concentrate) tapObject(waitForObject(acid_concentrate_box_obj)) bicarbonate_concentrate_box_obj = set_parameter_type(text = bicarbonate_concentrate) - utility.scroll_to_zone(bicarbonate_concentrate_box_obj, names.treatment_create_flickable) + utility.scroll_to_zone(bicarbonate_concentrate_box_obj, names.o_treatment_create_flickable) tapObject(waitForObject(bicarbonate_concentrate_box_obj)) object_on_zone = set_parameter_type(text = DIALYZER_TYPE[3]) - utility.scroll_to_zone(object_on_zone, names.treatment_create_flickable) + utility.scroll_to_zone(object_on_zone, names.o_treatment_create_flickable) dialyzer_type_box_obj = set_parameter_type(text = dialyzer_type) tapObject(waitForObject(dialyzer_type_box_obj)) @@ -126,12 +135,12 @@ expected_color = config.COLOR_CODES.get("Red") parameter_object = set_parameter_type(text = expected_treatment_title) - utility.scroll_to_zone(parameter_object, names.treatment_create_flickable) + utility.scroll_to_zone(parameter_object, names.o_treatment_create_flickable) parameter_text = waitForObject(parameter_object) parameter_text_color = parameter_text.color test.compare(expected_color, parameter_text_color, "parameter color should be "\ - f"red for {expected_treatment_title}, if the confirmation get rejected !") + "red for " + expected_treatment_title +" , if the confirmation get rejected !") test.endSection() @@ -145,7 +154,7 @@ else: slider_object = object.children(parameter)[2] slider_status = utility.set_slider_value(slider_value, slider_object, bislider, slider_range) - test.compare(slider_status, True, f"{item_text} should set to value -> {slider_value}") + test.compare(slider_status, True, str(item_text) + " should set to value -> " + str(slider_value)) def create_custom_treatment_record( blood_flow_rate, dialysate_flow_rate, @@ -164,7 +173,7 @@ @return: None """ - slider_object = waitForObject(names.create_treatment_screen) + slider_object = waitForObject(names.o_create_treatment_screen) child = object.children(slider_object)[0] parameter_child = object.children(child)[0] @@ -178,7 +187,7 @@ slider_value = Duration, slider_obj = parameter_child) parameter_object = set_parameter_type(text = "Heparin Stop Time") - utility.scroll_to_zone(parameter_object, names.treatment_create_flickable) + utility.scroll_to_zone(parameter_object, names.o_treatment_create_flickable) set_slider_value_for_parameter(index_value = 4, item_text = "heparin dispensing rate", slider_value = heparin_dispensing_rate, slider_obj = parameter_child) @@ -187,7 +196,7 @@ slider_value = heparin_bolus_volume, slider_obj = parameter_child) parameter_object = set_parameter_type(text = "Saline Bolus") - utility.scroll_to_zone(parameter_object, names.treatment_create_flickable) + utility.scroll_to_zone(parameter_object, names.o_treatment_create_flickable) set_slider_value_for_parameter(index_value = 6, item_text = "heparin stop time", @@ -202,13 +211,13 @@ dialyzer_type = DIALYZER_TYPE[index]) parameter_object = set_parameter_type(text = "Venous Pressure Limits (mmHg)") - utility.scroll_to_zone(parameter_object, names.treatment_create_flickable) + utility.scroll_to_zone(parameter_object, names.o_treatment_create_flickable) set_slider_value_for_parameter(index_value = 13, item_text = "dialysate temperature", slider_value = dialysate_temperature, slider_obj = parameter_child) parameter_object = set_parameter_type(text = "Rinseback Flow Rate") - utility.scroll_to_zone(parameter_object, names.treatment_create_flickable) + utility.scroll_to_zone(parameter_object, names.o_treatment_create_flickable) set_slider_value_for_parameter(index_value = 14, item_text = " arterial pressure low limits (mmHg)", @@ -233,39 +242,37 @@ def verify_the_confirm_treatment_screen_is_displayed() -> None: test.log("Verifying the 'Confirm Treatment' is displayed and its title text") - confirm_treatment_title = waitForObject(names.confirm_title_text) + confirm_treatment_title = waitForObject(names.o_confirm_title_text) test.compare(CONFIRM_TREATMENT_TITLE, confirm_treatment_title.text.toUtf8().constData(), - f"{CONFIRM_TREATMENT_TITLE} screen is displayed " + - f"and title should be {CONFIRM_TREATMENT_TITLE}") + CONFIRM_TREATMENT_TITLE + " screen is displayed " + + "and title should be " +CONFIRM_TREATMENT_TITLE) def verify_prescriptional_details_from_confirm_treatment_screen(index): test.startSection("Verifying prescription values from confirm treatment section") verify_the_confirm_treatment_screen_is_displayed() - prescription_title = waitForObject(names.prescription_title_text) + prescription_title = waitForObject(names.o_prescription_title_text) test.compare(PRESCRIPTION_TITLE, prescription_title.text.toUtf8().constData(), - f"{PRESCRIPTION_TITLE} title " + - f"should be {PRESCRIPTION_TITLE}") + PRESCRIPTION_TITLE + " title " + "should be " +PRESCRIPTION_TITLE) option = index for expected_prescription_title, measurement in PRESCRIPTION_DETAILS.items(): if expected_prescription_title == "Saline Bolus Volume": option = 0 - parameter_object = names.prescription_measurement_title(text = expected_prescription_title) - utility.scroll_to_zone(parameter_object, names.treatment_confirm_flickable) + parameter_object = prescription_measurement_title(text = expected_prescription_title) + utility.scroll_to_zone(parameter_object, names.o_treatment_confirm_flickable) - prescription_title = waitForObject(names.prescription_measurement_title(\ + prescription_title = waitForObject(prescription_measurement_title(\ text=expected_prescription_title)) actual_measurement = object.parent(prescription_title) actual_measurement = object.children(actual_measurement)[-1] test.compare(expected_prescription_title, prescription_title.text.toUtf8().constData(), - f"{expected_prescription_title} title should be " + - f"{expected_prescription_title}") + "title should be " + expected_prescription_title) unit = CREATE_TREATMENT_SLIDER_VALUES[expected_prescription_title][option] - test.compare(f"{unit} {measurement}", actual_measurement.text.toUtf8().constData(), - f"{expected_prescription_title} corresponding "+ - f"measured value should be {unit} {measurement}") + test.compare(str(unit)+ " " +str(measurement), actual_measurement.text, + expected_prescription_title + " corresponding "+ + "measured value should be " + str(unit)+" "+str(measurement)) option = index test.endSection() @@ -275,38 +282,37 @@ test.startSection("Verifying operational values from confirm treatment screen") verify_the_confirm_treatment_screen_is_displayed() - parameter_object = names.prescription_measurement_title(text = "Blood Flow Rate") - utility.scroll_to_zone(parameter_object, names.treatment_confirm_flickable) + parameter_object = prescription_measurement_title(text = "Blood Flow Rate") + utility.scroll_to_zone(parameter_object, names.o_treatment_confirm_flickable) for expected_operational_title, measurement in OPERATIONAL_PARAMETERS.items(): - operational_title = waitForObject(names.operating_parameters_measurement_title(\ + operational_title = waitForObject(prescription_measurement_title(\ text=expected_operational_title)) actual_measurement = object.parent(operational_title) actual_measurement = object.children(actual_measurement)[-1] test.compare(expected_operational_title, operational_title.text.toUtf8().constData(), - f"{expected_operational_title} title should be " + - f"{expected_operational_title}") + expected_operational_title + " title should be " + expected_operational_title) if expected_operational_title == "Acid Concentrate" or expected_operational_title == "Dialyzer Type": measurement = measurement[index] test.compare(measurement, actual_measurement.text.toUtf8().constData(), - f"{expected_operational_title} corresponding "+ - f"measured value should be {measurement}") + expected_operational_title +" corresponding "+ + "measured value should be " + measurement) test.endSection() def main(): - utils.tstStart("tst_create_custom_treatment") - utility.start_application("Create custom treatment for a patient") + utils.tstStart(__file__) + utility.start_application(config.AUT_NAME) hd = HDSimulator() hd.cmd_send_power_on_self_test_version_request() hd._handler_ui_first_check_in(message = None) - tapObject(waitForObject(names.input_patient_id)) - type(waitForObject(names.input_patient_id), PATIENT_ID) - tapObject(waitForObject(names.confirm_button)) + tapObject(waitForObject(names.o_input_patient_id)) + type(waitForObject(names.o_input_patient_id), PATIENT_ID) + tapObject(waitForObject(names.o_confirm_button)) #set custom values for parameters create_custom_treatment_record( @@ -333,10 +339,10 @@ verify_operational_details_from_confirm_treatment_screen(index = 0) verify_prescriptional_details_from_confirm_treatment_screen(index = 0) - tapObject(waitForObject(names.back_button_confirm_treatment)) + tapObject(waitForObject(names.o_back_button_confirm_treatment)) parameter_object = set_parameter_type(text = config.CREATE_TREATMENT_PARAMETERS[0]) - utility.scroll_to_zone(parameter_object, names.treatment_create_flickable, direction="Top") + utility.scroll_to_zone(parameter_object, names.o_treatment_create_flickable, direction="Top") #set custom values for parameters create_custom_treatment_record( @@ -360,13 +366,13 @@ verify_request_rejection_mode(hd) parameter_object = set_parameter_type(text = config.CREATE_TREATMENT_PARAMETERS[0]) - utility.scroll_to_zone(parameter_object, names.treatment_create_flickable, direction="Top") + utility.scroll_to_zone(parameter_object, names.o_treatment_create_flickable, direction="Top") #verification of create treatment screen after request rejection verify_custom_treatment_record_rejected() parameter_object = set_parameter_type(text = config.CREATE_TREATMENT_PARAMETERS[0]) - utility.scroll_to_zone(parameter_object, names.treatment_create_flickable, direction="Top") + utility.scroll_to_zone(parameter_object, names.o_treatment_create_flickable, direction="Top") #set custom values for parameters create_custom_treatment_record(