Squish: Use objects recorded by Squish 7.2.1

They provide better readability and also look more stable.
Squish 7.1.0 can use these new objects while Squish 7.2.1
cannot handle the old ones.

Task-number: SQUISH-16829
Change-Id: I4214eee31699b7e90eff67d37119102c068e36ca
Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>
Reviewed-by: Katarina Behrens <katarina.behrens@qt.io>

5 files changed, 11 insertions, 10 deletions

diff --git a/Tests/system/shared/globalnames.py b/Tests/system/shared/globalnames.py
index 8187e0c9..8153033a 100644
--- a/Tests/system/shared/globalnames.py
+++ b/Tests/system/shared/globalnames.py
@@ -10,10 +10,10 @@ microsoft_Visual_Studio_Window = {"text": Wildcard("*Microsoft Visual Studio"),
 continueWithoutCode_Label = {"container": microsoft_Visual_Studio_Window, "text": "System.Windows.Controls.AccessText Microsoft.VisualStudio.Imaging.CrispImage", "type": "Label"}
 microsoft_Visual_Studio_MenuBar = {"container": microsoft_Visual_Studio_Window, "type": "MenuBar"}
 file_MenuItem = {"container": microsoft_Visual_Studio_MenuBar, "text": "File", "type": "MenuItem"}
-pART_Popup_Popup = {"id": "", "name": "PART_Popup", "type": "Popup"}
-pART_Popup_Exit_MenuItem = {"container": pART_Popup_Popup, "text": "Exit", "type": "MenuItem"}
-pART_Popup_Qt_VS_Tools_MenuItem = {"container": pART_Popup_Popup, "text": "Qt VS Tools", "type": "MenuItem"}
+file_Exit_MenuItem = {"container": file_MenuItem, "text": "Exit", "type": "MenuItem"}
 extensions_MenuItem = {"container": microsoft_Visual_Studio_MenuBar, "text": "Extensions", "type": "MenuItem"}
+extensions_Qt_VS_Tools_MenuItem = {"container": extensions_MenuItem, "text": "Qt VS Tools",
+                                   "type": "MenuItem"}
 msvs_Skip_this_for_now_Button = {"container": microsoft_Visual_Studio_Window, "text": "Skip this for now.", "type": "Button"}
 msvs_Start_Visual_Studio_Button = {"container": microsoft_Visual_Studio_Window, "text": "Start Visual Studio", "type": "Button"}
 msvs_Not_now_maybe_later_Label = {"container": microsoft_Visual_Studio_Window, "text": "Not now, maybe later.", "type": "Label"}
diff --git a/Tests/system/shared/utils.py b/Tests/system/shared/utils.py
index cff02780..3068d6ae 100644
--- a/Tests/system/shared/utils.py
+++ b/Tests/system/shared/utils.py
@@ -47,7 +47,7 @@ def startAppGetVersion(waitForInitialDialogs=False):
 def openVsToolsMenu(version):
     while True:
         mouseClick(waitForObject(globalnames.extensions_MenuItem))
-        mouseClick(waitForObject(globalnames.pART_Popup_Qt_VS_Tools_MenuItem, 5000))
+        mouseClick(waitForObject(globalnames.extensions_Qt_VS_Tools_MenuItem, 5000))
         if not object.exists(globalnames.Initializing_MenuItem):
             break
         mouseClick(waitForObject(globalnames.extensions_MenuItem))  # close menu
@@ -56,4 +56,4 @@ def openVsToolsMenu(version):
 
 def closeMainWindow():
     mouseClick(waitForObject(globalnames.file_MenuItem))
-    mouseClick(waitForObject(globalnames.pART_Popup_Exit_MenuItem))
+    mouseClick(waitForObject(globalnames.file_Exit_MenuItem))
diff --git a/Tests/system/suite_installation/shared/scripts/install_utils.py b/Tests/system/suite_installation/shared/scripts/install_utils.py
index 42459513..41b5dcfe 100644
--- a/Tests/system/suite_installation/shared/scripts/install_utils.py
+++ b/Tests/system/suite_installation/shared/scripts/install_utils.py
@@ -10,7 +10,7 @@ import globalnames
 
 def openExtensionManager(version):
     mouseClick(waitForObject(globalnames.extensions_MenuItem))
-    mouseClick(waitForObject(names.pART_Popup_Manage_Extensions_MenuItem))
+    mouseClick(waitForObject(names.extensions_Manage_Extensions_MenuItem))
 
 
 def selectInstalledVsTools(version):
diff --git a/Tests/system/suite_installation/shared/scripts/names.py b/Tests/system/suite_installation/shared/scripts/names.py
index e0c4a27b..5ba8dbb7 100644
--- a/Tests/system/suite_installation/shared/scripts/names.py
+++ b/Tests/system/suite_installation/shared/scripts/names.py
@@ -7,19 +7,20 @@
 
 from objectmaphelper import *
 import globalnames
-pART_Popup_Manage_Extensions_MenuItem = {"container": globalnames.pART_Popup_Popup,
+extensions_Manage_Extensions_MenuItem = {"container": globalnames.extensions_MenuItem,
                                          "text": RegularExpression("^Manage Extensions(\.\.\.)?$"),
                                          "type": "MenuItem"}
 manage_Extensions_Window = {"text": Wildcard("*Extensions*"), "type": "Window"}
 extensionManager_UI_InstalledExtItem_Qt_Label = {"text": Wildcard("The Qt VS Tools for Visual Studio *"), "type": "Label"}
 manage_Extensions_Close_Button = {"container": manage_Extensions_Window, "text": "Close", "type": "Button"}
-pART_Popup_Extensions_and_Updates_MenuItem = {"container": globalnames.pART_Popup_Popup, "text": "Extensions and Updates...", "type": "MenuItem"}
 extensions_and_Updates_lvw_Extensions_ListView = {"container": manage_Extensions_Window, "name": "lvw_Extensions", "type": "ListView"}
 lvw_Extensions_Microsoft_VisualStudio_ExtensionManager_UI_InstalledExtensionItem_ListViewItem = {"container": extensions_and_Updates_lvw_Extensions_ListView, "id": "Qt Visual Studio Tools", "text": "Microsoft.VisualStudio.ExtensionManager.UI.InstalledExtensionItem", "type": "ListViewItem"}
 extensions_and_Updates_Version_Label = {"container": manage_Extensions_Window, "text": "Version:", "type": "Label"}
 manage_Extensions_Version_Label = {"leftObject": extensions_and_Updates_Version_Label, "type": "Label"}
 help_MenuItem = {"container": globalnames.microsoft_Visual_Studio_MenuBar, "text": "Help", "type": "MenuItem"}
-pART_Popup_About_Microsoft_Visual_Studio_MenuItem = {"container": globalnames.pART_Popup_Popup, "text": "About Microsoft Visual Studio", "type": "MenuItem"}
+help_About_Microsoft_Visual_Studio_MenuItem = {"container": help_MenuItem,
+                                               "text": "About Microsoft Visual Studio",
+                                               "type": "MenuItem"}
 o_Microsoft_Visual_Studio_OK_Button = {"container": globalnames.microsoft_Visual_Studio_Window, "text": "OK", "type": "Button"}
 about_Microsoft_Visual_Studio_Window = {"text": "About Microsoft Visual Studio", "type": "Window"}
 about_Microsoft_Visual_Studio_Edit = {"container": about_Microsoft_Visual_Studio_Window, "type": "Edit"}
diff --git a/Tests/system/suite_installation/tst_2_install_verify/test.py b/Tests/system/suite_installation/tst_2_install_verify/test.py
index 59ac96cf..ed939471 100644
--- a/Tests/system/suite_installation/tst_2_install_verify/test.py
+++ b/Tests/system/suite_installation/tst_2_install_verify/test.py
@@ -29,7 +29,7 @@ def main():
 
 def checkVSVersion(version):
     mouseClick(waitForObject(names.help_MenuItem))
-    mouseClick(waitForObject(names.pART_Popup_About_Microsoft_Visual_Studio_MenuItem))
+    mouseClick(waitForObject(names.help_About_Microsoft_Visual_Studio_MenuItem))
     vsVersionText = waitForObjectExists(names.about_Microsoft_Visual_Studio_Edit).text
     test.verify(version in vsVersionText,
                 "Is this VS %s as expected? Found:\n%s" % (version, vsVersionText))