Index: tst_TreatmentStatesData/test.py
===================================================================
diff -u -rd8ec01a7bb4d530339ded2f8034995604db04612 -r393fd43e9a1cbf6b25a0f107928a051a622b2be2
--- tst_TreatmentStatesData/test.py	(.../test.py)	(revision d8ec01a7bb4d530339ded2f8034995604db04612)
+++ tst_TreatmentStatesData/test.py	(.../test.py)	(revision 393fd43e9a1cbf6b25a0f107928a051a622b2be2)
@@ -14,24 +14,8 @@
 
 import names
 from dialin.squish import utils, denaliMessages
+from dialin.squish.denaliMessages import txStates
 
-class txStates:
-    # Saline states
-    SALINE_STOP_STATE        = 0
-    SALINE_START_STATE       = 1
-    SALINE_DISABLE_STATE     = 2
-    
-    # UF states
-    # UI only cares about the actual state and _NOT could be any other state
-    UF_PAUSED_STATE_NOT      = 0
-    UF_PAUSED_STATE          = 1
-    
-    # Sub Mode
-    # UI only cares about the actual state and _NOT could be any other state
-    TREATMENT_DIALYSIS_STATE_NOT = 0
-    TREATMENT_DIALYSIS_STATE     = 1 
-    
-    
 def gotoScreenNtest_Contains_TreatmentStatesData():
     mouseClick(waitForObject(names.o_treatmentHome_startTreatment))
     test_values(0, 0, 0)
@@ -40,14 +24,14 @@
 def test_values(vSubMode, vUFState, vSalineState):
     # these test cases are not always depending on each other
     if (vSubMode     == txStates.TREATMENT_DIALYSIS_STATE_NOT):
-        test.compare(    waitForObjectExists(names.o_treatmentStart_treatmentTime_arrowImage    ).visible, True )
-        test.compare(    waitForObjectExists(names.o_treatmentStart_treatmentTime_second        ).visible, True )
-        test.compare(       findObject      (names.o_treatmentStart_treatmentTime_notification  ).visible, False)
+        test.compare(    waitForObjectExists(names.o_treatmentStart_treatmentTime_arrowImage    ).visible, False )
+        test.compare(    waitForObjectExists(names.o_treatmentStart_treatmentTime_second        ).visible, False )
+        test.compare(       findObject      (names.o_treatmentStart_treatmentTime_notification  ).visible, True  )
         
     if (vSubMode     == txStates.TREATMENT_DIALYSIS_STATE    ):
-        test.compare(       findObject      (names.o_treatmentStart_treatmentTime_arrowImage    ).visible, False)
-        test.compare(       findObject      (names.o_treatmentStart_treatmentTime_second        ).visible, False)
-        test.compare(    waitForObjectExists(names.o_treatmentStart_treatmentTime_notification  ).visible, True )
+        test.compare(       findObject      (names.o_treatmentStart_treatmentTime_arrowImage    ).visible, True  )
+        test.compare(       findObject      (names.o_treatmentStart_treatmentTime_second        ).visible, True  )
+        test.compare(    waitForObjectExists(names.o_treatmentStart_treatmentTime_notification  ).visible, False )
         test.compare(str(waitForObjectExists(names.o_treatmentStart_treatmentTime_notification  ).text  ), "Treatment Paused")
         
     if (vUFState     == txStates.UF_PAUSED_STATE_NOT         ):
@@ -58,16 +42,16 @@
         test.compare(    waitForObjectExists(names.o_treatmentStart_ultrafiltration_notification    ).visible    , True)
         test.compare(str(waitForObjectExists(names.o_treatmentStart_ultrafiltration_notification    ).text  )    , "Ultrafiltration Paused" )
                                                              
