Squish: Update testing ProjectWelcomePage

Used by tst_session_handling and tst_WELP02.

Change-Id: I28bdececac39719372834c373f82ac9e99beb613
Reviewed-by: Christian Stenger <christian.stenger@qt.io>

src/plugins/projectexplorer/projectwelcomepage.cpp

@@ -499,9 +499,10 @@ public:
 class TreeView : public QTreeView
 {
 public:
-    TreeView(QWidget *parent)
+    TreeView(QWidget *parent, const QString &name)
         : QTreeView(parent)
     {
+        setObjectName(name);
         header()->hide();
         setMouseTracking(true); // To enable hover.
         setIndentation(0);
@@ -559,13 +560,13 @@ public:
         recentProjectsLabel->setFont(sizedFont(16, this));
         recentProjectsLabel->setText(ProjectWelcomePage::tr("Projects"));
 
-        auto sessionsList = new TreeView(this);
+        auto sessionsList = new TreeView(this, "Sessions");
         sessionsList->setModel(projectWelcomePage->m_sessionModel);
         sessionsList->header()->setSectionHidden(1, true); // The "last modified" column.
         sessionsList->setItemDelegate(&m_sessionDelegate);
         sessionsList->setVerticalScrollBarPolicy(Qt::ScrollBarAsNeeded);
 
-        auto projectsList = new TreeView(this);
+        auto projectsList = new TreeView(this, "Recent Projects");
         projectsList->setUniformRowHeights(true);
         projectsList->setModel(projectWelcomePage->m_projectModel);
         projectsList->setItemDelegate(&m_projectDelegate);

tests/system/objects.map

@@ -134,6 +134,7 @@
 :Qt Creator.Stop_QToolButton	{text='Stop' type='QToolButton' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'}
 :Qt Creator.Timeline_QDockWidget	{container=':Qt Creator.DebugModeWidget_QSplitter' name='QmlProfiler.Timeline.DockDockWidget' type='QDockWidget' visible='1'}
 :Qt Creator.Timeline_QTabBar	{aboveWidget=':Qt Creator.Timeline_QDockWidget' container=':Qt Creator.DebugModeWidget_QSplitter' type='QTabBar' unnamed='1' visible='1'}
+:Qt Creator.WelcomeScreenStackedWidget	{name='WelcomeScreenStackedWidget' type='QStackedWidget' visible='1' window=':Qt Creator_Core::Internal::MainWindow'}
 :Qt Creator.replaceEdit_Utils::FilterLineEdit	{name='replaceEdit' type='Utils::FancyLineEdit' visible='1' window=':Qt Creator_Core::Internal::MainWindow'}
 :Qt Creator.scrollArea_QScrollArea	{type='ProjectExplorer::PanelsWidget' visible='1' window=':Qt Creator_Core::Internal::MainWindow'}
 :Qt Creator.splitter_QSplitter	{name='splitter' type='QSplitter' visible='1' window=':Qt Creator_Core::Internal::MainWindow'}

tests/system/shared/project.py

@@ -31,9 +31,9 @@ def openQbsProject(projectPath):
 def openQmakeProject(projectPath, targets=Targets.desktopTargetClasses(), fromWelcome=False):
     cleanUpUserFiles(projectPath)
     if fromWelcome:
-        wsButtonFrame, wsButtonLabel = getWelcomeScreenMainButton('Open Project')
+        wsButtonFrame, wsButtonLabel = getWelcomeScreenMainButton('Open')
         if not all((wsButtonFrame, wsButtonLabel)):
-            test.fatal("Could not find 'Open Project' button on Welcome Page.")
+            test.fatal("Could not find 'Open' button on Welcome Page.")
             return []
         mouseClick(wsButtonLabel)
     else:
@@ -79,9 +79,9 @@ def openCmakeProject(projectPath, buildDir):
 # this list can be used in __chooseTargets__()
 def __createProjectOrFileSelectType__(category, template, fromWelcome = False, isProject=True):
     if fromWelcome:
-        wsButtonFrame, wsButtonLabel = getWelcomeScreenMainButton("New Project")
+        wsButtonFrame, wsButtonLabel = getWelcomeScreenMainButton("New")
         if not all((wsButtonFrame, wsButtonLabel)):
-            test.fatal("Could not find 'New Project' button on Welcome Page")
+            test.fatal("Could not find 'New' button on Welcome Page")
             return []
         mouseClick(wsButtonLabel)
     else:

tests/system/shared/welcome.py

@@ -46,16 +46,14 @@ def getWelcomeScreenSideBarButton(buttonLabel, isUrlButton = False):
     return __getWelcomeScreenButtonHelper__(buttonLabel, sideBar, isUrlButton)
 
 def getWelcomeScreenMainButton(buttonLabel):
-    stackedWidget = waitForObject("{type='QStackedWidget' name='WelcomeScreenStackedWidget' "
+    stackedWidget = waitForObject(":Qt Creator.WelcomeScreenStackedWidget")
-                                  "window=':Qt Creator_Core::Internal::MainWindow'}")
     currentStackWidget = stackedWidget.currentWidget()
     return __getWelcomeScreenButtonHelper__(buttonLabel, currentStackWidget)
 
 def getWelcomeTreeView(treeViewLabel):
     try:
-        return waitForObject("{aboveWidget={text='%s' type='QLabel' unnamed='1' visible='1' "
+        return waitForObjectExists("{container=':Qt Creator.WelcomeScreenStackedWidget' "
-                             "window=':Qt Creator_Core::Internal::MainWindow'} "
+                                   "name='%s' type='QTreeView' visible='1'}" % treeViewLabel)
-                             "type='QTreeView' unnamed='1' visible='1'}" % treeViewLabel)
     except:
         return None