Index: tst_CreateTreatment/test.py =================================================================== diff -u -rac88b33834b21228e3dd2764b5fa6ff13cbababe -rd98c5ca0c23aec102058af19bc136d37685177ab --- tst_CreateTreatment/test.py (.../test.py) (revision ac88b33834b21228e3dd2764b5fa6ff13cbababe) +++ tst_CreateTreatment/test.py (.../test.py) (revision d98c5ca0c23aec102058af19bc136d37685177ab) @@ -3,7 +3,6 @@ import names from dialin.squish import utils -from dialin.ui.hd_simulator import HDSimulator from dialin.common.msg_defs import RequestRejectReasons from dialin import HDSimulator from time import sleep @@ -173,8 +172,14 @@ mouseClick(waitForObject(slider_object), waitForObjectExists(slider_object).width, 0, Qt.LeftButton) sleep(0.01) - test.compare(waitForObjectExists(selected_value_object).visible, True) - test.compare(waitForObjectExists(selected_value_object).text, "{0} {1}".format(slider_info["max"], slider_info["units"])) + if "LimitsLow" in slider_name: + mouseClick(waitForObject(slider_object), -40, 0, Qt.LeftButton) + sleep(0.01) + test.compare(waitForObjectExists(selected_value_object).visible, True) + test.compare(waitForObjectExists(selected_value_object).text, "{0} {1}".format(slider_info["min"], slider_info["units"])) + else: + test.compare(waitForObjectExists(selected_value_object).visible, True) + test.compare(waitForObjectExists(selected_value_object).text, "{0} {1}".format(slider_info["max"], slider_info["units"])) def check_button_group(buttons, slider_ranges_key): @@ -225,11 +230,12 @@ check_button_group(dialyzer_options, "dialyzerTypeOptions") -def test_continue_failure(): +def test_continue_failure(hd_simulator: HDSimulator): """ Tests that continue is disabled by default Simulates a FW response that all parameters are invalid prior to selection. + @param hd_simulator: the HDSimulator object @return: None """ flick(waitForObject(names.o_create_treatment_flickable), 0, 2000) @@ -241,7 +247,6 @@ test.compare(waitForObject(names.o_create_treatment_rinseback).visible, True) # simulate FW response that all parameters are invalid - hd_simulator = HDSimulator() reject_reasons = [ RequestRejectReasons.REQUEST_REJECT_REASON_NOT_ALLOWED_IN_CURRENT_MODE @@ -256,42 +261,12 @@ Tests that selecting the continue button moves to the treatment confirm page Assumes all treatment parameters have already been selected + @param hd_simulator: the HDSimulator object @return: None """ - flick(waitForObject(names.o_create_treatment_flickable), 0, 700) - mouseClick(waitForObject(names.o_create_treatment_continue)) - - sleep(0.05) - - # simulate FW response that all parameters are valid - reject_reasons = [ - RequestRejectReasons.REQUEST_REJECT_REASON_NONE, # overall response - RequestRejectReasons.REQUEST_REJECT_REASON_NONE, # blood flow - RequestRejectReasons.REQUEST_REJECT_REASON_NONE, # dialysate flow - RequestRejectReasons.REQUEST_REJECT_REASON_NONE, # duration - RequestRejectReasons.REQUEST_REJECT_REASON_NONE, # heparin dispensing rate - RequestRejectReasons.REQUEST_REJECT_REASON_NONE, # heparin bolus volume - RequestRejectReasons.REQUEST_REJECT_REASON_NONE, # heparin stop time - RequestRejectReasons.REQUEST_REJECT_REASON_NONE, # saline bolus - RequestRejectReasons.REQUEST_REJECT_REASON_NONE, # acid concentrate - RequestRejectReasons.REQUEST_REJECT_REASON_NONE, # bicarbonate concentrate - RequestRejectReasons.REQUEST_REJECT_REASON_NONE, # dialyzer type - RequestRejectReasons.REQUEST_REJECT_REASON_NONE, # dialysate temperature - RequestRejectReasons.REQUEST_REJECT_REASON_NONE, # arterial pressure limit low - RequestRejectReasons.REQUEST_REJECT_REASON_NONE, # arterial pressure limit high - RequestRejectReasons.REQUEST_REJECT_REASON_NONE, # venous pressure limit low - RequestRejectReasons.REQUEST_REJECT_REASON_NONE, # venous pressure limit high - RequestRejectReasons.REQUEST_REJECT_REASON_NONE, # blood pressure measurement interval - RequestRejectReasons.REQUEST_REJECT_REASON_NONE, # rinseback flow rate - - ] - - hd_simulator.cmd_send_treatment_parameter_validation_response(reject_reasons) - - sleep(0.01) - + sleep(1) test.compare(waitForObjectExists(names.o_create_treatment_confirm).visible, True) def main(): @@ -301,7 +276,7 @@ sleep(1) test_load_create_treatment() sleep(1) - test_continue_failure() + test_continue_failure(hd_simulator) sleep(1) test_parameters_exist()