-    if (vSalineState == txStates.SALINE_DISABLE_STATE        ):
+    if (vSalineState == txStates.SALINE_BOLUS_STATE_MAX_DELIVERED        ):
         test.compare(    waitForObjectExists(names.o_treatmentStart_SalineSection       ).isTouchable, False)
         test.compare(str(waitForObjectExists(names.o_treatmentStart_SalineStart         ).text.text), "START BOLUS")
         test.compare(str(waitForObjectExists(names.o_treatmentStart_SalineNotification  ).text     ), "Maximum cumulative saline bolus volume delivered")
         test.compare(    waitForObjectExists(names.o_treatmentStart_SalineNotification  ).visible, True)
 
     # in all the other cases it should be enabled
-    test.compare(waitForObjectExists(names.o_treatmentStart_SalineStart).text.enabled, vSalineState != txStates.SALINE_DISABLE_STATE)
+    test.compare(waitForObjectExists(names.o_treatmentStart_SalineStart).text.enabled, vSalineState != txStates.SALINE_BOLUS_STATE_MAX_DELIVERED)
 
-    if (vSalineState == txStates.SALINE_STOP_STATE           ):
+    if (vSalineState == txStates.SALINE_BOLUS_STATE_IDLE           ):
         test.compare(    waitForObjectExists(names.o_treatmentStart_ultrafiltration_section         ).isTouchable, True  )
         utils.waitForGUI()
         mouseClick  (    waitForObject      (names.o_treatmentStart_ultrafiltration_section))
@@ -79,7 +63,7 @@
         
         mouseClick  (    waitForObject      (names.o_closeButton))
                                                              
-    if (vSalineState == txStates.SALINE_START_STATE          ):
+    if (vSalineState == txStates.SALINE_BOLUS_STATE_IN_PROGRESS          ):
         test.compare(    waitForObjectExists(names.o_treatmentStart_ultrafiltration_section         ).isTouchable, False )
 
 
@@ -93,60 +77,60 @@
     utils.waitForGUI(1)
 
     # start
-    denaliMessages.setTreatmentStatesData(txStates.TREATMENT_DIALYSIS_STATE_NOT, txStates.UF_PAUSED_STATE_NOT, txStates.SALINE_STOP_STATE   ) # 0 0 0 
-    test_values                          (txStates.TREATMENT_DIALYSIS_STATE_NOT, txStates.UF_PAUSED_STATE_NOT, txStates.SALINE_STOP_STATE   ) # 0 0 0
+    denaliMessages.setTreatmentStatesData(txStates.TREATMENT_DIALYSIS_STATE_NOT, txStates.UF_PAUSED_STATE_NOT, txStates.SALINE_BOLUS_STATE_IDLE   ) # 0 0 0 
+    test_values                          (txStates.TREATMENT_DIALYSIS_STATE_NOT, txStates.UF_PAUSED_STATE_NOT, txStates.SALINE_BOLUS_STATE_IDLE   ) # 0 0 0
     utils.waitForGUI(secPause)
     
-    denaliMessages.setTreatmentStatesData(txStates.TREATMENT_DIALYSIS_STATE_NOT, txStates.UF_PAUSED_STATE_NOT, txStates.SALINE_START_STATE  ) # 0 0 1
-    test_values                          (txStates.TREATMENT_DIALYSIS_STATE_NOT, txStates.UF_PAUSED_STATE_NOT, txStates.SALINE_START_STATE  ) # 0 0 1
+    denaliMessages.setTreatmentStatesData(txStates.TREATMENT_DIALYSIS_STATE_NOT, txStates.UF_PAUSED_STATE_NOT, txStates.SALINE_BOLUS_STATE_IN_PROGRESS  ) # 0 0 1
+    test_values                          (txStates.TREATMENT_DIALYSIS_STATE_NOT, txStates.UF_PAUSED_STATE_NOT, txStates.SALINE_BOLUS_STATE_IN_PROGRESS  ) # 0 0 1
     utils.waitForGUI(secPause)
 
