Squish: Clean up

Details:
 * removed unused functions
 * removed "QtQuickConstants" (Targets class is used for more than just Qt Quick)
 * removed Components class

Change-Id: I2908348db3e5a627d63242f9524832812822f790
Reviewed-by: Robert Loehning <robert.loehning@digia.com>

tests/system/shared/classes.py

@@ -1,53 +1,35 @@
 # for easier re-usage (because Python hasn't an enum type)
-class QtQuickConstants:
+class Targets:
-    class Components:
+    DESKTOP_474_GCC = 1
-        BUILTIN = 1
+    SIMULATOR = 2
-        MEEGO_HARMATTAN = 2
+    MAEMO5 = 4
-        EXISTING_QML = 4
+    HARMATTAN = 8
-
+    EMBEDDED_LINUX = 16
-    class Targets:
+    DESKTOP_474_MSVC2008 = 32
-        DESKTOP_474_GCC = 1
+    DESKTOP_501_DEFAULT = 64
-        SIMULATOR = 2
-        MAEMO5 = 4
-        HARMATTAN = 8
-        EMBEDDED_LINUX = 16
-        DESKTOP_474_MSVC2008 = 32
-        DESKTOP_501_DEFAULT = 64
 
     @staticmethod
     def desktopTargetClasses():
-        desktopTargets = QtQuickConstants.Targets.DESKTOP_474_GCC \
+        desktopTargets = Targets.DESKTOP_474_GCC | Targets.DESKTOP_501_DEFAULT
-                         | QtQuickConstants.Targets.DESKTOP_501_DEFAULT
         if platform.system() in ('Windows', 'Microsoft'):
-            desktopTargets |= QtQuickConstants.Targets.DESKTOP_474_MSVC2008
+            desktopTargets |= Targets.DESKTOP_474_MSVC2008
         return desktopTargets
 
-    @staticmethod
-    def getStringForComponents(components):
-            if components==QtQuickConstants.Components.BUILTIN:
-                return "Built-in elements only (for all platforms)"
-            elif components==QtQuickConstants.Components.MEEGO_HARMATTAN:
-                return "Qt Quick Components for Meego/Harmattan"
-            elif components==QtQuickConstants.Components.EXISTING_QML:
-                return "Use an existing .qml file"
-            else:
-                return None
-
     @staticmethod
     def getStringForTarget(target):
-        if target==QtQuickConstants.Targets.DESKTOP_474_GCC:
+        if target == Targets.DESKTOP_474_GCC:
             return "Desktop 474 GCC"
-        elif target==QtQuickConstants.Targets.MAEMO5:
+        elif target == Targets.MAEMO5:
             return "Fremantle"
-        elif target==QtQuickConstants.Targets.SIMULATOR:
+        elif target == Targets.SIMULATOR:
             return "Qt Simulator"
-        elif target==QtQuickConstants.Targets.HARMATTAN:
+        elif target == Targets.HARMATTAN:
             return "Harmattan"
-        elif target==QtQuickConstants.Targets.EMBEDDED_LINUX:
+        elif target == Targets.EMBEDDED_LINUX:
             return "Embedded Linux"
-        elif target==QtQuickConstants.Targets.DESKTOP_474_MSVC2008:
+        elif target == Targets.DESKTOP_474_MSVC2008:
             return "Desktop 474 MSVC2008"
-        elif target==QtQuickConstants.Targets.DESKTOP_501_DEFAULT:
+        elif target == Targets.DESKTOP_501_DEFAULT:
             return "Desktop 501 default"
         else:
             return None
@@ -57,7 +39,7 @@ class QtQuickConstants:
         if not isinstance(targets, (tuple,list)):
             test.fatal("Wrong usage... This function handles only tuples or lists.")
             return None
-        result = map(QtQuickConstants.getStringForTarget, targets)
+        result = map(Targets.getStringForTarget, targets)
         if None in result:
             test.fatal("You've passed at least one unknown target!")
         return result

tests/system/shared/project.py

@@ -12,7 +12,7 @@ def __handleProcessExited__(object, exitCode):
     global processExited
     processExited = True
 
-def openQmakeProject(projectPath, targets=QtQuickConstants.desktopTargetClasses(), fromWelcome=False):
+def openQmakeProject(projectPath, targets=Targets.desktopTargetClasses(), fromWelcome=False):
     cleanUpUserFiles(projectPath)
     if fromWelcome:
         mouseClick(waitForObject(":OpenProject_QStyleItem"), 5, 5, 0, Qt.LeftButton)
