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

Squish: Fix remaining WELP tests for Qt 5.5

Browse Source 
Change-Id: Ibe0df94d833ac2a10d43884ada3c1fe3d5de0b98
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
This commit is contained in:
Robert Loehning
2015-07-27 16:14:08 +02:00
parent bbb260093a
commit c70502d691
5 changed files with 54 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/system/objects.map
-2
View File
@@ -60,7 +60,6 @@
:Compiler:_QLabel {container=':qt_tabwidget_stackedwidget_QWidget' text='Compiler:' type='QLabel' unnamed='1' visible='1'}
:Core__Internal__GeneralSettings.User Interface_QGroupBox {container=':qt_tabwidget_stackedwidget.Core__Internal__GeneralSettings_QWidget' name='interfaceBox' title='User Interface' type='QGroupBox' visible='1'}
:CppTools__Internal__CompletionSettingsPage.Behavior_QGroupBox {container=':qt_tabwidget_stackedwidget.CppTools__Internal__CompletionSettingsPage_QWidget' name='groupBox' title='Behavior' type='QGroupBox' visible='1'}
:CreateProject_QStyleItem {clip='false' container=':WelcomePageStyledBar.WelcomePage_QQuickView' enabled='true' text='New Project' type='Button' unnamed='1' visible='true'}
:DebugModeWidget.Breakpoints_QDockWidget {container=':Qt Creator.DebugModeWidget_QSplitter' name='Debugger.Docks.Break' type='QDockWidget' visible='1' windowTitle='Breakpoints'}
:DebugModeWidget.Debugger Log_QDockWidget {container=':Qt Creator.DebugModeWidget_QSplitter' name='Debugger.Docks.Output' type='QDockWidget' visible='1' windowTitle='Debugger Log'}
:DebugModeWidget.Debugger Toolbar_QDockWidget {container=':Qt Creator.DebugModeWidget_QSplitter' name='Debugger Toolbar' type='QDockWidget' visible='1' windowTitle='Debugger Toolbar'}
@@ -116,7 +115,6 @@
:New_Core::Internal::NewDialog {name='Core__Internal__NewDialog' type='Core::Internal::NewDialog' visible='1' windowTitle?='New*'}
:Next_QPushButton {text~='(Next.*|Continue)' type='QPushButton' visible='1'}
:OpenDocuments_Widget {type='Core::Internal::OpenEditorsWidget' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow' windowTitle='Open Documents'}
:OpenProject_QStyleItem {clip='false' container=':WelcomePageStyledBar.WelcomePage_QQuickView' enabled='true' text='Open Project' type='Button' unnamed='1' visible='true'}
:Options.Cancel_QPushButton {text='Cancel' type='QPushButton' unnamed='1' visible='1' window=':Options_Core::Internal::SettingsDialog'}
:Options.OK_QPushButton {text='OK' type='QPushButton' unnamed='1' visible='1' window=':Options_Core::Internal::SettingsDialog'}
:Options.qt_tabwidget_stackedwidget_QStackedWidget {name='qt_tabwidget_stackedwidget' type='QStackedWidget' visible='1' window=':Options_Core::Internal::SettingsDialog'}
tests/system/shared/project.py
+14 -2
View File
@@ -39,7 +39,13 @@ def openQbsProject(projectPath):
def openQmakeProject(projectPath, targets=Targets.desktopTargetClasses(), fromWelcome=False):
cleanUpUserFiles(projectPath)
if fromWelcome:
mouseClick(waitForObject(":OpenProject_QStyleItem"), 5, 5, 0, Qt.LeftButton)
if isQt54Build:
welcomePage = ":WelcomePageStyledBar.WelcomePage_QQuickView"
else:
welcomePage = ":Qt Creator.WelcomePage_QQuickWidget"
mouseClick(waitForObject("{clip='false' container='%s' enabled='true' text='Open Project' "
"type='Button' unnamed='1' visible='true'}" % welcomePage),
5, 5, 0, Qt.LeftButton)
else:
invokeMenuItem("File", "Open File or Project...")
selectFromFileDialog(projectPath)
@@ -94,7 +100,13 @@ def __handleCmakeWizardPage__():
# this list can be used in __chooseTargets__()
def __createProjectOrFileSelectType__(category, template, fromWelcome = False, isProject=True):
if fromWelcome:
mouseClick(waitForObject(":CreateProject_QStyleItem"), 5, 5, 0, Qt.LeftButton)
if isQt54Build:
welcomePage = ":WelcomePageStyledBar.WelcomePage_QQuickView"
else:
welcomePage = ":Qt Creator.WelcomePage_QQuickWidget"
mouseClick(waitForObject("{clip='false' container='%s' enabled='true' text='New Project' "
"type='Button' unnamed='1' visible='true'}" % welcomePage),
5, 5, 0, Qt.LeftButton)
else:
invokeMenuItem("File", "New File or Project...")
categoriesView = waitForObject(":New.templateCategoryView_QTreeView")
tests/system/suite_WELP/tst_WELP02/test.py
+9 -9
View File
@@ -31,11 +31,14 @@
source("../../shared/qtcreator.py")
source("../../shared/suites_qtta.py")
if isQt54Build:
welcomePage = ":WelcomePageStyledBar.WelcomePage_QQuickView"
else:
welcomePage = ":Qt Creator.WelcomePage_QQuickWidget"
def checkTypeAndProperties(typePropertiesDetails):
for (qType, props, detail) in typePropertiesDetails:
test.verify(checkIfObjectExists(getQmlItem(qType,
":WelcomePageStyledBar.WelcomePage_QQuickView",
False, props)),
test.verify(checkIfObjectExists(getQmlItem(qType, welcomePage, False, props)),
"Verifying: Qt Creator displays %s." % detail)
def main():
@@ -85,13 +88,10 @@ def main():
"Verifying: The project is opened in 'Edit' mode after configuring.")
# go to "Welcome page" again and check if there is an information about recent projects
switchViewTo(ViewConstants.WELCOME)
test.verify(checkIfObjectExists(getQmlItem("LinkedText",
":WelcomePageStyledBar.WelcomePage_QQuickView",
False,
test.verify(checkIfObjectExists(getQmlItem("LinkedText", welcomePage, False,
"text='propertyanimation' id='projectNameText'")) and
checkIfObjectExists(getQmlItem("LinkedText",
":WelcomePageStyledBar.WelcomePage_QQuickView",
False, "text='SampleApp' id='projectNameText'")),
checkIfObjectExists(getQmlItem("LinkedText", welcomePage, False,
"text='SampleApp' id='projectNameText'")),
"Verifying: 'Welcome page' displays information about recently created and "
"opened projects.")
# exit Qt Creator
tests/system/suite_WELP/tst_WELP03/test.py
+16 -13
View File
@@ -50,6 +50,10 @@ def main():
test.log("Welcome mode is not scriptable with this Squish version")
return
global sdkPath
if isQt54Build:
welcomePage = ":WelcomePageStyledBar.WelcomePage_QQuickView"
else:
welcomePage = ":Qt Creator.WelcomePage_QQuickWidget"
# open Qt Creator
startApplication("qtcreator" + SettingsPath)
if not startedWithoutPluginError():
@@ -59,7 +63,7 @@ def main():
qchs.extend([os.path.join(p, "qtopengl.qch"), os.path.join(p, "qtwidgets.qch")])
addHelpDocumentation(qchs)
setAlwaysStartFullHelp()
getStartedNow = getQmlItem("Button", ":WelcomePageStyledBar.WelcomePage_QQuickView", False,
getStartedNow = getQmlItem("Button", welcomePage, False,
"text='Get Started Now' id='gettingStartedButton'")
if not test.verify(checkIfObjectExists(getStartedNow),
"Verifying: Qt Creator displays Welcome Page with Getting Started."):
@@ -67,11 +71,9 @@ def main():
invokeMenuItem("File", "Exit")
return
# select "Examples" topic
mouseClick(waitForObject(getQmlItem("Button", ":WelcomePageStyledBar.WelcomePage_QQuickView",
False, "text='Examples'")), 5, 5, 0, Qt.LeftButton)
test.verify(checkIfObjectExists(getQmlItem("Text",
":WelcomePageStyledBar.WelcomePage_QQuickView",
False, "text='Examples'")),
mouseClick(waitForObject(getQmlItem("Button", welcomePage, False, "text='Examples'")),
5, 5, 0, Qt.LeftButton)
test.verify(checkIfObjectExists(getQmlItem("Text", welcomePage, False, "text='Examples'")),
"Verifying: 'Examples' topic is opened and the examples are shown.")
basePath = "opengl/2dpainting/2dpainting.pro"
qt4Exmpl = os.path.join(sdkPath, "Examples", "4.7", basePath)
@@ -83,19 +85,18 @@ def main():
cleanUpUserFiles(proFiles)
for p in proFiles:
removePackagingDirectory(os.path.dirname(p))
examplesLineEdit = getQmlItem("TextField", ":WelcomePageStyledBar.WelcomePage_QQuickView",
examplesLineEdit = getQmlItem("TextField", welcomePage,
False, "id='lineEdit' placeholderText='Search in Examples...'")
mouseClick(waitForObject(examplesLineEdit), 5, 5, 0, Qt.LeftButton)
test.log("Using examples from Kit %s."
% (waitForObject(getQmlItem("ComboBox", ":WelcomePageStyledBar.WelcomePage_QQuickView",
% (waitForObject(getQmlItem("ComboBox", welcomePage,
False, "id='comboBox'")).currentText))
replaceEditorContent(waitForObject(examplesLineEdit), "qwerty")
test.verify(checkIfObjectExists(getQmlItem("Delegate",
":WelcomePageStyledBar.WelcomePage_QQuickView",
test.verify(checkIfObjectExists(getQmlItem("Delegate", welcomePage,
False, "id='delegate' radius='0' caption~='.*'"),
False), "Verifying: No example is shown.")
replaceEditorContent(waitForObject(examplesLineEdit), "2d painting")
twoDPainting = getQmlItem("Delegate", ":WelcomePageStyledBar.WelcomePage_QQuickView",
twoDPainting = getQmlItem("Delegate", welcomePage,
False, "id='delegate' radius='0' caption~='2D Painting.*'")
test.verify(checkIfObjectExists(twoDPainting),
"Verifying: Example (2D Painting) is shown.")
@@ -132,8 +133,10 @@ def main():
cleanUpUserFiles(proFiles)
for p in proFiles:
removePackagingDirectory(os.path.dirname(p))
replaceEditorContent(waitForObject(examplesLineEdit), "address book")
addressBook = getQmlItem("Delegate", ":WelcomePageStyledBar.WelcomePage_QQuickView",
examplesLineEditWidget = waitForObject(examplesLineEdit)
mouseClick(examplesLineEditWidget)
replaceEditorContent(examplesLineEditWidget, "address book")
addressBook = getQmlItem("Delegate", welcomePage,
False, "id='delegate' radius='0' caption~='Address Book.*'")
test.verify(checkIfObjectExists(addressBook), "Verifying: Example (address book) is shown.")
mouseClick(waitForObject(addressBook), 5, 5, 0, Qt.LeftButton)
tests/system/suite_WELP/tst_WELP04/test.py
+15 -12
View File
@@ -35,11 +35,15 @@ def main():
if not canTestEmbeddedQtQuick():
test.log("Welcome mode is not scriptable with this Squish version")
return
if isQt54Build:
welcomePage = ":WelcomePageStyledBar.WelcomePage_QQuickView"
else:
welcomePage = ":Qt Creator.WelcomePage_QQuickWidget"
# open Qt Creator
startApplication("qtcreator" + SettingsPath)
if not startedWithoutPluginError():
return
getStarted = getQmlItem("Button", ":WelcomePageStyledBar.WelcomePage_QQuickView", False,
getStarted = getQmlItem("Button", welcomePage, False,
"text='Get Started Now' id='gettingStartedButton'")
if not test.verify(checkIfObjectExists(getStarted),
"Verifying: Qt Creator displays Welcome Page with Get Started Now button."):
@@ -47,22 +51,20 @@ def main():
invokeMenuItem("File", "Exit")
return
# select "Tutorials"
mouseClick(waitForObject(getQmlItem("Button", ":WelcomePageStyledBar.WelcomePage_QQuickView",
False, "text='Tutorials'")), 5, 5, 0, Qt.LeftButton)
searchTut = getQmlItem("TextField", ":WelcomePageStyledBar.WelcomePage_QQuickView", False,
mouseClick(waitForObject(getQmlItem("Button", welcomePage, False, "text='Tutorials'")),
5, 5, 0, Qt.LeftButton)
searchTut = getQmlItem("TextField", welcomePage, False,
"placeholderText='Search in Tutorials...' id='lineEdit'")
mouseClick(waitForObject(searchTut), 5, 5, 0, Qt.LeftButton)
replaceEditorContent(waitForObject(searchTut), "qwerty")
test.verify(checkIfObjectExists(getQmlItem("Text",
":WelcomePageStyledBar.WelcomePage_QQuickView",
test.verify(checkIfObjectExists(getQmlItem("Text", welcomePage,
False, "text='Tutorials'")) and
checkIfObjectExists(getQmlItem("Delegate",
":WelcomePageStyledBar.WelcomePage_QQuickView",
checkIfObjectExists(getQmlItem("Delegate", welcomePage,
False, "id='delegate' radius='0' caption~='.*'"),
False),
"Verifying: 'Tutorials' topic is opened and nothing is shown.")
replaceEditorContent(waitForObject(searchTut), "building and running an example application")
bldRunExmpl = getQmlItem("Delegate", ":WelcomePageStyledBar.WelcomePage_QQuickView", False,
bldRunExmpl = getQmlItem("Delegate", welcomePage, False,
"caption='Building and Running an Example Application' "
"id='delegate' radius='0'")
test.verify(checkIfObjectExists(bldRunExmpl), "Verifying: Expected Text tutorial is shown.")
@@ -74,9 +76,10 @@ def main():
# close help widget again to avoid focus issues
sendEvent("QCloseEvent", waitForObject(":Help Widget_Help::Internal::HelpWidget"))
# check a demonstration video link
replaceEditorContent(waitForObject(searchTut), "embedded device")
test.verify(checkIfObjectExists(getQmlItem("Delegate",
":WelcomePageStyledBar.WelcomePage_QQuickView",
searchTutWidget = waitForObject(searchTut)
mouseClick(searchTutWidget)
replaceEditorContent(searchTutWidget, "embedded device")
test.verify(checkIfObjectExists(getQmlItem("Delegate", welcomePage,
False, "id='delegate' radius='0' caption="
"'Device Creation with Qt'")),
"Verifying: Link to the expected demonstration video exists.")