diff options
author | Robert Loehning <robert.loehning@theqtcompany.com> | 2015-05-29 17:26:13 +0200 |
---|---|---|
committer | Robert Loehning <robert.loehning@theqtcompany.com> | 2015-06-16 14:44:25 +0000 |
commit | 50c6343615e12398524d1a126fb19d6b8934337a (patch) | |
tree | d7daee4ac811a1af9c3f4a907b64a730e4f5e5c2 | |
parent | 52d89196bcb2e450829c0f4d80c4bdedbe7bb98f (diff) | |
download | qt-creator-50c6343615e12398524d1a126fb19d6b8934337a.tar.gz |
Squish: Remove outdated kit handling code
Change-Id: I69f1b6d0d27e9330ff23de0b9d5a09ef02f353ac
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
-rw-r--r-- | tests/system/shared/classes.py | 11 | ||||
-rw-r--r-- | tests/system/shared/project.py | 8 | ||||
-rw-r--r-- | tests/system/shared/utils.py | 11 | ||||
-rw-r--r-- | tests/system/suite_general/tst_create_proj_wizard/test.py | 8 |
4 files changed, 5 insertions, 33 deletions
diff --git a/tests/system/shared/classes.py b/tests/system/shared/classes.py index de02b8e5d3..7e8830d090 100644 --- a/tests/system/shared/classes.py +++ b/tests/system/shared/classes.py @@ -32,13 +32,11 @@ import operator # for easier re-usage (because Python hasn't an enum type) class Targets: - ALL_TARGETS = map(lambda x: 2 ** x , range(9)) + ALL_TARGETS = map(lambda x: 2 ** x , range(7)) (DESKTOP_474_GCC, DESKTOP_480_DEFAULT, SIMULATOR, - MAEMO5, - HARMATTAN, EMBEDDED_LINUX, DESKTOP_521_DEFAULT, DESKTOP_531_DEFAULT, @@ -46,8 +44,7 @@ class Targets: @staticmethod def desktopTargetClasses(): - desktopTargets = (sum(Targets.ALL_TARGETS) & ~Targets.SIMULATOR & ~Targets.MAEMO5 - & ~Targets.HARMATTAN & ~Targets.EMBEDDED_LINUX) + desktopTargets = (sum(Targets.ALL_TARGETS) & ~Targets.SIMULATOR & ~Targets.EMBEDDED_LINUX) if platform.system() == 'Darwin': desktopTargets &= ~Targets.DESKTOP_541_GCC return desktopTargets @@ -61,12 +58,8 @@ class Targets: return "Desktop 480 MSVC2010" else: return "Desktop 480 GCC" - elif target == Targets.MAEMO5: - return "Fremantle" elif target == Targets.SIMULATOR: return "Qt Simulator" - elif target == Targets.HARMATTAN: - return "Harmattan" elif target == Targets.EMBEDDED_LINUX: return "Embedded Linux" elif target == Targets.DESKTOP_521_DEFAULT: diff --git a/tests/system/shared/project.py b/tests/system/shared/project.py index d3abc1cf6d..9c9c75dc69 100644 --- a/tests/system/shared/project.py +++ b/tests/system/shared/project.py @@ -394,9 +394,6 @@ def __chooseTargets__(targets=Targets.DESKTOP_474_GCC, availableTargets=None): available.remove(Targets.EMBEDDED_LINUX) elif platform.system() == 'Darwin': available.remove(Targets.DESKTOP_541_GCC) - for target in filter(lambda x: x in available, - (Targets.MAEMO5, Targets.HARMATTAN)): - available.remove(target) checkedTargets = [] for current in available: mustCheck = targets & current == current @@ -624,14 +621,9 @@ def __getSupportedPlatforms__(text, templateName, getAsStrings=False): result.extend([Targets.DESKTOP_521_DEFAULT, Targets.DESKTOP_531_DEFAULT]) if platform.system() != 'Darwin': result.append(Targets.DESKTOP_541_GCC) - if 'MeeGo/Harmattan' in supports: - result.append(Targets.HARMATTAN) - if 'Maemo/Fremantle' in supports: - result.append(Targets.MAEMO5) if not ("BlackBerry" in templateName or re.search("custom Qt Creator plugin", text)) and (version == None or version < "5.0"): 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 = list(Targets.ALL_TARGETS) result.remove(Targets.EMBEDDED_LINUX) if platform.system() == 'Darwin': diff --git a/tests/system/shared/utils.py b/tests/system/shared/utils.py index e2e2535bba..08e3600503 100644 --- a/tests/system/shared/utils.py +++ b/tests/system/shared/utils.py @@ -380,20 +380,15 @@ def getConfiguredKits(): iterateKits(True, True, __setQtVersionForKit__, kitsWithQtVersionName) # merge defined target names with their configured Qt versions and devices for kit, qtVersion in kitsWithQtVersionName.iteritems(): - if kit in ('Fremantle', 'Harmattan') and qtVersion == 'None': - test.log("Found Kit '%s' with unassigned Qt version (disabled Madde plugin)" % kit) + if kit in ('Fremantle', 'Harmattan'): + test.verify(qtVersion == 'None', + "The outdated kit '%s' should not have a Qt version" % kit) elif qtVersion in qtVersionNames: result[kit] = targetsQtVersions[qtVersionNames.index(qtVersion)].items()[0] else: test.fail("Qt version '%s' for kit '%s' can't be found in qtVersionNames." % (qtVersion, kit)) clickButton(waitForObject(":Options.Cancel_QPushButton")) - # adjust device name(s) to match getStringForTarget() - some differ from time to time - for targetName in result.keys(): - targetInfo = result[targetName] - if targetInfo[0] == "Maemo": - result.update({targetName: - (Targets.getStringForTarget(Targets.MAEMO5), targetInfo[1])}) test.log("Configured kits: %s" % str(result)) return result diff --git a/tests/system/suite_general/tst_create_proj_wizard/test.py b/tests/system/suite_general/tst_create_proj_wizard/test.py index 2570e519dc..8d0de10b22 100644 --- a/tests/system/suite_general/tst_create_proj_wizard/test.py +++ b/tests/system/suite_general/tst_create_proj_wizard/test.py @@ -49,10 +49,7 @@ def main(): test.compare("Projects", str(projects.data())) comboBox = findObject(":New.comboBox_QComboBox") targets = zip(*kits.values())[0] - maddeTargets = Targets.getTargetsAsStrings([Targets.MAEMO5, Targets.HARMATTAN]) - maddeInTargets = len(set(targets) & set(maddeTargets)) > 0 test.verify(comboBox.enabled, "Verifying whether combobox is enabled.") - test.verify(not maddeInTargets, "Verify there are no leftovers of Madde") test.compare(comboBox.currentText, "Desktop Templates") selectFromCombo(comboBox, "All Templates") for category in [item.replace(".", "\\.") for item in dumpItems(catModel, projects)]: @@ -84,11 +81,6 @@ def main(): if counter < len(quickCombinations) - 1: displayedPlatforms = __createProject__(category, template) continue - try: - waitForObject("{name='mainQmlFileGroupBox' title='Main HTML File' type='QGroupBox' visible='1'}", 1000) - clickButton(waitForObject(":Next_QPushButton")) - except LookupError: - pass verifyKitCheckboxes(kits, displayedPlatforms) clickButton(waitForObject("{type='QPushButton' text='Cancel' visible='1'}")) invokeMenuItem("File", "Exit") |