Index: shared/scripts/configuration/config.py =================================================================== diff -u -r41a41434dd49aae846705cffee42ae5cce9be88e -r6f6d0397978bb45002f09804775e2df4d16c24a5 --- shared/scripts/configuration/config.py (.../config.py) (revision 41a41434dd49aae846705cffee42ae5cce9be88e) +++ shared/scripts/configuration/config.py (.../config.py) (revision 6f6d0397978bb45002f09804775e2df4d16c24a5) @@ -32,8 +32,8 @@ BLOOD_PRIMING_TEXT = "Blood Priming" SALINE_UNIT = "mL" BLOOD_PRIMING_DEFAULT_VALUE = "0 mL" +SALINE_BOLUS_CUMULATIVE = 300 - # dictionary of rejection reason from application source code. # message location -> denali-> Headers-> common-> MsgDefs.h REJECTION_REASON = { @@ -123,3 +123,4 @@ BLOOD_FLOW_TEXT = "blood" DIALYSATE_FLOW_TEXT = "dialysate" + Index: tst_treatment_saline_data/test.py =================================================================== diff -u -r41a41434dd49aae846705cffee42ae5cce9be88e -r6f6d0397978bb45002f09804775e2df4d16c24a5 --- tst_treatment_saline_data/test.py (.../test.py) (revision 41a41434dd49aae846705cffee42ae5cce9be88e) +++ tst_treatment_saline_data/test.py (.../test.py) (revision 6f6d0397978bb45002f09804775e2df4d16c24a5) @@ -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, so used 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()