Index: tst_Treatment_Ultrafiltration/test.py
===================================================================
diff -u -r99810cece725cd3b1070c61756563b90b6d36650 -r316fd2f51b0fa89c0f69949d79ef246e1e4bc4ed
--- tst_Treatment_Ultrafiltration/test.py	(.../test.py)	(revision 99810cece725cd3b1070c61756563b90b6d36650)
+++ tst_Treatment_Ultrafiltration/test.py	(.../test.py)	(revision 316fd2f51b0fa89c0f69949d79ef246e1e4bc4ed)
@@ -1,59 +1,63 @@
 # -*- coding: utf-8 -*-
-
-##
-# Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved.
-# copyright
-#          THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM,
-#          IN PART OR IN WHOLE,
-#          WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
+###########################################################################
 #
-# file    tst_Treatment_Ultrafiltration
-# date    2020/04/12
-# author  Behrouz NematiPour
+# Copyright (c) 2020-2025 Diality Inc. - All Rights Reserved.
 #
+# THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
+# WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
+#
+# @file    test.py
+#
+# @author  (last)      Behrouz NematiPour
+# @date    (last)      16-Oct-2020
+# @author  (original)  Behrouz NematiPour
+# @date    (original)  13-Apr-2020
+#
+############################################################################
 
 import names
-import utils
-import denaliMessages
+from dialin.squish import utils, denaliMessages
 
+
 def gotoScreenNtest_Contains_Ultrafiltration():
     mouseClick(waitForObject(names.o_treatmentHome_startTreatment))
     test.compare(waitForObjectExists(names.o_treatmentStart_ultrafiltrationTouchArea_TreatmentUltrafiltration).visible, True)
 
 def startNTestTreatmentUltrafiltration(vMinUF, vMaxUF):
-    for i in range(vMinUF, vMaxUF+1):
-        denaliMessages.setTreatmentUltrafiltration(vMaxUF, i, 1, 1, 1, 1, 1)
-        test.compare(waitForObjectExists(names.o_treatmentStart_ultrafiltrationTouchArea_TreatmentUltrafiltration).value, i)
+    for i in range(vMinUF, vMaxUF+1, 10):
+        denaliMessages.setTreatmentUltrafiltration(i, i, 0, 0, 0, 0, 0)
+        test.compare(utils.l2ml(waitForObjectExists(names.o_treatmentStart_ultrafiltrationTouchArea_TreatmentUltrafiltration).value), i)
 
+
 def resetNTestTreatmentUltrafiltration():
     denaliMessages.setTreatmentUltrafiltration(0, 0, 0, 0, 0, 0, 0)
     test.compare(waitForObjectExists(names.o_treatmentStart_ultrafiltrationTouchArea_TreatmentUltrafiltration).value, 0)
      
+
 def main():
-    startApplication("denaliSquish")
+    utils.tstStart(__file__)
+    
+    startApplication(names.AUT_NAME)
+    utils.waitForGUI(1)
 
     gotoScreenNtest_Contains_Ultrafiltration()
     utils.waitForGUI(1)
-
-    minUF = 10
-    maxUF = 20
-    denaliMessages.setTreatmentParamRanges(0, 0, minUF, maxUF, 0, 0)
-    denaliMessages.send_acknowledge_UI()
-    test.compare(waitForObjectExists(names.o_treatmentStart_ultrafiltrationTouchArea_TreatmentUltrafiltration).minimum, minUF)
-    test.compare(waitForObjectExists(names.o_treatmentStart_ultrafiltrationTouchArea_TreatmentUltrafiltration).maximum, maxUF)
     
-    resetNTestTreatmentUltrafiltration()   
-    startNTestTreatmentUltrafiltration(minUF, maxUF)
+    minUF =   0
+    maxUF = 600
+    test.compare(utils.l2ml(waitForObjectExists(names.o_treatmentStart_ultrafiltrationTouchArea_TreatmentUltrafiltration).minimum), minUF)
+    test.compare(utils.l2ml(waitForObjectExists(names.o_treatmentStart_ultrafiltrationTouchArea_TreatmentUltrafiltration).maximum), maxUF)
+    
     resetNTestTreatmentUltrafiltration()
-
-    minUF = 0
-    maxUF = 10
-    denaliMessages.setTreatmentParamRanges(0, 0, minUF, maxUF, 0, 0)
-    denaliMessages.send_acknowledge_UI()
-    test.compare(waitForObjectExists(names.o_treatmentStart_ultrafiltrationTouchArea_TreatmentUltrafiltration).minimum, minUF)
-    test.compare(waitForObjectExists(names.o_treatmentStart_ultrafiltrationTouchArea_TreatmentUltrafiltration).maximum, maxUF)
- 
-    resetNTestTreatmentUltrafiltration()   
     startNTestTreatmentUltrafiltration(minUF, maxUF)
-    resetNTestTreatmentUltrafiltration()
  
+    maxUF = 300
+    denaliMessages.setTreatmentAdjustUltrafiltrationConfirmResponse(1, 0, maxUF, 30, 5) 
+    test.compare(utils.l2ml(waitForObjectExists(names.o_treatmentStart_ultrafiltrationTouchArea_TreatmentUltrafiltration).minimum), minUF)
+    test.compare(utils.l2ml(waitForObjectExists(names.o_treatmentStart_ultrafiltrationTouchArea_TreatmentUltrafiltration).maximum), maxUF)
+    
+    resetNTestTreatmentUltrafiltration()
+    startNTestTreatmentUltrafiltration(minUF, maxUF)
+
+    utils.tstDone()
+    
\ No newline at end of file