Index: shared/scripts/names.py =================================================================== diff -u -r91e0fc7ff1a05af0ba299e45ef7dae1a79b45bc1 -rf9b1549b9531b5a3b244c47d72bf7178cc1165e4 --- shared/scripts/names.py (.../names.py) (revision 91e0fc7ff1a05af0ba299e45ef7dae1a79b45bc1) +++ shared/scripts/names.py (.../names.py) (revision f9b1549b9531b5a3b244c47d72bf7178cc1165e4) @@ -160,10 +160,9 @@ # Alarm Status o_qquickview_alarm = {"type": "QQuickView", "unnamed": 1, "visible": True} o_alarm_dialog = {"container": o_Overlay, "id": "_backgroundRect", "type": "Rectangle", "unnamed": 1, "visible": True} -o_okay_alarm = {"container": o_Overlay, "id": "_okay", "type": "TouchRect", "unnamed": 1, "visible": True} +o_okay_alarm = {"container": o_Overlay, "objectName": "_alarmOK", "type": "TouchRect"} o_alarm_bar = {"container": o_qquickview_alarm, "objectName": "NotificationBar", "type": "NotificationBar"} o_treatmentStart_heparinTouchArea_TreatmentFluid = {"container": o_treatmentStart_TreatmentStart, "id": "_heparinTouchArea", "type": "TreatmentFluid", "unnamed": 1, "visible": True} -o_dismiss_alarm = {"container": o_Overlay, "id": "_silence", "type": "TouchRect", "unnamed": 1, "visible": True} o_treatmentStart_TimeText_TimeText = {"container": o_treatmentStart_TreatmentStart, "objectName": "_TimeText", "type": "TimeText", "visible": True} o_treatmentStart_TimeText_hour_Text = {"container": o_treatmentStart_TreatmentStart, "objectName": "_TimeText_hour", "type": "Text", "visible": True} o_treatmentStart_TimeText_minute_Text = {"container": o_treatmentStart_TreatmentStart, "objectName": "_TimeText_minute", "type": "Text", "visible": True} @@ -394,6 +393,11 @@ o_NotificationDialog_Description_Text = {"container": o_Overlay, "objectName": "_NotificationDialog_Description", "type": "Text"} o_NotificationDialog_OKAY = {"container": o_Overlay, "text": "OKAY", "type": "Text"} +# Alert System +o_alert = {"container": o_Overlay, "id": "_backgroundRect", "type": "Rectangle"} +o_alert_confirm = {"container": o_Overlay, "objectName": "AlertConfirmButton", "type": "TouchRect"} +o_alert_cancel = {"container": o_Overlay, "objectName": "AlertCancelButton", "type": "TouchRect"} + o_create_treatment_button = {"container": o_treatmentHome, "text": "CREATE TREATMENT", "type": "Text", "unnamed": 1 } o_create_treatment_container = {"container": o_qquickview_alarm, "objectName": "TreatmentCreate", "type": "TreatmentCreate" } o_create_treatment_flickable = {"container": o_create_treatment_container, "objectName": "_treatmentCreateFlickable", "type": "Flickable"} @@ -416,6 +420,11 @@ o_create_treatment_confirm = {"container": o_create_treatment_confirm_container, "objectName": "_continueRect", "type": "TouchRect"} o_create_treatment_confirm_back_button = {"container": o_create_treatment_confirm_container, "objectName": "_backButton", "type": "BackButton"} +o_create_treatment_arterial_column = {"container": o_create_treatment_container, "objectName": "_arterialPressureLimitsColumn", "type": "Column" } +o_create_treatment_arterial_slider = {"container": o_create_treatment_container, "objectName": "_arterialPressureLimitsSlider", "type": "RangeSlider" } +o_create_treatment_venous_column = {"container": o_create_treatment_container, "objectName": "_venousPressureLimitsColumn", "type": "Column" } +o_create_treatment_venous_slider = {"container": o_create_treatment_container, "objectName": "_venousPressureLimitsSlider", "type": "RangeSlider" } + # Confirm + Priming + Begin Treatment o_confirm_treatment_flickable = {"container": o_create_treatment_confirm_container, "objectName": "_treatmentConfirmFlickable", "type": "Flickable"} o_priming_container = {"container": o_qquickview_alarm, "objectName": "_treatmentPrime", "type": "TreatmentPrime"} Index: tools/run_tests.sh =================================================================== diff -u -rac88b33834b21228e3dd2764b5fa6ff13cbababe -rf9b1549b9531b5a3b244c47d72bf7178cc1165e4 --- tools/run_tests.sh (.../run_tests.sh) (revision ac88b33834b21228e3dd2764b5fa6ff13cbababe) +++ tools/run_tests.sh (.../run_tests.sh) (revision f9b1549b9531b5a3b244c47d72bf7178cc1165e4) @@ -15,8 +15,8 @@ # and can run tests with the specified tags # ############################################################################ -TAGS=TreatmentAdjustmentBloodDialysate,TreatmentAdjustmentDuration,TreatmentStatesData,HDOutletFlowData,AlarmColors,CreateTreatment -TIMEOUT=60 +TAGS=ConfirmPrimingBegin +TIMEOUT=200 rm -rf /tmp/UnitTest cd .. Index: tst_Alarm_Colors/test.py =================================================================== diff -u -rcea779e4d5eb422603a9194f6b9a01ec7e268612 -rf9b1549b9531b5a3b244c47d72bf7178cc1165e4 --- tst_Alarm_Colors/test.py (.../test.py) (revision cea779e4d5eb422603a9194f6b9a01ec7e268612) +++ tst_Alarm_Colors/test.py (.../test.py) (revision f9b1549b9531b5a3b244c47d72bf7178cc1165e4) @@ -112,32 +112,18 @@ continue #test.log("Testing {0} = {1}".format(alarm_list[idx], alarm_id)) color = HIGH_PRIORITY_COLOR if priority == HIGH else MED_LOW_PRIORITY_COLOR + flags = HDSimulator.alarms_simulator.cmd_make_alarm_flags( + no_clear=1, + no_resume=1, + no_rinseback=1, + no_end_treatment=1, + no_new_treatment=1, + user_must_ack=1) HDSimulator.alarms_simulator.cmd_activate_alarm_id(priority, alarm_id, escalates_in, silent_expires_in, flags) test.compare(waitForObject(names.o_alarm_dialog).color.name, color) - mouseClick(waitForObject(names.o_dismiss_alarm)) - mouseClick(waitForObject(names.o_alarm_bar)) - mouseClick(waitForObject(names.o_dismiss_alarm)) - mouseClick(waitForObject(names.o_alarm_bar)) mouseClick(waitForObject(names.o_okay_alarm)) - mouseClick(waitForObject(names.o_alarm_bar)) HDSimulator.alarms_simulator.cmd_send_clear_alarms() -def test_alarm_acknowledge(alarms): - """ - Exercises the acknowledge alarm functionality - - @return: None - """ - #test.log("Testing alarm acknowledgement") - - HDSimulator.alarms_simulator.cmd_send_clear_alarms() - HDSimulator.alarms_simulator.cmd_activate_alarm_id(*alarms.ALARM_ID_SOFTWARE_FAULT) - test.compare(waitForObject(names.o_alarm_dialog).color.name, HIGH_PRIORITY_COLOR) - mouseClick(waitForObject(names.o_okay_alarm)) - HDSimulator.alarms_simulator.cmd_send_clear_alarms() - HDSimulator.alarms_simulator.cmd_activate_alarm_id(*alarms.ALARM_ID_SOFTWARE_FAULT) - - def get_alarm_list(alarms): """ Gets the alarm list @@ -167,9 +153,6 @@ alarm_list = get_alarm_list(alarms) test_alarms(alarms, alarm_list) - - # test the alarm acknowledgement - test_alarm_acknowledge(alarms) os.system("killall " + names.AUT_NAME) sleep(3) Index: tst_ConfirmPrimingBegin/test.py =================================================================== diff -u -r93fe289e1e33e4b2cf824e30f810490f073ecab3 -rf9b1549b9531b5a3b244c47d72bf7178cc1165e4 --- tst_ConfirmPrimingBegin/test.py (.../test.py) (revision 93fe289e1e33e4b2cf824e30f810490f073ecab3) +++ tst_ConfirmPrimingBegin/test.py (.../test.py) (revision f9b1549b9531b5a3b244c47d72bf7178cc1165e4) @@ -40,8 +40,6 @@ waitForGUI(7) # advance to start the treatment - test.compare(waitForObject(names.o_priming_flickable).visible, True, "Found priming flickable") - flick(waitForObject(names.o_priming_flickable), 0, 123) test.compare(waitForObject(names.o_priming_continue_button).visible, True, "Found priming continue button") mouseClick(waitForObject(names.o_priming_continue_button)) @@ -65,9 +63,15 @@ test.compare(waitForObject(names.o_priming_continue_button).visible, True, "Found priming continue button") mouseClick(waitForObject(names.o_priming_continue_button)) test_ultrafiltration_slider(hd_simulator) + + # Wait for the BLE alert + 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.1) + waitForGUI(0.2) mouseClick(waitForObject(names.o_treatmentStart_back)) mouseClick(waitForObject(names.o_mainMenu_settings)) mouseClick(waitForObject(names.o_settings_end_treatment)) @@ -80,7 +84,7 @@ @param hd_siulator: The HDSimulator object @return: None """ - slider_name = "_ultrafiltration" + slider_name = "_treatmentBeginUltrafiltration" slider_object_name = slider_name + "Slider" test.log("Slider Under Test", slider_object_name) slider_selected_value_object_name = slider_name + "Value" @@ -97,12 +101,12 @@ test.compare(waitForObject(selected_value_object).visible, True) mouseClick(waitForObject(slider_object), 0, 0, Qt.LeftButton) - test.compare(waitForObject(selected_value_object).text, "{0} {1}".format(0, "mL")) + test.compare(waitForObject(selected_value_object).text, "0.000") mouseClick(waitForObject(slider_object), waitForObject(slider_object).width, 0, Qt.LeftButton) test.compare(waitForObject(selected_value_object).visible, True) - test.compare(waitForObject(selected_value_object).text, "{0} {1}".format(8, "mL")) + test.compare(waitForObject(selected_value_object).text, "8.000") def main(): utils.tstStart(__file__) Index: tst_CreateTreatment/test.py =================================================================== diff -u -rcea779e4d5eb422603a9194f6b9a01ec7e268612 -rf9b1549b9531b5a3b244c47d72bf7178cc1165e4 --- tst_CreateTreatment/test.py (.../test.py) (revision cea779e4d5eb422603a9194f6b9a01ec7e268612) +++ tst_CreateTreatment/test.py (.../test.py) (revision f9b1549b9531b5a3b244c47d72bf7178cc1165e4) @@ -85,8 +85,6 @@ "_dialyzerTypeRect": "GridSelection", "_dialysateTemperature": "SliderCreateTreatment", - "_arterialPressureLimits": "SliderDoubleCreateTreatment", - "_venousPressureLimits": "SliderDoubleCreateTreatment", "_bloodPressureMeasurementInterval": "SliderCreateTreatment", "_rinsebackFlowRate": "SliderCreateTreatment", @@ -100,7 +98,14 @@ "objectName": parameter_name, "type": type_name }).visible, True, "Found " + parameter_name) + + # arterial and venous pressure limits + test.compare(waitForObjectExists(names.o_create_treatment_arterial_column).visible, True, "Found Arterial Pressure Limits Column") + test.compare(waitForObjectExists(names.o_create_treatment_arterial_slider).visible, True, "Found Arterial Pressure Limits Slider") + test.compare(waitForObjectExists(names.o_create_treatment_venous_column).visible, True, "Found Venous Pressure Limits Column") + test.compare(waitForObjectExists(names.o_create_treatment_venous_slider).visible, True, "Found Arterial Pressure Limits Slider") + def test_sliders(): """ Tests that all sliders have the correct min / max values and that the selected value is displayed correctly. @@ -118,10 +123,6 @@ "_heparinStopTime": {"min": slider_ranges["heparinStopTimeMin"], "max": slider_ranges["heparinStopTimeMax"], "units": "min" }, "_salineBolus": {"min": slider_ranges["salineBolusMin"], "max": slider_ranges["salineBolusMax"], "units": "mL" }, "_dialysateTemperature": {"min": slider_ranges["dialysateTempMin"], "max": slider_ranges["dialysateTempMax"], "units": "C" }, - "_arterialPressureLimitsLow": {"min": slider_ranges["arterialPressureLimitLowMin"], "max": slider_ranges["arterialPressureLimitLowMax"], "units": "mmHg" }, - "_arterialPressureLimitsHigh": {"min": slider_ranges["arterialPressureLimitHighMin"], "max": slider_ranges["arterialPressureLimitHighMax"], "units": "mmHg" }, - "_venousPressureLimitsLow": {"min": slider_ranges["venousPressureLimitLowMin"], "max": slider_ranges["venousPressureLimitLowMax"], "units": "mmHg" }, - "_venousPressureLimitsHigh": {"min": slider_ranges["venousPressureLimitHighMin"], "max": slider_ranges["venousPressureLimitHighMax"], "units": "mmHg" }, "_bloodPressureMeasurementInterval": {"min": slider_ranges["bloodPressureMeasureIntervalMin"], "max": slider_ranges["bloodPressureMeasureIntervalMax"], "units": "min" }, "_rinsebackFlowRate": {"min": slider_ranges["rinsebackFlowRateMin"], "max": slider_ranges["rinsebackFlowRateMax"], "units": "mL/min" }, } @@ -133,7 +134,7 @@ if slider_name == "_dialysateTemperature": flick(waitForObject(names.o_create_treatment_flickable), 0, 700) sleep(1) - if slider_name == "_venousPressureLimitsHigh": + if slider_name == "_bloodPressureMeasurementInterval": flick(waitForObject(names.o_create_treatment_flickable), 0, 300) sleep(2) @@ -175,7 +176,27 @@ test.compare(waitForObject(selected_value_object).visible, True) test.compare(waitForObject(selected_value_object).text, "{0} {1}".format(slider_info["max"], slider_info["units"])) +def test_pressure_limits(): + """ + Tests the arterial and venous pressure limits sliders + """ + objects = [names.o_create_treatment_arterial_slider, names.o_create_treatment_venous_slider] + for obj in objects: + mouseClick(waitForObject(obj), waitForObject(obj).width / 3, 5, Qt.LeftButton) + mouseDrag(waitForObject(obj), + waitForObject(obj).width / 2, + 0, + -waitForObject(obj).width / 2, + 0, + Qt.NoModifier, + Qt.LeftButton) + mouseClick(waitForObject(obj), waitForObject(obj).width *(2/3), 5, Qt.LeftButton) + mouseClick(waitForObject(obj), waitForObject(obj).width - 2, 0, Qt.LeftButton) + + + + def check_button_group(buttons, slider_ranges_key): for idx, btn in enumerate(buttons): @@ -271,6 +292,7 @@ test_continue_failure(hd_simulator) test_parameters_exist() test_sliders() + test_pressure_limits() test_rects() test_continue_success(hd_simulator) utils.tstDone()