Index: suite_leahi/shared/scripts/names.py =================================================================== diff -u -r7c8e3dedfd331c48c595f17878469c42dee2557f -rc3fed566691f30e31d3880f6b70cc26d626b5873 --- suite_leahi/shared/scripts/names.py (.../names.py) (revision 7c8e3dedfd331c48c595f17878469c42dee2557f) +++ suite_leahi/shared/scripts/names.py (.../names.py) (revision c3fed566691f30e31d3880f6b70cc26d626b5873) @@ -226,25 +226,23 @@ #Rinseback -o_EndTreatmentRinsebackStack_EndTreatmentRinsebackStack = {"container": o_Gui_MainView, "objectName": "_EndTreatmentRinsebackStack", "type": "EndTreatmentRinsebackStack" } -o_EndTreatmentRinsebackStack_EndTreatmentRinseback_EndTreatmentRinseback = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinsebackStack, "objectName": "_EndTreatmentRinseback", "type": "EndTreatmentRinseback" } -o_EndTreatmentRinseback_arterialRangeBar_TreatmentPressureComponent = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinseback_EndTreatmentRinseback, "id": "_arterialRangeBar", "type": "TreatmentPressureComponent", "unnamed": 1 } -o_EndTreatmentRinseback_venousRangeBar_TreatmentPressureComponent = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinseback_EndTreatmentRinseback, "id": "_venousRangeBar", "type": "TreatmentPressureComponent", "unnamed": 1 } -o_EndTreatmentRinseback_tmpRangeBar_TreatmentPressureComponent = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinseback_EndTreatmentRinseback, "id": "_tmpRangeBar", "type": "TreatmentPressureComponent", "unnamed": 1 } -o_EndTreatmentRinseback_deliveredVolumeText_Text = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinseback_EndTreatmentRinseback, "objectName": "_deliveredVolumeText", "type": "Text" } -o_EndTreatmentRinseback_flowRateValue_Text = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinseback_EndTreatmentRinseback, "objectName": "_flowRateValue", "type": "Text" } -o_EndTreatmentRinseback_endButton_TouchRect = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinseback_EndTreatmentRinseback, "objectName": "_endButton", "type": "TouchRect" } -o_EndTreatmentRinseback_pauseResumeButton_TouchRect = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinseback_EndTreatmentRinseback, "objectName": "_pauseResumeButton", "type": "TouchRect" } -# o_notification_bar = {"container": o_Overlay, "objectName": "NotificationBar", "type": "NotificationBarSmall" } -o_EndTreatmentRinseback_NotificationBar_NotificationBarSmall = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinseback_EndTreatmentRinseback, "objectName": "NotificationBar", "type": "NotificationBarSmall" } -# o_EndTreatmentRinseback_row_Row = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinseback_EndTreatmentRinseback, "id": "_row", "type": "Row", "unnamed": 1} -o_EndTreatmentRinseback = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinseback_EndTreatmentRinseback, "type": "Text", "unnamed": 1 } -o_EndTreatmentRinseback_targetVolumeProgress_ProgressCircle = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinseback_EndTreatmentRinseback, "objectName": "_targetVolumeProgress", "type": "ProgressCircle" } -o_EndTreatmentRinseback_timeout_TimeText = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinseback_EndTreatmentRinseback, "objectName": "_timeout", "type": "TimeText" } -o_EndTreatmentRinseback_decrementFlowRateButton_ArrowButton = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinseback_EndTreatmentRinseback, "objectName": "_decrementFlowRateButton", "type": "ArrowButton" } -o_EndTreatmentRinseback_incrementFlowRateButton_ArrowButton = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinseback_EndTreatmentRinseback, "objectName": "_incrementFlowRateButton", "type": "ArrowButton" } -o_EndTreatmentRinsebackStack_EndTreatmentRinsebackComplete_EndTreatmentRinsebackComplete = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinsebackStack, "objectName": "_EndTreatmentRinsebackComplete", "type": "EndTreatmentRinsebackComplete" } -o_EndTreatmentRinsebackComplete_instructionView_InstructionView = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinsebackComplete_EndTreatmentRinsebackComplete, "id": "_instructionView", "type": "InstructionView", "unnamed": 1 } +o_EndTreatmentRinsebackStack_EndTreatmentRinsebackStack = {"container": o_Gui_MainView, "objectName": "_EndTreatmentRinsebackStack", "type": "EndTreatmentRinsebackStack" } +o_EndTreatmentRinsebackStack_EndTreatmentRinseback_EndTreatmentRinseback = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinsebackStack, "objectName": "_EndTreatmentRinseback", "type": "EndTreatmentRinseback" } +o_EndTreatmentRinseback_arterialRangeBar_TreatmentPressureComponent = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinseback_EndTreatmentRinseback, "id": "_arterialRangeBar", "type": "TreatmentPressureComponent", "unnamed": 1 } +o_EndTreatmentRinseback_venousRangeBar_TreatmentPressureComponent = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinseback_EndTreatmentRinseback, "id": "_venousRangeBar", "type": "TreatmentPressureComponent", "unnamed": 1 } +o_EndTreatmentRinseback_tmpRangeBar_TreatmentPressureComponent = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinseback_EndTreatmentRinseback, "id": "_tmpRangeBar", "type": "TreatmentPressureComponent", "unnamed": 1 } +o_EndTreatmentRinseback_deliveredVolumeText_Text = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinseback_EndTreatmentRinseback, "objectName": "_deliveredVolumeText", "type": "Text" } +o_EndTreatmentRinseback_flowRateValue_Text = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinseback_EndTreatmentRinseback, "objectName": "_flowRateValue", "type": "Text" } +o_EndTreatmentRinseback_endButton_TouchRect = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinseback_EndTreatmentRinseback, "objectName": "_endButton", "type": "TouchRect" } +o_EndTreatmentRinseback_pauseResumeButton_TouchRect = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinseback_EndTreatmentRinseback, "objectName": "_pauseResumeButton", "type": "TouchRect" } +o_EndTreatmentRinseback_NotificationBar_NotificationBarSmall = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinseback_EndTreatmentRinseback, "objectName": "NotificationBar", "type": "NotificationBarSmall" } +o_EndTreatmentRinseback = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinseback_EndTreatmentRinseback, "type": "Text", "unnamed": 1 } +o_EndTreatmentRinseback_targetVolumeProgress_ProgressCircle = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinseback_EndTreatmentRinseback, "objectName": "_targetVolumeProgress", "type": "ProgressCircle" } +o_EndTreatmentRinseback_timeout_TimeText = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinseback_EndTreatmentRinseback, "objectName": "_timeout", "type": "TimeText" } +o_EndTreatmentRinseback_decrementFlowRateButton_ArrowButton = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinseback_EndTreatmentRinseback, "objectName": "_decrementFlowRateButton", "type": "ArrowButton" } +o_EndTreatmentRinseback_incrementFlowRateButton_ArrowButton = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinseback_EndTreatmentRinseback, "objectName": "_incrementFlowRateButton", "type": "ArrowButton" } +o_EndTreatmentRinsebackStack_EndTreatmentRinsebackComplete_EndTreatmentRinsebackComplete = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinsebackStack, "objectName": "_EndTreatmentRinsebackComplete", "type": "EndTreatmentRinsebackComplete" } +o_EndTreatmentRinsebackComplete_instructionView_InstructionView = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinsebackComplete_EndTreatmentRinsebackComplete, "id": "_instructionView", "type": "InstructionView", "unnamed": 1 } Index: suite_leahi/suite.conf =================================================================== diff -u -r1a3dc7aeb6c2998c4480a9c58c522c293c1389f5 -rc3fed566691f30e31d3880f6b70cc26d626b5873 --- suite_leahi/suite.conf (.../suite.conf) (revision 1a3dc7aeb6c2998c4480a9c58c522c293c1389f5) +++ suite_leahi/suite.conf (.../suite.conf) (revision c3fed566691f30e31d3880f6b70cc26d626b5873) @@ -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 +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_rinseback VERSION=3 WRAPPERS=Qt Index: suite_leahi/tst_rinseback/test.py =================================================================== diff -u -rfa71e89d96d4822d2174d6ba9650807ef000c1a6 -rc3fed566691f30e31d3880f6b70cc26d626b5873 --- suite_leahi/tst_rinseback/test.py (.../test.py) (revision fa71e89d96d4822d2174d6ba9650807ef000c1a6) +++ suite_leahi/tst_rinseback/test.py (.../test.py) (revision c3fed566691f30e31d3880f6b70cc26d626b5873) @@ -38,10 +38,9 @@ from leahi_dialin.common.td_defs import TDOpModes,TDTreatmentStates from leahi_dialin.utils import conversions -td =TD_Messaging() -can_interface = td.can_interface -rinsebackrequest = None -# request ="[1] Request is not allowed in the current operating mode" +td = TD_Messaging() +can_interface = td.can_interface +rinsebackrequest = None def change_treatmentstates(state,substate): test.startSection("Change the treatment parameter") @@ -162,13 +161,30 @@ vCountdown = 84, vIsCompleted = 0) timeouttext = waitForObject(names.o_EndTreatmentRinseback_timeout_TimeText, 2000) - test.log(str(timeouttext.time)) + timeoutValue = str(timeouttext.time) + test.compare(timeoutValue,"01:24","Rinseback paused text should be'{}'".format(timeoutValue)) mouseClick(waitForObject(names.o_EndTreatmentRinseback_pauseResumeButton_TouchRect, 2000)) - test.verify(waitFor( lambda: rinsebackrequest == 4, 3000), "Testing FW received Arterial Window Value") + test.verify(waitFor( lambda: rinsebackrequest == 4, 3000), "Testing FW received Resume Rinseback request") change_treatmentstates( TDTreatmentStates.TREATMENT_RINSEBACK_STATE.value, TXStates.RINSEBACK_RUN_STATE) test.endSection() +def verify_increment_decrement_rinseback_values(): + test.startSection("Verify the increment and decrement values in rinseback flow values ") + incrementButton = waitForObject(names.o_EndTreatmentRinseback_incrementFlowRateButton_ArrowButton,1000) + mouseClick(incrementButton) + test.verify(waitFor( lambda: rinsebackrequest == 1, 3000), "Testing FW received Increment value") + decrementButton =waitForObject(names.o_EndTreatmentRinseback_decrementFlowRateButton_ArrowButton,1000) + mouseClick(decrementButton) + test.verify(waitFor( lambda: rinsebackrequest == 2, 3000), "Testing FW received Decrement Value") + endRinseback = waitForObject(names.o_EndTreatmentRinseback_endButton_TouchRect,2000) + mouseClick(endRinseback) + test.verify(waitFor( lambda: rinsebackrequest == 5, 3000), "Testing FW received End Rinseback Value") + change_treatmentstates( TDTreatmentStates.TREATMENT_RINSEBACK_STATE.value, + TXStates.RINSEBACK_STOP_STATE) + + test.endSection() + def main(): utils.tstStart(__file__) startApplication(config.AUT_NAME) @@ -183,28 +199,18 @@ verify_pressure_value() verify_flow_values_rinseback() verify_pause_rinseback() - verify_resume_rinseback + verify_resume_rinseback() + verify_increment_decrement_rinseback_values() - #Increment and decremenet Rinseback - incrementButton = waitForObject(names.o_EndTreatmentRinseback_incrementFlowRateButton_ArrowButton,1000) - mouseClick(incrementButton) - test.verify(waitFor( lambda: rinsebackrequest == 1, 3000), "Testing FW received Arterial Window Value") - decrementButton =waitForObject(names.o_EndTreatmentRinseback_decrementFlowRateButton_ArrowButton,1000) - mouseClick(decrementButton) - test.verify(waitFor( lambda: rinsebackrequest == 2, 3000), "Testing FW received Arterial Window Value") - endRinseback = waitForObject(names.o_EndTreatmentRinseback_endButton_TouchRect,2000) - mouseClick(endRinseback) - test.verify(waitFor( lambda: rinsebackrequest == 5, 3000), "Testing FW received Arterial Window Value") - change_treatmentstates( TDTreatmentStates.TREATMENT_RINSEBACK_STATE.value, - TXStates.RINSEBACK_STOP_STATE) - + test.startSection("Verify the screen changes to Rinseback complete page") test.verify(waitForObjectExists(names.o_EndTreatmentRinsebackComplete_instructionView_InstructionView), "In Rinseback complete page") + test.endSection() + utils.tstDone() -