Index: tools/run_tests.sh
===================================================================
diff -u -r8df6ead4e7b8c832f4fdf07dd751245b9c75a973 -r343ceb5e6ac46457315f5e3abe762b13fa8db8c4
--- tools/run_tests.sh (.../run_tests.sh) (revision 8df6ead4e7b8c832f4fdf07dd751245b9c75a973)
+++ tools/run_tests.sh (.../run_tests.sh) (revision 343ceb5e6ac46457315f5e3abe762b13fa8db8c4)
@@ -15,7 +15,7 @@
# and can run tests with the specified tags
#
############################################################################
-tags=CreateTreatment,AlarmColors
+tags=AlarmStatusData,DGOperationMode,DGROPumpData,HDOperationModeData,TreatmentUltrafiltration,TreatmentSalineData
rm -rf /tmp/UnitTest
cd ..
echo "[i] This script assumes squishserver has already been started with run_server.sh."
Index: tst_AlarmStatusData/config.xml
===================================================================
diff -u
--- tst_AlarmStatusData/config.xml (revision 0)
+++ tst_AlarmStatusData/config.xml (revision 343ceb5e6ac46457315f5e3abe762b13fa8db8c4)
@@ -0,0 +1,10 @@
+
+
+
+
+
+
+AlarmStatusData
+
+
+
Index: tst_AlarmStatusData/test.py
===================================================================
diff -u -rb3653a30a05b551f24ac231ca499d71252fd2a3c -r343ceb5e6ac46457315f5e3abe762b13fa8db8c4
--- tst_AlarmStatusData/test.py (.../test.py) (revision b3653a30a05b551f24ac231ca499d71252fd2a3c)
+++ tst_AlarmStatusData/test.py (.../test.py) (revision 343ceb5e6ac46457315f5e3abe762b13fa8db8c4)
@@ -14,7 +14,6 @@
import names
-from time import sleep
if names.DIALIN_LINK:
from dialin.squish import utils, denaliMessages
else:
@@ -35,7 +34,6 @@
# ALARM_ID = (priority, alarmID, escalates in, silent_espires_in, flags)
def test_values(vPriority, vTopID, vEscalatesIn, vMuteTimeout, vFlags):
- sleep(0.01)
barVisible, barObj = isNotificationBar()
dlgVisible, dlgObj = isNotificationDialog()
Index: tst_DGOperationMode/config.xml
===================================================================
diff -u
--- tst_DGOperationMode/config.xml (revision 0)
+++ tst_DGOperationMode/config.xml (revision 343ceb5e6ac46457315f5e3abe762b13fa8db8c4)
@@ -0,0 +1,10 @@
+
+
+
+
+
+
+DGOperationMode
+
+
+
Index: tst_DGOperationMode/test.py
===================================================================
diff -u -rb3653a30a05b551f24ac231ca499d71252fd2a3c -r343ceb5e6ac46457315f5e3abe762b13fa8db8c4
--- tst_DGOperationMode/test.py (.../test.py) (revision b3653a30a05b551f24ac231ca499d71252fd2a3c)
+++ tst_DGOperationMode/test.py (.../test.py) (revision 343ceb5e6ac46457315f5e3abe762b13fa8db8c4)
@@ -13,7 +13,6 @@
#
import names
-from time import sleep
if names.DIALIN_LINK:
from dialin.squish import utils, denaliMessages
else:
@@ -42,7 +41,6 @@
def test_values(vDGOpMode):
- sleep(0.01)
if (vDGOpMode < len(opModes)):
test.compare(str(waitForObjectExists(names.o_managerHome_DGOperationModeData_DGOpMode).text), opModes[vDGOpMode])
else:
Index: tst_DGROPumpData/config.xml
===================================================================
diff -u
--- tst_DGROPumpData/config.xml (revision 0)
+++ tst_DGROPumpData/config.xml (revision 343ceb5e6ac46457315f5e3abe762b13fa8db8c4)
@@ -0,0 +1,10 @@
+
+
+
+
+
+
+DGROPumpData
+
+
+
Index: tst_DGROPumpData/test.py
===================================================================
diff -u -rb3653a30a05b551f24ac231ca499d71252fd2a3c -r343ceb5e6ac46457315f5e3abe762b13fa8db8c4
--- tst_DGROPumpData/test.py (.../test.py) (revision b3653a30a05b551f24ac231ca499d71252fd2a3c)
+++ tst_DGROPumpData/test.py (.../test.py) (revision 343ceb5e6ac46457315f5e3abe762b13fa8db8c4)
@@ -13,7 +13,6 @@
#
import names
-from time import sleep
if names.DIALIN_LINK:
from dialin.squish import utils, denaliMessages
else:
@@ -27,7 +26,6 @@
def test_values(vSetPtPressure, vFlowRate, vPWM):
- sleep(0.01)
test.compare(str(waitForObjectExists(names.o_managerHome_DGROPumpData_SetPtPressure).text), "{:.0f}".format(vSetPtPressure))
test.compare(str(waitForObjectExists(names.o_managerHome_DGROPumpData_FlowRate ).text), "{:.2f}".format(vFlowRate ))
test.compare(str(waitForObjectExists(names.o_managerHome_DGROPumpData_PWM ).text), "{:.2f}".format(vPWM ))
Index: tst_HDOperationModeData/config.xml
===================================================================
diff -u
--- tst_HDOperationModeData/config.xml (revision 0)
+++ tst_HDOperationModeData/config.xml (revision 343ceb5e6ac46457315f5e3abe762b13fa8db8c4)
@@ -0,0 +1,10 @@
+
+
+
+
+
+
+HDOperationModeData
+
+
+
Index: tst_HDOperationModeData/test.py
===================================================================
diff -u -rb3653a30a05b551f24ac231ca499d71252fd2a3c -r343ceb5e6ac46457315f5e3abe762b13fa8db8c4
--- tst_HDOperationModeData/test.py (.../test.py) (revision b3653a30a05b551f24ac231ca499d71252fd2a3c)
+++ tst_HDOperationModeData/test.py (.../test.py) (revision 343ceb5e6ac46457315f5e3abe762b13fa8db8c4)
@@ -13,7 +13,6 @@
#
import names
-from time import sleep
if names.DIALIN_LINK:
from dialin.squish import utils, denaliMessages
else:
@@ -39,7 +38,6 @@
def test_values(vOpMode):
- sleep(0.01)
if (vOpMode < len(opModes)):
test.compare(str(waitForObjectExists(names.o_managerHome_HDOperationModeData_OpMode).text), opModes[vOpMode])
else:
Index: tst_TreatmentSalineData/config.xml
===================================================================
diff -u
--- tst_TreatmentSalineData/config.xml (revision 0)
+++ tst_TreatmentSalineData/config.xml (revision 343ceb5e6ac46457315f5e3abe762b13fa8db8c4)
@@ -0,0 +1,10 @@
+
+
+
+
+
+
+TreatmentSalineData
+
+
+
Index: tst_TreatmentSalineData/test.py
===================================================================
diff -u -rb3653a30a05b551f24ac231ca499d71252fd2a3c -r343ceb5e6ac46457315f5e3abe762b13fa8db8c4
--- tst_TreatmentSalineData/test.py (.../test.py) (revision b3653a30a05b551f24ac231ca499d71252fd2a3c)
+++ tst_TreatmentSalineData/test.py (.../test.py) (revision 343ceb5e6ac46457315f5e3abe762b13fa8db8c4)
@@ -19,7 +19,6 @@
# o_managerHome_TreatmentSalineBolusData_Delivered = {"container": o_managerHome, "objectName": "_TreatmentSalineBolusData2", "type": "Text"}
import names
-from time import sleep
from dialin.squish import utils, denaliMessages
def getUnit():
@@ -35,15 +34,13 @@
def test_values(vCumulative, vDelivered):
- sleep(0.1)
test.compare(waitForObjectExists(names.o_treatmentStart_SalineSection).valueCumulative, vCumulative)
test.compare(waitForObjectExists(names.o_treatmentStart_SalineSection).valueDelivered , vDelivered )
test.compare(str(waitForObjectExists(names.o_treatmentStart_SalineCumulative).text), "{:.0f}".format(vCumulative))
test.compare(str(waitForObjectExists(names.o_treatmentStart_SalineDelivered ).text), "{:.0f}".format(vDelivered ))
def test_target(vTarget):
- sleep(0.01)
test.compare( waitForObjectExists(names.o_treatmentStart_SalineSection).valueTarget , vTarget )
test.compare(str(waitForObjectExists(names.o_treatmentStart_SalineTarget ).text) , "({:.0f} {})".format(vTarget, saline_unit))
Index: tst_Treatment_Ultrafiltration/config.xml
===================================================================
diff -u
--- tst_Treatment_Ultrafiltration/config.xml (revision 0)
+++ tst_Treatment_Ultrafiltration/config.xml (revision 343ceb5e6ac46457315f5e3abe762b13fa8db8c4)
@@ -0,0 +1,10 @@
+
+
+
+
+
+
+TreatmentUltrafiltration
+
+
+
Index: tst_Treatment_Ultrafiltration/test.py
===================================================================
diff -u -rb3653a30a05b551f24ac231ca499d71252fd2a3c -r343ceb5e6ac46457315f5e3abe762b13fa8db8c4
--- tst_Treatment_Ultrafiltration/test.py (.../test.py) (revision b3653a30a05b551f24ac231ca499d71252fd2a3c)
+++ tst_Treatment_Ultrafiltration/test.py (.../test.py) (revision 343ceb5e6ac46457315f5e3abe762b13fa8db8c4)
@@ -13,7 +13,6 @@
#
import names
-from time import sleep
if names.DIALIN_LINK:
from dialin.squish import utils, denaliMessages
else:
@@ -28,7 +27,6 @@
def startNTestTreatmentUltrafiltration(vMinUF, vMaxUF):
for i in range(vMinUF, vMaxUF+1, 10):
denaliMessages.setTreatmentUltrafiltration(i, i, 0, 0, 0, 0, 0)
- sleep(0.01)
test.compare(utils.l2ml(waitForObjectExists(names.o_treatmentStart_ultrafiltrationTouchArea_TreatmentUltrafiltration).value), i)