Index: tst_Treatment_Adjustment_Saline/test.py
===================================================================
diff -u -r54849f9bbce1803f0a5330508e4891c161bb86d4 -r24485172848ae32d15cf665b2ef024129dec6ca2
--- tst_Treatment_Adjustment_Saline/test.py	(.../test.py)	(revision 54849f9bbce1803f0a5330508e4891c161bb86d4)
+++ tst_Treatment_Adjustment_Saline/test.py	(.../test.py)	(revision 24485172848ae32d15cf665b2ef024129dec6ca2)
@@ -15,18 +15,17 @@
 
 import names
 from dialin.squish import utils, denaliMessages
+from dialin.squish.denaliMessages import txStates
+from dialin.common.msg_defs import RequestRejectReasons as rejectReason
 
 
-REQUEST_REJECT_REASON_SALINE_BOLUS_IN_PROGRESS = 16
-
-
 def gotoScreenNtest_Contains_TreatmentSalineBolusData():
     mouseClick(waitForObject(names.o_treatmentHome_startTreatment))
     test.compare(str(waitForObjectExists(names.o_treatmentStart_SalineSection).buttonText), "START BOLUS")
     test.compare(str(waitForObjectExists(names.o_treatmentStart_SalineSection).title     ), "SALINE BOLUS")
     test.compare(    waitForObjectExists(names.o_treatmentStart_SalineSection).visible    , True)
+    utils.waitForGUI(1)
 
-
 def getUnit():
     return str(waitForObjectExists(names.o_treatmentStart_SalineSection).unit)
     
@@ -36,20 +35,20 @@
     test.compare(str(waitForObjectExists(names.o_treatmentStart_SalineTarget ).text)       , "({:.0f} {})".format(vTarget, getUnit()))
     
 
-def test_state(vAccept, vText):
+def test_state(vAccept, vText, vState):
     mReason = 0
-    if (not vAccept): mReason = REQUEST_REJECT_REASON_SALINE_BOLUS_IN_PROGRESS 
+    if (not vAccept): mReason = rejectReason.REQUEST_REJECT_REASON_SALINE_BOLUS_IN_PROGRESS.value
     mouseClick(waitForObject(names.o_treatmentStart_SalineStart))
     # when rejected reason set 16
     # although rejected value has been sent to check UI only looks for Accept field
     # value and reason are not related by added those two to have a different value in case of rejection
     target = 50 + mReason
-    denaliMessages.setSalineBolusResponse(vAccept, mReason, target)
+    denaliMessages.setSalineBolusResponse(vAccept, mReason, target, vState)
     test.compare(str(waitForObjectExists(names.o_treatmentStart_SalineSection).buttonText), "{} BOLUS".format(vText))
     test_target(target)
 
 
-def test_ultrafiltration(vEnabled):
+def test_ultrafiltration_touchable(vEnabled):
     test.compare(waitForObjectExists(names.o_treatmentStart_ultrafiltrationTouchArea_TreatmentUltrafiltration).isTouchable, vEnabled)
 
 
@@ -59,37 +58,45 @@
     startApplication(names.AUT_NAME)
     utils.waitForGUI(1)
   
-    #initially is stopped                          (Text => START)
+    # Initial Idle                        -> Idle/START/UF_True
     gotoScreenNtest_Contains_TreatmentSalineBolusData()
-    utils.waitForGUI(1)
-   
-    # Init  stopped, stopped =(accepted)=> running (Text => STOP )
-    test_state(True , "STOP" )
-    test_ultrafiltration(False)
+    test_ultrafiltration_touchable(True )
     
-    # Now   running, running =(rejected)== running (Text == STOP )
-    test_state(False, "STOP" )
-    test_ultrafiltration(False)
-    
-    # multiple same request should not affect if rejected
-    # Now   running, running =(rejected)== running (Text == STOP )
-    test_state(False, "STOP" )
-    test_ultrafiltration(False)
+    # Initial Idle => Running => Rejected -> Idle/START/UF_True
+    test_state(False, "START"  , txStates.SALINE_BOLUS_STATE_IDLE ) 
+    test_ultrafiltration_touchable(True )
 
-    # Still running, running =(accepted)=> stopped (Text == START)
-    test_state(True , "START")
-    test_ultrafiltration(True)
+    # retry   Idle => Running => Rejected -> Idle/START/UF_True
+    test_state(False, "START"  , txStates.SALINE_BOLUS_STATE_IDLE ) 
+    test_ultrafiltration_touchable(True )
+
+    # Still   Idle => Running => Accepted -> Running/STOP/UF_False
+    test_state(True , "STOP"  , txStates.SALINE_BOLUS_STATE_IN_PROGRESS )
+    test_ultrafiltration_touchable(False)
     
-    # Now   stopped, stopped =(rejected)== stopped (Text == START)
-    test_state(False, "START")
-    test_ultrafiltration(True)
+    # Now     Running => Idle => Rejected -> Running/STOP/UF_False
+    test_state(False, "STOP"  , txStates.SALINE_BOLUS_STATE_IN_PROGRESS )
+    test_ultrafiltration_touchable(False)
     
-    # Now   stopped, stopped =(accepted)=> running (Text == STOP )
-    test_state(True , "STOP" )
-    test_ultrafiltration(False)
+    # Retry   Running => Idle => Rejected -> Running/STOP/UF_False
+    test_state(False, "STOP"  , txStates.SALINE_BOLUS_STATE_IN_PROGRESS )
+    test_ultrafiltration_touchable(False)
+
+    # Still   Running => Idle => Accepted -> Idle/START/UF_True
+    test_state(True , "START" , txStates.SALINE_BOLUS_STATE_IDLE        )
+    test_ultrafiltration_touchable(True )
     
-    # Still running, running =(accepted)=> stopped (Text == START)
-    test_state(True, "START")
-    test_ultrafiltration(True)
+    # Now     Idle => Running => Rejected -> Idle/START/UF_True
+    test_state(False, "START" , txStates.SALINE_BOLUS_STATE_IDLE        )
+    test_ultrafiltration_touchable(True )
     
+    # Retry   Idle => Running => Rejected -> Idle/START/UF_True
+    test_state(False, "START" , txStates.SALINE_BOLUS_STATE_IDLE        )
+    test_ultrafiltration_touchable(True )
+
+    # Still   Idle => Running => Accepted -> Running/STOP/UF_False
+    test_state(True , "STOP" , txStates.SALINE_BOLUS_STATE_IN_PROGRESS  )
+    test_ultrafiltration_touchable(False)
+    
+
     utils.tstDone()