Index: suite_leahi/shared/scripts/names.py =================================================================== diff -u -rac9b2e682a799b197e79adb58e94a708deccfb3b -r565fe7aef2a986066e364be426458fbe1e9e0a76 --- suite_leahi/shared/scripts/names.py (.../names.py) (revision ac9b2e682a799b197e79adb58e94a708deccfb3b) +++ suite_leahi/shared/scripts/names.py (.../names.py) (revision 565fe7aef2a986066e364be426458fbe1e9e0a76) @@ -248,28 +248,6 @@ o_factoryReset_ConfirmButton = {"container": o_userConfirmation_SettingsFactoryReset, "objectName": "_confirmButton", "type": "ConfirmButton", } o_cancelTouch_TouchRect = {"container": o_Overlay, "id": "_cancelTouch", "type": "TouchRect", "unnamed": 1 } o_confirmTouch_ConfirmButton = {"container": o_Overlay, "id": "_confirmTouch", "type": "ConfirmButton", "unnamed": 1 } -# Blood Prime -o_TreatmentBloodPrime_TreatmentBloodPrime = {"container": treatmentStack, "objectName": "_TreatmentBloodPrime", "type": "TreatmentBloodPrime", } -o_TreatmentBloodPrime_arterialRangeBar = {"container": o_TreatmentBloodPrime_TreatmentBloodPrime, "id": "_arterialRangeBar", "type": "TreatmentPressureComponent", "unnamed": 1 } -o_TreatmentBloodPrime_venousRangeBar = {"container": o_TreatmentBloodPrime_TreatmentBloodPrime, "id": "_venousRangeBar", "type": "TreatmentPressureComponent", "unnamed": 1 } -o_TreatmentBloodPrime_tmpRangeBar = {"container": o_TreatmentBloodPrime_TreatmentBloodPrime, "id": "_tmpRangeBar", "type": "TreatmentPressureComponent", "unnamed": 1 } -o_TreatmentBloodPrime_salineDescriptionText = {"container": o_TreatmentBloodPrime_TreatmentBloodPrime, "objectName": "salineDescriptionText", "type": "Text", } -o_TreatmentBloodPrime_startFluidButton_TouchRect = {"container": o_TreatmentBloodPrime_TreatmentBloodPrime, "id": "_startFluidButton", "type": "TouchRect", "unnamed": 1 } -o_TreatmentBloodPrime_fluidProgressBar_ProgressBar = {"container": o_TreatmentBloodPrime_TreatmentBloodPrime, "id": "_fluidProgressBar", "type": "ProgressBar", "unnamed": 1 } -o_TreatmentBloodPrime_treatmentSaline = {"container": o_TreatmentBloodPrime_TreatmentBloodPrime, "objectName": "_treatmentSaline", "type": "TreatmentSaline", } -o_TreatmentBloodPrime_currentBolusVolume = {"container": o_TreatmentBloodPrime_TreatmentBloodPrime, "type": "Label", "unnamed": 1 } -o_TreatmentBloodPrime_volumeText_Text = {"container": o_TreatmentBloodPrime_TreatmentBloodPrime, "objectName": "_volumeText", "type": "Text", } -o_TreatmentBloodPrime_Blood_Prime_Paused_Text = {"container": o_TreatmentBloodPrime_TreatmentBloodPrime, "type": "Text", "unnamed": 1 } -o_TreatmentBloodPrime_volumeProgress_ProgressCircle = {"container": o_TreatmentBloodPrime_TreatmentBloodPrime, "objectName": "_volumeProgress", "type": "ProgressCircle", } -o_TreatmentBloodPrime_pausedNotification = {"container": o_TreatmentBloodPrime_TreatmentBloodPrime, "objectName": "_pausedNotification", "type": "NotificationBarSmall", } -o_TreatmentBloodPrime_TimeText_hour_Text = {"container": o_TreatmentBloodPrime_TreatmentBloodPrime, "objectName": "_TimeText_hour", "type": "Text", } -o_TreatmentBloodPrime_TimeText_minute_Text = {"container": o_TreatmentBloodPrime_TreatmentBloodPrime, "objectName": "_TimeText_minute", "type": "Text", } -o_TreatmentBloodPrime_flowRateValue_Text = {"container": o_TreatmentBloodPrime_TreatmentBloodPrime, "objectName": "_flowRateValue", "type": "Text", } -o_TreatmentBloodPrime_flowRateUnit_Text = {"container": o_TreatmentBloodPrime_TreatmentBloodPrime, "objectName": "_flowRateUnit", "type": "Text", } -o_TreatmentBloodPrime_decrementFlowRateButton_ArrowButton = {"container": o_TreatmentBloodPrime_TreatmentBloodPrime, "objectName": "_decrementFlowRateButton", "type": "ArrowButton", } -o_TreatmentBloodPrime_incrementFlowRateButton_ArrowButton = {"container": o_TreatmentBloodPrime_TreatmentBloodPrime, "objectName": "_incrementFlowRateButton", "type": "ArrowButton", } -o_TreatmentBloodPrime_pauseResumeButton_TouchRect = {"container": o_TreatmentBloodPrime_TreatmentBloodPrime, "objectName": "_pauseResumeButton", "type": "TouchRect", } -o_TreatmentBloodPrime_NotificationBar = {"container": o_TreatmentBloodPrime_TreatmentBloodPrime, "objectName": "NotificationBar", "type": "NotificationBarSmall", } #Helpers o_SettingsStack_SettingsStack = {"container": o_Gui_MainView, "objectName": "_SettingsStack", "type": "SettingsStack", } @@ -345,7 +323,6 @@ o_SettingsAdvancedInstitutional_def_ValueAdjuster = {"container": o_SettingsBase_SettingsAdvancedInstitutional, "id": "_def", "type": "ValueAdjuster", "unnamed": 1 } o_PreTreatmentCreate_leftArrow_IconButton = {"container": o_preTreatmentStack_PreTreatmentCreate_PreTreatmentCreate, "id": "_leftArrow", "type": "IconButton", "unnamed": 1 } o_PreTreatmentCreate_rightArrow_IconButton = {"container": o_preTreatmentStack_PreTreatmentCreate_PreTreatmentCreate, "id": "_rightArrow", "type": "IconButton", "unnamed": 1 } - o_PreTreatmentSampleStack_PreTreatmentWaterSample = {"container": o_preTreatmentStack_PreTreatmentStack, "objectName": "_PreTreatmentSampleStack", "type": "PreTreatmentWaterSample", } o_PreTreatmentSampleStack_button_TouchRect = {"container": o_PreTreatmentSampleStack_PreTreatmentWaterSample, "id": "_button", "type": "TouchRect", "unnamed": 1 } o_preTreatmentStack_repeater_Repeater = {"container": o_preTreatmentStack_PreTreatmentStack, "id": "repeater", "type": "Repeater", "unnamed": 1 } @@ -369,3 +346,25 @@ o_EndTreatmentBase_NotificationBar_NotificationBarSmall_2 = {"container": o_recirculateRecirculateStack_EndTreatmentBase_EndTreatmentBase_2, "objectName": "NotificationBar", "type": "NotificationBarSmall", } o_EndTreatmentBase_ButtonResume_2 = {"container": o_recirculateRecirculateStack_EndTreatmentBase_EndTreatmentBase_2, "type": "ButtonResume", "unnamed": 1 } +# Blood Prime +o_TreatmentBloodPrime_TreatmentBloodPrime = {"container": treatmentStack, "objectName": "_TreatmentBloodPrime", "type": "TreatmentBloodPrime", } +o_TreatmentBloodPrime_arterialRangeBar = {"container": o_TreatmentBloodPrime_TreatmentBloodPrime, "id": "_arterialRangeBar", "type": "TreatmentPressureComponent", "unnamed": 1 } +o_TreatmentBloodPrime_venousRangeBar = {"container": o_TreatmentBloodPrime_TreatmentBloodPrime, "id": "_venousRangeBar", "type": "TreatmentPressureComponent", "unnamed": 1 } +o_TreatmentBloodPrime_tmpRangeBar = {"container": o_TreatmentBloodPrime_TreatmentBloodPrime, "id": "_tmpRangeBar", "type": "TreatmentPressureComponent", "unnamed": 1 } +o_TreatmentBloodPrime_salineDescriptionText = {"container": o_TreatmentBloodPrime_TreatmentBloodPrime, "objectName": "salineDescriptionText", "type": "Text", } +o_TreatmentBloodPrime_startFluidButton_TouchRect = {"container": o_TreatmentBloodPrime_TreatmentBloodPrime, "id": "_startFluidButton", "type": "TouchRect", "unnamed": 1 } +o_TreatmentBloodPrime_fluidProgressBar_ProgressBar = {"container": o_TreatmentBloodPrime_TreatmentBloodPrime, "id": "_fluidProgressBar", "type": "ProgressBar", "unnamed": 1 } +o_TreatmentBloodPrime_treatmentSaline = {"container": o_TreatmentBloodPrime_TreatmentBloodPrime, "objectName": "_treatmentSaline", "type": "TreatmentSaline", } +o_TreatmentBloodPrime_currentBolusVolume = {"container": o_TreatmentBloodPrime_TreatmentBloodPrime, "type": "Label", "unnamed": 1 } +o_TreatmentBloodPrime_volumeText_Text = {"container": o_TreatmentBloodPrime_TreatmentBloodPrime, "objectName": "_volumeText", "type": "Text", } +o_TreatmentBloodPrime_Blood_Prime_Paused_Text = {"container": o_TreatmentBloodPrime_TreatmentBloodPrime, "type": "Text", "unnamed": 1 } +o_TreatmentBloodPrime_volumeProgress_ProgressCircle = {"container": o_TreatmentBloodPrime_TreatmentBloodPrime, "objectName": "_volumeProgress", "type": "ProgressCircle", } +o_TreatmentBloodPrime_pausedNotification = {"container": o_TreatmentBloodPrime_TreatmentBloodPrime, "objectName": "_pausedNotification", "type": "NotificationBarSmall", } +o_TreatmentBloodPrime_TimeText_hour_Text = {"container": o_TreatmentBloodPrime_TreatmentBloodPrime, "objectName": "_TimeText_hour", "type": "Text", } +o_TreatmentBloodPrime_TimeText_minute_Text = {"container": o_TreatmentBloodPrime_TreatmentBloodPrime, "objectName": "_TimeText_minute", "type": "Text", } +o_TreatmentBloodPrime_flowRateValue_Text = {"container": o_TreatmentBloodPrime_TreatmentBloodPrime, "objectName": "_flowRateValue", "type": "Text", } +o_TreatmentBloodPrime_flowRateUnit_Text = {"container": o_TreatmentBloodPrime_TreatmentBloodPrime, "objectName": "_flowRateUnit", "type": "Text", } +o_TreatmentBloodPrime_decrementFlowRateButton_ArrowButton = {"container": o_TreatmentBloodPrime_TreatmentBloodPrime, "objectName": "_decrementFlowRateButton", "type": "ArrowButton", } +o_TreatmentBloodPrime_incrementFlowRateButton_ArrowButton = {"container": o_TreatmentBloodPrime_TreatmentBloodPrime, "objectName": "_incrementFlowRateButton", "type": "ArrowButton", } +o_TreatmentBloodPrime_pauseResumeButton_TouchRect = {"container": o_TreatmentBloodPrime_TreatmentBloodPrime, "objectName": "_pauseResumeButton", "type": "TouchRect", } +o_TreatmentBloodPrime_NotificationBar = {"container": o_TreatmentBloodPrime_TreatmentBloodPrime, "objectName": "NotificationBar", "type": "NotificationBarSmall", } Index: suite_leahi/suite.conf =================================================================== diff -u -r4b929ef6eef32479f10e84325b0ad12173474a4d -r565fe7aef2a986066e364be426458fbe1e9e0a76 --- suite_leahi/suite.conf (.../suite.conf) (revision 4b929ef6eef32479f10e84325b0ad12173474a4d) +++ suite_leahi/suite.conf (.../suite.conf) (revision 565fe7aef2a986066e364be426458fbe1e9e0a76) @@ -1,6 +1,6 @@ AUT=leahi LANGUAGE=Python OBJECTMAPSTYLE=script -TEST_CASES=tst_solution_infusion tst_main_treatment tst_service_export_logs tst_device_settings_information_version tst_headerbar_information_popup tst_headerbar_wifi_indicator tst_device_settings_wifi tst_ultrafiltration tst_create_treatment tst_general_alarm_requirements_instruction tst_headerbar_prescription tst_heparin tst_pre_treatment_foundation tst_feature_options tst_end_of_treatment tst_service_institutional +TEST_CASES=tst_solution_infusion tst_main_treatment tst_service_export_logs tst_device_settings_information_version tst_headerbar_information_popup tst_headerbar_wifi_indicator tst_device_settings_wifi tst_ultrafiltration tst_create_treatment tst_general_alarm_requirements_instruction tst_headerbar_prescription tst_heparin tst_pre_treatment_foundation tst_feature_options tst_end_of_treatment tst_service_institutional tst_settings_service tst_recirculate tst_blood_prime VERSION=3 WRAPPERS=Qt Index: suite_leahi/tst_blood_prime/test.py =================================================================== diff -u -re1246309ce89a717d94bc85ccc88f0a67ebec09c -r565fe7aef2a986066e364be426458fbe1e9e0a76 --- suite_leahi/tst_blood_prime/test.py (.../test.py) (revision e1246309ce89a717d94bc85ccc88f0a67ebec09c) +++ suite_leahi/tst_blood_prime/test.py (.../test.py) (revision 565fe7aef2a986066e364be426458fbe1e9e0a76) @@ -22,10 +22,10 @@ from leahi_dialin.protocols import CAN from leahi_dialin.utils import conversions -td_simulator = TD_Messaging() -can_interface = td_simulator.can_interface -bloodFlowrate = None -bloodPrimeState = None +td_simulator = TD_Messaging() +can_interface = td_simulator.can_interface +bloodFlowrate = None +bloodPrimeState = None salineBolusStartState = None ART_LOW_VAL_MINUS_390 = -390 ART_HIGH_VAL_220 = 220 @@ -608,8 +608,6 @@ utils.tstStart(__file__) startApplication(utility.aut("-q")) td_simulator.td_operation_mode(TDOpModes.MODE_STAN.value) - mouseClick(waitForObject(names.o_createTreatmentRect_TouchRect, 2000)) - td_simulator.td_operation_mode(TDOpModes.MODE_TREA.value, 0) td_simulator.td_tx_state( TDTreatmentStates.TREATMENT_BLOOD_PRIME_STATE.value, 0, 0, 0, 0, 0, 0, 0, 0, 0