Index: shared/scripts/names.py =================================================================== diff -u -r06d29555beb8ba4c368040050afe740cb3233d0f -r4ffabb3d2d53942662c17b2d6dfd2b02b5895e29 --- shared/scripts/names.py (.../names.py) (revision 06d29555beb8ba4c368040050afe740cb3233d0f) +++ shared/scripts/names.py (.../names.py) (revision 4ffabb3d2d53942662c17b2d6dfd2b02b5895e29) @@ -63,7 +63,7 @@ o_export_logs_text = {"container": o_SettingsBase_SettingsBase, "text": "Export Logs", "type": "Text", "unnamed": 1, "visible": True} o_combo_box_base_object={"container": o_SettingsBase_SettingsBase, "id": "_logTypeRow", "type": "Row", "unnamed": 1, "visible": True} o_combo_box={"container": o_combo_box_base_object, "id": "_logTypeCombo", "type": "ComboBox", "unnamed": 1, "visible": True} -o_treatment_comno_box={"checkable": False, "container": o_Overlay, "id": "_logTypeDelegate", "occurrence": 1, "type": "ItemDelegate", "unnamed": 1, "visible": True} +o_treatment_comno_box={"checkable": False, "container": o_Overlay, "id": "_logTypeDelegate", "occurrence": 3, "type": "ItemDelegate", "unnamed": 1, "visible": True} o_service_combo_box={"checkable": False, "container": o_Overlay, "id": "_logTypeDelegate", "text":"Service", "type": "ItemDelegate", "unnamed": 1, "visible": True} o_combo_box_text={"container": o_SettingsBase_SettingsBase, "echoMode": 0, "type": "TextField", "unnamed": 1, "visible": True} #SD Card Information @@ -73,6 +73,9 @@ o_export_btns = {"container": o_SettingsBase_SettingsBase,"id": "_logTypeExportButton", "type": "ExportButton", "unnamed": 1, "visible": True} #Export button o_export_btn = {"container": o_export_btns, "text": "Export", "type": "Text", "unnamed": 1, "visible": True} +o_export_log_list={"container": o_SettingsBase_SettingsBase, "id": "_usbFolderView", "type": "ListView", "unnamed": 1, "visible": True} +o_export_log_file={"container": o_export_log_list, "text": "VDGPressuresData.o.csmes", "type": "Text", "unnamed": 1, "visible": True} +o_export_log_id={"container": o_export_log_list, "text": "0.010", "type": "Text", "unnamed": 1, "visible": True} #object on keyboard to switch to keypad 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} Index: tst_service_screen/test.py =================================================================== diff -u -r06d29555beb8ba4c368040050afe740cb3233d0f -r4ffabb3d2d53942662c17b2d6dfd2b02b5895e29 --- tst_service_screen/test.py (.../test.py) (revision 06d29555beb8ba4c368040050afe740cb3233d0f) +++ tst_service_screen/test.py (.../test.py) (revision 4ffabb3d2d53942662c17b2d6dfd2b02b5895e29) @@ -20,6 +20,7 @@ from dialin.common.hd_defs import HDOpModes, HDOpSubModes from dialin.ui import utils from builtins import str +from cgitb import text EXPORT_LOGS = "Export Logs" @@ -36,6 +37,16 @@ names.o_services_screen_text_obj["text"] = text return names.o_services_screen_text_obj +def export_log_text(text): + names.o_export_log_file["text"]= text + return names.o_export_log_file + test.log(text) + +def export_log_id(id): + names.o_export_log_id["id"] = id + return names.o_export_log_id + test.log(id) + def navigate_to_settings_screen(): """ Method to navigate to "Settings" screen @@ -65,13 +76,13 @@ # mouseClick(waitForObjectExists(names.o_back_btn)) # test.compare(services_screen_text_obj.text, config.BACK_BUTTON_TEXT, "{} screen is displayed".format(config.BACK_BUTTON_TEXT)) # mouseClick(waitForObjectExists(settings_text_obj(EXPORT_LOGS))) - combobox_dropdown = waitForObjectExists(names.o_combo_box ) - for option in range(3): - mouseClick(waitForObjectExists(names.o_combo_box )) - test.compare(combobox_dropdown.text.option[0], config.EXPORT_LOGS_OPTIONS[0], "{} combo box is displayed".format(config.EXPORT_LOGS_OPTIONS[0])) - mouseClick(waitForObjectExists(names.o_combo_box )) - test.compare(waitForObjectExists(names.o_combo_box).text, config.EXPORT_LOGS_OPTIONS, "{} combo box is displayed".format(config.EXPORT_LOGS_OPTIONS)) - +# combobox_dropdown = waitForObjectExists(names.o_combo_box ) +# for option in range(3): +# mouseClick(waitForObjectExists(names.o_combo_box )) +# test.compare(combobox_dropdown.text.option[0], config.EXPORT_LOGS_OPTIONS[0], "{} combo box is displayed".format(config.EXPORT_LOGS_OPTIONS[0])) +# mouseClick(waitForObjectExists(names.o_combo_box )) +# test.compare(waitForObjectExists(names.o_combo_box).text, config.EXPORT_LOGS_OPTIONS, "{} combo box is displayed".format(config.EXPORT_LOGS_OPTIONS)) +# mouseClick(waitForObjectExists(names.o_export_btn )) test.compare(waitForObjectExists(names.o_export_btn).text, config.EXPORT_BUTTON_TEXT,"{} screen is displayed".format(config.EXPORT_BUTTON_TEXT)) test.endSection() @@ -81,6 +92,7 @@ utils.tstStart(__file__) startApplication(config.AUT_NAME) - + export_log_text(text) + export_log_id(id) navigate_to_settings_screen() utils.tstDone()