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

Squish: Update tst_create_proj_wizard

Browse Source 
Change-Id: If6c85dab873fac694e3d0bea3ff65cbb08618f4d
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
Robert Loehning
2017-09-05 17:49:43 +02:00
parent 898eb4a460
commit f98731b81a
1 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
tests/system/suite_general/tst_create_proj_wizard/test.py
View File

@@ -27,10 +27,8 @@ source("../../shared/qtcreator.py")
def main(): def main():
global tmpSettingsDir, availableBuildSystems global tmpSettingsDir, availableBuildSystems
qtVersionsForQuick = ["5.3"] qtVersionsForQuick = ["5.6"]
availableBuildSystems = ["qmake", "Qbs"] availableBuildSystems = ["qmake", "Qbs"]
if platform.system() != 'Darwin':
qtVersionsForQuick.append("5.4")
if which("cmake"): if which("cmake"):
availableBuildSystems.append("CMake") availableBuildSystems.append("CMake")
else: else:
@@ -73,7 +71,7 @@ def main():
category = current.keys()[0] category = current.keys()[0]
template = current.values()[0] template = current.values()[0]
displayedPlatforms = __createProject__(category, template) displayedPlatforms = __createProject__(category, template)
if template == "Qt Quick Application" or template == "Qt Quick Controls Application": if template.startswith("Qt Quick Application - "):
for counter, qtVersion in enumerate(qtVersionsForQuick): for counter, qtVersion in enumerate(qtVersionsForQuick):
def additionalFunc(displayedPlatforms, qtVersion): def additionalFunc(displayedPlatforms, qtVersion):
requiredQtVersion = __createProjectHandleQtQuickSelection__(qtVersion) requiredQtVersion = __createProjectHandleQtQuickSelection__(qtVersion)
@@ -84,11 +82,6 @@ def main():
if counter < len(qtVersionsForQuick) - 1: if counter < len(qtVersionsForQuick) - 1:
displayedPlatforms = __createProject__(category, template) displayedPlatforms = __createProject__(category, template)
continue continue
elif template == "Qt Quick Controls 2 Application": # needs a Qt5.7
def additionalFunc(displayedPlatforms):
clickButton(waitForObject(":Next_QPushButton")) # ignore this details page for now
handleBuildSystemVerifyKits(category, template, kits, displayedPlatforms, additionalFunc)
continue
elif template.startswith("Plain C"): elif template.startswith("Plain C"):
handleBuildSystemVerifyKits(category, template, kits, displayedPlatforms) handleBuildSystemVerifyKits(category, template, kits, displayedPlatforms)
continue continue
@@ -139,7 +132,11 @@ def handleBuildSystemVerifyKits(category, template, kits, displayedPlatforms,
test.log("Using build system '%s'" % buildSystem) test.log("Using build system '%s'" % buildSystem)
selectFromCombo(combo, buildSystem) selectFromCombo(combo, buildSystem)
clickButton(waitForObject(":Next_QPushButton")) clickButton(waitForObject(":Next_QPushButton"))
if specialHandlingFunc: if (template.startswith("Qt Quick Application - ")
and template != "Qt Quick Application - Empty"):
test.warning("No suitable Qt version available for '%s'" % template)
clickButton(waitForObject(":Next_QPushButton"))
elif specialHandlingFunc:
specialHandlingFunc(displayedPlatforms, *args) specialHandlingFunc(displayedPlatforms, *args)
verifyKitCheckboxes(kits, displayedPlatforms) verifyKitCheckboxes(kits, displayedPlatforms)
safeClickButton("Cancel") safeClickButton("Cancel")