-    denaliMessages.setTreatmentStatesData(txStates.TREATMENT_DIALYSIS_STATE_NOT, txStates.UF_PAUSED_STATE_NOT, txStates.SALINE_DISABLE_STATE) # 0 0 2
-    test_values                          (txStates.TREATMENT_DIALYSIS_STATE_NOT, txStates.UF_PAUSED_STATE_NOT, txStates.SALINE_DISABLE_STATE) # 0 0 2
+    denaliMessages.setTreatmentStatesData(txStates.TREATMENT_DIALYSIS_STATE_NOT, txStates.UF_PAUSED_STATE_NOT, txStates.SALINE_BOLUS_STATE_MAX_DELIVERED) # 0 0 2
+    test_values                          (txStates.TREATMENT_DIALYSIS_STATE_NOT, txStates.UF_PAUSED_STATE_NOT, txStates.SALINE_BOLUS_STATE_MAX_DELIVERED) # 0 0 2
     utils.waitForGUI(secPause)                                                 
                                                                                
-    denaliMessages.setTreatmentStatesData(txStates.TREATMENT_DIALYSIS_STATE_NOT, txStates.UF_PAUSED_STATE    , txStates.SALINE_STOP_STATE   ) # 0 1 0
-    test_values                          (txStates.TREATMENT_DIALYSIS_STATE_NOT, txStates.UF_PAUSED_STATE    , txStates.SALINE_STOP_STATE   ) # 0 1 0
+    denaliMessages.setTreatmentStatesData(txStates.TREATMENT_DIALYSIS_STATE_NOT, txStates.UF_PAUSED_STATE    , txStates.SALINE_BOLUS_STATE_IDLE   ) # 0 1 0
+    test_values                          (txStates.TREATMENT_DIALYSIS_STATE_NOT, txStates.UF_PAUSED_STATE    , txStates.SALINE_BOLUS_STATE_IDLE   ) # 0 1 0
     utils.waitForGUI(secPause)                                                 
                                                                                
-    denaliMessages.setTreatmentStatesData(txStates.TREATMENT_DIALYSIS_STATE_NOT, txStates.UF_PAUSED_STATE_NOT, txStates.SALINE_START_STATE  ) # 0 1 1
-    test_values                          (txStates.TREATMENT_DIALYSIS_STATE_NOT, txStates.UF_PAUSED_STATE_NOT, txStates.SALINE_START_STATE  ) # 0 1 1
+    denaliMessages.setTreatmentStatesData(txStates.TREATMENT_DIALYSIS_STATE_NOT, txStates.UF_PAUSED_STATE_NOT, txStates.SALINE_BOLUS_STATE_IN_PROGRESS  ) # 0 1 1
+    test_values                          (txStates.TREATMENT_DIALYSIS_STATE_NOT, txStates.UF_PAUSED_STATE_NOT, txStates.SALINE_BOLUS_STATE_IN_PROGRESS  ) # 0 1 1
     utils.waitForGUI(secPause)                                                 
                                                                                
-    denaliMessages.setTreatmentStatesData(txStates.TREATMENT_DIALYSIS_STATE_NOT, txStates.UF_PAUSED_STATE_NOT, txStates.SALINE_DISABLE_STATE) # 0 1 2
-    test_values                          (txStates.TREATMENT_DIALYSIS_STATE_NOT, txStates.UF_PAUSED_STATE_NOT, txStates.SALINE_DISABLE_STATE) # 0 1 2
+    denaliMessages.setTreatmentStatesData(txStates.TREATMENT_DIALYSIS_STATE_NOT, txStates.UF_PAUSED_STATE_NOT, txStates.SALINE_BOLUS_STATE_MAX_DELIVERED) # 0 1 2
+    test_values                          (txStates.TREATMENT_DIALYSIS_STATE_NOT, txStates.UF_PAUSED_STATE_NOT, txStates.SALINE_BOLUS_STATE_MAX_DELIVERED) # 0 1 2
     utils.waitForGUI(secPause)                                                 
                                                                                
