Index: shared/scripts/configuration/config.py =================================================================== diff -u -rf0e58744b2cb5782abb0ef39dc0b581f982f8065 -rf219736284ccfc6e0bc34fb6b82c28122928dc2f --- shared/scripts/configuration/config.py (.../config.py) (revision f0e58744b2cb5782abb0ef39dc0b581f982f8065) +++ shared/scripts/configuration/config.py (.../config.py) (revision f219736284ccfc6e0bc34fb6b82c28122928dc2f) @@ -46,10 +46,10 @@ PASSWORD = 123 CONFIRM_TEXT = "CONFIRM" SERVICE_BACK_BTN = "BACK" -IP_ADDRESS = "192.168.1.1" -GATEWAY = "255.255.255.0" -SUBNET_MASK = "255.255.255.0" -DNS = "0.0.0.0" +IP_ADDRESS = {"valid" : "192.168.1.1","invalid" : "192.168.1"} +GATEWAY = {"valid" : "255.255.255.0", "invalid" : "255.255.255"} +SUBNET_MASK = {"valid" : "255.255.255.0", "invalid" : "255.255.255"} +DNS = {"valid" : "0.0.0.0", "invalid" : "255.255.255"} Index: shared/scripts/names.py =================================================================== diff -u -rab623514918cd48e531391afbc5a9c365e00a109 -rf219736284ccfc6e0bc34fb6b82c28122928dc2f --- shared/scripts/names.py (.../names.py) (revision ab623514918cd48e531391afbc5a9c365e00a109) +++ shared/scripts/names.py (.../names.py) (revision f219736284ccfc6e0bc34fb6b82c28122928dc2f) @@ -130,6 +130,7 @@ o_gateway_text_inut = {"container": o_SettingsBase_SettingsWiFi, "echoMode": 0, "id": "_input", "occurrence": 2, "type": "TextInput", "unnamed": 1, "visible": True} o_subnet_mask_text_input = {"container": o_SettingsBase_SettingsWiFi, "echoMode": 0, "id": "_input", "occurrence": 3, "type": "TextInput", "unnamed": 1, "visible": True} o_dns_text_input = {"container": o_SettingsBase_SettingsWiFi, "echoMode": 0, "id": "_input", "occurrence": 4, "type": "TextInput", "unnamed": 1, "visible": True} +o_SettingsBase_mouseArea_MouseArea = {"container": o_SettingsBase_SettingsWiFi, "id": "_mouseArea", "type": "MouseArea", "unnamed": 1, "visible": True} Index: tst_settings_information/test.py =================================================================== diff -u -rab623514918cd48e531391afbc5a9c365e00a109 -rf219736284ccfc6e0bc34fb6b82c28122928dc2f --- tst_settings_information/test.py (.../test.py) (revision ab623514918cd48e531391afbc5a9c365e00a109) +++ tst_settings_information/test.py (.../test.py) (revision f219736284ccfc6e0bc34fb6b82c28122928dc2f) @@ -337,14 +337,16 @@ mouseClick(waitForObjectExists(names.o_keyboard_object)) test.endSection() -def enter_address_value(entry): +def enter_address_value(param,entry): """ Method to enter user desired value using keypad @param entry: (str) User expected value """ test.startSection("Entering {}".format(entry)) + user_input_clear_option(param) for value in entry: + utils.waitForGUI(0.2) if value.isalpha(): value = pyfloat(value) elif value == ("."): @@ -356,38 +358,53 @@ utils.waitForGUI(0.1) test.endSection() -def verify_wifi_parameters(): +def user_input_clear_option(param): """ + Tests to clear retained inserted values + @return: N/A + """ + utils.waitForGUI(0.2) + patient_id_input = waitForObjectExists(param) + utils.waitForGUI(0.2) + while (patient_id_input.text != ""): #Loop for deleting the present values on ui + type(waitForObject(param), "") + utils.waitForGUI(0.1) + type(waitForObject(param), "") + utils.waitForGUI(0.1) + +def verify_wifi_parameters(parameter): + """ Method to enter and verify "Wi-Fi" screen parameters such as ip address, gateway, subnet mask and dns """ test.startSection("Entering and Verifying Wi-Fi parameters") - utils.waitForGUI(0.1) + utils.waitForGUI(0.2) mouseClick(waitForObjectExists(names.o_SettingsHome_Wi_Fi_Text)) utils.waitForGUI(0.2) mouseClick(waitForObjectExists(names.o_ip_address_text_inut)) - enter_address_value(entry=str(config.IP_ADDRESS)) ip_adress = object.children(waitForObjectExists(names.o_ip_address_object)) - test.compare(ip_adress[IP_ADRESS_TEXT_INDEX].text, config.IP_ADDRESS, "IP address should be {}".format(config.IP_ADDRESS)) + enter_address_value(names.o_ip_address_text_inut,entry=str(config.IP_ADDRESS[parameter])) + test.compare(ip_adress[IP_ADRESS_TEXT_INDEX].text, config.IP_ADDRESS[parameter], "IP address should be {}".format(config.IP_ADDRESS[parameter])) utils.waitForGUI(0.1) mouseClick(waitForObjectExists(names.o_gateway_text_inut)) - enter_address_value(entry=str(config.GATEWAY)) gateway = object.children(waitForObjectExists(names.o_gateway_object)) - test.compare(gateway[GATEWAY_TEXT_INDEX].text, config.GATEWAY, "Gateway should be {}".format(config.GATEWAY)) + enter_address_value(names.o_gateway_text_inut,entry=str(config.GATEWAY[parameter])) + test.compare(gateway[GATEWAY_TEXT_INDEX].text, config.GATEWAY[parameter], "Gateway should be {}".format(config.GATEWAY[parameter])) utils.waitForGUI(0.1) mouseClick(waitForObjectExists(names.o_subnet_mask_text_input)) - enter_address_value(entry=str(config.SUBNET_MASK)) subnet_mask = object.children(waitForObjectExists(names.o_subnet_mask_object)) - test.compare(subnet_mask[SUBNET_MASK_TEXT_INDEX].text, config.SUBNET_MASK, "Subnet mask should be {}".format(config.SUBNET_MASK)) + enter_address_value(names.o_subnet_mask_text_input,entry=str(config.SUBNET_MASK[parameter])) + test.compare(subnet_mask[SUBNET_MASK_TEXT_INDEX].text, config.SUBNET_MASK[parameter], "Subnet mask should be {}".format(config.SUBNET_MASK[parameter])) utils.waitForGUI(0.1) mouseClick(waitForObjectExists(names.o_dns_text_input)) - enter_address_value(entry=str(config.DNS)) dns = object.children(waitForObjectExists(names.o_dns_object)) - test.compare(dns[DNS_TEXT_INDEX].text, config.DNS, "DNS should be {}".format(config.DNS)) + enter_address_value(names.o_dns_text_input,entry=str(config.DNS[parameter])) + test.compare(dns[DNS_TEXT_INDEX].text, config.DNS[parameter], "DNS should be {}".format(config.DNS[parameter])) mouseClick(waitForObjectExists(names.o_SettingsBase_SCAN_Text)) + mouseClick(waitForObjectExists(names.o_SettingsBase_mouseArea_MouseArea)) test.endSection() def verify_bluetooth_cuff_setting(): @@ -489,14 +506,13 @@ utils.waitForGUI(1) test.endSection() + def main(): utils.tstStart(__file__) startApplication(config.AUT_NAME) navigate_to_settings_screen() - - verify_settings_parameters() verify_parameters_under_information() verify_hd_and_dg_versions(hd_major=10, hd_minor=20, hd_micro=30, hd_build=4000, hd_fpga_id=50, @@ -522,32 +538,36 @@ hd_serial="HD09876543210987", dg_major=100, dg_minor=95, dg_micro=105, dg_build=1000, dg_fpga_id=124, dg_fpga_major=75, dg_fpga_minor=65, dg_fpga_lab=125, dg_compatibility_rev=4000, dg_serial="DG9876543210987") - + utils.waitForGUI(0.5) verify_service_date(hd_day=DAY_3, hd_month=MONTH_NOVEMBER, hd_year=YEAR_2022, hd_interval_days=INTERVAL_DAYS_2_YEARS, dg_day=DAY_25, dg_month=MONTH_JAN, dg_year=YEAR_1977, dg_interval_days=INTERVAL_DAYS_1_YEARS) - + utils.waitForGUI(0.5) verify_service_date(hd_day=DAY_25, hd_month=MONTH_JAN, hd_year=YEAR_1977, hd_interval_days=INTERVAL_DAYS_1_YEARS, dg_day=DAY_12, dg_month=MONTH_APRIL, dg_year=YEAR_2001, dg_interval_days=INTERVAL_DAYS_6_MONTHS) - + utils.waitForGUI(0.5) verify_service_date(hd_day=DAY_12, hd_month=MONTH_APRIL, hd_year=YEAR_2001, hd_interval_days=INTERVAL_DAYS_6_MONTHS, dg_day=DAY_30, dg_month=MONTH_AUGUST, dg_year=YEAR_2045, dg_interval_days=INTERVAL_DAYS_10_MONTHS) - + utils.waitForGUI(0.5) verify_service_date(hd_day=DAY_30, hd_month=MONTH_AUGUST, hd_year=YEAR_2045, hd_interval_days=INTERVAL_DAYS_10_MONTHS, dg_day=DAY_3, dg_month=MONTH_NOVEMBER, dg_year=YEAR_2022, dg_interval_days=INTERVAL_DAYS_2_YEARS) - + test.log("Navigating to 'Settings' screen") mouseClick(waitForObjectExists(service_date_obj(config.BACK_TEXT))) utils.waitForGUI(0.5) test.log("Navigating to 'Volume and Brightness' screen") mouseClick(waitForObjectExists(settings_text_obj(config.VOLUME_AND_BRIGHTNESS_TEXT))) verify_volume_and_brightness_section() - + verify_alarm_volume() - + verify_wifi_setting() verify_bluetooth_cuff_setting() verify_dg_cleaning_setting() verify_service_password_screen() - verify_wifi_parameters() + test.log("Passing incorrect parameters to validate wifi parameters") + verify_wifi_parameters("invalid") + utils.waitForGUI(0.5) + test.log("Passing correct parameters to validate wifi parameters") + verify_wifi_parameters("valid") utils.tstDone() \ No newline at end of file