Index: tst_pre_treatment_patient_connection/test.py =================================================================== diff -u -r2e73714b63ae5fd2ef8b5acca5043e136454feff -rc79559a8ecd6dc676c7aed956ba1a5d1e45534a0 --- tst_pre_treatment_patient_connection/test.py (.../test.py) (revision 2e73714b63ae5fd2ef8b5acca5043e136454feff) +++ tst_pre_treatment_patient_connection/test.py (.../test.py) (revision c79559a8ecd6dc676c7aed956ba1a5d1e45534a0) @@ -97,6 +97,7 @@ """ test.startSection("Verify the entered systolic, diastolic and heart rate value updated in main-treatement screen") mouseClick(waitForObject(names.o_PreTreatmentBase_bloodPressureSystolic_TextEntry)) + utils.waitForGUI(0.5) utility.erase_entered_value(names.o_PreTreatmentBase_input_TextInput_2) utility.enter_keypad_value(sys_val) @@ -105,6 +106,7 @@ utility.verify_color_of_entry(entry=sys_val, vital_parameter=config.SYSTOLIC_TEXT, input_field=waitForObject(names.o_PreTreatmentBase_input_TextInput_2)) mouseClick(waitForObject(names.o_PreTreatmentBase_input_TextInput_3)) + utils.waitForGUI(0.5) utility.erase_entered_value(names.o_PreTreatmentBase_input_TextInput_3) utility.enter_keypad_value(dia_val) @@ -114,6 +116,7 @@ mouseClick(waitForObject(names.o_PreTreatmentBase_input_TextInput_4)) + utils.waitForGUI(0.5) utility.erase_entered_value(names.o_PreTreatmentBase_input_TextInput_4) utility.enter_keypad_value(heart_rate) @@ -158,7 +161,7 @@ mouseClick(waitForObject(names.o_patient_connection_PreTreatmentBase_leftImage_Image)) - for instruction_screen in range(4): + for instruction_screen in range(7): mouseClick(waitForObject(names.o_patient_connection_PreTreatmentBase_rightImage_Image)) mouseClick(waitForObjectExists(names.o_pretreatment_instruction_continue_btn)) @@ -219,8 +222,8 @@ """ test.startSection("Verifying BP/HR section from patient connection") test.compare(waitForObjectExists(names.o_PreTreatmentBase_BP_HR_Text).text, config.BP_HR_TEXT, "BP/HR title text should be :" + str(config.BP_HR_TEXT)) - test.compare(waitForObjectExists(names.o_PreTreatmentbase_skip_text).text, config.SKIP_TEXT, "BP/HR button text should be " + str(config.SKIP_TEXT)) - test.verify(waitForObjectExists(names.o_PreTreatmentbase_skip_text).enabled, "BP/HR button should enabled.") + test.compare(waitForObjectExists(names.o_PreTreatmentBase_CONFIRM_Text_2).text, config.CONFIRM_TEXT, "BP/HR button text should be " + str(config.SKIP_TEXT)) + test.verify(waitForObjectExists(names.o_PreTreatmentBase_CONFIRM_Text_2).enabled, "BP/HR button should enabled.") test.compare(waitForObjectExists(names.o_PreTreatmentBase_Blood_Pressure_Text).text, config.BLOOD_PRESSURE_TITLE, "BP title text should be :" + str(config.BLOOD_PRESSURE_TITLE)) test.compare(waitForObjectExists(names.o_PreTreatmentBase_mmHg_Label).text, config.BLOOD_PRESSURE_UNIT, "BP unit should be " + str(config.BLOOD_PRESSURE_UNIT)) test.compare(waitForObjectExists(names.o_PreTreatmentBase_Heart_Rate_Text).text, config.HEART_RATE_TITLE, "HR text should be :" + str(config.HEART_RATE_TITLE)) @@ -233,28 +236,17 @@ test.verify(waitForObjectExists(names.o_PreTreatmentBase_CONFIRM_Text_2).enabled, "Confirm button is enabled.") verify_entered_valid_vital_entries_in_main_treatment_screen(sys_val=config.SYSTOLIC_PRESSSURE_15, dia_val=config.DIASTOLIC_PRESSSURE_85, heart_rate=config.HEART_RATE_VAL_100) - test.verify(waitForObjectExists(names.o_PreTreatmentbase_skip_text).enabled, "skip button is enabled.") + test.verify(waitForObjectExists(names.o_PreTreatmentBase_CONFIRM_Text_2).enabled, "confirm button is enabled.") verify_entered_valid_vital_entries_in_main_treatment_screen(sys_val=config.SYSTOLIC_PRESSSURE_150, dia_val=config.DIASTOLIC_PRESSSURE_25, heart_rate=config.HEART_RATE_VAL_110) - test.verify(waitForObjectExists(names.o_PreTreatmentbase_skip_text).enabled, "skip button is enabled.") + test.verify(waitForObjectExists(names.o_PreTreatmentBase_CONFIRM_Text_2).enabled, "confirm button is enabled.") verify_entered_valid_vital_entries_in_main_treatment_screen(sys_val=config.SYSTOLIC_PRESSSURE_200, dia_val=config.DIASTOLIC_PRESSSURE_200, heart_rate=config.HEART_RATE_VAL_200) - test.verify(waitForObjectExists(names.o_PreTreatmentbase_skip_text).enabled, "skip button is enabled.") + test.verify(waitForObjectExists(names.o_PreTreatmentBase_CONFIRM_Text_2).enabled, "confirm button is enabled.") verify_entered_valid_vital_entries_in_main_treatment_screen(sys_val=config.SYSTOLIC_PRESSSURE_175, dia_val=config.DIASTOLIC_PRESSSURE_74, heart_rate=config.HEART_RATE_VAL_85) test.verify(waitForObjectExists(names.o_PreTreatmentBase_CONFIRM_Text_2).enabled, "Confirm button is enabled.") - verify_entered_valid_vital_entries_in_main_treatment_screen(sys_val=config.SYSTOLIC_PRESSSURE_59, dia_val=config.DIASTOLIC_PRESSSURE_39, heart_rate=config.HEART_RATE_VAL_39) - test.verify(waitForObjectExists(names.o_PreTreatmentbase_skip_text).enabled, "skip button is enabled.") - - verify_entered_valid_vital_entries_in_main_treatment_screen(sys_val=config.SYSTOLIC_PRESSSURE_251, dia_val=config.DIASTOLIC_PRESSSURE_201, heart_rate=config.HEART_RATE_VAL_181) - test.verify(waitForObjectExists(names.o_PreTreatmentbase_skip_text).enabled, "skip button is enabled.") - - mouseClick(waitForObject(names.o_PreTreatmentbase_skip_text)) - test.compare(waitForObjectExists(names.o_swipeview_tutorial_text).enabled, True, "Tutorial text should be enabled.") - mouseClick(waitForObject(names.o_PreTreatmentBase_BACK_Text)) - - verify_entered_valid_vital_entries_in_main_treatment_screen(sys_val=config.SYSTOLIC_PRESSSURE_200, dia_val=config.DIASTOLIC_PRESSSURE_150, heart_rate=config.HEART_RATE_VAL_70) mouseClick(waitForObject(names.o_PreTreatmentBase_CONFIRM_Text_2)) test.endSection() @@ -272,6 +264,12 @@ #navigate to patient connection sub mode navigate_patient_connection(PRE_TREATMENT_PATIENT_CONNECTION_MODE) + #verification of indicators from BP/HR section + utility.verify_page_step_indicator(names.o_PreTreatmentStack_pretreatmentConnectionStack_PreTreatmentConnectionStack, BP_HR_PRE_TREATMENT_STEPS, config.PRE_TREATMENT_SCREENS) + + #verification of BP/HR entries based on edge condition + verify_vital_entries_on_patient_connection() + #verification of indicators from patient connection section utility.verify_page_step_indicator(names.o_PreTreatmentStack_pretreatmentConnectionStack_PreTreatmentConnectionStack, UF_PRE_TREATMENT_STEPS, config.PRE_TREATMENT_SCREENS) @@ -292,13 +290,7 @@ #cmd to navigate to BP/HR section hd_simulator.cmd_send_uf_treatment_response(accepted=False, reason=1, volume=config.UF_VALID_RANGE) hd_simulator.cmd_send_uf_treatment_response(accepted=True, reason=0, volume=config.UF_VALID_RANGE) - - #verification of indicators from BP/HR section - utility.verify_page_step_indicator(names.o_PreTreatmentStack_pretreatmentConnectionStack_PreTreatmentConnectionStack, BP_HR_PRE_TREATMENT_STEPS, config.PRE_TREATMENT_SCREENS) - - #verification of BP/HR entries based on edge condition - verify_vital_entries_on_patient_connection() - + #verification of indicators from Connection section utility.verify_page_step_indicator(names.o_PreTreatmentStack_pretreatmentConnectionStack_PreTreatmentConnectionStack, CONNECTION_PRE_TREATMENT_STEPS, config.PRE_TREATMENT_SCREENS)