Index: tst_CreateTreatment/test.py =================================================================== diff -u -r90d25f34aa147e502583fab7c9e4fd4a980dd4e8 -r40314c67874695eefc506c3a6a33896495953edd --- tst_CreateTreatment/test.py (.../test.py) (revision 90d25f34aa147e502583fab7c9e4fd4a980dd4e8) +++ tst_CreateTreatment/test.py (.../test.py) (revision 40314c67874695eefc506c3a6a33896495953edd) @@ -2,7 +2,8 @@ import names -from dialin.squish import utils +from configuration import config, utility +from dialin.ui import utils from dialin.common.msg_defs import RequestRejectReasons from dialin import HDSimulator from time import sleep @@ -60,19 +61,23 @@ @return: None """ + + createTreatmentButton = utility.get_object_from_names(names.o_create_treatment_button, "names.o_create_treatment_button object missing") + if createTreatmentButton is not None: + mouseClick(waitForObject(names.o_create_treatment_button)) + utils.waitForGUI(0.5) - mouseClick(waitForObject(names.o_create_treatment_button)) - utils.waitForGUI(0.5) + test.compare(waitForObject(names.o_create_treatment_flickable).visible, True, "Create treatment page loads") - test.compare(waitForObject(names.o_create_treatment_flickable).visible, True, "Create treatment page loads") - def test_parameters_exist(): """ Tests that all treatment parameter components exist on the treatment parameters page. @return: None """ - + test.fail("TODO : test_parameters_exist() Need to update / remove the testcase to reflect new GUIs and navigation...return") + return + parameter_names = { "_bloodFlowRate": "SliderCreateTreatment", "_dialysateFlowRate": "SliderCreateTreatment", @@ -82,18 +87,18 @@ "_heparinStopTime": "SliderCreateTreatment", "_salineBolus": "SliderCreateTreatment", - "_acidConcentrateRect": "GridSelection", - "_bicarbonateConcentrateRect": "GridSelection", - "_dialyzerTypeRect": "GridSelection", + "_acidConcentrateRect": "GridSelection", + "_bicarbonateConcentrateRect": "GridSelection", + "_dialyzerTypeRect": "GridSelection", + + "_dialysateTemperature": "SliderCreateTreatment", +# "_arterialPressureLimits": "RangeSlider", +# "_venousPressureLimits": "RangeSlider", + + "_bloodPressureMeasurementInterval": "SliderCreateTreatment", + "_rinsebackFlowRate": "SliderCreateTreatment", + "_continueButton": "TouchRect", - "_dialysateTemperature": "SliderCreateTreatment", - "_arterialPressureLimits": "SliderDoubleCreateTreatment", - "_venousPressureLimits": "SliderDoubleCreateTreatment", - - "_bloodPressureMeasurementInterval": "SliderCreateTreatment", - "_rinsebackFlowRate": "SliderCreateTreatment", - "_continueButton": "TouchRect", - } for parameter_name, type_name in parameter_names.items(): @@ -110,7 +115,9 @@ @return: None """ - + test.fail("TODO : test_sliders() Need to update / remove the testcase to reflect new GUIs and navigation...return") + return + sliders = { "_bloodFlowRate": {"min": slider_ranges["bloodFlowRateMin"], "max": slider_ranges["bloodFlowRateMax"], "units": "mL/min" }, "_dialysateFlowRate": {"min": slider_ranges["dialysateFlowRateMin"], "max": slider_ranges["dialysateFlowRateMax"], "units": "mL/min" }, @@ -120,23 +127,22 @@ "_heparinStopTime": {"min": slider_ranges["heparinStopTimeMin"], "max": slider_ranges["heparinStopTimeMax"], "units": "min" }, "_salineBolus": {"min": slider_ranges["salineBolusMin"], "max": slider_ranges["salineBolusMax"], "units": "mL" }, "_dialysateTemperature": {"min": slider_ranges["dialysateTempMin"], "max": slider_ranges["dialysateTempMax"], "units": "C" }, - "_arterialPressureLimitsLow": {"min": slider_ranges["arterialPressureLimitLowMin"], "max": slider_ranges["arterialPressureLimitLowMax"], "units": "mmHg" }, - "_arterialPressureLimitsHigh": {"min": slider_ranges["arterialPressureLimitHighMin"], "max": slider_ranges["arterialPressureLimitHighMax"], "units": "mmHg" }, - "_venousPressureLimitsLow": {"min": slider_ranges["venousPressureLimitLowMin"], "max": slider_ranges["venousPressureLimitLowMax"], "units": "mmHg" }, - "_venousPressureLimitsHigh": {"min": slider_ranges["venousPressureLimitHighMin"], "max": slider_ranges["venousPressureLimitHighMax"], "units": "mmHg" }, "_bloodPressureMeasurementInterval": {"min": slider_ranges["bloodPressureMeasureIntervalMin"], "max": slider_ranges["bloodPressureMeasureIntervalMax"], "units": "min" }, "_rinsebackFlowRate": {"min": slider_ranges["rinsebackFlowRateMin"], "max": slider_ranges["rinsebackFlowRateMax"], "units": "mL/min" }, } for slider_name, slider_info in sliders.items(): + if slider_name == "_heparinStopTime": + flick(waitForObject(names.o_create_treatment_flickable), 0, 300) + sleep(1) if slider_name == "_salineBolus": - flick(waitForObject(names.o_create_treatment_flickable), 0, 700) + flick(waitForObject(names.o_create_treatment_flickable), 0, 300) sleep(1) if slider_name == "_dialysateTemperature": flick(waitForObject(names.o_create_treatment_flickable), 0, 700) sleep(1) - if slider_name == "_venousPressureLimitsHigh": - flick(waitForObject(names.o_create_treatment_flickable), 0, 300) + if slider_name == "_bloodPressureMeasurementInterval": + flick(waitForObject(names.o_create_treatment_flickable), 0, 700) sleep(2) @@ -177,6 +183,13 @@ test.compare(waitForObject(selected_value_object).text, "{0} {1}".format(slider_info["max"], slider_info["units"])) + mouseClick(waitForObject(names.o_create_treatment_venousPressureLimitsSlider), 82, 3, Qt.LeftButton) + mouseClick(waitForObject(names.o_create_treatment_venousPressureLimitsSlider), 609, 4, Qt.LeftButton) + mouseClick(waitForObject(names.o_create_treatment_arterialPressureLimitsSlider), 92, 4, Qt.LeftButton) + mouseClick(waitForObject(names.o_create_treatment_arterialPressureLimitsSlider), 563, 5, Qt.LeftButton) + + print("") + def check_button_group(buttons, slider_ranges_key): for idx, btn in enumerate(buttons): @@ -193,6 +206,8 @@ @return: None """ + test.fail("TODO : test_rects() Need to update / remove the testcase to reflect new GUIs and navigation...return") + return flick(waitForObject(names.o_create_treatment_flickable), 0, -1100) @@ -233,6 +248,9 @@ @param hd_simulator: the HDSimulator object @return: None """ + test.fail("TODO : Need to update / remove the testcase to reflect new GUIs and navigation...return") + return + utils.waitForGUI(0.5) flick(waitForObject(names.o_create_treatment_flickable), 0, 2000) @@ -260,14 +278,17 @@ @param hd_simulator: the HDSimulator object @return: None """ + test.fail("TODO : test_continue_success() Need to update / remove the testcase to reflect new GUIs and navigation...return") + return + flick(waitForObject(names.o_create_treatment_flickable), 0, 700) mouseClick(waitForObject(names.o_create_treatment_continue)) sleep(1) test.compare(waitForObjectExists(names.o_create_treatment_confirm).visible, True) def main(): utils.tstStart(__file__) - startApplication(names.AUT_NAME + " -q") + startApplication(config.AUT_NAME + " -q") hd_simulator = HDSimulator() test_load_create_treatment() test_continue_failure(hd_simulator)