Index: shared/scripts/configuration/config.py =================================================================== diff -u -r20f71633acc71b9332335b30d882c45223e02c22 -r0d87dd595814c1ad9b7904dad3e42a78aa3b7b3e --- shared/scripts/configuration/config.py (.../config.py) (revision 20f71633acc71b9332335b30d882c45223e02c22) +++ shared/scripts/configuration/config.py (.../config.py) (revision 0d87dd595814c1ad9b7904dad3e42a78aa3b7b3e) @@ -79,6 +79,7 @@ 39 : "REQUEST_REJECT_REASON_RINSEBACK_NOT_COMPLETED" , # Cannot move on to recirculate without completing full rinseback } + NUM_OF_REQUEST_REJECT_REASONS = 39 +SALINE_BOLUS_CUMULATIVE = 300 - Index: tst_treatment_saline_data/test.py =================================================================== diff -u -r20f71633acc71b9332335b30d882c45223e02c22 -r0d87dd595814c1ad9b7904dad3e42a78aa3b7b3e --- tst_treatment_saline_data/test.py (.../test.py) (revision 20f71633acc71b9332335b30d882c45223e02c22) +++ tst_treatment_saline_data/test.py (.../test.py) (revision 0d87dd595814c1ad9b7904dad3e42a78aa3b7b3e) @@ -23,11 +23,8 @@ from configuration import config #testing options for main treatment saline -SALINE_BOLUS_TARGET = [0, 1, 25, 30, 50, 80, 70, 220, 250, 280, 300] -SALINE_BOLUS_CUMULATIVE = [0, 1, 150.4, 180.8, 25, 35.5, 88, 180, 225, 280, 290] -SALINE_BOLUS_DELIVERED = [0, 1, 220.3, 852.6, 98, 758.1, 862, 752, 564, 580, 600] +SALINE_BOLUS_TARGET = [0, 1, 25, 30, 50, 80, 70, 150, 180, 220, 250, 280, 300] - hd_simulator = HDSimulator() @@ -136,11 +133,11 @@ @return: none """ test.startSection("verification of saline parameter values on main treatment screen") - + #FIXME: execution time is more, if we use specified saline target value for verification. for target_value in SALINE_BOLUS_TARGET: - for index in range(0, len(SALINE_BOLUS_DELIVERED)-1): - cumulative_value = SALINE_BOLUS_CUMULATIVE[index] - delivered_value = SALINE_BOLUS_DELIVERED[index] + for saline_values in range(config.SALINE_BOLUS_CUMULATIVE+1): + cumulative_value = saline_values + delivered_value = config.SALINE_BOLUS_CUMULATIVE - saline_values hd_simulator.cmd_set_treatment_saline_bolus_data(target = target_value, cumulative = cumulative_value, delivered = delivered_value) @@ -151,6 +148,8 @@ verification_of_target_value(expected_target_value = format(target_value, '.1f')) verification_of_delivered_value(expected_delivered_value = format(delivered_value, '.0f')) verification_of_cumulative_value(expected_cumulative_value = format(cumulative_value, '.0f')) + #FIXME: verified stability issue on application, if delay is less. (section getting error in random values) + utils.waitForGUI(0.2) test.endSection() @@ -227,7 +226,6 @@ #verification of target, cumulative and delivered value test_saline_values() - #verification of saline stages test_saline_stage()