-    denaliMessages.setTreatmentStatesData(txStates.TREATMENT_DIALYSIS_STATE    , txStates.UF_PAUSED_STATE_NOT, txStates.SALINE_STOP_STATE   ) # 1 0 0
-    test_values                          (txStates.TREATMENT_DIALYSIS_STATE    , txStates.UF_PAUSED_STATE_NOT, txStates.SALINE_STOP_STATE   ) # 1 0 0
+    denaliMessages.setTreatmentStatesData(txStates.TREATMENT_DIALYSIS_STATE    , txStates.UF_PAUSED_STATE_NOT, txStates.SALINE_BOLUS_STATE_IDLE   ) # 1 0 0
+    test_values                          (txStates.TREATMENT_DIALYSIS_STATE    , txStates.UF_PAUSED_STATE_NOT, txStates.SALINE_BOLUS_STATE_IDLE   ) # 1 0 0
     utils.waitForGUI(secPause)                                                 
                                                                                
-    denaliMessages.setTreatmentStatesData(txStates.TREATMENT_DIALYSIS_STATE    , txStates.UF_PAUSED_STATE_NOT, txStates.SALINE_START_STATE  ) # 1 0 1
-    test_values                          (txStates.TREATMENT_DIALYSIS_STATE    , txStates.UF_PAUSED_STATE_NOT, txStates.SALINE_START_STATE  ) # 1 0 1
+    denaliMessages.setTreatmentStatesData(txStates.TREATMENT_DIALYSIS_STATE    , txStates.UF_PAUSED_STATE_NOT, txStates.SALINE_BOLUS_STATE_IN_PROGRESS  ) # 1 0 1
+    test_values                          (txStates.TREATMENT_DIALYSIS_STATE    , txStates.UF_PAUSED_STATE_NOT, txStates.SALINE_BOLUS_STATE_IN_PROGRESS  ) # 1 0 1
     utils.waitForGUI(secPause)                                                 
                                                                                
-    denaliMessages.setTreatmentStatesData(txStates.TREATMENT_DIALYSIS_STATE    , txStates.UF_PAUSED_STATE_NOT, txStates.SALINE_DISABLE_STATE) # 1 0 2
-    test_values                          (txStates.TREATMENT_DIALYSIS_STATE    , txStates.UF_PAUSED_STATE_NOT, txStates.SALINE_DISABLE_STATE) # 1 0 2
+    denaliMessages.setTreatmentStatesData(txStates.TREATMENT_DIALYSIS_STATE    , txStates.UF_PAUSED_STATE_NOT, txStates.SALINE_BOLUS_STATE_MAX_DELIVERED) # 1 0 2
+    test_values                          (txStates.TREATMENT_DIALYSIS_STATE    , txStates.UF_PAUSED_STATE_NOT, txStates.SALINE_BOLUS_STATE_MAX_DELIVERED) # 1 0 2
     utils.waitForGUI(secPause)                                                 
                                                                                
-    denaliMessages.setTreatmentStatesData(txStates.TREATMENT_DIALYSIS_STATE    , txStates.UF_PAUSED_STATE    , txStates.SALINE_STOP_STATE   ) # 1 1 0
-    test_values                          (txStates.TREATMENT_DIALYSIS_STATE    , txStates.UF_PAUSED_STATE    , txStates.SALINE_STOP_STATE   ) # 1 1 0
+    denaliMessages.setTreatmentStatesData(txStates.TREATMENT_DIALYSIS_STATE    , txStates.UF_PAUSED_STATE    , txStates.SALINE_BOLUS_STATE_IDLE   ) # 1 1 0
+    test_values                          (txStates.TREATMENT_DIALYSIS_STATE    , txStates.UF_PAUSED_STATE    , txStates.SALINE_BOLUS_STATE_IDLE   ) # 1 1 0
     utils.waitForGUI(secPause)                                                 
                                                                                
