Index: shared/scripts/configuration/strings.py =================================================================== diff -u -r51f350d176f9f913b1e63018f5b42e1e65855518 -r2c7da26ac2ba169d208a91e591ff7a1e494abead --- shared/scripts/configuration/strings.py (.../strings.py) (revision 51f350d176f9f913b1e63018f5b42e1e65855518) +++ shared/scripts/configuration/strings.py (.../strings.py) (revision 2c7da26ac2ba169d208a91e591ff7a1e494abead) @@ -30,4 +30,24 @@ BACK_TEXT = "BACK" UNIT_OF_VOLUME_AND_BRIGHTNESS = "%" +#wifi +WIFI_TITLE_TEXT = "Wi-Fi" +IP_ADDRESS_TEXT = "IP Address" +GATEWAY_TEXT = "Gateway" +SUBNET_MASK_TEXT = "Subnet Mask" +DNS_TEXT = "DNS" +SSID_TEXT = "SSID" +SCAN_TEXT = "SCAN" +BACK_BUTTON_TEXT = "BACK" +#Bluetooth cuff +BLUETOOTH_CUFF_TITLE_TEXT = "Bluetooth Cuff" +DEVICES_TEXT = "Devices" + +#DG Cleaning +DG_CLEANING_TITLE_TEXT = "DG Cleaning" +WATER_FLUSH_TEXT = "Water Flush" +HEAT_DISINFECTION_TEXT = "Heat Disinfection" +CHEMICAL_DISINFECTION_TEXT = "Chemical Disinfection" + + Index: shared/scripts/names.py =================================================================== diff -u -r904e8524bb387ebdce90b82021a8f20c8cd8d0ef -r2c7da26ac2ba169d208a91e591ff7a1e494abead --- shared/scripts/names.py (.../names.py) (revision 904e8524bb387ebdce90b82021a8f20c8cd8d0ef) +++ shared/scripts/names.py (.../names.py) (revision 2c7da26ac2ba169d208a91e591ff7a1e494abead) @@ -70,4 +70,34 @@ o_SettingsBase_Volume_And_Brightness_Text = {"container": o_SettingsBase_SettingsVolumeBrightness, "type": "Text", "unnamed": 1, "visible": True} o_brightness_parent_obj = {"container": o_SettingsBase_SettingsVolumeBrightness, "gradient": 0, "id": "_brightness", "type": "Slider", "unnamed": 1, "visible": True} - +#Setting WiFi, Bluetooth cuff, DG cleaning +device_settings_screen = {"container": o_Gui_MainView, "text": "Treatment", "type": "Text", "unnamed": 1, "visible": True} +o_SettingsHome_SettingsHome_2 = {"container": o_Gui_MainView, "objectName": "_SettingsHome", "type": "SettingsHome", "visible": True} +o_SettingsHome_Wi_Fi_Text = {"container": o_SettingsHome_SettingsHome_2, "text": "Wi-Fi", "type": "Text", "unnamed": 1, "visible": True} +o_Gui_MainView_2 = {"type": "Gui::MainView", "unnamed": 1, "visible": True} +o_SettingsBase_SettingsWiFi = {"container": o_Gui_MainView_2, "objectName": "_SettingsBase", "type": "SettingsWiFi", "visible": True} +o_SettingsBase_Wi_Fi_Text = {"container": o_SettingsBase_SettingsWiFi, "text": "Wi-Fi", "type": "Text", "unnamed": 1, "visible": True} +o_SettingsBase_IP_Address_Text = {"container": o_SettingsBase_SettingsWiFi, "text": "IP Address", "type": "Text", "unnamed": 1, "visible": True} +o_SettingsBase_Gateway_Text = {"container": o_SettingsBase_SettingsWiFi, "text": "Gateway", "type": "Text", "unnamed": 1, "visible": True} +o_SettingsBase_Subnet_Mask_Text = {"container": o_SettingsBase_SettingsWiFi, "text": "Subnet Mask", "type": "Text", "unnamed": 1, "visible": True} +o_SettingsBase_DNS_Text = {"container": o_SettingsBase_SettingsWiFi, "text": "DNS", "type": "Text", "unnamed": 1, "visible": True} +o_SettingsBase_SSID_Text = {"container": o_SettingsBase_SettingsWiFi, "text": "SSID", "type": "Text", "unnamed": 1, "visible": True} +o_SettingsBase_SCAN_Text = {"container": o_SettingsBase_SettingsWiFi, "text": "SCAN", "type": "Text", "unnamed": 1, "visible": True} +o_SettingsHome_Bluetooth_Cuff_Text = {"container": o_SettingsHome_SettingsHome_2, "text": "Bluetooth Cuff", "type": "Text", "visible": True} +o_SettingsBase_Devices_Label = {"container": o_SettingsBase_SettingsBase, "text": "Devices", "type": "Label", "unnamed": 1, "visible": True} +o_SettingsBase_Bluetooth_Cuff_Text = {"container": o_SettingsBase_SettingsBase, "text": "Bluetooth Cuff", "type": "Text", "unnamed": 1, "visible": True} +o_SettingsBase_SettingsDG = {"container": o_Gui_MainView_2, "objectName": "_SettingsBase", "type": "SettingsDG", "visible": True} +o_SettingsBase_DG_Cleaning_Text = {"container": o_SettingsBase_SettingsDG, "text": "DG Cleaning", "type": "Text", "unnamed": 1, "visible": True} +o_SettingsHome_DG_Cleaning_Text = {"container": o_SettingsHome_SettingsHome_2, "text": "DG Cleaning", "type": "Text", "unnamed": 1, "visible": True} +o_SettingsBase_Water_Flush_Text = {"container": o_SettingsBase_SettingsDG, "text": "Water Flush", "type": "Text", "unnamed": 1, "visible": True} +o_SettingsBase_Heat_Disinfection_Text = {"container": o_SettingsBase_SettingsDG, "text": "Heat Disinfection", "type": "Text", "unnamed": 1, "visible": True} +o_SettingsBase_Chemical_Disinfection_Text = {"container": o_SettingsBase_SettingsDG, "text": "Chemical Disinfection", "type": "Text", "unnamed": 1, "visible": True} +o_SettingsBase_backButton_BackButton = {"container": o_SettingsBase_SettingsWiFi, "gradient": 0, "objectName": "_backButton", "type": "BackButton", "visible": True} +o_back_button = {"container": o_Gui_MainView_2, "text": "BACK", "type": "Text", "unnamed": 1, "visible": False} +o_SettingsBase_SCAN_Text_2 = {"container": o_SettingsBase_SettingsBase, "text": "SCAN", "type": "Text", "unnamed": 1, "visible": True} +o_SettingsBase_ssidText_Text = {"container": o_SettingsBase_SettingsWiFi, "id": "_ssidText", "type": "Text", "unnamed": 1, "visible": True} +o_SettingsBase_input_TextInput = {"container": o_SettingsBase_SettingsWiFi, "echoMode": 0, "id": "_input", "type": "TextInput", "unnamed": 1, "visible": True} +o_SettingsBase_input_TextInput_2 = {"container": o_SettingsBase_SettingsWiFi, "echoMode": 0, "id": "_input", "type": "TextInput", "unnamed": 1, "visible": True} +o_SettingsBase_input_TextInput_3 = {"container": o_SettingsBase_SettingsWiFi, "echoMode": 0, "id": "_input", "type": "TextInput", "unnamed": 1, "visible": True} +o_SettingsBase_input_TextInput_4 = {"container": o_SettingsBase_SettingsWiFi, "echoMode": 0, "id": "_input", "type": "TextInput", "unnamed": 1, "visible": True} +o_keyboard_object = {"container": o_Gui_MainView, "type": "Text", "unnamed": 1, "visible": True} Index: tst_settings_information/test.py =================================================================== diff -u -r51f350d176f9f913b1e63018f5b42e1e65855518 -r2c7da26ac2ba169d208a91e591ff7a1e494abead --- tst_settings_information/test.py (.../test.py) (revision 51f350d176f9f913b1e63018f5b42e1e65855518) +++ tst_settings_information/test.py (.../test.py) (revision 2c7da26ac2ba169d208a91e591ff7a1e494abead) @@ -50,6 +50,8 @@ BRIGHTNESS_BUFFER = 20 VOLUME_BUFFER = 20 VOLUME_RANGE = [80, 40, 20, 100, 60] + + def settings_text_obj(text): names.o_settings_home_text_obj["text"] = text @@ -293,12 +295,70 @@ """ for volume in VOLUME_RANGE: adjust_and_verify_alarm_volume(volume) + back_btn = waitForObjectExists(volume_and_brightness_text_obj(config.BACK_TEXT)) + mouseClick(back_btn) +def verify_wifi_setting(): + """ + Method to verify "Wi-Fi" screen + """ + test.startSection("Verifying Wi-Fi setting") + utils.waitForGUI(0.2) + mouseClick(waitForObjectExists(names.o_SettingsHome_Wi_Fi_Text)) + test.compare(waitForObjectExists(names.o_SettingsBase_Wi_Fi_Text).text, config.WIFI_TITLE_TEXT,"Wi-Fi Title must be {}".format(config.WIFI_TITLE_TEXT)) + test.compare(waitForObjectExists(names.o_SettingsBase_IP_Address_Text).text, config.IP_ADDRESS_TEXT,"IP Address Text must be {}".format(config.IP_ADDRESS_TEXT)) + test.compare(waitForObjectExists(names.o_SettingsBase_Gateway_Text).text, config.GATEWAY_TEXT,"Gateway Text must be {}".format(config.GATEWAY_TEXT)) + test.compare(waitForObjectExists(names.o_SettingsBase_Subnet_Mask_Text).text, config.SUBNET_MASK_TEXT,"Subnet Mask Text must be {}".format(config.SUBNET_MASK_TEXT)) + test.compare(waitForObjectExists(names.o_SettingsBase_DNS_Text).text, config.DNS_TEXT,"DNS Text must be {}".format(config.DNS_TEXT)) + test.compare(waitForObjectExists(names.o_SettingsBase_SSID_Text).text, config.SSID_TEXT,"SSID Text must be {}".format(config.SSID_TEXT)) + test.compare(waitForObjectExists(names.o_SettingsBase_SCAN_Text).text, config.SCAN_TEXT,"SCAN Text must be {}".format(config.SCAN_TEXT)) + test.compare(waitForObjectExists(names.o_back_button).text, config.BACK_BUTTON_TEXT,"BACK Button Text must be {}".format(config.BACK_BUTTON_TEXT)) + test.verify(waitForObjectExists(names.o_SettingsBase_input_TextInput).enabled, "IP Address TEXT box must be enabled") + test.verify(waitForObjectExists(names.o_SettingsBase_input_TextInput_2).enabled, "Gateway TEXT box must be enabled") + test.verify(waitForObjectExists(names.o_SettingsBase_input_TextInput_3).enabled, "Subnet Mask TEXT box must be enabled") + test.verify(waitForObjectExists(names.o_SettingsBase_input_TextInput_4).enabled, "DNS TEXT box must be enabled") + test.verify(waitForObjectExists(names.o_SettingsBase_ssidText_Text).enabled, "SSID TEXT box must be enabled") + mouseClick(waitForObjectExists(names.o_SettingsBase_SCAN_Text)) + mouseClick(waitForObjectExists(names.o_keyboard_object)) + test.endSection() + +def verify_bluetooth_cuff_setting(): + """ + Method to verify "Bluetooth Cuff" screen + """ + test.startSection("Verifying Bluetooth Cuff Setting") + utils.waitForGUI(0.2) + mouseClick(waitForObjectExists(names.o_SettingsHome_Bluetooth_Cuff_Text)) + test.compare(waitForObjectExists(names.o_SettingsBase_Bluetooth_Cuff_Text).text, config.BLUETOOTH_CUFF_TITLE_TEXT,"Bluetooth Cuff Title must be {}".format(config.BLUETOOTH_CUFF_TITLE_TEXT)) + test.compare(waitForObjectExists(names.o_SettingsBase_Devices_Label).text, config.DEVICES_TEXT,"Devices must be {}".format(config.DEVICES_TEXT)) + test.compare(waitForObjectExists(names.o_SettingsBase_SCAN_Text_2).text, config.SCAN_TEXT,"SCAN Text must be {}".format(config.SCAN_TEXT)) + test.compare(waitForObjectExists(names.o_back_button).text, config.BACK_BUTTON_TEXT,"BACK Button Text must be {}".format(config.BACK_BUTTON_TEXT)) + mouseClick(waitForObjectExists(names.o_SettingsBase_SCAN_Text_2)) + mouseClick(waitForObject(names.o_keyboard_object)) + test.endSection() + +def verify_dg_cleaning_setting(): + """ + Method to verify "DG Cleaning" screen + """ + test.startSection("Verifying DG Cleaning setting") + utils.waitForGUI(0.2) + mouseClick(waitForObject(names.o_SettingsHome_DG_Cleaning_Text)) + test.compare(waitForObjectExists(names.o_SettingsBase_DG_Cleaning_Text).text, config.DG_CLEANING_TITLE_TEXT,"DG Cleaning Title must be {}".format(config.DG_CLEANING_TITLE_TEXT)) + test.compare(waitForObjectExists(names.o_SettingsBase_Water_Flush_Text).text, config.WATER_FLUSH_TEXT,"Water Flush must be {}".format(config.WATER_FLUSH_TEXT)) + test.compare(waitForObjectExists(names.o_SettingsBase_Heat_Disinfection_Text).text, config.HEAT_DISINFECTION_TEXT,"Heat Disinfection Text must be {}".format(config.HEAT_DISINFECTION_TEXT)) + test.compare(waitForObjectExists(names.o_SettingsBase_Chemical_Disinfection_Text).text, config.CHEMICAL_DISINFECTION_TEXT,"Chemical Disinfection Text must be {}".format(config.CHEMICAL_DISINFECTION_TEXT)) + test.compare(waitForObjectExists(names.o_back_button).text, config.BACK_BUTTON_TEXT,"BACK Button Text must be {}".format(config.BACK_BUTTON_TEXT)) + mouseClick(waitForObjectExists(names.o_SettingsBase_Water_Flush_Text)) + mouseClick(waitForObjectExists(names.o_SettingsBase_Heat_Disinfection_Text)) + mouseClick(waitForObjectExists(names.o_SettingsBase_Chemical_Disinfection_Text)) + mouseClick(waitForObjectExists(names.o_keyboard_object)) + test.endSection() + def main(): utils.tstStart(__file__) - startApplication(config.AUT_NAME) - + startApplication(config.AUT_NAME) navigate_to_settings_screen() verify_settings_parameters() verify_parameters_under_information() @@ -325,10 +385,10 @@ 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) @@ -346,6 +406,9 @@ verify_volume_and_brightness_section() verify_alarm_volume() - + + verify_wifi_setting() + verify_bluetooth_cuff_setting() + verify_dg_cleaning_setting() utils.tstDone() \ No newline at end of file