Index: tst_AlarmStatusData/test.py =================================================================== diff -u -r310f51a5ed4921f184572f90d07b350ec41c0bae -r4becb22543b290e42c8663e4d9ad59323bdec355 --- tst_AlarmStatusData/test.py (.../test.py) (revision 310f51a5ed4921f184572f90d07b350ec41c0bae) +++ tst_AlarmStatusData/test.py (.../test.py) (revision 4becb22543b290e42c8663e4d9ad59323bdec355) @@ -91,18 +91,8 @@ def maximize(): mouseClick(waitForObject(names.o_alarm_bar_maximize)) utils.waitForGUI(0.5) # this wait is necessary. Due to dialog animation it will be hide until the animation is done. + - -def test_colors(vPriority): - test.compare(str(waitForObjectExists(names.o_modalDialog ).color.name), alarm_colors_body [vPriority]) - test.compare(str(waitForObjectExists(names.o_alarm_dialog_titleBar).color.name), alarm_colors_header[vPriority]) - - minimize() - test.compare(str(waitForObject (names.o_alarm_bar ).color.name), alarm_colors_body[vPriority]) - - maximize() - - def test_messages(vTopID): if vTopID == alarm_id_noalarm: utils.waitForGUI() @@ -236,12 +226,6 @@ HDSimulator.alarms_simulator.cmd_activate_alarm_id(1, alarm_id, 0, 0, 0) test_messages ( alarm_id ) - - ## -------------------- Alarm Dialog/Bar: test alarm priority colors - for alarm_priority in alarm_priorities: - HDSimulator.alarms_simulator.cmd_activate_alarm_id(alarm_priority, 1, 0, 0, 0) - test_colors (alarm_priority ) - utils.tstDone() Index: tst_ConfirmPrimingBegin/test.py =================================================================== diff -u -r310f51a5ed4921f184572f90d07b350ec41c0bae -r4becb22543b290e42c8663e4d9ad59323bdec355 --- tst_ConfirmPrimingBegin/test.py (.../test.py) (revision 310f51a5ed4921f184572f90d07b350ec41c0bae) +++ tst_ConfirmPrimingBegin/test.py (.../test.py) (revision 4becb22543b290e42c8663e4d9ad59323bdec355) @@ -67,10 +67,7 @@ mouseClick(waitForObject(names.o_treatment_begin_start_button)) test.compare(waitForObject(names.o_alert).visible, True, "Found alert") mouseClick(waitForObject(names.o_alert_confirm)) - - test.compare(waitForObject(names.o_treatment_begin_start_button).visible, True, "Found treatment start button") - mouseClick(waitForObject(names.o_treatment_begin_start_button)) - waitForGUI(0.2) + waitForGUI(1) mouseClick(waitForObject(names.o_treatmentStart_back)) mouseClick(waitForObject(names.o_mainMenu_settings)) mouseClick(waitForObject(names.o_settings_end_treatment)) Index: tst_HDBloodFlowData/test.py =================================================================== diff -u -ra7b9888952bec12aef09dab4db580b790c6db5ba -r4becb22543b290e42c8663e4d9ad59323bdec355 --- tst_HDBloodFlowData/test.py (.../test.py) (revision a7b9888952bec12aef09dab4db580b790c6db5ba) +++ tst_HDBloodFlowData/test.py (.../test.py) (revision 4becb22543b290e42c8663e4d9ad59323bdec355) @@ -24,26 +24,18 @@ def test_values(vFlowSetPt, vMeasFlow, vRotSpd, vMotSpd, vMCSpd, vMCCurr, vPWM): + + test.compare(str(waitForObjectExists(utils.dict_update(names.o_managerHome_BloodFlowData_FlowSetPoint , "text", "{:.0f}".format( vFlowSetPt ))).text), "{:.0f}".format( vFlowSetPt )) + test.compare(str(waitForObjectExists(utils.dict_update(names.o_managerHome_BloodFlowData_MeasuredFlow , "text", "{:.2f}".format( vMeasFlow ))).text), "{:.2f}".format( vMeasFlow )) + test.compare(str(waitForObjectExists(utils.dict_update(names.o_managerHome_BloodFlowData_RotorSpeed , "text", "{:.2f}".format( vRotSpd ))).text), "{:.2f}".format( vRotSpd )) + test.compare(str(waitForObjectExists(utils.dict_update(names.o_managerHome_BloodFlowData_MotorSpeed , "text", "{:.2f}".format( vMotSpd ))).text), "{:.2f}".format( vMotSpd )) + test.compare(str(waitForObjectExists(utils.dict_update(names.o_managerHome_BloodFlowData_MotorCtlSpeed , "text", "{:.2f}".format( vMCSpd ))).text), "{:.2f}".format( vMCSpd )) + test.compare(str(waitForObjectExists(utils.dict_update(names.o_managerHome_BloodFlowData_MotorCtlCurrent, "text", "{:.2f}".format( vMCCurr ))).text), "{:.2f}".format( vMCCurr )) + test.compare(str(waitForObjectExists(utils.dict_update(names.o_managerHome_BloodFlowData_PWMDutyCycle , "text", "%" "{:.2f}".format( vPWM ))).text), "%" "{:.2f}".format( vPWM )) - test.compare(str(waitForObjectExists(names.o_managerHome_BloodFlowData_FlowSetPoint ).text), "{:.0f}".format( vFlowSetPt )) - test.compare(str(waitForObjectExists(names.o_managerHome_BloodFlowData_MeasuredFlow ).text), "{:.2f}".format( vMeasFlow )) - test.compare(str(waitForObjectExists(names.o_managerHome_BloodFlowData_RotorSpeed ).text), "{:.2f}".format( vRotSpd )) - test.compare(str(waitForObjectExists(names.o_managerHome_BloodFlowData_MotorSpeed ).text), "{:.2f}".format( vMotSpd )) - test.compare(str(waitForObjectExists(names.o_managerHome_BloodFlowData_MotorCtlSpeed ).text), "{:.2f}".format( vMCSpd )) - test.compare(str(waitForObjectExists(names.o_managerHome_BloodFlowData_MotorCtlCurrent).text), "{:.2f}".format( vMCCurr )) - test.compare(str(waitForObjectExists(names.o_managerHome_BloodFlowData_PWMDutyCycle ).text), "%" "{:.2f}".format( vPWM )) - # test.compare(str(waitForObjectExists(utils.dict_update(names.o_managerHome_BloodFlowData_FlowSetPoint , "text", "{:.0f}".format( vFlowSetPt ))).text), "{:.0f}".format( vFlowSetPt )) - # test.compare(str(waitForObjectExists(utils.dict_update(names.o_managerHome_BloodFlowData_MeasuredFlow , "text", "{:.2f}".format( vMeasFlow ))).text), "{:.2f}".format( vMeasFlow )) - # test.compare(str(waitForObjectExists(utils.dict_update(names.o_managerHome_BloodFlowData_RotorSpeed , "text", "{:.2f}".format( vRotSpd ))).text), "{:.2f}".format( vRotSpd )) - # test.compare(str(waitForObjectExists(utils.dict_update(names.o_managerHome_BloodFlowData_MotorSpeed , "text", "{:.2f}".format( vMotSpd ))).text), "{:.2f}".format( vMotSpd )) - # test.compare(str(waitForObjectExists(utils.dict_update(names.o_managerHome_BloodFlowData_MotorCtlSpeed , "text", "{:.2f}".format( vMCSpd ))).text), "{:.2f}".format( vMCSpd )) - # test.compare(str(waitForObjectExists(utils.dict_update(names.o_managerHome_BloodFlowData_MotorCtlCurrent, "text", "{:.2f}".format( vMCCurr ))).text), "{:.2f}".format( vMCCurr )) - # test.compare(str(waitForObjectExists(utils.dict_update(names.o_managerHome_BloodFlowData_PWMDutyCycle , "text", "%" "{:.2f}".format( vPWM ))).text), "%" "{:.2f}".format( vPWM )) - - def main(): utils.tstStart(__file__) Index: tst_TreatmentHeparineData/test.py =================================================================== diff -u -r80181d382e841f6e66c8f0ad85d1c78e6856cfde -r4becb22543b290e42c8663e4d9ad59323bdec355 --- tst_TreatmentHeparineData/test.py (.../test.py) (revision 80181d382e841f6e66c8f0ad85d1c78e6856cfde) +++ tst_TreatmentHeparineData/test.py (.../test.py) (revision 4becb22543b290e42c8663e4d9ad59323bdec355) @@ -25,9 +25,9 @@ def gotoScreenNtest_Contains_TreatmentHeparinData(): mouseClick(waitForObject(names.o_treatmentHome_startTreatment)) - test.compare(str(waitForObjectExists(names.o_treatmentStart_HeparinSection).buttonText), "HEPARIN DELIVERY") - test.compare(str(waitForObjectExists(names.o_treatmentStart_HeparinSection).title ), "HEPARIN") - test.compare( waitForObjectExists(names.o_treatmentStart_HeparinSection).visible , True) + test.compare(str(waitForObjectExists(utils.dict_update(names.o_treatmentStart_HeparinSection, "buttonText", "HEPARIN DELIVERY")).buttonText), "HEPARIN DELIVERY") + test.compare(str(waitForObjectExists(utils.dict_update(names.o_treatmentStart_HeparinSection, "title", "HEPARIN")).title), "HEPARIN") + test.compare( waitForObject(names.o_treatmentStart_HeparinSection).visible , True) def test_values(vDelivered):