Squish: Enclose code model tests in sections

Change-Id: I4478acfc5ea7b3fa22d1cd17576e04fdda81dbb9
Reviewed-by: Christian Stenger <christian.stenger@qt.io>

tests/system/README

@@ -2,7 +2,7 @@ Prerequisites - general information
 -----------------------------------
 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:
  1. Download the source code from:

tests/system/shared/clang.py

@@ -61,11 +61,13 @@ def __openCodeModelOptions__():
     clickItem(":Options_QListView", "C++", 14, 15, 0, Qt.LeftButton)
     clickOnTab(":Options.qt_tabwidget_tabbar_QTabBar", "Code Model")
 
-def checkCodeModelSettings(useClang):
+def getCodeModelString(useClang):
     codeModelName = "built-in"
     if useClang:
         codeModelName = "Clang"
-    test.log("Testing code model: %s" % codeModelName)
+    return "Testing code model: %s" % codeModelName
+
+def checkCodeModelSettings(useClang):
     __openCodeModelOptions__()
     test.verify(verifyChecked("{name='ignorePCHCheckBox' type='QCheckBox' visible='1'}"),
                 "Verifying whether 'Ignore pre-compiled headers' is checked by default.")

tests/system/shared/classes.py

@@ -231,3 +231,13 @@ class Qt5Path:
             path = "Docs/Qt-5.%d" % qtMinorVersion
 
         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()

tests/system/suite_CSUP/tst_CSUP01/test.py

@@ -44,6 +44,7 @@ def triggerCompletion(editorWidget):
 # entry of test
 def main():
     for useClang in [False, True]:
+        with TestSection(getCodeModelString(useClang)):
             if not startCreator(useClang):
                 continue
             # create qt quick application

tests/system/suite_CSUP/tst_CSUP02/test.py

@@ -28,6 +28,7 @@ source("../../shared/qtcreator.py")
 # entry of test
 def main():
     for useClang in [False, True]:
+        with TestSection(getCodeModelString(useClang)):
             if not startCreator(useClang):
                 continue
             # create qt quick application

tests/system/suite_CSUP/tst_CSUP03/test.py

@@ -76,6 +76,7 @@ def main():
             "do while" : ["", "int dummy = 0;", "do", "++dummy;", "while (dummy < 10);"]
             }
     for useClang in [False, True]:
+        with TestSection(getCodeModelString(useClang)):
             if not startCreator(useClang):
                 continue
             projectName = createNewNonQtProject()

tests/system/suite_CSUP/tst_CSUP04/test.py

@@ -36,6 +36,7 @@ def main():
     templateDir = prepareTemplate(sourceExample)
     examplePath = os.path.join(templateDir, proFile)
     for useClang in [False, True]:
+        with TestSection(getCodeModelString(useClang)):
             if not startCreator(useClang):
                 continue
             # open example project

tests/system/suite_CSUP/tst_CSUP05/test.py

@@ -36,6 +36,7 @@ def main():
     templateDir = prepareTemplate(sourceExample)
     examplePath = os.path.join(templateDir, proFile)
     for useClang in [False, True]:
+        with TestSection(getCodeModelString(useClang)):
             if not startCreator(useClang):
                 continue
             # open example project

tests/system/suite_CSUP/tst_CSUP06/test.py

@@ -162,6 +162,7 @@ def main():
     templateDir = prepareTemplate(examplePath)
     examplePath = os.path.join(templateDir, "cplusplus-tools.pro")
     for useClang in [False, True]:
+        with TestSection(getCodeModelString(useClang)):
             if not startCreator(useClang):
                 continue
             openQmakeProject(examplePath, [Targets.DESKTOP_531_DEFAULT])

tests/system/suite_editors/tst_memberoperator/test.py

@@ -27,6 +27,7 @@ source("../../shared/qtcreator.py")
 
 def main():
     for useClang in [False, True]:
+        with TestSection(getCodeModelString(useClang)):
             if not startCreator(useClang):
                 continue
             createProject_Qt_Console(tempDir(), "SquishProject")