Index: suite_leahi/tst_main_treatment/test.py =================================================================== diff -u -r6c793bf295d7ca93dc19e04a7105faf926086f75 -r3c058b92591ff8a31fbe80d8df985d822c8b8698 --- suite_leahi/tst_main_treatment/test.py (.../test.py) (revision 6c793bf295d7ca93dc19e04a7105faf926086f75) +++ suite_leahi/tst_main_treatment/test.py (.../test.py) (revision 3c058b92591ff8a31fbe80d8df985d822c8b8698) @@ -62,13 +62,13 @@ """ test.startSection("Verifying Arterial low and high and Venous low and high value on main treatment screen") if accepted == ACCEPTED: - arterial_rangeBar = utility.get_object_from_names(names.arterial_RangeBar, error_message="arterial rangeBar object is missing") + arterial_rangeBar = utility.get_object_from_names(names.o_arterial_RangeBar, error_message="arterial rangeBar object is missing") arterial_low = arterial_rangeBar.lowerBound arterial_high = arterial_rangeBar.upperBound - venous_rangeBar = utility.get_object_from_names(names.venous_RangeBar, error_message="venous rangeBar object is missing") + venous_rangeBar = utility.get_object_from_names(names.o_venous_RangeBar, error_message="venous rangeBar object is missing") venous_low = venous_rangeBar.lowerBound venous_high = venous_rangeBar.upperBound - tmp_RangeBar = utility.get_object_from_names(names.tmp_RangeBar, error_message="trancememberance rangeBar object is missing") + tmp_RangeBar = utility.get_object_from_names(names.o_tmp_RangeBar, error_message="trancememberance rangeBar object is missing") trancememberance_low = tmp_RangeBar.lowerBound trancememberance_high = tmp_RangeBar.upperBound test.compare(arterial_low, art_low, @@ -146,43 +146,43 @@ tmp_max = target_tmp_max_limit) # check the range bar's upper and lower bounds - arterial_rangeBar = utility.get_object_from_names(names.arterial_RangeBar, error_message="arterial rangeBar object is missing",timeout_ms=1000) + arterial_rangeBar = waitForObjectExists(names.o_arterial_RangeBar) if arterial_rangeBar is not None: test.compare(arterial_rangeBar.lowerBound, target_arterial_min_limit, "Checking lower bound of arterial pressure range bar") test.compare(arterial_rangeBar.upperBound, target_arterial_max_limit, "Checking upper bound of arterial pressure range bar") #check the marker value for the arterial pressure - arterial_rangeBar_marker_text_object = utility.get_object_from_names(names.pressure_arterial_marker_text, error_message="arterial pressure marker label object is missing",timeout_ms=1000) + arterial_rangeBar_marker_text_object = waitForObjectExists(names.o_arterial_RangeBar) if arterial_rangeBar_marker_text_object is not None: - actual_text = str(arterial_rangeBar_marker_text_object.value).strip() - expected_text = str(target_arterial_pressure).strip() - test.compare(float(actual_text), float(expected_text), "Expecting arterial pressure to be displayed") + actual_text = str(arterial_rangeBar_marker_text_object.pressure) + expected_text = str(target_arterial_pressure) + test.compare(actual_text, expected_text, "Expecting arterial pressure to be displayed") # check the range bar's upper and lower bounds - venous_rangeBar = utility.get_object_from_names(names.venous_RangeBar, error_message="venous rangeBar object is missing",timeout_ms=1000) + venous_rangeBar = waitForObjectExists(names.o_venous_RangeBar) if venous_rangeBar is not None: test.compare(venous_rangeBar.lowerBound, target_venous_min_limit, "Checking lower bound of venous pressure range bar") test.compare(venous_rangeBar.upperBound, target_venous_max_limit, "Checking upper bound of venous pressure range bar") #check the marker value for the venous pressure - venous_rangeBar_marker_text_object = utility.get_object_from_names(names.pressure_venous_marker_text, error_message="venous pressure marker label object is missing",timeout_ms=1000) + venous_rangeBar_marker_text_object = waitForObjectExists(names.o_venous_RangeBar) if venous_rangeBar_marker_text_object is not None: - actual_text = str(venous_rangeBar_marker_text_object.value).strip() - expected_text = str(target_venous_pressure).strip() - test.compare(float(actual_text), float(expected_text), "Expecting venous pressure to be displayed") + actual_text = str(venous_rangeBar_marker_text_object.pressure) + expected_text = str(target_venous_pressure) + test.compare(actual_text, expected_text, "Expecting venous pressure to be displayed") # check the range bar's upper and lower bounds - tmp_rangeBar = utility.get_object_from_names(names.tmp_RangeBar, error_message="Trancememberance rangeBar object is missing",timeout_ms=1000) + tmp_rangeBar = waitForObjectExists(names.o_tmp_RangeBar) if tmp_rangeBar is not None: test.compare(tmp_rangeBar.lowerBound, target_tmp_min_limit, "Checking lower bound of trancememberance pressure range bar") test.compare(tmp_rangeBar.upperBound, target_tmp_max_limit, "Checking upper bound of trancememberance pressure range bar") #check the marker value for the trancememberance pressure - tmp_rangeBar_marker_text_object = utility.get_object_from_names(names.pressure_tmp_marker_text, error_message="Trancememberance pressure marker label object is missing",timeout_ms=1000) + tmp_rangeBar_marker_text_object = waitForObjectExists(names.o_tmp_RangeBar) if tmp_rangeBar_marker_text_object is not None: - actual_text = str(tmp_rangeBar_marker_text_object.value).strip() - expected_text = str(target_tmp_pressure).strip() - test.compare(float(actual_text), float(expected_text), "Expecting trancememberance pressure to be displayed") + actual_text = str(tmp_rangeBar_marker_text_object.pressure) + expected_text = str(target_tmp_pressure) + test.compare(actual_text, expected_text, "Expecting trancememberance pressure to be displayed") test.endSection() @@ -191,9 +191,9 @@ """ @return: N/A """ - test.compare(utility.get_object_from_names(names.treatmentUltrafiltration).visible, True, "UltraFiltration section is visible") - test.compare(utility.get_object_from_names(names.UF_Volume_Text).text, "UF Volume", "UF Volume text verified") - test.compare(utility.get_object_from_names(names.UF_Rate_Text).text, "UF Rate", "UF Rate text verified") + 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_Rate_Text).topText, "UF Rate", "UF Rate text verified") def start_test_treatment_ultrafiltration(uf_volume,uf_rate,vol_delivered): """ @@ -204,9 +204,9 @@ """ td.td_ultrafiltration(uf_volume,uf_rate,vol_delivered,0) - test.compare(utility.get_object_from_names(names.UF_Volume_LabelValue).bottomText, "{:.2f}".format(float(uf_volume)), "UF Volume value should be :" + str(uf_volume)) - test.compare(utility.get_object_from_names(names.UF_Rate_LabelValue).bottomText, "{:.2f}".format(float(uf_rate)), "UF Rate value should be :" + str(uf_rate)) - test.compare(utility.get_object_from_names(names.Volume_Delivered).text, "{:.2f}".format(float(vol_delivered)) +" L", "Volume delivered value should be :" + str(vol_delivered)) + test.compare(utility.get_object_from_names(names.o_UF_Volume_LabelValue).bottomText, "{:.2f}".format(float(uf_volume)), "UF Volume value should be :" + str(uf_volume)) + test.compare(utility.get_object_from_names(names.o_UF_Rate_LabelValue).bottomText, "{:.2f}".format(float(uf_rate)), "UF Rate value should be :" + str(uf_rate)) + test.compare(utility.get_object_from_names(names.o_Volume_Delivered).text, "{:.2f}".format(float(vol_delivered)) +" L", "Volume delivered value should be :" + str(vol_delivered)) #TX time def start_treatment_time_verification(vTotal): @@ -217,8 +217,8 @@ """ for count in range(0,vTotal+1): td.td_treatment_time(vTotal, count, vTotal - count) - test.compare(utility.get_object_from_names(names.treatment_duration).progressValue, count, "progress value should be {}".format(count)) - test.compare(utility.get_object_from_names(names.treatment_duration).timeTextValue, vTotal - count, "Expected Time on UI should be in seconds {}".format(vTotal - count)) + test.compare(utility.get_object_from_names(names.o_treatment_duration).progressValue, count, "progress value should be {}".format(count)) + test.compare(utility.get_object_from_names(names.o_treatment_duration).timeTextValue, vTotal - count, "Expected Time on UI should be in seconds {}".format(vTotal - count)) def reset_treatment_time_verification(vTotal): """ @@ -228,8 +228,8 @@ """ td.td_treatment_time(vTotal, 0, vTotal) - test.compare(utility.get_object_from_names(names.treatment_duration).maximum, vTotal, "Reset maximum value and compare it expected value {}".format(vTotal)) - test.compare(utility.get_object_from_names(names.treatment_duration).minimum, 0, "Reset minimum value and compare it expected value {}".format(0)) + test.compare(utility.get_object_from_names(names.o_treatment_duration).maximum, vTotal, "Reset maximum value and compare it expected value {}".format(vTotal)) + test.compare(utility.get_object_from_names(names.o_treatment_duration).minimum, 0, "Reset minimum value and compare it expected value {}".format(0)) def treatment_time_verification(total): test.startSection("Verify the seconds values inside Progress bar and on timer 'Time in seconds'") @@ -248,11 +248,10 @@ ] #Verify the title values in the set points - test.compare(utility.get_object_from_names(names.Treatment_Parameters_Text).text, "Treatment Parameters", "Treatement Parameters text verified") - test.compare(utility.get_object_from_names(names.blood_flow_title_Text).text, "Blood Flow", "Blood flow text verified" ) - test.compare(utility.get_object_from_names(names.dialyste_flow_title_Text).text, "Dialysate Flow", "Dialysate Flow text verified" ) - test.compare(utility.get_object_from_names(names.dialyste_tmp_title_Text).text, "Dialysate Temp.", "Dialysate trancememberance text verified" ) - test.compare(utility.get_object_from_names(names.dialyste_cond_title_Text).text, "Dialysate Cond.", "Dialysate cond text verified" ) + test.compare(utility.get_object_from_names(names.o_blood_flow_title_Text).title, "Blood Flow", "Blood flow text verified" ) + test.compare(utility.get_object_from_names(names.o_dialyste_flow_title_Text).title, "Dialysate Flow", "Dialysate Flow text verified" ) + test.compare(utility.get_object_from_names(names.o_dialyste_tmp_title_Text).title, "Dialysate Temp.", "Dialysate trancememberance text verified" ) + test.compare(utility.get_object_from_names(names.o_dialyste_cond_title_Text).title, "Dialysate Cond.", "Dialysate cond text verified" ) for index in range(0, len(TREATMENT_PARAMETER_SETPOINTS_TD_TEST_VALUES), 1): test.startSection("Checking the value of the set points".format(index)) @@ -266,15 +265,15 @@ dialysate_flow = target_dial_flow, dialysate_temp = target_dial_tmp) - bloodFlow = utility.get_object_from_names(names.blood_flow_value) + bloodFlow = utility.get_object_from_names(names.o_blood_flow_value) bloodFlow_properties = object.properties(bloodFlow) test.compare(str(bloodFlow_properties["value"]), str(target_blood_flow), "Blood Flow value should be :" + str(target_blood_flow)) - dialFlow = utility.get_object_from_names(names.dial_flow_value) + dialFlow = utility.get_object_from_names(names.o_dial_flow_value) dialFlow_properties = object.properties(dialFlow) test.compare(str(dialFlow_properties["value"]), str(target_dial_flow), "Dialyste flow value should be :" + str(target_dial_flow)) - dialTmp = utility.get_object_from_names(names.dial_tmp_value) + dialTmp = utility.get_object_from_names(names.o_dial_tmp_value) dialTmp_properties = object.properties(dialTmp) test.compare(str(dialTmp_properties["value"]), str(target_dial_tmp), "Dialyste Tmp value should be :" + str(target_dial_tmp)) @@ -284,7 +283,7 @@ D43 = 0, D74 = 0) - dialCond = utility.get_object_from_names(names.dial_cond_value) + dialCond = utility.get_object_from_names(names.o_dial_cond_value) dialCond_properties = object.properties(dialCond) test.compare(str(dialCond_properties["value"]), str(target_dial_cond), "Dialyste conductivity value should be :" + str(target_dial_cond)) @@ -296,7 +295,7 @@ td.td_operation_mode(TDOpModes.MODE_STAN.value,0) # verify Standby screen - test.verify(waitForObjectExists(names.standByScreen_MainHome), "In Standby") + test.verify(waitForObjectExists(names.o_standByScreen_MainHome), "In Standby") td.td_operation_mode( TDOpModes.MODE_TREA.value, 0 ) td.td_tx_state(TDTreatmentStates.TREATMENT_DIALYSIS_STATE.value , @@ -345,7 +344,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.treatmentTimeNotificationBarSmall).text, "Treatment Complete", "Tx time completed text should be :" + str("Treatment Complete")) + test.compare(utility.get_object_from_names(names.o_treatmentTimeNotificationBarSmall).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 ) @@ -359,7 +358,7 @@ 0 , 0 , 0 ) - test.compare(utility.get_object_from_names(names.treatmentTimeNotificationBarSmall).text, "Treatment Paused", "Tx time paused text should be :" + str("Treatment Paused")) + test.compare(utility.get_object_from_names(names.o_treatmentTimeNotificationBarSmall).text, "Treatment Paused", "Tx time paused text should be :" + str("Treatment Paused")) test.endSection() #TX Parameter Set Points