Index: suite_leahi/shared/scripts/names.py =================================================================== diff -u -rc2bd9c5111de498925aff408a70f9701d92bc74d -r7c8e3dedfd331c48c595f17878469c42dee2557f --- suite_leahi/shared/scripts/names.py (.../names.py) (revision c2bd9c5111de498925aff408a70f9701d92bc74d) +++ suite_leahi/shared/scripts/names.py (.../names.py) (revision 7c8e3dedfd331c48c595f17878469c42dee2557f) @@ -226,22 +226,27 @@ #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", "visible": True} -o_EndTreatmentRinseback_timeout_TimeText = {"container": o_EndTreatmentRinsebackStack_EndTreatmentRinseback_EndTreatmentRinseback, "objectName": "_timeout", "type": "TimeText", "visible": True} +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 } + Index: suite_leahi/tst_rinseback/test.py =================================================================== diff -u -rc2bd9c5111de498925aff408a70f9701d92bc74d -r7c8e3dedfd331c48c595f17878469c42dee2557f --- suite_leahi/tst_rinseback/test.py (.../test.py) (revision c2bd9c5111de498925aff408a70f9701d92bc74d) +++ suite_leahi/tst_rinseback/test.py (.../test.py) (revision 7c8e3dedfd331c48c595f17878469c42dee2557f) @@ -15,7 +15,7 @@ td =TD_Messaging() can_interface = td.can_interface -rinsebackrequest = 0 +rinsebackrequest = "0" request ="[1] Request is not allowed in the current operating mode" def change_treatmentstates(state): @@ -42,9 +42,10 @@ state,index = conversions.bytearray_to_integer( message, index) global rinsebackrequest - rinsebackrequest = state + test.log("Inside the function") + rinsebackrequest = str(state) + test.log("After the function") - def main(): utils.tstStart(__file__) startApplication(config.AUT_NAME) @@ -113,11 +114,8 @@ flow_rate_text =flow_rate.text test.log(str(flow_rate_text)) mouseClick(waitForObject(names.o_EndTreatmentRinseback_pauseResumeButton_TouchRect)) - # handle sent messages from UI - - # handle_solution_infusion_request(MsgIds.MSG_ID_UI_RINSEBACK_CMD_REQUEST.value) - test.verify(waitFor( lambda: rinsebackrequest == 3, 10000), "Testing FW received Arterial Window Value") + test.verify(waitFor( lambda: rinsebackrequest == 0, 10000), "Testing FW received Arterial Window Value") #test rejection td.td_rinseback_cmd_response(vRejectionReason = 1) rejectionReason = waitForObject(utility.setObjectText(text=request ,obj =names.o_EndTreatmentRinseback_NotificationBar_NotificationBarSmall)) @@ -160,8 +158,28 @@ 0 , 0) - test.log("test") + #Increment and decremenet Rinseback + incrementButton = waitForObject(names.o_EndTreatmentRinseback_incrementFlowRateButton_ArrowButton) + mouseClick(incrementButton) + #Verify FW receives request with correct opmode + decrementButton =waitForObject(names.o_EndTreatmentRinseback_decrementFlowRateButton_ArrowButton) + mouseClick(decrementButton) + #End Rinseback + endRinseback = waitForObject(names.o_EndTreatmentRinseback_endButton_TouchRect) + mouseClick(endRinseback) + # verify fw gets request with correct opmode + td.td_tx_state( TDTreatmentStates.TREATMENT_RINSEBACK_STATE.value, + 0 , + 0 , + 0 , + 0 , + TXStates.RINSEBACK_STOP_STATE , + 0 , + 0 , + 0 , + 0) + test.verify(waitForObjectExists(names.o_EndTreatmentRinsebackComplete_instructionView_InstructionView), "In Rinseback complete page") @@ -171,6 +189,3 @@ - - -