Index: tst_main_treatment_ultrafiltration/test.py =================================================================== diff -u -r2e73714b63ae5fd2ef8b5acca5043e136454feff -r5d6a0bb96d04a86cc10936ac3f303c28be3bb249 --- tst_main_treatment_ultrafiltration/test.py (.../test.py) (revision 2e73714b63ae5fd2ef8b5acca5043e136454feff) +++ tst_main_treatment_ultrafiltration/test.py (.../test.py) (revision 5d6a0bb96d04a86cc10936ac3f303c28be3bb249) @@ -20,7 +20,7 @@ from dialin.ui import utils from dialin.common.ui_defs import TXStates as uf_states from dialin.ui.hd_simulator import HDSimulator -from dialin.common.hd_defs import HDStandbyStates, TreatmentStates +from dialin.common.hd_defs import HDStandbyStates, TreatmentStates, BloodLeakZeroingStates from configuration import config hd_simulator = HDSimulator() @@ -76,13 +76,13 @@ hd_simulator.cmd_set_treatment_parameter_ranges(MIN_TREATMENT_DURATION, MAX_TREATMENT_DURATION, min_uf, max_uf, MIN_DIALYSATE_FLOW_RATE, MAX_DIALYSATE_FLOW_RATE) for uf_value in range(min_uf, (max_uf)+1, 1): - hd_simulator.cmd_set_treatment_ultrafiltration_outlet_flow_data(uf_value, uf_value, ROT_SPEED, MOT_SPEED, MC_SPEED, MC_CURRENT, PWM) + hd_simulator.cmd_set_treatment_ultrafiltration_outlet_flow_data(uf_value, uf_value, ROT_SPEED, MOT_SPEED, MC_SPEED, MC_CURRENT, PWM, 0,0,0,0,0,0) utils.waitForGUI(0.2) test.compare(utils.l2ml(waitForObjectExists(names.o_treatmentStart_ultrafiltrationTouchArea_TreatmentUltrafiltration).value), uf_value, "uf set value should be :" + str(uf_value)) hd_simulator.cmd_send_uf_treatment_response(accepted = True, reason = 0, volume = 500) if uf_state == uf_states.UF_RUNNING_STATE: mouseClick(waitForObjectExists(names.o_ultrafiltration_pause_btn)) - if uf_state == uf_states.UF_PAUSED_STATE or uf_state == uf_states.UF_START_STATE: + if uf_state == uf_states.UF_PAUSED_STATE : 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)) @@ -93,7 +93,7 @@ @param : N/A @return: N/A """ - hd_simulator.cmd_set_treatment_ultrafiltration_outlet_flow_data(REF_UF_VOL, MEASURED_UF_VOL, ROT_SPEED, MOT_SPEED, MC_SPEED, MC_CURRENT, PWM, 0,0,0,0,0) + hd_simulator.cmd_set_treatment_ultrafiltration_outlet_flow_data(REF_UF_VOL, MEASURED_UF_VOL, ROT_SPEED, MOT_SPEED, MC_SPEED, MC_CURRENT, PWM, 0,0,0,0,0,0) test.compare(waitForObjectExists(names.o_treatmentStart_ultrafiltrationTouchArea_TreatmentUltrafiltration).value, config.UF_MINIMUM_VALUE, "uf treatment reset to 0") @@ -113,7 +113,7 @@ # Integration team needs to determine if the new UF parameters to the simulator need to be exercised for verification. hd_simulator.cmd_set_treatment_ultrafiltration_outlet_flow_data(ultrafiltration_flow_parameter[REF_UF_VOL_INDEX], ultrafiltration_flow_parameter[MEASURED_UF_VOL_INDEX], ultrafiltration_flow_parameter[ROT_SPEED_INDEX], ultrafiltration_flow_parameter[MOT_SPEED_INDEX], ultrafiltration_flow_parameter[MC_SPEED_INDEX], - ultrafiltration_flow_parameter[MC_CURRENT_INDEX], ultrafiltration_flow_parameter[PWM_INDEX],0,0,0,0,0) + ultrafiltration_flow_parameter[MC_CURRENT_INDEX], ultrafiltration_flow_parameter[PWM_INDEX],0,0,0,0,0,0) test.log("test to verify ultrafiltration flow parameters.") @@ -219,28 +219,6 @@ test.endSection() -def verify_ultrafiltration_start_state(uf_states): - """ - Test to verify ultrafiltration start state. - @param uf_state: (int) ultrafiltration state to be set - start state. - @return: N/A - """ - test.startSection("verification of ultrafiltration start state") - - mouseClick(waitForObject(names.o_backbutton_backbutton)) - mouseClick(waitForObject(names.o_ultrafiltration_closeButton)) - hd_simulator.cmd_set_treatment_adjust_ultrafiltration_accepted(uf_states) - utils.waitForGUI(0.2) - - mouseClick(names.o_treatmentStart_ultrafiltrationTouchArea_TreatmentUltrafiltration) - test.compare(waitForObjectExists(names.o_editButton_TouchRect).text.text, config.EDIT_TEXT, "edit text should be "+str(config.EDIT_TEXT)) - test.compare(waitForObjectExists(names.o_ultrafiltration_volume_text).text, config.TITLE_TEXT, "title text should be "+str(config.TITLE_TEXT)) - - mouseClick(names.o_editButton_TouchRect) - test.compare(waitForObjectExists(names.o_ultrafiltration_volume_text).text, config.TITLE_TEXT, "title text should be "+str(config.TITLE_TEXT)) - test.endSection() - - def verify_ultrafiltration_running_state(uf_states): """ Test to verify ultrafiltration running state. @@ -291,14 +269,15 @@ test.compare(expected_edit_volume_msg.text, edit_volume_message, "Edit Volume title message should be {}".format(edit_volume_message)) increase_uf_rate_text = waitForObjectExists(expected_uf_texts(config.INCREASE_UF_RATE_TEXT)) test.compare(increase_uf_rate_text.text, config.INCREASE_UF_RATE_TEXT, "Increase UF rate box title should be {}".format(config.INCREASE_UF_RATE_TEXT)) - increase_treatment_duration_text = waitForObjectExists(expected_uf_texts(config.INCREASE_TREATMENT_DURATION_TEXT)) - test.compare(increase_treatment_duration_text.text, config.INCREASE_TREATMENT_DURATION_TEXT, "Increase treatment duration box title should be {}".format(config.INCREASE_TREATMENT_DURATION_TEXT)) increase_uf_rate_msg = "The rate increases by {} mL/min,\nthe treatment duration remains the same.".format(rate) increase_uf_rate_msg_text = waitForObjectExists(expected_uf_texts(increase_uf_rate_msg)) test.compare(increase_uf_rate_msg_text.text, increase_uf_rate_msg, "Increase UF rate msg should be {}".format(increase_uf_rate_msg)) - increase_treatment_duration_msg = "The rate remains, the treatment\nduration increases by {} minutes.".format(duration_diff) - increase_treatment_duration_msg_text = waitForObjectExists(expected_uf_texts(increase_treatment_duration_msg)) - test.compare(increase_treatment_duration_msg_text.text, increase_treatment_duration_msg, "Increase treatment duration msg should be {}".format(increase_treatment_duration_msg)) + + #TODO add back this test if the _durationAdjustmentButton ever get sets to visible + increase_treatment_duration_msg = "The rate remains, the treatment\nduration %2 by {} minutes.".format(duration_diff) + # increase_treatment_duration_msg_text = waitForObjectExists(expected_uf_texts(increase_treatment_duration_msg)) + # test.compare(increase_treatment_duration_msg_text.text, increase_treatment_duration_msg, "Increase treatment duration msg should be {}".format(increase_treatment_duration_msg)) + uf_rate_title_and_val = "UF Rate : {} mL/min".format(rate) uf_rate_title_and_val_text = waitForObjectExists(expected_uf_texts(uf_rate_title_and_val)) test.compare(uf_rate_title_and_val_text.text, uf_rate_title_and_val, "UF Rate title and value should be {}".format(uf_rate_title_and_val)) @@ -307,11 +286,11 @@ if option == "Rate": test.log("Selecting Increase UF Rate") mouseClick(increase_uf_rate_text) - else: - test.log("Selecting duration") - mouseClick(increase_treatment_duration_text) - mouseClick(waitForObjectExists(names.o_ultrafilteration_confirm_btn)) - mouseClick(waitForObjectExists(names.o_mouseArea_MouseArea_ultrafiltration)) + # else: + # test.log("Selecting duration") + # mouseClick(increase_treatment_duration_text) + # mouseClick(waitForObjectExists(names.o_ultrafilteration_confirm_btn)) + # mouseClick(waitForObjectExists(names.o_mouseArea_MouseArea_ultrafiltration)) hd_simulator.cmd_set_treatment_adjust_ultrafiltration_confirm_response(accepted=config.ACCEPTED, reason=0, volume=volume, duration=duration, rate=rate) test.endSection() @@ -323,9 +302,17 @@ startApplication(config.AUT_NAME) #navigate to dialysis state - hd_simulator.cmd_set_treatment_states_data(sub_mode=HDStandbyStates.STANDBY_WAIT_FOR_DISINFECT_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=TreatmentStates.TREATMENT_START_STATE.value, recirculate_state=TreatmentStates.TREATMENT_START_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) + hd_simulator.cmd_set_treatment_states_data(sub_mode=HDStandbyStates.STANDBY_WAIT_FOR_DISINFECT_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=TreatmentStates.TREATMENT_START_STATE.value, + recirculate_state=TreatmentStates.TREATMENT_START_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, + bloodLeakZeoringState = BloodLeakZeroingStates.BLD_ZEROING_IDLE_STATE.value) verification_of_uf_from_main_treatment() @@ -351,10 +338,7 @@ mouseClick(waitForObjectExists(names.o_ultrafiltration_resume_btn)) mouseClick(waitForObjectExists(names.o_editButton_TouchRect)) test_treatment_ultrafiltration(uf_states.UF_PAUSED_STATE) - - verify_ultrafiltration_start_state(uf_states.UF_START_STATE) - test_treatment_ultrafiltration(uf_states.UF_START_STATE) - + verify_ultrafiltration_running_state(uf_states.UF_RUNNING_STATE) test_treatment_ultrafiltration(uf_states.UF_RUNNING_STATE)