Index: tst_Treatment_Adjustment_Ultrafiltration/test.py
===================================================================
diff -u -r393fd43e9a1cbf6b25a0f107928a051a622b2be2 -r24485172848ae32d15cf665b2ef024129dec6ca2
--- tst_Treatment_Adjustment_Ultrafiltration/test.py	(.../test.py)	(revision 393fd43e9a1cbf6b25a0f107928a051a622b2be2)
+++ tst_Treatment_Adjustment_Ultrafiltration/test.py	(.../test.py)	(revision 24485172848ae32d15cf665b2ef024129dec6ca2)
@@ -14,6 +14,8 @@
 
 import names
 from dialin.squish import utils, denaliMessages
+from dialin.squish.denaliMessages import txStates
+from dialin.common.msg_defs import RequestRejectReasons as rejectReason
 
 
 eInvalid        = 0
@@ -69,6 +71,23 @@
     utils.waitForGUI(1)
 
 
+# --------------- Off Screen --- the default state is off for ultrafiltration
+def testScreen_Off_Ultrafiltration():
+    # [Stop Screen] which is actually paused screen without resume button since the uf is in stop mode and user need to adjust/edit uf volume to start.
+    test.compare(    waitForObjectExists(names.o_treatmentAdjustmentUltrafiltrationPaused_Screen      ).visible, True) 
+    ## Edit Button
+    test.compare(str(waitForObjectExists(names.o_treatmentAdjustmentUltrafiltrationPaused_EditButton  ).text.text), "EDIT ULTRAFILTRATION VOLUME")
+    ## Resume Buttons
+    test.compare(    waitForObjectExists(names.o_treatmentAdjustmentUltrafiltrationPaused_ResumeButton).visible, False)
+    ## Paused Notification
+    test.compare(str(waitForObjectExists(names.o_treatmentAdjustmentUltrafiltrationPaused_PausedText).text), "Ultrafiltration is off")
+
+
+def testScreen_Off_Notification():
+    # [Section Paused Notification]
+    test.compare(str(waitForObjectExists(names.o_treatmentStart_ultrafiltrationTouchArea_TreatmentUltrafiltration).notification.text), "Ultrafiltration is off")
+
+
 # --------------- Start Screen
 def testScreen_Start_Ultrafiltration():
     # [Start Screen]
@@ -86,14 +105,14 @@
     # [Normal Notification]
     test.compare(str(waitForObjectExists(names.o_treatmentAdjustmentUltrafiltrationStart_NotificationBar).text), "")    
     # [Reject Pause]
-    denaliMessages.setTreatmentAdjustUltrafiltrationRejected()
+    denaliMessages.setTreatmentAdjustUltrafiltrationRejected(rejectReason.REQUEST_REJECT_REASON_UF_NOT_IN_PROGESS.value, txStates.UF_RUNNING_STATE)
     # [Reject Notification]
-    test.compare(str(waitForObjectExists(names.o_treatmentAdjustmentUltrafiltrationStart_NotificationBar).text), "Unable to Pause Ultrafiltration or already paused")
+    test.compare(str(waitForObjectExists(names.o_treatmentAdjustmentUltrafiltrationStart_NotificationBar).text), rejectReason.REQUEST_REJECT_REASON_UF_NOT_IN_PROGESS.name)
 
 
 def pause_Accept():
     # [Accept Pause]
-    denaliMessages.setTreatmentAdjustUltrafiltrationAccepted()
+    denaliMessages.setTreatmentAdjustUltrafiltrationAccepted(txStates.UF_PAUSED_STATE)
     # [Accept Notification]
     test.compare(str(waitForObjectExists(names.o_treatmentAdjustmentUltrafiltrationPaused_NotificationBar).text), "")    
     utils.waitForGUI(1)
@@ -108,7 +127,7 @@
     ## Resume Button
     test.compare(str(waitForObjectExists(names.o_treatmentAdjustmentUltrafiltrationPaused_ResumeButton).text.text), "RESUME ULTRAFILTRATION")
     ## Paused Notification
-    test.compare(str(waitForObjectExists(names.o_treatmentAdjustmentUltrafiltrationPaused_PausedText).text), "Ultrafiltration is paused.")
+    test.compare(str(waitForObjectExists(names.o_treatmentAdjustmentUltrafiltrationPaused_PausedText).text), "Ultrafiltration is paused")
     
 
 def resume_Request():
@@ -120,14 +139,14 @@
     # [Normal Notification]
     test.compare(str(waitForObjectExists(names.o_treatmentAdjustmentUltrafiltrationPaused_NotificationBar).text), "")    
     # [Reject Resume]
-    denaliMessages.setTreatmentAdjustUltrafiltrationRejected()
+    denaliMessages.setTreatmentAdjustUltrafiltrationRejected(rejectReason.REQUEST_REJECT_REASON_UF_NOT_PAUSED.value, txStates.UF_PAUSED_STATE)
     # [Reject Notification]
-    test.compare(str(waitForObjectExists(names.o_treatmentAdjustmentUltrafiltrationPaused_NotificationBar).text), "Unable to Resume Ultrafiltration or already running")
+    test.compare(str(waitForObjectExists(names.o_treatmentAdjustmentUltrafiltrationPaused_NotificationBar).text), rejectReason.REQUEST_REJECT_REASON_UF_NOT_PAUSED.name)
 
 
 def resume_Accept():
     # [Accept Resume]
-    denaliMessages.setTreatmentAdjustUltrafiltrationAccepted()
+    denaliMessages.setTreatmentAdjustUltrafiltrationAccepted(txStates.UF_RUNNING_STATE)
     utils.waitForGUI(1)
 
 
