Index: shared/scripts/configuration/utility.py =================================================================== diff -u -r82fd0a371523a464e2f53ac5a0b658ead77be235 -ra1d91d52c638b1b6291be26a26b346b90cee6bd4 --- shared/scripts/configuration/utility.py (.../utility.py) (revision 82fd0a371523a464e2f53ac5a0b658ead77be235) +++ shared/scripts/configuration/utility.py (.../utility.py) (revision a1d91d52c638b1b6291be26a26b346b90cee6bd4) @@ -86,14 +86,12 @@ """ Method to enter user desired value using keypad - @param entry: (str) User expected value + @param entry: (int) User expected value """ test.startSection("Entering {}".format(entry)) + entry = pyStr(entry) for value in entry: - value = pyInt(value) - key_val = squish.waitForObject(keypad_input(value)) - squish.mouseClick(key_val) - utils.waitForGUI(0.1) + squish.mouseClick(squish.waitForObject(keypad_input(value))) test.endSection() @@ -336,15 +334,5 @@ test.compare(ven_min, ven_low, "Actual Venous range minimum value: {} is equal to Expected value: {}".format(ven_min, ven_low)) test.endSection() - -def enter_keypad_value_bphr(entry): - """ - Method to enter user desired - value using keypad - @param entry: (str) User expected value - """ - test.startSection("Entering {}".format(entry)) - entry = pyStr(entry) #type casted into string format - for value in entry: - squish.mouseClick(squish.waitForObject(keypad_input(value))) - test.endSection() \ No newline at end of file + + Index: tst_main_treatment_vitals/test.py =================================================================== diff -u -r28701bd23a048c19d8a6be4595ea4929e094d49f -ra1d91d52c638b1b6291be26a26b346b90cee6bd4 --- tst_main_treatment_vitals/test.py (.../test.py) (revision 28701bd23a048c19d8a6be4595ea4929e094d49f) +++ tst_main_treatment_vitals/test.py (.../test.py) (revision a1d91d52c638b1b6291be26a26b346b90cee6bd4) @@ -537,7 +537,7 @@ test.startSection("Verify the entered systolic, diastolic and heart rate value updated in main-treatement screen") mouseClick(waitForObject(names.o_PreTreatmentBase_bloodPressureSystolic_TextEntry)) utility.erase_entered_value(names.o_PreTreatmentBase_input_TextInput_2) - utility.enter_keypad_value_bphr(sys_val) + utility.enter_keypad_value(sys_val) 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)) @@ -546,7 +546,7 @@ mouseClick(waitForObject(names.o_PreTreatmentBase_input_TextInput_3)) utility.erase_entered_value(names.o_PreTreatmentBase_input_TextInput_3) - utility.enter_keypad_value_bphr(dia_val) + utility.enter_keypad_value(dia_val) 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)) @@ -555,7 +555,7 @@ mouseClick(waitForObject(names.o_PreTreatmentBase_input_TextInput_4)) utility.erase_entered_value(names.o_PreTreatmentBase_input_TextInput_4) - utility.enter_keypad_value_bphr(heart_rate) + utility.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))