feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Squish: Update testing ProjectWelcomePage

Browse Source 
Used by tst_session_handling and tst_WELP02.

Change-Id: I28bdececac39719372834c373f82ac9e99beb613
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
Robert Loehning
2019-10-31 17:40:16 +01:00
parent 096147d96d
commit cf3772ca77
4 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/plugins/projectexplorer/projectwelcomepage.cpp
View File

@@ -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);

1
tests/system/objects.map
View File

@@ -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'}

8
tests/system/shared/project.py
View File

@@ -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:

8
tests/system/shared/welcome.py
View File

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