diff --git a/tests/system/shared/classes.py b/tests/system/shared/classes.py index f2e7fcb9961db96eba811a74248186519566a5a4..3defd01252db00161c3cf82506acc3c34f647a14 100644 --- a/tests/system/shared/classes.py +++ b/tests/system/shared/classes.py @@ -39,9 +39,10 @@ class Targets: @staticmethod def desktopTargetClasses(): - desktopTargets = (sum(Targets.ALL_TARGETS) & ~Targets.EMBEDDED_LINUX) + desktopTargets = list(Targets.ALL_TARGETS) + desktopTargets.remove(Targets.EMBEDDED_LINUX) if platform.system() == 'Darwin': - desktopTargets &= ~Targets.DESKTOP_541_GCC + desktopTargets.remove(Targets.DESKTOP_541_GCC) return desktopTargets @staticmethod @@ -79,14 +80,6 @@ class Targets: test.fatal("You've passed at least one unknown target!") return result - @staticmethod - def intToArray(targets): - return filter(lambda x: x & targets, Targets.ALL_TARGETS) - - @staticmethod - def arrayToInt(targetArr): - return reduce(operator.or_, targetArr, 0) - @staticmethod def getDefaultKit(): return Targets.DESKTOP_531_DEFAULT diff --git a/tests/system/shared/project.py b/tests/system/shared/project.py index e8e7a90330e45d6db979d743e7b595f3ebcead94..b08384544db41d7a6e55b6e03aa28e6ba81103be 100644 --- a/tests/system/shared/project.py +++ b/tests/system/shared/project.py @@ -71,8 +71,8 @@ def openCmakeProject(projectPath, buildDir): invokeMenuItem("File", "Open File or Project...") selectFromFileDialog(projectPath) - __chooseTargets__(0) # uncheck all - __chooseTargets__(Targets.DESKTOP_480_DEFAULT, additionalFunc=additionalFunction) + __chooseTargets__([]) # uncheck all + __chooseTargets__([Targets.DESKTOP_480_DEFAULT], additionalFunc=additionalFunction) clickButton(waitForObject(":Qt Creator.Configure Project_QPushButton")) return True @@ -326,7 +326,7 @@ def createEmptyQtProject(workingDir=None, projectName=None, targets=Targets.desk __createProjectHandleLastPage__() return projectName, checkedTargets -def createNewNonQtProject(workingDir=None, projectName=None, target=Targets.DESKTOP_474_GCC, +def createNewNonQtProject(workingDir=None, projectName=None, target=[Targets.DESKTOP_474_GCC], plainC=False, cmake=False, qbs=False): if plainC: template = "Plain C Application" @@ -355,7 +355,7 @@ def createNewNonQtProject(workingDir=None, projectName=None, target=Targets.DESK return projectName def createNewCPPLib(projectDir = None, projectName = None, className = None, fromWelcome = False, - target = Targets.DESKTOP_474_GCC, isStatic = False, modules = ["QtCore"]): + target = [Targets.DESKTOP_474_GCC], isStatic = False, modules = ["QtCore"]): available = __createProjectOrFileSelectType__(" Library", "C++ Library", fromWelcome, True) if isStatic: libType = LibType.STATIC @@ -373,7 +373,7 @@ def createNewCPPLib(projectDir = None, projectName = None, className = None, fro return checkedTargets, projectName, className def createNewQtPlugin(projectDir=None, projectName=None, className=None, fromWelcome=False, - target=Targets.DESKTOP_474_GCC, baseClass="QGenericPlugin"): + target=[Targets.DESKTOP_474_GCC], baseClass="QGenericPlugin"): available = __createProjectOrFileSelectType__(" Library", "C++ Library", fromWelcome, True) if projectDir == None: projectDir = tempDir() @@ -385,13 +385,13 @@ def createNewQtPlugin(projectDir=None, projectName=None, className=None, fromWel __createProjectHandleLastPage__() return checkedTargets, projectName, className -# parameter target can be an OR'd value of Targets +# parameter target can be a list of Targets # parameter availableTargets should be the result of __createProjectOrFileSelectType__() # or use None as a fallback # parameter additionalFunc function to be executed inside the detailed view of each chosen kit # if present, 'Details' button will be clicked, function will be executed, # 'Details' button will be clicked again -def __chooseTargets__(targets=Targets.DESKTOP_474_GCC, availableTargets=None, additionalFunc=None): +def __chooseTargets__(targets=[Targets.DESKTOP_474_GCC], availableTargets=None, additionalFunc=None): if availableTargets != None: available = availableTargets else: @@ -403,7 +403,7 @@ def __chooseTargets__(targets=Targets.DESKTOP_474_GCC, availableTargets=None, ad available.remove(Targets.DESKTOP_541_GCC) checkedTargets = [] for current in available: - mustCheck = targets & current == current + mustCheck = current in targets try: ensureChecked("{type='QCheckBox' text='%s' visible='1'}" % Targets.getStringForTarget(current), mustCheck, 3000) diff --git a/tests/system/suite_APTW/tst_APTW03/test.py b/tests/system/suite_APTW/tst_APTW03/test.py index 36053d2709a2e0ed3391d62aa824320f82b03808..1b8090fcdcef8753c43d884fb0733d854451f434 100644 --- a/tests/system/suite_APTW/tst_APTW03/test.py +++ b/tests/system/suite_APTW/tst_APTW03/test.py @@ -80,7 +80,8 @@ def main(): checkSimpleCppLib("SampleApp2", True) # Qt Plugin needs Qt4.8 for QGenericPlugin which is tested by default - targets = Targets.desktopTargetClasses() & ~Targets.DESKTOP_474_GCC + targets = Targets.desktopTargetClasses() + targets.remove(Targets.DESKTOP_474_GCC) checkedTargets, projectName, className = createNewQtPlugin(tempDir(), "SampleApp3", "MyPlugin", target=targets) virtualFunctionsAdded = False diff --git a/tests/system/suite_CCOM/tst_CCOM01/test.py b/tests/system/suite_CCOM/tst_CCOM01/test.py index d5859c69b590075495dd4fa4bc7edd555e7ea12d..99d1d33f76e883a473dfdbc6648e75b0beb2ac45 100755 --- a/tests/system/suite_CCOM/tst_CCOM01/test.py +++ b/tests/system/suite_CCOM/tst_CCOM01/test.py @@ -40,7 +40,9 @@ def main(): if not startedWithoutPluginError(): return # open example project, supports only Qt 5 - targets = Targets.desktopTargetClasses() & ~Targets.DESKTOP_474_GCC & ~Targets.DESKTOP_480_DEFAULT + targets = Targets.desktopTargetClasses() + targets.remove(Targets.DESKTOP_474_GCC) + targets.remove(Targets.DESKTOP_480_DEFAULT) checkedTargets = openQmakeProject(examplePath, targets) # build and wait until finished - on all build configurations availableConfigs = iterateBuildConfigs(len(checkedTargets)) diff --git a/tests/system/suite_CSUP/tst_CSUP06/test.py b/tests/system/suite_CSUP/tst_CSUP06/test.py index d721790e7e7ccdf39e3168602348971fc332718f..068553719946d7d244c15a147af71042e71adedb 100644 --- a/tests/system/suite_CSUP/tst_CSUP06/test.py +++ b/tests/system/suite_CSUP/tst_CSUP06/test.py @@ -174,7 +174,7 @@ def main(): for useClang in [False, True]: if not startCreator(useClang): continue - openQmakeProject(examplePath, Targets.DESKTOP_531_DEFAULT) + openQmakeProject(examplePath, [Targets.DESKTOP_531_DEFAULT]) checkCodeModelSettings(useClang) if not openDocument("cplusplus-tools.Sources.main\\.cpp"): earlyExit("Failed to open main.cpp.") diff --git a/tests/system/suite_QMLS/tst_QMLS03/test.py b/tests/system/suite_QMLS/tst_QMLS03/test.py index 9c07a844bc62aa31ea47bb5a6711efd4ca138039..3682816da52c54bca65c71d60e38ca836ac14c09 100644 --- a/tests/system/suite_QMLS/tst_QMLS03/test.py +++ b/tests/system/suite_QMLS/tst_QMLS03/test.py @@ -80,7 +80,7 @@ def main(): if not startedWithoutPluginError(): return # open example project - openQmakeProject(examplePath, Targets.DESKTOP_531_DEFAULT) + openQmakeProject(examplePath, [Targets.DESKTOP_531_DEFAULT]) # open qml file openDocument("animation.Resources.animation\\.qrc./animation.basics.color-animation\\.qml") # get editor diff --git a/tests/system/suite_debugger/tst_debug_empty_main/test.py b/tests/system/suite_debugger/tst_debug_empty_main/test.py index 39b9ed30188e6a536051da2ba5ba2984f19ead2d..524499c81623ecb3f02a644c942f40e61d1ff513 100644 --- a/tests/system/suite_debugger/tst_debug_empty_main/test.py +++ b/tests/system/suite_debugger/tst_debug_empty_main/test.py @@ -58,13 +58,12 @@ def main(): performDebugging(projectName, checkedTargets) invokeMenuItem("File", "Close All Projects and Editors") # C/C++ - targets = Targets.intToArray(Targets.desktopTargetClasses()) for name,isC in {"C":True, "CPP":False}.items(): for singleTarget in targets: workingDir = tempDir() qtVersion = re.search("\d{3}", Targets.getStringForTarget(singleTarget)).group() projectName = createNewNonQtProject(workingDir, "Sample%s%s" % (name, qtVersion), - singleTarget, isC) + [singleTarget], isC) if projectName == None: test.fail("Failed to create Sample%s%s" % (name, qtVersion), "Target: %s, plainC: %s" % (Targets.getStringForTargt(singleTarget), isC)) diff --git a/tests/system/suite_debugger/tst_simple_debug/test.py b/tests/system/suite_debugger/tst_simple_debug/test.py index 14c250acad2ff45d29014849121bd67daca4e401..f20069cd2a76fa0245a08a857ee4bc08536cf0c4 100644 --- a/tests/system/suite_debugger/tst_simple_debug/test.py +++ b/tests/system/suite_debugger/tst_simple_debug/test.py @@ -30,7 +30,8 @@ def main(): if not startedWithoutPluginError(): return # Requires Qt 4.8 - targets = Targets.desktopTargetClasses() & ~Targets.DESKTOP_474_GCC + targets = Targets.desktopTargetClasses() + targets.remove(Targets.DESKTOP_474_GCC) # using a temporary directory won't mess up a potentially existing workingDir = tempDir() checkedTargets, projectName = createNewQtQuickApplication(workingDir, targets=targets) diff --git a/tests/system/suite_general/tst_build_speedcrunch/test.py b/tests/system/suite_general/tst_build_speedcrunch/test.py index 7d6c30227cb4aa392eebce14e3455e95b37aa889..d66524001ca3d85781c5e0a553662f2277060c4b 100644 --- a/tests/system/suite_general/tst_build_speedcrunch/test.py +++ b/tests/system/suite_general/tst_build_speedcrunch/test.py @@ -42,7 +42,7 @@ def main(): startApplication("qtcreator" + SettingsPath) if not startedWithoutPluginError(): return - checkedTargets = openQmakeProject(SpeedCrunchPath, Targets.DESKTOP_480_DEFAULT) + checkedTargets = openQmakeProject(SpeedCrunchPath, [Targets.DESKTOP_480_DEFAULT]) progressBarWait(30000) fancyToolButton = waitForObject(":*Qt Creator_Core::Internal::FancyToolButton") diff --git a/tests/system/suite_general/tst_openqt_creator/test.py b/tests/system/suite_general/tst_openqt_creator/test.py index 5722a3fe46c06817e3505f1b33ecb82590a31e99..8f838bd4e27ec0bfda20557fc0b3a5955c553499 100644 --- a/tests/system/suite_general/tst_openqt_creator/test.py +++ b/tests/system/suite_general/tst_openqt_creator/test.py @@ -36,12 +36,12 @@ def main(): return runButton = findObject(':*Qt Creator.Run_Core::Internal::FancyToolButton') - openQmakeProject(pathSpeedcrunch, Targets.DESKTOP_480_DEFAULT) + openQmakeProject(pathSpeedcrunch, [Targets.DESKTOP_480_DEFAULT]) # Wait for parsing to complete waitFor("runButton.enabled", 30000) # Starting before opening, because this is where Creator froze (QTCREATORBUG-10733) startopening = datetime.utcnow() - openQmakeProject(pathCreator, Targets.DESKTOP_561_DEFAULT) + openQmakeProject(pathCreator, [Targets.DESKTOP_561_DEFAULT]) # Wait for parsing to complete startreading = datetime.utcnow() waitFor("runButton.enabled", 300000) diff --git a/tests/system/suite_general/tst_session_handling/test.py b/tests/system/suite_general/tst_session_handling/test.py index 3e11f51a07898b3ea4ec1a9b2250af3192e10353..0247b6404f54a24bb8e39d89d8c9b6e4ad8ca021 100644 --- a/tests/system/suite_general/tst_session_handling/test.py +++ b/tests/system/suite_general/tst_session_handling/test.py @@ -39,7 +39,7 @@ def main(): "Verifying window title contains created session name.") checkWelcomePage(sessionName, True) for project in projects: - openQmakeProject(project, Targets.DESKTOP_531_DEFAULT) + openQmakeProject(project, [Targets.DESKTOP_531_DEFAULT]) progressBarWait(20000) checkNavigator(53, "Verifying whether all projects have been opened.") openDocument("animation.Resources.animation\\.qrc./animation.basics.animators\\.qml") diff --git a/tests/system/suite_qtquick/tst_qml_outline/test.py b/tests/system/suite_qtquick/tst_qml_outline/test.py index e837f523463e590f79841556ade32125609d222e..383d8296f73a56600ea0b97d628ff7d6d3d4c189 100644 --- a/tests/system/suite_qtquick/tst_qml_outline/test.py +++ b/tests/system/suite_qtquick/tst_qml_outline/test.py @@ -39,7 +39,7 @@ def main(): startApplication("qtcreator" + SettingsPath) if not startedWithoutPluginError(): return - openQmakeProject(os.path.join(templateDir, proFile), Targets.DESKTOP_531_DEFAULT) + openQmakeProject(os.path.join(templateDir, proFile), [Targets.DESKTOP_531_DEFAULT]) qmlFiles = [treebase + "focus\\.qml", treebase + "Core.ListMenu\\.qml"] checkOutlineFor(qmlFiles) testModify() diff --git a/tests/system/suite_qtquick/tst_qtquick_creation/test.py b/tests/system/suite_qtquick/tst_qtquick_creation/test.py index c2d349c13b54111da6cc592152f187f4cc0fa6a2..72ab1e104940c6a2e1cc3b0ce12ecda766d7f8a6 100644 --- a/tests/system/suite_qtquick/tst_qtquick_creation/test.py +++ b/tests/system/suite_qtquick/tst_qtquick_creation/test.py @@ -36,10 +36,10 @@ def main(): for qtVersion, controls in available: if qtVersion == "5.3": - targ = Targets.DESKTOP_531_DEFAULT + targ = [Targets.DESKTOP_531_DEFAULT] quick = "2.3" else: - targ = Targets.DESKTOP_541_GCC + targ = [Targets.DESKTOP_541_GCC] quick = "2.4" # using a temporary directory won't mess up a potentially existing workingDir = tempDir() diff --git a/tests/system/suite_qtquick/tst_qtquick_creation4/test.py b/tests/system/suite_qtquick/tst_qtquick_creation4/test.py index 99cccb8cd24d5e745050a918e85836b34f74d006..a93d9a25ffa6eddaa49fc077243e35591a4b69a8 100644 --- a/tests/system/suite_qtquick/tst_qtquick_creation4/test.py +++ b/tests/system/suite_qtquick/tst_qtquick_creation4/test.py @@ -29,8 +29,8 @@ def main(): startApplication("qtcreator" + SettingsPath) if not startedWithoutPluginError(): return - for targ, quickVer in [[Targets.DESKTOP_480_DEFAULT, 1], [Targets.DESKTOP_561_DEFAULT, 2], - [Targets.DESKTOP_531_DEFAULT, 2]]: + for targ, quickVer in [[[Targets.DESKTOP_480_DEFAULT], 1], [[Targets.DESKTOP_561_DEFAULT], 2], + [[Targets.DESKTOP_531_DEFAULT], 2]]: # using a temporary directory won't mess up a potentially existing createNewQmlExtension(tempDir(), targ, quickVer) # wait for parsing to complete