@@ -112,7 +112,7 @@ def __createProjectSetNameAndPath__(path, projectName = None, checks = True):
 # param checks turns tests in the function on if set to True
 # param available a list holding the available targets
 def __selectQtVersionDesktop__(checks, available=None):
-    checkedTargets = __chooseTargets__(QtQuickConstants.desktopTargetClasses(), available)
+    checkedTargets = __chooseTargets__(Targets.desktopTargetClasses(), available)
     if checks:
         cbObject = ("{type='QCheckBox' text='%s' unnamed='1' visible='1' "
                     "container={type='Utils::DetailsWidget' visible='1' unnamed='1'}}")
@@ -204,7 +204,7 @@ def createProject_Qt_Console(path, projectName, checks = True):
     return checkedTargets
 
 def createNewQtQuickApplication(workingDir, projectName = None, templateFile = None,
-                                targets=QtQuickConstants.desktopTargetClasses(), qtQuickVersion=1,
+                                targets=Targets.desktopTargetClasses(), qtQuickVersion=1,
                                 fromWelcome=False):
     if templateFile:
         available = __createProjectOrFileSelectType__("  Applications", "Qt Quick %d Application (from Existing QML File)"
@@ -240,7 +240,7 @@ def createNewQmlExtension(workingDir):
     if workingDir == None:
         workingDir = tempDir()
     __createProjectSetNameAndPath__(workingDir)
-    checkedTargets = __chooseTargets__(QtQuickConstants.Targets.DESKTOP_474_GCC, available)
+    checkedTargets = __chooseTargets__(Targets.DESKTOP_474_GCC, available)
     nextButton = waitForObject(":Next_QPushButton")
     clickButton(nextButton)
     nameLineEd = waitForObject("{buddy={type='QLabel' text='Object Class-name:' unnamed='1' visible='1'} "
@@ -253,51 +253,39 @@ def createNewQmlExtension(workingDir):
     __createProjectHandleLastPage__()
     return checkedTargets
 
-# parameter components can only be one of the Constants defined in QtQuickConstants.Components
+# parameter target can be an OR'd value of Targets
-def __chooseComponents__(components=QtQuickConstants.Components.BUILTIN):
-    rbComponentToChoose = waitForObject("{type='QRadioButton' text='%s' visible='1'}"
-                              % QtQuickConstants.getStringForComponents(components))
-    if rbComponentToChoose.checked:
-        test.passes("Selected QRadioButton is '%s'" % QtQuickConstants.getStringForComponents(components))
-    else:
-        clickButton(rbComponentToChoose)
-        test.verify(rbComponentToChoose.checked, "Selected QRadioButton is '%s'"
-                % QtQuickConstants.getStringForComponents(components))
-
-# parameter target can be an OR'd value of QtQuickConstants.Targets
 # parameter availableTargets should be the result of __createProjectSelectType__()
 #           or use None as a fallback
-def __chooseTargets__(targets=QtQuickConstants.Targets.DESKTOP_474_GCC, availableTargets=None,
+def __chooseTargets__(targets=Targets.DESKTOP_474_GCC, availableTargets=None,
                       isMaddeDisabled=True):
     if availableTargets != None:
         available = availableTargets
     else:
         # following targets depend on the build environment - added for further/later tests
-        available = [QtQuickConstants.Targets.DESKTOP_474_GCC, QtQuickConstants.Targets.DESKTOP_501_DEFAULT,
+        available = [Targets.DESKTOP_474_GCC, Targets.DESKTOP_501_DEFAULT, Targets.MAEMO5,
-                     QtQuickConstants.Targets.MAEMO5, QtQuickConstants.Targets.EMBEDDED_LINUX,
+                     Targets.EMBEDDED_LINUX, Targets.SIMULATOR, Targets.HARMATTAN]
-                     QtQuickConstants.Targets.SIMULATOR, QtQuickConstants.Targets.HARMATTAN]
         if platform.system() in ('Windows', 'Microsoft'):
-            available.remove(QtQuickConstants.Targets.EMBEDDED_LINUX)
+            available.remove(Targets.EMBEDDED_LINUX)
-            available.append(QtQuickConstants.Targets.DESKTOP_474_MSVC2008)
+            available.append(Targets.DESKTOP_474_MSVC2008)
     if isMaddeDisabled:
         for target in filter(lambda x: x in available,
-                             (QtQuickConstants.Targets.MAEMO5, QtQuickConstants.Targets.HARMATTAN)):
+                             (Targets.MAEMO5, Targets.HARMATTAN)):
             available.remove(target)
     checkedTargets = []
     for current in available:
         mustCheck = targets & current == current
         try:
-            ensureChecked("{type='QCheckBox' text='%s' visible='1'}" % QtQuickConstants.getStringForTarget(current),
+            ensureChecked("{type='QCheckBox' text='%s' visible='1'}" % Targets.getStringForTarget(current),
                           mustCheck, 3000)
             if (mustCheck):
                 checkedTargets.append(current)
         except LookupError:
             if mustCheck:
-                test.fail("Failed to check target '%s'." % QtQuickConstants.getStringForTarget(current))
+                test.fail("Failed to check target '%s'." % Targets.getStringForTarget(current))
             else:
                 # Simulator has been added without knowing whether configured or not - so skip warning here?
-                if current != QtQuickConstants.Targets.SIMULATOR:
+                if current != Targets.Targets.SIMULATOR:
-                    test.warning("Target '%s' is not set up correctly." % QtQuickConstants.getStringForTarget(current))
+                    test.warning("Target '%s' is not set up correctly." % Targets.getStringForTarget(current))
     return checkedTargets
 
 # run and close an application
@@ -453,7 +441,7 @@ def resetApplicationContextToCreator():
 # Simulator must be handled in a special way, because this depends on the
 # configured Qt versions and Toolchains and cannot be looked up the same way
 # if you set getAsStrings to True this function returns a list of strings instead
-# of the constants defined in QtQuickConstants.Targets
+# of the constants defined in Targets
 def __getSupportedPlatforms__(text, getAsStrings=False):
     reqPattern = re.compile("requires qt (?P<version>\d+\.\d+(\.\d+)?)", re.IGNORECASE)
     res = reqPattern.search(text)
@@ -465,31 +453,30 @@ def __getSupportedPlatforms__(text, getAsStrings=False):
         supports = text[text.find('Supported Platforms'):].split(":")[1].strip().split(" ")
         result = []
         if 'Desktop' in supports:
-            result.append(QtQuickConstants.Targets.DESKTOP_474_GCC)
+            result.append(Targets.DESKTOP_474_GCC)
-            result.append(QtQuickConstants.Targets.DESKTOP_501_DEFAULT)
+            result.append(Targets.DESKTOP_501_DEFAULT)
             if platform.system() in ("Linux", "Darwin"):
-                result.append(QtQuickConstants.Targets.EMBEDDED_LINUX)
+                result.append(Targets.EMBEDDED_LINUX)
             elif platform.system() in ('Windows', 'Microsoft'):
-                result.append(QtQuickConstants.Targets.DESKTOP_474_MSVC2008)
+                result.append(Targets.DESKTOP_474_MSVC2008)
         if 'MeeGo/Harmattan' in supports:
-            result.append(QtQuickConstants.Targets.HARMATTAN)
+            result.append(Targets.HARMATTAN)
         if 'Maemo/Fremantle' in supports:
-            result.append(QtQuickConstants.Targets.MAEMO5)
+            result.append(Targets.MAEMO5)
         if not re.search("custom Qt Creator plugin", text):
-            result.append(QtQuickConstants.Targets.SIMULATOR)
+            result.append(Targets.SIMULATOR)
     elif 'Platform independent' in text:
         # MAEMO5 and HARMATTAN could be wrong here - depends on having Madde plugin enabled or not
-        result = [QtQuickConstants.Targets.DESKTOP_474_GCC, QtQuickConstants.Targets.DESKTOP_501_DEFAULT,
+        result = [Targets.DESKTOP_474_GCC, Targets.DESKTOP_501_DEFAULT, Targets.MAEMO5,
-                  QtQuickConstants.Targets.MAEMO5, QtQuickConstants.Targets.SIMULATOR,
+                  Targets.SIMULATOR, Targets.HARMATTAN]
-                  QtQuickConstants.Targets.HARMATTAN]
         if platform.system() in ('Windows', 'Microsoft'):
-            result.append(QtQuickConstants.Targets.DESKTOP_474_MSVC2008)
+            result.append(Targets.DESKTOP_474_MSVC2008)
     else:
         test.warning("Returning None (__getSupportedPlatforms__())",
                      "Parsed text: '%s'" % text)
         return None, None
     if getAsStrings:
-        result = QtQuickConstants.getTargetsAsStrings(result)
+        result = Targets.getTargetsAsStrings(result)
     return result, version
 
 # copy example project (sourceExample is path to project) to temporary directory inside repository

tests/system/shared/utils.py

@@ -344,8 +344,7 @@ def getConfiguredKits(isMaddeDisabled=True):
         targetInfo = result[targetName]
         if targetInfo[0] == "Maemo":
             result.update({targetName:
-                           (QtQuickConstants.getStringForTarget(QtQuickConstants.Targets.MAEMO5),
+                           (Targets.getStringForTarget(Targets.MAEMO5), targetInfo[1])})
-                            targetInfo[1])})
     test.log("Configured kits: %s" % str(result))
     return result
 
@@ -409,7 +408,7 @@ def checkDebuggingLibrary(kitIDs):
     # end of internal function for iterateQtVersions
     kits, qtv = iterateKits(True, False, __getQtVersionForKit__)
     qtVersionsOfKits = zip(kits, qtv)
-    wantedKits = QtQuickConstants.getTargetsAsStrings(kitIDs)
+    wantedKits = Targets.getTargetsAsStrings(kitIDs)
     kitsQtV = dict([i for i in qtVersionsOfKits if i[0] in wantedKits])
     tv, builtAndFailedList = iterateQtVersions(False, True, __checkDebugLibsInternalFunc__, kitsQtV)
     built = failed = 0

tests/system/suite_debugger/tst_simple_debug/test.py

@@ -7,9 +7,9 @@ def main():
     startApplication("qtcreator" + SettingsPath)
     if not startedWithoutPluginError():
         return
-    targets = [QtQuickConstants.Targets.DESKTOP_474_GCC]
+    targets = [Targets.DESKTOP_474_GCC]
     if platform.system() in ('Windows', 'Microsoft'):
-        targets.append(QtQuickConstants.Targets.DESKTOP_474_MSVC2008)
+        targets.append(Targets.DESKTOP_474_MSVC2008)
     if not checkDebuggingLibrary(targets):
         test.fatal("Error while checking debugging libraries - leaving this test.")
         invokeMenuItem("File", "Exit")

tests/system/suite_general/tst_build_speedcrunch/test.py

@@ -17,9 +17,9 @@ def main():
     startApplication("qtcreator" + SettingsPath)
     if not startedWithoutPluginError():
         return
-    suitableKits = QtQuickConstants.Targets.DESKTOP_474_GCC
+    suitableKits = Targets.DESKTOP_474_GCC
     if platform.system() in ('Windows', 'Microsoft'):
-        suitableKits |= QtQuickConstants.Targets.DESKTOP_474_MSVC2008
+        suitableKits |= Targets.DESKTOP_474_MSVC2008
     checkedTargets = openQmakeProject(SpeedCrunchPath, suitableKits)
     waitForSignal("{type='CppTools::Internal::CppModelManager' unnamed='1'}", "sourceFilesRefreshed(QStringList)")
 

tests/system/suite_general/tst_create_proj_wizard/test.py

@@ -38,8 +38,7 @@ def performTest(templateDir, qmlFile, isMaddeDisabled):
     comboBox = findObject("{name='comboBox' type='QComboBox' visible='1' "
                           "window=':New_Core::Internal::NewDialog'}")
     targets = zip(*kits.values())[0]
-    maddeTargets = QtQuickConstants.getTargetsAsStrings([QtQuickConstants.Targets.MAEMO5,
+    maddeTargets = Targets.getTargetsAsStrings([Targets.MAEMO5, Targets.HARMATTAN])
-                                                         QtQuickConstants.Targets.HARMATTAN])
     maddeInTargets = len(set(targets) & set(maddeTargets)) > 0
     test.compare(comboBox.enabled, maddeInTargets, "Verifying whether combox is enabled.")
     test.compare(maddeInTargets, not isMaddeDisabled, "Verifying if kits are configured.")

tests/system/suite_qtquick/tst_qtquick_creation/test.py

@@ -7,7 +7,7 @@ def main():
     # using a temporary directory won't mess up a potentially existing
     workingDir = tempDir()
     checkedTargets, projectName = createNewQtQuickApplication(workingDir,
-                                                              targets = QtQuickConstants.Targets.DESKTOP_474_GCC)
+                                                              targets = Targets.DESKTOP_474_GCC)
     test.log("Building project")
     result = modifyRunSettingsForHookInto(projectName, len(checkedTargets), 11223)
     invokeMenuItem("Build", "Build All")

tests/system/suite_qtquick/tst_qtquick_creation2/test.py

@@ -12,7 +12,7 @@ def main():
     workingDir = tempDir()
     checkedTargets, projectName = createNewQtQuickApplication(workingDir, None,
                                                               os.path.join(prepareTemplate(sourceExample), qmlFile),
-                                                              QtQuickConstants.Targets.DESKTOP_474_GCC)
+                                                              Targets.DESKTOP_474_GCC)
     test.log("Building project")
     result = modifyRunSettingsForHookInto(projectName, len(checkedTargets), 11223)
     invokeMenuItem("Build","Build All")