Index: tst_main_treatment_vitals/test.py =================================================================== diff -u -r62b41ac739f27813608a6b4eb0bdd9ee4331d64f -rbf0f91cc77deda73a01e96768c76160d71e46ddf --- tst_main_treatment_vitals/test.py (.../test.py) (revision 62b41ac739f27813608a6b4eb0bdd9ee4331d64f) +++ tst_main_treatment_vitals/test.py (.../test.py) (revision bf0f91cc77deda73a01e96768c76160d71e46ddf) @@ -143,7 +143,7 @@ input_field = waitForObject(input_field) entered_value = input_field.text.toUtf8().constData() test.compare(entered_value, value, - "Expected {} value: {} should be equal to Actual {} value: {}".format(vital, value, vital, entered_value)) + "Actual {} value: {} should be equal to Expected {} value: {}".format(vital, entered_value, vital, value)) test.endSection() @@ -294,15 +294,15 @@ rinseback_state= 0, recirculate_state= 0, blood_prime_state= 0, treatment_end_state=0, treatment_stop_state= 0) - utils.waitForGUI(delay_s=3) + 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(2) + utils.waitForGUI(1) open_vitals_pop_up() verify_entered_value_in_pop_up(value=SYSTOLIC_PRESSSURE_120, @@ -318,7 +318,7 @@ dia_val=DIASTOLIC_PRESSSURE_60, heart_rate=HEART_RATE_VAL_85, save=False) - utils.waitForGUI(2) + utils.waitForGUI(1) open_vitals_pop_up() verify_entered_value_in_pop_up(value=SYSTOLIC_PRESSSURE_175, input_field=names.o_pop_up_systolic_input_field, @@ -333,7 +333,7 @@ dia_val=DIASTOLIC_PRESSSURE_74, heart_rate=HEART_RATE_VAL_70, save=True) - utils.waitForGUI(2) + utils.waitForGUI(1) open_vitals_pop_up() verify_entered_value_in_pop_up(value=SYSTOLIC_PRESSSURE_113, input_field=names.o_pop_up_systolic_input_field, @@ -348,7 +348,7 @@ dia_val=DIASTOLIC_PRESSSURE_150, heart_rate=HEART_RATE_VAL_60, save=False) - utils.waitForGUI(2) + utils.waitForGUI(1) open_vitals_pop_up() verify_ranges_of_vital(vital_parameter=SYSTOLIC_TEXT) verify_ranges_of_vital(vital_parameter=DIASTOLIC_TEXT)