Index: suite_leahi/shared/scripts/configuration/config.py =================================================================== diff -u -r9e9fb3fcb3825db1635bd4be27e49c5e0d354b8a -r1b0dfcc0a4907f1aad84794e1d1fc60ea9649e40 --- suite_leahi/shared/scripts/configuration/config.py (.../config.py) (revision 9e9fb3fcb3825db1635bd4be27e49c5e0d354b8a) +++ suite_leahi/shared/scripts/configuration/config.py (.../config.py) (revision 1b0dfcc0a4907f1aad84794e1d1fc60ea9649e40) @@ -98,3 +98,31 @@ ISOLATED_UF_VOLUME_GOAL ="Isolated UF Volume Goal" ULTRAFILTRATION_PAUSED_STATE = "Ultrafiltration Paused" ULTRAFILTRATION_COMPLETE_STATE = "Ultrafiltration Complete" + +#ultrafiltration +MAX_UF_VOLUME = 10.00 +MAX_UF_RATE = 10.00 +MAX_VOLUME_DELIVERED = 8.00 + +MIN_UF_VOLUME = 0.35 +MIN_UF_RATE = 0.22 +MIN_VOLUME_DELIVERED = 0.09 + +MID_UF_VOLUME = 5.00 +MID_UF_RATE = 5.00 +MID_VOLUME_DELIVERED = 4.00 + +ULTRAFILTRATION_VOLUME = "Ultrafiltration Volume (L)" +UF_VOLUME_REMOVED = "UF Volume Removed" +UF_VOLUME_GOAL = "UF Volume Goal" +NEW_UF_VOLUME = "New UF Volume" +NEW_UF_RATE = "New UF Rate" + + + +MAX_NEW_UF_VOLUME = 8.0 +MAX_NEW_UF_RATE = 2.0 + + + +# Index: suite_leahi/tst_ultrafiltration/test.py =================================================================== diff -u -rf89e67f8f2dd341d78381fb45b42ee2d53f242e0 -r1b0dfcc0a4907f1aad84794e1d1fc60ea9649e40 --- suite_leahi/tst_ultrafiltration/test.py (.../test.py) (revision f89e67f8f2dd341d78381fb45b42ee2d53f242e0) +++ suite_leahi/tst_ultrafiltration/test.py (.../test.py) (revision 1b0dfcc0a4907f1aad84794e1d1fc60ea9649e40) @@ -31,29 +31,8 @@ td =TD_Messaging() -MAX_UF_VOLUME = 10.00 -MAX_UF_RATE = 10.00 -MAX_VOLUME_DELIVERED = 8.00 -MIN_UF_VOLUME = 0.35 -MIN_UF_RATE = 0.22 -MIN_VOLUME_DELIVERED = 0.09 -MID_UF_VOLUME = 5.00 -MID_UF_RATE = 5.00 -MID_VOLUME_DELIVERED = 4.00 - -ULTRAFILTRATION_VOLUME = "Ultrafiltration Volume (L)" -UF_VOLUME_REMOVED = "UF Volume Removed" -UF_VOLUME_GOAL = "UF Volume Goal" -NEW_UF_VOLUME = "New UF Volume" -NEW_UF_RATE = "New UF Rate" - - - -MAX_NEW_UF_VOLUME = 8.0 -MAX_NEW_UF_RATE = 2.0 - def continue_edit_changes(accept,rejectionReason): payload = conversions.integer_to_bytearray(accept) payload += conversions.integer_to_bytearray(rejectionReason) @@ -170,37 +149,37 @@ max_dial_rate_mLH = 0) test.startSection("Check the maximum values in Ultrafiltration") - check_values_ultrfiltration_main_treatment(uf_volume = MAX_UF_VOLUME, - uf_rate = MAX_UF_RATE, - volume_delivered = MAX_VOLUME_DELIVERED) + check_values_ultrfiltration_main_treatment(uf_volume = config.MAX_UF_VOLUME, + uf_rate = config.MAX_UF_RATE, + volume_delivered = config.MAX_VOLUME_DELIVERED) test.endSection() test.startSection("Check the mid values in Ultrafiltration") - check_values_ultrfiltration_main_treatment(uf_volume = MID_UF_VOLUME, - uf_rate = MID_UF_RATE, - volume_delivered = MID_VOLUME_DELIVERED) + check_values_ultrfiltration_main_treatment(uf_volume = config.MID_UF_VOLUME, + uf_rate = config.MID_UF_RATE, + volume_delivered = config.MID_VOLUME_DELIVERED) test.endSection() test.startSection("Check the minimum values in Ultrafiltration") - check_values_ultrfiltration_main_treatment(uf_volume = MIN_UF_VOLUME, - uf_rate = MIN_UF_RATE, - volume_delivered = MIN_VOLUME_DELIVERED) + check_values_ultrfiltration_main_treatment(uf_volume = config.MIN_UF_VOLUME, + uf_rate = config.MIN_UF_RATE, + volume_delivered = config.MIN_VOLUME_DELIVERED) test.endSection() test.startSection("Check the values in the Ultrafiltration Volume Popup") mouseClick(waitForObject(names.o_editButton_ultrafiltration_IconButton)) #check the title in edit popup - title = waitForObjectExists(utility.setObjectText(obj=names.o_title_Text,text = ULTRAFILTRATION_VOLUME)) - test.compare(title.text, ULTRAFILTRATION_VOLUME, "Title text should be -> "+ str(ULTRAFILTRATION_VOLUME)) + title = waitForObjectExists(utility.setObjectText(obj=names.o_title_Text,text = config.ULTRAFILTRATION_VOLUME)) + test.compare(title.text, config.ULTRAFILTRATION_VOLUME, "Title text should be -> "+ str(config.ULTRAFILTRATION_VOLUME)) #check the value in the edit popup uf_volume_removed_text = waitForObjectExists(names.o_left_LabelUnitText).label - test.compare(uf_volume_removed_text,UF_VOLUME_REMOVED ,"Text Value should be ->" +str(UF_VOLUME_REMOVED)) + test.compare(uf_volume_removed_text,config.UF_VOLUME_REMOVED ,"Text Value should be ->" +str(config.UF_VOLUME_REMOVED)) uf_volume_removed_value = waitForObjectExists(names.o_left_LabelUnitText).value - test.compare(str(uf_volume_removed_value), str(MIN_VOLUME_DELIVERED), "UF Volume Removed value should be ->"+str(uf_volume_removed_value)) + test.compare(str(uf_volume_removed_value), str(config.MIN_VOLUME_DELIVERED), "UF Volume Removed value should be ->"+str(uf_volume_removed_value)) uf_volume_goal_text =waitForObjectExists(names.o_right_LabelUnitText).label - test.compare(uf_volume_goal_text,UF_VOLUME_GOAL ,"Text Value should be ->" +str(UF_VOLUME_GOAL)) + test.compare(uf_volume_goal_text,config.UF_VOLUME_GOAL ,"Text Value should be ->" +str(config.UF_VOLUME_GOAL)) uf_volume_goal_value = waitForObjectExists(names.o_right_LabelUnitText).value - test.compare(str(uf_volume_goal_value), str(MIN_UF_VOLUME), "UF Volume Removed value should be ->"+str(uf_volume_goal_value)) + test.compare(str(uf_volume_goal_value), str(config.MIN_UF_VOLUME), "UF Volume Removed value should be ->"+str(uf_volume_goal_value)) test.endSection() test.startSection("Check the values in the Confirm Ultrafiltration Volume Popup ") @@ -219,11 +198,9 @@ test.compare(confirm_ultrafiltrationtitle.text, "Confirm Ultrafiltration Volume (L)", "Title text should be -> "+ str("Confirm Ultrafiltration Volume (L)")) new_uf_volume_text = waitForObjectExists(names.o_left_LabelUnitText).label - test.compare(new_uf_volume_text,NEW_UF_VOLUME ,"Text Value should be ->" +str(NEW_UF_VOLUME)) + test.compare(new_uf_volume_text,config.UF_VOLUME_REMOVED ,"Text Value should be ->" +str(config.NEW_UF_VOLUME)) new_uf_rate_text = waitForObjectExists(names.o_right_LabelUnitText).label - test.compare(new_uf_rate_text,NEW_UF_RATE ,"Text Value should be ->" +str(NEW_UF_RATE)) - new_uf_volume_value = waitForObjectExists(names.o_right_LabelUnitText).value - test.compare(new_uf_volume_value, "0.04","Text Value should be ->" +str("0.04")) + test.compare(new_uf_rate_text,config.UF_VOLUME_GOAL ,"Text Value should be ->" +str(config.NEW_UF_RATE)) #click on the continue button mouseClick(waitForObject(names.o_confirmButton_TouchRect))