Commit b58dadfe authored by Robert Loehning's avatar Robert Loehning

Squish: Enclose code model tests in sections

Change-Id: I4478acfc5ea7b3fa22d1cd17576e04fdda81dbb9
Reviewed-by: Christian Stenger's avatarChristian Stenger <christian.stenger@qt.io>
parent 2760b9fc
...@@ -2,7 +2,7 @@ Prerequisites - general information ...@@ -2,7 +2,7 @@ Prerequisites - general information
----------------------------------- -----------------------------------
Squish tests inside this folder have several prerequisites to get them running. Squish tests inside this folder have several prerequisites to get them running.
First - and most important - you have to own a valid Squish license. Currently it's recommended to use Squish 6.0. First - and most important - you have to own a valid Squish license. At least Squish 6.0 is required.
Second - some of the test suites/test cases expect a build of Qt 4.8.7 to be available: Second - some of the test suites/test cases expect a build of Qt 4.8.7 to be available:
1. Download the source code from: 1. Download the source code from:
......
...@@ -61,11 +61,13 @@ def __openCodeModelOptions__(): ...@@ -61,11 +61,13 @@ def __openCodeModelOptions__():
clickItem(":Options_QListView", "C++", 14, 15, 0, Qt.LeftButton) clickItem(":Options_QListView", "C++", 14, 15, 0, Qt.LeftButton)
clickOnTab(":Options.qt_tabwidget_tabbar_QTabBar", "Code Model") clickOnTab(":Options.qt_tabwidget_tabbar_QTabBar", "Code Model")
def checkCodeModelSettings(useClang): def getCodeModelString(useClang):
codeModelName = "built-in" codeModelName = "built-in"
if useClang: if useClang:
codeModelName = "Clang" codeModelName = "Clang"
test.log("Testing code model: %s" % codeModelName) return "Testing code model: %s" % codeModelName
def checkCodeModelSettings(useClang):
__openCodeModelOptions__() __openCodeModelOptions__()
test.verify(verifyChecked("{name='ignorePCHCheckBox' type='QCheckBox' visible='1'}"), test.verify(verifyChecked("{name='ignorePCHCheckBox' type='QCheckBox' visible='1'}"),
"Verifying whether 'Ignore pre-compiled headers' is checked by default.") "Verifying whether 'Ignore pre-compiled headers' is checked by default.")
......
...@@ -231,3 +231,13 @@ class Qt5Path: ...@@ -231,3 +231,13 @@ class Qt5Path:
path = "Docs/Qt-5.%d" % qtMinorVersion path = "Docs/Qt-5.%d" % qtMinorVersion
return os.path.join(Qt5Path.__createPlatformQtPath__(qtMinorVersion), path) return os.path.join(Qt5Path.__createPlatformQtPath__(qtMinorVersion), path)
class TestSection:
def __init__(self, description):
self.description = description
def __enter__(self):
test.startSection(self.description)
def __exit__(self, exc_type, exc_value, traceback):
test.endSection()
...@@ -44,6 +44,7 @@ def triggerCompletion(editorWidget): ...@@ -44,6 +44,7 @@ def triggerCompletion(editorWidget):
# entry of test # entry of test
def main(): def main():
for useClang in [False, True]: for useClang in [False, True]:
with TestSection(getCodeModelString(useClang)):
if not startCreator(useClang): if not startCreator(useClang):
continue continue
# create qt quick application # create qt quick application
......
...@@ -28,6 +28,7 @@ source("../../shared/qtcreator.py") ...@@ -28,6 +28,7 @@ source("../../shared/qtcreator.py")
# entry of test # entry of test
def main(): def main():
for useClang in [False, True]: for useClang in [False, True]:
with TestSection(getCodeModelString(useClang)):
if not startCreator(useClang): if not startCreator(useClang):
continue continue
# create qt quick application # create qt quick application
......
...@@ -76,6 +76,7 @@ def main(): ...@@ -76,6 +76,7 @@ def main():
"do while" : ["", "int dummy = 0;", "do", "++dummy;", "while (dummy < 10);"] "do while" : ["", "int dummy = 0;", "do", "++dummy;", "while (dummy < 10);"]
} }
for useClang in [False, True]: for useClang in [False, True]:
with TestSection(getCodeModelString(useClang)):
if not startCreator(useClang): if not startCreator(useClang):
continue continue
projectName = createNewNonQtProject() projectName = createNewNonQtProject()
......
...@@ -36,6 +36,7 @@ def main(): ...@@ -36,6 +36,7 @@ def main():
templateDir = prepareTemplate(sourceExample) templateDir = prepareTemplate(sourceExample)
examplePath = os.path.join(templateDir, proFile) examplePath = os.path.join(templateDir, proFile)
for useClang in [False, True]: for useClang in [False, True]:
with TestSection(getCodeModelString(useClang)):
if not startCreator(useClang): if not startCreator(useClang):
continue continue
# open example project # open example project
......
...@@ -36,6 +36,7 @@ def main(): ...@@ -36,6 +36,7 @@ def main():
templateDir = prepareTemplate(sourceExample) templateDir = prepareTemplate(sourceExample)
examplePath = os.path.join(templateDir, proFile) examplePath = os.path.join(templateDir, proFile)
for useClang in [False, True]: for useClang in [False, True]:
with TestSection(getCodeModelString(useClang)):
if not startCreator(useClang): if not startCreator(useClang):
continue continue
# open example project # open example project
......
...@@ -162,6 +162,7 @@ def main(): ...@@ -162,6 +162,7 @@ def main():
templateDir = prepareTemplate(examplePath) templateDir = prepareTemplate(examplePath)
examplePath = os.path.join(templateDir, "cplusplus-tools.pro") examplePath = os.path.join(templateDir, "cplusplus-tools.pro")
for useClang in [False, True]: for useClang in [False, True]:
with TestSection(getCodeModelString(useClang)):
if not startCreator(useClang): if not startCreator(useClang):
continue continue
openQmakeProject(examplePath, [Targets.DESKTOP_531_DEFAULT]) openQmakeProject(examplePath, [Targets.DESKTOP_531_DEFAULT])
......
...@@ -27,6 +27,7 @@ source("../../shared/qtcreator.py") ...@@ -27,6 +27,7 @@ source("../../shared/qtcreator.py")
def main(): def main():
for useClang in [False, True]: for useClang in [False, True]:
with TestSection(getCodeModelString(useClang)):
if not startCreator(useClang): if not startCreator(useClang):
continue continue
createProject_Qt_Console(tempDir(), "SquishProject") createProject_Qt_Console(tempDir(), "SquishProject")
......
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