Index: shared/scripts/names.py =================================================================== diff -u -r6b19710351f0b217d2db86c52822ffbc9d33092b -rb5754a889c248c804e4b9f1b717addb88927ed0f --- shared/scripts/names.py (.../names.py) (revision 6b19710351f0b217d2db86c52822ffbc9d33092b) +++ shared/scripts/names.py (.../names.py) (revision b5754a889c248c804e4b9f1b717addb88927ed0f) @@ -83,7 +83,7 @@ #vital time interval o_time_interval_obj = {"container": o_treatmentStack_treatmentHome_TreatmentHome, "type": "Text", "unnamed": 1, "visible": True} - +o_time_interval = {"container": o_treatmentStack_treatmentHome_TreatmentHome, "id": "_text", "type": "Text", "unnamed": 1, "visible": True} #create_custom treatment testcase o_PreTreatmentBase_confirmButton_TouchRect = {"container": o_PreTreatmentCreateStack_PreTreatmentBase_TreatmentFlowBase, "text": "CONFIRM", "type": "Text", "unnamed": 1, "visible": True} o_PreTreatmentCreate_bloodFlowRate_SliderCreateTreatment = {"container": o_PreTreatmentCreateStack_PreTreatmentCreate_PreTreatmentCreate, "objectName": "_bloodFlowRate", "type": "SliderCreateTreatment", "visible": True} Index: tst_main_treatment_vitals/test.py =================================================================== diff -u -r8422100d07ba097a8c658aebc8663ee98d2458bf -rb5754a889c248c804e4b9f1b717addb88927ed0f --- tst_main_treatment_vitals/test.py (.../test.py) (revision 8422100d07ba097a8c658aebc8663ee98d2458bf) +++ tst_main_treatment_vitals/test.py (.../test.py) (revision b5754a889c248c804e4b9f1b717addb88927ed0f) @@ -175,18 +175,30 @@ @param saved_time: (str) time of saving blood pressure and heart rate """ test.startSection("Verify the last read of blood pressure and heart rate") + test.log("Expected last read logs on current date and time") expected_last_read = "Interval: off , Last Read: {}".format(saved_time) - utils.waitForGUI(0.5) - last_read = waitForObject(utility.vitals_reading_obj(expected_last_read)) - last_read = str(last_read.text) - test.log(str(last_read)) - interval_status = last_read.split(",") - test.log(str(interval_status)) - interval = interval_status[0].split(":") - test.log(str(interval)) - date = interval_status[1].split(":") - test.compare(interval[0], "Interval", "Text should be Interval") - test.compare(last_read, expected_last_read, "Last read time should be {}".format(last_read)) + expected_interval_status = (str(expected_last_read)).split(",") + expected_interval_data = expected_interval_status[0] + expected_last_read_data = expected_interval_status[1].split(":") + expected_last_read_text = expected_last_read_data[0] + expected_last_read_only_date = expected_last_read_data[1][1:11] + expected_last_read_date = expected_interval_status[1].split(" ") + expected_last_read_time = expected_last_read_date[4:] + expected_last_read_time_without_sec = expected_last_read_time[0][0:5] + test.log("Last read logs from UI screen") + last_read = (waitForObject(names.o_time_interval)).text + interval_status = (str(last_read)).split(",") + interval_data = interval_status[0] + last_read_data = interval_status[1].split(":") + last_read_text = last_read_data[0] + last_read_only_date = last_read_data[1][1:11] + last_read_date = interval_status[1].split(" ") + last_read_time = last_read_date[4:] + last_read_time_without_sec = last_read_time[0][0:5] + test.compare(interval_data, expected_interval_data, "Interval data should be {}".format(expected_interval_data)) + test.compare(last_read_text, expected_last_read_text, "Last read text should be {}".format(expected_last_read_text)) + test.compare(last_read_only_date, expected_last_read_only_date, "Last read date should be {}".format(expected_last_read_only_date)) + test.compare(last_read_time_without_sec, expected_last_read_time_without_sec, "Last read time should be {}".format(expected_last_read_time_without_sec)) test.endSection() @@ -333,8 +345,6 @@ test.log("Clicking confirm button") confirm_button = waitForObjectExists(names.o_vitals_confrim_btn) test.compare(confirm_button.enabled, True, "Valid Blood Pressure and Heart is entered therefore confirm button is enabled") - #saved_time = utility.get_current_date_and_time() - #saved_time = utility.get_current_date_and_time(date_format='%Y/%b/%d - %H:%M') saved_time = utility.get_current_date_and_time(date_format='%m/%d/%Y %H:%M:%S') mouseClick(confirm_button) @@ -740,7 +750,7 @@ min_uf_volume=0.0, max_uf_volume=8000.0, min_dialysate_flow_rate=100, max_dialysate_flow_rate=600) - #verify_vitals_pop_up_automatic_close_functionality() + verify_vitals_pop_up_automatic_close_functionality() utils.waitForGUI(1) open_vitals_pop_up()