Squish: Move simpleFileName() into shared script

Change-Id: I359af17fcbc67149fab4e291142523b436a43832
Reviewed-by: Robert Loehning <robert.loehning@digia.com>

5 files changed, 3 insertions, 12 deletions

diff --git a/tests/system/shared/utils.py b/tests/system/shared/utils.py
index 401acbe963..2e8d5ce2dc 100644
--- a/tests/system/shared/utils.py
+++ b/tests/system/shared/utils.py
@@ -647,3 +647,6 @@ def readFile(filename):
     content = f.read()
     f.close()
     return content
+
+def simpleFileName(navigatorFileName):
+    return ".".join(navigatorFileName.split(".")[-2:]).replace("\\","")
diff --git a/tests/system/suite_editors/tst_modify_readonly/test.py b/tests/system/suite_editors/tst_modify_readonly/test.py
index 7d2a05f5aa..d31b244b0c 100644
--- a/tests/system/suite_editors/tst_modify_readonly/test.py
+++ b/tests/system/suite_editors/tst_modify_readonly/test.py
@@ -149,9 +149,6 @@ def checkUnsavedChangesContains(model, filePaths):
     test.compare(set(foundItems), set(filePaths),
                  "Verifying whether modified (unsaved) files do match expected.")
 
-def simpleFileName(navigatorFileName):
-    return ".".join(navigatorFileName.split(".")[-2:]).replace("\\","")
-
 def cleanup():
     global testFolder
     if testFolder:
diff --git a/tests/system/suite_editors/tst_rename_macros/test.py b/tests/system/suite_editors/tst_rename_macros/test.py
index a8c15e5ab1..d82b0f666d 100644
--- a/tests/system/suite_editors/tst_rename_macros/test.py
+++ b/tests/system/suite_editors/tst_rename_macros/test.py
@@ -166,6 +166,3 @@ def revertChanges(files):
                              "Maybe it has not been changed at all.")
         else:
             test.fail("Could not open %s for reverting changes" % simpleName)
-
-def simpleFileName(navigatorFileName):
-    return ".".join(navigatorFileName.split(".")[-2:]).replace("\\","")
diff --git a/tests/system/suite_editors/tst_revert_changes/test.py b/tests/system/suite_editors/tst_revert_changes/test.py
index d9dfdfcc53..670adcccde 100644
--- a/tests/system/suite_editors/tst_revert_changes/test.py
+++ b/tests/system/suite_editors/tst_revert_changes/test.py
@@ -140,6 +140,3 @@ def compareFileToOriginal(fileName):
     origFile.close()
     test.compare(originalContent, currentContent,
                  "Comparing original to reverted file content for '%s'" % fileName)
-
-def simpleFileName(navigatorFileName):
-    return ".".join(navigatorFileName.split(".")[-2:]).replace("\\","")
diff --git a/tests/system/suite_qtquick/tst_qml_outline/test.py b/tests/system/suite_qtquick/tst_qml_outline/test.py
index da41920494..2580fcf6de 100644
--- a/tests/system/suite_qtquick/tst_qml_outline/test.py
+++ b/tests/system/suite_qtquick/tst_qml_outline/test.py
@@ -147,6 +147,3 @@ def verifyOutline(outlinePseudoTree, datasetFileName):
            return
     test.passes("All nodes (%d) inside outline match expected nodes for '%s'."
                 % (len(expected), fileName))
-
-def simpleFileName(navigatorFileName):
-    return ".".join(navigatorFileName.split(".")[-2:]).replace("\\", "")