Index: shared/scripts/configuration/strings.py =================================================================== diff -u -rb20bf1d72b0cb790a0e8966b405b769d306fcf0e -raea720dc4efe66713d2b9a00a7d6a2497dbcaea4 --- shared/scripts/configuration/strings.py (.../strings.py) (revision b20bf1d72b0cb790a0e8966b405b769d306fcf0e) +++ shared/scripts/configuration/strings.py (.../strings.py) (revision aea720dc4efe66713d2b9a00a7d6a2497dbcaea4) @@ -391,14 +391,14 @@ BACK_TEXT = "BACK" UNIT_OF_VOLUME_AND_BRIGHTNESS = "%" -#Service wifi +#service wifi WIFI_PARAMETERS_TEXTS = ["Wi-Fi", "IP Address", "Gateway", "Subnet Mask", "DNS", "SSID", "SCAN", "Scan Finished", "BACK"] -#SErvice Bluetooth cuff +#service Bluetooth cuff BLUETOOTH_CUFF_PARAMETERS = ["Bluetooth Cuff", "Devices"] BLUETOOTH_CUFF_NOTIFICATION_MESSAGE_TEXT = "The Bluetooth cuff pair clear error. [1001]" -#SErvice DG Cleaning +#service DG Cleaning DG_CLEANING_PARAMETERS = ["DG Cleaning", "Water Flush", "Time (HH:MM)", "Cycle (Days)", "Heat Disinfection", "Time (HH:MM)", "Cycle (Days)"] #service export log Index: shared/scripts/names.py =================================================================== diff -u -rb20bf1d72b0cb790a0e8966b405b769d306fcf0e -raea720dc4efe66713d2b9a00a7d6a2497dbcaea4 --- shared/scripts/names.py (.../names.py) (revision b20bf1d72b0cb790a0e8966b405b769d306fcf0e) +++ shared/scripts/names.py (.../names.py) (revision aea720dc4efe66713d2b9a00a7d6a2497dbcaea4) @@ -1030,7 +1030,7 @@ o_SettingsBase_SettingsWiFi = {"container": o_Gui_MainView, "objectName": "_SettingsBase", "type": "SettingsWiFi", "visible": True} o_SettingsHome_backbutton_mousearea_service_wifi = {"container": o_SettingsBase_SettingsWiFi, "id": "_mouseArea", "type": "MouseArea", "unnamed": 1, "visible": True} o_SettingsBase_service_wifi_scan_button_mouseArea_MouseArea_2 = {"container": o_SettingsBase_SettingsWiFi, "id": "_mouseArea", "occurrence": 2, "type": "MouseArea", "unnamed": 1, "visible": True} -#o_SettingsBase_Wi_Fi_Text = {"container": o_SettingsBase_SettingsWiFi, "type": "Text", "unnamed": 1, "visible": True} +o_SettingsBase_input_TextInput = {"container": o_SettingsBase_SettingsWiFi, "echoMode": 0, "id": "_input", "type": "TextInput", "unnamed": 1, "visible": True} # service bluetooth cuff screen o_SettingsHome_mousearea_service_bluetooth_cuff = {"container": o_SettingsHome_SettingsHome_2, "id": "_mouseArea", "occurrence": 5, "type": "MouseArea", "unnamed": 1, "visible": True} @@ -1042,7 +1042,13 @@ o_SettingsHome_mousearea_service_dg_cleaning = {"container": o_SettingsHome_SettingsHome_2, "id": "_mouseArea", "occurrence": 6, "type": "MouseArea", "unnamed": 1, "visible": True} o_SettingsHome_backbutton_mousearea_service_dg_cleaning = {"container": o_SettingsBase_SettingsBase, "id": "_mouseArea", "type": "MouseArea", "unnamed": 1, "visible": True} o_SettingsBase_SettingsDG = {"container": o_Gui_MainView, "objectName": "_SettingsBase", "type": "SettingsDG", "visible": True} -o_SettingsBase_service_dg_cleaning_scan_button_mouseArea_MouseArea_4 = {"container": o_SettingsBase_SettingsDG, "id": "_mouseArea", "occurrence": 3, "type": "MouseArea", "unnamed": 1, "visible": True} +o_SettingsBase_service_dg_cleaning_button_mouseArea_MouseArea_4 = {"container": o_SettingsBase_SettingsDG, "id": "_mouseArea", "occurrence": 3, "type": "MouseArea", "unnamed": 1, "visible": True} +o_SettingsBase_MouseArea_waterflush_hr = {"container": o_SettingsBase_SettingsDG, "occurrence": 3, "type": "MouseArea", "unnamed": 1, "visible": True} +o_SettingsBase_MouseArea_waterflush_min = {"container": o_SettingsBase_SettingsDG, "occurrence": 4, "type": "MouseArea", "unnamed": 1, "visible": True} +o_SettingsBase_MouseArea_waterflush_cycle = {"container": o_SettingsBase_SettingsDG, "occurrence": 5, "type": "MouseArea", "unnamed": 1, "visible": True} +o_SettingsBase_MouseArea_3_heat_disinfrection_hr = {"container": o_SettingsBase_SettingsDG, "occurrence": 6, "type": "MouseArea", "unnamed": 1, "visible": True} +o_SettingsBase_MouseArea_4_heat_disinfrection_min = {"container": o_SettingsBase_SettingsDG, "occurrence": 7, "type": "MouseArea", "unnamed": 1, "visible": True} +o_SettingsBase_MouseArea_5_heat_disinfrection_cycle = {"container": o_SettingsBase_SettingsDG, "occurrence": 8, "type": "MouseArea", "unnamed": 1, "visible": True} #Export button o_export_btns = {"container": o_SettingsBase_SettingsBase,"id": "_logTypeExportButton", "type": "ExportButton", "unnamed": 1, "visible": True} Index: tst_service_screen/test.py =================================================================== diff -u -rb20bf1d72b0cb790a0e8966b405b769d306fcf0e -raea720dc4efe66713d2b9a00a7d6a2497dbcaea4 --- tst_service_screen/test.py (.../test.py) (revision b20bf1d72b0cb790a0e8966b405b769d306fcf0e) +++ tst_service_screen/test.py (.../test.py) (revision aea720dc4efe66713d2b9a00a7d6a2497dbcaea4) @@ -79,6 +79,7 @@ """ test.startSection("Verify the parameter under Information screen") test.log("Navigating to 'Information' screen") + utils.waitForGUI(0.5) mouseClick(waitForObjectExists(names.o_SettingsHome_touchItem_TouchRect_service_information)) for title in config.INFORMATION_TITLES: title_text = waitForObjectExists(text_obj(title)) @@ -128,14 +129,16 @@ Method to verify "Wi-Fi" screen in service """ test.startSection("Verifying Wi-Fi setting") - utils.waitForGUI(0.2) + utils.waitForGUI(0.5) mouseClick(waitForObjectExists(names.o_SettingsHome_mousearea_service_wifi)) for services_parameter in config.WIFI_PARAMETERS_TEXTS: services_par_text = waitForObjectExists(text_obj(services_parameter)) test.compare(services_par_text.text, services_parameter, "{} should be available under Wi-Fi title".format(services_parameter)) - utils.waitForGUI(0.3) + utils.waitForGUI(0.5) mouseClick(waitForObjectExists(names.o_SettingsBase_service_wifi_scan_button_mouseArea_MouseArea_2)) - utils.waitForGUI(0.2) + utils.waitForGUI(0.5) + mouseClick(waitForObjectExists(names.o_SettingsBase_input_TextInput)) + utils.waitForGUI(0.5) mouseClick(waitForObjectExists(names.o_SettingsHome_backbutton_mousearea_service_wifi)) test.endSection() @@ -145,15 +148,15 @@ Method to verify "Bluetooth Cuff" screen in service """ test.startSection("Verifying Bluetooth Cuff Setting") - utils.waitForGUI(0.2) + utils.waitForGUI(0.5) mouseClick(waitForObjectExists(names.o_SettingsHome_mousearea_service_bluetooth_cuff)) for services_parameter in config.BLUETOOTH_CUFF_PARAMETERS: services_par_text = waitForObjectExists(text_obj(services_parameter)) test.compare(services_par_text.text, services_parameter, "{} should be available under Bluetooth Cuff title".format(services_parameter)) - utils.waitForGUI(0.2) + utils.waitForGUI(0.5) mouseClick(waitForObjectExists(names.o_SettingsBase_service_bluetooth_cuff_scan_button_mouseArea_MouseArea_3)) mouseClick(waitForObjectExists(names.o_SettingsBase_service_bluetooth_cuff_scan_button_mouseArea_MouseArea_3)) - utils.waitForGUI(0.2) + utils.waitForGUI(0.5) test.compare(waitForObjectExists(names.o_SettingsBase_The_Bluetooth_cuff_pair_clear_error_1001_Text).text, config.BLUETOOTH_CUFF_NOTIFICATION_MESSAGE_TEXT,"Notification Message Text must be {}".format(config.BLUETOOTH_CUFF_NOTIFICATION_MESSAGE_TEXT)) mouseClick(waitForObjectExists(names.o_SettingsHome_backbutton_mousearea_service_bluetooth_cuff)) test.endSection() @@ -164,17 +167,28 @@ Method to verify "DG Cleaning" screen in service """ test.startSection("Verifying DG Cleaning setting") - utils.waitForGUI(0.2) + utils.waitForGUI(0.5) mouseClick(waitForObject(names.o_SettingsHome_mousearea_service_dg_cleaning)) for services_parameter in config.DG_CLEANING_PARAMETERS: services_par_text = waitForObjectExists(text_obj(services_parameter)) test.compare(services_par_text.text, services_parameter, "{} should be available under Bluetooth Cuff title".format(services_parameter)) - utils.waitForGUI(0.2) - mouseClick(waitForObjectExists(names.o_SettingsBase_service_dg_cleaning_scan_button_mouseArea_MouseArea_4)) - utils.waitForGUI(0.2) + utils.waitForGUI(0.5) + mouseClick(waitForObjectExists(names.o_SettingsBase_MouseArea_waterflush_hr)) + utils.waitForGUI(0.5) + mouseClick(waitForObjectExists(names.o_SettingsBase_MouseArea_waterflush_min)) + utils.waitForGUI(0.5) + mouseClick(waitForObjectExists(names.o_SettingsBase_MouseArea_waterflush_cycle)) + utils.waitForGUI(0.5) + mouseClick(waitForObjectExists(names.o_SettingsBase_MouseArea_3_heat_disinfrection_hr)) + utils.waitForGUI(0.5) + mouseClick(waitForObjectExists(names.o_SettingsBase_MouseArea_4_heat_disinfrection_min)) + utils.waitForGUI(0.5) + mouseClick(waitForObjectExists(names.o_SettingsBase_MouseArea_5_heat_disinfrection_cycle)) + utils.waitForGUI(0.5) + mouseClick(waitForObjectExists(names.o_SettingsBase_service_dg_cleaning_button_mouseArea_MouseArea_4)) + utils.waitForGUI(0.5) mouseClick(waitForObjectExists(names.o_SettingsHome_backbutton_mousearea_service_dg_cleaning)) test.endSection() - def get_storage_data_status(file_name): """ @@ -198,7 +212,7 @@ """ test.startSection("Verifying the the export logs screen") test.log("Navigating to service screen to export log screen") - utils.waitForGUI(0.3) + utils.waitForGUI(0.5) mouseClick(waitForObjectExists(names.o_SettingsHome_export_log_mouseArea_MouseArea)) test.compare(waitForObjectExists(names.o_export_logs_text).text,config.EXPORT_LOG_TEXT,"{} should be under export logs screen ".format(config.EXPORT_LOG_TEXT)) log_status = get_storage_data_status(names.o_usb_folder_slider) @@ -226,7 +240,7 @@ test.log("verification of progress bar color before exporting data") test.compare(waitForObjectExists(names.o_SettingsBase_progressCircle_ProgressCircle).color.name, config.RED_COLOR,"{} color progress bar is displayed for sd-card".format(config.RED_COLOR)) test.compare(waitForObjectExists(names.o_SettingsBase_progressCircle_ProgressCircle_2).color.name, config.GREEN_COLOR,"{} color progress bar is displayed for usb-drive".format(config.GREEN_COLOR)) - utils.waitForGUI(0.2) + utils.waitForGUI(0.5) mouseClick(waitForObjectExists(names.o_SettingsBase_export_button_mouseArea_MouseArea_2)) utils.waitForGUI(2) @@ -238,7 +252,8 @@ test.compare(waitForObjectExists(names.o_SettingsBase_progressCircle_ProgressCircle).color.name, config.RED_COLOR,"{} color progress bar is displayed for sd-card".format(config.RED_COLOR)) test.compare(waitForObjectExists(names.o_SettingsBase_progressCircle_ProgressCircle_2).color.name, config.GREEN_COLOR,"{} color progress bar is displayed for usb-drive".format(config.GREEN_COLOR)) - mouseClick(waitForObjectExists(names.o_SettingsBase_image_Image_export_log_eject_button )) ## + utils.waitForGUI(0.5) + mouseClick(waitForObjectExists(names.o_SettingsBase_image_Image_export_log_eject_button )) test.compare(waitForObjectExists(names.o_export_btn).text, config.EXPORT_BUTTON_TEXT,"Export button text should be {}".format(config.EXPORT_BUTTON_TEXT)) test.compare(waitForObjectExists(names.o_export_btn).enabled, False, "Export button should be disabled") @@ -254,7 +269,7 @@ verify shutdown button after clicking export button """ test.startSection("verification of system shutdown option") - utils.waitForGUI(0.2) + utils.waitForGUI(0.5) mouseClick(waitForObjectExists(names.o_SettingsBase_export_log_backButton_BackButton)) test.compare(waitForObjectExists(names.o_keyboard_object).text, config.SHUTDOWN_BUTTON_TEXT, "User should able to click {}".format(config.SHUTDOWN_BUTTON_TEXT)) utils.waitForGUI(1) @@ -265,7 +280,7 @@ hd_simulator.cmd_send_poweroff_button_pressed() mouseClick(waitForObjectExists(names.o_cancelTouch_TouchRect)) hd_simulator.cmd_send_poweroff_button_pressed() - utils.waitForGUI(0.2) + utils.waitForGUI(0.5) mouseClick(waitForObjectExists(names.o_shutdownRect_TouchRect)) #0x0E00 #0x0E00 @@ -283,6 +298,7 @@ verify_parameters_under_information() verify_volume_and_brightness_section() verify_wifi_setting() + verify_bluetooth_cuff_setting() verify_dg_cleaning_setting() verify_export_logs_screen()