Index: tst_TreatmentStatesData/test.py
===================================================================
diff -u -r6d01b12355c38d1a14b9aa6fb3578c52928d285b -rcb8d48033154f4b36a6a05b6f31bd10390e84ac7
--- tst_TreatmentStatesData/test.py	(.../test.py)	(revision 6d01b12355c38d1a14b9aa6fb3578c52928d285b)
+++ tst_TreatmentStatesData/test.py	(.../test.py)	(revision cb8d48033154f4b36a6a05b6f31bd10390e84ac7)
@@ -13,69 +13,71 @@
 #
 
 import names
-from dialin.squish import utils, denaliMessages
-from dialin.squish.denaliMessages import txStates
+from dialin.ui import utils
+from dialin import HDSimulator
+from dialin.ui.hd_simulator import TXStates
+HDSimulator = HDSimulator()
 
 
 def gotoScreenNtest_Contains_TreatmentStatesData():
     mouseClick(waitForObject(names.o_treatmentHome_startTreatment))
     # default state of the in-treatment
-    test_values(txStates.TREATMENT_DIALYSIS_STATE_NOT , txStates.UF_OFF_STATE , txStates.SALINE_BOLUS_STATE_IDLE, txStates.HEPARIN_STATE_OFF)
+    test_values(TXStates.TREATMENT_DIALYSIS_STATE_NOT, TXStates.UF_OFF_STATE, TXStates.SALINE_BOLUS_STATE_IDLE, TXStates.HEPARIN_STATE_OFF)
 
 
 def test_values(vSubMode, vUFState, vSalineState, vHeparinState):
-    denaliMessages.setTreatmentStatesData(vSubMode, vUFState, vSalineState, vHeparinState)
+    HDSimulator.setTreatmentStatesData(vSubMode, vUFState, vSalineState, vHeparinState)
     # these test cases are not always depending on each other
-    if (vSubMode     == txStates.TREATMENT_DIALYSIS_STATE_NOT):
+    if (vSubMode     == TXStates.TREATMENT_DIALYSIS_STATE_NOT):
         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    ):
+    if (vSubMode     == TXStates.TREATMENT_DIALYSIS_STATE):
         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_OFF_STATE                ):
+    if (vUFState     == TXStates.UF_OFF_STATE):
         test.compare(    waitForObjectExists(names.o_treatmentStart_ultrafiltration_notification    ).visible    , True)
         test.compare(str(waitForObjectExists(names.o_treatmentStart_ultrafiltration_notification    ).text  )    , "Ultrafiltration is off"   )
                                                              
-    if (vUFState     == txStates.UF_PAUSED_STATE             ):
+    if (vUFState     == TXStates.UF_PAUSED_STATE):
         test.compare(    waitForObjectExists(names.o_treatmentStart_ultrafiltration_notification    ).visible    , True)
         test.compare(str(waitForObjectExists(names.o_treatmentStart_ultrafiltration_notification    ).text  )    , "Ultrafiltration is paused" )
                                                              
-    if (vUFState     == txStates.UF_COMPLETED_STATE          ):
+    if (vUFState     == TXStates.UF_COMPLETED_STATE):
         test.compare(    waitForObjectExists(names.o_treatmentStart_ultrafiltration_notification    ).visible    , True)
         test.compare(str(waitForObjectExists(names.o_treatmentStart_ultrafiltration_notification    ).text  )    , "Ultrafiltration is completed" )
 
-    if (vSalineState == txStates.SALINE_BOLUS_STATE_MAX_DELIVERED        ):
+    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, 
-                 not ( 
-                     vSalineState == txStates.SALINE_BOLUS_STATE_MAX_DELIVERED or 
-                     vSalineState == txStates.SALINE_BOLUS_STATE_WAIT_FOR_PUMPS_STOP 
+                 not (
+                         vSalineState == TXStates.SALINE_BOLUS_STATE_MAX_DELIVERED or
+                         vSalineState == TXStates.SALINE_BOLUS_STATE_WAIT_FOR_PUMPS_STOP
                      ) 
                  )
 
-    if (vSalineState == txStates.SALINE_BOLUS_STATE_IDLE        ):
+    if (vSalineState == TXStates.SALINE_BOLUS_STATE_IDLE):
         test.compare(    waitForObjectExists(names.o_treatmentStart_ultrafiltration_section         ).isTouchable, True  )
         utils.waitForGUI(0.2)
         mouseClick  (    waitForObject      (names.o_treatmentStart_ultrafiltration_section))
         utils.waitForGUI(0.2)
-        if (vUFState     == txStates.UF_RUNNING_STATE           ):
+        if (vUFState     == TXStates.UF_RUNNING_STATE):
             test.compare(       findObject      (names.o_treatmentAdjustmentUltrafiltrationStart_Screen  ).visible    , True )
         else:
             test.compare(       findObject      (names.o_treatmentAdjustmentUltrafiltrationPaused_Screen ).visible    , True )
         
         mouseClick  (    waitForObject      (names.o_closeButton))
                                                              
-    if (vSalineState == txStates.SALINE_BOLUS_STATE_IN_PROGRESS or vSalineState == txStates.SALINE_BOLUS_STATE_WAIT_FOR_PUMPS_STOP):
+    if (vSalineState == TXStates.SALINE_BOLUS_STATE_IN_PROGRESS or vSalineState == TXStates.SALINE_BOLUS_STATE_WAIT_FOR_PUMPS_STOP):
         test.compare(    waitForObjectExists(names.o_treatmentStart_ultrafiltration_section         ).isTouchable, False )
         test.compare(    waitForObjectExists(names.o_treatmentStart_HeparinSection                  ).isTouchable, False )