Index: shared/scripts/configuration/config.py =================================================================== diff -u -rf219736284ccfc6e0bc34fb6b82c28122928dc2f -r549595222c6cd45b73146676b9887a0195aa1651 --- shared/scripts/configuration/config.py (.../config.py) (revision f219736284ccfc6e0bc34fb6b82c28122928dc2f) +++ shared/scripts/configuration/config.py (.../config.py) (revision 549595222c6cd45b73146676b9887a0195aa1651) @@ -27,7 +27,7 @@ #Service password loction CONFIG_PATH = Path(os.getcwd()) HOME_DIR_PATH = CONFIG_PATH.parent.parent.parent -SERVICE_CONF_LOCATION ="".join([str(HOME_DIR_PATH),'/Projects/application/resources/settings/Service.conf']) +SERVICE_CONF_LOCATION ="".join([str(HOME_DIR_PATH),'/Projects/application/resources/settings/Settings/System.conf']) #standby mode GOODMORNING_START_TIME_SEC = 0 @@ -41,18 +41,11 @@ BRIGHTNESS_MAX_VAL = 100 VOLUME_MIN_VAL = 20 VOLUME_MAX_VAL = 100 -DEVICE_SETTINGS_TEXT = "Device Settings" -SERVICE_TEXT = "Service" + PASSWORD = 123 -CONFIRM_TEXT = "CONFIRM" -SERVICE_BACK_BTN = "BACK" + 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/configuration/strings.py =================================================================== diff -u -r2c7da26ac2ba169d208a91e591ff7a1e494abead -r549595222c6cd45b73146676b9887a0195aa1651 --- shared/scripts/configuration/strings.py (.../strings.py) (revision 2c7da26ac2ba169d208a91e591ff7a1e494abead) +++ shared/scripts/configuration/strings.py (.../strings.py) (revision 549595222c6cd45b73146676b9887a0195aa1651) @@ -20,13 +20,15 @@ INFORMATION_TITLES = ["Information", "Versions"] INFORMATION_PARAMETERS = ["Information", "UI Version", "HD Version", "HD FPGA Version", "HD Serial Number", "DG Version", "DG FPGA Version", "DG Serial Number"] -SERIVCES_TITLE = "Service" +SERVICE_TEXT = "Service" SERVICES_PARAMETERS = ["HD Last Service Date", "HD Next Service Date", "DG Last Service Date", "DG Next Service Date"] #volume and brightness VOLUME_AND_BRIGHTNESS_TEXT = "Volume And Brightness" BRIGHTNESS_TEXT = "Brightness" ALARM_VOLUME_TEXT = "Alarm Volume" +CONFIRM_TEXT = "CONFIRM" +SERVICE_BACK_BTN = "BACK" BACK_TEXT = "BACK" UNIT_OF_VOLUME_AND_BRIGHTNESS = "%" @@ -50,4 +52,3 @@ HEAT_DISINFECTION_TEXT = "Heat Disinfection" CHEMICAL_DISINFECTION_TEXT = "Chemical Disinfection" - Index: shared/scripts/names.py =================================================================== diff -u -rf219736284ccfc6e0bc34fb6b82c28122928dc2f -r549595222c6cd45b73146676b9887a0195aa1651 --- shared/scripts/names.py (.../names.py) (revision f219736284ccfc6e0bc34fb6b82c28122928dc2f) +++ shared/scripts/names.py (.../names.py) (revision 549595222c6cd45b73146676b9887a0195aa1651) @@ -131,7 +131,3 @@ 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 -r6b6e4d07a0de37a3b1cb90ffcc0da7834ec35a57 -r549595222c6cd45b73146676b9887a0195aa1651 --- tst_settings_information/test.py (.../test.py) (revision 6b6e4d07a0de37a3b1cb90ffcc0da7834ec35a57) +++ tst_settings_information/test.py (.../test.py) (revision 549595222c6cd45b73146676b9887a0195aa1651) @@ -112,8 +112,8 @@ test.compare(info_parameter_text.text, info_parameter, "{} should be available under 'Information'".format(info_parameter)) test.log("Verifying services title and parameters") - services_text = waitForObjectExists(settings_base_text_obj(config.SERIVCES_TITLE)) - test.compare(services_text.text, config.SERIVCES_TITLE, "Services title should be {}".format(config.SERIVCES_TITLE)) + services_text = waitForObjectExists(settings_base_text_obj(config.SERVICE_TEXT)) + test.compare(services_text.text, config.SERVICE_TEXT, "Services title should be {}".format(config.SERVICE_TEXT)) for services_parameter in config.SERVICES_PARAMETERS: services_par_text = waitForObjectExists(settings_base_text_obj(services_parameter)) @@ -485,17 +485,19 @@ with open(SERVICE_CONF_LOCATION, "r") as file: lines = file.readlines() for index, line in enumerate(lines): - if "Service Password" in line: + if "Service" in line: services_password = lines[index+1][:-1] + test.log(str(services_password)) + password_line = (str(services_password)).split("= ") + password = password_line[1] break else: continue - - utility.enter_keyboard_numeric_value(entry=str(services_password)) + utility.enter_keyboard_numeric_value(entry=str(password)) mouseClick(waitForObjectExists(names.o_show_password)) test.log("Verifying the entered password") password = str((waitForObjectExists(names.o_password_text_field)).text) - test.compare(password, str(services_password), "Entered password should be {}".format(str(services_password))) + test.compare(password, str(password), "Entered password should be {}".format(str(password))) confirm_button = (waitForObjectExists(names.o_service_confirm_btn).text) test.compare(confirm_button, config.CONFIRM_TEXT, "Button text should be {}".format(config.CONFIRM_TEXT)) mouseClick(waitForObjectExists(names.o_service_confirm_btn)) @@ -538,32 +540,33 @@ 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() + test.log("Passing incorrect parameters to validate wifi parameters") verify_wifi_parameters("invalid") utils.waitForGUI(0.5)