Index: suite_leahi/shared/scripts/names.py =================================================================== diff -u -r15ffe502f51439e7a264140af4154c3f57bc6070 -rdc6c6fda156779ac8b454120ba014b28b8ab9499 --- suite_leahi/shared/scripts/names.py (.../names.py) (revision 15ffe502f51439e7a264140af4154c3f57bc6070) +++ suite_leahi/shared/scripts/names.py (.../names.py) (revision dc6c6fda156779ac8b454120ba014b28b8ab9499) @@ -50,6 +50,7 @@ o_Settings_Menu = {"container": o_listView_delegateControl, "objectName": "_touchRect2", "type": "TouchRect" } o_SettingsHome = {"container": o_Gui_MainView, "objectName": "_SettingsHome", "type": "SettingsHome" } o_SettingsExportLogs = {"container": o_Gui_MainView, "objectName": "_SettingsBase", "type": "SettingsExportLogs" } +o_SettingsBase_exportButton_IconButton = {"container": o_SettingsExportLogs, "id": "_exportButton", "type": "IconButton", "unnamed": 1 } o_DeviceSettingsTitleText = {"container": o_SettingsHome, "id":"_titleText", "type": "Text", "unnamed": 1 } o_SettingsInformation = {"container": o_Gui_MainView, "objectName": "_SettingsBase", "type": "SettingsBase" } o_USBEjectButton = {"container": o_SettingsExportLogs, "id": "_usbEjectButton", "type": "USBButton", "unnamed": 1 } @@ -120,7 +121,7 @@ o_SettingsBase_SettingsInformation = {"container": o_Gui_MainView, "objectName": "_SettingsBase", "type": "SettingsBase" } o_SettingsBase_Information_Text = {"container": o_SettingsBase_SettingsInformation, "type": "Text", "unnamed": 1 } o_SettingsBase_SettingsInformation_2 = {"container": o_Gui_MainView, "objectName": "_SettingsBase", "type": "SettingsInformation" } -o_SettingsBase_grid_Grid = {"container": o_SettingsBase_SettingsInformation_2, "id": "_grid", "type": "Grid", "unnamed": 1 } +o_SettingsBase_versions_ReviewContainer = {"container": o_SettingsBase_SettingsInformation_2, "id": "_versions", "type": "ReviewContainer", "unnamed": 1 } #HeaderBar WiFi o_HeaderBar_WiFi_IconButton = {"container": o_Gui_MainView, "id": "_wifiButton", "type": "IconButton", "unnamed": 1 } Index: suite_leahi/tst_device_settings_information_version/test.py =================================================================== diff -u -rf7c5babf0cceeac7cacd155523b3fca43ac25a95 -rdc6c6fda156779ac8b454120ba014b28b8ab9499 --- suite_leahi/tst_device_settings_information_version/test.py (.../test.py) (revision f7c5babf0cceeac7cacd155523b3fca43ac25a95) +++ suite_leahi/tst_device_settings_information_version/test.py (.../test.py) (revision dc6c6fda156779ac8b454120ba014b28b8ab9499) @@ -204,17 +204,18 @@ version_details["DD FPGA Version"] = dd_fpga_version version_details["DD Serial Number"] = dd_serial - column = waitForObject(names.o_SettingsBase_grid_Grid) - + versions_review_container = waitForObject(names.o_SettingsBase_versions_ReviewContainer) + column = utility.findObjectById(versions_review_container, "_column") + # Get a list of the children children = object.children(column) # Create an iterator for the version_details items version_details_iter = iter(version_details.items()) count = 0 - for child in children: - value = utility.findObjectById(child, "_itemsValue") + for child in children[1:]: + value = utility.findObjectById(child, "_initial") value_text = str(value.text) if value_text != "": Index: suite_leahi/tst_device_settings_wifi/test.py =================================================================== diff -u -rf7c5babf0cceeac7cacd155523b3fca43ac25a95 -rdc6c6fda156779ac8b454120ba014b28b8ab9499 --- suite_leahi/tst_device_settings_wifi/test.py (.../test.py) (revision f7c5babf0cceeac7cacd155523b3fca43ac25a95) +++ suite_leahi/tst_device_settings_wifi/test.py (.../test.py) (revision dc6c6fda156779ac8b454120ba014b28b8ab9499) @@ -8,8 +8,7 @@ # Then, navigate to the WiFi screen and Compare WiFi screen title text # 2 Verify the parameter under Device Settings WiFi screen # 3 Set and Compare Information Parameters texts -# 4 Verify SCAN button is Disabled and Compare WiFi Screen Scan Button text -# 5 Click on WiFi Screen Back Button to navigate back from WiFi Screen +# 4 Click on WiFi Screen Back Button to navigate back from WiFi Screen import names @@ -52,32 +51,7 @@ wifi_parameter, "{} should be available under Wi-Fi title".format(wifi_parameter), ) - wifi_screen_scan_button = waitForObjectExists( - names.o_SettingsBase_WifiScreen_ScanButton, 2000 - ) - if wifi_screen_scan_button is not None: - test.compare( - wifi_screen_scan_button.textString, - config.WIFI_SCREEN_SCAN_BUTTON_TEXT, - "{} button is displayed and Comparison of WiFi Screen Scan Button text".format( - config.WIFI_SCREEN_SCAN_BUTTON_TEXT - ), - ) - - if wifi_screen_scan_button is True: - test.compare( - wifi_screen_scan_button.enabled, - config.ENABLED, - f"Check if the WiFi Screen Scan Button enabled = {config.ENABLED}", - ) - else: - test.compare( - wifi_screen_scan_button.enabled, - config.DISABLED, - f"Check if the WiFi Screen Scan Button disabled = {config.DISABLED}", - ) - wifi_screen_back_button = utility.get_object_from_names( names.o_SettingsBase_WifiScreen_BackButton, error_message="WiFi Screen Back Button missing", Index: suite_leahi/tst_service_export_logs/test.py =================================================================== diff -u -rf7c5babf0cceeac7cacd155523b3fca43ac25a95 -rdc6c6fda156779ac8b454120ba014b28b8ab9499 --- suite_leahi/tst_service_export_logs/test.py (.../test.py) (revision f7c5babf0cceeac7cacd155523b3fca43ac25a95) +++ suite_leahi/tst_service_export_logs/test.py (.../test.py) (revision dc6c6fda156779ac8b454120ba014b28b8ab9499) @@ -86,7 +86,7 @@ tests the case that the usb is ejected, requires restarting the application to get original state """ export_button = utility.get_object_from_names( - names.o_ExportButton, + names.o_SettingsBase_exportButton_IconButton, error_message="Export button was not enabled", ) if export_button is not None: @@ -136,7 +136,7 @@ ) export_button = utility.get_object_from_names( - names.o_ExportButton, + names.o_SettingsBase_exportButton_IconButton, error_message="Export button was not enabled", ) if export_button is not None: @@ -170,7 +170,7 @@ mouseClick(select_a_file) export_button = utility.get_object_from_names( - names.o_ExportButton, + names.o_SettingsBase_exportButton_IconButton, error_message="Export button was not enabled", ) if export_button is not None: