Index: .settings/org.eclipse.core.resources.prefs =================================================================== diff -u -r8f4c08420761e05cfb3e125bdc9a98a5d30c9bc4 -r4aea809c4c3eaaeb674f79f550aff589e61d6739 --- .settings/org.eclipse.core.resources.prefs (.../org.eclipse.core.resources.prefs) (revision 8f4c08420761e05cfb3e125bdc9a98a5d30c9bc4) +++ .settings/org.eclipse.core.resources.prefs (.../org.eclipse.core.resources.prefs) (revision 4aea809c4c3eaaeb674f79f550aff589e61d6739) @@ -6,3 +6,5 @@ encoding//tst_HomeScreen/test.py=utf-8 encoding//tst_Internals/test.py=utf-8 encoding//tst_ServiceShutdown/test.py=utf-8 +encoding//tst_TreatmentScreen/test.py=utf-8 +encoding//tst_Treatment_Adjustment_Ultrafiltration/test.py=utf-8 Index: shared/scripts/names.py =================================================================== diff -u -r0641bc72e2338b37ace48847abf301374b6620f6 -r4aea809c4c3eaaeb674f79f550aff589e61d6739 --- shared/scripts/names.py (.../names.py) (revision 0641bc72e2338b37ace48847abf301374b6620f6) +++ shared/scripts/names.py (.../names.py) (revision 4aea809c4c3eaaeb674f79f550aff589e61d6739) @@ -12,6 +12,7 @@ # author Behrouz NematiPour # +DIALIN_LINK = False AUT_NAME = "denaliSquish" # Squish # Top Parents Index: tst_Alarm/test.py =================================================================== diff -u -r2565fdf7f0ff9d43afd963653edd4bd00ef426c8 -r4aea809c4c3eaaeb674f79f550aff589e61d6739 --- tst_Alarm/test.py (.../test.py) (revision 2565fdf7f0ff9d43afd963653edd4bd00ef426c8) +++ tst_Alarm/test.py (.../test.py) (revision 4aea809c4c3eaaeb674f79f550aff589e61d6739) @@ -12,11 +12,17 @@ # author Peter Lucia # -import names -from dialin.squish import utils, denaliMessages -from time import sleep import os +from time import sleep +import names +if names.DIALIN_LINK: + from dialin.squish import utils, denaliMessages +else: + import utils + import denaliMessages + + HIGH = 3 MED = 2 LOW = 1 Index: tst_CANBusFaultCount/test.py =================================================================== diff -u -r2565fdf7f0ff9d43afd963653edd4bd00ef426c8 -r4aea809c4c3eaaeb674f79f550aff589e61d6739 --- tst_CANBusFaultCount/test.py (.../test.py) (revision 2565fdf7f0ff9d43afd963653edd4bd00ef426c8) +++ tst_CANBusFaultCount/test.py (.../test.py) (revision 4aea809c4c3eaaeb674f79f550aff589e61d6739) @@ -13,15 +13,18 @@ # import names -from dialin.squish import utils, denaliMessages - +if names.DIALIN_LINK: + from dialin.squish import utils, denaliMessages +else: + import utils + import denaliMessages + def gotoScreenNtest_Contains_CANBusFaultCount(): mouseClick(waitForObject(names.o_mainMenu_settings)) test_values(0) - def test_values(vCount): test.compare(str(waitForObjectExists(names.o_settingsHome_canbusFaultCount).text), "CAN Faults : {}".format(vCount)) Index: tst_DGDrainPumpData/test.py =================================================================== diff -u -r2565fdf7f0ff9d43afd963653edd4bd00ef426c8 -r4aea809c4c3eaaeb674f79f550aff589e61d6739 --- tst_DGDrainPumpData/test.py (.../test.py) (revision 2565fdf7f0ff9d43afd963653edd4bd00ef426c8) +++ tst_DGDrainPumpData/test.py (.../test.py) (revision 4aea809c4c3eaaeb674f79f550aff589e61d6739) @@ -13,8 +13,13 @@ # import names -from dialin.squish import utils, denaliMessages +if names.DIALIN_LINK: + from dialin.squish import utils, denaliMessages +else: + import utils + import denaliMessages + def gotoScreenNtest_Contains_DGDrainPumpData(): mouseClick(waitForObject(names.o_mainMenu_manager)) test_values(0, 0) Index: tst_DGHeatersData/test.py =================================================================== diff -u -r2565fdf7f0ff9d43afd963653edd4bd00ef426c8 -r4aea809c4c3eaaeb674f79f550aff589e61d6739 --- tst_DGHeatersData/test.py (.../test.py) (revision 2565fdf7f0ff9d43afd963653edd4bd00ef426c8) +++ tst_DGHeatersData/test.py (.../test.py) (revision 4aea809c4c3eaaeb674f79f550aff589e61d6739) @@ -13,8 +13,13 @@ # import names -from dialin.squish import utils, denaliMessages +if names.DIALIN_LINK: + from dialin.squish import utils, denaliMessages +else: + import utils + import denaliMessages + def gotoScreenNtest_Contains_DGHeatersData(): mouseClick(waitForObject(names.o_mainMenu_manager)) test_values(0, 0, 0) Index: tst_DGLoadCellReadingsData/test.py =================================================================== diff -u -r2565fdf7f0ff9d43afd963653edd4bd00ef426c8 -r4aea809c4c3eaaeb674f79f550aff589e61d6739 --- tst_DGLoadCellReadingsData/test.py (.../test.py) (revision 2565fdf7f0ff9d43afd963653edd4bd00ef426c8) +++ tst_DGLoadCellReadingsData/test.py (.../test.py) (revision 4aea809c4c3eaaeb674f79f550aff589e61d6739) @@ -13,8 +13,13 @@ # import names -from dialin.squish import utils, denaliMessages +if names.DIALIN_LINK: + from dialin.squish import utils, denaliMessages +else: + import utils + import denaliMessages + def gotoScreenNtest_Contains_DGLoadCellReadingsData(): mouseClick(waitForObject(names.o_mainMenu_manager)) test_values(0, 0, 0, 0) Index: tst_DGOperationMode/test.py =================================================================== diff -u -r2565fdf7f0ff9d43afd963653edd4bd00ef426c8 -r4aea809c4c3eaaeb674f79f550aff589e61d6739 --- tst_DGOperationMode/test.py (.../test.py) (revision 2565fdf7f0ff9d43afd963653edd4bd00ef426c8) +++ tst_DGOperationMode/test.py (.../test.py) (revision 4aea809c4c3eaaeb674f79f550aff589e61d6739) @@ -13,8 +13,13 @@ # import names -from dialin.squish import utils, denaliMessages +if names.DIALIN_LINK: + from dialin.squish import utils, denaliMessages +else: + import utils + import denaliMessages + opModes = [ "DG_MODE_FAUL" , "DG_MODE_SERV" , Index: tst_DGPressureData/test.py =================================================================== diff -u -r2565fdf7f0ff9d43afd963653edd4bd00ef426c8 -r4aea809c4c3eaaeb674f79f550aff589e61d6739 --- tst_DGPressureData/test.py (.../test.py) (revision 2565fdf7f0ff9d43afd963653edd4bd00ef426c8) +++ tst_DGPressureData/test.py (.../test.py) (revision 4aea809c4c3eaaeb674f79f550aff589e61d6739) @@ -13,8 +13,13 @@ # import names -from dialin.squish import utils, denaliMessages +if names.DIALIN_LINK: + from dialin.squish import utils, denaliMessages +else: + import utils + import denaliMessages + def gotoScreenNtest_Contains_DGPressuresData(): mouseClick(waitForObject(names.o_mainMenu_manager)) test_values(0, 0, 0, 0) Index: tst_DGROPumpData/test.py =================================================================== diff -u -r2565fdf7f0ff9d43afd963653edd4bd00ef426c8 -r4aea809c4c3eaaeb674f79f550aff589e61d6739 --- tst_DGROPumpData/test.py (.../test.py) (revision 2565fdf7f0ff9d43afd963653edd4bd00ef426c8) +++ tst_DGROPumpData/test.py (.../test.py) (revision 4aea809c4c3eaaeb674f79f550aff589e61d6739) @@ -13,8 +13,13 @@ # import names -from dialin.squish import utils, denaliMessages +if names.DIALIN_LINK: + from dialin.squish import utils, denaliMessages +else: + import utils + import denaliMessages + def gotoScreenNtest_Contains_DGROPumpData(): mouseClick(waitForObject(names.o_mainMenu_manager)) test_values(0, 0, 0) Index: tst_DGReservoirData/test.py =================================================================== diff -u -r2565fdf7f0ff9d43afd963653edd4bd00ef426c8 -r4aea809c4c3eaaeb674f79f550aff589e61d6739 --- tst_DGReservoirData/test.py (.../test.py) (revision 2565fdf7f0ff9d43afd963653edd4bd00ef426c8) +++ tst_DGReservoirData/test.py (.../test.py) (revision 4aea809c4c3eaaeb674f79f550aff589e61d6739) @@ -13,8 +13,13 @@ # import names -from dialin.squish import utils, denaliMessages +if names.DIALIN_LINK: + from dialin.squish import utils, denaliMessages +else: + import utils + import denaliMessages + def gotoScreenNtest_Contains_DGReservoirData(): mouseClick(waitForObject(names.o_mainMenu_manager)) test_values(0, 0, 0) Index: tst_DGTemperaturesData/test.py =================================================================== diff -u -r2565fdf7f0ff9d43afd963653edd4bd00ef426c8 -r4aea809c4c3eaaeb674f79f550aff589e61d6739 --- tst_DGTemperaturesData/test.py (.../test.py) (revision 2565fdf7f0ff9d43afd963653edd4bd00ef426c8) +++ tst_DGTemperaturesData/test.py (.../test.py) (revision 4aea809c4c3eaaeb674f79f550aff589e61d6739) @@ -13,8 +13,13 @@ # import names -from dialin.squish import utils, denaliMessages +if names.DIALIN_LINK: + from dialin.squish import utils, denaliMessages +else: + import utils + import denaliMessages + def gotoScreenNtest_Contains_DGTemperaturesData(): mouseClick(waitForObject(names.o_mainMenu_manager)) test_values(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0) Index: tst_DGValvesStatesData/test.py =================================================================== diff -u -r2565fdf7f0ff9d43afd963653edd4bd00ef426c8 -r4aea809c4c3eaaeb674f79f550aff589e61d6739 --- tst_DGValvesStatesData/test.py (.../test.py) (revision 2565fdf7f0ff9d43afd963653edd4bd00ef426c8) +++ tst_DGValvesStatesData/test.py (.../test.py) (revision 4aea809c4c3eaaeb674f79f550aff589e61d6739) @@ -13,8 +13,13 @@ # import names -from dialin.squish import utils, denaliMessages +if names.DIALIN_LINK: + from dialin.squish import utils, denaliMessages +else: + import utils + import denaliMessages + valvesBitLen = 12 def gotoScreenNtest_Contains_DGValvesStatesData(): mouseClick(waitForObject(names.o_mainMenu_manager)) Index: tst_DebugText/test.py =================================================================== diff -u -r2565fdf7f0ff9d43afd963653edd4bd00ef426c8 -r4aea809c4c3eaaeb674f79f550aff589e61d6739 --- tst_DebugText/test.py (.../test.py) (revision 2565fdf7f0ff9d43afd963653edd4bd00ef426c8) +++ tst_DebugText/test.py (.../test.py) (revision 4aea809c4c3eaaeb674f79f550aff589e61d6739) @@ -13,8 +13,13 @@ # import names -from dialin.squish import utils, denaliMessages +if names.DIALIN_LINK: + from dialin.squish import utils, denaliMessages +else: + import utils + import denaliMessages + def main(): utils.tstStart(__file__) Index: tst_HDOperationModeData/test.py =================================================================== diff -u -r2565fdf7f0ff9d43afd963653edd4bd00ef426c8 -r4aea809c4c3eaaeb674f79f550aff589e61d6739 --- tst_HDOperationModeData/test.py (.../test.py) (revision 2565fdf7f0ff9d43afd963653edd4bd00ef426c8) +++ tst_HDOperationModeData/test.py (.../test.py) (revision 4aea809c4c3eaaeb674f79f550aff589e61d6739) @@ -13,8 +13,13 @@ # import names -from dialin.squish import utils, denaliMessages +if names.DIALIN_LINK: + from dialin.squish import utils, denaliMessages +else: + import utils + import denaliMessages + opModes = [ "MODE_FAUL" , "MODE_SERV" , Index: tst_HDPressureOcclusionData/test.py =================================================================== diff -u -r2565fdf7f0ff9d43afd963653edd4bd00ef426c8 -r4aea809c4c3eaaeb674f79f550aff589e61d6739 --- tst_HDPressureOcclusionData/test.py (.../test.py) (revision 2565fdf7f0ff9d43afd963653edd4bd00ef426c8) +++ tst_HDPressureOcclusionData/test.py (.../test.py) (revision 4aea809c4c3eaaeb674f79f550aff589e61d6739) @@ -13,8 +13,13 @@ # import names -from dialin.squish import utils, denaliMessages +if names.DIALIN_LINK: + from dialin.squish import utils, denaliMessages +else: + import utils + import denaliMessages + def gotoScreenNtest_Contains_PressureOcclusionData(): mouseClick(waitForObject(names.o_mainMenu_settings)) test_values(0, 0, 0, 0, 0) Index: tst_HomeScreen/test.py =================================================================== diff -u -r2565fdf7f0ff9d43afd963653edd4bd00ef426c8 -r4aea809c4c3eaaeb674f79f550aff589e61d6739 --- tst_HomeScreen/test.py (.../test.py) (revision 2565fdf7f0ff9d43afd963653edd4bd00ef426c8) +++ tst_HomeScreen/test.py (.../test.py) (revision 4aea809c4c3eaaeb674f79f550aff589e61d6739) @@ -13,8 +13,12 @@ # import names -from dialin.squish import utils +if names.DIALIN_LINK: + from dialin.squish import utils +else: + import utils + def main(): utils.tstStart(__file__) Index: tst_Internals/test.py =================================================================== diff -u -r2565fdf7f0ff9d43afd963653edd4bd00ef426c8 -r4aea809c4c3eaaeb674f79f550aff589e61d6739 --- tst_Internals/test.py (.../test.py) (revision 2565fdf7f0ff9d43afd963653edd4bd00ef426c8) +++ tst_Internals/test.py (.../test.py) (revision 4aea809c4c3eaaeb674f79f550aff589e61d6739) @@ -12,14 +12,19 @@ # author Behrouz NematiPour # -from dialin.squish.utils import tstStart, tstDone -from dialin.squish import unittests - +import names +if names.DIALIN_LINK: + from dialin.squish import utils + from dialin.squish import unittests +else: + import utils + import unittests + def main(): - tstStart(__file__) + utils.tstStart(__file__) unittests.test_python_version() unittests.test_crc8() - tstDone() \ No newline at end of file + utils.tstDone() \ No newline at end of file Index: tst_ServiceShutdown/test.py =================================================================== diff -u -r2565fdf7f0ff9d43afd963653edd4bd00ef426c8 -r4aea809c4c3eaaeb674f79f550aff589e61d6739 --- tst_ServiceShutdown/test.py (.../test.py) (revision 2565fdf7f0ff9d43afd963653edd4bd00ef426c8) +++ tst_ServiceShutdown/test.py (.../test.py) (revision 4aea809c4c3eaaeb674f79f550aff589e61d6739) @@ -13,8 +13,14 @@ # import names -from dialin.squish import utils, globals, denaliMessages +if names.DIALIN_LINK: + from dialin.squish import utils, globals, denaliMessages +else: + import utils + import globals + import denaliMessages + ################################################################################ # This test need to be changed when the Service screen has been implemented # # This is only checking the functionality exists and it's working # Index: tst_TreatmentScreen/test.py =================================================================== diff -u -r2565fdf7f0ff9d43afd963653edd4bd00ef426c8 -r4aea809c4c3eaaeb674f79f550aff589e61d6739 --- tst_TreatmentScreen/test.py (.../test.py) (revision 2565fdf7f0ff9d43afd963653edd4bd00ef426c8) +++ tst_TreatmentScreen/test.py (.../test.py) (revision 4aea809c4c3eaaeb674f79f550aff589e61d6739) @@ -13,7 +13,10 @@ # import names -from dialin.squish import utils +if names.DIALIN_LINK: + from dialin.squish import utils +else: + import utils def main(): Index: tst_TreatmentStatesData/test.py =================================================================== diff -u -r2565fdf7f0ff9d43afd963653edd4bd00ef426c8 -r4aea809c4c3eaaeb674f79f550aff589e61d6739 --- tst_TreatmentStatesData/test.py (.../test.py) (revision 2565fdf7f0ff9d43afd963653edd4bd00ef426c8) +++ tst_TreatmentStatesData/test.py (.../test.py) (revision 4aea809c4c3eaaeb674f79f550aff589e61d6739) @@ -13,8 +13,13 @@ # import names -from dialin.squish import utils, denaliMessages +if names.DIALIN_LINK: + from dialin.squish import utils, denaliMessages +else: + import utils + import denaliMessages + def gotoScreenNtest_Contains_TreatmentStatesData(): mouseClick(waitForObject(names.o_mainMenu_manager)) test_values(0, 0, 0) Index: tst_Treatment_Adjustment_BloodDialysate/test.py =================================================================== diff -u -r2565fdf7f0ff9d43afd963653edd4bd00ef426c8 -r4aea809c4c3eaaeb674f79f550aff589e61d6739 --- tst_Treatment_Adjustment_BloodDialysate/test.py (.../test.py) (revision 2565fdf7f0ff9d43afd963653edd4bd00ef426c8) +++ tst_Treatment_Adjustment_BloodDialysate/test.py (.../test.py) (revision 4aea809c4c3eaaeb674f79f550aff589e61d6739) @@ -13,7 +13,11 @@ # import names -from dialin.squish import utils, denaliMessages +if names.DIALIN_LINK: + from dialin.squish import utils, denaliMessages +else: + import utils + import denaliMessages def gotoScreenNtest_Contains_FlowsSection(): Index: tst_Treatment_Adjustment_Duration/test.py =================================================================== diff -u -r2565fdf7f0ff9d43afd963653edd4bd00ef426c8 -r4aea809c4c3eaaeb674f79f550aff589e61d6739 --- tst_Treatment_Adjustment_Duration/test.py (.../test.py) (revision 2565fdf7f0ff9d43afd963653edd4bd00ef426c8) +++ tst_Treatment_Adjustment_Duration/test.py (.../test.py) (revision 4aea809c4c3eaaeb674f79f550aff589e61d6739) @@ -13,7 +13,11 @@ # import names -from dialin.squish import utils, denaliMessages +if names.DIALIN_LINK: + from dialin.squish import utils, denaliMessages +else: + import utils + import denaliMessages def gotoScreenNtest_Contains_DurationSection(): Index: tst_Treatment_Adjustment_Ultrafiltration/test.py =================================================================== diff -u -r2565fdf7f0ff9d43afd963653edd4bd00ef426c8 -r4aea809c4c3eaaeb674f79f550aff589e61d6739 --- tst_Treatment_Adjustment_Ultrafiltration/test.py (.../test.py) (revision 2565fdf7f0ff9d43afd963653edd4bd00ef426c8) +++ tst_Treatment_Adjustment_Ultrafiltration/test.py (.../test.py) (revision 4aea809c4c3eaaeb674f79f550aff589e61d6739) @@ -12,11 +12,14 @@ # author Behrouz NematiPour # -from dialin.squish import utils, denaliMessages +import names +if names.DIALIN_LINK: + from dialin.squish import utils, denaliMessages +else: + import utils + import denaliMessages -from names import * - eInvalid = 0 eIncrease = 1 eDecrease = 2 @@ -54,76 +57,76 @@ # --------------- Main Treatment def gotoScreenNtest_Contains_Ultrafiltration(): - mouseClick(waitForObject(o_treatmentHome_startTreatment)) - test.compare(waitForObjectExists(o_treatmentStart_ultrafiltrationTouchArea_TreatmentUltrafiltration).visible, True) + 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, 10): denaliMessages.setTreatmentUltrafiltration(vMaxUF, i, 1, 1, 1, 1, 1) - test.compare(utils.l2ml(waitForObjectExists(o_treatmentStart_ultrafiltrationTouchArea_TreatmentUltrafiltration).value), i) + test.compare(utils.l2ml(waitForObjectExists(names.o_treatmentStart_ultrafiltrationTouchArea_TreatmentUltrafiltration).value), i) def gotoScreen_UltrafiltrationAdjustment(): # [Section Click] - mouseClick(waitForObject(o_treatmentStart_ultrafiltrationTouchArea_TreatmentUltrafiltration)) + mouseClick(waitForObject(names.o_treatmentStart_ultrafiltrationTouchArea_TreatmentUltrafiltration)) utils.waitForGUI(1) # --------------- Start Screen def testScreen_Start_Ultrafiltration(): # [Start Screen] - test.compare( waitForObjectExists(o_treatmentAdjustmentUltrafiltrationStart_Screen ).visible , True ) + test.compare( waitForObjectExists(names.o_treatmentAdjustmentUltrafiltrationStart_Screen ).visible , True ) ## Pause Button - test.compare(str(waitForObjectExists(o_treatmentAdjustmentUltrafiltrationStart_PauseButton).text.text), "PAUSE ULTRAFILTRATION") + test.compare(str(waitForObjectExists(names.o_treatmentAdjustmentUltrafiltrationStart_PauseButton).text.text), "PAUSE ULTRAFILTRATION") def pause_Request(): # [Request Pause] - mouseClick(waitForObject(o_treatmentAdjustmentUltrafiltrationStart_PauseButton)) + mouseClick(waitForObject(names.o_treatmentAdjustmentUltrafiltrationStart_PauseButton)) def pause_RejectNTest(): # [Normal Notification] - test.compare(str(waitForObjectExists(o_treatmentAdjustmentUltrafiltrationStart_NotificationBar).text), "") + test.compare(str(waitForObjectExists(names.o_treatmentAdjustmentUltrafiltrationStart_NotificationBar).text), "") # [Reject Pause] denaliMessages.setTreatmentAdjustUltrafiltrationRejected() # [Reject Notification] - test.compare(str(waitForObjectExists(o_treatmentAdjustmentUltrafiltrationStart_NotificationBar).text), "Unable to Pause Ultrafiltration or already paused") + test.compare(str(waitForObjectExists(names.o_treatmentAdjustmentUltrafiltrationStart_NotificationBar).text), "Unable to Pause Ultrafiltration or already paused") def pause_Accept(): # [Accept Pause] denaliMessages.setTreatmentAdjustUltrafiltrationAccepted() # [Accept Notification] - test.compare(str(waitForObjectExists(o_treatmentAdjustmentUltrafiltrationPaused_NotificationBar).text), "") + test.compare(str(waitForObjectExists(names.o_treatmentAdjustmentUltrafiltrationPaused_NotificationBar).text), "") utils.waitForGUI(1) # --------------- Paused Screen def testScreen_Paused_Ultrafiltration(): # [Paused Screen] - test.compare(waitForObjectExists(o_treatmentAdjustmentUltrafiltrationPaused_Screen).visible, True) + test.compare(waitForObjectExists(names.o_treatmentAdjustmentUltrafiltrationPaused_Screen).visible, True) ## Edit Button - test.compare(str(waitForObjectExists(o_treatmentAdjustmentUltrafiltrationPaused_EditButton).text.text), "EDIT ULTRAFILTRATION VOLUME") + test.compare(str(waitForObjectExists(names.o_treatmentAdjustmentUltrafiltrationPaused_EditButton).text.text), "EDIT ULTRAFILTRATION VOLUME") ## Resume Button - test.compare(str(waitForObjectExists(o_treatmentAdjustmentUltrafiltrationPaused_ResumeButton).text.text), "RESUME ULTRAFILTRATION") + test.compare(str(waitForObjectExists(names.o_treatmentAdjustmentUltrafiltrationPaused_ResumeButton).text.text), "RESUME ULTRAFILTRATION") ## Paused Notification - test.compare(str(waitForObjectExists(o_treatmentAdjustmentUltrafiltrationPaused_PausedText).text), "Ultrafiltration is paused.") + test.compare(str(waitForObjectExists(names.o_treatmentAdjustmentUltrafiltrationPaused_PausedText).text), "Ultrafiltration is paused.") def resume_Request(): # [Request Resume] - mouseClick(waitForObject(o_treatmentAdjustmentUltrafiltrationPaused_ResumeButton)) + mouseClick(waitForObject(names.o_treatmentAdjustmentUltrafiltrationPaused_ResumeButton)) def resume_RejectNTest(): # [Normal Notification] - test.compare(str(waitForObjectExists(o_treatmentAdjustmentUltrafiltrationPaused_NotificationBar).text), "") + test.compare(str(waitForObjectExists(names.o_treatmentAdjustmentUltrafiltrationPaused_NotificationBar).text), "") # [Reject Resume] denaliMessages.setTreatmentAdjustUltrafiltrationRejected() # [Reject Notification] - test.compare(str(waitForObjectExists(o_treatmentAdjustmentUltrafiltrationPaused_NotificationBar).text), "Unable to Resume Ultrafiltration or already running") + test.compare(str(waitForObjectExists(names.o_treatmentAdjustmentUltrafiltrationPaused_NotificationBar).text), "Unable to Resume Ultrafiltration or already running") def resume_Accept(): @@ -134,52 +137,52 @@ def closeScreen(): utils.waitForGUI() - mouseClick(waitForObject(o_closeButton)) + mouseClick(waitForObject(names.o_closeButton)) utils.waitForGUI() def testScreen_Paused_Notification(): # [Section Paused Notification] - test.compare(str(waitForObjectExists(o_treatmentStart_ultrafiltrationTouchArea_TreatmentUltrafiltration).notification.text), "Ultrafiltration Paused") + test.compare(str(waitForObjectExists(names.o_treatmentStart_ultrafiltrationTouchArea_TreatmentUltrafiltration).notification.text), "Ultrafiltration Paused") def edit_Clicked(): - mouseClick(waitForObject(o_treatmentAdjustmentUltrafiltrationPaused_EditButton)) + mouseClick(waitForObject(names.o_treatmentAdjustmentUltrafiltrationPaused_EditButton)) utils.waitForGUI(1) def testScreen_Edit_Ultrafiltration(): - test.compare(str(waitForObjectExists(o_treatmentAdjustmentUltrafiltrationEdit_NextButton).text.text), "NEXT") - test.compare(str(waitForObjectExists(o_treatmentAdjustmentUltrafiltrationEdit_PausedText).text), "Ultrafiltration is paused.") - test.compare(str(waitForObjectExists(o_backButton).text.text), "BACK") + 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_backButton).text.text), "BACK") def back_Clicked(): - mouseClick(waitForObject(o_backButton)) + mouseClick(waitForObject(names.o_backButton)) def edit_RejectNTest(): denaliMessages.setTreatmentAdjustUltrafiltrationEditRejected(12) - test.compare( waitForObjectExists(o_treatmentAdjustmentUltrafiltrationEdit_NotificationBar).visible, True) + test.compare( waitForObjectExists(names.o_treatmentAdjustmentUltrafiltrationEdit_NotificationBar).visible, True) #this error message needs to be changed later when translated. - test.compare(str(waitForObjectExists(o_treatmentAdjustmentUltrafiltrationEdit_NotificationBar).text), "REQUEST_REJECT_REASON_UF_RATE_OUT_OF_RANGE") + test.compare(str(waitForObjectExists(names.o_treatmentAdjustmentUltrafiltrationEdit_NotificationBar).text), "REQUEST_REJECT_REASON_UF_RATE_OUT_OF_RANGE") def updateNTest_Adjustment_Ranges(vMinUFVolume, vMaxUFVolume): # HD sends Ultrafiltration ranges denaliMessages.setTreatmentParamRanges(0, 0, vMinUFVolume, vMaxUFVolume, 0, 0) # Edit Screen updates Ultrafiltration ranges on Slider upon Receiving Ranges - test.compare(str(waitForObjectExists(o_treatmentAdjustmentUltrafiltrationEdit_VolumeSlider).minText.text), "{:.3f}".format(utils.ml2l(vMinUFVolume))) - test.compare(str(waitForObjectExists(o_treatmentAdjustmentUltrafiltrationEdit_VolumeSlider).maxText.text), "{:.3f}".format(utils.ml2l(vMaxUFVolume))) + test.compare(str(waitForObjectExists(names.o_treatmentAdjustmentUltrafiltrationEdit_VolumeSlider).minText.text), "{:.3f}".format(utils.ml2l(vMinUFVolume))) + test.compare(str(waitForObjectExists(names.o_treatmentAdjustmentUltrafiltrationEdit_VolumeSlider).maxText.text), "{:.3f}".format(utils.ml2l(vMaxUFVolume))) def user_Adjusted(): # Edit Screen updated the adjusted Ultrafiltration value - mouseClick(waitForObject(o_treatmentAdjustmentUltrafiltrationEdit_VolumeSlider), 430, 1, Qt.LeftButton) + mouseClick(waitForObject(names.o_treatmentAdjustmentUltrafiltrationEdit_VolumeSlider), 430, 1, Qt.LeftButton) def next_Clicked(): - mouseClick(waitForObject(o_treatmentAdjustmentUltrafiltrationEdit_NextButton)) + mouseClick(waitForObject(names.o_treatmentAdjustmentUltrafiltrationEdit_NextButton)) def adjustmentResponse(): @@ -224,16 +227,16 @@ def testScreen_Confirm_Ultrafiltration(): #[Confrim Screen] - test.compare( waitForObjectExists(o_treatmentAdjustmentUltrafiltrationConfirm_Screen).visible, True) - test.compare(str(waitForObjectExists(o_treatmentAdjustmentUltrafiltrationConfirm_PausedText).text), "Ultrafiltration is paused.") - test.compare(str(waitForObjectExists(o_treatmentAdjustmentUltrafiltrationConfirm_ConfirmButton).text.text), "CONFIRM") - test.compare( waitForObjectExists(o_treatmentAdjustmentUltrafiltrationConfirm_ConfirmButton).disabled, True) - test.compare(str(waitForObjectExists(o_backButton).text.text), "BACK") + 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_ConfirmButton).text.text), "CONFIRM") + test.compare( waitForObjectExists(names.o_treatmentAdjustmentUltrafiltrationConfirm_ConfirmButton).disabled, True) + test.compare(str(waitForObjectExists(names.o_backButton).text.text), "BACK") #[Confirm Title / Ultrafiltration Volume] - test.compare(str(waitForObjectExists(o_treatmentAdjustmentUltrafiltrationConfirm_Title ).text), "To confirm new UF Volume ({:.3f}),\nselect a treatment adjustment:".format(utils.ml2l(_Volume))) - test.compare( waitForObjectExists(o_treatmentAdjustmentUltrafiltrationConfirm_AdjustmentButtonRate ).selected , False) - test.compare( waitForObjectExists(o_treatmentAdjustmentUltrafiltrationConfirm_AdjustmentButtonDuration).selected , False) + test.compare(str(waitForObjectExists(names.o_treatmentAdjustmentUltrafiltrationConfirm_Title ).text), "To confirm new UF Volume ({:.3f}),\nselect a treatment adjustment:".format(utils.ml2l(_Volume))) + test.compare( waitForObjectExists(names.o_treatmentAdjustmentUltrafiltrationConfirm_AdjustmentButtonRate ).selected , False) + test.compare( waitForObjectExists(names.o_treatmentAdjustmentUltrafiltrationConfirm_AdjustmentButtonDuration).selected , False) def testScreen_Confirm_OptionRate(vIncrease): @@ -246,21 +249,21 @@ test.compare(mIncrease, vIncrease == eIncrease) test.compare(mInvalid , vIncrease == eInvalid ) - test.compare( waitForObjectExists(o_treatmentAdjustmentUltrafiltrationConfirm_AdjustmentButtonRate).visible , True ) - test.compare( waitForObjectExists(o_treatmentAdjustmentUltrafiltrationConfirm_AdjustmentButtonRate).disabled , mInvalid) - test.compare( waitForObjectExists(o_treatmentAdjustmentUltrafiltrationConfirm_AdjustmentButtonRate).isIncrease , mIncrease) - test.compare( waitForObjectExists(o_treatmentAdjustmentUltrafiltrationConfirm_AdjustmentButtonRate_Title ).visible , True) - test.compare(str(waitForObjectExists(o_treatmentAdjustmentUltrafiltrationConfirm_AdjustmentButtonRate).title ), "{} UF Rate".format(mInDeCrease)) - test.compare( waitForObjectExists(o_treatmentAdjustmentUltrafiltrationConfirm_AdjustmentButtonRate_Description ).visible , True) + test.compare( waitForObjectExists(names.o_treatmentAdjustmentUltrafiltrationConfirm_AdjustmentButtonRate).visible , True ) + test.compare( waitForObjectExists(names.o_treatmentAdjustmentUltrafiltrationConfirm_AdjustmentButtonRate).disabled , mInvalid) + test.compare( waitForObjectExists(names.o_treatmentAdjustmentUltrafiltrationConfirm_AdjustmentButtonRate).isIncrease , mIncrease) + test.compare( waitForObjectExists(names.o_treatmentAdjustmentUltrafiltrationConfirm_AdjustmentButtonRate_Title ).visible , True) + test.compare(str(waitForObjectExists(names.o_treatmentAdjustmentUltrafiltrationConfirm_AdjustmentButtonRate).title ), "{} UF Rate".format(mInDeCrease)) + test.compare( waitForObjectExists(names.o_treatmentAdjustmentUltrafiltrationConfirm_AdjustmentButtonRate_Description ).visible , True) if mInvalid: - test.compare(str(waitForObjectExists(o_treatmentAdjustmentUltrafiltrationConfirm_AdjustmentButtonRate).description ),stringInvalidTxt) + test.compare(str(waitForObjectExists(names.o_treatmentAdjustmentUltrafiltrationConfirm_AdjustmentButtonRate).description ),stringInvalidTxt) else: - test.compare(str(waitForObjectExists(o_treatmentAdjustmentUltrafiltrationConfirm_AdjustmentButtonRate).description ), + test.compare(str(waitForObjectExists(names.o_treatmentAdjustmentUltrafiltrationConfirm_AdjustmentButtonRate).description ), "The rate {} by {} mL/min,\nthe treatment duration remains the same.".format(mInDeCreases, abs(_RateDiff))) - test.compare(str(waitForObjectExists(o_treatmentAdjustmentUltrafiltrationConfirm_AdjustmentButtonRate).valueText ), "UF Rate : {} mL/min".format(_Rate)) - test.compare( waitForObjectExists(o_treatmentAdjustmentUltrafiltrationConfirm_AdjustmentButtonRate_DiffImageWave ).visible , not mInvalid) - test.compare( waitForObjectExists(o_treatmentAdjustmentUltrafiltrationConfirm_AdjustmentButtonRate_DiffImageWave ).isIncrease , mIncrease) - test.compare( waitForObjectExists(o_treatmentAdjustmentUltrafiltrationConfirm_AdjustmentButtonRate_DiffImageClock).visible , False) + test.compare(str(waitForObjectExists(names.o_treatmentAdjustmentUltrafiltrationConfirm_AdjustmentButtonRate).valueText ), "UF Rate : {} mL/min".format(_Rate)) + test.compare( waitForObjectExists(names.o_treatmentAdjustmentUltrafiltrationConfirm_AdjustmentButtonRate_DiffImageWave ).visible , not mInvalid) + test.compare( waitForObjectExists(names.o_treatmentAdjustmentUltrafiltrationConfirm_AdjustmentButtonRate_DiffImageWave ).isIncrease , mIncrease) + test.compare( waitForObjectExists(names.o_treatmentAdjustmentUltrafiltrationConfirm_AdjustmentButtonRate_DiffImageClock).visible , False) def testScreen_Confirm_OptionDuration(vIncrease): @@ -272,44 +275,44 @@ test.compare(mIncrease, vIncrease == eIncrease) test.compare(mInvalid , vIncrease == eInvalid ) - test.compare( waitForObjectExists(o_treatmentAdjustmentUltrafiltrationConfirm_AdjustmentButtonDuration).visible , True ) - test.compare( waitForObjectExists(o_treatmentAdjustmentUltrafiltrationConfirm_AdjustmentButtonDuration).disabled , mInvalid) - test.compare( waitForObjectExists(o_treatmentAdjustmentUltrafiltrationConfirm_AdjustmentButtonDuration).isIncrease , mIncrease ) - test.compare( waitForObjectExists(o_treatmentAdjustmentUltrafiltrationConfirm_AdjustmentButtonDuration_Title ).visible , True ) - test.compare(str(waitForObjectExists(o_treatmentAdjustmentUltrafiltrationConfirm_AdjustmentButtonDuration).title ), "{} Treatment Duration".format(mInDeCrease)) - test.compare( waitForObjectExists(o_treatmentAdjustmentUltrafiltrationConfirm_AdjustmentButtonDuration_Description ).visible , True ) + test.compare( waitForObjectExists(names.o_treatmentAdjustmentUltrafiltrationConfirm_AdjustmentButtonDuration).visible , True ) + test.compare( waitForObjectExists(names.o_treatmentAdjustmentUltrafiltrationConfirm_AdjustmentButtonDuration).disabled , mInvalid) + test.compare( waitForObjectExists(names.o_treatmentAdjustmentUltrafiltrationConfirm_AdjustmentButtonDuration).isIncrease , mIncrease ) + test.compare( waitForObjectExists(names.o_treatmentAdjustmentUltrafiltrationConfirm_AdjustmentButtonDuration_Title ).visible , True ) + test.compare(str(waitForObjectExists(names.o_treatmentAdjustmentUltrafiltrationConfirm_AdjustmentButtonDuration).title ), "{} Treatment Duration".format(mInDeCrease)) + test.compare( waitForObjectExists(names.o_treatmentAdjustmentUltrafiltrationConfirm_AdjustmentButtonDuration_Description ).visible , True ) if mInvalid: - test.compare(str(waitForObjectExists(o_treatmentAdjustmentUltrafiltrationConfirm_AdjustmentButtonDuration).description ),stringInvalidTxt) + test.compare(str(waitForObjectExists(names.o_treatmentAdjustmentUltrafiltrationConfirm_AdjustmentButtonDuration).description ),stringInvalidTxt) else: - test.compare(str(waitForObjectExists(o_treatmentAdjustmentUltrafiltrationConfirm_AdjustmentButtonDuration).description ), + test.compare(str(waitForObjectExists(names.o_treatmentAdjustmentUltrafiltrationConfirm_AdjustmentButtonDuration).description ), "The rate remains, the treatment\nduration {} by {} minutes.".format(mInDeCreases, abs(_DurationDiff))) - test.compare(str(waitForObjectExists(o_treatmentAdjustmentUltrafiltrationConfirm_AdjustmentButtonDuration).valueText ), "UF Rate : {} mL/min".format(_RateOld)) - test.compare( waitForObjectExists(o_treatmentAdjustmentUltrafiltrationConfirm_AdjustmentButtonDuration_DiffImageClock).visible , not mInvalid ) - test.compare( waitForObjectExists(o_treatmentAdjustmentUltrafiltrationConfirm_AdjustmentButtonDuration_DiffImageClock).isIncrease, mIncrease ) - test.compare( waitForObjectExists(o_treatmentAdjustmentUltrafiltrationConfirm_AdjustmentButtonDuration_DiffImageWave ).visible , False) + test.compare(str(waitForObjectExists(names.o_treatmentAdjustmentUltrafiltrationConfirm_AdjustmentButtonDuration).valueText ), "UF Rate : {} mL/min".format(_RateOld)) + test.compare( waitForObjectExists(names.o_treatmentAdjustmentUltrafiltrationConfirm_AdjustmentButtonDuration_DiffImageClock).visible , not mInvalid ) + test.compare( waitForObjectExists(names.o_treatmentAdjustmentUltrafiltrationConfirm_AdjustmentButtonDuration_DiffImageClock).isIncrease, mIncrease ) + test.compare( waitForObjectExists(names.o_treatmentAdjustmentUltrafiltrationConfirm_AdjustmentButtonDuration_DiffImageWave ).visible , False) def confirm_Request_Rate(): - mouseClick(waitForObject(o_treatmentAdjustmentUltrafiltrationConfirm_AdjustmentButtonRate)) - test.compare( waitForObjectExists(o_treatmentAdjustmentUltrafiltrationConfirm_ConfirmButton).disabled, False) - mouseClick(waitForObject(o_treatmentAdjustmentUltrafiltrationConfirm_ConfirmButton)) + mouseClick(waitForObject(names.o_treatmentAdjustmentUltrafiltrationConfirm_AdjustmentButtonRate)) + test.compare( waitForObjectExists(names.o_treatmentAdjustmentUltrafiltrationConfirm_ConfirmButton).disabled, False) + mouseClick(waitForObject(names.o_treatmentAdjustmentUltrafiltrationConfirm_ConfirmButton)) def confirm_Request_Duration(): - mouseClick(waitForObject(o_treatmentAdjustmentUltrafiltrationConfirm_AdjustmentButtonDuration)) - test.compare( waitForObjectExists(o_treatmentAdjustmentUltrafiltrationConfirm_ConfirmButton).disabled, False) - mouseClick(waitForObject(o_treatmentAdjustmentUltrafiltrationConfirm_ConfirmButton)) + mouseClick(waitForObject(names.o_treatmentAdjustmentUltrafiltrationConfirm_AdjustmentButtonDuration)) + test.compare( waitForObjectExists(names.o_treatmentAdjustmentUltrafiltrationConfirm_ConfirmButton).disabled, False) + mouseClick(waitForObject(names.o_treatmentAdjustmentUltrafiltrationConfirm_ConfirmButton)) def confirm_RejectNTest(): denaliMessages.setTreatmentAdjustUltrafiltrationConfirmRejected(2) - test.compare( waitForObjectExists(o_treatmentAdjustmentUltrafiltrationConfirm_NotificationBar).visible, True) - test.compare(str(waitForObjectExists(o_treatmentAdjustmentUltrafiltrationConfirm_NotificationBar).text ), "REQUEST_REJECT_REASON_TIMEOUT_WAITING_FOR_USER_CONFIRM") + 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") def confirm_RejectNTest_Unknow(): denaliMessages.setTreatmentAdjustUltrafiltrationConfirmRejected(200) - test.compare( waitForObjectExists(o_treatmentAdjustmentUltrafiltrationConfirm_NotificationBar).visible, True) - test.compare(str(waitForObjectExists(o_treatmentAdjustmentUltrafiltrationConfirm_NotificationBar).text ), "[200] Unknown Error") + test.compare( waitForObjectExists(names.o_treatmentAdjustmentUltrafiltrationConfirm_NotificationBar).visible, True) + test.compare(str(waitForObjectExists(names.o_treatmentAdjustmentUltrafiltrationConfirm_NotificationBar).text ), "[200] Unknown Error") def confirm_Accept(vVolume, vDuration, vRate): @@ -319,7 +322,7 @@ def main(): utils.tstStart(__file__) - startApplication(AUT_NAME + " -q") + startApplication(names.AUT_NAME + " -q") utils.waitForGUI(1) gotoScreenNtest_Contains_Ultrafiltration() @@ -467,7 +470,7 @@ confirm_Accept(1200, 2 *60, 20) - test.compare(utils.l2ml(waitForObjectExists(o_treatmentStart_ultrafiltrationTouchArea_TreatmentUltrafiltration).maximum), 1200) + test.compare(utils.l2ml(waitForObjectExists(names.o_treatmentStart_ultrafiltrationTouchArea_TreatmentUltrafiltration).maximum), 1200) utils.tstDone() Index: tst_Treatment_BloodDialysateFlowRate/test.py =================================================================== diff -u -r2565fdf7f0ff9d43afd963653edd4bd00ef426c8 -r4aea809c4c3eaaeb674f79f550aff589e61d6739 --- tst_Treatment_BloodDialysateFlowRate/test.py (.../test.py) (revision 2565fdf7f0ff9d43afd963653edd4bd00ef426c8) +++ tst_Treatment_BloodDialysateFlowRate/test.py (.../test.py) (revision 4aea809c4c3eaaeb674f79f550aff589e61d6739) @@ -13,7 +13,11 @@ # import names -from dialin.squish import utils, denaliMessages +if names.DIALIN_LINK: + from dialin.squish import utils, denaliMessages +else: + import utils + import denaliMessages def gotoScreenNtest_Contains_FlowsSection(): Index: tst_Treatment_ParametersRange/test.py =================================================================== diff -u -r2565fdf7f0ff9d43afd963653edd4bd00ef426c8 -r4aea809c4c3eaaeb674f79f550aff589e61d6739 --- tst_Treatment_ParametersRange/test.py (.../test.py) (revision 2565fdf7f0ff9d43afd963653edd4bd00ef426c8) +++ tst_Treatment_ParametersRange/test.py (.../test.py) (revision 4aea809c4c3eaaeb674f79f550aff589e61d6739) @@ -13,7 +13,11 @@ # import names -from dialin.squish import utils, denaliMessages +if names.DIALIN_LINK: + from dialin.squish import utils, denaliMessages +else: + import utils + import denaliMessages def gotoScreenNtest_Contains_FlowsSection(): Index: tst_Treatment_PressureOcclusion/test.py =================================================================== diff -u -r2565fdf7f0ff9d43afd963653edd4bd00ef426c8 -r4aea809c4c3eaaeb674f79f550aff589e61d6739 --- tst_Treatment_PressureOcclusion/test.py (.../test.py) (revision 2565fdf7f0ff9d43afd963653edd4bd00ef426c8) +++ tst_Treatment_PressureOcclusion/test.py (.../test.py) (revision 4aea809c4c3eaaeb674f79f550aff589e61d6739) @@ -13,7 +13,11 @@ # import names -from dialin.squish import utils, denaliMessages +if names.DIALIN_LINK: + from dialin.squish import utils, denaliMessages +else: + import utils + import denaliMessages def gotoScreenNtest_Contains_PressureOcclusion(): Index: tst_Treatment_Section_BloodDialysate/test.py =================================================================== diff -u -r2565fdf7f0ff9d43afd963653edd4bd00ef426c8 -r4aea809c4c3eaaeb674f79f550aff589e61d6739 --- tst_Treatment_Section_BloodDialysate/test.py (.../test.py) (revision 2565fdf7f0ff9d43afd963653edd4bd00ef426c8) +++ tst_Treatment_Section_BloodDialysate/test.py (.../test.py) (revision 4aea809c4c3eaaeb674f79f550aff589e61d6739) @@ -13,8 +13,12 @@ # import names -from dialin.squish import utils +if names.DIALIN_LINK: + from dialin.squish import utils +else: + import utils + def main(): utils.tstStart(__file__) Index: tst_Treatment_Time/test.py =================================================================== diff -u -r2565fdf7f0ff9d43afd963653edd4bd00ef426c8 -r4aea809c4c3eaaeb674f79f550aff589e61d6739 --- tst_Treatment_Time/test.py (.../test.py) (revision 2565fdf7f0ff9d43afd963653edd4bd00ef426c8) +++ tst_Treatment_Time/test.py (.../test.py) (revision 4aea809c4c3eaaeb674f79f550aff589e61d6739) @@ -13,7 +13,11 @@ # import names -from dialin.squish import utils, denaliMessages +if names.DIALIN_LINK: + from dialin.squish import utils, denaliMessages +else: + import utils + import denaliMessages def gotoScreenNtest_Contains_TimeSection(): Index: tst_Treatment_Ultrafiltration/test.py =================================================================== diff -u -r2565fdf7f0ff9d43afd963653edd4bd00ef426c8 -r4aea809c4c3eaaeb674f79f550aff589e61d6739 --- tst_Treatment_Ultrafiltration/test.py (.../test.py) (revision 2565fdf7f0ff9d43afd963653edd4bd00ef426c8) +++ tst_Treatment_Ultrafiltration/test.py (.../test.py) (revision 4aea809c4c3eaaeb674f79f550aff589e61d6739) @@ -12,8 +12,12 @@ # author Behrouz NematiPour # -import names -from dialin.squish import utils, denaliMessages +import names +if names.DIALIN_LINK: + from dialin.squish import utils, denaliMessages +else: + import utils + import denaliMessages def gotoScreenNtest_Contains_Ultrafiltration():