Index: suite_leahi/tst_main_treatment_pressure/test.py =================================================================== diff -u -rdf46ae9526c946705f73eb2d30e91c8a700e02e0 -rdfe37deb9956b87df475c862cc80f0a94b4ed196 --- suite_leahi/tst_main_treatment_pressure/test.py (.../test.py) (revision df46ae9526c946705f73eb2d30e91c8a700e02e0) +++ suite_leahi/tst_main_treatment_pressure/test.py (.../test.py) (revision dfe37deb9956b87df475c862cc80f0a94b4ed196) @@ -174,9 +174,11 @@ #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") if arterial_rangeBar_marker_text_object is not None: - actual_text = str(arterial_rangeBar_marker_text_object.text).strip() + actual_text = str(arterial_rangeBar_marker_text_object.value).strip() expected_text = str(target_arterial_pressure).strip() - test.compare(actual_text, expected_text, "Expecting arterial pressure to be displayed") + test.compare(float(actual_text), float(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") @@ -187,9 +189,9 @@ #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") if venous_rangeBar_marker_text_object is not None: - actual_text = str(venous_rangeBar_marker_text_object.text).strip() + actual_text = str(venous_rangeBar_marker_text_object.value).strip() expected_text = str(target_venous_pressure).strip() - test.compare(actual_text, expected_text, "Expecting venous pressure to be displayed") + test.compare(float(actual_text), float(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.temp_rangeBar, error_message="venous rangeBar object is missing") @@ -198,11 +200,11 @@ 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.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="temperature 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() + actual_text = str(temp_rangeBar_marker_text_object.value).strip() expected_text = str(target_temp_pressure).strip() - test.compare(actual_text, expected_text, "Expecting temperature pressure to be displayed") + test.compare(float(actual_text), float(expected_text), "Expecting temperature pressure to be displayed") utils.waitForGUI(1) test.endSection() @@ -275,6 +277,11 @@ ] #Verify the tittle values in the set points test.compare(waitForObjectExists(names.Treatment_Parameters_Text).text, "Treatment Parameters", "Treatement Parameters text verified") + test.compare(waitForObjectExists(names.blood_flow_title_Text).text, "Blood Flow", "Blood flow text verified") + test.compare(waitForObjectExists(names.dialyste_flow_title_Text).text, "Dialysate Flow", "Dialysate Flow text verified") + test.compare(waitForObjectExists(names.dialyste_temp_title_Text).text, "Dialysate Temp.", "Dialysate temp text verified") + test.compare(waitForObjectExists(names.dialyste_cond_title_Text).text, "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)) target_blood_flow = TREATMENT_PARAMETER_SETPOINTS_TD_TEST_VALUES[index]["blood flow"] @@ -314,7 +321,7 @@ def main(): utils.tstStart(__file__) - startApplication("leahi") # need to have acknowledging enabled + startApplication("leahi") td.td_operation_mode(TDOpModes.MODE_STAN.value)