Index: suite_leahi/tst_main_treatment_pressure/test.py =================================================================== diff -u -r5ebb9de7dea509efa8828ffee70aae69ea36dd34 -rdf46ae9526c946705f73eb2d30e91c8a700e02e0 --- suite_leahi/tst_main_treatment_pressure/test.py (.../test.py) (revision 5ebb9de7dea509efa8828ffee70aae69ea36dd34) +++ suite_leahi/tst_main_treatment_pressure/test.py (.../test.py) (revision df46ae9526c946705f73eb2d30e91c8a700e02e0) @@ -166,39 +166,39 @@ utils.waitForGUI(1) # check the range bar's upper and lower bounds - arterial_rangeBar = utility.get_object_from_names(names.o_treatmentHome_rangeBar_RangeBar, error_message="arterial rangeBar object is missing") + arterial_rangeBar = utility.get_object_from_names(names.arterial_RangeBar, error_message="arterial rangeBar object is missing") 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.o_treatmentHome_pressure_arterial_marker_text, error_message="arterial pressure marker label object is missing") + arterial_rangeBar_marker_text_object = utility.get_object_from_names(names.pressure_arterial_marker_text, error_message="arterial pressure marker label object is missing") if arterial_rangeBar_marker_text_object is not None: actual_text = str(arterial_rangeBar_marker_text_object.text).strip() expected_text = str(target_arterial_pressure).strip() 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.o_treatmentHome_rangeBar_RangeBar_2, error_message="venous rangeBar object is missing") + venous_rangeBar = utility.get_object_from_names(names.venous_rangeBar, error_message="venous rangeBar object is missing") 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.o_treatmentHome_pressure_venous_marker_text, error_message="venous pressure marker label object is missing") + venous_rangeBar_marker_text_object = utility.get_object_from_names(names.pressure_venous_marker_text, error_message="venous pressure marker label object is missing") if venous_rangeBar_marker_text_object is not None: actual_text = str(venous_rangeBar_marker_text_object.text).strip() expected_text = str(target_venous_pressure).strip() test.compare(actual_text, expected_text, "Expecting venous pressure to be displayed") # check the range bar's upper and lower bounds - temp_rangeBar = utility.get_object_from_names(names.o_treatmentHome_rangeBar_RangeBar_3, error_message="venous rangeBar object is missing") + temp_rangeBar = utility.get_object_from_names(names.temp_rangeBar, error_message="venous rangeBar object is missing") if temp_rangeBar is not None: test.compare(temp_rangeBar.lowerBound, target_temp_min_limit, "Checking lower bound of temperature pressure range bar") test.compare(temp_rangeBar.upperBound, target_temp_max_limit, "Checking upper bound of temperature pressure range bar") #check the marker value for the tempreature pressure - temp_rangeBar_marker_text_object = utility.get_object_from_names(names.o_treatmentHome_pressure_temp_marker_text, error_message="venous pressure marker label object is missing") + temp_rangeBar_marker_text_object = utility.get_object_from_names(names.pressure_temp_marker_text, error_message="venous pressure marker label object is missing") if temp_rangeBar_marker_text_object is not None: actual_text = str(temp_rangeBar_marker_text_object.text).strip() expected_text = str(target_temp_pressure).strip() @@ -212,9 +212,9 @@ """ @return: N/A """ - test.compare(waitForObjectExists(names.o_treatmentStart_ultrafiltrationTouchArea_TreatmentUltrafiltration).visible, True, "ultrafiltration section is visible") - test.compare(waitForObjectExists(names.o_treatmentHome_UF_Volume_Text).text, "UF Volume", "UF Volume text verified") - test.compare(waitForObjectExists(names.o_treatmentHome_UF_Rate_Text).text, "UF Rate", "UF Rate text verified") + test.compare(waitForObjectExists(names.treatmentUltrafiltration).visible, True, "ultrafiltration section is visible") + test.compare(waitForObjectExists(names.UF_Volume_Text).text, "UF Volume", "UF Volume text verified") + test.compare(waitForObjectExists(names.UF_Rate_Text).text, "UF Rate", "UF Rate text verified") def start_test_treatment_ultrafiltration(uf_volume,uf_rate,vol_delivered): """ @@ -226,9 +226,9 @@ td.td_ultrafiltration(uf_volume,uf_rate,vol_delivered,0) - test.compare(waitForObjectExists(names.o_treatmentHome_UF_Volume_LabelValue).bottomText, "{:.2f}".format(float(uf_volume)), "UF Volume value should be :" + str(uf_volume)) - test.compare(waitForObjectExists(names.o_treatmentHome_UF_Rate_LabelValue).bottomText, "{:.2f}".format(float(uf_rate)), "UF Rate value should be :" + str(uf_rate)) - test.compare(waitForObjectExists(names.o_treatmentHome_Volume_Delivered).text, "{:.2f}".format(float(vol_delivered)) +" L", "Volume delivered value should be :" + str(vol_delivered)) + test.compare(waitForObjectExists(names.UF_Volume_LabelValue).bottomText, "{:.2f}".format(float(uf_volume)), "UF Volume value should be :" + str(uf_volume)) + test.compare(waitForObjectExists(names.UF_Rate_LabelValue).bottomText, "{:.2f}".format(float(uf_rate)), "UF Rate value should be :" + str(uf_rate)) + test.compare(waitForObjectExists(names.Volume_Delivered).text, "{:.2f}".format(float(vol_delivered)) +" L", "Volume delivered value should be :" + str(vol_delivered)) #TX time @@ -243,8 +243,8 @@ td.td_treatment_time(vTotal, count, vTotal - count) utils.waitForGUI(0.5) - test.compare(waitForObjectExists(names.o_treatment_duration).progressValue, count, "progress value should be {}".format(count)) - test.compare(waitForObjectExists(names.o_treatment_duration).timeTextValue, vTotal - count, "Expected Time on UI should be in seconds {}".format(vTotal - count)) + test.compare(waitForObjectExists(names.treatment_duration).progressValue, count, "progress value should be {}".format(count)) + test.compare(waitForObjectExists(names.treatment_duration).timeTextValue, vTotal - count, "Expected Time on UI should be in seconds {}".format(vTotal - count)) def reset_treatment_time_verification(vTotal): """ @@ -254,8 +254,8 @@ """ td.td_treatment_time(vTotal, 0, vTotal) - test.compare(waitForObjectExists(names.o_treatment_duration).maximum, vTotal, "Reset maximum value and compare it expected value {}".format(vTotal)) - test.compare(waitForObjectExists(names.o_treatment_duration).minimum, 0, "Reset minimum value and compare it expected value {}".format(0)) + test.compare(waitForObjectExists(names.treatment_duration).maximum, vTotal, "Reset maximum value and compare it expected value {}".format(vTotal)) + test.compare(waitForObjectExists(names.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'") @@ -274,7 +274,7 @@ {"blood flow": 110, "dial flow":110, "dial temp":110.0,"dial cond":110.0} ] #Verify the tittle values in the set points - test.compare(waitForObjectExists(names.o_treatmentHome_Treatment_Parameters_Text).text, "Treatment Parameters", "Treatement Parameters text verified") + test.compare(waitForObjectExists(names.Treatment_Parameters_Text).text, "Treatment Parameters", "Treatement Parameters 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)) target_blood_flow = TREATMENT_PARAMETER_SETPOINTS_TD_TEST_VALUES[index]["blood flow"] @@ -288,16 +288,16 @@ dialysate_temp =target_dial_temp) utils.waitForGUI(1) - bloodFlow = waitForObject(names.o_treatment_blood_flow_value) + bloodFlow = waitForObject(names.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 = waitForObject(names.o_treatment_dial_flow_value) + dialFlow = waitForObject(names.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)) - dialTemp = waitForObject(names.o_treatment_dial_temp_value) + dialTemp = waitForObject(names.dial_temp_value) dialTemp_properties = object.properties(dialTemp) test.compare(str(dialTemp_properties["value"]), str(target_dial_temp), "Dialyste Temp value should be :" + str(target_dial_temp)) @@ -307,7 +307,7 @@ D43= 0, D74= 0) - dialCond = waitForObject(names.o_treatment_dial_cond_value) + dialCond = waitForObject(names.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)) @@ -340,7 +340,7 @@ tmp_pressure= 0 , tmp_min= TEMP_LOW_VAL_MINUS_640 , tmp_max= TEMP_HIGH_VAL_210) - utils.waitForGUI(1) + # utils.waitForGUI(1) # 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,TEMP_LOW_VAL_MINUS_640,TEMP_HIGH_VAL_210) Fisheye: Tag df46ae9526c946705f73eb2d30e91c8a700e02e0 refers to a dead (removed) revision in file `suite_leahi/tst_main_treatment_pressure/verificationPoints/VP1'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag df46ae9526c946705f73eb2d30e91c8a700e02e0 refers to a dead (removed) revision in file `suite_leahi/tst_main_treatment_pressure/verificationPoints/VP2'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag df46ae9526c946705f73eb2d30e91c8a700e02e0 refers to a dead (removed) revision in file `suite_leahi/tst_main_treatment_pressure/verificationPoints/VP3'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag df46ae9526c946705f73eb2d30e91c8a700e02e0 refers to a dead (removed) revision in file `suite_leahi/tst_main_treatment_pressure/verificationPoints/VP4'. Fisheye: No comparison available. Pass `N' to diff?