@@ -139,7 +158,7 @@
 
 def testScreen_Paused_Notification():
     # [Section Paused Notification]
-    test.compare(str(waitForObjectExists(names.o_treatmentStart_ultrafiltrationTouchArea_TreatmentUltrafiltration).notification.text), "Ultrafiltration Paused")
+    test.compare(str(waitForObjectExists(names.o_treatmentStart_ultrafiltrationTouchArea_TreatmentUltrafiltration).notification.text), "Ultrafiltration is paused")
 
 
 def edit_Clicked():
@@ -149,7 +168,7 @@
 
 def testScreen_Edit_Ultrafiltration():
     test.compare(str(waitForObjectExists(names.o_treatmentAdjustmentUltrafiltrationEdit_NextButton).text.text), "NEXT")
-    test.compare(str(waitForObjectExists(names.o_treatmentAdjustmentUltrafiltrationEdit_PausedText).text), "Ultrafiltration is paused.")
+    test.compare(str(waitForObjectExists(names.o_treatmentAdjustmentUltrafiltrationEdit_PausedText).text), "Ultrafiltration is paused")
     test.compare(str(waitForObjectExists(names.o_backButton).text.text), "BACK")
 
 
@@ -158,10 +177,10 @@
 
 
 def edit_RejectNTest():
-    denaliMessages.setTreatmentAdjustUltrafiltrationEditRejected(12)
+    denaliMessages.setTreatmentAdjustUltrafiltrationEditRejected(rejectReason.REQUEST_REJECT_REASON_UF_RATE_OUT_OF_RANGE.value)
     test.compare(    waitForObjectExists(names.o_treatmentAdjustmentUltrafiltrationEdit_NotificationBar).visible, True)
     #this error message needs to be changed later when translated.
-    test.compare(str(waitForObjectExists(names.o_treatmentAdjustmentUltrafiltrationEdit_NotificationBar).text), "REQUEST_REJECT_REASON_UF_RATE_OUT_OF_RANGE")
+    test.compare(str(waitForObjectExists(names.o_treatmentAdjustmentUltrafiltrationEdit_NotificationBar).text), rejectReason.REQUEST_REJECT_REASON_UF_RATE_OUT_OF_RANGE.name)
 
 
 def updateNTest_Adjustment_Ranges(vMinUFVolume, vMaxUFVolume):
@@ -224,7 +243,7 @@
 def testScreen_Confirm_Ultrafiltration():
     #[Confrim Screen]
     test.compare(    waitForObjectExists(names.o_treatmentAdjustmentUltrafiltrationConfirm_Screen).visible, True)
-    test.compare(str(waitForObjectExists(names.o_treatmentAdjustmentUltrafiltrationConfirm_PausedText).text), "Ultrafiltration is paused.")
+    test.compare(str(waitForObjectExists(names.o_treatmentAdjustmentUltrafiltrationConfirm_PausedText).text), "Ultrafiltration is paused")
     test.compare(str(waitForObjectExists(names.o_treatmentAdjustmentUltrafiltrationConfirm_ConfirmButton).text.text), "CONFIRM")
     test.compare(    waitForObjectExists(names.o_treatmentAdjustmentUltrafiltrationConfirm_ConfirmButton).disabled, True)
     test.compare(str(waitForObjectExists(names.o_backButton).text.text), "BACK")
@@ -300,9 +319,9 @@
 
 
 def confirm_RejectNTest():
-    denaliMessages.setTreatmentAdjustUltrafiltrationConfirmRejected(2)
+    denaliMessages.setTreatmentAdjustUltrafiltrationConfirmRejected(rejectReason.REQUEST_REJECT_REASON_TIMEOUT_WAITING_FOR_USER_CONFIRM.value)
     test.compare(    waitForObjectExists(names.o_treatmentAdjustmentUltrafiltrationConfirm_NotificationBar).visible, True)
-    test.compare(str(waitForObjectExists(names.o_treatmentAdjustmentUltrafiltrationConfirm_NotificationBar).text  ), "REQUEST_REJECT_REASON_TIMEOUT_WAITING_FOR_USER_CONFIRM")
+    test.compare(str(waitForObjectExists(names.o_treatmentAdjustmentUltrafiltrationConfirm_NotificationBar).text  ), rejectReason.REQUEST_REJECT_REASON_TIMEOUT_WAITING_FOR_USER_CONFIRM.name)
 
 
 def confirm_RejectNTest_Unknow():
@@ -324,9 +343,21 @@
     gotoScreenNtest_Contains_Ultrafiltration()
     utils.waitForGUI(1)
 
+    # Main Treatment Off Notification while ultrafiltration is off (default state) 
+    testScreen_Off_Notification()
+
     gotoScreen_UltrafiltrationAdjustment()
 
-    # Start Screen upon User touch while IS NOT PAUSED
+    # Off screen upon user touch while IN OFF (default state)
+    testScreen_Off_Ultrafiltration()
+    closeScreen() # Back to main
+
+    # set the ultrafiltration to running state
+    denaliMessages.setTreatmentStatesData(txStates.TREATMENT_DIALYSIS_STATE_NOT, txStates.UF_RUNNING_STATE, txStates.SALINE_BOLUS_STATE_IDLE )
+
+    gotoScreen_UltrafiltrationAdjustment()
+
+    # Start Screen upon User touch while IS RUNNING
     testScreen_Start_Ultrafiltration()
     closeScreen() # Back to main