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

Squish: Enable Qt5 for suite_qtquick test cases

Browse Source 
Change-Id: I84caf3b4c47badcf444242b6fbc52090ccb5680a
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
This commit is contained in:
Christian Stenger
2013-08-26 11:31:37 +02:00
parent 1cecc5b0f7
commit 8ff61e3036
4 changed files with 105 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
tests/system/suite_qtquick/tst_qtquick_creation/test.py
View File

@@ -33,11 +33,13 @@ def main():
startApplication("qtcreator" + SettingsPath)
if not startedWithoutPluginError():
return
for targ, qVer in {Targets.DESKTOP_480_GCC:1, Targets.DESKTOP_501_DEFAULT:2}.items():
# using a temporary directory won't mess up a potentially existing
workingDir = tempDir()
checkedTargets, projectName = createNewQtQuickApplication(workingDir,
targets = Targets.DESKTOP_474_GCC)
test.log("Building project")
checkedTargets, projectName = createNewQtQuickApplication(workingDir, targets=targ,
qtQuickVersion=qVer)
test.log("Building project Qt Quick %d Application (%s)"
% (qVer, Targets.getStringForTarget(targ)))
result = modifyRunSettingsForHookInto(projectName, len(checkedTargets), 11223)
invokeMenuItem("Build", "Build All")
waitForSignal("{type='ProjectExplorer::BuildManager' unnamed='1'}", "buildQueueFinished(bool)")
@@ -59,6 +61,7 @@ def main():
result = runAndCloseApp()
if result:
logApplicationOutput()
invokeMenuItem("File", "Close All Projects and Editors")
invokeMenuItem("File", "Exit")

21
tests/system/suite_qtquick/tst_qtquick_creation2/test.py
View File

@@ -30,19 +30,27 @@
source("../../shared/qtcreator.py")
def main():
sourceExample = os.path.abspath(sdkPath + "/Examples/4.7/declarative/text/textselection")
qmlFile = os.path.join("qml", "textselection.qml")
if not neededFilePresent(os.path.join(sourceExample, qmlFile)):
sourceExampleQt4 = os.path.join(sdkPath, "Examples", "4.7", "declarative", "text",
"textselection", "qml", "textselection.qml")
sourceExampleQt5 = os.path.join(qt5SDKPath(), "examples", "quick", "text", "textselection",
"textselection.qml")
if not neededFilePresent(sourceExampleQt4):
return
if not neededFilePresent(sourceExampleQt5):
return
startApplication("qtcreator" + SettingsPath)
if not startedWithoutPluginError():
return
targetsAndQuickVersion = {Targets.DESKTOP_480_GCC:[1, sourceExampleQt4],
Targets.DESKTOP_501_DEFAULT:[2, sourceExampleQt5]}
for targ, qVerAndEx in targetsAndQuickVersion.items():
# using a temporary directory won't mess up a potentially existing
workingDir = tempDir()
checkedTargets, projectName = createNewQtQuickApplication(workingDir, None,
os.path.join(prepareTemplate(sourceExample), qmlFile),
Targets.DESKTOP_474_GCC)
test.log("Building project")
qVerAndEx[1],
targ, qVerAndEx[0])
test.log("Building project Qt Quick %d Application (%s)"
% (qVerAndEx[0], Targets.getStringForTarget(targ)))
result = modifyRunSettingsForHookInto(projectName, len(checkedTargets), 11223)
invokeMenuItem("Build","Build All")
waitForSignal("{type='ProjectExplorer::BuildManager' unnamed='1'}", "buildQueueFinished(bool)")
@@ -64,6 +72,7 @@ def main():
result = runAndCloseApp()
if result:
logApplicationOutput()
invokeMenuItem("File", "Close All Projects and Editors")
invokeMenuItem("File", "Exit")
def subprocessFunction():

12
tests/system/suite_qtquick/tst_qtquick_creation3/test.py
View File

@@ -33,15 +33,18 @@ def main():
startApplication("qtcreator" + SettingsPath)
if not startedWithoutPluginError():
return
for quickVersion in [1, 2]:
# using a temporary directory won't mess up a potentially existing
workingDir = tempDir()
projectName = createNewQtQuickUI(workingDir)
test.log("Running project")
projectName = createNewQtQuickUI(workingDir, quickVersion)
test.log("Running project Qt Quick %d UI" % quickVersion)
# TODO replace this quickfix with a proper identification of kits
# changes to createNewQtQuickUI(...) after fixing QTCREATORBUG-8704 will probably handle this
kitCount = 2
if platform.system() in ('Windows', 'Microsoft'):
kitCount = 1
if quickVersion == 1:
kitCount = 3
if platform.system() in ('Windows', 'Microsoft'):
kitCount = 4
qmlViewer = modifyRunSettingsForHookIntoQtQuickUI(kitCount, workingDir, projectName, 11223)
if qmlViewer!=None:
qmlViewerPath = os.path.dirname(qmlViewer)
@@ -58,4 +61,5 @@ def main():
result = runAndCloseApp(sType=SubprocessType.QT_QUICK_UI)
if result:
logApplicationOutput()
invokeMenuItem("File", "Close All Projects and Editors")
invokeMenuItem("File", "Exit")

7
tests/system/suite_qtquick/tst_qtquick_creation4/test.py
View File

@@ -33,13 +33,16 @@ def main():
startApplication("qtcreator" + SettingsPath)
if not startedWithoutPluginError():
return
for targ, quickVer in {Targets.DESKTOP_480_GCC:1, Targets.DESKTOP_501_DEFAULT:2}.items():
# using a temporary directory won't mess up a potentially existing
createNewQmlExtension(tempDir())
createNewQmlExtension(tempDir(), targ, quickVer)
# wait for parsing to complete
progressBarWait(30000)
test.log("Building project")
test.log("Building project Qt Quick %d Extension Plugin (%s)"
% (quickVer, Targets.getStringForTarget(targ)))
invokeMenuItem("Build","Build All")
waitForSignal("{type='ProjectExplorer::BuildManager' unnamed='1'}", "buildQueueFinished(bool)")
checkCompile()
checkLastBuild()
invokeMenuItem("File", "Close All Projects and Editors")
invokeMenuItem("File", "Exit")