Index: tst_In_treatment/test.py =================================================================== diff -u -rc6274593f3f5a607595b95f0243313a6cf32d599 -reabfecc1d8d205f4b8888b99158c54f5ac92ae4e --- tst_In_treatment/test.py (.../test.py) (revision c6274593f3f5a607595b95f0243313a6cf32d599) +++ tst_In_treatment/test.py (.../test.py) (revision eabfecc1d8d205f4b8888b99158c54f5ac92ae4e) @@ -16,20 +16,14 @@ # section import names -import squish import re -from time import sleep from dialin.ui import utils from dialin.ui import unittests - from dialin.ui.hd_simulator import HDSimulator from builtins import str as pyStr -from builtins import int as pyInt +from configuration import utility, config -BLOOD_PRIMING_TEXT = "Blood Priming" -SALINE_UNIT = "mL" -BLOOD_PRIMING_DEFAULT_VALUE = "0 mL" UF_MINIMUM_VALUE = 0.000 UF_MAXIMUM_VALUE = 0.600 UF_DEFAULT_VALUE = 0.000 @@ -44,12 +38,12 @@ @return: N/A """ - blood_priming_page = waitForObject(names.blood_priming) + blood_priming_page = waitForObject(names.o_blood_priming) blood_priming_text = blood_priming_page.text - test.compare(blood_priming_text, BLOOD_PRIMING_TEXT) - blood_priming_value = waitForObject(names.blood_priming_value_by_default) + test.compare(blood_priming_text, config.BLOOD_PRIMING_TEXT) + blood_priming_value = waitForObject(names.o_blood_priming_value_by_default) blood_priming_text = blood_priming_value.text - test.compare(blood_priming_text, BLOOD_PRIMING_DEFAULT_VALUE) + test.compare(blood_priming_text, config.BLOOD_PRIMING_DEFAULT_VALUE) def verification_of_uf_from_dialysis_state(): @@ -58,10 +52,10 @@ @return: N/A """ - uf_minimum = waitForObject(names.uf_minimum_value) + uf_minimum = waitForObject(names.o_uf_minimum_value) uf_minimum_value = uf_minimum.text test.compare(format(UF_MINIMUM_VALUE, ".3f"), uf_minimum_value) - uf_maximum = waitForObject(names.uf_maximum_value) + uf_maximum = waitForObject(names.o_uf_maximum_value) uf_maximum_value = uf_maximum.text test.compare(format(UF_MAXIMUM_VALUE,".3f"), uf_maximum_value) @@ -72,7 +66,7 @@ @input: expected target value. """ - saline_value = waitForObject(names.fluid_text) + saline_value = waitForObject(names.o_fluid_text) saline_target = object.children(saline_value)[0] target_value = saline_target.text target_value_displayed = re.findall(r'\d+', pyStr(target_value)) @@ -85,9 +79,9 @@ @input: expected cumulative value. """ - saline_text = waitForObject(names.cumulative_fluid_text) + saline_text = waitForObject(names.o_cumulative_fluid_text) saline_unit = object.children(saline_text)[0] - if saline_unit.text == SALINE_UNIT: + if saline_unit.text == config.LIQUID_UNIT: saline_cumulative = object.children(saline_text)[1] test.compare(pyStr(expected_cumulative_value), pyStr(saline_cumulative.text)) else: @@ -100,9 +94,9 @@ @input: expected delivered value. """ - saline_text = waitForObject(names.fluid_text) + saline_text = waitForObject(names.o_fluid_text) saline_unit = object.children(saline_text)[1] - if saline_unit.text == SALINE_UNIT: + if saline_unit.text == config.LIQUID_UNIT: saline_cumulative = object.children(saline_text)[2] test.compare(pyStr(expected_delivered_value), pyStr(saline_cumulative.text)) else: @@ -116,33 +110,33 @@ @return: N/A """ #user clicks on ultra filteration section - uf_maximum = waitForObject(names.uf_maximum_value) + uf_maximum = waitForObject(names.o_uf_maximum_value) mouseClick(uf_maximum) utils.waitForGUI(0.5) - uf_minimum = waitForObject(names.uf_minimum_value_pop_up) + uf_minimum = waitForObject(names.o_uf_minimum_value_pop_up) uf_minimum_value = uf_minimum.text test.compare(format(UF_MINIMUM_VALUE, ".3f"), uf_minimum_value) - test.log(f"Uf minimum value should be {format(UF_MINIMUM_VALUE,'.3f')}") + test.log("Uf minimum value should be "+format(UF_MINIMUM_VALUE,'.3f')) - uf_maximum = waitForObject(names.uf_maximum_value_pop_up) + uf_maximum = waitForObject(names.o_uf_maximum_value_pop_up) uf_maximum_value = uf_maximum.text test.compare(format(UF_MAXIMUM_VALUE,".3f"), uf_maximum_value) - test.log(f"Uf maximum value should be {format(UF_MAXIMUM_VALUE,'.3f')}") + test.log("Uf maximum value should be "+format(UF_MAXIMUM_VALUE,'.3f')) - tapObject(waitForObject(names.edit_uf_value)) - uf_maximum_displayed = waitForObject(names.uf_maximum_value) + tapObject(waitForObject(names.o_edit_uf_value)) + uf_maximum_displayed = waitForObject(names.o_uf_maximum_value) test.compare(format(UF_MAXIMUM_VALUE,".3f"), uf_maximum_displayed.text) - test.log(f"Uf maximum value displayed on uf_edit section should be " +\ - f"{format(UF_MAXIMUM_VALUE,'.3f')} by default") + test.log("Uf maximum value displayed on uf_edit section should be " +\ + format(UF_MAXIMUM_VALUE,'.3f')+" by default") utils.waitForGUI(1) - tapObject(waitForObject(names.uf_back_button)) - tapObject(waitForObject(names.uf_close_button)) + tapObject(waitForObject(names.o_uf_back_button)) + tapObject(waitForObject(names.o_uf_close_button)) def main(): - utils.tstStart("Verification of In-Treatment section of application") - startApplication("denaliSquish") + utils.tstStart("tst_In-treatment") + utility.start_application(config.AUT_NAME) hd = HDSimulator() @@ -172,18 +166,16 @@ hd.cmd_set_treatment_saline_bolus_data(target = target_value, cumulative = cumulative_value, delivered = delivered_value) - test.log(f"Verification of saline values from dialysis state for target value : {target_value}"+\ - f" cumulative value : {cumulative_value} and delivered value : {delivered_value}") + test.log("Verification of saline values from dialysis state for target value :" + str(target_value)+\ + " cumulative value :" +str(cumulative_value)+" and delivered value :"+ str(delivered_value)) verification_of_target_value(expected_target_value = target_value) utils.waitForGUI(0.5) verification_of_delivered_value(expected_delivered_value = delivered_value) utils.waitForGUI(0.5) verification_of_cumulative_value(expected_cumulative_value = cumulative_value) utils.waitForGUI(0.5) - #hd.cmd_set_saline_bolus_response(accepted= 1, reason=0, target=150, state= 1) - - + utils.tstDone()