-    denaliMessages.setTreatmentStatesData(txStates.TREATMENT_DIALYSIS_STATE    , txStates.UF_PAUSED_STATE    , txStates.SALINE_START_STATE  ) # 1 1 1
-    test_values                          (txStates.TREATMENT_DIALYSIS_STATE    , txStates.UF_PAUSED_STATE    , txStates.SALINE_START_STATE  ) # 1 1 1
+    denaliMessages.setTreatmentStatesData(txStates.TREATMENT_DIALYSIS_STATE    , txStates.UF_PAUSED_STATE    , txStates.SALINE_BOLUS_STATE_IN_PROGRESS  ) # 1 1 1
+    test_values                          (txStates.TREATMENT_DIALYSIS_STATE    , txStates.UF_PAUSED_STATE    , txStates.SALINE_BOLUS_STATE_IN_PROGRESS  ) # 1 1 1
     utils.waitForGUI(secPause)                                                 
                                                                                
-    denaliMessages.setTreatmentStatesData(txStates.TREATMENT_DIALYSIS_STATE    , txStates.UF_PAUSED_STATE    , txStates.SALINE_DISABLE_STATE) # 1 1 2
-    test_values                          (txStates.TREATMENT_DIALYSIS_STATE    , txStates.UF_PAUSED_STATE    , txStates.SALINE_DISABLE_STATE) # 1 1 2
+    denaliMessages.setTreatmentStatesData(txStates.TREATMENT_DIALYSIS_STATE    , txStates.UF_PAUSED_STATE    , txStates.SALINE_BOLUS_STATE_MAX_DELIVERED) # 1 1 2
+    test_values                          (txStates.TREATMENT_DIALYSIS_STATE    , txStates.UF_PAUSED_STATE    , txStates.SALINE_BOLUS_STATE_MAX_DELIVERED) # 1 1 2
     utils.waitForGUI(secPause)                                                 
                                                                                
-    denaliMessages.setTreatmentStatesData(txStates.TREATMENT_DIALYSIS_STATE    , txStates.UF_PAUSED_STATE    , txStates.SALINE_DISABLE_STATE) # 1 1 2
-    test_values                          (txStates.TREATMENT_DIALYSIS_STATE    , txStates.UF_PAUSED_STATE    , txStates.SALINE_DISABLE_STATE) # 1 1 2
+    denaliMessages.setTreatmentStatesData(txStates.TREATMENT_DIALYSIS_STATE    , txStates.UF_PAUSED_STATE    , txStates.SALINE_BOLUS_STATE_MAX_DELIVERED) # 1 1 2
+    test_values                          (txStates.TREATMENT_DIALYSIS_STATE    , txStates.UF_PAUSED_STATE    , txStates.SALINE_BOLUS_STATE_MAX_DELIVERED) # 1 1 2
     utils.waitForGUI(secPause)                                                 
                                                                                
-    denaliMessages.setTreatmentStatesData(txStates.TREATMENT_DIALYSIS_STATE_NOT, txStates.UF_PAUSED_STATE_NOT, txStates.SALINE_STOP_STATE   ) # 0 0 0
-    test_values                          (txStates.TREATMENT_DIALYSIS_STATE_NOT, txStates.UF_PAUSED_STATE_NOT, txStates.SALINE_STOP_STATE   ) # 0 0 0
+    denaliMessages.setTreatmentStatesData(txStates.TREATMENT_DIALYSIS_STATE_NOT, txStates.UF_PAUSED_STATE_NOT, txStates.SALINE_BOLUS_STATE_IDLE   ) # 0 0 0
+    test_values                          (txStates.TREATMENT_DIALYSIS_STATE_NOT, txStates.UF_PAUSED_STATE_NOT, txStates.SALINE_BOLUS_STATE_IDLE   ) # 0 0 0
     utils.waitForGUI(secPause)
 
     utils.tstDone()