Index: shared/scripts/names.py =================================================================== diff -u -rb869ed404a130fcc7d04f45cfac092fce9bfc13a -r86ad4f6650af063df9ffda1d589d4d988407b813 --- shared/scripts/names.py (.../names.py) (revision b869ed404a130fcc7d04f45cfac092fce9bfc13a) +++ shared/scripts/names.py (.../names.py) (revision 86ad4f6650af063df9ffda1d589d4d988407b813) @@ -865,6 +865,7 @@ o_switch_keyboard_to_keypad = {"container": o_Gui_MainView, "text": "&123", "type": "Text", "unnamed": 1, "visible": True} o_keyboard_object = {"container": o_Gui_MainView, "type": "Text", "unnamed": 1, "visible": True} + o_settings_date_and_time_text = {"container": o_SettingsBase_SettingsDateTime, "type": "Text", "unnamed": 1, "visible": True} o_date_time_container = {"container": o_SettingsBase_SettingsDateTime, "id": "_container", "type": "Column", "unnamed": 1, "visible": True} o_shutdown_text = {"container": o_Gui_MainView, "text": "SHUTDOWN", "type": "Text", "unnamed": 1, "visible": True} @@ -999,9 +1000,14 @@ # #Export button o_export_btns = {"container": o_SettingsBase_SettingsBase,"id": "_logTypeExportButton", "type": "ExportButton", "unnamed": 1, "visible": True} o_export_btn = {"container": o_export_btns, "text": "Export", "type": "Text", "unnamed": 1, "visible": True} +o_SettingsBase_SettingsExportLogs = {"container": o_Gui_MainView, "objectName": "_SettingsBase", "type": "SettingsExportLogs", "visible": True} +o_SettingsBase_export_button_mouseArea_MouseArea_2 = {"container": o_SettingsBase_SettingsExportLogs, "id": "_mouseArea", "occurrence": 5, "type": "MouseArea", "unnamed": 1, "visible": True} +o_SettingsHome_export_log_mouseArea_MouseArea = {"container": o_SettingsHome_SettingsHome_2, "id": "_mouseArea", "occurrence": 8, "type": "MouseArea", "unnamed": 1, "visible": True} +o_SettingsBase_export_log_backButton_BackButton = {"container": o_SettingsBase_SettingsExportLogs, "objectName": "_backButton", "type": "BackButton", "visible": True} +o_SettingsHome_service_confirmButton_TouchRect = {"container": o_SettingsHome_SettingsHome_2, "objectName": "_confirmButton", "type": "TouchRect", "visible": True} + #USB drive and SD crad Information o_usb_folder_slider = {"container": o_SettingsBase_SettingsBase, "id": "_usbFolderView", "type": "ListView", "unnamed": 1, "visible": True} -o_SettingsBase_SettingsExportLogs = {"container": o_Gui_MainView, "objectName": "_SettingsBase", "type": "SettingsExportLogs", "visible": True} o_SettingsBase_sdcFolderView_ListView = {"container": o_SettingsBase_SettingsExportLogs, "id": "_sdcFolderView", "type": "ListView", "unnamed": 1, "visible": True} #device log objects @@ -1010,7 +1016,6 @@ o_SettingsBase_progressCircle_ProgressCircle_2 = {"container": o_SettingsBase_SettingsBase, "id": "_progressCircle", "occurrence": 2, "type": "ProgressCircle", "unnamed": 1, "visible": True} o_SettingsBase_image_Image = {"container": o_SettingsBase_SettingsBase, "id": "_image", "source": "qrc:/images/iEject", "type": "Image", "unnamed": 1, "visible": True} - #cloudsync o_mainItem_Item = o_mainItem_Item = {"container": o_Gui_MainView, "id": "_mainItem", "type": "Item", "unnamed": 1, "visible": True} o_PostTreatmentStack_PostTreatmentStack = {"container": o_Gui_MainView, "objectName": "_PostTreatmentStack", "type": "PostTreatmentStack", "visible": True} @@ -1125,4 +1130,3 @@ o_time_duration_confirmButton_TouchRect_2 = {"container": o_Overlay, "id": "_confirmButton", "type": "TouchRect", "unnamed": 1, "visible": True} o_treatment_duration = {"container": o_treatmentHome, "objectName": "TreatmentTime", "type": "TreatmentTime", "visible": True} o_pop_up_close_button = {"container": o_Overlay, "id": "_image", "source": "qrc:/images/iClose", "type": "Image", "unnamed": 1, "visible": True} - Index: tst_service_screen/test.py =================================================================== diff -u -r09dad4f4fbf30637c5e2967a793ba2ea48615b74 -r86ad4f6650af063df9ffda1d589d4d988407b813 --- tst_service_screen/test.py (.../test.py) (revision 09dad4f4fbf30637c5e2967a793ba2ea48615b74) +++ tst_service_screen/test.py (.../test.py) (revision 86ad4f6650af063df9ffda1d589d4d988407b813) @@ -18,15 +18,11 @@ from dialin.common.hd_defs import HDOpModes, HDOpSubModes from dialin.ui import utils +hd_simulator = HDSimulator() - -EXPORT_LOGS = "Export Logs" - SERVICE_SCREEN_OPTIONS = ["Information", "Volume And Brightness", "Wi-Fi", "Bluetooth Cuff", "DG Cleaning", "Service", "Export Logs"] -hd_simulator = HDSimulator() - def custom_object_for_export_log(text): """ Method to set custom object property for export option @@ -79,7 +75,7 @@ """ test.startSection("Verifying the the export logs screen") test.log("Navigating to service screen to export log screen") - mouseClick(waitForObjectExists(settings_text_obj(EXPORT_LOGS))) + 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) test.verify(log_status == False, "export data rectangles should not be filled with contents under USB drive.") @@ -88,7 +84,7 @@ for option in range(len(config.EXPORT_LOGS_OPTIONS)): utils.waitForGUI(1) - mouseClick(waitForObjectExists(names.o_combo_box )) + mouseClick(waitForObjectExists(names.o_combo_box)) export_option = waitForObjectExists(custom_object_for_export_log(config.EXPORT_LOGS_OPTIONS[option])) utils.waitForGUI(1) @@ -108,7 +104,7 @@ 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_export_btn )) + mouseClick(waitForObjectExists(names.o_SettingsBase_export_button_mouseArea_MouseArea_2)) utils.waitForGUI(2) log_status = get_storage_data_status(names.o_usb_folder_slider) @@ -135,12 +131,10 @@ verify shutdown button after clicking export button """ test.startSection("verification of system shutdown option") - mouseClick(waitForObjectExists(names.o_keyboard_object)) + 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.5) - mouseClick(waitForObjectExists(names.o_keyboard_object)) - + utils.waitForGUI(1) + mouseClick(waitForObjectExists(names.o_SettingsHome_service_confirmButton_TouchRect)) test.endSection()