Index: shared/scripts/names.py =================================================================== diff -u -rde4dd0bb518628a7cdb691f5af71f8d2ffa02d52 -rd0bf741e91553bcc6f505d31b4bccb13c34c3a60 --- shared/scripts/names.py (.../names.py) (revision de4dd0bb518628a7cdb691f5af71f8d2ffa02d52) +++ shared/scripts/names.py (.../names.py) (revision d0bf741e91553bcc6f505d31b4bccb13c34c3a60) @@ -283,8 +283,23 @@ #virtal keypad back space key o_back_space_key = {"container": o_Gui_MainView, "id": "_backspaceKeyIcon", "source": "qrc:/plugins/QtQuick/VirtualKeyboard/Styles/denali/images/iBackspace.svg", "type": "Image", "unnamed": 1, "visible": True} - -#authentication +#vital time interval +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} +o_PreTreatmentBase_confirmButton_TouchRect_2 = {"container": o_PreTreatmentCreateStack_PreTreatmentBase_TreatmentFlowBase, "objectName": "_confirmButton", "type": "TouchRect", "visible": True} +o_PreTreatmentCreate_heparinDispensingRate_SliderCreateTreatment = {"container": o_PreTreatmentCreateStack_PreTreatmentCreate_PreTreatmentCreate, "objectName": "_heparinDispensingRate", "type": "SliderCreateTreatment", "visible": True} +o_PreTreatmentBase_backgroundRect_Rectangle_2 = {"container": o_PreTreatmentCreateStack_PreTreatmentBase_TreatmentFlowBase, "id": "_backgroundRect", "type": "Rectangle", "unnamed": 1, "visible": True} +o_PreTreatmentCreateStack_PreTreatmentConfirm_TreatmentFlowBase = {"container": o_PreTreatmentCreateStack_PreTreatmentCreateStack, "objectName": "_PreTreatmentConfirm", "type": "TreatmentFlowBase", "visible": True} +o_treatment_confirm_flickable = {"container": o_PreTreatmentCreateStack_PreTreatmentConfirm_TreatmentFlowBase, "objectName": "_PreTreatmentConfirmFlickable", "type": "Flickable", "visible": True} +o_prescription_mesurement = {"container": o_PreTreatmentCreateStack_PreTreatmentConfirm_TreatmentFlowBase, "type": "Text", "visible": True} +o_operating_parameters = {"container": o_PreTreatmentCreateStack_PreTreatmentCreate_PreTreatmentCreate, "type": "Text", "unnamed": 1, "visible": True} +o_treatment_create_flickable = {"container": o_PreTreatmentCreateStack_PreTreatmentCreate_PreTreatmentCreate, "objectName": "TreatmentCreateFlickable", "type": "Flickable", "visible": True} +o_create_treatment_screen = {"container": o_PreTreatmentCreateStack_PreTreatmentCreate_PreTreatmentCreate, "objectName": "TreatmentCreateFlickable", "type": "Flickable", "visible": True} +o_confirm_title_text = {"container": o_PreTreatmentCreateStack_PreTreatmentConfirm_TreatmentFlowBase, "text": "Confirm Treatment", "type": "Text", "unnamed": 1, "visible": True} +o_prescription_title_text = {"container": o_PreTreatmentCreateStack_PreTreatmentConfirm_TreatmentFlowBase, "objectName": "ConfirmTreatmentTable_prescription", "type": "Text", "visible": True} +o_input_patient_id = {"container": o_PreTreatmentCreateStack_PreTreatmentBase_TreatmentFlowBase, "echoMode": 0, "id": "_input", "type": "TextInput", "unnamed": 1, "visible": True} o_confirm_button = {"container": o_PreTreatmentCreateStack_PreTreatmentBase_TreatmentFlowBase, "text": "CONFIRM", "type": "Text", "unnamed": 1, "visible": True} o_create_back_button ={"container": o_PreTreatmentCreateStack_PreTreatmentCreate_PreTreatmentCreate, "id": "_image", "source": "qrc:/images/iBack", "type": "Image", "unnamed": 1, "visible": True} o_input_patient_id = {"container": o_PreTreatmentCreateStack_PreTreatmentBase_TreatmentFlowBase, "echoMode": 0, "id": "_input", "type": "TextInput", "unnamed": 1, "visible": True} Index: tst_main_treatment_vitals/test.py =================================================================== diff -u -rae1bfa4af97263849cafb3d6964205cce4a10700 -rd0bf741e91553bcc6f505d31b4bccb13c34c3a60 --- tst_main_treatment_vitals/test.py (.../test.py) (revision ae1bfa4af97263849cafb3d6964205cce4a10700) +++ tst_main_treatment_vitals/test.py (.../test.py) (revision d0bf741e91553bcc6f505d31b4bccb13c34c3a60) @@ -19,6 +19,7 @@ from dialin.ui import utils from dialin.ui.hd_simulator import HDSimulator from dialin.common.hd_defs import PreTreatmentSubModes, HDOpModes, HDOpSubModes, PreTreatmentSampleWaterStates, PreTreatmentConsumableSelfTestStates, PreTreatmentNoCartSelfTestsStates, PreTreatmentCartridgeInstallStates, PreTreatmentDrySelfTestsStates, PreTreatmentPrimeStates, PreTreatmentRecircStates, PreTreatmentPatientConnectionStates, TreatmentStates +from time import strftime hd_simulator = HDSimulator() @@ -36,8 +37,7 @@ HEART_RATE_VAL_85 = "85" BLOOD_PRESSURE_DEFAULT_VAL = "__ / __" HEART_RATE_DEFAULT_VAL = "__" -INVALID_VALS = {"systolic" : [260, 59, 300, 23], "diastolic": [39, 1, 210, 201], - "Heart Rate": [181, 200, 39, 20]} +INVALID_VALS = {"systolic" : [260, 59, 300, 23], "diastolic": [39, 1, 210, 201], "Heart Rate": [181, 200, 39, 20]} SYSTOLIC_VALUES = [60, 72, 85, 99, 101, 110, 111, 115, 121, 139, 150, 144, 163, 176, 188, 191, 222, 200, 230, 231, 244, 250] DIASTOLIC_VALUES = [40, 44, 51, 53, 60, 66, 72, 89, 99, 102, 109, 112, 124, 133, 151, 147, 161, 178, 189, 192, 200] HEART_RATE_VALUES = [40, 42, 55, 61, 77, 81, 92, 100, 107, 115, 122, 135, 142, 151, 169, 177, 180] @@ -174,10 +174,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) - last_read = waitForObject(utility.vitals_reading_obj(expected_last_read)) - last_read = str(last_read.text) - 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() @@ -324,8 +344,8 @@ 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) verify_last_read_time(saved_time) elif save is False: @@ -341,8 +361,7 @@ """ Method to accept treatment response. """ - treatment_status = hd_simulator.cmd_send_treatment_parameter_manual_validation_response([ - 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]) + treatment_status = hd_simulator.cmd_send_treatment_parameter_manual_validation_response([1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]) test.compare(treatment_status, True, "custom treatment should be accepted") def verify_create_custom_treatment_parameter(): @@ -601,7 +620,7 @@ navigate to main treatment screen to reset vital """ test.startSection("Verify last read and interval of blood pressure and heart rate") - hd_simulator.cmd_send_hd_operation_mode(op_mode=HDOpModes.MODE_TPAR.value, sub_mode=HDOpSubModes.SUBMODE_START.value) + hd_simulator.cmd_send_hd_operation_mode(op_mode=HDOpModes.MODE_TPAR.value, sub_mode=HDOpSubModes.STANDBY_START_STATE.value) mouseClick(waitForObject(names.o_input_patient_id)) type(waitForObject(names.o_input_patient_id), "abcd") mouseClick(waitForObject(names.o_confirm_button)) @@ -610,7 +629,7 @@ utils.waitForGUI(1) hd_simulator.cmd_initiate_treatment_response(response=1, reason=0) - hd_simulator.cmd_send_hd_operation_mode(op_mode=HDOpModes.MODE_PRET.value , sub_mode=HDOpSubModes.SUBMODE_START.value) + hd_simulator.cmd_send_hd_operation_mode(op_mode=HDOpModes.MODE_PRET.value , sub_mode=HDOpSubModes.STANDBY_START_STATE.value) hd_simulator.cmd_send_pre_treatment_state_data(sub_mode=PreTreatmentSubModes.HD_PRE_TREATMENT_PATIENT_CONNECTION_STATE.value, water_sample_state=PreTreatmentSampleWaterStates.SAMPLE_WATER_SETUP_STATE.value,consumables_self_test_state=PreTreatmentConsumableSelfTestStates.CONSUMABLE_SELF_TESTS_INSTALL_STATE.value, no_cartridge_self_test_state=PreTreatmentNoCartSelfTestsStates.NO_CART_SELF_TESTS_START_STATE.value,installation_state=PreTreatmentCartridgeInstallStates.CARTRIDGE_INSTALL_STATE.value, dry_self_test_state=PreTreatmentDrySelfTestsStates.DRY_SELF_TESTS_START_STATE.value, prime_state=PreTreatmentPrimeStates.HD_PRIME_START_STATE.value,recirculate_state=PreTreatmentRecircStates.PRE_TREATMENT_RECIRC_STATE.value, patient_connection_state=PreTreatmentPatientConnectionStates.PATIENT_CONNECTION_STATE.value) @@ -730,11 +749,11 @@ min_dialysate_flow_rate=100, max_dialysate_flow_rate=600) verify_vitals_pop_up_automatic_close_functionality() - + utils.waitForGUI(1) open_vitals_pop_up() verify_entered_valid_vital_entries_in_main_treatment_screen(sys_val=SYSTOLIC_PRESSSURE_120, dia_val=DIASTOLIC_PRESSSURE_80, heart_rate=HEART_RATE_VAL_101, save=True) - + utils.waitForGUI(1) open_vitals_pop_up() verify_entered_value_in_pop_up(value=SYSTOLIC_PRESSSURE_120,input_field=names.o_pop_up_systolic_input_field, vital=config.SYSTOLIC_TEXT) @@ -758,11 +777,11 @@ verify_ranges_of_vital(vital_parameter=config.SYSTOLIC_TEXT) verify_ranges_of_vital(vital_parameter=config.DIASTOLIC_TEXT) verify_ranges_of_vital(vital_parameter=config.HEART_RATE_TITLE) - + verify_the_color_of_out_of_range(vital_parameter=config.SYSTOLIC_TEXT) verify_the_color_of_out_of_range(vital_parameter=config.DIASTOLIC_TEXT) verify_the_color_of_out_of_range(vital_parameter=config.HEART_RATE_TITLE) - + verify_interval_for_bpm() utils.tstDone()