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(