Index: suite_leahi/shared/scripts/names.py =================================================================== diff -u -r9e9fb3fcb3825db1635bd4be27e49c5e0d354b8a -ra63e10cb89f60f685552b6955625ab3b4d00ef40 --- suite_leahi/shared/scripts/names.py (.../names.py) (revision 9e9fb3fcb3825db1635bd4be27e49c5e0d354b8a) +++ suite_leahi/shared/scripts/names.py (.../names.py) (revision a63e10cb89f60f685552b6955625ab3b4d00ef40) @@ -36,7 +36,7 @@ o_dialyste_flow_title_Text = {"container": mainTreatmentScreen, "objectName": "dialysateFlowComponent", "type": "TreatmentFlowsComponent" } o_dialyste_tmp_title_Text = {"container": mainTreatmentScreen, "id": "_dialysateTemp", "objectName": "dialysateTempComponent", "type": "TreatmentFlowsComponent" } o_dialyste_cond_title_Text = {"container": mainTreatmentScreen, "id": "_dialysateCond", "objectName": "dialysateCondComponent", "type": "TreatmentFlowsComponent" } -o_treatmentTimeNotificationBarSmall = {"container": mainTreatmentScreen, "objectName": "notification", "type": "NotificationBarSmall" } + o_newTreatmentDuration_ValueAdjuster = {"container": o_Overlay, "objectName": "_valueAdjuster", "type": "ValueAdjuster", } o_newTreatmentDuration = {"container": o_Overlay, "objectName": "_newTreatmentDuration", "type": "LabelUnitText", } o_Popup_CloseButton = {"container": o_Overlay, "id": "_closeButton", "type": "CloseButton", "unnamed": 1 } @@ -262,3 +262,7 @@ o_rate_LabelUnitText = {"container": o_Overlay, "objectName": "_rate", "type": "LabelUnitText" } o_treatmentAdjustmentIsolatedUFDurationEdit = {"container": o_Overlay, "objectName": "_treatmentAdjustmentIsolatedUFDurationEdit", "type": "TreatmentAdjustmentIsolatedUFDurationEdit" } o_treatmentAdjustmentIsolatedUFVolumeEdit = {"container": o_Overlay, "objectName": "_treatmentAdjustmentIsolatedUFVolumeEdit", "type": "TreatmentAdjustmentIsolatedUFVolumeEdit" } +o_treatmentHome_notification_NotificationBarSmall = {"container": mainTreatmentScreen, "objectName": "notification", "type": "NotificationBarSmall"} + + + Index: suite_leahi/tst_main_treatment/test.py =================================================================== diff -u -r4e2984559dbdc1dc708f2bdbc984ed03ea1fd8e1 -ra63e10cb89f60f685552b6955625ab3b4d00ef40 --- suite_leahi/tst_main_treatment/test.py (.../test.py) (revision 4e2984559dbdc1dc708f2bdbc984ed03ea1fd8e1) +++ suite_leahi/tst_main_treatment/test.py (.../test.py) (revision a63e10cb89f60f685552b6955625ab3b4d00ef40) @@ -44,7 +44,7 @@ {"uf_volume": 1, "uf_rate": 0.53, "vol_delivered": 0.37 }, {"uf_volume": 10, "uf_rate": 5.05, "vol_delivered": 2.37 }, {"uf_volume": 20, "uf_rate": 10.0, "vol_delivered": 5.0 }, - {"uf_volume": 100,"uf_rate": 140.0,"vol_delivered": 156.0 }, + # {"uf_volume": 100,"uf_rate": 140.0,"vol_delivered": 156.0 }, {"uf_volume": 0, "uf_rate": 0.0, "vol_delivered": 0.0 } ] @@ -160,9 +160,11 @@ H14_venous_max = target_venous_max_limit, H2_arterial_long = 0 , H14_venous_long = 0 , - tmp_pressure = target_tmp_pressure, + tmp_pressure = target_tmp_pressure, + tmp_long = 0.0 , tmp_min = target_tmp_min_limit, - tmp_max = target_tmp_max_limit) + tmp_max = target_tmp_max_limit, + barometric = 0.0) # check the range bar's upper and lower bounds arterial_rangeBar = waitForObjectExists(names.o_arterial_RangeBar) @@ -211,7 +213,7 @@ @return: N/A """ test.compare(utility.get_object_from_names(names.o_treatmentUltrafiltration).visible, True, "UltraFiltration section is visible") - test.compare(waitForObjectExists(names.o_UF_Volume_Text).topText, "UF Volume", "UF Volume text verified") + test.compare(waitForObjectExists(names.o_UF_Volume_Text).topText, "UF Volume Goal", "UF Volume text verified") test.compare(waitForObjectExists(names.o_UF_Rate_Text).topText, "UF Rate", "UF Rate text verified") def start_test_treatment_ultrafiltration(uf_volume,uf_rate,vol_delivered): @@ -327,7 +329,7 @@ treatmentEditbutton = utility.findObjectById(treatmentEdit, "_editTimeIcon") mouseClick(treatmentEditbutton) if can_interface is not None: - channel_id = CAN.DenaliChannels.ui_to_td_ch_id + channel_id = CAN.CanChannels.ui_to_td_ch_id message_id = MsgIds.MSG_ID_UI_DURATION_VALIDATE_REQUEST.value can_interface.register_receiving_publication_function( channel_id, message_id, handle_new_treatment_duration_request @@ -377,7 +379,7 @@ 0 , 0) - verify main treatment screen + #verify main treatment screen test.verify(waitForObjectExists(names.mainTreatmentScreen), "In Main Treatment") # Pressure State @@ -393,8 +395,10 @@ H2_arterial_long = 0 , H14_venous_long = 0 , tmp_pressure = 0 , + tmp_long = 0.0 , tmp_min = TMP_LOW_VAL_MINUS_640 , - tmp_max = TMP_HIGH_VAL_210) + tmp_max = TMP_HIGH_VAL_210, + barometric = 0.0) verify_arterial_and_venous_value_in_main_treatment_screen(ACCEPTED,ART_LOW_VAL_MINUS_390,ART_HIGH_VAL_220,VENOUS_LOW_VAL_MINUS_90,VENOUS_HIGH_VAL_410,TMP_LOW_VAL_MINUS_640,TMP_HIGH_VAL_210) test.endSection() @@ -412,7 +416,7 @@ for value in total_time_list: treatment_time_verification(value) #Check the treatment complete text message - test.compare(utility.get_object_from_names(names.o_treatmentTimeNotificationBarSmall).text, "Treatment Complete", "Tx time completed text should be :" + str("Treatment Complete")) + test.compare(waitForObjectExists(names.o_treatmentHome_notification_NotificationBarSmall,2000).text, "Treatment Complete", "Tx time completed text should be :" + str("Treatment Complete")) td.td_treatment_time( tx_duration_s = 51 , tx_elapsed_s = 5 , tx_remaining_s = 6 ) @@ -426,7 +430,7 @@ 0 , 0 , 0 ) - test.compare(utility.get_object_from_names(names.o_treatmentTimeNotificationBarSmall).text, "Treatment Paused", "Tx time paused text should be :" + str("Treatment Paused")) + test.compare(waitForObjectExists(names.o_treatmentHome_notification_NotificationBarSmall).text, "Treatment Paused", "Tx time paused text should be :" + str("Treatment Paused")) test.endSection() #TX Parameter Set Points