Index: shared/scripts/configuration/config.py =================================================================== diff -u -r75b5f2a93fc13f944d268961901be981dec4bfbe -r31c9ee5a3c0a5e6a778887935bc42b12578a4693 --- shared/scripts/configuration/config.py (.../config.py) (revision 75b5f2a93fc13f944d268961901be981dec4bfbe) +++ shared/scripts/configuration/config.py (.../config.py) (revision 31c9ee5a3c0a5e6a778887935bc42b12578a4693) @@ -124,19 +124,6 @@ ############################################################################################### -VITALS_TITLE = "VITALS" -OUT_OF_RANGE_COLOR = "#c53b33" -IN_RANGE_COLOR = "#fcfcfc" -SYSTOLIC_LOWER_LIMIT = 60 -SYSTOLIC_UPPER_LIMIT = 250 -DIASTOLIC_LOWER_LIMIT = 40 -DIASTOLIC_UPPER_LIMIT = 200 -HEART_RATE_LOWER_LIMIT = 40 -HEART_RATE_UPPER_LIMIT = 180 -HEART_RATE_TITLE = "Heart Rate" -BLOOD_PRESSURE_TITLE = "Blood Pressure" -BLOOD_PRESSURE_UNIT = "mmHg" -HEART_RATE_UNIT = "BPM" @@ -145,3 +132,4 @@ + Index: shared/scripts/names.py =================================================================== diff -u -r75b5f2a93fc13f944d268961901be981dec4bfbe -r31c9ee5a3c0a5e6a778887935bc42b12578a4693 --- shared/scripts/names.py (.../names.py) (revision 75b5f2a93fc13f944d268961901be981dec4bfbe) +++ shared/scripts/names.py (.../names.py) (revision 31c9ee5a3c0a5e6a778887935bc42b12578a4693) @@ -133,6 +133,10 @@ o_pop_up_systolic_input_field = {"container": o_treatmentStack_TreatmentStack, "echoMode": 0, "id": "_input", "type": "TextInput", "unnamed": 1, "visible": True} o_pop_up_diastolic_input_field = {"container": o_treatmentStack_TreatmentStack, "echoMode": 0, "id": "_input", "occurrence": 2, "type": "TextInput", "unnamed": 1, "visible": True} o_pop_up_heart_rate_input_field = {"backgroundcolor": "#254670", "container": o_treatmentStack_TreatmentStack, "echoMode": 0, "id": "_input", "occurrence": 3, "type": "TextInput", "unnamed": 1, "visible": True} +o_PreTreatmentBase_input_TextInput_3 = {"container": o_PreTreatmentConsumblesStack_PreTreatmentBase_TreatmentFlowBase_2, "echoMode": 0, "id": "_input", "occurrence": 2, "type": "TextInput", "unnamed": 1, "visible": True} +o_PreTreatmentBase_bloodPressureDiastolic_TextEntry = {"container": o_PreTreatmentConsumblesStack_PreTreatmentBase_TreatmentFlowBase_2, "id": "_bloodPressureDiastolic", "type": "TextEntry", "unnamed": 1, "visible": True} +o_PreTreatmentBase_input_TextInput_4 = {"container": o_PreTreatmentConsumblesStack_PreTreatmentBase_TreatmentFlowBase_2, "echoMode": 0, "id": "_input", "occurrence": 3, "type": "TextInput", "unnamed": 1, "visible": True} +o_PreTreatmentBase_heartRate_TextEntry = {"container": o_PreTreatmentConsumblesStack_PreTreatmentBase_TreatmentFlowBase_2, "id": "_heartRate", "type": "TextEntry", "unnamed": 1, "visible": True} Index: tst_pre_treatment_patient_connection/test.py =================================================================== diff -u -r75b5f2a93fc13f944d268961901be981dec4bfbe -r31c9ee5a3c0a5e6a778887935bc42b12578a4693 --- tst_pre_treatment_patient_connection/test.py (.../test.py) (revision 75b5f2a93fc13f944d268961901be981dec4bfbe) +++ tst_pre_treatment_patient_connection/test.py (.../test.py) (revision 31c9ee5a3c0a5e6a778887935bc42b12578a4693) @@ -17,33 +17,46 @@ import names from dialin.ui.hd_simulator import HDSimulator -from dialin.common.hd_defs import PreTreatmentSubModes -from dialin.common.msg_defs import RequestRejectReasons -from dialin.common.hd_defs import HDOpModes from dialin.ui import utils +from builtins import int as pyInt +from builtins import str as pyStr from configuration import config, utility hd_simulator = HDSimulator() -SYSTOLIC_PRESSSURE_120 = "120" -SYSTOLIC_PRESSSURE_113 = "113" -SYSTOLIC_PRESSSURE_200 = "200" -SYSTOLIC_PRESSSURE_175 = "175" -DIASTOLIC_PRESSSURE_74 = "74" -DIASTOLIC_PRESSSURE_150 = "150" -DIASTOLIC_PRESSSURE_80 = "80" -DIASTOLIC_PRESSSURE_60 = "60" -HEART_RATE_VAL_101 = "101" -HEART_RATE_VAL_60 = "60" -HEART_RATE_VAL_70 = "70" -HEART_RATE_VAL_85 = "85" +SYSTOLIC_PRESSSURE_120 = 120 +SYSTOLIC_PRESSSURE_113 = 113 +SYSTOLIC_PRESSSURE_200 = 200 +SYSTOLIC_PRESSSURE_175 = 175 +SYSTOLIC_PRESSSURE_251 = 251 +SYSTOLIC_PRESSSURE_59 = 59 +DIASTOLIC_PRESSSURE_74 = 74 +DIASTOLIC_PRESSSURE_150 = 150 +DIASTOLIC_PRESSSURE_80 = 80 +DIASTOLIC_PRESSSURE_60 = 60 +DIASTOLIC_PRESSSURE_201 = 201 +DIASTOLIC_PRESSSURE_39 = 39 +HEART_RATE_VAL_101 = 101 +HEART_RATE_VAL_60 = 60 +HEART_RATE_VAL_70 = 70 +HEART_RATE_VAL_85 = 85 +HEART_RATE_VAL_181 = 181 +HEART_RATE_VAL_39 = 39 +SYSTOLIC_LOWER_LIMIT = 60 +SYSTOLIC_UPPER_LIMIT = 250 +DIASTOLIC_LOWER_LIMIT = 40 +DIASTOLIC_UPPER_LIMIT = 200 +HEART_RATE_LOWER_LIMIT = 40 +HEART_RATE_UPPER_LIMIT = 180 DIASTOLIC_TEXT = "diastolic" SYSTOLIC_TEXT = "systolic" -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]} +OUT_OF_RANGE_COLOR = "#c53b33" +IN_RANGE_COLOR = "#fcfcfc" +HEART_RATE_TITLE = "Heart Rate" +BLOOD_PRESSURE_TITLE = "Blood Pressure" +BLOOD_PRESSURE_UNIT = "mmHg" +HEART_RATE_UNIT = "BPM" PRE_TREATMENT_PATIENT_CONNECTION_MODE = 8 UF_PRE_TREATMENT_STEPS = 5 @@ -100,8 +113,8 @@ @param entry: (str) User expected value """ test.startSection("Entering {}".format(entry)) + entry = pyStr(entry) #type casted into string format for value in entry: -# value = int(value) mouseClick(waitForObject(keypad_input(value))) test.endSection() @@ -113,13 +126,12 @@ """ input_field = waitForObject(input_field).text for value in input_field: - test.log(str(value)) mouseClick(squish.waitForObjectExists(names.o_back_space_key)) - test.compare(input_field, "", "Input field should be empty") + test.log("user cleared pre-used value") -def verify_entered_valid_vital_entries_in_main_treatment_screen(sys_val, dia_val, heart_rate, save): +def verify_entered_valid_vital_entries_in_main_treatment_screen(sys_val, dia_val, heart_rate): """ method to enter systolic, diastolic and heart rate value and save or unsave it and verify same is updated in pre-treatment screen. @@ -131,59 +143,43 @@ test.startSection("Verify the entered systolic, diastolic and heart rate value updated in main-treatement screen") mouseClick(waitForObject(names.o_PreTreatmentBase_bloodPressureSystolic_TextEntry)) erase_entered_value(names.o_PreTreatmentBase_input_TextInput_2) - enter_keypad_value(str(sys_val)) + enter_keypad_value(sys_val) - test.verify(waitForObjectExists(names.o_PreTreatmentBase_bloodPressureSystolic_TextEntry).enabled, "systolic value should be enabled.") + test.verify(waitForObjectExists(names.o_PreTreatmentBase_bloodPressureSystolic_TextEntry).enabled, "systolic combo box should be enabled.") test.compare(waitForObjectExists(names.o_PreTreatmentBase_bloodPressureSystolic_TextEntry).text, str(sys_val), "systolic value should be : "+str(sys_val)) - verify_color_of_entry(entry=sys_val, vital_parameter=SYSTOLIC_TEXT, input_field=waitForObject(names.o_PreTreatmentBase_input_TextInput_2)) + verify_color_of_entry(entry = sys_val, vital_parameter = SYSTOLIC_TEXT, input_field = waitForObject(names.o_PreTreatmentBase_input_TextInput_2)) - mouseClick(waitForObject(names.o_pop_up_diastolic_input_field)) - erase_entered_value(diastolic) - enter_keypad_value(str(dia_val)) - verify_entered_value_in_pop_up(value=str(dia_val), input_field=diastolic, - vital=DIASTOLIC_TEXT) - verify_color_of_entry(entry=dia_val, vital_parameter=DIASTOLIC_TEXT, - input_field=diastolic) + mouseClick(waitForObject(names.o_PreTreatmentBase_input_TextInput_3)) + erase_entered_value(names.o_PreTreatmentBase_input_TextInput_3) + enter_keypad_value(dia_val) - hr = waitForObject(names.o_pop_up_heart_rate_input_field) - mouseClick(hr) - erase_entered_value(hr) - enter_keypad_value(str(heart_rate)) - verify_entered_value_in_pop_up(value=str(heart_rate), input_field=hr, - vital=HEART_RATE_TITLE) - verify_color_of_entry(entry=heart_rate, vital_parameter=HEART_RATE_TITLE, - input_field=hr) + test.verify(waitForObjectExists(names.o_PreTreatmentBase_bloodPressureDiastolic_TextEntry).enabled, "diastolic value should be enabled.") + test.compare(waitForObjectExists(names.o_PreTreatmentBase_bloodPressureDiastolic_TextEntry).text, str(dia_val), "diastolic value should be : "+str(dia_val)) + verify_color_of_entry(entry = dia_val, vital_parameter = DIASTOLIC_TEXT, input_field = waitForObject(names.o_PreTreatmentBase_input_TextInput_3)) - if save: - 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 = get_current_date_and_time() - mouseClick(confirm_button) - verify_last_read_time(saved_time) - elif save is False: - mouseClick(waitForObject(names.o_vitals_close_btn)) - test.log("'Vitals pop is closed") - - expected_blood_pressure = "{sys} / {dia}".format(sys=sys_val, dia=dia_val) - verify_entered_value_in_main_treatment_screen(value=expected_blood_pressure, - vital=BLOOD_PRESSURE_TITLE, save=save) - verify_entered_value_in_main_treatment_screen(value=heart_rate, vital=HEART_RATE_TITLE, save=save) + + mouseClick(waitForObject(names.o_PreTreatmentBase_input_TextInput_4)) + erase_entered_value(names.o_PreTreatmentBase_input_TextInput_4) + enter_keypad_value(heart_rate) + + test.verify(waitForObjectExists(names.o_PreTreatmentBase_heartRate_TextEntry).enabled, "diastolic value should be enabled.") + test.compare(waitForObjectExists(names.o_PreTreatmentBase_heartRate_TextEntry).text, str(heart_rate), "diastolic value should be : "+str(dia_val)) + verify_color_of_entry(entry = heart_rate, vital_parameter = HEART_RATE_TITLE, input_field = waitForObject(names.o_PreTreatmentBase_input_TextInput_4)) + test.endSection() -def verify_color_of_entry(entry, vital_parameter, input_field): +def verify_color_of_entry(entry = 0, vital_parameter = None, input_field = None): """ - Method to verify the color of entry - of systolic, diastolic and heart rate + Method to verify the color of entry of systolic, diastolic and heart rate @param entry: (int) user entered value @param vital_parameter - (str) parameter name under which user is entering value (sys/dia/heart rate) @param input_field - (obj) object of input field """ test.startSection("Verify the color of {} value {}".format(vital_parameter, entry)) input_field_color = input_field.color.name - entry = builtins.int(entry) + entry = pyInt(entry) if vital_parameter is SYSTOLIC_TEXT: if (entry < SYSTOLIC_LOWER_LIMIT) or (entry > SYSTOLIC_UPPER_LIMIT): test.compare(input_field_color, OUT_OF_RANGE_COLOR, "systolic value {} is out of range, systolic value should be in range of {} and {}".format(entry, SYSTOLIC_LOWER_LIMIT, SYSTOLIC_UPPER_LIMIT)) @@ -226,8 +222,6 @@ def test_patient_connection_instruction_screen(screen_indicator): - for instruction_screen in (screen_indicator): - mouseClick(waitForObject(names.names.o_PreTreatmentBase_rightImage_Image)) test.compare(str(waitForObjectExists(names.o_PreTreatmentBase_Patient_Connection_Text).text, config.PATIENT_CONNECTION_TEXT, "Patient connection text should be {msg}".format(msg=config.PATIENT_CONNECTION_TEXT))) test.compare(str(waitForObjectExists(names.o_swipeview_tutorial_text).enabled, True, "Tutorial text should be enabled.")) @@ -295,15 +289,8 @@ test.verify((names.o_PreTreatmentBase_indicator_StepIndicator).enable, "Verified indicator") - -def reset_treatment_time_verification(vTotal): - """ - Method to reset and verify Actual time in seconds - to Maximum & Minimum values on UI screen in seconds - @param vTotal: (int) Total time in seconds - """ - mouseClick(waitForObject(names.o_PreTreatmentbase_skip_text)) + def test_vital_entries_on_patient_connection(): """ Method to verify BP/HR section from patient connection. @@ -319,12 +306,14 @@ test.compare(waitForObjectExists(names.o_PreTreatmentBase_Heart_Rate_Text).text, config.HR_TEXT, "HR text should be :" + str(config.HR_TEXT)) test.compare(waitForObjectExists(names.o_PreTreatmentBase_BPM_Label).text, config.BPM_LABEL, "BP unit should be " + str(config.BPM_LABEL)) - 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) - - + 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) + verify_entered_valid_vital_entries_in_main_treatment_screen(sys_val=SYSTOLIC_PRESSSURE_113, dia_val=DIASTOLIC_PRESSSURE_60, heart_rate=HEART_RATE_VAL_60) + verify_entered_valid_vital_entries_in_main_treatment_screen(sys_val=SYSTOLIC_PRESSSURE_200, dia_val=DIASTOLIC_PRESSSURE_150, heart_rate=HEART_RATE_VAL_70) + verify_entered_valid_vital_entries_in_main_treatment_screen(sys_val=SYSTOLIC_PRESSSURE_175, dia_val=DIASTOLIC_PRESSSURE_74, heart_rate=HEART_RATE_VAL_85) + verify_entered_valid_vital_entries_in_main_treatment_screen(sys_val=SYSTOLIC_PRESSSURE_59, dia_val=DIASTOLIC_PRESSSURE_39, heart_rate=HEART_RATE_VAL_39) + verify_entered_valid_vital_entries_in_main_treatment_screen(sys_val=SYSTOLIC_PRESSSURE_251, dia_val=DIASTOLIC_PRESSSURE_201, heart_rate=HEART_RATE_VAL_181) + + mouseClick(waitForObject(names.o_PreTreatmentbase_skip_text)) test.endSection() @@ -342,7 +331,7 @@ #verification of indicators from patient connection section utility.page_step_indicator_verification(UF_PRE_TREATMENT_STEPS, names.o_PreTreatmentUltrafiltration_Indicators) - + """ #verification of uf slider based on edge condition. start_test_treatment_ultrafilteration(TREATMENT_ULTRAFILTERATION_TESTING_OPTION["OPTION_1"]) start_test_treatment_ultrafilteration(TREATMENT_ULTRAFILTERATION_TESTING_OPTION["OPTION_2"]) @@ -354,7 +343,7 @@ start_test_treatment_ultrafilteration(TREATMENT_ULTRAFILTERATION_TESTING_OPTION["OPTION_8"]) start_test_treatment_ultrafilteration(TREATMENT_ULTRAFILTERATION_TESTING_OPTION["OPTION_9"]) start_test_treatment_ultrafilteration(TREATMENT_ULTRAFILTERATION_TESTING_OPTION["OPTION_10"]) - + """ #verification of rejection message test_rejection_message_patient_connection(accept_status = False)