Commit c79d8b32 authored by Robert Loehning's avatar Robert Loehning Committed by Robert Löhning

Squish: Some more reuse of code

Change-Id: I3d4e7c0b9d8afc31fb5cfa2bc7879ea999129158
Reviewed-by: default avatarBill King <bill.king@nokia.com>
Reviewed-by: default avatarChristian Stenger <christian.stenger@nokia.com>
parent 28668eea
......@@ -95,12 +95,7 @@ def __createProjectHandleLastPage__(expectedFiles = None):
def createProject_Qt_GUI(path, projectName, qtVersion, checks):
__createProjectSelectType__("Qt Widget Project", "Qt Gui Application")
__createProjectSetNameAndPath__(path, projectName, checks)
desktopCheckbox = waitForObject(":scrollArea.Desktop_QCheckBox", 20000)
if checks:
test.compare(desktopCheckbox.text, "Desktop")
if not desktopCheckbox.checked:
clickButton(desktopCheckbox)
__chooseTargets__()
selectFromCombo(":scrollArea.Create Build Configurations:_QComboBox_2", "For One Qt Version One Debug And One Release")
selectFromCombo(":scrollArea.Qt Version:_QComboBox", qtVersion.replace(".", "\\."))
if checks:
......
......@@ -105,7 +105,11 @@ def runAndCloseApp():
# the following is currently a work-around for not using hooking into subprocesses
if (waitForObject(":Qt Creator_Core::Internal::OutputPaneToggleButton").checked!=True):
clickButton(":Qt Creator_Core::Internal::OutputPaneToggleButton")
clickButton(":Qt Creator.Stop_QToolButton")
playButton = verifyEnabled(":Qt Creator.ReRun_QToolButton", False)
stopButton = verifyEnabled(":Qt Creator.Stop_QToolButton")
clickButton(stopButton)
test.verify(playButton.enabled)
test.compare(stopButton.enabled, False)
return True
def runAndCloseQtQuickUI():
......
......@@ -6,13 +6,7 @@ project = "SquishProject"
def main():
startApplication("qtcreator" + SettingsPath)
createProject_Qt_GUI(projectsPath, project, defaultQtVersion, True)
clickButton(verifyEnabled(":*Qt Creator.Run_Core::Internal::FancyToolButton"))
waitForSignal("{type='ProjectExplorer::BuildManager' unnamed='1'}", "buildQueueFinished(bool)")
playButton = verifyEnabled(":Qt Creator.ReRun_QToolButton", False)
stopButton = verifyEnabled(":Qt Creator.Stop_QToolButton")
clickButton(stopButton)
test.verify(playButton.enabled)
test.compare(stopButton.enabled, False)
runAndCloseApp()
sendEvent("QCloseEvent", waitForObject(":Qt Creator_Core::Internal::MainWindow"))
waitForCleanShutdown()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment