Index: tst_pre_treatment_patient_connection/test.py =================================================================== diff -u -rb5f97cddacc0a93b825af43c75ca3097a71d51b8 -r98f13c9198e630726f86fa3288e452554d3b2cf5 --- tst_pre_treatment_patient_connection/test.py (.../test.py) (revision b5f97cddacc0a93b825af43c75ca3097a71d51b8) +++ tst_pre_treatment_patient_connection/test.py (.../test.py) (revision 98f13c9198e630726f86fa3288e452554d3b2cf5) @@ -85,11 +85,12 @@ for instruction_screen in (screen_indicator): mouseClick(waitForObject(names.names.o_PreTreatmentBase_rightImage_Image)) - test.compare(str(waitForObjectExists(names.o_PreTreatmentBase_Patient_Connection_Text).text),config.PATIENT_CONNECTION_TEXT, "Patient connection text should be {msg}".format(msg=config.PATIENT_CONNECTION_TEXT)) + test.compare(str(waitForObjectExists(names.o_PreTreatmentBase_Patient_Connection_Text).text, config.PATIENT_CONNECTION_TEXT, "Patient connection text should be {msg}".format(msg=config.PATIENT_CONNECTION_TEXT))) test.compare(str(waitForObjectExists(names.o_swipeview_tutorial_text).enabled, True, "Tutorial text should be enabled.")) - test.compare(str(waitForObjectExists(names.o_swipeview_tutorial_text).text, config.TUTORIAL_TEXT[screen_indicator], "Tutorial text should be {msg}".format(msg=config.TUTORIAL_TEXT[screen_indicator])) - verify_bullet_indicators(screen_indicator) + test.compare(str(waitForObjectExists(names.o_swipeview_tutorial_text).text, config.TUTORIAL_TEXT[screen_indicator], "Tutorial text should be {msg}".format(msg=config.TUTORIAL_TEXT[screen_indicator]))) + #verify_bullet_indicators(screen_indicator) if screen_indicator == 4: + test.compare(str(waitForObjectExists(names.o_PreTreatmentBase_Continue_Text).enabled, False, "continue button should be disabled")) else: test.compare(str(waitForObjectExists(names.o_PreTreatmentBase_Continue_Text).enabled, True, "continue button should be disabled")) @@ -127,7 +128,7 @@ slider_width = slider_buffer + config.UF_MINIMUM_SLIDER_WIDTH mouseClick(waitForObject(names.o_PreTreatmentUltrafiltration_volumeSlider_Slider), slider_width , 3, Qt.LeftButton) - test.compare(waitForObject(names.o_PreTreatmentUltrafiltration_volumeSlider_Slider).value , (slider_value/10), "user adjusted slider value to -> "+ str(slider_value)) + test.compare(waitForObject(names.o_PreTreatmentUltrafiltration_volumeSlider_Slider).value , (slider_value/10), "user adjusted slider value to -> "+ str(slider_value/10)) @@ -155,11 +156,11 @@ hd_simulator.cmd_set_treatment_parameter_ranges(0, 100, 0, max_uf, 0, 0) for uf_value in range(1, (max_uf//100)+1, 1): drag_and_drop_ultrafilteration_slider(uf_value, max_uf) -# test.compare(utils.l2ml(waitForObjectExists(names.o_treatmentStart_ultrafiltrationTouchArea_TreatmentUltrafiltration).value), uf_value, "uf set value should be :" + str(uf_value)) - -# test.compare(utils.l2ml(waitForObjectExists(names.o_volumeSlider_slider).maximum), max_uf, "maximum uf value should be :" + str(max_uf)) -# test.compare(utils.l2ml(waitForObjectExists(names.o_volumeSlider_slider).minimum), min_uf, "minimum uf value should be :" + str(min_uf)) - + + test.compare(utils.l2ml(waitForObjectExists(names.o_PreTreatmentUltrafiltration_volumeSlider_Slider).maximum), max_uf, "maximum uf value should be :" + str(max_uf)) + test.compare(utils.l2ml(waitForObjectExists(names.o_PreTreatmentUltrafiltration_volumeSlider_Slider).minimum), min_uf, "minimum uf value should be :" + str(min_uf)) + test.verify((names.o_PreTreatmentUltrafiltration_Ultrafiltration_Volume_Text).text, config.UF_VOLUME_TEXT, "uf volume text should be " + config.UF_VOLUME_TEXT) + test.verify((names.o_PreTreatmentBase_indicator_StepIndicator).text, config.UF_TITLE_TEXT, "uf title text should be "+config.UF_TITLE_TEXT) def verify_bullet_indicators(indicator): @@ -183,14 +184,16 @@ utils.waitForGUI(2) - #navigate to pre treatment hd_simulator.cmd_set_hd_operation_mode_data(5,0) + #navigate to patient connection sub mode navigate_patient_connection(PRE_TREATMENT_PATIENT_CONNECTION_MODE) - #utility.page_step_indicator_verification(PRE_TREATMENT_STEPS, names.ultrafilteration_text) + #verification of indicators from patient connection section + utility.page_step_indicator_verification(PRE_TREATMENT_STEPS, names.o_PreTreatmentUltrafiltration_Indicators) + #verification of uf slider based on edge condition. start_test_treatment_ultrafilteration(TREATMENT_ULTRAFILTERATION_TESTING_OPTION["OPTION_1"]) start_test_treatment_ultrafilteration(TREATMENT_ULTRAFILTERATION_TESTING_OPTION["OPTION_2"]) start_test_treatment_ultrafilteration(TREATMENT_ULTRAFILTERATION_TESTING_OPTION["OPTION_3"]) @@ -202,6 +205,7 @@ start_test_treatment_ultrafilteration(TREATMENT_ULTRAFILTERATION_TESTING_OPTION["OPTION_9"]) start_test_treatment_ultrafilteration(TREATMENT_ULTRAFILTERATION_TESTING_OPTION["OPTION_10"]) + test_rejection_message_patient_connection(accept_status = False) hd_simulator.cmd_send_uf_treatment_response(accepted = True, reason = 0, volume = config.UF_VALID_RANGE)