From aed1616b351e909b870e5caccd544b66b16000bf Mon Sep 17 00:00:00 2001
From: Robert Loehning <robert.loehning@qt.io>
Date: Thu, 2 Aug 2018 19:55:52 +0200
Subject: [PATCH] Squish: Simplify mapping between kits and their names

Task-number: QTCREATORBUG-20861
Change-Id: I809036dc331b93f015ee5b10381229b106e27cbd
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
---
 tests/system/shared/classes.py | 36 +++++++++++-----------------------
 1 file changed, 11 insertions(+), 25 deletions(-)

diff --git a/tests/system/shared/classes.py b/tests/system/shared/classes.py
index a8bdbf96640..cd6facb6ca1 100644
--- a/tests/system/shared/classes.py
+++ b/tests/system/shared/classes.py
@@ -27,7 +27,7 @@ import __builtin__
 
 # for easier re-usage (because Python hasn't an enum type)
 class Targets:
-    ALL_TARGETS = tuple(map(lambda x: 2 ** x , range(5)))
+    ALL_TARGETS = tuple(range(5))
 
     (DESKTOP_4_8_7_DEFAULT,
      EMBEDDED_LINUX,
@@ -35,6 +35,13 @@ class Targets:
      DESKTOP_5_6_1_DEFAULT,
      DESKTOP_5_10_1_DEFAULT) = ALL_TARGETS
 
+    __TARGET_NAME_DICT__ = dict(zip(ALL_TARGETS,
+                                    ["Desktop 4.8.7 default",
+                                     "Embedded Linux",
+                                     "Desktop 5.4.1 GCC",
+                                     "Desktop 5.6.1 default",
+                                     "Desktop 5.10.1 default"]))
+
     @staticmethod
     def availableTargetClasses():
         availableTargets = list(Targets.ALL_TARGETS)
@@ -51,41 +58,20 @@ class Targets:
             desktopTargets.remove(Targets.EMBEDDED_LINUX)
         return desktopTargets
 
-    @staticmethod
-    def qt4Classes():
-        return (Targets.DESKTOP_4_8_7_DEFAULT | Targets.EMBEDDED_LINUX)
-
     @staticmethod
     def getStringForTarget(target):
-        if target == Targets.DESKTOP_4_8_7_DEFAULT:
-            return "Desktop 4.8.7 default"
-        elif target == Targets.EMBEDDED_LINUX:
-            return "Embedded Linux"
-        elif target == Targets.DESKTOP_5_4_1_GCC:
-            return "Desktop 5.4.1 GCC"
-        elif target == Targets.DESKTOP_5_6_1_DEFAULT:
-            return "Desktop 5.6.1 default"
-        elif target == Targets.DESKTOP_5_10_1_DEFAULT:
-            return "Desktop 5.10.1 default"
-        else:
-            return None
+        return Targets.__TARGET_NAME_DICT__[target]
 
     @staticmethod
     def getTargetsAsStrings(targets):
         if not isinstance(targets, (tuple,list)):
             test.fatal("Wrong usage... This function handles only tuples or lists.")
             return None
-        result = map(Targets.getStringForTarget, targets)
-        if None in result:
-            test.fatal("You've passed at least one unknown target!")
-        return result
+        return map(Targets.getStringForTarget, targets)
 
     @staticmethod
     def getIdForTargetName(targetName):
-        for id in Targets.ALL_TARGETS:
-            if Targets.getStringForTarget(id) == targetName:
-                return id
-        raise Exception("'%s' is not a known target name" % targetName)
+        return {v:k for k, v in Targets.__TARGET_NAME_DICT__.items()}[targetName]
 
     @staticmethod
     def getDefaultKit():