From ec735c3a2a13a638b7f651eccf30ae8588a84a48 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20L=C3=B6hning?= Date: Fri, 19 Jul 2024 22:22:28 +0200 Subject: [PATCH] SquishTests: Fix tst_rename_file for case ignoring file systems On Linux, Creator only considers files with the exact extension ".qml" QML files and places them under a "QML" node in the project tree. On Mac and Windows, Creator also places files with extension ".QML" there. Change-Id: Id81989e867fa946081ea7a350b208ddfe09e5460 Reviewed-by: Jukka Nokso Reviewed-by: Christian Stenger --- tests/system/suite_general/tst_rename_file/test.py | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/tests/system/suite_general/tst_rename_file/test.py b/tests/system/suite_general/tst_rename_file/test.py index d2abe87ea2b..aebd7e5fd79 100644 --- a/tests/system/suite_general/tst_rename_file/test.py +++ b/tests/system/suite_general/tst_rename_file/test.py @@ -38,7 +38,7 @@ def main(): previous = filenames[-1] for filename in filenames: tempFiletype = filetype - if filetype == "QML" and not previous.endswith(".qml"): + if filetype == "QML" and not fileExtMatchesQml(previous): tempFiletype = "Other files" renameFile(templateDir, usedProFile, projectName + "." + tempFiletype, previous, filename) @@ -61,6 +61,15 @@ def verifyRenamedIncludes(templateDir, file, oldname, newname): 'Verify that new filename is included in %s' % file)): test.log(grep("include", fileText)) + +def fileExtMatchesQml(fileName): + if platform.system() == "Linux": + return fileName.endswith(".qml") + else: + # On case ignoring file systems, ".QML" is the same as ".qml" + return fileName.lower().endswith(".qml") + + def renameFile(projectDir, proFile, branch, oldname, newname): oldFilePath = os.path.join(projectDir, oldname) newFilePath = os.path.join(projectDir, newname) @@ -115,7 +124,7 @@ def renameFile(projectDir, proFile, branch, oldname, newname): test.verify(oldname not in os.listdir(projectDir), "Verify that file with old name does not exist: %s" % oldFilePath) - if newItemText.endswith("\\.qml"): + if fileExtMatchesQml(newItemText): newItemText = newItemText.replace(".Other files.", ".QML.") else: newItemText = newItemText.replace(".QML.", ".Other files.")