diff --git a/tests/src/mocks/generation/CleanUp_openGL_mock.py b/tests/src/mocks/generation/CleanUp_openGL_mock.py index 427333961c08713d83ad2672a983f4957d25f912..4fbd83e282c830b61488c67530bf0f6291ebe7ea 100644 --- a/tests/src/mocks/generation/CleanUp_openGL_mock.py +++ b/tests/src/mocks/generation/CleanUp_openGL_mock.py @@ -32,28 +32,35 @@ def sortListAlphabetically(content): sub_content = content[content.find("[")+1:content.find("']")] params = sub_content.split("',") - #if (params_to_be_sorted[1] not in prefix): - #params = sorted(params, key=lambda s: s.lower()) - #else: - params = sorted(params) + params = sorted(params, key=lambda s: s.lower()) if (params_to_be_sorted[1] in prefix): - sub_content = SortGlewBeforeGl(params) + sub_content = sortGlewBeforeGl(params) + elif (params_to_be_sorted[2] in prefix): + sub_content = sortGLBeforeRest(params) else: sub_content = ', '.join(str(val)+"'" for val in params) return (prefix+ " = [" + sub_content+"]") - -def SortGlewBeforeGl(params): +def sortGlewBeforeGl(params): d = defaultdict(list) for val in params: d["glew" in val].append(val) - sortedParams = ', '.join(str(p)+"'" for p in d[True]) + sortedParams = ','.join(str(p)+"'" for p in d[True]) sortedParams += ',' sortedParams += ','.join(str(p)+"'" for p in d[False]) return sortedParams +def sortGLBeforeRest(params): + d = defaultdict(list) + for val in params: + d["GL" in val].append(val) + sortedParams = ', '.join(str(p)+"'" for p in d[True]) + sortedParams += ',' + sortedParams += ','.join(str(p)+"'" for p in d[False]) + return sortedParams + def printToFile(file, content): nr_of_blanks = len(content[0:content.find("[")+1]) @@ -63,7 +70,7 @@ def printToFile(file, content): printWith80CharacterLimit(file, content, nr_of_blanks) def printWith80CharacterLimit(file, content, nr_of_blanks): - input = ('\n'+' '*nr_of_blanks+'').join(textwrap.wrap(content, + input = ('\n'+' '*nr_of_blanks).join(textwrap.wrap(content, 80-nr_of_blanks)) input += "\n" file.write(input)